浏览代码

wxGUI: fix GListCtrl for wxPython 4

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@73472 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 6 年之前
父节点
当前提交
d498170b73
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. 7 4
      gui/wxpython/gui_core/widgets.py

+ 7 - 4
gui/wxpython/gui_core/widgets.py

@@ -91,7 +91,7 @@ from core.utils import _
 from core.gcmd import GMessage, GError
 from core.debug import Debug
 from gui_core.wrap import Button, SearchCtrl, StaticText, StaticBox, \
-    TextCtrl, Menu, Rect, EmptyBitmap
+    TextCtrl, Menu, Rect, EmptyBitmap, ListCtrl
 
 
 class NotebookController:
@@ -935,7 +935,7 @@ class SingleSymbolPanel(wx.Panel):
         self.Refresh()
 
 
-class GListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin,
+class GListCtrl(ListCtrl, listmix.ListCtrlAutoWidthMixin,
                 listmix.CheckListCtrlMixin):
     """Generic ListCtrl with popup menu to select/deselect all
     items"""
@@ -943,7 +943,7 @@ class GListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin,
     def __init__(self, parent):
         self.parent = parent
 
-        wx.ListCtrl.__init__(self, parent, id=wx.ID_ANY,
+        ListCtrl.__init__(self, parent, id=wx.ID_ANY,
                              style=wx.LC_REPORT)
         listmix.CheckListCtrlMixin.__init__(self)
 
@@ -1035,7 +1035,10 @@ class GListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin,
 
         idx = 0
         for item in data:
-            index = self.InsertStringItem(idx, str(item[0]))
+            if wxPythonPhoenix:
+                index = self.InsertItem(idx, str(item[0]))
+            else:
+                index = self.InsertStringItem(idx, str(item[0]))
             for i in range(1, self.GetColumnCount()):
                 self.SetStringItem(index, i, item[i])
             idx += 1