Tcl regex lib

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

diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index ad1fa7becad7bd8fc19afb09d863fb3f0e6a4b04..e0ad207b73c710469d4734ff0e6788034b5e06ca 100644 (file)
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -19,11 +19,6 @@ class MyCanvas(wxScrolledWindow):
         self.drawing = false
 
         self.SetBackgroundColour("WHITE")
-        EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
-        EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
-        EVT_MOTION(self,    self.OnLeftButtonEvent)
-        EVT_PAINT(self, self.OnPaint)
-
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         bmp = images.getTest2Bitmap()
         mask = wxMaskColour(bmp, wxBLUE)
@@ -40,6 +35,12 @@ class MyCanvas(wxScrolledWindow):
             dc.Clear()
             self.DoDrawing(dc)
 
+        EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
+        EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
+        EVT_MOTION(self,    self.OnLeftButtonEvent)
+        EVT_PAINT(self, self.OnPaint)
+        ##EVT_MOUSEWHEEL(self, self.OnWheel)
+
 
     def getWidth(self):
         return self.maxWidth
@@ -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:
-                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)
@@ -188,6 +190,7 @@ class MyCanvas(wxScrolledWindow):
 ##         delta = evt.GetWheelDelta()
 ##         rot = evt.GetWheelRotation()
 ##         linesPer = evt.GetLinesPerAction()
+##         print delta, rot, linesPer
 ##         ws = self.wheelScroll
 ##         ws = ws + rot
 ##         lines = ws / delta
@@ -211,13 +214,14 @@ def runTest(frame, nb, log):
 
 
 
+overview = """\
+"""
 
 
 
 
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
 
-
-
-
-overview = """\
-"""