diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt index 526c9de73f..b388e4dc39 100644 --- a/distrib/msw/innotop.txt +++ b/distrib/msw/innotop.txt @@ -4,13 +4,13 @@ [Setup] MinVersion=4.0,4.0 - AppName=wxWindows 2.3.4 + AppName=wxWindows 2.4.0 AppId=wxWindows CreateUninstallRegKey=1 UsePreviousAppDir=0 UsePreviousGroup=0 - AppVersion=2.3.4 - AppVerName=wxWindows 2.3.4 + AppVersion=2.4.0 + AppVerName=wxWindows 2.4.0 AppCopyright=Copyright © The wxWindows Team BackColor=$FF0000 BackColor2=$000000 @@ -19,7 +19,7 @@ WindowStartMaximized=1 WindowVisible=1 WindowResizable=1 - UninstallDisplayName=wxWindows 2.3.4 + UninstallDisplayName=wxWindows 2.4.0 UninstallLogMode=Append DirExistsWarning=auto UninstallFilesDir={app} @@ -28,10 +28,10 @@ CreateAppDir=1 DisableProgramGroupPage=0 AlwaysCreateUninstallIcon=1 - UninstallIconName=Uninstall wxWindows 2.3.4 + UninstallIconName=Uninstall wxWindows 2.4.0 Uninstallable=1 - DefaultDirName=c:\wxWindows_2.3.4 - DefaultGroupName=wxWindows 2.3.4 + DefaultDirName=c:\wxWindows_2.4.0 + DefaultGroupName=wxWindows 2.4.0 LicenseFile=C:\wx24\wxWindows\docs\licence.txt InfoBeforeFile=C:\wx24\wxWindows\docs\readme.txt InfoAfterFile=C:\wx24\wxWindows\docs\msw\install.txt @@ -41,6 +41,6 @@ DiskClusterSize=512 ReserveBytes=0 UseSetupLdr=1 - SourceDir=c:\wx24\wxWindows\deliver\wxWindows-2.3.4 + SourceDir=c:\wx24\wxWindows\deliver\wxWindows-2.4.0 OutputDir=c:\wx24\wxWindows\deliver diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat index 2cdf280f57..5f2bb2ae62 100755 --- a/distrib/msw/zipdistinno.bat +++ b/distrib/msw/zipdistinno.bat @@ -7,7 +7,7 @@ set webfiles=c:\wx2dev\wxWebSite set inno=0 Rem Set this to the required version -set version=2.3.4 +set version=2.4.0 if "%src" == "" goto usage if "%dest" == "" goto usage diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index c261b9aa29..2999a2995e 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -1,4 +1,4 @@ -wxWindows 2.3 for GTK installation +wxWindows 2.4 for GTK installation ---------------------------------- IMPORTANT NOTE: @@ -11,7 +11,7 @@ IMPORTANT NOTE: When sending bug reports tell us what version of wxWindows you are using (including the beta) and what compiler on what system. One - example: wxGTK 2.3.4, gcc 2.95.4, Redhat 6.2 + example: wxGTK 2.4.0, gcc 2.95.4, Redhat 6.2 * The simplest case ------------------- @@ -44,7 +44,7 @@ If you want to remove wxWindows on Unix you can do this: * The GTK+ 2 case ----------------- -wxGTK 2.3.4 has support for the new version 2.0.X of GTK+. This means +wxGTK 2.4.0 has support for the new version 2.0.X of GTK+. This means that wxGTK apps can now make use Unicode as the underlying encoding for all text operations. This is a very fundamental change and will need time to stabilize, so be careful. Anyways, after installing a diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt index 7b954792f3..c110682f77 100644 --- a/docs/gtk/readme.txt +++ b/docs/gtk/readme.txt @@ -1,7 +1,7 @@ - Welcome to wxWindows/Gtk 2.3 + Welcome to wxWindows/Gtk 2.4 -you have downloaded version 2.3 of the GTK port of the +you have downloaded version 2.4 of the GTK port of the wxWindows GUI library. wxWindows no longer supports GTK 1.0 (as did some early diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex index 91e3b2aa0e..900ca246b2 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{wxWindows 2.3.4: A portable C++ and Python GUI toolkit} +\title{wxWindows 2.4.0: 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{November 2002} +\date{December 2002} } \makeindex \begin{document} diff --git a/docs/motif/install.txt b/docs/motif/install.txt index 6444041525..005100d99f 100644 --- a/docs/motif/install.txt +++ b/docs/motif/install.txt @@ -1,4 +1,4 @@ -wxWindows 2.3 for Motif installation +wxWindows 2.4 for Motif installation ------------------------------------ IMPORTANT NOTE: @@ -11,7 +11,7 @@ IMPORTANT NOTE: When sending bug reports tell us what version of wxWindows you are using (including the beta) and what compiler on what system. One - example: wxMotif 2.3.4, gcc 2.95.4, Redhat 6.1 + example: wxMotif 2.4.0, gcc 2.95.4, Redhat 6.1 First steps ----------- diff --git a/docs/motif/readme.txt b/docs/motif/readme.txt index 363c122331..cb9610d0d2 100644 --- a/docs/motif/readme.txt +++ b/docs/motif/readme.txt @@ -1,7 +1,7 @@ - Welcome to wxWindows/Motif 2.3.4 + Welcome to wxWindows/Motif 2.4.0 -You have downloaded version 2.3.4 of the Motif port of +You have downloaded version 2.4.0 of the Motif port of the wxWindows GUI library. More information about the wxWindows project as a whole diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 93b948fa1f..6f7ea2fd0d 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -1,8 +1,8 @@ -Installing wxWindows 2.3.4 +Installing wxWindows 2.4.0 -------------------------- -This is wxWindows 2.3.4 for Microsoft Windows 9x/ME, Windows NT, +This is wxWindows 2.4.0 for Microsoft Windows 9x/ME, Windows NT, Windows 2000 and Windows XP. This is an unstable development release. Please note that the library naming conventions for VC++ @@ -235,7 +235,7 @@ Compiling using the makefiles (updated 24 Sept 02): set WXWIN=c:\wxwindows to your autoexec.bat file], The WXWIN variable should contain neither spaces nor - You may like to use the short form as shown by a dos directory listing ; - eg instead of c:\wxwindows-2.3.4 use c:\wxwind~1.4 + eg instead of c:\wxwindows-2.4.0 use c:\wxwind~1.4 Reboot if needed for the changes to autoexec.bat to take effect. 2. Change directory to src\msw. Type 'make -f makefile.b32' to make the wxWindows core library. Ignore the compiler warnings. @@ -408,7 +408,7 @@ Metrowerks CodeWarrior compilation ---------------------------------- 1. CodeWarrior Pro7 project files in XML format are already - included in wxMSW-2.3.4.zip and the setup version. + included in wxMSW-2.4.0.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 what you want. If you aren't sure, leave it alone and go with the diff --git a/docs/os2/install.txt b/docs/os2/install.txt index 1202b6de32..f491137d5a 100644 --- a/docs/os2/install.txt +++ b/docs/os2/install.txt @@ -1,7 +1,7 @@ -Installing wxWindows 2.3.4 +Installing wxWindows 2.4.0 -------------------------- -This is wxWindows 2.3.4 for IBM OS/2 Warp3 and Warp4. This is an unstable +This is wxWindows 2.4.0 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. wxWindows 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\wxWindows-2.3.4, copy the .zip files to there and unzip them ensuring you +C:\wx\wxWindows-2.4.0, 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 wxWindows 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.3.4.zip, documentation +All but the documentation is included in wxOS2-2.4.0.zip, documentation must be downloaded separately from the wxWindows Web site. Other add-on packages are available from the wxWindows Web site, such as: @@ -46,27 +46,27 @@ General installation notes After unzipping everything your directory tree should look something like this: -x:\wx\wxWindows-2.3.4\docs (your HTML reference manual) -x:\wx\wxWindows-2.3.4\include\wx -x:\wx\wxWindows-2.3.4\include\wx\generic -x:\wx\wxWindows-2.3.4\include\wx\html -x:\wx\wxWindows-2.3.4\include\wx\os2 -x:\wx\wxWindows-2.3.4\samples\.... (all the sample directories) -x:\wx\wxWindows-2.3.4\src -x:\wx\wxWindows-2.3.4\src\common -x:\wx\wxWindows-2.3.4\src\generic -x:\wx\wxWindows-2.3.4\src\html -x:\wx\wxWindows-2.3.4\src\jpeg -x:\wx\wxWindows-2.3.4\src\os2 -x:\wx\wxWindows-2.3.4\src\png -x:\wx\wxWindows-2.3.4\src\tiff -x:\wx\wxWindows-2.3.4\src\zlib +x:\wx\wxWindows-2.4.0\docs (your HTML reference manual) +x:\wx\wxWindows-2.4.0\include\wx +x:\wx\wxWindows-2.4.0\include\wx\generic +x:\wx\wxWindows-2.4.0\include\wx\html +x:\wx\wxWindows-2.4.0\include\wx\os2 +x:\wx\wxWindows-2.4.0\samples\.... (all the sample directories) +x:\wx\wxWindows-2.4.0\src +x:\wx\wxWindows-2.4.0\src\common +x:\wx\wxWindows-2.4.0\src\generic +x:\wx\wxWindows-2.4.0\src\html +x:\wx\wxWindows-2.4.0\src\jpeg +x:\wx\wxWindows-2.4.0\src\os2 +x:\wx\wxWindows-2.4.0\src\png +x:\wx\wxWindows-2.4.0\src\tiff +x:\wx\wxWindows-2.4.0\src\zlib If you are using VisualAge, you will also need to ensure you have a -\lib directory as well, x:\wx\wxWindows-2.3.4\lib +\lib directory as well, x:\wx\wxWindows-2.4.0\lib and you will have to set a WXWIN environment variable in your config.sys, -SET WXWIN=X:\WX\WXWINDOWS-2.3.4; +SET WXWIN=X:\WX\WXWINDOWS-2.4.0; 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\wxWindows-2.3.4\build\pm. Now we need to set some environment +\wx\wxWindows-2.4.0\build\pm. Now we need to set some environment variables, namely MAKE_SHELL (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 MAKE_SHELL=ash -SET INSTALL=/wx/wxWindows-2.3.4/install-sh. +SET INSTALL=/wx/wxWindows-2.4.0/install-sh. Be warned that depending on the precise version of your make, setting MAKE_SHELL might not be sufficient, it might be necessary to set SHELL @@ -224,7 +224,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. -\wxWindows-2.3.4\build\gtk), you'll have to do a `make clean' first. +\wxWindows-2.4.0\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/x11/install.txt b/docs/x11/install.txt index 3f0e8c2452..7c672c7d21 100644 --- a/docs/x11/install.txt +++ b/docs/x11/install.txt @@ -1,4 +1,4 @@ -wxWindows 2.3 for X11 installation +wxWindows 2.4 for X11 installation ---------------------------------- IMPORTANT NOTE: @@ -11,12 +11,12 @@ IMPORTANT NOTE: When sending bug reports tell us what version of wxWindows you are using (including the beta) and what compiler on what system. One - example: wxX11 2.3.4, gcc 2.95.4, Redhat 6.2 + example: wxX11 2.4.0, gcc 2.95.4, Redhat 6.2 First steps ----------- -- Download wxWindows-X-x.y.z.tgz, where x.y.z is the version number. +- Download wxX11-x.y.z.tgz, where x.y.z is the version number. Download documentation in a preferred format, such as wxWindows-HTML.zip or wxWindows-PDF.zip. @@ -137,7 +137,8 @@ YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried... * GUI libraries --------------- -wxWindows/X11 requires the X11 library to be installed on your system. +wxWindows/X11 only requires the X11 system to be installed. TinyX +will also suffice. * Additional libraries ---------------------- @@ -498,5 +499,5 @@ compiler and the error message(s) to the wxwin-developers mailing list at: wx-dev@lists.wxwindows.org -Julian Smart, Robert Roebling and Vadim Zeitlin, February 2002. +Julian Smart, Robert Roebling and Vadim Zeitlin, Decemver 2002. diff --git a/docs/x11/readme.txt b/docs/x11/readme.txt index a9ece6e956..f8f752cba1 100644 --- a/docs/x11/readme.txt +++ b/docs/x11/readme.txt @@ -1,11 +1,12 @@ - Welcome to wxWindows/X11 2.3.4 + Welcome to wxWindows/X11 2.4.0 -You have downloaded version 2.3.4 of the X11 port of +You have downloaded version 2.4.0 of the X11 port of the wxWindows 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 is to have it run on NanoX as well as desktop X11. +The wxX11 distribution also includes the wxMotif port. More information about the wxWindows project as a whole can be found at: