wx: Fixed deprecation warnings/errors

- Warnings/Errors associated with LevelEditor.

direct/src/leveleditor/LevelEditor.py

@@ -31,7 +31,7 @@ class LevelEditor(LevelEditorBase):
 
         # Populating uderlined data-structures
         self.ui = LevelEditorUI(self)
-        self.ui.SetCursor(wx.StockCursor(wx.CURSOR_WAIT))
+        self.ui.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
         self.objectPalette.populate()
         self.protoPalette.populate()
 
@@ -42,4 +42,4 @@ class LevelEditor(LevelEditorBase):
         # When you define your own LevelEditor class inheriting LevelEditorBase
         # you should call self.initialize() at the end of __init__() function
         self.initialize()
-        self.ui.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
+        self.ui.SetCursor(wx.Cursor(wx.CURSOR_ARROW))

direct/src/leveleditor/LevelEditorBase.py

@@ -305,7 +305,7 @@ class LevelEditorBase(DirectObject):
         if self.settingsFile is None:
             return
 
-        self.ui.SetCursor(wx.StockCursor(wx.CURSOR_WAIT))
+        self.ui.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
         try:
             f = open(self.settingsFile, 'r')
             configLines = f.readlines()
@@ -342,7 +342,7 @@ class LevelEditorBase(DirectObject):
             self.ui.updateMenu()
         except:
             pass
-        self.ui.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
+        self.ui.SetCursor(wx.Cursor(wx.CURSOR_ARROW))
 
     def convertMaya(self, modelname, callBack, obj=None, isAnim=False):
         if obj and isAnim:

direct/src/leveleditor/LevelEditorUIBase.py

@@ -478,7 +478,7 @@ class LevelEditorUIBase(WxPandaShell):
         self.editor.reset()
 
     def onOpen(self, evt=None):
