Updated layout test

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

diff --git a/wxPython/misc/image.png b/wxPython/misc/image.png
new file mode 100644 (file)
index 0000000..5a4ce74
Binary files /dev/null and b/wxPython/misc/image.png differ

diff --git a/wxPython/misc/widgetLayoutTest.cfg b/wxPython/misc/widgetLayoutTest.cfg
index 9a1c4d8d07ab471f32c2fa87d54217c238d49b5f..c54c93d54c1d8c71f7a032d851ff51d80d49515f 100644 (file)
--- a/wxPython/misc/widgetLayoutTest.cfg
+++ b/wxPython/misc/widgetLayoutTest.cfg
@@ -10,7 +10,7 @@
 ['wx', 'BitmapButton', '-1, wx.Bitmap("image.png")'],
 ['wx', 'StaticBitmap', '-1, wx.Bitmap("image.png")'],
 ['wx.calendar', 'CalendarCtrl', '-1'],
 ['wx', 'BitmapButton', '-1, wx.Bitmap("image.png")'],
 ['wx', 'StaticBitmap', '-1, wx.Bitmap("image.png")'],
 ['wx.calendar', 'CalendarCtrl', '-1'],

-['wx', 'CheckListBox', '-1, choices="one two three four five six seven eight".split()'],
+['wx', 'CheckListBox', '-1, size=(100,-1), choices="one two three four five six seven eight".split()'],

 ['wx', 'Choice', '-1, choices="one two three four five six seven eight".split()'],
 ['wx', 'ComboBox', '-1, choices="one two three four five six seven eight".split(), value="default"'],
 ['wx', 'Gauge', '-1, 100'],
 ['wx', 'Choice', '-1, choices="one two three four five six seven eight".split()'],
 ['wx', 'ComboBox', '-1, choices="one two three four five six seven eight".split(), value="default"'],
 ['wx', 'Gauge', '-1, 100'],

diff --git a/wxPython/misc/widgetLayoutTest.py b/wxPython/misc/widgetLayoutTest.py
index e9f61c6bbb8980fae720ec66311f013540044cbd..02a8a33695b7237c9114ab76606dd01d65963418 100644 (file)
--- a/wxPython/misc/widgetLayoutTest.py
+++ b/wxPython/misc/widgetLayoutTest.py
@@ -42,8 +42,7 @@ class LayoutTestFrame(wx.Frame):
         bottomPanel.SetDefaultBackgroundColour("light blue")
 
         self.testPanel = wx.Panel(bottomPanel, name="testPanel")
         bottomPanel.SetDefaultBackgroundColour("light blue")
 
         self.testPanel = wx.Panel(bottomPanel, name="testPanel")

-        self.testPanel.SetSizeHints((20,20))
-        #self.testPanel.SetDefaultBackgroundColour("dark red")
+        self.testPanel.SetDefaultBackgroundColour((205, 183, 181)) # mistyrose3

         self.testWidget = None
 
 
         self.testWidget = None
 
 


@@ -263,7 +262,7 @@ class LayoutTestFrame(wx.Frame):
             import traceback
             traceback.print_exc()
             return
             import traceback
             traceback.print_exc()
             return

-                
+

         # Put the widget in a sizer and the sizer in the testPanel
         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(w, 0, wx.ALL, 5)
         # Put the widget in a sizer and the sizer in the testPanel
         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(w, 0, wx.ALL, 5)


@@ -274,25 +273,35 @@ class LayoutTestFrame(wx.Frame):
         # make the destroy button be default now
         self.destroyBtn.SetDefault()
 
         # make the destroy button be default now
         self.destroyBtn.SetDefault()
 

+
+        if True:
+            print 'w size', w.GetSize()
+            print 'w minsize', w.GetMinSize()
+            print 'w bestsize', w.GetBestSize()
+            print 'w abstsize', w.GetAdjustedBestSize()
+        
+            tp = self.testPanel
+            #print tp.GetSizer()
+            print 'tp size', tp.GetSize()
+            print 'tp minsize', tp.GetMinSize()
+            print 'tp bestsize', tp.GetBestSize()
+            print 'tp abstsize', tp.GetAdjustedBestSize()
+            

         
 
     def OnDestroyWidget(self, evt):
         self.testWidget.Destroy()
         self.testWidget = None
         self.testPanel.SetSizer(None, True)
         
 
     def OnDestroyWidget(self, evt):
         self.testWidget.Destroy()
         self.testWidget = None
         self.testPanel.SetSizer(None, True)

-        self.bottomSizer.Layout()

 
 

+        # ensure the panel shrinks again
+        self.testPanel.SetSizeHints((20,20)) 
+        self.bottomSizer.Layout()
+        self.testPanel.SetSizeHints(wx.DefaultSize)
+        

         # make the create button be default now
         self.createBtn.SetDefault()
 
         # make the create button be default now
         self.createBtn.SetDefault()
 

-##         tp = self.testPanel
-##         print tp.GetSizer()
-##         print 'size', tp.GetSize()
-##         print 'minsize', tp.GetMinSize()
-##         print 'bestsize', tp.GetBestSize()
-##         print 'abstsize', tp.GetAdjustedBestSize()
-
-

 
     def OnClear(self, evt):
         self.moduleName.SetValue("")
 
     def OnClear(self, evt):
         self.moduleName.SetValue("")