No animate contrib anymore

[wxWidgets.git] / wxPython / samples / doodle / superdoodle.py

diff --git a/wxPython/samples/doodle/superdoodle.py b/wxPython/samples/doodle/superdoodle.py
index 0e8024d63261269267f34f0efccb6a7043f2a7fa..f2f24fecb6a9e1e2cfee1aa376e5e4ed69e1ceab 100644 (file)
--- a/wxPython/samples/doodle/superdoodle.py
+++ b/wxPython/samples/doodle/superdoodle.py
@@ -57,8 +57,7 @@ class DoodleFrame(wx.Frame):
         box.Add(self.doodle, 1, wx.EXPAND)
 
         # Tell the frame that it should layout itself in response to
-        # size events.
-        self.SetAutoLayout(True)
+        # size events using this sizer.
         self.SetSizer(box)
 
 
@@ -181,7 +180,7 @@ class ControlPanel(wx.Panel):
     BMP_BORDER = 3
 
     def __init__(self, parent, ID, doodle):
-        wx.Panel.__init__(self, parent, ID, style=wx.RAISED_BORDER)
+        wx.Panel.__init__(self, parent, ID, style=wx.RAISED_BORDER, size=(20,20))
 
         numCols = 4
         spacing = 4
@@ -295,7 +294,7 @@ class ColourIndicator(wx.Window):
     def __init__(self, parent):
         wx.Window.__init__(self, parent, -1, style=wx.SUNKEN_BORDER)
         self.SetBackgroundColour(wx.WHITE)
-        self.SetSize( (-1, 45) )
+        self.SetSize( (45, 45) )
         self.colour = self.thickness = None
         self.Bind(wx.EVT_PAINT, self.OnPaint)
 
@@ -321,7 +320,7 @@ class ColourIndicator(wx.Window):
             pen = wx.Pen(self.colour, self.thickness)
             dc.BeginDrawing()
             dc.SetPen(pen)
-            dc.DrawLine((10, sz.height/2), (sz.width-10, sz.height/2))
+            dc.DrawLine(10, sz.height/2, sz.width-10, sz.height/2)
             dc.EndDrawing()
 
 
@@ -352,7 +351,7 @@ instructions: </p>
 
 <p><b>SuperDoodle</b> and <b>wxPython</b> are brought to you by
 <b>Robin Dunn</b> and <b>Total Control Software</b>, Copyright
-&copy; 1997-2003.</p>
+&copy; 1997-2006.</p>
 </body>
 </html>
 '''
@@ -399,5 +398,5 @@ class DoodleApp(wx.App):
 #----------------------------------------------------------------------
 
 if __name__ == '__main__':
-    app = DoodleApp(0)
+    app = DoodleApp(redirect=True)
     app.MainLoop()