AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

toolbars can be added inside windows, fix for relative pathnames

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roman Rolinsky 2005-07-13 14:34:05 +00:00
parent 7235f8e178
commit 207ebbbd72
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wxPython/wx/tools/XRCed/xrced.py
View File

@ -361,7 +361,7 @@ class Frame(wxFrame):
if evt.GetId() == wxID_SAVEAS or not self.dataFile: if evt.GetId() == wxID_SAVEAS or not self.dataFile:
if self.dataFile: defaultName = '' if self.dataFile: defaultName = ''
else: defaultName = 'UNTITLED.xrc' 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', dlg = wxFileDialog(self, 'Save As', dirname, defaultName, '*.xrc',
wxSAVE | wxOVERWRITE_PROMPT | wxCHANGE_DIR) wxSAVE | wxOVERWRITE_PROMPT | wxCHANGE_DIR)
if dlg.ShowModal() == wxID_OK: if dlg.ShowModal() == wxID_OK:
@ -456,7 +456,8 @@ class Frame(wxFrame):
if parent.__class__ != xxxMainNode: error = True if parent.__class__ != xxxMainNode: error = True
elif x.__class__ == xxxToolBar: elif x.__class__ == xxxToolBar:
# Toolbar can be top-level of child of panel or frame # 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: elif x.__class__ == xxxPanel and parent.__class__ == xxxMainNode:
pass pass
elif x.__class__ == xxxSpacer: elif x.__class__ == xxxSpacer: