From a6905d8b558f1a0d258365b815bff0b5b5c76a0b Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 31 May 2005 09:06:27 +0000 Subject: [PATCH] Version number updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 4 ++-- docs/gtk/install.txt | 2 +- docs/latex/wx/manual.tex | 4 ++-- docs/mac/install.txt | 2 +- docs/mac/readme.txt | 2 +- docs/mgl/install.txt | 4 ++-- docs/mgl/readme.txt | 2 +- docs/motif/install.txt | 4 ++-- docs/motif/readme.txt | 4 ++-- docs/msw/install.txt | 6 ++--- docs/msw/wince/readme.txt | 4 ++-- docs/os2/install.txt | 48 ++++++++++++++++++------------------- docs/publicity/announce.txt | 4 ++-- docs/readme.txt | 4 ++-- docs/wine/readme.txt | 4 ++-- docs/x11/install.txt | 4 ++-- docs/x11/readme.txt | 4 ++-- 17 files changed, 53 insertions(+), 53 deletions(-) diff --git a/configure.in b/configure.in index fd9c60681d..354166c554 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.6.0], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.6.1], [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]) @@ -66,7 +66,7 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number WX_CURRENT=0 -WX_REVISION=0 +WX_REVISION=1 WX_AGE=0 diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index 6e0b380372..f2cdfe4d84 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.0, gcc 2.95.4, Redhat 6.2 + example: wxGTK 2.6.1, 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 6cb0f2d954..d821104044 100644 --- a/docs/latex/wx/manual.tex +++ b/docs/latex/wx/manual.tex @@ -26,13 +26,13 @@ %\special{!/@scaleunit 1 def} \parskip=10pt \parindent=0pt -\title{wxWidgets 2.6.0: A portable C++ and Python GUI toolkit} +\title{wxWidgets 2.6.1: A portable C++ and Python GUI toolkit} \winhelponly{\author{by Julian Smart et al %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$} }} \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn, et al} -\date{April, 2005} +\date{June, 2005} } \makeindex \begin{document} diff --git a/docs/mac/install.txt b/docs/mac/install.txt index b04d0cb10b..07ff3c61c5 100644 --- a/docs/mac/install.txt +++ b/docs/mac/install.txt @@ -1,4 +1,4 @@ -wxWidgets 2.6.0 for Mac installation +wxWidgets 2.6.1 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 616f2756bb..42450ae884 100644 --- a/docs/mac/readme.txt +++ b/docs/mac/readme.txt @@ -1,4 +1,4 @@ -Welcome to wxWidgets/Mac 2.6.0 +Welcome to wxWidgets/Mac 2.6.1 More Information is available from the wxWidgets project home page at diff --git a/docs/mgl/install.txt b/docs/mgl/install.txt index 39491ee7e0..ba494e77c6 100644 --- a/docs/mgl/install.txt +++ b/docs/mgl/install.txt @@ -1,4 +1,4 @@ -wxWidgets 2.6.0 for MGL installation +wxWidgets 2.6.1 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.0, gcc 2.95.3, Redhat 7.0 + example: wxMGL 2.6.1, gcc 2.95.3, Redhat 7.0 First steps ----------- diff --git a/docs/mgl/readme.txt b/docs/mgl/readme.txt index a75802a2ef..8cf99e2215 100644 --- a/docs/mgl/readme.txt +++ b/docs/mgl/readme.txt @@ -1,5 +1,5 @@ - Welcome to wxWidgets/MGL 2.6.0 + Welcome to wxWidgets/MGL 2.6.1 You have downloaded version 2.6.0 of the MGL port of the wxWidgets GUI library. This runs on top of SciTech MGL library diff --git a/docs/motif/install.txt b/docs/motif/install.txt index eeeb14245b..491ea8099a 100644 --- a/docs/motif/install.txt +++ b/docs/motif/install.txt @@ -1,4 +1,4 @@ -wxWidgets 2.6.0 for Motif installation +wxWidgets 2.6.1 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.0, gcc 2.95.4, Redhat 6.1 + example: wxMotif 2.6.1, gcc 2.95.4, Redhat 6.1 First steps ----------- diff --git a/docs/motif/readme.txt b/docs/motif/readme.txt index b9fe741737..6a736f87e6 100644 --- a/docs/motif/readme.txt +++ b/docs/motif/readme.txt @@ -1,7 +1,7 @@ - Welcome to wxWidgets/Motif 2.6.0 + Welcome to wxWidgets/Motif 2.6.1 -You have downloaded version 2.6.0 of the Motif port of +You have downloaded version 2.6.1 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 6e942f8ffb..1851bae7f7 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -1,7 +1,7 @@ -Installing wxWidgets 2.6.0 +Installing wxWidgets 2.6.1 ----------------------------------------------------------- -This is wxWidgets 2.6.0 for Microsoft Windows 9x/ME, Windows NT, +This is wxWidgets 2.6.1 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.0.zip and the setup version. + included in wxMSW-2.6.1.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/msw/wince/readme.txt b/docs/msw/wince/readme.txt index b6b535ad69..957d79be1a 100644 --- a/docs/msw/wince/readme.txt +++ b/docs/msw/wince/readme.txt @@ -1,9 +1,9 @@ ================================================= - Welcome to wxWidgets/CE 2.6.0 + Welcome to wxWidgets/CE 2.6.1 ================================================= -You have downloaded version 2.6.0 of the Windows CE port of +You have downloaded version 2.6.1 of the Windows CE port of the wxWidgets GUI library. This runs on Pocket PC 2002/2003, Smartphone 2002/2003, and Windows CE .NET 4.x. diff --git a/docs/os2/install.txt b/docs/os2/install.txt index f2b752f9bb..a954ced80d 100644 --- a/docs/os2/install.txt +++ b/docs/os2/install.txt @@ -1,7 +1,7 @@ -Installing wxWidgets 2.6.0 +Installing wxWidgets 2.6.1 -------------------------- -This is wxWidgets 2.6.0 for IBM OS/2 Warp3 and Warp4. This is an unstable +This is wxWidgets 2.6.1 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.0, copy the .zip files to there and unzip them ensuring you +C:\wx\wxWidgets-2.6.1, 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.0.zip, documentation +All but the documentation is included in wxOS2-2.6.1.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.0\docs (your HTML reference manual) -x:\wx\wxWidgets-2.6.0\include\wx -x:\wx\wxWidgets-2.6.0\include\wx\generic -x:\wx\wxWidgets-2.6.0\include\wx\html -x:\wx\wxWidgets-2.6.0\include\wx\os2 -x:\wx\wxWidgets-2.6.0\samples\.... (all the sample directories) -x:\wx\wxWidgets-2.6.0\src -x:\wx\wxWidgets-2.6.0\src\common -x:\wx\wxWidgets-2.6.0\src\generic -x:\wx\wxWidgets-2.6.0\src\html -x:\wx\wxWidgets-2.6.0\src\jpeg -x:\wx\wxWidgets-2.6.0\src\os2 -x:\wx\wxWidgets-2.6.0\src\png -x:\wx\wxWidgets-2.6.0\src\tiff -x:\wx\wxWidgets-2.6.0\src\zlib +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 If you are using VisualAge, you will also need to ensure you have a -\lib directory as well, x:\wx\wxWidgets-2.6.0\lib +\lib directory as well, x:\wx\wxWidgets-2.6.1\lib and you will have to set a WXWIN environment variable in your config.sys, -SET WXWIN=X:\WX\WXWINDOWS-2.6.0; +SET WXWIN=X:\WX\WXWINDOWS-2.6.1; 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.0\build\pm. Now we need to set some environment +\wx\wxWidgets-2.6.1\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.0/install-sh -c +SET INSTALL=/wx/wxWidgets-2.6.1/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.0\build\gtk), you'll have to do a `make clean' first. +\wxWidgets-2.6.1\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/publicity/announce.txt b/docs/publicity/announce.txt index 2eb4313f2e..b9e2e739e3 100644 --- a/docs/publicity/announce.txt +++ b/docs/publicity/announce.txt @@ -1,7 +1,7 @@ -Announcing wxWidgets 2.6.0: a cross-platform GUI toolkit +Announcing wxWidgets 2.6.1: a cross-platform GUI toolkit ---------------------------------------------------------------- -April 30th, 2005 -- the wxWidgets team is pleased to announce +June 5th, 2005 -- the wxWidgets team is pleased to announce a new official release of the mature cross-platform C++ application framework. diff --git a/docs/readme.txt b/docs/readme.txt index 1940621586..b0ab8c35b8 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ -wxWidgets 2.6.0 +wxWidgets 2.6.1 --------------------------------------------------------- Welcome to wxWidgets, a sophisticated cross-platform C++ @@ -153,5 +153,5 @@ web site. Have fun! -The wxWidgets Team, April 2005 +The wxWidgets Team, June 2005 diff --git a/docs/wine/readme.txt b/docs/wine/readme.txt index 561c45be59..b2e00371b6 100644 --- a/docs/wine/readme.txt +++ b/docs/wine/readme.txt @@ -1,7 +1,7 @@ - Welcome to wxWidgets/Wine 2.6.0 + Welcome to wxWidgets/Wine 2.6.1 -You have downloaded version 2.6.0 of the WINE port of +You have downloaded version 2.6.1 of the WINE port of the wxWidgets GUI library. Information on how to install can be found in the file diff --git a/docs/x11/install.txt b/docs/x11/install.txt index 9c2e841259..b4b3083f46 100644 --- a/docs/x11/install.txt +++ b/docs/x11/install.txt @@ -1,4 +1,4 @@ -wxWidgets 2.6.0 for X11 installation +wxWidgets 2.6.1 for X11 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: wxX11 2.6.0, gcc 2.95.4, Redhat 6.2 + example: wxX11 2.6.1, gcc 2.95.4, Redhat 6.2 First steps ----------- diff --git a/docs/x11/readme.txt b/docs/x11/readme.txt index 788b9f6e00..942b9be981 100644 --- a/docs/x11/readme.txt +++ b/docs/x11/readme.txt @@ -1,7 +1,7 @@ - Welcome to wxWidgets/X11 2.6.0 + Welcome to wxWidgets/X11 2.6.1 -You have downloaded version 2.6.0 of the X11 port of +You have downloaded version 2.6.1 of the X11 port of the wxWidgets GUI library. This runs on X11 with no Motif, Xt, GTK+ or any other standard widget set -- instead it uses the wxUniversal widgets. The intention -- 2.45.2