Pārlūkot izejas kodu

wxGUI/gselect: fix g.remove in wxPython 3, Select widget behaves differently

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@64210 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 gadi atpakaļ
vecāks
revīzija
c91d579be9
2 mainītis faili ar 9 papildinājumiem un 2 dzēšanām
  1. 4 1
      gui/wxpython/gui_core/forms.py
  2. 5 1
      gui/wxpython/gui_core/gselect.py

+ 4 - 1
gui/wxpython/gui_core/forms.py

@@ -200,7 +200,10 @@ class UpdateThread(Thread):
                 else:
                     etype = type_param.get('value')
 
-                self.data[win.GetParent().SetElementList] = {'type': etype}
+                if globalvar.CheckWxVersion([3]):
+                    self.data[win.SetElementList] = {'type': etype}
+                else:
+                    self.data[win.GetParent().SetElementList] = {'type': etype}
 
                 # t.(un)register has one type for 'input', 'maps'
                 maps_param = self.task.get_param('maps', element='name', raiseError=False)

+ 5 - 1
gui/wxpython/gui_core/gselect.py

@@ -95,7 +95,11 @@ class Select(wx.combo.ComboCtrl):
         :param validator: validator for TextCtrl
         """
         wx.combo.ComboCtrl.__init__(self, parent=parent, id=id, size=size, validator=validator)
-        self.GetChildren()[0].SetName("Select")
+        if globalvar.CheckWxVersion([3]):
+            self.SetName("Select")
+        else:
+            self.GetChildren()[0].SetName("Select")
+            
         self.GetChildren()[0].type = type
 
         self.tcp = TreeCtrlComboPopup()