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

Fixed Cut command, added support for MenuBar inside Frame/Dialog.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roman Rolinsky
2006-02-16 17:19:39 +00:00
parent eb3efe0d4b
commit 6165053b84
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wxPython/wx/tools/XRCed/CHANGES.txt
View File

@@ -1,3 +1,8 @@
0.1.7-2
-------
Fixed Cut command, added support for MenuBar inside Frame/Dialog.
0.1.7-1 0.1.7-1
------- -------

2
wxPython/wx/tools/XRCed/globals.py
View File

@@ -15,7 +15,7 @@ import sys
# Global constants # Global constants
progname = 'XRCed' progname = 'XRCed'
version = '0.1.7-1' version = '0.1.7-2'
# Minimal wxWindows version # Minimal wxWindows version
MinWxVersion = (2,6,0) MinWxVersion = (2,6,0)
if wxVERSION[:3] < MinWxVersion: if wxVERSION[:3] < MinWxVersion:

6
wxPython/wx/tools/XRCed/tree.py
View File

@@ -653,9 +653,9 @@ class XML_Tree(wxTreeCtrl):
# Top-level sizer? return window's sizer # Top-level sizer? return window's sizer
if xxx.isSizer and isinstance(parentWin, wxWindow): if xxx.isSizer and isinstance(parentWin, wxWindow):
return parentWin.GetSizer() return parentWin.GetSizer()
elif isinstance(xxx, xxxStatusBar): return None elif xxx.__class__ in [xxxStatusBar, xxxMenu, xxxMenuItem, xxxSeparator]: return None
elif isinstance(xxx, xxxToolBar): elif xxx.__class__ in [xxxToolBar, xxxMenuBar]:
# If it's the main toolbar, we can't really select it # If it's the main toolbar or menubar, we can't really select it
if xxx.parent.__class__ == xxxFrame: return None if xxx.parent.__class__ == xxxFrame: return None
elif isinstance(xxx.parent, xxxToolBar): elif isinstance(xxx.parent, xxxToolBar):
# Select complete toolbar # Select complete toolbar

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

@@ -463,9 +463,12 @@ class Frame(wxFrame):
error = False error = False
# Top-level # Top-level
x = xxx.treeObject() x = xxx.treeObject()
if x.__class__ in [xxxDialog, xxxFrame, xxxMenuBar, xxxWizard]: if x.__class__ in [xxxDialog, xxxFrame, xxxWizard]:
# Top-level classes # Top-level classes
if parent.__class__ != xxxMainNode: error = True if parent.__class__ != xxxMainNode: error = True
elif x.__class__ == xxxMenuBar:
# Menubar can be put in frame or dialog
if parent.__class__ not in [xxxMainNode, xxxFrame, xxxDialog]: 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] and \ if parent.__class__ not in [xxxMainNode, xxxPanel, xxxFrame] and \
@@ -576,7 +579,7 @@ class Frame(wxFrame):
if evt.GetId() == wxID_CUT: if evt.GetId() == wxID_CUT:
wx.TheClipboard.Open() wx.TheClipboard.Open()
data = wx.CustomDataObject('XRCED') data = wx.CustomDataObject('XRCED')
data.SetData(cPickle.dumps(elem)) data.SetData(cPickle.dumps(elem.toxml()))
wx.TheClipboard.SetData(data) wx.TheClipboard.SetData(data)
wx.TheClipboard.Close() wx.TheClipboard.Close()
tree.pendingHighLight = None tree.pendingHighLight = None