From f02fe2efc8e0788f8d57b59527dc17fff914c40c Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 25 Jul 2005 16:35:16 +0000
Subject: [PATCH] Version number update

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure.in             |  4 ++--
 distrib/msw/makesetup.sh |  2 +-
 distrib/msw/patch.rsp    |  2 +-
 docs/gtk/install.txt     |  2 +-
 docs/latex/wx/manual.tex |  2 +-
 docs/mac/install.txt     |  2 +-
 docs/mac/readme.txt      |  2 +-
 docs/mgl/install.txt     |  4 ++--
 docs/mgl/readme.txt      |  4 ++--
 docs/motif/install.txt   |  4 ++--
 docs/motif/readme.txt    |  4 ++--
 docs/msw/install.txt     |  6 ++---
 docs/os2/install.txt     | 48 ++++++++++++++++++++--------------------
 docs/readme.txt          |  2 +-
 docs/wine/readme.txt     |  4 ++--
 include/wx/version.h     |  4 ++--
 wxBase.spec              |  2 +-
 wxGTK.spec               |  2 +-
 wxGTK_RR.spec            |  2 +-
 wxMGL.spec               |  2 +-
 wxMotif.spec             |  2 +-
 wxWINE.spec              |  2 +-
 wxX11.spec               |  2 +-
 23 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/configure.in b/configure.in
index b96b715a3c..d4a121c1b8 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
-AC_INIT([wxWidgets], [2.6.1], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.6.2], [wx-dev@lists.wxwidgets.org])
 
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
@@ -34,7 +34,7 @@ dnl wx_release_number += 1
 
 wx_major_version_number=2
 wx_minor_version_number=6
-wx_release_number=1
+wx_release_number=2
 wx_subrelease_number=1
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index 646b512fd7..84a2e7383e 100644
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -25,7 +25,7 @@ PROGNAME=$0
 SCRIPTDIR=$WXWIN/distrib/msw
 WEBFILES=c:/wx2dev/wxWebSite
 # Set this to the required version
-VERSION=2.6.1
+VERSION=2.6.2
 
 . $SCRIPTDIR/setup.var
 
diff --git a/distrib/msw/patch.rsp b/distrib/msw/patch.rsp
index 537c676392..00f57df371 100644
--- a/distrib/msw/patch.rsp
+++ b/distrib/msw/patch.rsp
@@ -1,6 +1,6 @@
 include/wx/msw/window.h
 include/wx/msw/listbox.h
-include/src/msw/window.cpp
+src/msw/window.cpp
 include/wx/msw/notebook.h
 include/wx/msw/uxthemep.h
 src/msw/notebook.cpp
diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index b9e2a142f4..8b537bbcd4 100644
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
 
   When sending bug reports tell us what version of wxWidgets you are
   using (including the beta) and what compiler on what system. One
-  example: wxGTK 2.6.1, gcc 2.95.4, Redhat 6.2
+  example: wxGTK 2.6.2, gcc 2.95.4, Redhat 6.2
 
 * The simplest case
 -------------------
diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 2bf4ccffc1..7efc2e8d2f 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -26,7 +26,7 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{wxWidgets 2.6.1: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.6.2: A portable C++ and Python GUI toolkit}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
diff --git a/docs/mac/install.txt b/docs/mac/install.txt
index 07ff3c61c5..6fff2a4940 100644
--- a/docs/mac/install.txt
+++ b/docs/mac/install.txt
@@ -1,4 +1,4 @@
-wxWidgets 2.6.1 for Mac installation
+wxWidgets 2.6.2 for Mac installation
 ------------------------------------
 
 On MacOS X, you can download Apple's free developer tools (gcc
diff --git a/docs/mac/readme.txt b/docs/mac/readme.txt
index 42450ae884..aa00de9b0e 100644
--- a/docs/mac/readme.txt
+++ b/docs/mac/readme.txt
@@ -1,4 +1,4 @@
-Welcome to wxWidgets/Mac 2.6.1
+Welcome to wxWidgets/Mac 2.6.2
 
 More Information is available from the wxWidgets project home page at
 
