Various layout tweaks, wx.FIXED_SIZE added, etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/IntCtrl.py b/wxPython/demo/IntCtrl.py
index 16b5610eb5f3d1cdcac3e2aac4b1989d9d3cb47d..8226d1848ade22bd5b2b5883d4282224194b2f7e 100644 (file)
--- a/wxPython/demo/IntCtrl.py
+++ b/wxPython/demo/IntCtrl.py
@@ -28,10 +28,10 @@ class TestPanel( wx.Panel ):
 
         grid = wx.FlexGridSizer( 0, 2, 0, 0 )
         grid.Add( self.set_min, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
-        grid.Add( self.min, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
+        grid.Add( self.min, 0, wx.FIXED_SIZE|wx.ALIGN_LEFT|wx.ALL, 5 )
 
         grid.Add(self.set_max, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
-        grid.Add( self.max, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
+        grid.Add( self.max, 0, wx.FIXED_SIZE|wx.ALIGN_LEFT|wx.ALL, 5 )
 
         grid.Add( self.limit_target, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
         grid.Add( (20, 0), 0, wx.ALIGN_LEFT|wx.ALL, 5 )

diff --git a/wxPython/demo/MimeTypesManager.py b/wxPython/demo/MimeTypesManager.py
index c6e70cd263973241260a5f6734a68223ae65adf0..24b62a3527450858209409f8b90959e5cea3a386 100644 (file)
--- a/wxPython/demo/MimeTypesManager.py
+++ b/wxPython/demo/MimeTypesManager.py
@@ -43,10 +43,10 @@ class MimeTypesDemoPanel(wx.Panel):
         # Text control for ext / type entry plus label.
         t = wx.StaticText(self, -1, 'Extension / MIME type: ', style = wx.ALIGN_RIGHT )
         t.SetFont(bfont)
-        usizer.Add(t, 0, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER | wx.ALIGN_CENTER_VERTICAL, 2)
+        usizer.Add(t, 0, wx.ALL | wx.ALIGN_CENTER | wx.ALIGN_CENTER_VERTICAL, 2)
 
         self.ext = wx.TextCtrl(self, -1, value="wav", style = wx.TE_PROCESS_ENTER )
-        usizer.Add(self.ext, 0, wx.ALL | wx.ALIGN_TOP, 4)
+        usizer.Add(self.ext, 0, wx.FIXED_SIZE | wx.ALL | wx.ALIGN_TOP, 4)
         self.Bind(wx.EVT_TEXT_ENTER, self.OnLookup, self.ext)
 
         # Select how to look it up
@@ -85,13 +85,13 @@ class MimeTypesDemoPanel(wx.Panel):
         llsizer.Add(t, (0, 0), (1, 1), wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 2)
 
         self.icon = wx.StaticBitmap(self, -1, images.getNoIconBitmap())
-        llsizer.Add(self.icon, (0, 1), (1, 1), wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 2)
+        llsizer.Add(self.icon, (0, 1), (1, 1), wx.FIXED_SIZE | wx.ALL | wx.ALIGN_CENTER, 2)
 
-        self.iconsource = wx.TextCtrl(self, -1, value="", style = wx.TE_READONLY )
-        llsizer.Add(self.iconsource, (0, 2), (1, 1), wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 2)
+        self.iconsource = wx.TextCtrl(self, -1, value="", size=(125, -1), style = wx.TE_READONLY )
+        llsizer.Add(self.iconsource, (0, 2), (1, 1), wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 2)
 
-        self.iconoffset = wx.TextCtrl(self, -1, value="", style = wx.TE_READONLY )
-        llsizer.Add(self.iconoffset, (0, 3), (1, 1), wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 2)
+        self.iconoffset = wx.TextCtrl(self, -1, value="", size=(25,-1), style = wx.TE_READONLY )
+        llsizer.Add(self.iconoffset, (0, 3), (1, 1), wx.FIXED_SIZE | wx.ALL | wx.ALIGN_CENTER_VERTICAL, 2)
 
         #------- MIME Type
 

diff --git a/wxPython/demo/XmlResourceHandler.py b/wxPython/demo/XmlResourceHandler.py
index 1fe3f3f7ad20c7c7c1bffd6466b39af74defbc21..1ef824759b0c249d10b2d3e00b13929d26f811d3 100644 (file)
--- a/wxPython/demo/XmlResourceHandler.py
+++ b/wxPython/demo/XmlResourceHandler.py
@@ -12,7 +12,7 @@ resourceText = r'''<?xml version="1.0"?>
 <object class="MyCustomPanel" name="MyPanel">
     <size>200,100</size>
     <object class="wxStaticText" name="label1">
-        <label>This blue panel is a class derived from wx.Panel,\nand is loaded by a custom XmlResourceHandler.</label>
+        <label>This panel is a custom class derived from wx.Panel,\nand is loaded by a custom XmlResourceHandler.</label>
         <pos>10,10</pos>
     </object>
 </object>

diff --git a/wxPython/demo/XmlResourceSubclass.py b/wxPython/demo/XmlResourceSubclass.py
index 285e834ef598544a66135bcd6809608d06f62803..6e975e538f2914c873e194825039d5f79bfa8fe2 100644 (file)
--- a/wxPython/demo/XmlResourceSubclass.py
+++ b/wxPython/demo/XmlResourceSubclass.py
@@ -14,8 +14,7 @@ resourceText = r'''<?xml version="1.0"?>
 <object class="wxPanel" subclass="XmlResourceSubclass.MyCustomPanel" name="MyPanel">
     <size>200,100</size>
     <object class="wxStaticText" name="label1">
-        <label>This blue panel is a class derived from wx.Panel
-and is loaded by a using a subclass attribute of the object tag.</label>
+        <label>This panel is a custom class derived from wx.Panel,\nand is loaded by a custom XmlResourceHandler.</label>
         <pos>10,10</pos>
     </object>
 </object>
@@ -48,7 +47,7 @@ class MyCustomPanel(wx.Panel):
             # On OSX the EVT_SIZE happens before EVT_WINDOW_CREATE !?!
             # so give it another kick
             wx.CallAfter(self.OnSize, None)
-            
+        evt.Skip()
 
     def OnSize(self, evt):
         if hasattr(self, 't'):
@@ -80,9 +79,7 @@ class TestPanel(wx.Panel):
         res.LoadFromString(resourceText)
 
         # Now create a panel from the resource data
-        #panel = res.LoadPanel(self, "MyPanel")
-        panel = MyCustomPanel()
-        panel.Create(self, -1)
+        panel = res.LoadPanel(self, "MyPanel")
 
         # and do the layout
         sizer = wx.BoxSizer(wx.VERTICAL)

diff --git a/wxPython/demo/data/resource_wdr.xrc b/wxPython/demo/data/resource_wdr.xrc
index c42b0edb7268c6eda38fb60117823802be1900fc..fd598cf35abf4b1df13016f6c15d05860fdd6d61 100644 (file)
--- a/wxPython/demo/data/resource_wdr.xrc
+++ b/wxPython/demo/data/resource_wdr.xrc
@@ -74,7 +74,7 @@
                 </object>
               </object>
               <object class="sizeritem">
-                <flag>wxALIGN_CENTRE|wxLEFT|wxTOP</flag>
+                <flag>wxALIGN_CENTRE|wxLEFT|wxTOP|wxFIXED_SIZE</flag>
                 <border>5</border>
                 <object class="wxTextCtrl" name="ID_StateField">
                   <size>30,-1</size>
@@ -82,7 +82,7 @@
                 </object>
               </object>
               <object class="sizeritem">
-                <flag>wxALIGN_CENTRE|wxLEFT|wxRIGHT|wxTOP</flag>
+                <flag>wxALIGN_CENTRE|wxLEFT|wxRIGHT|wxTOP|wxFIXED_SIZE</flag>
                 <border>5</border>
                 <object class="wxTextCtrl" name="ID_ZipField">
                   <size>50,-1</size>

diff --git a/wxPython/wx/lib/analogclock.py b/wxPython/wx/lib/analogclock.py
index 55622d2dba6461b8c46a4b2556ad71b61a53f83b..5d1b91f3e364c4fa56a3c65465548ec5ebd6e996 100644 (file)
--- a/wxPython/wx/lib/analogclock.py
+++ b/wxPython/wx/lib/analogclock.py
@@ -51,14 +51,14 @@ TICKS_DECIMAL       = 16
 TICKS_ROMAN         = 32
 
 
-class AnalogClockWindow(wx.Window):
+class AnalogClockWindow(wx.PyWindow):
     """An analog clock window"""
 
     def __init__(self, parent, ID=-1, pos=wx.DefaultPosition, size=wx.DefaultSize,
                  style=0, name="clock"):
         
         # Initialize the wxWindow...
-        wx.Window.__init__(self, parent, ID, pos, size, style, name)
+        wx.PyWindow.__init__(self, parent, ID, pos, size, style, name)
 
         # Initialize some variables and defaults...
         self.clockStep = 1
@@ -124,6 +124,8 @@ class AnalogClockWindow(wx.Window):
         self.timer = wx.Timer(self)
         self.timer.Start(500)
 
+    def DoGetBestSize(self):
+        return wx.Size(25,25)
 
     def OnPaint(self, event):
         self._doDrawHands(wx.BufferedPaintDC(self), True)

diff --git a/wxPython/wx/lib/colourchooser/pycolourbox.py b/wxPython/wx/lib/colourchooser/pycolourbox.py
index 9cc9b5f3b204a40d6029a3e616f18c26b1f6480f..90117a198b4d6c6c848e71777d1768b0e0c1386d 100644 (file)
--- a/wxPython/wx/lib/colourchooser/pycolourbox.py
+++ b/wxPython/wx/lib/colourchooser/pycolourbox.py
@@ -33,12 +33,12 @@ class PyColourBox(wx.Panel):
     def __init__(self, parent, id, colour=(0, 0, 0), size=(25, 20)):
         """Creates a new colour box instance and initializes the colour
         content."""
-        wx.Panel.__init__(self, parent, id, size=size)
+        wx.Panel.__init__(self, parent, id, size=size, style=wx.NO_BORDER)
 
-        self.colour_box = wx.Panel(self, -1, style=wx.SIMPLE_BORDER)
+        self.colour_box = wx.Window(self, -1, style=wx.SIMPLE_BORDER)
 
         sizer = wx.GridSizer(1, 1)
-        sizer.Add(self.colour_box, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_CENTER_HORIZONTAL)
+        sizer.Add(self.colour_box, 0, wx.FIXED_SIZE | wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_CENTER_HORIZONTAL)
         sizer.SetItemMinSize(self.colour_box, size[0] - 5, size[1] - 5)
         self.SetAutoLayout(True)
         self.SetSizer(sizer)

diff --git a/wxPython/wx/lib/colourchooser/pycolourchooser.py b/wxPython/wx/lib/colourchooser/pycolourchooser.py
index 34d15c94d20882f211989b986c368a1a0f077a3d..763777a35c5705d8328edc551cf1a61b07f63844 100644 (file)
--- a/wxPython/wx/lib/colourchooser/pycolourchooser.py
+++ b/wxPython/wx/lib/colourchooser/pycolourchooser.py
@@ -202,9 +202,9 @@ class PyColourChooser(wx.Panel):
         self.ventry.SetSize((40, -1))
         hsvgrid = wx.FlexGridSizer(1, 6, 2, 2)
         hsvgrid.AddMany ([
-            (hlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.hentry, 0, 0),
-            (slabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.sentry, 0, 0),
-            (vlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.ventry, 0, 0),
+            (hlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.hentry, 0, wx.FIXED_SIZE),
+            (slabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.sentry, 0, wx.FIXED_SIZE),
+            (vlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.ventry, 0, wx.FIXED_SIZE),
         ])
 
         rlabel = wx.StaticText(self, -1, _("R:"))
@@ -218,9 +218,9 @@ class PyColourChooser(wx.Panel):
         self.bentry.SetSize((40, -1))
         lgrid = wx.FlexGridSizer(1, 6, 2, 2)
         lgrid.AddMany([
-            (rlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.rentry, 0, 0),
-            (glabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.gentry, 0, 0),
-            (blabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.bentry, 0, 0),
+            (rlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.rentry, 0, wx.FIXED_SIZE),
+            (glabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.gentry, 0, wx.FIXED_SIZE),
+            (blabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.bentry, 0, wx.FIXED_SIZE),
         ])
 
         gsizer = wx.GridSizer(2, 1)

diff --git a/wxPython/wx/lib/throbber.py b/wxPython/wx/lib/throbber.py
index 46a4c4405ae6d08026a79994e1dc8f2e828738f4..a436e1ea2b523ac675dc27a73cd5403233741a17 100644 (file)
--- a/wxPython/wx/lib/throbber.py
+++ b/wxPython/wx/lib/throbber.py
@@ -37,7 +37,7 @@ class UpdateThrobberEvent(wx.PyEvent):
 
 # ------------------------------------------------------------------------------
 
-class Throbber(wx.Panel):
+class Throbber(wx.PyPanel):
     """
     The first argument is either the name of a file that will be split into frames
     (a composite image) or a list of  strings of image names that will be treated
@@ -60,7 +60,7 @@ class Throbber(wx.Panel):
                  reverse = 0,     # reverse direction at end of animation
                  style = 0,       # window style
                  name = "throbber"):
-        wx.Panel.__init__(self, parent, id, pos, size, style, name)
+        wx.PyPanel.__init__(self, parent, id, pos, size, style, name)
         self.name = name
         self.label = label
         self.running = (1 != 1)
@@ -127,7 +127,11 @@ class Throbber(wx.Panel):
         self.Bind(wx.EVT_PAINT, self.OnPaint)
         self.Bind(wx.EVT_TIMER, self.OnTimer, self.timer)
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroyWindow)
-            
+
+
+    def DoGetBestSize(self):
+        return (self.width, self.height)
+    
 
     def OnTimer(self, event):
         wx.PostEvent(self, UpdateThrobberEvent())