]> git.saurik.com Git - wxWidgets.git/commitdiff
moved custom menu up
authorRoman Rolinsky <rolinsky@femagsoft.com>
Wed, 14 Mar 2007 23:17:48 +0000 (23:17 +0000)
committerRoman Rolinsky <rolinsky@femagsoft.com>
Wed, 14 Mar 2007 23:17:48 +0000 (23:17 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/wx/tools/XRCed/tree.py

index 098ed7f689ae203000663f501a45a6617be7ba70..10169a9a6070ebe8dd12c5ec4ef8f837fc458079 100644 (file)
@@ -848,19 +848,6 @@ class XML_Tree(wx.TreeCtrl):
         testWin = g.testWin
         # Create a window with this resource
         xxx = self.GetPyData(item).treeObject()
-
-        # If frame
-#        if xxx.__class__ == xxxFrame:
-            # Frame can't have many children,
-            # but it's first child possibly can...
-#            child = self.GetFirstChild(item)[0]
-#            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
-#                # Clean-up before recursive call or error
-#                wx.MemoryFSHandler.RemoveFile('xxx.xrc')
-#                wx.EndBusyCursor()
-#                self.CreateTestWin(child)
-#                return
-
         # Close old window, remember where it was
         highLight = None
         if testWin:
@@ -918,6 +905,7 @@ class XML_Tree(wx.TreeCtrl):
         xrc.XmlResource.Set(res)        # set as global
         # Register handlers
         addHandlers()
+        # Same module list
         res.Load('memory:xxx.xrc')
         try:
             if xxx.__class__ == xxxFrame:
@@ -1141,12 +1129,12 @@ class XML_Tree(wx.TreeCtrl):
                         m.Enable(ID_NEW.SPACER, False)
                     if xxx.__class__ is not xxxFrame:
                         m.Enable(ID_NEW.MENU_BAR, False)
-                m.AppendSeparator()
-                m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node')
-                m.Append(ID_NEW.COMMENT, 'comment', 'Create comment node')
                 # Add custom controls menu
                 if pullDownMenu.customMap:
                     SetMenu(m, pullDownMenu.custom)
+                m.AppendSeparator()
+                m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node')
+                m.Append(ID_NEW.COMMENT, 'comment', 'Create comment node')
             # Select correct label for create menu
             if not needInsert:
                 if self.shift: