Version changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-01 16:49:41 +00:00
parent e44b4b86f1
commit e63aab5adf
27 changed files with 81 additions and 94 deletions

View File

@@ -143,6 +143,7 @@ contrib/samples/animate/*.txt
contrib/samples/animate/*.ico
contrib/samples/animate/*.bmp
contrib/samples/animate/*.rc
contrib/samples/animate/*.gif
contrib/samples/animate/AniTestVC.dsp
contrib/samples/animate/AniTestVC.dsw

View File

@@ -32,7 +32,7 @@
; DO NOT DELETE THEM or you may be unable to reload the script
;[ScriptSetup]
;VerNum=2.4.0
;VerNum=2.4.1
;InnoVer=1.3
;AddVerTo=AppVerName
;SetupFilename=setup.exe

View File

@@ -4,13 +4,13 @@
[Setup]
MinVersion=4.0,4.0
AppName=wxWindows 2.4.0
AppName=wxWindows 2.4.1
AppId=wxWindows
CreateUninstallRegKey=1
UsePreviousAppDir=0
UsePreviousGroup=0
AppVersion=2.4.0
AppVerName=wxWindows 2.4.0
AppVersion=2.4.1
AppVerName=wxWindows 2.4.1
AppCopyright=Copyright <20> The wxWindows Team
BackColor=$FF0000
BackColor2=$000000
@@ -19,7 +19,7 @@
WindowStartMaximized=1
WindowVisible=1
WindowResizable=1
UninstallDisplayName=wxWindows 2.4.0
UninstallDisplayName=wxWindows 2.4.1
UninstallLogMode=Append
DirExistsWarning=auto
UninstallFilesDir={app}
@@ -28,10 +28,10 @@
CreateAppDir=1
DisableProgramGroupPage=0
AlwaysCreateUninstallIcon=1
UninstallIconName=Uninstall wxWindows 2.4.0
UninstallIconName=Uninstall wxWindows 2.4.1
Uninstallable=1
DefaultDirName=c:\wxWindows_2.4.0
DefaultGroupName=wxWindows 2.4.0
DefaultDirName=c:\wxWindows_2.4.1
DefaultGroupName=wxWindows 2.4.1
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.4.0
SourceDir=c:\wx24\wxWindows\deliver\wxWindows-2.4.1
OutputDir=c:\wx24\wxWindows\deliver

View File

@@ -59,6 +59,10 @@ doinit()
cp $WXSRC/docs/mac/readme.txt $WXDEST/readme-mac-${WXVER}.txt
cp $WXSRC/docs/mac/install.txt $WXDEST/install-mac-${WXVER}.txt
cp $WXSRC/docs/os2/install.txt $WXDEST/install-os2-${WXVER}.txt
# Make .mo files
cd $WXSRC/locale
make allmo
}
dospinwxgtk()

View File

@@ -7,7 +7,7 @@ set webfiles=c:\wx2dev\wxWebSite
set inno=0
Rem Set this to the required version
set version=2.4.0
set version=2.4.1
if "%src" == "" goto usage
if "%dest" == "" goto usage
@@ -271,6 +271,7 @@ echo Unzipping the Windows files into wxWindows-%version%
unzip32 -o wxWindows-%version%-win.zip
unzip32 -o wxWindows-%version%-VC.zip -d wxWindows-%version
unzip32 -o wxWindows-%version%-BC.zip -d wxWindows-%version
unzip32 -o wxWindows-%version%-CW.zip -d wxWindows-%version
unzip32 -o wxWindows-%version%-HTMLHelp.zip
unzip32 -o wxWindows-%version%-ExtraDoc.zip
Rem Need Word file, for Remstar DB classes

View File

@@ -44,7 +44,7 @@ If you want to remove wxWindows on Unix you can do this:
* The GTK+ 2 case
-----------------
wxGTK 2.4.0 has support for the new version 2.0.X of GTK+. This means
wxGTK 2.4.1 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

View File

@@ -26,7 +26,7 @@
%\special{!/@scaleunit 1 def}
\parskip=10pt
\parindent=0pt
\title{wxWindows 2.4.0: A portable C++ and Python GUI toolkit}
\title{wxWindows 2.4.1: A portable C++ and Python GUI toolkit}
\winhelponly{\author{by Julian Smart et al
%\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
}}

View File

@@ -1,4 +1,4 @@
wxWindows 2.3 for MGL installation
wxWindows 2.4 for MGL 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: wxMGL 2.3.4, gcc 2.95.3, Redhat 7.0
example: wxMGL 2.4.1, gcc 2.95.3, Redhat 7.0
First steps
-----------

View File

@@ -1,7 +1,7 @@
Welcome to wxWindows/MGL 2.3
Welcome to wxWindows/MGL 2.4
You have downloaded version 2.3 of the MGL port of
You have downloaded version 2.4 of the MGL port of
the wxWindows 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.

View File

@@ -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.4.0, gcc 2.95.4, Redhat 6.1
example: wxMotif 2.4.1, gcc 2.95.4, Redhat 6.1
First steps
-----------

View File

@@ -1,7 +1,7 @@
Welcome to wxWindows/Motif 2.4.0
Welcome to wxWindows/Motif 2.4.1
You have downloaded version 2.4.0 of the Motif port of
You have downloaded version 2.4.1 of the Motif port of
the wxWindows GUI library.
More information about the wxWindows project as a whole

View File

@@ -1,8 +1,8 @@
Installing wxWindows 2.4.0
Installing wxWindows 2.4.1
--------------------------
This is wxWindows 2.4.0 for Microsoft Windows 9x/ME, Windows NT,
This is wxWindows 2.4.1 for Microsoft Windows 9x/ME, Windows NT,
Windows 2000 and Windows XP. This is an official release.
Please note that the library naming conventions for VC++
@@ -243,8 +243,7 @@ Compiling using the makefiles (updated 24 Sept 02):
1. Make sure your WXWIN variable is set [e.g add
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.4.0 use c:\wxwind~1.4
You may like to use the short form as shown by a DOS directory listing.
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.
@@ -441,7 +440,7 @@ Metrowerks CodeWarrior compilation
----------------------------------
1. CodeWarrior Pro7 project files in XML format are already
included in wxMSW-2.4.0.zip and the setup version.
included in wxMSW-2.4.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
what you want. If you aren't sure, leave it alone and go with the

View File

@@ -1,7 +1,7 @@
Installing wxWindows 2.4.0
Installing wxWindows 2.4.1
--------------------------
This is wxWindows 2.4.0 for IBM OS/2 Warp3 and Warp4. This is an unstable
This is wxWindows 2.4.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.
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.4.0, copy the .zip files to there and unzip them ensuring you
C:\wx\wxWindows-2.4.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 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.4.0.zip, documentation
All but the documentation is included in wxOS2-2.4.1.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.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
x:\wx\wxWindows-2.4.1\docs (your HTML reference manual)
x:\wx\wxWindows-2.4.1\include\wx
x:\wx\wxWindows-2.4.1\include\wx\generic
x:\wx\wxWindows-2.4.1\include\wx\html
x:\wx\wxWindows-2.4.1\include\wx\os2
x:\wx\wxWindows-2.4.1\samples\.... (all the sample directories)
x:\wx\wxWindows-2.4.1\src
x:\wx\wxWindows-2.4.1\src\common
x:\wx\wxWindows-2.4.1\src\generic
x:\wx\wxWindows-2.4.1\src\html
x:\wx\wxWindows-2.4.1\src\jpeg
x:\wx\wxWindows-2.4.1\src\os2
x:\wx\wxWindows-2.4.1\src\png
x:\wx\wxWindows-2.4.1\src\tiff
x:\wx\wxWindows-2.4.1\src\zlib
If you are using VisualAge, you will also need to ensure you have a
\lib directory as well, x:\wx\wxWindows-2.4.0\lib
\lib directory as well, x:\wx\wxWindows-2.4.1\lib
and you will have to set a WXWIN environment variable in your
config.sys,
SET WXWIN=X:\WX\WXWINDOWS-2.4.0;
SET WXWIN=X:\WX\WXWINDOWS-2.4.1;
Compilation
-----------
@@ -124,21 +124,21 @@ the outputs execute namek clean -f makefile.va WXMAKINGDLL=1. For
VisualAge 3.0 we use the module definition file method.
If, for some reason you encounter linking problems with your dll build you may
need to rebuild the module definition file, wx23.def, found in \src\os2. To
need to rebuild the module definition file, wx24.def, found in \src\os2. To
do this you need to have a static version built. Go to the \lib directoy and
execute CPPFILT /B /P wx.lib>temp.def. Copy this file to \src\os2. Delete
the temp.def from your \lib directory.
I find the following to be the easiest to reconstruct the .def file. Open
both the wx23.def and the temp.def file. Copy the header of the wx23.def to
both the wx24.def and the temp.def file. Copy the header of the wx24.def to
the clipboard and paste it into the top of the temp.def file. If you have
a valid SQL database client with its SDK on your system you can skip the next
step. wxWindows included some ODBC and SQL modules. They expect the standard
sql.h and such to available. If you do not have a database client with its
SDK (such as DB/2) then for the .dll build you need to delete the exports for
the following three modules from your temp.def file, db.cpp, dbgrid.cpp and
dbtable.cpp. save you changes to temp.def. Delete wx23.def and rename your
temp.def to wx23.def and you are ready to go.
dbtable.cpp. save you changes to temp.def. Delete wx24.def and rename your
temp.def to wx24.def and you are ready to go.
I hope to clean up the .dll builds at some point before the the library is
a full fledged production caliber product. Fortunately EMX and Watcom can use
@@ -168,12 +168,12 @@ configure script working - the one from GNU shell utilities 1.12
does work (check that uname -s returns "OS/2" and uname -m returns "i386"
and you should be mostly fine.
If you donwloaded wxAll-2.4.0, the directories will contain unix versions
If you donwloaded wxAll-2.4.1, the directories will contain unix versions
of all configure scripts which need to be replaced by the OS/2 enhanced
versions contained in e.g. \wx\wxWindows-2.4.0\docs\os2\os2-specific.zip.
For this purpose change into the top level directory (\wx\wxWindows-2.4.0)
versions contained in e.g. \wx\wxWindows-2.4.1\docs\os2\os2-specific.zip.
For this purpose change into the top level directory (\wx\wxWindows-2.4.1)
and call "unzip docs\os2\os2-specific.zip" (assuming you have InfoZip's
unzip installed). Of course, replace \wx\wxWindows-2.4.0 by the path you
unzip installed). Of course, replace \wx\wxWindows-2.4.1 by the path you
did choose.
Once you are done with those preliminaries, the first thing to do is to
@@ -185,13 +185,13 @@ 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.4.0\build\pm. Now we need to set some environment
\wx\wxWindows-2.4.1\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.4.0/install-sh.
SET INSTALL=/wx/wxWindows-2.4.1/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
@@ -245,7 +245,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.4.0\build\gtk), you'll have to do a `make clean' first.
\wxWindows-2.4.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

View File

@@ -1,8 +1,8 @@
Announcing wxWindows 2.4.0: a cross-platform GUI toolkit
Announcing wxWindows 2.4.1: a cross-platform GUI toolkit
----------------------------------------------------------------
January 7th, 2003 -- the wxWindows team is pleased to announce
an official 2.4.0 release of the mature cross-platform C++
April ??th, 2003 -- the wxWindows team is pleased to announce
an official 2.4.1 release of the mature cross-platform C++
application framework.
The following platforms are supported:

View File

@@ -1,7 +1,7 @@
wxWindows 2.4.0
wxWindows 2.4.1
---------------
Welcome to wxWindows 2, a sophisticated cross-platform C++
Welcome to wxWindows, a sophisticated cross-platform C++
framework for writing advanced GUI applications using (where
possible) the native controls.
@@ -200,5 +200,5 @@ web site.
Have fun!
The wxWindows Team, January 2003
The wxWindows Team, April 2003

View File

@@ -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: wxX11 2.4.0, gcc 2.95.4, Redhat 6.2
example: wxX11 2.4.1, gcc 2.95.4, Redhat 6.2
First steps
-----------

View File

@@ -1,7 +1,7 @@
Welcome to wxWindows/X11 2.4.0
Welcome to wxWindows/X11 2.4.1
You have downloaded version 2.4.0 of the X11 port of
You have downloaded version 2.4.1 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

View File

@@ -15,13 +15,13 @@
// Bump-up with each new version
#define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 4
#define wxRELEASE_NUMBER 0
#define wxVERSION_STRING _T("wxWindows 2.4.0")
#define wxRELEASE_NUMBER 1
#define wxVERSION_STRING _T("wxWindows 2.4.1")
// These are used by src/msw/version.rc and should always be ASCII, not Unicode
// and must be updated manually as well each time the version above changes
#define wxVERSION_NUM_DOT_STRING "2.4.0"
#define wxVERSION_NUM_STRING "240"
#define wxVERSION_NUM_DOT_STRING "2.4.1"
#define wxVERSION_NUM_STRING "241"
// nothing should be updated below this line when updating the version

View File

@@ -136,10 +136,6 @@ all:
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\splitter
nmake -f makefile.vc $(MAKEFLAGS)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\tab
nmake -f makefile.vc $(MAKEFLAGS)
!endif
cd $(WXDIR)\samples\taskbar
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\text
@@ -252,8 +248,6 @@ clean:
nmake -f makefile.vc clean
cd $(WXDIR)\samples\splitter
nmake -f makefile.vc clean
cd $(WXDIR)\samples\tab
nmake -f makefile.vc clean
cd $(WXDIR)\samples\taskbar
nmake -f makefile.vc clean
cd $(WXDIR)\samples\text

View File

@@ -771,18 +771,6 @@ Package=<4>
###############################################################################
Project: "tab"=.\tab\tab.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "taskbar"=.\taskbar\taskbar.dsp - Package Owner=<4>
Package=<5>

View File

@@ -60,7 +60,7 @@ MINGW32VERSION=3.0
#OSTYPE=msys
# If building DLL, the version
WXVERSION=240
WXVERSION=241
ifndef UNICODE
UNICODE=0

View File

@@ -1,5 +1,5 @@
%define pref /usr
%define ver 2.4.0
%define ver 2.4.1
%define ver2 2.4
%define rel 1

View File

@@ -1,5 +1,5 @@
%define pref /usr
%define ver 2.4.0
%define ver 2.4.1
%define ver2 2.4
%define rel 1

View File

@@ -1,5 +1,5 @@
%define pref /usr
%define ver 2.4.0
%define ver 2.4.1
%define ver2 2.4
%define rel 1

View File

@@ -3,7 +3,7 @@
# Note that this is NOT a relocatable package
%define pref /usr
%define ver 2.4.0
%define ver 2.4.1
%define ver2 2.4
%define rel 1

View File

@@ -1,6 +1,6 @@
# Note that this is NOT a relocatable package
%define pref /usr
%define ver 2.4.0
%define ver 2.4.1
%define rel 1
Summary: The WINE port of the wxWindows library

View File

@@ -1,5 +1,5 @@
%define pref /usr
%define ver 2.4.0
%define ver 2.4.1
%define ver2 2.4
%define rel 1