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

backport more fixes from HEAD

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-05-03 17:01:32 +00:00
parent 07e945b244
commit 8c9f00aaa3
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -422,8 +422,8 @@ class HighLightBox:
def __init__(self, pos, size): def __init__(self, pos, size):
if not self.colour: colour = self.colour = wx.NamedColour(COLOUR_HL) if not self.colour: colour = self.colour = wx.NamedColour(COLOUR_HL)
else: colour = self.colour else: colour = self.colour
if size.width == -1: size.width = 0 if size.width == -1: size.width = 1
if size.height == -1: size.height = 0 if size.height == -1: size.height = 1
w = g.testWin.panel w = g.testWin.panel
l1 = wx.Window(w, -1, pos, wx.Size(size.width, 2)) l1 = wx.Window(w, -1, pos, wx.Size(size.width, 2))
l1.SetBackgroundColour(self.colour) l1.SetBackgroundColour(self.colour)
@@ -438,8 +438,8 @@ class HighLightBox:
g.testWin.highLight = self g.testWin.highLight = self
# Move highlight to a new position # Move highlight to a new position
def Replace(self, pos, size): def Replace(self, pos, size):
if size.width == -1: size.width = 0 if size.width == -1: size.width = 1
if size.height == -1: size.height = 0 if size.height == -1: size.height = 1
self.lines[0].SetDimensions(pos.x, pos.y, size.width, 2) self.lines[0].SetDimensions(pos.x, pos.y, size.width, 2)
self.lines[1].SetDimensions(pos.x, pos.y, 2, size.height) self.lines[1].SetDimensions(pos.x, pos.y, 2, size.height)
self.lines[2].SetDimensions(pos.x + size.width - 2, pos.y, 2, size.height) self.lines[2].SetDimensions(pos.x + size.width - 2, pos.y, 2, size.height)
@@ -838,6 +838,7 @@ class XML_Tree(wx.TreeCtrl):
# so we must remove the old HL window # so we must remove the old HL window
g.testWin.highLight = updateHL(g.testWin.highLight, HighLightBox, pos, size) g.testWin.highLight = updateHL(g.testWin.highLight, HighLightBox, pos, size)
g.testWin.highLight.item = item g.testWin.highLight.item = item
g.testWin.highLight.obj = obj
def ShowTestWindow(self, item): def ShowTestWindow(self, item):
xxx = self.GetPyData(item) xxx = self.GetPyData(item)
@@ -975,9 +976,10 @@ class XML_Tree(wx.TreeCtrl):
# Create new frame # Create new frame
if not testWin: if not testWin:
testWin = g.testWin = wx.Frame(g.frame, -1, 'Panel: ' + name, testWin = g.testWin = wx.Frame(g.frame, -1, 'Panel: ' + name,
pos=pos, name=STD_NAME) pos=pos, name=STD_NAME)
testWin.panel = res.LoadPanel(testWin, STD_NAME) testWin.panel = res.LoadPanel(testWin, STD_NAME)
testWin.SetClientSize(testWin.GetBestSize()) testWin.panel.SetSize(testWin.GetClientSize())
#testWin.SetClientSize(testWin.GetSize())
testWin.Show(True) testWin.Show(True)
elif xxx.__class__ == xxxDialog: elif xxx.__class__ == xxxDialog:
testWin = g.testWin = res.LoadDialog(g.frame, STD_NAME) testWin = g.testWin = res.LoadDialog(g.frame, STD_NAME)
@@ -1072,8 +1074,10 @@ class XML_Tree(wx.TreeCtrl):
self.CloseTestWindow() self.CloseTestWindow()
def OnSizeTestWin(self, evt): def OnSizeTestWin(self, evt):
if g.testWin.highLight: # Update highlight after size change
self.HighLight(g.testWin.highLight.item) hl = g.testWin.highLight
if hl: hl.Replace(self.FindNodePos(hl.item), hl.obj.GetSize())
#self.HighLight(g.testWin.highLight.item)
evt.Skip() evt.Skip()
# Return index in parent, for real window children # Return index in parent, for real window children
@@ -1352,8 +1356,9 @@ class DropTarget(wx.PyDropTarget):
g.tree.SetItemTextColour(hl.item, g.tree.itemColour) g.tree.SetItemTextColour(hl.item, g.tree.itemColour)
# Highlight future parent # Highlight future parent
g.tree.itemColour = g.tree.GetItemTextColour(parentItem) # save current g.tree.itemColour = g.tree.GetItemTextColour(parentItem) # save current
g.testWin.highLightDT = updateHL(hl, HighLightDTBox, pos, size) if not hl or hl.item != parentItem:
g.testWin.highLightDT.item = parentItem g.testWin.highLightDT = updateHL(hl, HighLightDTBox, pos, size)
g.testWin.highLightDT.item = parentItem
g.tree.SetItemTextColour(parentItem, COLOUR_DT) g.tree.SetItemTextColour(parentItem, COLOUR_DT)
g.tree.EnsureVisible(parentItem) g.tree.EnsureVisible(parentItem)
g.frame.SetStatusText('Drop target: %s' % parent.treeName()) g.frame.SetStatusText('Drop target: %s' % parent.treeName())

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

@@ -191,7 +191,7 @@ class xxxObject:
hasName = True # has name attribute? hasName = True # has name attribute?
isSizer = hasChild = False isSizer = hasChild = False
isElement = True isElement = True
allParams = None # Some nodes have no parameters allParams = [] # Some nodes have no parameters
# Style parameters (all optional) # Style parameters (all optional)
styles = ['fg', 'bg', 'font', 'enabled', 'focused', 'hidden', 'tooltip'] styles = ['fg', 'bg', 'font', 'enabled', 'focused', 'hidden', 'tooltip']
# Special parameters # Special parameters