This commit was manufactured by cvs2svn to create tag 'WX_2_8_3'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_8_3@44921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2007-03-19 12:50:38 +00:00
parent 0d3847e80c
commit ddae8107b7
440 changed files with 11219 additions and 10751 deletions

View File

@@ -563,6 +563,8 @@ class XML_Tree(wx.TreeCtrl):
# Different color for references
if treeObj.ref:
self.SetItemTextColour(item, 'DarkGreen')
elif treeObj.hasStyle and treeObj.params.get('hidden', False):
self.SetItemTextColour(item, 'Grey')
# Try to find children objects
if treeObj.hasChildren:
nodes = treeObj.element.childNodes[:]
@@ -723,7 +725,8 @@ class XML_Tree(wx.TreeCtrl):
if item == g.testWin.item: return False
while item != self.root:
item = self.GetItemParent(item)
if item == g.testWin.item: return True
if item == g.testWin.item:
return True
return False
# Highlight selected item
@@ -739,7 +742,9 @@ class XML_Tree(wx.TreeCtrl):
return
# Get window/sizer object
obj = self.FindNodeObject(item)
if not obj:
xxx = self.GetPyData(item).treeObject()
# Remove existing HL if item not found or is hidden
if not obj or xxx.hasStyle and xxx.params.get('hidden', False):
if g.testWin.highLight: g.testWin.highLight.Remove()
return
pos = self.FindNodePos(item, obj)
@@ -769,6 +774,7 @@ class XML_Tree(wx.TreeCtrl):
return
# Show item in bold
if g.testWin: # Reset old
self.Unselect()
self.SetItemBold(g.testWin.item, False)
try:
wx.BeginBusyCursor()
@@ -1116,7 +1122,7 @@ class XML_Tree(wx.TreeCtrl):
(ID_NEW.PANEL, 'Panel', 'Create panel'),
(ID_NEW.DIALOG, 'Dialog', 'Create dialog'),
(ID_NEW.FRAME, 'Frame', 'Create frame')], shift=True)
elif xxx.isSizer:
elif xxx.isSizer and self.ItemHasChildren(item):
SetMenu(m, pullDownMenu.sizers, shift=True)
else:
SetMenu(m, pullDownMenu.controls, shift=True)
@@ -1143,6 +1149,12 @@ class XML_Tree(wx.TreeCtrl):
self.PopupMenu(menu, evt.GetPosition())
menu.Destroy()
# Redefine to force the update of font dimentions on wxGTK
if wx.Platform == '__WXGTK__':
def SetItemBold(self, item, state=True):
wx.TreeCtrl.SetItemBold(self, item, state)
self.SetIndent(self.GetIndent())
# Apply changes
def Apply(self, xxx, item):
g.panel.Apply()