wxGUI: fix 'wxPyDeprecationWarning: Call to deprecated item. Use Find…

…Item instead.' (#1344)
OSGeo · Feb 18, 2021 · 3c8ef8d · 3c8ef8d
1 parent b9e8077
commit 3c8ef8d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/gui/wxpython/gcp/manager.py b/gui/wxpython/gcp/manager.py
@@ -1215,7 +1215,7 @@ def DeleteGCP(self, event):
 
         # update key and GCP number
         for newkey in range(key, len(self.mapcoordlist)):
-            index = self.list.FindItemData(-1, newkey + 1)
+            index = self.list.FindItem(-1, newkey + 1)
             self.mapcoordlist[newkey][0] = newkey
             self.list.SetItem(index, 0, str(newkey))
             self.list.SetItemData(index, newkey)
@@ -2434,7 +2434,7 @@ def OnItemActivated(self, event):
 
     def OnColClick(self, event):
         """ListCtrl forgets selected item..."""
-        self.selected = self.FindItemData(-1, self.selectedkey)
+        self.selected = self.FindItem(-1, self.selectedkey)
         self.SetItemState(self.selected,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED)

diff --git a/gui/wxpython/gcp/statusbar.py b/gui/wxpython/gcp/statusbar.py
@@ -61,7 +61,7 @@ def OnGoToGCP(self, event):
         listCtrl = self.mapFrame.GetListCtrl()
 
         listCtrl.selectedkey = gcpNumber
-        listCtrl.selected = listCtrl.FindItemData(-1, gcpNumber)
+        listCtrl.selected = listCtrl.FindItem(-1, gcpNumber)
         listCtrl.render = False
         listCtrl.SetItemState(listCtrl.selected,
                               wx.LIST_STATE_SELECTED,

diff --git a/gui/wxpython/image2target/ii2t_manager.py b/gui/wxpython/image2target/ii2t_manager.py
@@ -1235,7 +1235,7 @@ def DeleteGCP(self, event):
 
         # update key and GCP number
         for newkey in range(key, len(self.mapcoordlist)):
-            index = self.list.FindItemData(-1, newkey + 1)
+            index = self.list.FindItem(-1, newkey + 1)
             self.mapcoordlist[newkey][0] = newkey
             self.list.SetItem(index, 0, str(newkey))
             self.list.SetItemData(index, newkey)
@@ -2409,7 +2409,7 @@ def OnItemActivated(self, event):
 
     def OnColClick(self, event):
         """ListCtrl forgets selected item..."""
-        self.selected = self.FindItemData(-1, self.selectedkey)
+        self.selected = self.FindItem(-1, self.selectedkey)
         self.SetItemState(self.selected,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED)

diff --git a/gui/wxpython/image2target/ii2t_statusbar.py b/gui/wxpython/image2target/ii2t_statusbar.py
@@ -61,7 +61,7 @@ def OnGoToGCP(self, event):
         listCtrl = self.mapFrame.GetListCtrl()
 
         listCtrl.selectedkey = gcpNumber
-        listCtrl.selected = listCtrl.FindItemData(-1, gcpNumber)
+        listCtrl.selected = listCtrl.FindItem(-1, gcpNumber)
         listCtrl.render = False
         listCtrl.SetItemState(listCtrl.selected,
                               wx.LIST_STATE_SELECTED,

diff --git a/gui/wxpython/photo2image/ip2i_manager.py b/gui/wxpython/photo2image/ip2i_manager.py
@@ -618,7 +618,7 @@ def DeleteGCP(self, event):
 
         # update key and GCP number
         for newkey in range(key, len(self.mapcoordlist)):
-            index = self.list.FindItemData(-1, newkey + 1)
+            index = self.list.FindItem(-1, newkey + 1)
             self.mapcoordlist[newkey][0] = newkey
             self.list.SetItem(index, 0, str(newkey))
             self.list.SetItemData(index, newkey)
@@ -1717,7 +1717,7 @@ def OnItemActivated(self, event):
 
     def OnColClick(self, event):
         """ListCtrl forgets selected item..."""
-        self.selected = self.FindItemData(-1, self.selectedkey)
+        self.selected = self.FindItem(-1, self.selectedkey)
         self.SetItemState(self.selected,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED)

diff --git a/gui/wxpython/photo2image/ip2i_statusbar.py b/gui/wxpython/photo2image/ip2i_statusbar.py
@@ -61,7 +61,7 @@ def OnGoToGCP(self, event):
         listCtrl = self.mapFrame.GetListCtrl()
 
         listCtrl.selectedkey = gcpNumber
-        listCtrl.selected = listCtrl.FindItemData(-1, gcpNumber)
+        listCtrl.selected = listCtrl.FindItem(-1, gcpNumber)
         listCtrl.render = False
         listCtrl.SetItemState(listCtrl.selected,
                               wx.LIST_STATE_SELECTED,

diff --git a/gui/wxpython/vnet/widgets.py b/gui/wxpython/vnet/widgets.py
@@ -301,7 +301,7 @@ def DeleteItem(self):
 
         # update key and point number
         for newkey in range(key, len(self.itemDataMap)):
-            index = self.FindItemData(-1, newkey + 1)
+            index = self.FindItem(-1, newkey + 1)
             self.itemDataMap[newkey][0] = newkey
             self.SetItem(index, 0, str(newkey + 1))
             self.SetItemData(index, newkey)
@@ -416,7 +416,7 @@ def CreateEditDialog(self, data, pointNo):
 
     def OnColClick(self, event):
         """ListCtrl forgets selected item..."""
-        self.selected = self.FindItemData(-1, self.selectedkey)
+        self.selected = self.FindItem(-1, self.selectedkey)
         self.SetItemState(self.selected,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED)