fixed child windows scrolling to use wxSIZE_ALLOW_MINUS_ONE

[wxWidgets.git] / wxPython / demo / ScrolledPanel.py

diff --git a/wxPython/demo/ScrolledPanel.py b/wxPython/demo/ScrolledPanel.py
index 34aa549a55605ed67e70634813fd9b07ddd05959..e5226cf72895e94efc5a2461c79254e8d7094a1d 100644 (file)
--- a/wxPython/demo/ScrolledPanel.py
+++ b/wxPython/demo/ScrolledPanel.py
@@ -34,10 +34,15 @@ class TestPanel(scrolled.ScrolledPanel):
 
         for word in words:
             label = wx.StaticText(panel1, -1, word+":")
 
         for word in words:
             label = wx.StaticText(panel1, -1, word+":")

-            if word == "three":
-                tc = wx.TextCtrl(panel1, -1, word, size=(150,-1))
-            else:
-                tc = wx.TextCtrl(panel1, -1, word, size=(50,-1))
+
+            # A test for scrolling with a too big control
+            #if word == "three":
+            #    tc = wx.TextCtrl(panel1, -1, word, size=(150,-1))
+            #else:
+            #    tc = wx.TextCtrl(panel1, -1, word, size=(50,-1))
+
+            tc = wx.TextCtrl(panel1, -1, word, size=(50,-1))
+

             fgs1.Add(label, flag=wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=10)
             fgs1.Add(tc, flag=wx.RIGHT, border=10)
 
             fgs1.Add(label, flag=wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border=10)
             fgs1.Add(tc, flag=wx.RIGHT, border=10)
 


@@ -76,14 +81,14 @@ class TestPanel(scrolled.ScrolledPanel):
 
         hbox = wx.BoxSizer(wx.HORIZONTAL)
         hbox.Add((20,20))
 
         hbox = wx.BoxSizer(wx.HORIZONTAL)
         hbox.Add((20,20))

-        hbox.Add(panel1, 0)
+        hbox.Add(panel1, 0, wx.FIXED_MINSIZE)

         hbox.Add((40, 10))
 
         vbox2 = wx.BoxSizer(wx.VERTICAL)
         hbox.Add((40, 10))
 
         vbox2 = wx.BoxSizer(wx.VERTICAL)

-        vbox2.Add(panel2, 0)
+        vbox2.Add(panel2, 0, wx.FIXED_MINSIZE)

         vbox2.Add((20, 50))
 
         vbox2.Add((20, 50))
 

-        vbox2.Add(panel3, 0)
+        vbox2.Add(panel3, 0, wx.FIXED_MINSIZE)

         vbox2.Add((20, 10))
         hbox.Add(vbox2)
 
         vbox2.Add((20, 10))
         hbox.Add(vbox2)