compilation fix

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

diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index 527209813077c80b46fb2d3e7643e18b6772747e..67f38113c301a5276530640a8d46dc6a303739f4 100644 (file)
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -12,6 +12,7 @@ class MyCanvas(wxScrolledWindow):
         self.lines = []
         self.maxWidth  = 1000
         self.maxHeight = 1000
+        self.count = 0
 
         self.SetBackgroundColour(wxNamedColor("WHITE"))
         EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
@@ -36,9 +37,12 @@ class MyCanvas(wxScrolledWindow):
 
 
     def OnPaint(self, event):
+        #self.count += 1
+        #print self.count, "begin paint...",
         dc = wxPaintDC(self)
         self.PrepareDC(dc)
         self.DoDrawing(dc)
+        #print "end paint"
 
 
     def DoDrawing(self, dc):
@@ -89,16 +93,25 @@ class MyCanvas(wxScrolledWindow):
             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()
 
 
-
     def DrawSavedLines(self, dc):
         dc.SetPen(wxPen(wxNamedColour('MEDIUM FOREST GREEN'), 4))
         for line in self.lines: