X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2481bf3cb684141768951d987a5adce365735051..92218ce60024b07e9ae5a5790a85582db083e55c:/wxPython/wx/tools/XRCed/tree.py diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py index 06e43c5d00..0a4d4d0638 100644 --- a/wxPython/wx/tools/XRCed/tree.py +++ b/wxPython/wx/tools/XRCed/tree.py @@ -6,6 +6,7 @@ from xxx import * # xxx imports globals and params import types +import traceback # Constant to define standart window name STD_NAME = '_XRCED_T_W' @@ -18,7 +19,15 @@ class MemoryFile: self.name = name self.buffer = '' def write(self, data): - self.buffer += data.encode() + if g.currentEncoding: + encoding = g.currentEncoding + else: + encoding = wxGetDefaultPyEncoding() + try: + self.buffer += data.encode(encoding) + except UnicodeEncodeError: + self.buffer += data.encode(encoding, 'xmlcharrefreplace') + def close(self): wxMemoryFSHandler_AddFile(self.name, self.buffer) @@ -55,6 +64,7 @@ class ID_NEW: BITMAP_BUTTON = wxNewId() RADIO_BUTTON = wxNewId() SPIN_BUTTON = wxNewId() + TOGGLE_BUTTON = wxNewId() STATIC_BOX = wxNewId() CHECK_BOX = wxNewId() @@ -72,29 +82,50 @@ class ID_NEW: LIST_CTRL = wxNewId() CHECK_LIST = wxNewId() NOTEBOOK = wxNewId() + SPLITTER_WINDOW = wxNewId() SCROLLED_WINDOW = wxNewId() HTML_WINDOW = wxNewId() CALENDAR_CTRL = wxNewId() GENERIC_DIR_CTRL = wxNewId() SPIN_CTRL = wxNewId() UNKNOWN = wxNewId() + WIZARD = wxNewId() + WIZARD_PAGE = wxNewId() + WIZARD_PAGE_SIMPLE = wxNewId() + STATUS_BAR = wxNewId() BOX_SIZER = wxNewId() STATIC_BOX_SIZER = wxNewId() GRID_SIZER = wxNewId() FLEX_GRID_SIZER = wxNewId() + GRID_BAG_SIZER = wxNewId() + STD_DIALOG_BUTTON_SIZER = wxNewId() SPACER = wxNewId() + TOOL_BAR = wxNewId() TOOL = wxNewId() MENU = wxNewId() MENU_ITEM = wxNewId() SEPARATOR = wxNewId() + + OK_BUTTON = wxNewId() + YES_BUTTON = wxNewId() + SAVE_BUTTON = wxNewId() + APPLY_BUTTON = wxNewId() + NO_BUTTON = wxNewId() + CANCEL_BUTTON = wxNewId() + HELP_BUTTON = wxNewId() + CONTEXT_HELP_BUTTON = wxNewId() + LAST = wxNewId() + + class PullDownMenu: ID_EXPAND = wxNewId() ID_COLLAPSE = wxNewId() ID_PASTE_SIBLING = wxNewId() + ID_TOOL_PASTE = wxNewId() ID_SUBCLASS = wxNewId() def __init__(self, parent): @@ -113,6 +144,9 @@ class PullDownMenu: ID_NEW.PANEL: 'wxPanel', ID_NEW.DIALOG: 'wxDialog', ID_NEW.FRAME: 'wxFrame', + ID_NEW.WIZARD: 'wxWizard', + ID_NEW.WIZARD_PAGE: 'wxWizardPage', + ID_NEW.WIZARD_PAGE_SIMPLE: 'wxWizardPageSimple', ID_NEW.TOOL_BAR: 'wxToolBar', ID_NEW.TOOL: 'tool', ID_NEW.MENU_BAR: 'wxMenuBar', @@ -127,6 +161,7 @@ class PullDownMenu: ID_NEW.BITMAP_BUTTON: 'wxBitmapButton', ID_NEW.RADIO_BUTTON: 'wxRadioButton', ID_NEW.SPIN_BUTTON: 'wxSpinButton', + ID_NEW.TOGGLE_BUTTON: 'wxToggleButton', ID_NEW.STATIC_BOX: 'wxStaticBox', ID_NEW.CHECK_BOX: 'wxCheckBox', @@ -142,8 +177,9 @@ class PullDownMenu: ID_NEW.SCROLL_BAR: 'wxScrollBar', ID_NEW.TREE_CTRL: 'wxTreeCtrl', ID_NEW.LIST_CTRL: 'wxListCtrl', - ID_NEW.CHECK_LIST: 'wxCheckList', + ID_NEW.CHECK_LIST: 'wxCheckListBox', ID_NEW.NOTEBOOK: 'wxNotebook', + ID_NEW.SPLITTER_WINDOW: 'wxSplitterWindow', ID_NEW.SCROLLED_WINDOW: 'wxScrolledWindow', ID_NEW.HTML_WINDOW: 'wxHtmlWindow', ID_NEW.CALENDAR_CTRL: 'wxCalendarCtrl', @@ -154,13 +190,25 @@ class PullDownMenu: ID_NEW.STATIC_BOX_SIZER: 'wxStaticBoxSizer', ID_NEW.GRID_SIZER: 'wxGridSizer', ID_NEW.FLEX_GRID_SIZER: 'wxFlexGridSizer', + ID_NEW.GRID_BAG_SIZER: 'wxGridBagSizer', + ID_NEW.STD_DIALOG_BUTTON_SIZER: 'wxStdDialogButtonSizer', ID_NEW.SPACER: 'spacer', ID_NEW.UNKNOWN: 'unknown', + + ID_NEW.OK_BUTTON: 'wxButton', + ID_NEW.YES_BUTTON: 'wxButton', + ID_NEW.SAVE_BUTTON: 'wxButton', + ID_NEW.APPLY_BUTTON: 'wxButton', + ID_NEW.NO_BUTTON: 'wxButton', + ID_NEW.CANCEL_BUTTON: 'wxButton', + ID_NEW.HELP_BUTTON: 'wxButton', + ID_NEW.CONTEXT_HELP_BUTTON: 'wxButton', } self.topLevel = [ (ID_NEW.PANEL, 'Panel', 'Create panel'), (ID_NEW.DIALOG, 'Dialog', 'Create dialog'), (ID_NEW.FRAME, 'Frame', 'Create frame'), + (ID_NEW.WIZARD, 'Wizard', 'Create wizard'), None, (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'), (ID_NEW.MENU_BAR, 'MenuBar', 'Create menubar'), @@ -169,7 +217,10 @@ class PullDownMenu: self.containers = [ (ID_NEW.PANEL, 'Panel', 'Create panel'), (ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'), + (ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'), (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'), +# (ID_NEW.WIZARD_PAGE, 'WizardPage', 'Create wizard page'), + (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'), ] self.sizers = [ (ID_NEW.BOX_SIZER, 'BoxSizer', 'Create box sizer'), @@ -178,6 +229,10 @@ class PullDownMenu: (ID_NEW.GRID_SIZER, 'GridSizer', 'Create grid sizer'), (ID_NEW.FLEX_GRID_SIZER, 'FlexGridSizer', 'Create flexgrid sizer'), + (ID_NEW.GRID_BAG_SIZER, 'GridBagSizer', + 'Create gridbag sizer'), +# (ID_NEW.STD_DIALOG_BUTTON_SIZER, 'StdDialogButtonSizer', +# 'Create standard button sizer'), (ID_NEW.SPACER, 'Spacer', 'Create spacer'), ] self.controls = [ @@ -205,6 +260,7 @@ class PullDownMenu: (ID_NEW.BITMAP_BUTTON, 'BitmapButton', 'Create bitmap button'), (ID_NEW.RADIO_BUTTON, 'RadioButton', 'Create radio button'), (ID_NEW.SPIN_BUTTON, 'SpinButton', 'Create spin button'), + (ID_NEW.TOGGLE_BUTTON, 'ToggleButton', 'Create toggle button'), ], ['box', 'Boxes', (ID_NEW.STATIC_BOX, 'StaticBox', 'Create static box'), @@ -216,7 +272,10 @@ class PullDownMenu: ['container', 'Containers', (ID_NEW.PANEL, 'Panel', 'Create panel'), (ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'), + (ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'), (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'), +# (ID_NEW.WIZARD_PAGE, 'Wizard Page', 'Create wizard page'), + (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'), ], ['sizer', 'Sizers', (ID_NEW.BOX_SIZER, 'BoxSizer', 'Create box sizer'), @@ -225,7 +284,11 @@ class PullDownMenu: (ID_NEW.GRID_SIZER, 'GridSizer', 'Create grid sizer'), (ID_NEW.FLEX_GRID_SIZER, 'FlexGridSizer', 'Create flexgrid sizer'), + (ID_NEW.GRID_BAG_SIZER, 'GridBagSizer', + 'Create gridbag sizer'), (ID_NEW.SPACER, 'Spacer', 'Create spacer'), + (ID_NEW.STD_DIALOG_BUTTON_SIZER, 'StdDialogButtonSizer', + 'Create standard button sizer'), ] ] self.menuControls = [ @@ -262,33 +325,45 @@ class PullDownMenu: (ID_NEW.LIST_BOX, 'ListBox', 'Create list box'), ], ] + self.stdButtons = [ + (ID_NEW.OK_BUTTON, 'OK Button', 'Create standard button'), + (ID_NEW.YES_BUTTON, 'YES Button', 'Create standard button'), + (ID_NEW.SAVE_BUTTON, 'SAVE Button', 'Create standard button'), + (ID_NEW.APPLY_BUTTON, 'APPLY Button', 'Create standard button'), + (ID_NEW.NO_BUTTON, 'NO Button', 'Create standard button'), + (ID_NEW.CANCEL_BUTTON, 'CANCEL Button', 'Create standard button'), + (ID_NEW.HELP_BUTTON, 'HELP Button', 'Create standard button'), + (ID_NEW.CONTEXT_HELP_BUTTON, 'CONTEXT HELP Button', 'Create standard button'), + ] + self.stdButtonIDs = { + ID_NEW.OK_BUTTON: ('wxID_OK', '&Ok'), + ID_NEW.YES_BUTTON: ('wxID_YES', '&Yes'), + ID_NEW.SAVE_BUTTON: ('wxID_SAVE', '&Save'), + ID_NEW.APPLY_BUTTON: ('wxID_APPLY', '&Apply'), + ID_NEW.NO_BUTTON: ('wxID_NO', '&No'), + ID_NEW.CANCEL_BUTTON: ('wxID_CANCEL', '&Cancel'), + ID_NEW.HELP_BUTTON: ('wxID_HELP', '&Help'), + ID_NEW.CONTEXT_HELP_BUTTON: ('wxID_CONTEXT_HELP', '&Help'), + } + + ################################################################################ # Set menu to list items. # Each menu command is a tuple (id, label, help) # submenus are lists [id, label, help, submenu] -# and separators are any other type -def SetMenu(m, list): - for l in list: - if type(l) == types.TupleType: - apply(m.Append, l) - elif type(l) == types.ListType: - subMenu = wxMenu() - SetMenu(subMenu, l[2:]) - m.AppendMenu(wxNewId(), l[0], subMenu, l[1]) - else: # separator - m.AppendSeparator() -# Same, but adds 1000 to all IDs -def SetMenu2(m, list): +# and separators are any other type. Shift is for making +# alternative sets of IDs. (+1000). +def SetMenu(m, list, shift=False): for l in list: if type(l) == types.TupleType: # Shift ID - l = (1000 + l[0],) + l[1:] + if shift: l = (1000 + l[0],) + l[1:] apply(m.Append, l) elif type(l) == types.ListType: subMenu = wxMenu() - SetMenu2(subMenu, l[2:]) + SetMenu(subMenu, l[2:]) m.AppendMenu(wxNewId(), l[0], subMenu, l[1]) else: # separator m.AppendSeparator() @@ -321,6 +396,8 @@ class HighLightBox: def Remove(self): map(wxWindow.Destroy, self.lines) g.testWin.highLight = None + def Refresh(self): + map(wxWindow.Refresh, self.lines) ################################################################################ @@ -498,24 +575,32 @@ class XML_Tree(wxTreeCtrl): self.selection = None return node # Find position relative to the top-level window - def FindNodePos(self, item): + def FindNodePos(self, item, obj=None): # Root at (0,0) if item == g.testWin.item: return wxPoint(0, 0) itemParent = self.GetItemParent(item) # Select NB page - obj = self.FindNodeObject(item) + if not obj: obj = self.FindNodeObject(item) if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook: notebook = self.FindNodeObject(itemParent) # Find position for i in range(notebook.GetPageCount()): if notebook.GetPage(i) == obj: - if notebook.GetSelection() != i: notebook.SetSelection(i) + if notebook.GetSelection() != i: + notebook.SetSelection(i) + # Remove highlight - otherwise highlight window won't be visible + if g.testWin.highLight: + g.testWin.highLight.Remove() break # Find first ancestor which is a wxWindow (not a sizer) winParent = itemParent while self.GetPyData(winParent).isSizer: winParent = self.GetItemParent(winParent) - parentPos = self.FindNodePos(winParent) + # Notebook children are layed out in a little strange way + if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook: + parentPos = wxPoint(0,0) + else: + parentPos = self.FindNodePos(winParent) # Position (-1,-1) is really (0,0) pos = obj.GetPosition() if pos == (-1,-1): pos = (0,0) @@ -532,6 +617,15 @@ class XML_Tree(wxTreeCtrl): # Top-level sizer? return window's sizer if xxx.isSizer and isinstance(parentWin, wxWindow): return parentWin.GetSizer() + elif isinstance(xxx.parent, xxxToolBar): + # How to get tool from toolbar? + return parentWin.GetChildren()[0] + elif isinstance(xxx.parent, xxxStdDialogButtonSizer): + # This sizer returns non-existing children + for ch in parentWin.GetChildren(): + if ch.GetWindow() and ch.GetWindow().GetName() == xxx.name: + return ch.GetWindow() + return None # Otherwise get parent's object and it's child child = parentWin.GetChildren()[self.ItemIndex(item)] # Return window or sizer for sizer items @@ -545,6 +639,9 @@ class XML_Tree(wxTreeCtrl): return child def OnSelChanged(self, evt): + self.ChangeSelection(evt.GetItem()) + + def ChangeSelection(self, item): # Apply changes # !!! problem with wxGTK - GetOldItem is Ok if nothing selected #oldItem = evt.GetOldItem() @@ -563,7 +660,7 @@ class XML_Tree(wxTreeCtrl): status = 'Changes were applied' g.frame.SetStatusText(status) # Generate view - self.selection = evt.GetItem() + self.selection = item if not self.selection.IsOk(): self.selection = None return @@ -572,7 +669,7 @@ class XML_Tree(wxTreeCtrl): g.panel.SetData(xxx) # Update tools g.tools.UpdateUI() - # Hightlighting is done in OnIdle + # Highlighting is done in OnIdle self.pendingHighLight = self.selection # Check if item is in testWin subtree @@ -595,14 +692,17 @@ class XML_Tree(wxTreeCtrl): if g.testWin.highLight: g.testWin.highLight.Remove() return # Get window/sizer object - obj, pos = self.FindNodeObject(item), self.FindNodePos(item) + obj = self.FindNodeObject(item) + if not obj: return + pos = self.FindNodePos(item, obj) size = obj.GetSize() # Highlight - # Nagative positions are not working wuite well + # Negative positions are not working quite well if g.testWin.highLight: g.testWin.highLight.Replace(pos, size) else: g.testWin.highLight = HighLightBox(pos, size) + g.testWin.highLight.Refresh() g.testWin.highLight.item = item def ShowTestWindow(self, item): @@ -611,14 +711,15 @@ class XML_Tree(wxTreeCtrl): self.Apply(xxx, item) # apply changes treeObj = xxx.treeObject() if treeObj.className not in ['wxFrame', 'wxPanel', 'wxDialog', - 'wxMenuBar', 'wxToolBar']: + 'wxMenuBar', 'wxToolBar', 'wxWizard', + 'wxWizardPageSimple']: wxLogMessage('No view for this element (yet)') return # Show item in bold if g.testWin: # Reset old self.SetItemBold(g.testWin.item, False) self.CreateTestWin(item) - # Maybe an error occured, so we need to test + # Maybe an error occurred, so we need to test if g.testWin: self.SetItemBold(g.testWin.item) # Double-click on Linux @@ -699,6 +800,10 @@ class XML_Tree(wxTreeCtrl): else: name = xxx.name elem.setAttribute('name', STD_NAME) + # Replace wizard page class temporarily + if xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]: + oldCl = elem.getAttribute('class') + elem.setAttribute('class', 'wxPanel') parent = elem.parentNode next = elem.nextSibling parent.replaceChild(self.dummyNode, elem) @@ -714,82 +819,125 @@ class XML_Tree(wxTreeCtrl): elem.removeAttribute('name') else: elem.setAttribute('name', xxx.name) + if xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]: + elem.setAttribute('class', oldCl) memFile.close() # write to wxMemoryFS xmlFlags = wxXRC_NO_SUBCLASSING # Use translations if encoding is not specified - if g.currentEncoding == 'ascii': + if not g.currentEncoding: xmlFlags != wxXRC_USE_LOCALE res = wxXmlResource('', xmlFlags) res.Load('memory:xxx.xrc') - 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 -# wxMemoryFSHandler_RemoveFile('xxx.xrc') -# wxEndBusyCursor() -# self.CreateTestWin(child) -# return - # This currently works under GTK, but not under MSW - testWin = g.testWin = wxPreFrame() - res.LoadOnFrame(testWin, g.frame, STD_NAME) - # Create status bar - testWin.panel = testWin - testWin.CreateStatusBar() - testWin.SetClientSize(testWin.GetBestSize()) - testWin.panel = testWin - testWin.SetPosition(pos) - testWin.Show(True) - elif xxx.__class__ == xxxPanel: - # Create new frame - if not testWin: - testWin = g.testWin = wxFrame(g.frame, -1, 'Panel: ' + name, + try: + 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 + # wxMemoryFSHandler_RemoveFile('xxx.xrc') + # wxEndBusyCursor() + # self.CreateTestWin(child) + # return + # This currently works under GTK, but not under MSW + testWin = g.testWin = wxPreFrame() + res.LoadOnFrame(testWin, g.frame, STD_NAME) + # Create status bar + testWin.panel = testWin + testWin.CreateStatusBar() + testWin.SetClientSize(testWin.GetBestSize()) + testWin.SetPosition(pos) + testWin.Show(True) + elif xxx.__class__ == xxxPanel: + # Create new frame + if not testWin: + testWin = g.testWin = wxFrame(g.frame, -1, 'Panel: ' + name, + pos=pos, name=STD_NAME) + testWin.panel = res.LoadPanel(testWin, STD_NAME) + testWin.SetClientSize(testWin.GetBestSize()) + testWin.Show(True) + elif xxx.__class__ == xxxDialog: + testWin = g.testWin = res.LoadDialog(None, STD_NAME) + testWin.panel = testWin + testWin.Layout() + testWin.SetPosition(pos) + testWin.Show(True) + # Dialog's default code does not produce EVT_CLOSE + EVT_BUTTON(testWin, wxID_OK, self.OnCloseTestWin) + EVT_BUTTON(testWin, wxID_CANCEL, self.OnCloseTestWin) + elif xxx.__class__ == xxxWizard: + wiz = wxPreWizard() + res.LoadOnObject(wiz, None, STD_NAME, 'wxWizard') + # Find first page (don't know better way) + firstPage = None + for w in wiz.GetChildren(): + if isinstance(w, wxWizardPage): + firstPage = w + break + if not firstPage: + wxLogError('Wizard is empty') + else: + # Wizard should be modal + self.SetItemBold(item) + wiz.RunWizard(w) + self.SetItemBold(item, False) + wiz.Destroy() + elif xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]: + # Create new frame + if not testWin: + testWin = g.testWin = wxFrame(g.frame, -1, 'Wizard page: ' + name, + pos=pos, name=STD_NAME) + testWin.panel = wxPrePanel() + res.LoadOnObject(testWin.panel, testWin, STD_NAME, 'wxPanel') + testWin.SetClientSize(testWin.GetBestSize()) + testWin.Show(True) + elif xxx.__class__ == xxxMenuBar: + testWin = g.testWin = wxFrame(g.frame, -1, 'MenuBar: ' + name, pos=pos, name=STD_NAME) - testWin.panel = res.LoadPanel(testWin, STD_NAME) - testWin.SetClientSize(testWin.GetBestSize()) - testWin.Show(True) - elif xxx.__class__ == xxxDialog: - testWin = g.testWin = res.LoadDialog(None, STD_NAME) - testWin.panel = testWin - testWin.Layout() - testWin.SetPosition(pos) - testWin.Show(True) - # Dialog's default code does not produce EVT_CLOSE - EVT_BUTTON(testWin, wxID_OK, self.OnCloseTestWin) - EVT_BUTTON(testWin, wxID_CANCEL, self.OnCloseTestWin) - elif xxx.__class__ == xxxMenuBar: - testWin = g.testWin = wxFrame(g.frame, -1, 'MenuBar: ' + name, - pos=pos, name=STD_NAME) - testWin.panel = None - # Set status bar to display help - testWin.CreateStatusBar() - testWin.menuBar = res.LoadMenuBar(STD_NAME) - testWin.SetMenuBar(testWin.menuBar) - testWin.Show(True) - elif xxx.__class__ == xxxToolBar: - testWin = g.testWin = wxFrame(g.frame, -1, 'ToolBar: ' + name, - pos=pos, name=STD_NAME) - testWin.panel = None - # Set status bar to display help - testWin.CreateStatusBar() - testWin.toolBar = res.LoadToolBar(testWin, STD_NAME) - testWin.SetToolBar(testWin.toolBar) - testWin.Show(True) + testWin.panel = None + # Set status bar to display help + testWin.CreateStatusBar() + testWin.menuBar = res.LoadMenuBar(STD_NAME) + testWin.SetMenuBar(testWin.menuBar) + testWin.Show(True) + elif xxx.__class__ == xxxToolBar: + testWin = g.testWin = wxFrame(g.frame, -1, 'ToolBar: ' + name, + pos=pos, name=STD_NAME) + testWin.panel = None + # Set status bar to display help + testWin.CreateStatusBar() + testWin.toolBar = res.LoadToolBar(testWin, STD_NAME) + testWin.SetToolBar(testWin.toolBar) + testWin.Show(True) + if testWin: + testWin.item = item + EVT_CLOSE(testWin, self.OnCloseTestWin) + testWin.highLight = None + if highLight and not self.pendingHighLight: + self.HighLight(highLight) + except: + if g.testWin: + self.SetItemBold(item, False) + g.testWinPos = g.testWin.GetPosition() + g.testWin.Destroy() + g.testWin = None + inf = sys.exc_info() + wxLogError(traceback.format_exception(inf[0], inf[1], None)[-1]) + wxLogError('Error loading resource') wxMemoryFSHandler_RemoveFile('xxx.xrc') - testWin.item = item - EVT_CLOSE(testWin, self.OnCloseTestWin) - testWin.highLight = None - if highLight and not self.pendingHighLight: - self.HighLight(highLight) wxEndBusyCursor() - def OnCloseTestWin(self, evt): + def CloseTestWindow(self): + if not g.testWin: return self.SetItemBold(g.testWin.item, False) + g.frame.tb.ToggleTool(g.frame.ID_TOOL_LOCATE, False) g.testWinPos = g.testWin.GetPosition() g.testWin.Destroy() g.testWin = None + def OnCloseTestWin(self, evt): + self.CloseTestWindow() + # Return item index in parent def ItemIndex(self, item): n = 0 # index of sibling @@ -861,6 +1009,8 @@ class XML_Tree(wxTreeCtrl): SetMenu(m, pullDownMenu.toolBarControls) elif xxx.__class__ in [xxxMenu, xxxMenuItem]: SetMenu(m, pullDownMenu.menuControls) + elif xxx.__class__ == xxxStdDialogButtonSizer: + SetMenu(m, pullDownMenu.stdButtons) else: SetMenu(m, pullDownMenu.controls) if xxx.__class__ == xxxNotebook: @@ -889,19 +1039,19 @@ class XML_Tree(wxTreeCtrl): if xxx.__class__ == xxxMenuBar: m.Append(1000 + ID_NEW.MENU, 'Menu', 'Create menu') elif xxx.__class__ in [xxxMenu, xxxMenuItem]: - SetMenu2(m, pullDownMenu.menuControls) + SetMenu(m, pullDownMenu.menuControls, shift=True) elif xxx.__class__ == xxxToolBar and \ self.GetItemParent(item) == self.root: - SetMenu2(m, []) + SetMenu(m, [], shift=True) elif xxx.__class__ in [xxxFrame, xxxDialog, xxxPanel]: - SetMenu2(m, [ + SetMenu(m, [ (ID_NEW.PANEL, 'Panel', 'Create panel'), (ID_NEW.DIALOG, 'Dialog', 'Create dialog'), - (ID_NEW.FRAME, 'Frame', 'Create frame')]) + (ID_NEW.FRAME, 'Frame', 'Create frame')], shift=True) elif xxx.isSizer: - SetMenu2(m, pullDownMenu.sizers) + SetMenu(m, pullDownMenu.sizers, shift=True) else: - SetMenu2(m, pullDownMenu.controls) + SetMenu(m, pullDownMenu.controls, shift=True) id = wxNewId() menu.AppendMenu(id, 'Replace With', m) if not m.GetMenuItemCount(): menu.Enable(id, False)