removed DoGetSize implementation

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

diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index 31a388a11e34877d25e18f4443b297251930127f..53d8b4a130b411b96d0e76ea90a42cb2bbc696f5 100644 (file)
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -16,7 +16,7 @@ class MyCanvas(wxScrolledWindow):
         self.maxHeight = 1000
         self.x = self.y = 0
         self.curLine = []
         self.maxHeight = 1000
         self.x = self.y = 0
         self.curLine = []

-        self.drawing = false
+        self.drawing = False

 
         self.SetBackgroundColour("WHITE")
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
 
         self.SetBackgroundColour("WHITE")
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))


@@ -39,6 +39,7 @@ class MyCanvas(wxScrolledWindow):
         EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
         EVT_MOTION(self,    self.OnLeftButtonEvent)
         EVT_PAINT(self, self.OnPaint)
         EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
         EVT_MOTION(self,    self.OnLeftButtonEvent)
         EVT_PAINT(self, self.OnPaint)

+        ##EVT_MOUSEWHEEL(self, self.OnWheel)

 
 
     def getWidth(self):
 
 
     def getWidth(self):


@@ -87,7 +88,7 @@ class MyCanvas(wxScrolledWindow):
         dc.SetPen(wxGREEN_PEN)
         dc.DrawSpline(lst+[(100,100)])
 
         dc.SetPen(wxGREEN_PEN)
         dc.DrawSpline(lst+[(100,100)])
 

-        dc.DrawBitmap(self.bmp, 200, 20, true)
+        dc.DrawBitmap(self.bmp, 200, 20, True)

         dc.SetTextForeground(wxColour(0, 0xFF, 0x80))
         dc.DrawText("a bitmap", 200, 85)
 
         dc.SetTextForeground(wxColour(0, 0xFF, 0x80))
         dc.DrawText("a bitmap", 200, 85)
 


@@ -109,7 +110,8 @@ class MyCanvas(wxScrolledWindow):
         for style in [wxDOT, wxLONG_DASH, wxSHORT_DASH, wxDOT_DASH, wxUSER_DASH]:
             pen = wxPen("DARK ORCHID", 1, style)
             if style == wxUSER_DASH:
         for style in [wxDOT, wxLONG_DASH, wxSHORT_DASH, wxDOT_DASH, wxUSER_DASH]:
             pen = wxPen("DARK ORCHID", 1, style)
             if style == wxUSER_DASH:

-                pen.SetDashes([1, 2, 3, 4, 5, 6, 7, 8])
+                pen.SetCap(wxCAP_BUTT)
+                pen.SetDashes([1,2])

                 pen.SetColour("RED")
             dc.SetPen(pen)
             dc.DrawLine(300, y, 400, y)
                 pen.SetColour("RED")
             dc.SetPen(pen)
             dc.DrawLine(300, y, 400, y)


@@ -147,10 +149,11 @@ class MyCanvas(wxScrolledWindow):
 
     def OnLeftButtonEvent(self, event):
         if event.LeftDown():
 
     def OnLeftButtonEvent(self, event):
         if event.LeftDown():

+            self.SetFocus()

             self.SetXY(event)
             self.curLine = []
             self.CaptureMouse()
             self.SetXY(event)
             self.curLine = []
             self.CaptureMouse()

-            self.drawing = true
+            self.drawing = True

 
         elif event.Dragging() and self.drawing:
             if BUFFERED:
 
         elif event.Dragging() and self.drawing:
             if BUFFERED:


@@ -176,7 +179,7 @@ class MyCanvas(wxScrolledWindow):
             self.lines.append(self.curLine)
             self.curLine = []
             self.ReleaseMouse()
             self.lines.append(self.curLine)
             self.curLine = []
             self.ReleaseMouse()

-            self.drawing = false
+            self.drawing = False

 
 
 ## This is an example of what to do for the EVT_MOUSEWHEEL event,
 
 
 ## This is an example of what to do for the EVT_MOUSEWHEEL event,


@@ -188,6 +191,7 @@ class MyCanvas(wxScrolledWindow):
 ##         delta = evt.GetWheelDelta()
 ##         rot = evt.GetWheelRotation()
 ##         linesPer = evt.GetLinesPerAction()
 ##         delta = evt.GetWheelDelta()
 ##         rot = evt.GetWheelRotation()
 ##         linesPer = evt.GetLinesPerAction()

+##         print delta, rot, linesPer

 ##         ws = self.wheelScroll
 ##         ws = ws + rot
 ##         lines = ws / delta
 ##         ws = self.wheelScroll
 ##         ws = ws + rot
 ##         lines = ws / delta


@@ -211,13 +215,14 @@ def runTest(frame, nb, log):
 
 
 
 
 
 

+overview = """\
+"""

 
 
 
 
 
 
 
 

+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])

 
 

-
-
-
-overview = """\
-"""