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

Don't cache property and style panels as wxMac can't do Reparenting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-08-24 18:34:29 +00:00
parent d71cc120e3
commit a78714eb8c
3 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
wxPython/wx/tools/XRCed/panel.py
View File

@@ -41,22 +41,14 @@ class Panel(wxNotebook):
sizer.Add(wxBoxSizer()) # dummy sizer sizer.Add(wxBoxSizer()) # dummy sizer
self.page2.SetAutoLayout(True) self.page2.SetAutoLayout(True)
self.page2.SetSizer(sizer) self.page2.SetSizer(sizer)
# Cache for already used panels
self.pageCache = {} # cached property panels
self.stylePageCache = {} # cached style panels
# Dummy parent window for cache pages
self.cacheParent = wxFrame(None, -1, 'i am invisible')
# Delete child windows and recreate page sizer # Delete child windows and recreate page sizer
def ResetPage(self, page): def ResetPage(self, page):
topSizer = page.GetSizer() topSizer = page.GetSizer()
sizer = topSizer.GetChildren()[0].GetSizer() sizer = topSizer.GetChildren()[0].GetSizer()
for w in page.GetChildren(): for w in page.GetChildren():
sizer.Remove(w) w.Destroy()
if isinstance(w, ParamPage):
# With SetParent, we wouldn't need this
w.Reparent(self.cacheParent)
else:
w.Destroy()
topSizer.Remove(sizer) topSizer.Remove(sizer)
# Create new windows # Create new windows
sizer = wxBoxSizer(wxVERTICAL) sizer = wxBoxSizer(wxVERTICAL)
@@ -66,10 +58,10 @@ class Panel(wxNotebook):
else: else:
topSizer.Add(sizer, 0, wxALL, 5) topSizer.Add(sizer, 0, wxALL, 5)
return sizer return sizer
def SetData(self, xxx): def SetData(self, xxx):
self.pages = [] self.pages = []
# First page # First page
# Set cached or new page
# Remove current objects and sizer # Remove current objects and sizer
sizer = self.ResetPage(self.page1) sizer = self.ResetPage(self.page1)
if not xxx or (not xxx.allParams and not xxx.hasName): if not xxx or (not xxx.allParams and not xxx.hasName):
@@ -89,27 +81,13 @@ class Panel(wxNotebook):
g.currentXXX = xxx.treeObject() g.currentXXX = xxx.treeObject()
# Normal or SizerItem page # Normal or SizerItem page
isGBSizerItem = isinstance(xxx.parent, xxxGridBagSizer) isGBSizerItem = isinstance(xxx.parent, xxxGridBagSizer)
cacheID = (xxx.__class__, isGBSizerItem) page = PropPage(self.page1, xxx.panelName(), xxx)
try:
page = self.pageCache[cacheID]
page.box.SetLabel(xxx.panelName())
page.Reparent(self.page1)
except KeyError:
page = PropPage(self.page1, xxx.panelName(), xxx)
self.pageCache[cacheID] = page
page.SetValues(xxx) page.SetValues(xxx)
self.pages.append(page) self.pages.append(page)
sizer.Add(page, 1, wxEXPAND) sizer.Add(page, 1, wxEXPAND)
if xxx.hasChild: if xxx.hasChild:
# Special label for child objects - they may have different GUI # Special label for child objects - they may have different GUI
cacheID = (xxx.child.__class__, xxx.__class__) page = PropPage(self.page1, xxx.child.panelName(), xxx.child)
try:
page = self.pageCache[cacheID]
page.box.SetLabel(xxx.child.panelName())
page.Reparent(self.page1)
except KeyError:
page = PropPage(self.page1, xxx.child.panelName(), xxx.child)
self.pageCache[cacheID] = page
page.SetValues(xxx.child) page.SetValues(xxx.child)
self.pages.append(page) self.pages.append(page)
sizer.Add(page, 0, wxEXPAND | wxTOP, 5) sizer.Add(page, 0, wxEXPAND | wxTOP, 5)
@@ -123,12 +101,7 @@ class Panel(wxNotebook):
xxx = xxx.treeObject() xxx = xxx.treeObject()
# Simplest case: set data if class is the same # Simplest case: set data if class is the same
sizer = self.ResetPage(self.page2) sizer = self.ResetPage(self.page2)
try: page = StylePage(self.page2, xxx.className + ' style', xxx)
page = self.stylePageCache[xxx.__class__]
page.Reparent(self.page2)
except KeyError:
page = StylePage(self.page2, xxx.className + ' style', xxx)
self.stylePageCache[xxx.__class__] = page
page.SetValues(xxx) page.SetValues(xxx)
self.pages.append(page) self.pages.append(page)
sizer.Add(page, 0, wxEXPAND) sizer.Add(page, 0, wxEXPAND)
@@ -256,6 +229,8 @@ class ParamPage(wxPanel):
################################################################################ ################################################################################
LABEL_WIDTH = 125
# Panel for displaying properties # Panel for displaying properties
class PropPage(ParamPage): class PropPage(ParamPage):
def __init__(self, parent, label, xxx): def __init__(self, parent, label, xxx):
@@ -266,7 +241,7 @@ class PropPage(ParamPage):
sizer = wxFlexGridSizer(len(xxx.allParams), 2, 1, 1) sizer = wxFlexGridSizer(len(xxx.allParams), 2, 1, 1)
sizer.AddGrowableCol(1) sizer.AddGrowableCol(1)
if xxx.hasName: if xxx.hasName:
label = wxStaticText(self, -1, 'XML ID:', size=(100,-1)) label = wxStaticText(self, -1, 'XML ID:', size=(LABEL_WIDTH,-1))
control = ParamText(self, 'XML_name', 200) control = ParamText(self, 'XML_name', 200)
sizer.AddMany([ (label, 0, wxALIGN_CENTER_VERTICAL), sizer.AddMany([ (label, 0, wxALIGN_CENTER_VERTICAL),
(control, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM | wxGROW, 5) ]) (control, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM | wxGROW, 5) ])
@@ -275,13 +250,13 @@ class PropPage(ParamPage):
present = xxx.params.has_key(param) present = xxx.params.has_key(param)
if param in xxx.required: if param in xxx.required:
label = wxStaticText(self, paramIDs[param], param + ':', label = wxStaticText(self, paramIDs[param], param + ':',
size = (100,-1), name = param) size = (LABEL_WIDTH,-1), name = param)
else: else:
# Notebook has one very loooooong parameter # Notebook has one very loooooong parameter
if param == 'usenotebooksizer': sParam = 'usesizer:' if param == 'usenotebooksizer': sParam = 'usesizer:'
else: sParam = param + ':' else: sParam = param + ':'
label = wxCheckBox(self, paramIDs[param], sParam, label = wxCheckBox(self, paramIDs[param], sParam,
size = (100,-1), name = param) size = (LABEL_WIDTH,-1), name = param)
self.checks[param] = label self.checks[param] = label
try: try:
typeClass = xxx.paramDict[param] typeClass = xxx.paramDict[param]
@@ -341,7 +316,7 @@ class StylePage(ParamPage):
for param in xxx.styles: for param in xxx.styles:
present = xxx.params.has_key(param) present = xxx.params.has_key(param)
check = wxCheckBox(self, paramIDs[param], check = wxCheckBox(self, paramIDs[param],
param + ':', size = (100,-1), name = param) param + ':', size = (LABEL_WIDTH,-1), name = param)
check.SetValue(present) check.SetValue(present)
control = paramDict[param](self, name = param) control = paramDict[param](self, name = param)
control.Enable(present) control.Enable(present)

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

@@ -794,8 +794,6 @@ Homepage: http://xrced.sourceforge.net\
def OnCloseWindow(self, evt): def OnCloseWindow(self, evt):
if not self.AskSave(): return if not self.AskSave(): return
if g.testWin: g.testWin.Destroy() if g.testWin: g.testWin.Destroy()
# Destroy cached windows
panel.cacheParent.Destroy()
if not panel.GetPageCount() == 2: if not panel.GetPageCount() == 2:
panel.page2.Destroy() panel.page2.Destroy()
if not self.IsIconized(): if not self.IsIconized():

4
wxPython/wx/tools/XRCed/xrced.xrc
View File

@@ -143,7 +143,7 @@
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient> <orient>wxHORIZONTAL</orient>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxCheckList" name="CHECK_LIST"> <object class="wxCheckListBox" name="CHECK_LIST">
<content/> <content/>
</object> </object>
<option>1</option> <option>1</option>
@@ -224,7 +224,7 @@
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxCheckList" name="CHECK_LIST"> <object class="wxCheckListBox" name="CHECK_LIST">
<content/> <content/>
<size>250,250</size> <size>250,250</size>
<style></style> <style></style>