Some updates and fixes

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

diff --git a/utils/wxPython/demo/wxScrolledWindow.py b/utils/wxPython/demo/wxScrolledWindow.py
index e565d8d394b6b774bfb70b946f8f3cc04a739b96..d04508458f6f052a792bfdf94d04a699057ffcb4 100644 (file)
--- a/utils/wxPython/demo/wxScrolledWindow.py
+++ b/utils/wxPython/demo/wxScrolledWindow.py
@@ -4,8 +4,8 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 class MyCanvas(wxScrolledWindow):
-    def __init__(self, parent):
-        wxScrolledWindow.__init__(self, parent, -1, wxPoint(0, 0), wxPyDefaultSize, wxSUNKEN_BORDER)
+    def __init__(self, parent, id = -1, size = wxDefaultSize):
+        wxScrolledWindow.__init__(self, parent, id, wxPoint(0, 0), size, wxSUNKEN_BORDER)
 
         self.lines = []
         self.maxWidth  = 1000
@@ -18,6 +18,8 @@ class MyCanvas(wxScrolledWindow):
 
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         self.bmp = bmp
 
         self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
@@ -61,14 +63,29 @@ class MyCanvas(wxScrolledWindow):
         dc.SetPen(wxGREEN_PEN)
         dc.DrawSpline(lst+[(100,100)])
 
-        dc.DrawBitmap(self.bmp, 200, 20)
+        dc.DrawBitmap(self.bmp, 200, 20, true)
         dc.SetTextForeground(wxColour(0, 0xFF, 0x80))
         dc.DrawText("a bitmap", 200, 85)
 
+        font = wxFont(20, wxSWISS, wxNORMAL, wxNORMAL)
+        dc.SetFont(font)
+        dc.SetTextForeground(wxBLACK)
+        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: