X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68ae5821b6b27a9aef780619aa31851cf4f3616f..b41b09e28513f8b30065914eeb1051a0a32e6e1b:/wxPython/wx/tools/XRCed/tools.py diff --git a/wxPython/wx/tools/XRCed/tools.py b/wxPython/wx/tools/XRCed/tools.py index d6264f22aa..00f7103b1e 100644 --- a/wxPython/wx/tools/XRCed/tools.py +++ b/wxPython/wx/tools/XRCed/tools.py @@ -15,7 +15,7 @@ GROUPNUM = 4 GROUP_WINDOWS, GROUP_MENUS, GROUP_SIZERS, GROUP_CONTROLS = range(GROUPNUM) # States depending on current selection and Control/Shift keys -STATE_ROOT, STATE_MENUBAR, STATE_TOOLBAR, STATE_MENU, STATE_ELSE = range(5) +STATE_ROOT, STATE_MENUBAR, STATE_TOOLBAR, STATE_MENU, STATE_STDDLGBTN, STATE_ELSE = range(6) # Left toolbar for GUI elements class Tools(wxPanel): @@ -210,6 +210,8 @@ class Tools(wxPanel): state = STATE_TOOLBAR elif xxx.__class__ in [xxxMenu, xxxMenuItem]: state = STATE_MENU + elif xxx.__class__ == xxxStdDialogButtonSizer: + state = STATE_STDDLGBTN else: state = STATE_ELSE @@ -228,6 +230,8 @@ class Tools(wxPanel): ID_NEW.MENU_ITEM, ID_NEW.SEPARATOR ], False) + elif state == STATE_STDDLGBTN: + pass # nothing can be added from toolbar elif state == STATE_MENUBAR: self.EnableGroup(GROUP_MENUS) self.EnableGroupItems(GROUP_MENUS, @@ -273,9 +277,9 @@ class Tools(wxPanel): False) self.EnableGroup(GROUP_SIZERS) self.EnableGroup(GROUP_CONTROLS) - # Special case for notebook (always executed) + # Special case for *book (always executed) if state == STATE_ELSE: - if xxx.__class__ == xxxNotebook: + if xxx.__class__ in [xxxNotebook, xxxChoicebook, xxxListbook]: self.EnableGroup(GROUP_SIZERS, False) else: self.EnableGroup(GROUP_SIZERS)