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

diff --git a/wxPython/wx/tools/XRCed/CHANGES.txt b/wxPython/wx/tools/XRCed/CHANGES.txt
index 4da16b2982f5abf88232afd168d87944d6dbf2c0..c4bdbc07a59ec76e34b15f80e92108bb58fed6e7 100644 (file)
--- a/wxPython/wx/tools/XRCed/CHANGES.txt
+++ b/wxPython/wx/tools/XRCed/CHANGES.txt
@@ -1,3 +1,8 @@
+0.1.8-4
+-------
+
+Fixes for wxMSW (notebook highlighting, control sizes, tree Unselect).
+

 0.1.8-3
 -------
 
 0.1.8-3
 -------
 

diff --git a/wxPython/wx/tools/XRCed/globals.py b/wxPython/wx/tools/XRCed/globals.py
index a46f1cf02f8b81bf82fa35c6d3da8c3fea803ead..dbf976927973ad06ff617967ef05eaea51e09b36 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -15,7 +15,7 @@ import sys
 # Global constants
 
 progname = 'XRCed'
 # 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:
 # Minimal wxWidgets version
 MinWxVersion = (2,6,0)
 if wx.VERSION[:3] < MinWxVersion:

diff --git a/wxPython/wx/tools/XRCed/params.py b/wxPython/wx/tools/XRCed/params.py
index d08cba4aec269747f6d20f7d12e44921a5b61eb9..a246adab9aff32a29611c1cdd8f15b5833af0775 100644 (file)
--- a/wxPython/wx/tools/XRCed/params.py
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -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.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)
         textW = 60 - self.spin.GetSize()[0]
         self.text = wx.TextCtrl(self, self.ID_TEXT_CTRL, size=(textW,-1))
         self.spin.SetRange(-10000, 10000)

diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py
index da78f48859c5252ab8921a5eb7e86aa8fa28480f..3c5ddf95fbc4a718402d1e1469eba2cf31fb92d9 100644 (file)
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -634,12 +634,16 @@ class XML_Tree(wx.TreeCtrl):
                     break
         # For sizers and notebooks we must select the first window-like parent
         winParent = itemParent
                     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)
             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)
         parentPos = self.FindNodePos(winParent)

-        # Position (-1,-1) is really (0,0)

         pos = obj.GetPosition()
         pos = obj.GetPosition()

+        # Position (-1,-1) is really (0,0)

         if pos == (-1,-1): pos = (0,0)
         return parentPos + pos
 
         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
             return
         # Show item in bold
         if g.testWin:     # Reset old

-            self.Unselect()
+            self.UnselectAll()

             self.SetItemBold(g.testWin.item, False)
         try:
             wx.BeginBusyCursor()
             self.SetItemBold(g.testWin.item, False)
         try:
             wx.BeginBusyCursor()

diff --git a/wxPython/wx/tools/XRCed/xrced.xrc b/wxPython/wx/tools/XRCed/xrced.xrc
index 9ebe7d1fdddef0a88dfe420a4223430b5428588a..16ba037d9411bf9f8e317f1925b0777bab15f6ee 100644 (file)
--- a/wxPython/wx/tools/XRCed/xrced.xrc
+++ b/wxPython/wx/tools/XRCed/xrced.xrc
@@ -350,7 +350,7 @@
               <orient>wxVERTICAL</orient>
               <object class="sizeritem">
                 <object class="wxSpinCtrl" name="SPIN">
               <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>
                 </object>
                 <flag>wxBOTTOM</flag>
                 <border>5</border>