X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0569df0fc965c911275f9015e1774b37a7f8f064..e1437298456a5b4904075f20733282e7771816aa:/wxPython/demo/wxScrolledWindow.py diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py index c772f2ed66..cdc526826e 100644 --- a/wxPython/demo/wxScrolledWindow.py +++ b/wxPython/demo/wxScrolledWindow.py @@ -1,6 +1,8 @@ from wxPython.wx import * +import images + #--------------------------------------------------------------------------- class MyCanvas(wxScrolledWindow): @@ -20,7 +22,7 @@ class MyCanvas(wxScrolledWindow): self.SetCursor(wxStockCursor(wxCURSOR_PENCIL)) - bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP) + bmp = images.getTest2Bitmap() mask = wxMaskColour(bmp, wxBLUE) bmp.SetMask(mask) self.bmp = bmp @@ -42,7 +44,6 @@ class MyCanvas(wxScrolledWindow): def DoDrawing(self, dc): dc.BeginDrawing() - #pen1 = wxPen(wxNamedColour('RED')) dc.SetPen(wxPen(wxNamedColour('RED'))) dc.DrawRectangle(5, 5, 50, 50) @@ -50,7 +51,6 @@ class MyCanvas(wxScrolledWindow): dc.SetPen(wxPen(wxNamedColour('BLUE'), 4)) dc.DrawRectangle(15, 15, 50, 50) - #font = wxFont(14, wxSWISS, wxNORMAL, wxNORMAL) dc.SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL)) dc.SetTextForeground(wxColour(0xFF, 0x20, 0xFF)) te = dc.GetTextExtent("Hello World")