Skip to content

Commit c60174d

Browse files
Fixes basic start of RIDE on wxPython 2.8.12.1 and 3.0.2. Grid editor not functional. (#1986)
1 parent 3b4fc3a commit c60174d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/robotide/preferences/editors.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ def ReadFonts():
3636
'''Returns list with fixed width fonts'''
3737
f = wx.FontEnumerator()
3838
f.EnumerateFacenames()
39-
names = f.GetFacenames(fixedWidthOnly=True)
39+
if wx.VERSION >= (3, 0, 3, ''): # DEBUG wxPhoenix
40+
names = f.GetFacenames(fixedWidthOnly=True)
41+
else:
42+
names = f.GetFacenames()
4043
names = [n for n in names if not n.startswith('@')]
4144
names.sort()
4245
return names

src/robotide/ui/mainframe.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def __init__(self, application, controller):
175175
self.Bind(wx.EVT_SIZE, self.OnSize)
176176
self.Bind(wx.EVT_MOVE, self.OnMove)
177177
self.Bind(wx.EVT_MAXIMIZE, self.OnMaximize)
178-
if wx.VERSION >= (2, 9, 5, ''): # DEBUG wxPhoenix
178+
if wx.VERSION >= (3, 0, 3, ''): # DEBUG wxPhoenix
179179
self.Bind(wx.EVT_DIRCTRL_FILEACTIVATED, self.OnOpenFile)
180180
self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnMenuOpenFile)
181181
self._subscribe_messages()
@@ -283,7 +283,7 @@ def _init_ui(self):
283283
self.actions.register_actions(
284284
ActionInfoCollection(_menudata, self, self.tree))
285285
###### File explorer pane
286-
if wx.VERSION >= (2, 9, 5, ''): # DEBUG wxPhoenix
286+
if wx.VERSION >= (3, 0, 3, ''): # DEBUG wxPhoenix
287287
self.filemgr = wx.GenericDirCtrl(self, -1, size=(200, 225),
288288
style=wx.DIRCTRL_3D_INTERNAL)
289289
self.filemgr.SetMinSize(wx.Size(120, 200))

0 commit comments

Comments
 (0)