X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2458faeb60f3d66a1fa462924eb3af59104a6cfc..9c6e3c57143f79eb8b384f0f097f3934e86efb26:/wxPython/wx/tools/XRCed/tree.py diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py index 77a86720de..de22265b1a 100644 --- 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.MENU_BAR, 'MenuBar', 'Create menubar'), # (ID_NEW.WIZARD_PAGE, 'Wizard Page', 'Create wizard page'), (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'), ], @@ -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() - 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 @@ -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) + 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