X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c368d904fc27d35ae1e533155e2154dc496432e4..f07bb01b1816dbaaa1b4538e8fbf912190eef501:/wxPython/demo/wxScrolledWindow.py diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py index 3b6edadb14..c248b4ba98 100644 --- a/wxPython/demo/wxScrolledWindow.py +++ b/wxPython/demo/wxScrolledWindow.py @@ -42,16 +42,14 @@ class MyCanvas(wxScrolledWindow): def DoDrawing(self, dc): dc.BeginDrawing() - pen1 = wxPen(wxNamedColour('RED')) - dc.SetPen(pen1) + dc.SetPen(wxPen(wxNamedColour('RED'))) dc.DrawRectangle(5, 5, 50, 50) dc.SetBrush(wxLIGHT_GREY_BRUSH) dc.SetPen(wxPen(wxNamedColour('BLUE'), 4)) dc.DrawRectangle(15, 15, 50, 50) - font = wxFont(14, wxSWISS, wxNORMAL, wxNORMAL) - dc.SetFont(font) + dc.SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL)) dc.SetTextForeground(wxColour(0xFF, 0x20, 0xFF)) te = dc.GetTextExtent("Hello World") dc.DrawText("Hello World", 60, 65) @@ -81,12 +79,9 @@ class MyCanvas(wxScrolledWindow): dc.DrawRectangle(50,500,50,50) dc.DrawRectangle(100,500,50,50) - dc.SetPen(pen1) + dc.SetPen(wxPen(wxNamedColour('RED'))) dc.DrawEllipticArc(200, 500, 50, 75, 0, 90) - #from wxPython import dch - #dch.FillRect(dc, wxRect(50, 400, 50, 50), wxBLACK) - self.DrawSavedLines(dc) dc.EndDrawing()