Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)

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

wxPython/samples/doodle/.cvsignore

@@ -1,2 +1,3 @@
+.DS_Store
 build
 dist

wxPython/samples/doodle/doodle.py

@@ -74,7 +74,7 @@ class DoodleWindow(wxWindow):
         dc.SetBackground(wxBrush(self.GetBackgroundColour()))
         dc.Clear()
         self.DrawLines(dc)
-        self.reInitBuffer = false
+        self.reInitBuffer = False
 
 
     def SetColour(self, colour):
@@ -125,14 +125,14 @@ class DoodleWindow(wxWindow):
     def OnCheckMenuColours(self, event):
         text = self.menuColours[event.GetId()]
         if text == self.colour:
-            event.Check(true)
+            event.Check(True)
         else:
-            event.Check(false)
+            event.Check(False)
     def OnCheckMenuThickness(self, event):
         if event.GetId() == self.thickness:
-            event.Check(true)
+            event.Check(True)
         else:
-            event.Check(false)
+            event.Check(False)
 
 
     def OnLeftDown(self, event):
@@ -180,7 +180,7 @@ class DoodleWindow(wxWindow):
         Called when the window is resized.  We set a flag so the idle
         handler will resize the buffer.
         """
-        self.reInitBuffer = true
+        self.reInitBuffer = True
 
 
     def OnIdle(self, event):
@@ -192,7 +192,7 @@ class DoodleWindow(wxWindow):
         """
         if self.reInitBuffer:
             self.InitBuffer()
-            self.Refresh(FALSE)
+            self.Refresh(False)
 
 
     def OnPaint(self, event):
@@ -251,6 +251,6 @@ class DoodleFrame(wxFrame):
 if __name__ == '__main__':
     app = wxPySimpleApp()
     frame = DoodleFrame(None)
-    frame.Show(true)
+    frame.Show(True)
     app.MainLoop()
 

wxPython/samples/doodle/superdoodle.py

@@ -53,7 +53,7 @@ class DoodleFrame(wxFrame):
 
         # Tell the frame that it should layout itself in response to
         # size events.
-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)
         self.SetSizer(box)
 
 
@@ -213,7 +213,7 @@ class ControlPanel(wxPanel):
         box.Add(tGrid, 0, wxALL, spacing)
         box.Add(ci, 0, wxEXPAND|wxALL, spacing)
         self.SetSizer(box)
-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)
 
         # Resize this window so it is just large enough for the
         # minimum requirements of the sizer.
@@ -348,7 +348,7 @@ instructions: </p>
         lc.height.AsIs()
         button.SetConstraints(lc)
 
-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)
         self.Layout()
         self.CentreOnParent(wxBOTH)
 
@@ -358,9 +358,9 @@ instructions: </p>
 class DoodleApp(wxApp):
     def OnInit(self):
         frame = DoodleFrame(None)
-        frame.Show(true)
+        frame.Show(True)
         self.SetTopWindow(frame)
-        return true
+        return True
 
 
 #----------------------------------------------------------------------