X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05f30eecb7fbe4b923e8c0ff13b1a97a03cb75d3..922ba68045d84789ab1dfceb4d1aa1b6e2c5e810:/wxPython/demo/wxScrolledWindow.py?ds=sidebyside diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py index bb679ceb44..15806b1319 100644 --- 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_PAINT(self, self.OnPaint) - 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) + def getWidth(self): return self.maxWidth @@ -90,11 +89,21 @@ 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()