Committing in .

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

diff --git a/utils/wxPython/demo/wxScrolledWindow.py b/utils/wxPython/demo/wxScrolledWindow.py
index 9586cd1bc01acb709d022edf3d5e3a8b3740b8b8..b51757f6c25110571d74259a068c9624bb1f5b38 100644 (file)
--- a/utils/wxPython/demo/wxScrolledWindow.py
+++ b/utils/wxPython/demo/wxScrolledWindow.py
@@ -4,10 +4,12 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 class MyCanvas(wxScrolledWindow):
 #---------------------------------------------------------------------------
 
 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.lines = []

+        self.maxWidth  = 1000
+        self.maxHeight = 1000

 
         self.SetBackgroundColour(wxNamedColor("WHITE"))
         self.Connect(-1, -1, wxEVT_LEFT_DOWN, self.OnLeftButtonEvent)
 
         self.SetBackgroundColour(wxNamedColor("WHITE"))
         self.Connect(-1, -1, wxEVT_LEFT_DOWN, self.OnLeftButtonEvent)


@@ -15,10 +17,18 @@ class MyCanvas(wxScrolledWindow):
         self.Connect(-1, -1, wxEVT_MOTION,    self.OnLeftButtonEvent)
 
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         self.Connect(-1, -1, wxEVT_MOTION,    self.OnLeftButtonEvent)
 
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))

-        #bmp = wxBitmap('bitmaps/image.bmp', wxBITMAP_TYPE_BMP)
-        #self.bmp = bmp
+        bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
+        self.bmp = bmp

 
 

-        self.SetScrollbars(20, 20, 50, 50)
+        self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
+
+    def getWidth(self):
+        return self.maxWidth
+
+    def getHeight(self):
+        return self.maxHeight

 
 
     def OnPaint(self, event):
 
 
     def OnPaint(self, event):


@@ -29,7 +39,6 @@ class MyCanvas(wxScrolledWindow):
 
     def DoDrawing(self, dc):
         dc.BeginDrawing()
 
     def DoDrawing(self, dc):
         dc.BeginDrawing()

-        #dc.Clear()

         pen1 = wxPen(wxNamedColour('RED'))
         dc.SetPen(pen1)
         dc.DrawRectangle(5, 5, 50, 50)
         pen1 = wxPen(wxNamedColour('RED'))
         dc.SetPen(pen1)
         dc.DrawRectangle(5, 5, 50, 50)


@@ -54,9 +63,15 @@ class MyCanvas(wxScrolledWindow):
         dc.SetPen(wxGREEN_PEN)
         dc.DrawSpline(lst+[(100,100)])
 
         dc.SetPen(wxGREEN_PEN)
         dc.DrawSpline(lst+[(100,100)])
 

-        #dc.DrawBitmap(self.bmp, 200, 20)
-        #dc.SetTextForeground(wxColour(0, 0xFF, 0x80))
-        #dc.DrawText("a bitmap", 200, 80)
+        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)

 
         self.DrawSavedLines(dc)
         dc.EndDrawing()
 
         self.DrawSavedLines(dc)
         dc.EndDrawing()