Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed problem with pasting wxMenu in wxMenuBar and others

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roman Rolinsky
2003-02-13 11:07:59 +00:00
parent c5ee986890
commit 515c91da66
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/wxPython/tools/XRCed/xrced.py
View File

@@ -489,6 +489,8 @@ class Frame(wxFrame):
if not parent.__class__ in [xxxMenu, xxxToolBar]: error = true if not parent.__class__ in [xxxMenu, xxxToolBar]: error = true
elif x.__class__ == xxxTool: elif x.__class__ == xxxTool:
if parent.__class__ != xxxToolBar: error = true if parent.__class__ != xxxToolBar: error = true
elif x.__class__ == xxxMenu:
if not parent.__class__ in [xxxMainNode, xxxMenuBar, xxxMenu]: error = true
elif x.__class__ == xxxMenuItem: elif x.__class__ == xxxMenuItem:
if not parent.__class__ in [xxxMenuBar, xxxMenu]: error = true if not parent.__class__ in [xxxMenuBar, xxxMenu]: error = true
elif x.isSizer and parent.__class__ == xxxNotebook: error = true elif x.isSizer and parent.__class__ == xxxNotebook: error = true
@@ -508,7 +510,7 @@ class Frame(wxFrame):
isChildContainer = isinstance(xxx, xxxChildContainer) isChildContainer = isinstance(xxx, xxxChildContainer)
if isChildContainer and \ if isChildContainer and \
((parent.isSizer and not isinstance(xxx, xxxSizerItem)) or \ ((parent.isSizer and not isinstance(xxx, xxxSizerItem)) or \
(isinstance(parent, xxxNotebook) and not isinstance(xxx, xxxNotebookPage)) or \ (isinstance(parent, xxxNotebook) and not isinstance(xxx, xxxNotebookPage)) or \
not (parent.isSizer or isinstance(parent, xxxNotebook))): not (parent.isSizer or isinstance(parent, xxxNotebook))):
elem.removeChild(xxx.child.element) # detach child elem.removeChild(xxx.child.element) # detach child
elem.unlink() # delete child container elem.unlink() # delete child container