even more fixes for nmake compilation

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

diff --git a/utils/wxPython/demo/wxScrolledWindow.py b/utils/wxPython/demo/wxScrolledWindow.py
index 7012e38f9a9f3b9dad4b9cea94f509b7220769b7..e565d8d394b6b774bfb70b946f8f3cc04a739b96 100644 (file)
--- a/utils/wxPython/demo/wxScrolledWindow.py
+++ b/utils/wxPython/demo/wxScrolledWindow.py
@@ -8,6 +8,8 @@ class MyCanvas(wxScrolledWindow):
         wxScrolledWindow.__init__(self, parent, -1, wxPoint(0, 0), wxPyDefaultSize, wxSUNKEN_BORDER)
 
         self.lines = []
         wxScrolledWindow.__init__(self, parent, -1, wxPoint(0, 0), wxPyDefaultSize, wxSUNKEN_BORDER)
 
         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)


@@ -18,7 +20,13 @@ class MyCanvas(wxScrolledWindow):
         bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
         self.bmp = bmp
 
         bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
         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 +37,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)


@@ -56,7 +63,7 @@ class MyCanvas(wxScrolledWindow):
 
         dc.DrawBitmap(self.bmp, 200, 20)
         dc.SetTextForeground(wxColour(0, 0xFF, 0x80))
 
         dc.DrawBitmap(self.bmp, 200, 20)
         dc.SetTextForeground(wxColour(0, 0xFF, 0x80))

-        dc.DrawText("a bitmap", 200, 80)
+        dc.DrawText("a bitmap", 200, 85)

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