diff --git a/docs/mgl/install.txt b/docs/mgl/install.txt
index ba494e77c6..5e09ad4f94 100644
--- a/docs/mgl/install.txt
+++ b/docs/mgl/install.txt
@@ -1,4 +1,4 @@
-wxWidgets 2.6.1 for MGL installation
+wxWidgets 2.6.2 for MGL installation
 ------------------------------------
 
 IMPORTANT NOTE:
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
   
   When sending bug reports tell us what version of wxWidgets you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxMGL 2.6.1, gcc 2.95.3, Redhat 7.0
+  example: wxMGL 2.6.2, gcc 2.95.3, Redhat 7.0
 
 First steps
 -----------
diff --git a/docs/mgl/readme.txt b/docs/mgl/readme.txt
index 8cf99e2215..3194893b78 100644
--- a/docs/mgl/readme.txt
+++ b/docs/mgl/readme.txt
@@ -1,7 +1,7 @@
 
-  Welcome to wxWidgets/MGL 2.6.1
+  Welcome to wxWidgets/MGL 2.6.2
 
-You have downloaded version 2.6.0 of the MGL port of
+You have downloaded version 2.6.2 of the MGL port of
 the wxWidgets GUI library. This runs on top of SciTech MGL library
 (http://www.scitechsoft.com) that is available for variety of 
 operating systems and comes with support for embedded devices.
diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 491ea8099a..6ebeb616c3 100644
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -1,4 +1,4 @@
-wxWidgets 2.6.1 for Motif installation
+wxWidgets 2.6.2 for Motif installation
 ------------------------------------
 
 IMPORTANT NOTE:
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
   
   When sending bug reports tell us what version of wxWidgets you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxMotif 2.6.1, gcc 2.95.4, Redhat 6.1
+  example: wxMotif 2.6.2, gcc 2.95.4, Redhat 6.1
 
 First steps
 -----------
diff --git a/docs/motif/readme.txt b/docs/motif/readme.txt
index 6a736f87e6..b915d87101 100644
--- a/docs/motif/readme.txt
+++ b/docs/motif/readme.txt
@@ -1,7 +1,7 @@
 
-  Welcome to wxWidgets/Motif 2.6.1
+  Welcome to wxWidgets/Motif 2.6.2
 
-You have downloaded version 2.6.1 of the Motif port of
+You have downloaded version 2.6.2 of the Motif port of
 the wxWidgets GUI library.
 
 More information about the wxWidgets project as a whole
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 1851bae7f7..f44d135c02 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -1,7 +1,7 @@
-Installing wxWidgets 2.6.1
+Installing wxWidgets 2.6.2
 -----------------------------------------------------------
 
-This is wxWidgets 2.6.1 for Microsoft Windows 9x/ME, Windows NT,
+This is wxWidgets 2.6.2 for Microsoft Windows 9x/ME, Windows NT,
 Windows 2000, Windows XP and Windows CE.
 
 These installation notes can be found in docs/msw/install.txt
@@ -264,7 +264,7 @@ Metrowerks CodeWarrior compilation
 ----------------------------------------------------------------
 
 1. CodeWarrior Pro 7 project files in XML format are already
-   included in wxMSW-2.6.1.zip and the setup version.
+   included in wxMSW-2.6.2.zip and the setup version.
 
 2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if
    you are working from the CVS version) to make sure the settings reflect
diff --git a/docs/os2/install.txt b/docs/os2/install.txt
index a954ced80d..245c212c61 100644
--- a/docs/os2/install.txt
+++ b/docs/os2/install.txt
@@ -1,7 +1,7 @@
-Installing wxWidgets 2.6.1
+Installing wxWidgets 2.6.2
 --------------------------
 
-This is wxWidgets 2.6.1 for IBM OS/2 Warp3 and Warp4. This is an unstable
+This is wxWidgets 2.6.2 for IBM OS/2 Warp3 and Warp4. This is an unstable
 development release and OS/2 is considered to be in beta.
 
 IMPORTANT NOTE: If you experience problems installing, please
@@ -17,7 +17,7 @@ Unarchiving
 At this time there is no comprehensive setup.exe type installation program.
 wxWidgets for OS/2 requires you download various .zip files and unpack them
 to your desired location on your system.  Pick a location say,
