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/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]

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
 

wxPython/distrib/wxPython.spec

@@ -1,6 +1,6 @@
 %define pref /usr
-%define ver 2.1.16
-%define rpmver 1
+%define ver 2.2.0
+%define rpmver 0
 
 Summary: Cross platform GUI toolkit for use with the Python language.
 Name: wxPython

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