Changed defined(__DARWIN__) to (defined(__DARWIN__) && defined(__WXMAC__))

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

diff --git a/wxPython/samples/doodle/doodle.py b/wxPython/samples/doodle/doodle.py
index 70bb55aae6514a7523983355b2de9317ef6426f0..4895026e744eda797deac2247e5a27d41c14d344 100644 (file)
--- a/wxPython/samples/doodle/doodle.py
+++ b/wxPython/samples/doodle/doodle.py
@@ -56,12 +56,11 @@ class DoodleWindow(wxWindow):
         # and the refresh event
         EVT_PAINT(self, self.OnPaint)
 
+        # When the window is destroyed, clean up resources.
+        EVT_WINDOW_DESTROY(self, self.Cleanup)
 
-    def __del__(self):
-        self.Cleanup()
 
-
-    def Cleanup(self):
+    def Cleanup(self, evt):
         if hasattr(self, "menu"):
             self.menu.Destroy()
             del self.menu
@@ -75,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):
@@ -126,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):
@@ -181,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):
@@ -193,7 +192,7 @@ class DoodleWindow(wxWindow):
         """
         if self.reInitBuffer:
             self.InitBuffer()
-            self.Refresh(FALSE)
+            self.Refresh(False)
 
 
     def OnPaint(self, event):
@@ -252,6 +251,6 @@ class DoodleFrame(wxFrame):
 if __name__ == '__main__':
     app = wxPySimpleApp()
     frame = DoodleFrame(None)
-    frame.Show(true)
+    frame.Show(True)
     app.MainLoop()