-C:\wx\wxWidgets-2.6.1, copy the .zip files to there and unzip them ensuring you
+C:\wx\wxWidgets-2.6.2, copy the .zip files to there and unzip them ensuring you
 unzip the subdirectories as well.  You will need:
 
 - All common, generic and OS2-specific wxWidgets source;
@@ -30,7 +30,7 @@ unzip the subdirectories as well.  You will need:
 - PNG library source;
 - ZLIB library source;
 
-All but the documentation is included in wxOS2-2.6.1.zip, documentation
+All but the documentation is included in wxOS2-2.6.2.zip, documentation
 must be downloaded separately from the wxWidgets Web site.
 
 Other add-on packages are available from the wxWidgets Web site, such as:
@@ -46,27 +46,27 @@ General installation notes
 After unzipping everything your directory tree should look something like
 this:
 
-x:\wx\wxWidgets-2.6.1\docs (your HTML reference manual)
-x:\wx\wxWidgets-2.6.1\include\wx
-x:\wx\wxWidgets-2.6.1\include\wx\generic
-x:\wx\wxWidgets-2.6.1\include\wx\html
-x:\wx\wxWidgets-2.6.1\include\wx\os2
-x:\wx\wxWidgets-2.6.1\samples\....  (all the sample directories)
-x:\wx\wxWidgets-2.6.1\src
-x:\wx\wxWidgets-2.6.1\src\common
-x:\wx\wxWidgets-2.6.1\src\generic
-x:\wx\wxWidgets-2.6.1\src\html
-x:\wx\wxWidgets-2.6.1\src\jpeg
-x:\wx\wxWidgets-2.6.1\src\os2
-x:\wx\wxWidgets-2.6.1\src\png
-x:\wx\wxWidgets-2.6.1\src\tiff
-x:\wx\wxWidgets-2.6.1\src\zlib
+x:\wx\wxWidgets-2.6.2\docs (your HTML reference manual)
+x:\wx\wxWidgets-2.6.2\include\wx
+x:\wx\wxWidgets-2.6.2\include\wx\generic
+x:\wx\wxWidgets-2.6.2\include\wx\html
+x:\wx\wxWidgets-2.6.2\include\wx\os2
+x:\wx\wxWidgets-2.6.2\samples\....  (all the sample directories)
+x:\wx\wxWidgets-2.6.2\src
+x:\wx\wxWidgets-2.6.2\src\common
+x:\wx\wxWidgets-2.6.2\src\generic
+x:\wx\wxWidgets-2.6.2\src\html
+x:\wx\wxWidgets-2.6.2\src\jpeg
+x:\wx\wxWidgets-2.6.2\src\os2
+x:\wx\wxWidgets-2.6.2\src\png
+x:\wx\wxWidgets-2.6.2\src\tiff
+x:\wx\wxWidgets-2.6.2\src\zlib
 
 If you are using VisualAge, you will also need to ensure you have a
-\lib directory as well, x:\wx\wxWidgets-2.6.1\lib
+\lib directory as well, x:\wx\wxWidgets-2.6.2\lib
 and you will have to set a WXWIN environment variable in your
 config.sys,
-SET WXWIN=X:\WX\WXWINDOWS-2.6.1;
+SET WXWIN=X:\WX\WXWINDOWS-2.6.2;
 
 Compilation
 -----------
@@ -176,13 +176,13 @@ developping cross-platform applications you might want to compile (and
 update) e.g. wxGTK or wxX11 as well.
 
 In the following, let's assume you decided to build in
