second merge of the 2.2 branch (RL)

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

wxPython/demo/About.py

@@ -25,7 +25,7 @@ sit back and enjoy.  Be sure to take a peek at the source code for each
 demo item so you can learn how to use the classes yourself.</p>
 
 <p><b>wxPython</b> is brought to you by <b>Robin Dunn</b> and<br>
-<b>Total Control Software</b>, Copyright (c) 1997-1999.</p>
+<b>Total Control Software</b>, Copyright (c) 1997-2000.</p>
 
 <p>
 <font size="-1">Please see <i>license.txt</i> for licensing information.</font>

wxPython/demo/GridSimple.py

@@ -30,6 +30,9 @@ class SimpleGrid(wxGrid):
         # you can set cell attributes for the whole row (or column)
         self.SetRowAttr(5, attr)
 
+        self.SetColLabelValue(0, "Custom")
+        self.SetColLabelValue(1, "column")
+        self.SetColLabelValue(2, "labels")
 
         # test all the events
         EVT_GRID_CELL_LEFT_CLICK(self, self.OnCellLeftClick)

wxPython/demo/Main.py

@@ -70,6 +70,7 @@ class wxPythonDemo(wxFrame):
                          style=wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
 
         self.cwd = os.getcwd()
+        self.curOverview = ""
 
         if wxPlatform == '__WXMSW__':
             self.icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)

wxPython/demo/wxScrolledWindow.py

@@ -100,7 +100,7 @@ class MyCanvas(wxScrolledWindow):
         self.x, self.y = self.ConvertEventCoords(event)
 
     def ConvertEventCoords(self, event):
-        xView, yView = self.ViewStart()
+        xView, yView = self.GetViewStart()
         xDelta, yDelta = self.GetScrollPixelsPerUnit()
         return (event.GetX() + (xView * xDelta),
                 event.GetY() + (yView * yDelta))