-        dialog = wx.FileDialog(None, "Choose a file", os.getcwd(), "", "*.py", wx.OPEN)
+        dialog = wx.FileDialog(None, "Choose a file", os.getcwd(), "", "*.py", style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
         if dialog.ShowModal() == wx.ID_OK:
             self.editor.load(dialog.GetPath())
             self.editor.setTitleWithFilename(dialog.GetPath())
@@ -492,7 +492,7 @@ class LevelEditorUIBase(WxPandaShell):
             self.editor.save()
 
     def onSaveAs(self, evt):
-        dialog = wx.FileDialog(None, "Choose a file", os.getcwd(), "", "*.py", wx.SAVE)
+        dialog = wx.FileDialog(None, "Choose a file", os.getcwd(), "", "*.py", style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
         result = True
         if dialog.ShowModal() == wx.ID_OK:
             self.editor.saveAs(dialog.GetPath())
@@ -503,7 +503,7 @@ class LevelEditorUIBase(WxPandaShell):
         return result
 
     def onExportToMaya(self, evt):
-        dialog = wx.FileDialog(None, "Choose a file", os.getcwd(), "", "*.mb", wx.SAVE)
+        dialog = wx.FileDialog(None, "Choose a file", os.getcwd(), "", "*.mb", style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
         if dialog.ShowModal() == wx.ID_OK:
             self.editor.exportToMaya(dialog.GetPath())
         dialog.Destroy()

direct/src/leveleditor/ObjectPaletteUI.py

@@ -69,4 +69,4 @@ class ObjectPaletteUI(wx.Panel):
         return cmp(index1, index2)
 
     def getSelected(self):
-        return self.tree.GetItemPyData(self.tree.GetSelection())
+        return self.tree.GetItemData(self.tree.GetSelection())

direct/src/leveleditor/PaletteTreeCtrl.py

@@ -41,7 +41,7 @@ class PaletteTreeCtrl(wx.TreeCtrl):
                roots.append(key)
         for root in roots:
             newItem = self.AppendItem(parentItem, root)
-            self.SetItemPyData(newItem, root)
+            self.SetItemData(newItem, root)
             rootItems.append(newItem)
             itemKeys.remove(root)
         for rootItem in rootItems:
@@ -108,7 +108,7 @@ class PaletteTreeCtrl(wx.TreeCtrl):
         item, cookie = self.GetFirstChild(parent)
         while item:
            itemName = self.GetItemText(item)
-           itemData = self.GetItemPyData(item)
+           itemData = self.GetItemData(item)
 
            newItem = self.AppendItem(newParent, itemName)
            self.SetItemPyData(newItem, itemData)

direct/src/leveleditor/ProtoPaletteUI.py

@@ -6,10 +6,10 @@ import os
 from panda3d.core import *
 from .PaletteTreeCtrl import *
 
-class UniversalDropTarget(wx.PyDropTarget):
+class UniversalDropTarget(wx.DropTarget):
    """Implements drop target functionality to receive files, bitmaps and text"""
    def __init__(self, editor):
-       wx.PyDropTarget.__init__(self)
+       wx.DropTarget.__init__(self)
        self.editor = editor
        self.do = wx.DataObjectComposite()  # the dataobject that gets filled with the appropriate data
        self.filedo = wx.FileDataObject()

direct/src/leveleditor/SceneGraphUIBase.py

@@ -26,7 +26,7 @@ class SceneGraphUIBase(wx.Panel):
                   size=wx.DefaultSize, style=wx.TR_MULTIPLE|wx.TR_DEFAULT_STYLE,
                   validator=wx.DefaultValidator, name="treeCtrl")
         self.root = self.tree.AddRoot('render')
-        self.tree.SetItemPyData(self.root, "render")
+        self.tree.SetItemData(self.root, "render")
 
         self.shouldShowPandaObjChildren = False
 
@@ -61,7 +61,7 @@ class SceneGraphUIBase(wx.Panel):
             self.tree.Delete(item)
 
     def traversePandaObjects(self, parent, objNodePath):
-        itemId = self.tree.GetItemPyData(parent)
+        itemId = self.tree.GetItemData(parent)
         i = 0
         for child in objNodePath.getChildren():
             if child.hasTag('OBJRoot'):
@@ -78,7 +78,7 @@ class SceneGraphUIBase(wx.Panel):
 
     def addPandaObjectChildren(self, parent):
         # first, find Panda Object's NodePath of the item
-        itemId = self.tree.GetItemPyData(parent)
+        itemId = self.tree.GetItemData(parent)
         if itemId == "render":
            return
         obj = self.editor.objectMgr.findObjectById(itemId)
@@ -96,7 +96,7 @@ class SceneGraphUIBase(wx.Panel):
 
     def removePandaObjectChildren(self, parent):
         # first, find Panda Object's NodePath of the item
-        itemId = self.tree.GetItemPyData(parent)
+        itemId = self.tree.GetItemData(parent)
         if itemId == "render":
            return
         obj = self.editor.objectMgr.findObjectById(itemId)
@@ -142,14 +142,14 @@ class SceneGraphUIBase(wx.Panel):
 
     def traverse(self, parent, itemId):
         # prevent from traversing into self
-        if itemId == self.tree.GetItemPyData(parent):
+        if itemId == self.tree.GetItemData(parent):
            return None
 
         # main loop - serching for an item with an itemId
         item, cookie = self.tree.GetFirstChild(parent)
         while item:
               # if the item was found - return it
-              if itemId == self.tree.GetItemPyData(item):
+              if itemId == self.tree.GetItemData(item):
                  return item
 
               # the tem was not found - checking if it has children
@@ -168,7 +168,7 @@ class SceneGraphUIBase(wx.Panel):
         item, cookie = self.tree.GetFirstChild(parent)
         while item:
            data = self.tree.GetItemText(item)
-           itemId = self.tree.GetItemPyData(item)
+           itemId = self.tree.GetItemData(item)
            newItem = self.tree.AppendItem(newParent, data)
            self.tree.SetItemPyData(newItem, itemId)
 
@@ -186,13 +186,13 @@ class SceneGraphUIBase(wx.Panel):
     def reParent(self, oldParent, newParent, child):
         if newParent is None:
            newParent = self.root
-        itemId = self.tree.GetItemPyData(oldParent)
+        itemId = self.tree.GetItemData(oldParent)
         newItem = self.tree.AppendItem(newParent, child)
         self.tree.SetItemPyData(newItem, itemId)
         self.reParentTree(oldParent, newItem)
 
         obj = self.editor.objectMgr.findObjectById(itemId)
-        itemId = self.tree.GetItemPyData(newParent)
+        itemId = self.tree.GetItemData(newParent)
         if itemId != "render":
           newParentObj = self.editor.objectMgr.findObjectById(itemId)
           self.reParentData(newParentObj[OG.OBJ_NP], obj[OG.OBJ_NP])
@@ -207,7 +207,7 @@ class SceneGraphUIBase(wx.Panel):
            self.addPandaObjectChildren(newpParent)
 
     def isChildOrGrandChild(self, parent, child):
-        childId = self.tree.GetItemPyData(child)
+        childId = self.tree.GetItemData(child)
         return self.traverse(parent, childId)
 
     def changeHierarchy(self, data, x, y):
@@ -226,7 +226,7 @@ class SceneGraphUIBase(wx.Panel):
               return
 
            # undo function setup...
-           action = ActionChangeHierarchy(self.editor, self.tree.GetItemPyData(self.tree.GetItemParent(item)), self.tree.GetItemPyData(item), self.tree.GetItemPyData(dragToItem), data)
+           action = ActionChangeHierarchy(self.editor, self.tree.GetItemData(self.tree.GetItemParent(item)), self.tree.GetItemData(item), self.tree.GetItemData(dragToItem), data)
            self.editor.actionMgr.push(action)
            action()
 
@@ -283,7 +283,7 @@ class SceneGraphUIBase(wx.Panel):
     def onSelected(self, event):
         item = event.GetItem();
         if item:
-           itemId = self.tree.GetItemPyData(item)
+           itemId = self.tree.GetItemData(item)
            if itemId:
               obj = self.editor.objectMgr.findObjectById(itemId);
               if obj:
@@ -313,7 +313,7 @@ class SceneGraphUIBase(wx.Panel):
         if not item.IsOk():
             return
         self.currItem = item
-        itemId = self.tree.GetItemPyData(item)
+        itemId = self.tree.GetItemData(item)
         if not itemId:
             return
         self.currObj = self.editor.objectMgr.findObjectById(itemId);

direct/src/showbase/ShowBase.py

@@ -2926,7 +2926,7 @@ class ShowBase(DirectObject.DirectObject):
 
         if not self.wxApp:
             # Create a new base.wxApp.
-            self.wxApp = wx.PySimpleApp(redirect = False)
+            self.wxApp = wx.App(redirect = False)
 
         if ConfigVariableBool('wx-main-loop', True):
             # Put wxPython in charge of the main loop.  It really

direct/src/wxwidgets/WxPandaShell.py

@@ -202,15 +202,15 @@ class WxPandaShell(WxAppShell):
         """A step in the WX event loop. You can either call this yourself or use as task."""
         while self.evtLoop.Pending():
           self.evtLoop.Dispatch()
-        self.wxApp.ProcessIdle()
+        self.evtLoop.ProcessIdle()
         if task != None: return task.cont
 
     def appInit(self):
         """Overridden from WxAppShell.py."""
         # Create a new event loop (to overide default wxEventLoop)
-        self.evtLoop = wx.EventLoop()
-        self.oldLoop = wx.EventLoop.GetActive()
-        wx.EventLoop.SetActive(self.evtLoop)
+        self.evtLoop = wx.GUIEventLoop()
+        self.oldLoop = wx.GUIEventLoop.GetActive()
+        wx.GUIEventLoop.SetActive(self.evtLoop)
         taskMgr.add(self.wxStep, "evtLoopTask")
 
     def onViewChange(self, evt, viewIdx):