Use self.GetCanvas() instead of just self.GetCanvas

[wxWidgets.git] / wxPython / wx / tools / XRCed / tree.py

diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py
index 597c56a345daa76461518f16db3831bc2530dfe0..de22265b1a66003acdb7a52fdf9605f414614683 100644 (file)
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -298,6 +298,7 @@ class PullDownMenu:
              (ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'),
              (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
              (ID_NEW.STATUS_BAR, 'StatusBar', 'Create status bar'),
              (ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'),
              (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
              (ID_NEW.STATUS_BAR, 'StatusBar', 'Create status bar'),

+             (ID_NEW.MENU_BAR, 'MenuBar', 'Create menubar'),

 #             (ID_NEW.WIZARD_PAGE, 'Wizard Page', 'Create wizard page'),
              (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'),
              ],
 #             (ID_NEW.WIZARD_PAGE, 'Wizard Page', 'Create wizard page'),
              (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'),
              ],


@@ -441,7 +442,7 @@ class XML_Tree(wxTreeCtrl):
         EVT_TREE_ITEM_COLLAPSED(self, self.GetId(), self.OnItemExpandedCollapsed)
 
         self.selection = None
         EVT_TREE_ITEM_COLLAPSED(self, self.GetId(), self.OnItemExpandedCollapsed)
 
         self.selection = None

-       self.selectionChanging = False
+        self.selectionChanging = False

         self.needUpdate = False
         self.pendingHighLight = None
         self.ctrl = self.shift = False
         self.needUpdate = False
         self.pendingHighLight = None
         self.ctrl = self.shift = False


@@ -653,9 +654,9 @@ class XML_Tree(wxTreeCtrl):
         # Top-level sizer? return window's sizer
         if xxx.isSizer and isinstance(parentWin, wxWindow):
             return parentWin.GetSizer()
         # Top-level sizer? return window's sizer
         if xxx.isSizer and isinstance(parentWin, wxWindow):
             return parentWin.GetSizer()

-        elif isinstance(xxx, xxxStatusBar):  return None
-        elif isinstance(xxx, xxxToolBar):
-            # If it's the main toolbar, we can't really select it
+        elif xxx.__class__ in [xxxStatusBar, xxxMenu, xxxMenuItem, xxxSeparator]:  return None
+        elif xxx.__class__ in [xxxToolBar, xxxMenuBar]:
+            # If it's the main toolbar or menubar, we can't really select it

             if xxx.parent.__class__ == xxxFrame:  return None
         elif isinstance(xxx.parent, xxxToolBar):
             # Select complete toolbar
             if xxx.parent.__class__ == xxxFrame:  return None
         elif isinstance(xxx.parent, xxxToolBar):
             # Select complete toolbar


@@ -683,10 +684,10 @@ class XML_Tree(wxTreeCtrl):
 
     def OnSelChanged(self, evt):
         if self.selectionChanging: return
 
     def OnSelChanged(self, evt):
         if self.selectionChanging: return

-       self.selectionChanging = True
+        self.selectionChanging = True

         self.UnselectAll()
         self.SelectItem(evt.GetItem())
         self.UnselectAll()
         self.SelectItem(evt.GetItem())

-       self.selectionChanging = False
+        self.selectionChanging = False

 
     def ChangeSelection(self, item):
         # Apply changes
 
     def ChangeSelection(self, item):
         # Apply changes


@@ -1070,6 +1071,8 @@ class XML_Tree(wxTreeCtrl):
                         m.Enable(m.FindItem('sizer'), False)
                     elif not (xxx.isSizer or xxx.parent and xxx.parent.isSizer):
                         m.Enable(ID_NEW.SPACER, False)
                         m.Enable(m.FindItem('sizer'), False)
                     elif not (xxx.isSizer or xxx.parent and xxx.parent.isSizer):
                         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')
             # Select correct label for create menu
                 m.AppendSeparator()
                 m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node')
             # Select correct label for create menu