Updates for new/old DC method signatures, also updated setup.py for

new py2exe


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

wxPython/samples/doodle/doodle.py

@@ -174,7 +174,7 @@ class DoodleWindow(wx.Window):
             dc.BeginDrawing()
             dc.SetPen(self.pen)
             pos = event.GetPosition()
-            coords = (self.pos, pos)
+            coords = (self.pos.x, self.pos.y, pos.x, pos.y)
             self.curLine.append(coords)
             dc.DrawLine(*coords)
             self.pos = pos

wxPython/samples/doodle/setup.py

@@ -11,6 +11,7 @@ from distutils.core import setup
 import py2exe
 
 setup( name = "superdoodle",
-       scripts = ["superdoodle.py"]
+       #console = ["superdoodle.py", "doodle.py"]
+       windows = ["superdoodle.py", "doodle.py"]
        )
 

wxPython/samples/doodle/superdoodle.py

@@ -321,7 +321,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()
 
 
@@ -399,5 +399,5 @@ class DoodleApp(wx.App):
 #----------------------------------------------------------------------
 
 if __name__ == '__main__':
-    app = DoodleApp(0)
+    app = DoodleApp(redirect=True)
     app.MainLoop()