2.5 --> 2.6 changes

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

diff --git a/wxPython/distrib/README.1st.txt b/wxPython/distrib/README.1st.txt
index da8e423eae9a2abb6260f06e313b06f511c2dc20..a4699bf9107d0116babf021fe1a08f37bd750b50 100644 (file)
--- a/wxPython/distrib/README.1st.txt
+++ b/wxPython/distrib/README.1st.txt
@@ -1,4 +1,4 @@
-README for wxPython-src-2.5.*.tar.gz
+README for wxPython-src-2.6.*.tar.gz
 ====================================
 
 
@@ -12,7 +12,7 @@ checkout from CVS yourself (see http://www.wxwindows.org/cvs.htm.)  If
 you would like to use CVS to get the exact same sources as one of
 these tarballs then you can update using a release tag.  For example::
 
-      cvs update -r wxPy_2_5_1_0
+      cvs update -r wxPy_2_6_1_0
 
 
 For more details about building and installing wxWidgets and wxPython
@@ -28,8 +28,8 @@ For a log of recent changes check these files::
       wxPython/docs/CHANGES.txt    (for wxPython)
 
 
-And for information about major changes in wxPython 2.5 and how to
-migrate your existing code to 2.5 please read this file::
+And for information about major changes in wxPython 2.6 and how to
+migrate your existing code to 2.6 please read this file::
 
       wxPython/docs/MigrationGuide.txt
 

diff --git a/wxPython/distrib/README.win32.txt b/wxPython/distrib/README.win32.txt
index 291d65906b72d9a38ddc5f86e18d68f7a5dcdfa4..4279f8b12785c212a37381b79d7f0beb77f2473d 100644 (file)
--- a/wxPython/distrib/README.win32.txt
+++ b/wxPython/distrib/README.win32.txt
@@ -21,7 +21,7 @@ page for using wxversion.
 This installer does *not* include the wxPython documentation, the
 wxPython demo and other sample applications are provided as part of
 wxPython.  Those are available in a separate installer named
-wxPython2.5-win32-docs-demos-*.exe which should also be located from
+wxPython2.6-win32-docs-demos-*.exe which should also be located from
 wherever you downloaded this package from.  The Docs and Demos
 installer will also create Start Menu shortcuts for the tool scripts
 mentioned above.

diff --git a/wxPython/distrib/makedev.bat b/wxPython/distrib/makedev.bat
index f50a670ce086ac370328a0096178f2d6ce34fdfb..31df78063b5a29e4b708d5eda8981c2f14616b03 100755 (executable)
--- a/wxPython/distrib/makedev.bat
+++ b/wxPython/distrib/makedev.bat
@@ -67,9 +67,9 @@ rem del /sxzy @del-dirs
 rm del-files
 rm del-dirs
 
-rem *** bundle it all up  TODO: don't hard-code the 2.5
-tar cvf ../dist/wxPython2.5-win32-devel-%1.tar wxPython-%1
-gzip -9 ../dist/wxPython2.5-win32-devel-%1.tar
+rem *** bundle it all up  TODO: don't hard-code the 2.6
+tar cvf ../dist/wxPython2.6-win32-devel-%1.tar wxPython-%1
+gzip -9 ../dist/wxPython2.6-win32-devel-%1.tar
 
 rem *** cleanup
 cd ..

diff --git a/wxPython/docs/BUILD.txt b/wxPython/docs/BUILD.txt
index 7fe299fef0dae6774e11fc33cde373c23dcc6b04..8a084764f0f96c120d01ad43fd043670e0ede27e 100644 (file)
--- a/wxPython/docs/BUILD.txt
+++ b/wxPython/docs/BUILD.txt
@@ -1,11 +1,11 @@
-Building wxPython 2.5 for Development and Testing
+Building wxPython 2.6 for Development and Testing
 =================================================
 
 This file describes how I build wxWidgets and wxPython while doing
 development and testing, and is meant to help other people that want
 to do the same thing.  I'll assume that you are using either a CVS
 snapshot from http://wxWidgets.org/snapshots/, a checkout from CVS, or
-one of the released wxPython-src-2.5.* tarballs.  I'll also assume that
+one of the released wxPython-src-2.6.* tarballs.  I'll also assume that
 you know your way around your system, the compiler, etc. and most
 importantly, that you know what you are doing!  ;-)
 
@@ -74,7 +74,7 @@ place, then do the same for wxPython.
          cd $WXDIR
          mkdir bld
          cd bld
