moved gtk/palette.h to generic/paletteg.h

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

diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index 3b6edadb14f486d97b96275ef3044ddbf373128e..cdc526826ecf6650f30a3f37c6f56fd68eeaaa1c 100644 (file)
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -1,6 +1,8 @@
 
 from wxPython.wx import *
 
 
 from wxPython.wx import *
 

+import images
+

 #---------------------------------------------------------------------------
 
 class MyCanvas(wxScrolledWindow):
 #---------------------------------------------------------------------------
 
 class MyCanvas(wxScrolledWindow):


@@ -20,7 +22,7 @@ class MyCanvas(wxScrolledWindow):
 
 
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
 
 
         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
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
         self.bmp = bmp


@@ -42,16 +44,14 @@ class MyCanvas(wxScrolledWindow):
 
     def DoDrawing(self, dc):
         dc.BeginDrawing()
 
     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)
 
         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)
         dc.SetTextForeground(wxColour(0xFF, 0x20, 0xFF))
         te = dc.GetTextExtent("Hello World")
         dc.DrawText("Hello World", 60, 65)


@@ -81,12 +81,9 @@ class MyCanvas(wxScrolledWindow):
         dc.DrawRectangle(50,500,50,50)
         dc.DrawRectangle(100,500,50,50)
 
         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)
 
         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()
 
         self.DrawSavedLines(dc)
         dc.EndDrawing()