converted some args to return values

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

diff --git a/utils/wxPython/demo/wxScrolledWindow.py b/utils/wxPython/demo/wxScrolledWindow.py
index b51757f6c25110571d74259a068c9624bb1f5b38..44b5f9fd93d679e51e1722fcf3873ee288eff8be 100644 (file)
--- a/utils/wxPython/demo/wxScrolledWindow.py
+++ b/utils/wxPython/demo/wxScrolledWindow.py
@@ -73,10 +73,19 @@ class MyCanvas(wxScrolledWindow):
         for a in range(0, 360, 45):
             dc.DrawRotatedText("Rotated text...", 300, 300, a)
 
+        dc.SetPen(wxTRANSPARENT_PEN)
+        dc.SetBrush(wxBLUE_BRUSH)
+        dc.DrawRectangle(50,500,50,50)
+        dc.DrawRectangle(100,500,50,50)
+
+        #from wxPython import dch
+        #dch.FillRect(dc, wxRect(50, 400, 50, 50), wxBLACK)
+
         self.DrawSavedLines(dc)
         dc.EndDrawing()
 
 
+
     def DrawSavedLines(self, dc):
         dc.SetPen(wxPen(wxNamedColour('MEDIUM FOREST GREEN'), 4))
         for line in self.lines:
@@ -97,8 +106,10 @@ class MyCanvas(wxScrolledWindow):
         if event.LeftDown():
             self.SetXY(event)
             self.curLine = []
+            self.CaptureMouse()
 
         elif event.Dragging():
+            print event.GetPosition()
             dc = wxClientDC(self)
             self.PrepareDC(dc)
             dc.BeginDrawing()
@@ -112,6 +123,7 @@ class MyCanvas(wxScrolledWindow):
         elif event.LeftUp():
             self.lines.append(self.curLine)
             self.curLine = []
+            self.ReleaseMouse()
 
 #---------------------------------------------------------------------------