diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py
index 7e9827675e..ab36a5428a 100644
--- a/wxPython/demo/About.py
+++ b/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>
diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index 8c9d2713ed..e018d18e10 100644
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/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))
diff --git a/wxPython/distrib/autobuild.py b/wxPython/distrib/autobuild.py
index e6a303fbab..706f00dc1b 100755
--- a/wxPython/distrib/autobuild.py
+++ b/wxPython/distrib/autobuild.py
@@ -7,8 +7,8 @@ cwd = os.getcwd()
 
 logfile = 'c:\\temp\\autobuild.log'
 WXDIR   = os.environ['WXWIN']
-dllVer  = '21_16'
-wxpVer  = '2.1.16'
+dllVer  = '22_0'
+wxpVer  = '2.2.0'
 dateSt  = time.strftime("%Y%m%d", time.localtime(time.time()))
 
 base = os.path.split(sys.argv[0])[0]
diff --git a/wxPython/distrib/build.py b/wxPython/distrib/build.py
index d23a664a1a..3e64e9f736 100755
--- a/wxPython/distrib/build.py
+++ b/wxPython/distrib/build.py
@@ -120,8 +120,8 @@ import sys, os, string, getopt
 # This is really the wxPython version number, and will be placed in the
 # Makefiles for use with the distribution related targets.
 
-major_version = '2.1'
-build_version = '16'
+major_version = '2.2'
+build_version = '0'
 
 __version__ = major_version + '.' + build_version
 
diff --git a/wxPython/distrib/wxPython.WSM b/wxPython/distrib/wxPython.WSM
index 26e9687fea..9205dd5512 100644
Binary files a/wxPython/distrib/wxPython.WSM and b/wxPython/distrib/wxPython.WSM differ
diff --git a/wxPython/distrib/wxPython.wse b/wxPython/distrib/wxPython.wse
index d12d329375..0d82dd645c 100644
--- a/wxPython/distrib/wxPython.wse
+++ b/wxPython/distrib/wxPython.wse
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=6.01
-  Title=wxPython 2.1 Installation
+  Title=wxPython 2.2 Installation
   Flags=10010111
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
@@ -17,7 +17,7 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
-  EXE Filename=wxPython-2.1.16.exe
+  EXE Filename=wxPython-2.2.0.exe
   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6
@@ -55,12 +55,12 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
-  Value=wxPython 2.1
+  Value=wxPython 2.2
   Flags=10000000
 end
 item: Set Variable
   Variable=GROUP
-  Value=wxPython 2.1
+  Value=wxPython 2.2
   Flags=10000000
 end
 item: Set Variable
@@ -819,8 +819,8 @@ item: Install File
   Flags=0000001010000011
 end
 item: Install File
-  Source=c:\projects\wx\lib\wx21_16.dll
-  Destination=%SYS%\wx21_16.dll
+  Source=c:\projects\wx\lib\wx22_0.dll
+  Destination=%SYS%\wx22_0.dll
   Flags=0000001010010010
 end
 item: Install File
diff --git a/wxPython/wxPython/lib/pyshell.py b/wxPython/wxPython/lib/pyshell.py
index 58dd3601ff..e105021a44 100644
--- a/wxPython/wxPython/lib/pyshell.py
+++ b/wxPython/wxPython/lib/pyshell.py
@@ -17,8 +17,8 @@ inside a wxStyledTextCtrl, similar to the Python shell windows found in
 IDLE and PythonWin.
 
 There is still much to be done to improve this class, such as line
-buffering/recall, autoindent, calltips, autocomplete, etc...  But
-it's a good start.
+buffering/recall, autoindent, calltips, autocomplete, fixing the colourizer,
+etc...  But it's a good start.
 
 """
 
@@ -107,7 +107,7 @@ class PyShellWindow(wxStyledTextCtrl, InteractiveInterpreter):
         # Event handlers
         EVT_KEY_DOWN(self, self.OnKey)
         EVT_STC_UPDATEUI(self, ID, self.OnUpdateUI)
-        EVT_STC_STYLENEEDED(self, ID, self.OnStyle)
+        #EVT_STC_STYLENEEDED(self, ID, self.OnStyle)
 
 
     def GetLocals(self): return self.locals