-\wx\wxWidgets-2.6.1\build\pm. Now we need to set some environment
+\wx\wxWidgets-2.6.2\build\pm. Now we need to set some environment
 variables, namely MAKESHELL (to a Unix like shell, let's assume ash)
 and INSTALL (to point to the install script. If you omit this, configure
 might find something like the system's tcpip\pcomos\install.exe which will
 not do the thing you want), e.g.
 SET MAKESHELL=ash
-SET INSTALL=/wx/wxWidgets-2.6.1/install-sh -c
+SET INSTALL=/wx/wxWidgets-2.6.2/install-sh -c
 
 Be warned that depending on the precise version of your make, the
 variable that needs to be set might be MAKE_SHELL instead of MAKESHELL.
@@ -225,7 +225,7 @@ Finally, if you also want to build a different port, e.g. wxGTK, you
 essentially have to use the procedure described above, the only difference
 being that you have to pass a switch to configure indicating which port
 to build. If you do not do this in a separate build directory (e.g.
-\wxWidgets-2.6.1\build\gtk), you'll have to do a `make clean' first.
+\wxWidgets-2.6.2\build\gtk), you'll have to do a `make clean' first.
 The magical switches that have to be passed to configure for the various
 ports are --with-gtk (wxGTK), --with-motif (wxMotif), --with-x11 (wxX11),
 and --disable-gui (wxBase). Note that contrary to the native, PM based
diff --git a/docs/readme.txt b/docs/readme.txt
index b0ab8c35b8..9aaae80092 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWidgets 2.6.1
+wxWidgets 2.6.2
 ---------------------------------------------------------
 
 Welcome to wxWidgets, a sophisticated cross-platform C++
diff --git a/docs/wine/readme.txt b/docs/wine/readme.txt
index b2e00371b6..9f19a49c63 100644
--- a/docs/wine/readme.txt
+++ b/docs/wine/readme.txt
@@ -1,7 +1,7 @@
 
-  Welcome to wxWidgets/Wine 2.6.1
+  Welcome to wxWidgets/Wine 2.6.2
 
-You have downloaded version 2.6.1 of the WINE port of 
+You have downloaded version 2.6.2 of the WINE port of 
 the wxWidgets GUI library.
 
 Information on how to install can be found in the file
diff --git a/include/wx/version.h b/include/wx/version.h
index 0e344117db..7f8b9fc5c5 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -21,9 +21,9 @@
 /*      so don't change its format too much or they could break */
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      6
-#define wxRELEASE_NUMBER     1
+#define wxRELEASE_NUMBER     2
 #define wxSUBRELEASE_NUMBER  1
-#define wxVERSION_STRING   _T("wxWidgets 2.6.1")
+#define wxVERSION_STRING   _T("wxWidgets 2.6.2")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */
diff --git a/wxBase.spec b/wxBase.spec
index bd35c83f3a..c4433d4dbf 100644
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.6.1
+%define ver  2.6.2
 %define ver2 2.6
 %define rel  1
 
diff --git a/wxGTK.spec b/wxGTK.spec
index ff111cb3c3..904896be43 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,5 +1,5 @@
 %define _prefix /opt/gnome
-%define ver  2.6.1
+%define ver  2.6.2
 %define ver2 2.6
 %define rel  1
 
diff --git a/wxGTK_RR.spec b/wxGTK_RR.spec
index ff111cb3c3..904896be43 100644
--- a/wxGTK_RR.spec
+++ b/wxGTK_RR.spec
@@ -1,5 +1,5 @@
 %define _prefix /opt/gnome
-%define ver  2.6.1
+%define ver  2.6.2
 %define ver2 2.6
 %define rel  1
 
diff --git a/wxMGL.spec b/wxMGL.spec
index b5399bb526..a1f763aa06 100644
--- a/wxMGL.spec
+++ b/wxMGL.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.6.1
+%define ver 2.6.2
 %define ver2 2.6
 %define rel 1
 
diff --git a/wxMotif.spec b/wxMotif.spec
index 179d8d127c..3b796ab2ff 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.6.1
+%define ver  2.6.2
 %define ver2 2.6
 %define rel  1
 
diff --git a/wxWINE.spec b/wxWINE.spec
index 157d41c8e7..c80afaca77 100644
--- a/wxWINE.spec
+++ b/wxWINE.spec
@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.6.1
+%define ver 2.6.2
 %define rel 1
 
 Summary: The WINE port of the wxWindows library
diff --git a/wxX11.spec b/wxX11.spec
index d1c63b140d..c3add880b9 100644
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.6.1
+%define ver  2.6.2
 %define ver2 2.6
 %define rel  1
 
-- 
2.50.0