-         ../configure --prefix=/opt/wx/2.5 \
+         ../configure --prefix=/opt/wx/2.6 \
                       --with-gtk \
                       --with-opengl \
                       --enable-debug \
@@ -112,14 +112,14 @@ place, then do the same for wxPython.
                          
                       --enable-unicode \
 
-   Notice that I used a prefix of /opt/wx/2.5.  You can use whatever
+   Notice that I used a prefix of /opt/wx/2.6.  You can use whatever
    path you want, such as a path in your HOME dir or even one of the
    standard prefix paths such as /usr or /usr/local if you like, but
    using /opt this way lets me easily have multiple versions and ports
    of wxWidgets "installed" and makes it easy to switch between them,
    without impacting any versions of wxWidgets that may have been
    installed via an RPM or whatever.  For the rest of the steps below
-   be sure to also substitute "/opt/wx/2.5" with whatever prefix you
+   be sure to also substitute "/opt/wx/2.6" with whatever prefix you
    choose for your build.
 
    If you want to use the image and zlib libraries included with
@@ -152,9 +152,9 @@ place, then do the same for wxPython.
          .make install
 
    When it's done you should have an installed set of files under
-   /opt/wx/2.5 containing just wxWidgets.  Now to use this version of
-   wxWidgets you just need to add /opt/wx/2.5/bin to the PATH and set
-   LD_LIBRARY_PATH (or DYLD_LIBRARY_PATH on OS X) to /opt/wx/2.5/lib.
+   /opt/wx/2.6 containing just wxWidgets.  Now to use this version of
+   wxWidgets you just need to add /opt/wx/2.6/bin to the PATH and set
+   LD_LIBRARY_PATH (or DYLD_LIBRARY_PATH on OS X) to /opt/wx/2.6/lib.
 
 
 3. I also have a script to help me build wxPython and it is checked in
@@ -187,7 +187,7 @@ place, then do the same for wxPython.
    other version of it found first, then you can add this to the
    command line to ensure your new one is used instead::
 
-         WX_CONFIG=/opt/wx/2.5/bin/wx-config
+         WX_CONFIG=/opt/wx/2.6/bin/wx-config
 
    By default setup.py will assume that you built wxWidgets to use
    GTK2.  If you built wxWidgets to use GTK 1.2.x then you should add
@@ -222,7 +222,7 @@ place, then do the same for wxPython.
    PYTHONPATH to the wxPython dir located in the source tree.  For
    example::
 
-        export LD_LIBRARY_PATH=/opt/wx/2.5/lib
+        export LD_LIBRARY_PATH=/opt/wx/2.6/lib
         export PYTHONPATH=$WXDIR/wxPython
         cd $WXDIR/wxPython/demo
         python2.3 demo.py

diff --git a/wxPython/docs/INSTALL.txt b/wxPython/docs/INSTALL.txt
index eaa7e3e2da2dbccdc33300a171994a94b7a9f055..848359181f2d9d3cd0091eeb4d26c49153f12cae 100644 (file)
--- a/wxPython/docs/INSTALL.txt
+++ b/wxPython/docs/INSTALL.txt
@@ -1,4 +1,4 @@
-Installing wxPython 2.5 from Source
+Installing wxPython 2.6 from Source
 ===================================
 
 
@@ -48,7 +48,7 @@ Installing on Unix-like Systems (not OS X)
    path into the binaries by using the rpath option when configuring
    wxWidgets.  For example::
 
-                     --enable-rpath=/opt/wx/2.5/lib \
+                     --enable-rpath=/opt/wx/2.6/lib \
 
    SOLARIS NOTE: The --enable-rpath option may cause problems when
    using wxGTK on Solaris when compiling wxPython as described below.

diff --git a/wxPython/docs/MigrationGuide.txt b/wxPython/docs/MigrationGuide.txt
index c10c126ab1e2b0ca07a2306ca7993a44d563d9ff..d2c915508c53966cc9d929b9f12ac4ab3c8fc7fa 100644 (file)
--- a/wxPython/docs/MigrationGuide.txt
+++ b/wxPython/docs/MigrationGuide.txt
@@ -1,9 +1,9 @@
 ============================
-wxPython 2.5 Migration Guide
+wxPython 2.6 Migration Guide
 ============================
 
 This document will help explain some of the major changes in wxPython
-2.5 since the 2.4 series and let you know what you need to do to adapt
+2.6 since the 2.4 series and let you know what you need to do to adapt
 your programs to those changes.  Be sure to also check in the CHANGES_
 file like usual to see info about the not so major changes and other
 things that have been added to wxPython.