Emptied patch.rsp

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

diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index 5f90e34f5a0ae9fa35b4056e085838274c975f7e..15806b1319d11230e9e87de36223fce278198fd9 100644 (file)
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -17,10 +17,8 @@ class MyCanvas(wxScrolledWindow):
         EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
         EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
         EVT_MOTION(self,    self.OnLeftButtonEvent)
         EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
         EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
         EVT_MOTION(self,    self.OnLeftButtonEvent)

-

         EVT_PAINT(self, self.OnPaint)
 
         EVT_PAINT(self, self.OnPaint)
 

-

         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         bmp = images.getTest2Bitmap()
         mask = wxMaskColour(bmp, wxBLUE)
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         bmp = images.getTest2Bitmap()
         mask = wxMaskColour(bmp, wxBLUE)


@@ -29,6 +27,7 @@ class MyCanvas(wxScrolledWindow):
 
         self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
 
 
         self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
 

+

     def getWidth(self):
         return self.maxWidth
 
     def getWidth(self):
         return self.maxWidth
 


@@ -84,6 +83,27 @@ class MyCanvas(wxScrolledWindow):
         dc.SetPen(wxPen(wxNamedColour('RED')))
         dc.DrawEllipticArc(200, 500, 50, 75, 0, 90)
 
         dc.SetPen(wxPen(wxNamedColour('RED')))
         dc.DrawEllipticArc(200, 500, 50, 75, 0, 90)
 

+        y = 20
+        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.SetColour("RED")
+            dc.SetPen(pen)
+            dc.DrawLine(300, y, 400, y)
+            y = y + 10
+
+        dc.SetBrush(wxNullBrush)
+        dc.SetPen(wxPen(wxColour(0xFF, 0x20, 0xFF), 1, wxSOLID))
+        dc.DrawRectangle(450, 50, 100, 100)
+        old_pen = dc.GetPen()
+        new_pen = wxPen("BLACK", 5)
+        dc.SetPen(new_pen)
+        dc.DrawRectangle(470, 70, 60, 60)
+        dc.SetPen(old_pen)
+        dc.DrawRectangle(490, 90, 20, 20)
+
+

         self.DrawSavedLines(dc)
         dc.EndDrawing()
 
         self.DrawSavedLines(dc)
         dc.EndDrawing()