Browse Source

fixes for python3 and wxPython4

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@73972 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 6 years ago
parent
commit
498028ea36
1 changed files with 14 additions and 7 deletions
  1. 14 7
      gui/wxpython/location_wizard/wizard.py

+ 14 - 7
gui/wxpython/location_wizard/wizard.py

@@ -568,7 +568,7 @@ class ProjectionsPage(TitledPage):
 
 
     def OnItemSelected(self, event):
     def OnItemSelected(self, event):
         """Projection selected"""
         """Projection selected"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
 
 
         # set values
         # set values
         self.proj = self.projlist.GetItem(index, 0).GetText().lower()
         self.proj = self.projlist.GetItem(index, 0).GetText().lower()
@@ -654,7 +654,7 @@ class ItemList(wx.ListCtrl,
             self.sourceData = data
             self.sourceData = data
 
 
         try:
         try:
-            data.sort()
+            data = sorted(data)
             self.DeleteAllItems()
             self.DeleteAllItems()
             row = 0
             row = 0
             for value in data:
             for value in data:
@@ -702,6 +702,9 @@ class ItemList(wx.ListCtrl,
         s = str(self.itemDataMap[index][col])
         s = str(self.itemDataMap[index][col])
         return s
         return s
 
 
+    def OnGetItemImage(self, item):
+        return -1
+
     def OnGetItemAttr(self, item):
     def OnGetItemAttr(self, item):
         """Get item attributes"""
         """Get item attributes"""
         index = self.itemIndexMap[item]
         index = self.itemIndexMap[item]
@@ -713,7 +716,11 @@ class ItemList(wx.ListCtrl,
     def SortItems(self, sorter=cmp):
     def SortItems(self, sorter=cmp):
         """Sort items"""
         """Sort items"""
         items = list(self.itemDataMap.keys())
         items = list(self.itemDataMap.keys())
-        items.sort(self.Sorter)
+        if sys.version_info[0] >= 3:
+            # not sure what Sorter is needed for
+            items.sort()
+        else:
+            items.sort(self.Sorter)
         self.itemIndexMap = items
         self.itemIndexMap = items
 
 
         # redraw the list
         # redraw the list
@@ -1149,7 +1156,7 @@ class DatumPage(TitledPage):
 
 
     def OnDatumSelected(self, event):
     def OnDatumSelected(self, event):
         """Datum selected"""
         """Datum selected"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
         item = event.GetItem()
         item = event.GetItem()
 
 
         self.datum = self.datumlist.GetItem(index, 0).GetText()
         self.datum = self.datumlist.GetItem(index, 0).GetText()
@@ -1309,7 +1316,7 @@ class EllipsePage(TitledPage):
 
 
     def OnItemSelected(self, event):
     def OnItemSelected(self, event):
         """Ellipsoid selected"""
         """Ellipsoid selected"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
         item = event.GetItem()
         item = event.GetItem()
 
 
         self.ellipse = self.ellipselist.GetItem(index, 0).GetText()
         self.ellipse = self.ellipselist.GetItem(index, 0).GetText()
@@ -1680,7 +1687,7 @@ class EPSGPage(TitledPage):
 
 
     def OnItemSelected(self, event):
     def OnItemSelected(self, event):
         """EPSG code selected from the list"""
         """EPSG code selected from the list"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
         item = event.GetItem()
         item = event.GetItem()
 
 
         self.epsgcode = int(self.epsglist.GetItem(index, 0).GetText())
         self.epsgcode = int(self.epsglist.GetItem(index, 0).GetText())
@@ -1925,7 +1932,7 @@ class IAUPage(TitledPage):
 
 
     def OnItemSelected(self, event):
     def OnItemSelected(self, event):
         """IAU code selected from the list"""
         """IAU code selected from the list"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
         item = event.GetItem()
         item = event.GetItem()
 
 
         self.epsgcode = int(self.epsglist.GetItem(index, 0).GetText())
         self.epsgcode = int(self.epsglist.GetItem(index, 0).GetText())