From 207ebbbd7281ff518aac06a2388bb487a8c18733 Mon Sep 17 00:00:00 2001 From: Roman Rolinsky Date: Wed, 13 Jul 2005 14:34:05 +0000 Subject: [PATCH] toolbars can be added inside windows, fix for relative pathnames git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/wx/tools/XRCed/xrced.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py index 730bf823ba..1458535cec 100644 --- a/wxPython/wx/tools/XRCed/xrced.py +++ b/wxPython/wx/tools/XRCed/xrced.py @@ -361,7 +361,7 @@ class Frame(wxFrame): if evt.GetId() == wxID_SAVEAS or not self.dataFile: if self.dataFile: defaultName = '' else: defaultName = 'UNTITLED.xrc' - dirname = os.path.dirname(self.dataFile) + dirname = os.path.abspath(os.path.dirname(self.dataFile)) dlg = wxFileDialog(self, 'Save As', dirname, defaultName, '*.xrc', wxSAVE | wxOVERWRITE_PROMPT | wxCHANGE_DIR) if dlg.ShowModal() == wxID_OK: @@ -456,7 +456,8 @@ class Frame(wxFrame): if parent.__class__ != xxxMainNode: error = True elif x.__class__ == xxxToolBar: # Toolbar can be top-level of child of panel or frame - if parent.__class__ not in [xxxMainNode, xxxPanel, xxxFrame]: error = True + if parent.__class__ not in [xxxMainNode, xxxPanel, xxxFrame] and \ + not parent.isSizer: error = True elif x.__class__ == xxxPanel and parent.__class__ == xxxMainNode: pass elif x.__class__ == xxxSpacer: -- 2.45.2