0.1.8-4
------- Fixes for wxMSW (notebook highlighting, control sizes, tree Unselect). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
0.1.8-4
|
||||
-------
|
||||
|
||||
Fixes for wxMSW (notebook highlighting, control sizes, tree Unselect).
|
||||
|
||||
0.1.8-3
|
||||
-------
|
||||
|
||||
|
@@ -15,7 +15,7 @@ import sys
|
||||
# Global constants
|
||||
|
||||
progname = 'XRCed'
|
||||
version = '0.1.8-3'
|
||||
version = '0.1.8-4'
|
||||
# Minimal wxWidgets version
|
||||
MinWxVersion = (2,6,0)
|
||||
if wx.VERSION[:3] < MinWxVersion:
|
||||
|
@@ -382,7 +382,7 @@ class ParamUnit(PPanel):
|
||||
self.ID_TEXT_CTRL = wx.NewId()
|
||||
self.ID_SPIN_BUTTON = wx.NewId()
|
||||
sizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||
self.spin = wx.SpinButton(self, self.ID_SPIN_BUTTON, style = wx.SP_VERTICAL)
|
||||
self.spin = wx.SpinButton(self, self.ID_SPIN_BUTTON, style = wx.SP_VERTICAL, size=(-1,0))
|
||||
textW = 60 - self.spin.GetSize()[0]
|
||||
self.text = wx.TextCtrl(self, self.ID_TEXT_CTRL, size=(textW,-1))
|
||||
self.spin.SetRange(-10000, 10000)
|
||||
|
@@ -634,12 +634,16 @@ class XML_Tree(wx.TreeCtrl):
|
||||
break
|
||||
# For sizers and notebooks we must select the first window-like parent
|
||||
winParent = itemParent
|
||||
while self.GetPyData(winParent).isSizer or \
|
||||
self.GetPyData(winParent).treeObject().__class__ == xxxNotebook:
|
||||
while self.GetPyData(winParent).isSizer:
|
||||
winParent = self.GetItemParent(winParent)
|
||||
# Notebook children are layed out in a little strange way
|
||||
# wxGTK places NB panels relative to the NB parent
|
||||
if wx.Platform == '__WXGTK__':
|
||||
if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook:
|
||||
winParent = self.GetItemParent(winParent)
|
||||
parentPos = self.FindNodePos(winParent)
|
||||
# Position (-1,-1) is really (0,0)
|
||||
pos = obj.GetPosition()
|
||||
# Position (-1,-1) is really (0,0)
|
||||
if pos == (-1,-1): pos = (0,0)
|
||||
return parentPos + pos
|
||||
|
||||
@@ -771,7 +775,7 @@ class XML_Tree(wx.TreeCtrl):
|
||||
return
|
||||
# Show item in bold
|
||||
if g.testWin: # Reset old
|
||||
self.Unselect()
|
||||
self.UnselectAll()
|
||||
self.SetItemBold(g.testWin.item, False)
|
||||
try:
|
||||
wx.BeginBusyCursor()
|
||||
|
@@ -350,7 +350,7 @@
|
||||
<orient>wxVERTICAL</orient>
|
||||
<object class="sizeritem">
|
||||
<object class="wxSpinCtrl" name="SPIN">
|
||||
<size>20,-1d</size>
|
||||
<size>60,-1</size>
|
||||
</object>
|
||||
<flag>wxBOTTOM</flag>
|
||||
<border>5</border>
|
||||
|
Reference in New Issue
Block a user