[GRASS-SVN] r73972 - grass/trunk/gui/wxpython/location_wizard

[svn_grass at osgeo.org]

Author: annakrat
Date: 2019-01-17 20:14:50 -0800 (Thu, 17 Jan 2019)
New Revision: 73972

Modified:
   grass/trunk/gui/wxpython/location_wizard/wizard.py
Log:
fixes for python3 and wxPython4

Modified: grass/trunk/gui/wxpython/location_wizard/wizard.py
===================================================================
--- grass/trunk/gui/wxpython/location_wizard/wizard.py	2019-01-17 22:01:13 UTC (rev 73971)
+++ grass/trunk/gui/wxpython/location_wizard/wizard.py	2019-01-18 04:14:50 UTC (rev 73972)
@@ -568,7 +568,7 @@
 
     def OnItemSelected(self, event):
         """Projection selected"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
 
         # set values
         self.proj = self.projlist.GetItem(index, 0).GetText().lower()
@@ -654,7 +654,7 @@
             self.sourceData = data
 
         try:
-            data.sort()
+            data = sorted(data)
             self.DeleteAllItems()
             row = 0
             for value in data:
@@ -702,6 +702,9 @@
         s = str(self.itemDataMap[index][col])
         return s
 
+    def OnGetItemImage(self, item):
+        return -1
+
     def OnGetItemAttr(self, item):
         """Get item attributes"""
         index = self.itemIndexMap[item]
@@ -713,7 +716,11 @@
     def SortItems(self, sorter=cmp):
         """Sort items"""
         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
 
         # redraw the list
@@ -1149,7 +1156,7 @@
 
     def OnDatumSelected(self, event):
         """Datum selected"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
         item = event.GetItem()
 
         self.datum = self.datumlist.GetItem(index, 0).GetText()
@@ -1309,7 +1316,7 @@
 
     def OnItemSelected(self, event):
         """Ellipsoid selected"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
         item = event.GetItem()
 
         self.ellipse = self.ellipselist.GetItem(index, 0).GetText()
@@ -1680,7 +1687,7 @@
 
     def OnItemSelected(self, event):
         """EPSG code selected from the list"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
         item = event.GetItem()
 
         self.epsgcode = int(self.epsglist.GetItem(index, 0).GetText())
@@ -1925,7 +1932,7 @@
 
     def OnItemSelected(self, event):
         """IAU code selected from the list"""
-        index = event.m_itemIndex
+        index = event.GetIndex()
         item = event.GetItem()
 
         self.epsgcode = int(self.epsglist.GetItem(index, 0).GetText())