This commit was manufactured by cvs2svn to create tag 'WX_2_4_1'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_4_1@21086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/wxScrolledWindow.py

@@ -16,7 +16,7 @@ class MyCanvas(wxScrolledWindow):
         self.maxHeight = 1000
         self.x = self.y = 0
         self.curLine = []
-        self.drawing = false
+        self.drawing = False
 
         self.SetBackgroundColour("WHITE")
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
@@ -88,10 +88,15 @@ class MyCanvas(wxScrolledWindow):
         dc.SetPen(wxGREEN_PEN)
         dc.DrawSpline(lst+[(100,100)])
 
-        dc.DrawBitmap(self.bmp, 200, 20, true)
+        dc.DrawBitmap(self.bmp, 200, 20, True)
         dc.SetTextForeground(wxColour(0, 0xFF, 0x80))
         dc.DrawText("a bitmap", 200, 85)
 
+##         dc.SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL))
+##         dc.SetTextForeground("BLACK")
+##         dc.DrawText("TEST this STRING", 10, 200)
+##         print dc.GetFullTextExtent("TEST this STRING")
+
         font = wxFont(20, wxSWISS, wxNORMAL, wxNORMAL)
         dc.SetFont(font)
         dc.SetTextForeground(wxBLACK)
@@ -149,10 +154,11 @@ class MyCanvas(wxScrolledWindow):
 
     def OnLeftButtonEvent(self, event):
         if event.LeftDown():
+            self.SetFocus()
             self.SetXY(event)
             self.curLine = []
             self.CaptureMouse()
-            self.drawing = true
+            self.drawing = True
 
         elif event.Dragging() and self.drawing:
             if BUFFERED:
@@ -178,7 +184,7 @@ class MyCanvas(wxScrolledWindow):
             self.lines.append(self.curLine)
             self.curLine = []
             self.ReleaseMouse()
-            self.drawing = false
+            self.drawing = False
 
 
 ## This is an example of what to do for the EVT_MOUSEWHEEL event,