This commit was manufactured by cvs2svn to create tag 'wxPy_2_4_0_5'.

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

BuildCVS.txt

@@ -19,30 +19,29 @@ varaibles and PATH entries.
 Continue with item c) below.
 
 
-b) If using the GNU Mingw32 or GNU Cygwin32 compilers
+b) If using the MinGW or Cygwin compilers
 
-You can get Mingw32 from  http://www.mingw.org
+You can get MinGW from  http://www.mingw.org/
 
-Cygwin32 is available at  http://www.cygwin.com
+Cygwin is available at  http://sources.redhat.com/cygwin/
 
 The makefile might have small problems with Cygwin's tools
-so it is recommended to use Mingw32 and its toolchain instead
+so it is recommended to use MinGW and its toolchain instead
 if possible.
 
 -> Set your path so that it includes the directory
    where your compiler and tools reside
 
--> If your are using an old Mingw32 version (gcc-2.95 or older),
+-> If your are using an old MinGW version (gcc-2.95 or older),
    you might need to fix some headers with the patches contained
    in the wxWin\Mingw32-gcc295.patches file. PLEASE APPLY THESE
    PATCHES BY HAND! There are apparently a few different versions
    of the headers floating around. Note that these patches are
-   not needed if you are using Mingw32 gcc-2.95.2 or newer.
+   not needed if you are using MinGW gcc-2.95.2 or newer.
   
 -> Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
-   the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
+   the file to either 1 (you have MinGW) or 0 (you have Cygwin).
-   If using MINGW32, also set the MINGW32VERSION variable
+   Also set the MINGW32VERSION variable appropiately.
-   appropiately.
 
 
 c) Build instructions
@@ -51,19 +50,8 @@ c) Build instructions
    into c:\wxWin
 -> Copy c:\wxWin\include\wx\msw\setup0.h
    to   c:\wxWin\include\wx\msw\setup.h
--> Edit c:\wxWin\include\wx\msw\setup.h so that
+-> Edit c:\wxWin\include\wx\msw\setup.h to choose
-   most features are enabled (i.e. defined to 1), for example:
+   the features you would like to compile wxWindows with[out].
-   #define wxUSE_ODBC          0
-   #define wxUSE_SOCKETS       1
-   #define wxUSE_HTML          1
-   #define wxUSE_THREADS       1
-   #define wxUSE_FS_INET       0
-   #define wxUSE_FS_ZIP        1
-   #define wxUSE_BUSYINFO      1
-   #define wxUSE_DYNLIB_CLASS  1
-   #define wxUSE_ZIPSTREAM     1
-   #define wxUSE_LIBJPEG       1
-   #define wxUSE_LIBPNG        1
 
    and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
@@ -72,6 +60,8 @@ c) Build instructions
 -> type: make -f makefile.g95  (if using GNU tools)
 or type: nmake -f makefile.vc   (if using MS VC++)
 
+   See also docs/msw/install.txt for additional compilation options.
+
 d) Borland (including free command line tools)
    Download tools from http://www.borland.com/downloads/
    
@@ -117,11 +107,10 @@ yet complete).
 III) Windows using configure
 ----------------------------------------
 
-Take a look at Unix->Windows cross compiling. With minor
+wxWindows can be built on Windows using MSYS (see
-modifications, this should work in Windows if you've got the cygnus
+http://www.mingw.org/), which is a POSIX build environment
-utilities (bash, GNU make, etc) and either mingw32 or cygwin32 installed.
+for Windows. With MSYS you can just ./configure && make (see also VII,
-See http://www.cygnus.com for these programs, or go straight to their
+Unix->Windows cross-compiling using configure).
-ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
 
 Of course, you can also build the library using plain makefiles (see
 section I).
@@ -168,17 +157,17 @@ VI) OS/2
 VII) Unix->Windows cross-compiling using configure
 --------------------------------------------------
 
-First you'll need a cross-compiler; linux glibc binaries of mingw32 and
+First you'll need a cross-compiler; linux glibc binaries of MinGW and
-cygwin32 (both based on egcs) can be found at
+Cygwin (both based on egcs) can be found at
 ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
 based on the latest MinGW release can be found at
-http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html 
+http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
 Otherwise you can compile one yourself.
 
-[ A Note about cygwin32 and mingw32: the main difference is that cygwin32
+[ A Note about Cygwin and MinGW: the main difference is that Cygwin
 binaries are always linked against cygwin.dll. This dll encapsulates most
 standard Unix C extensions, which is very handy if you're porting unix
-software to windows. However, wxMSW doesn't need this, so mingw32 is
+software to windows. However, wxMSW doesn't need this, so MinGW is
 preferable if you write portable C(++). ]
 
 You might want to build both Unix and Windows binaries in the same source
@@ -203,7 +192,7 @@ yourself:
    DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
    ../configure --host=i586-mingw32 --with-mingw
 
-(all assuming you're using mingw32)
+(all assuming you're using MinGW)
 By default this will compile a DLL, if you want a static library,
 specify --disable-shared.
 
@@ -215,7 +204,7 @@ will be a compile error :-)
 NB: if you are using a very old compiler you risk to get quite a few warnings
     about "ANSI C++ forbids implicit conversion from 'void *'" in all places
     where va_arg macro is used. This is due to a bug in (some versions of)
-    mingw32 headers which may be corrected by upgrading your compier,
+    MinGW headers which may be corrected by upgrading your compier,
     otherwise you might edit the file
 
     ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
@@ -238,7 +227,7 @@ typedef void *__gnuc_va_list;
     __gnuc_va_list is char *.
 
 If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
-( or just libwx_msw.a if you opted for a static build ).
+(or just libwx_msw.a if you opted for a static build).
 Now try building the minimal sample:
 
 -> cd samples/minimal

Makefile.in

@@ -1153,7 +1153,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles
 	cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
 	cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
-    
+
 	mkdir $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
@@ -1441,12 +1441,16 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/demo/bmp_source
 	mkdir $(DISTDIR)/wxPython/demo/data
 	mkdir $(DISTDIR)/wxPython/demo/dllwidget
+	mkdir $(DISTDIR)/wxPython/distutils
+	mkdir $(DISTDIR)/wxPython/distutils/command
 	mkdir $(DISTDIR)/wxPython/src
 	mkdir $(DISTDIR)/wxPython/src/gtk
 	mkdir $(DISTDIR)/wxPython/scripts
 	mkdir $(DISTDIR)/wxPython/wxPython
 	mkdir $(DISTDIR)/wxPython/wxPython/lib
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust/wxd
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/colourchooser
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
 	mkdir $(DISTDIR)/wxPython/wxPython/tools
@@ -1470,12 +1474,16 @@ PYTHON_DIST:
 	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
 	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
 	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
+	cp $(WXDIR)/wxPython/distutils/*.py $(DISTDIR)/wxPython/distutils
+	cp $(WXDIR)/wxPython/distutils/command/*.py $(DISTDIR)/wxPython/distutils/command
 	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
 	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
 	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
 	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/wxd/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust/wxd
+	cp $(WXDIR)/wxPython/wxPython/lib/colourchooser/*.py $(DISTDIR)/wxPython/wxPython/lib/colourchooser
 	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
 	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
 	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools

config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2001-09-07'
+timestamp='2003-01-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-09-07'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -226,32 +227,44 @@ case $basic_machine in
 	1750a | 580 \
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
+	| clipper \
-	| d10v | d30v | dsp16xx \
+	| d10v | d30v | dlx | dsp16xx \
-	| fr30 \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
+	| ip2k \
 	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips16 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mips64 | mips64el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mips64vr | mips64vrel \
-	| mipsisa32 \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| msp430 \
 	| ns16k | ns32k \
-	| openrisc \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sh64 | sh64le \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| stormy16 | strongarm \
+	| strongarm \
 	| tahoe | thumb | tic80 | tron \
-	| v850 \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xscale \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -278,38 +291,53 @@ case $basic_machine in
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
+	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
+	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* \
 	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips16-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mips64-* | mips64el-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| mips64vr-* | mips64vrel-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
+	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | vax-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -374,6 +402,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -394,16 +426,8 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
+	cray | j90)
-		basic_machine=ymp-cray
+		basic_machine=j90-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -418,6 +442,14 @@ case $basic_machine in
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -598,14 +630,6 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -620,6 +644,10 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -692,6 +720,10 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -699,6 +731,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -721,19 +757,19 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -748,22 +784,22 @@ case $basic_machine in
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-	        ;;
+		;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-	        ;;
+		;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
+		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-	        ;;
+		;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -784,10 +820,22 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -795,7 +843,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -862,9 +910,17 @@ case $basic_machine in
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=t3e-cray
+		basic_machine=alphaev5-cray
 		os=-unicos
 		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+        tic4x | c4x*)
+		basic_machine=tic4x-unknown
+		os=-coff
+		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
@@ -875,6 +931,10 @@ case $basic_machine in
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -899,8 +959,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
+		basic_machine=f301-fujitsu
-               ;;
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -921,17 +981,13 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
+	xps | xps100)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -952,13 +1008,6 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -978,13 +1027,16 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb)
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
 		basic_machine=sh-unknown
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -999,10 +1051,6 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1065,10 +1113,12 @@ case $os in
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -microbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1080,8 +1130,10 @@ case $os in
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1120,14 +1172,20 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1166,8 +1224,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+		os=-mint
 		;;
 	-none)
 		;;
@@ -1200,10 +1258,11 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1230,6 +1289,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1293,19 +1355,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1377,7 +1439,7 @@ case $basic_machine in
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)

configure.in

@@ -1241,10 +1241,13 @@ dnl install checks
 dnl   defines INSTALL with the appropriate command
 AC_PROG_INSTALL
 
-dnl   make install path absolute (if not already); will fail with MSDOS paths
+dnl   make install path absolute (if not already);
+dnl   will fail with (some) MSDOS paths
 case ${INSTALL} in
   /* ) # Absolute
      ;;
+  ?:* ) # Drive letter, considered as absolute.
+     ;;
   *)
      INSTALL=`pwd`/${INSTALL} ;;
 esac
@@ -1397,6 +1400,15 @@ fi
 dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
 AC_CHECK_HEADERS(langinfo.h)
 
+case "${host}" in
+  *-pc-os2_emx | *-pc-os2-emx )
+      dnl Explicitly link -lintl if langinfo.h is available.
+      if test $ac_cv_header_langinfo_h = "yes"; then
+          LIBS="$LIBS -lintl"
+      fi
+  ;;
+esac
+
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes"; then
         dnl defines HAVE_X11_XKBLIB_H
@@ -1697,41 +1709,53 @@ if test "$wxUSE_ZLIB" != "no" ; then
     AC_DEFINE(wxUSE_ZLIB)
 
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
-        dnl we have troubles with ancient zlib versions (e.g. 1.0.4 is known
+        dnl don't test for zlib under Mac -- its verson there is 1.1.3 but we
-        dnl to not work) and although I don't know which is the minimal
+        dnl should still use it because hopefully (can someone confirm this?)
-        dnl required version it's safer to test for 1.1.4 as it fixes a
+        dnl Apple did fix the security problem in it and not using the system
-        dnl security problem in 1.1.3 -- and hopefully nobody has anything
+        dnl library results in a whole bunch of warnings when linking with
-        dnl more ancient (1.1.3 was released in July 1998) anyow
+        dnl Carbon framework
-        AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
+        if test "$USE_DARWIN" = 1; then
-            AC_TRY_RUN(
+            system_zlib_h_ok="yes"
-                [
+        else
-                    dnl zlib.h defines ZLIB_VERSION="x.y.z"
+            dnl we have troubles with ancient zlib versions (e.g. 1.0.4 is
-                    #include <zlib.h>
+            dnl known to not work) and although I don't know which is
-                    #include <stdio.h>
+            dnl the minimal required version it's safer to test for 1.1.4 as
+            dnl it fixes a security problem in 1.1.3 -- and hopefully nobody
+            dnl has anything more ancient (1.1.3 was released in July 1998)
+            dnl anyhow
+            AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
+                AC_TRY_RUN(
+                    [
+                        dnl zlib.h defines ZLIB_VERSION="x.y.z"
+                        #include <zlib.h>
+                        #include <stdio.h>
 
-                    dnl don't use the brackets as quotes, we need them
+                        dnl don't use the brackets as quotes, we need them
-                    changequote(,)
+                        changequote(,)
-                    int main()
+                        int main()
-                    {
+                        {
-                        FILE *f=fopen("conftestval", "w");
+                            FILE *f=fopen("conftestval", "w");
-                        if (!f) exit(1);
+                            if (!f) exit(1);
-                        fprintf(f, "%s",
+                            fprintf(f, "%s",
-                                ZLIB_VERSION[0] == '1' &&
+                                    ZLIB_VERSION[0] == '1' &&
-                                (ZLIB_VERSION[2] > '1' ||
+                                    (ZLIB_VERSION[2] > '1' ||
-                                (ZLIB_VERSION[2] == '1' &&
+                                    (ZLIB_VERSION[2] == '1' &&
-                                 ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
+                                     ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
-                        exit(0);
+                            exit(0);
-                    }
+                        }
-                    changequote([,])
+                        changequote([,])
-                ],
+                    ],
-                ac_cv_header_zlib_h=`cat conftestval`,
+                    ac_cv_header_zlib_h=`cat conftestval`,
-                ac_cv_header_zlib_h=no,
+                    ac_cv_header_zlib_h=no,
-                dnl cross-compiling: test if we have any zlib.h
+                    dnl cross-compiling: test if we have any zlib.h
-                AC_CHECK_HEADER(zlib.h)
+                    AC_CHECK_HEADER(zlib.h)
+                )
             )
-        )
 
-        if test "$ac_cv_header_zlib_h" = "yes"; then
+            system_zlib_h_ok=$ac_cv_header_zlib_h
+        fi
+
+        if test "$system_zlib_h_ok" = "yes"; then
             AC_CHECK_LIB(z, deflate, ZLIB_LINK=" -lz")
         fi
 
@@ -2142,36 +2166,52 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             AC_MSG_RESULT($MGL_ROOT)
         fi
 
+        AC_MSG_CHECKING(for libmgl location)
         dnl Find MGL library that we want
         dnl FIXME_MGL - test for MGL variants for freebsd etc.
         case "${host}" in
             *-*-linux* )
-              mgl_os="linux/gcc/glibc*"
+              if test "x$wxUSE_SHARED" = xyes ; then
+                  mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc"
+              else
+                  mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so"
+              fi
               ;;
             *-pc-msdosdjgpp )
-              mgl_os=dos32/dj2
+              mgl_os_candidates="dos32/dj2"
               ;;
             *)
               AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
         esac
 
         mgl_lib_type=""
+        mgl_os=""
 
-        if test "$wxUSE_DEBUG_FLAG" = yes ; then
+        for mgl_os_i in $mgl_os_candidates ; do
-            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
+            if test "x$mgl_os" = x ; then
-                    -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
+                if test "$wxUSE_DEBUG_FLAG" = yes ; then
-                mgl_lib_type=debug
+                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
+                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
+                        mgl_lib_type=debug
+                        mgl_os=$mgl_os_i
+                    fi
+                fi
+                if test "x$mgl_lib_type" = x ; then
+                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
+                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
+                        mgl_lib_type=release
+                        mgl_os=$mgl_os_i
+                    fi
+                fi
             fi
-        fi
+        done
-        if test "x$mgl_lib_type" = x ; then
-            if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
-                    -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then
-                mgl_lib_type=release
-            else
-                AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
-            fi
-        fi
 
+        if test "x$mgl_os" = x ; then
+            AC_MSG_RESULT(not found)
+            AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
+        fi
+        AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
+ 
         wxUSE_UNIVERSAL="yes"
 
         TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
@@ -2529,10 +2569,10 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         TOOLKIT=PM
         GUIDIST=GTK_DIST
         AC_MSG_WARN([OS/2 PM requires old resource format, re-enabled])
-	wxUSE_PROLOGIO="yes"
+        wxUSE_PROLOGIO="yes"
-	wxUSE_RESOURCES="yes"
+        wxUSE_RESOURCES="yes"
         AC_MSG_WARN([OS/2 threads are not yet supported... disabled])
-	wxUSE_THREADS="no"
+        wxUSE_THREADS="no"
     fi
 
     dnl the name of the directory where the files for this toolkit live
@@ -2755,12 +2795,24 @@ case "${host}" in
         ;;
 
     *-*-darwin* )
+        dnl Under Mac OS X, the naming conventions for shared libraries
+        dnl are different: the number precedes the suffix.
+        
+        WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
+        WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
+        WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+        WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
+        WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+
         dnl Under Mac OS X, we should build real frameworks instead of simple
         dnl dynamic shared libraries (in order to embed the resources)
         if test "$wxUSE_MAC" = 1; then
-            dnl the name of the resources file for wxMac
+            dnl base name of the resource file for wxMac must be the same
-            WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
+            dnl as library installation base name (-install_name)
-            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
+            WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
+            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
         fi
         ;;
 esac
@@ -2891,8 +2943,11 @@ if test "$wxUSE_SHARED" = "yes"; then
         dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
         SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
         PIC_FLAG="-dynamic -fPIC"
-        SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
+        dnl library installation base name and wxMac resources file base name
-        SONAME_FLAGS_GL=${SONAME_FLAGS}
+        dnl must be identical in order for the resource file to be found at
+        dnl run time in src/mac/app.cpp
+        SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
+        SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
       ;;
 
       *-*-aix* )
@@ -2915,12 +2970,12 @@ if test "$wxUSE_SHARED" = "yes"; then
 
         PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 
-        dnl install shared libs without symlinks
+        dnl Don't build seperate GL library
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+
         if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="preinstall_gl"
+            LIBS="${LIBS} ${OPENGL_LIBS}"
-            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
-        else
-            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
       ;;
 
@@ -3243,20 +3298,17 @@ AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
 )
 
 if test "$wx_cv_func_statfs" = "yes"; then
+    wx_cv_type_statvfs_t="struct statfs"
     AC_DEFINE(HAVE_STATFS)
 else
     AC_CACHE_CHECK(for statvfs, wx_cv_func_statvfs,
         AC_TRY_COMPILE(
             [
-                 #include <sys/statvfs.h>
+                #include <stddef.h>
+                #include <sys/statvfs.h>
             ],
             [
-                 long l;
+                statvfs("/", NULL);
-                 struct statvfs fs;
-                 statvfs("/", &fs);
-                 l = fs.f_bsize;
-                 l += fs.f_blocks;
-                 l += fs.f_bavail;
             ],
             [
                  wx_cv_func_statvfs=yes
@@ -3268,12 +3320,73 @@ else
     )
 
     if test "$wx_cv_func_statvfs" = "yes"; then
-        AC_DEFINE(HAVE_STATVFS)
+        dnl we also have to check whether we should use statvfs_t (works under
+        dnl Solaris 8, doesn't work under Solaris 7) or "struct statvfs" (vice
+        dnl versa) as the argument for statvfs in 64 bit off_t mode (in 32 bit
+        dnl mode both work fine)
+        dnl
+        dnl for this check C++ compiler has to be used as passing incompatible
+        dnl pointers is just a warning and not an error in C
+        AC_LANG_SAVE
+        AC_LANG_CPLUSPLUS
+
+        AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t,
+            AC_TRY_COMPILE(
+                [
+                    #include <sys/statvfs.h>
+                ],
+                [
+                    long l;
+                    statvfs_t fs;
+                    statvfs("/", &fs);
+                    l = fs.f_bsize;
+                    l += fs.f_blocks;
+                    l += fs.f_bavail;
+                ],
+                [
+                    wx_cv_type_statvfs_t=statvfs_t
+                ],
+                [
+                    AC_TRY_COMPILE(
+                        [
+                            #include <sys/statvfs.h>
+                        ],
+                        [
+                            long l;
+                            struct statvfs fs;
+                            statvfs("/", &fs);
+                            l = fs.f_bsize;
+                            l += fs.f_blocks;
+                            l += fs.f_bavail;
+                        ],
+                        [
+                            wx_cv_type_statvfs_t="struct statvfs"
+                        ],
+                        [
+                            wx_cv_type_statvfs_t="unknown"
+                        ]
+                    )
+                ]
+            )
+        )
+
+        AC_LANG_RESTORE
+
+        if test "$wx_cv_type_statvfs_t" != "unknown"; then
+            AC_DEFINE(HAVE_STATVFS)
+        fi
     else
-        AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
+        dnl set it for the test below
+        wx_cv_type_statvfs_t="unknown"
     fi
 fi
 
+if test "$wx_cv_type_statvfs_t" != "unknown"; then
+    AC_DEFINE_UNQUOTED(WX_STATFS_T, $wx_cv_type_statvfs_t)
+else
+    AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
+fi
+
 dnl check for fcntl() or at least flock() needed by Unix implementation of
 dnl wxSingleInstanceChecker
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
@@ -5458,6 +5571,10 @@ echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-n
 echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"
 echo "  Should wxWindows be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
 
+echo "  What level of wxWindows compatibility should be enabled?"
+echo "                                       wxWindows 2.0      ${WXWIN_COMPATIBILITY_2:-no}"
+echo "                                       wxWindows 2.2      ${WXWIN_COMPATIBILITY_2_2:-yes}"
+
 echo "  Which libraries should wxWindows use?"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
 echo "                                       png                ${wxUSE_LIBPNG-none}"

contrib/include/wx/stc/stc.h

@@ -24,11 +24,29 @@
 #include <wx/wx.h>
 #include <wx/dnd.h>
 
-#ifdef STCISDLL
+#ifndef SWIG
-#define STCDLLEXPORT WXDLLEXPORT
+/*
+ * If we're using wx in Dynamic Library format do we
+ * want wxStyledTextCtrl to be in DLL form as well?
+ */
+#if defined(WXUSINGDLL) && \
+    (defined(WXMAKING_STC_DLL) || defined(WXUSING_STC_DLL))
+
+#if defined(WXMAKING_STC_DLL)
+    // When building the DLL WXSTC_DECLSPEC exports classes
+#   define WXSTC_DECLSPEC            WXEXPORT
+#elif defined(WXUSING_STC_DLL)
+    // When using the DLL WXSTC_DECLSPEC imports classes
+#   define WXSTC_DECLSPEC            WXIMPORT
+#endif // defined(WXBUILD_STC_DLL)
+
 #else
-#define STCDLLEXPORT
+// When building the static library nullify the effect of WXSTC_DECLSPEC
-#endif
+#define WXSTC_DECLSPEC
+#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL)
+
+#endif // SWIG
+
 
 //----------------------------------------------------------------------
 
@@ -908,9 +926,9 @@ class  WordList;
 struct SCNotification;
 
 #ifndef SWIG
-extern STCDLLEXPORT const wxChar* wxSTCNameStr;
+extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr;
-class STCDLLEXPORT wxStyledTextCtrl;
+class WXSTC_DECLSPEC wxStyledTextCtrl;
-class STCDLLEXPORT wxStyledTextEvent;
+class WXSTC_DECLSPEC wxStyledTextEvent;
 #endif
 
 //----------------------------------------------------------------------

contrib/samples/animate/makefile.wat

@@ -6,9 +6,12 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\animate
 
 PROGRAM = anitest
-OBJECTS = $(PROGRAM).obj animate.obj
+EXTRALIBS = $(WXDIR)\lib\anim_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/gizmos/multicell/makefile.wat

@@ -3,9 +3,13 @@
 
 WXDIR = $(%WXWIN)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\gizmos\multicell
+
+
 PROGRAM = mtest
-OBJECTS = $(PROGRAM).obj ..\src\multicell.obj
+EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
-EXTRAINC=-I..\include
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/gizmos/splittree/makefile.wat

@@ -1,14 +1,14 @@
-#
+# Purpose: makefile for multicell example (Watcom)
-# Makefile for WATCOM
+# Created 2000-07-28
-#
-# Created by Julian Smart, January 1999
-# 
-#
 
 WXDIR = $(%WXWIN)
 
-PROGRAM = minimal
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-OBJECTS = $(PROGRAM).obj
+THISDIR = $(WXDIR)\contrib\samples\gizmos\splittree
+
+PROGRAM = tree
+EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/mmedia/makefile.wat

@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = mmboard
-OBJECTS = $(PROGRAM).obj mmbman.obj
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj  mmbman.obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/ogl/ogledit/makefile.wat

@@ -7,9 +7,12 @@
 
 WXDIR = $(%WXWIN)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit
+
 PROGRAM = ogledit
-EXTRALIBS = $(WXDIR)\lib\ogl.lib
+EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
-OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\doc.obj $(OUTPUTDIR)\view.obj $(OUTPUTDIR)\palette.obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/ogl/studio/makefile.wat

@@ -7,10 +7,21 @@
 
 WXDIR = $(%WXWIN)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\ogl\studio
+
 PROGRAM = studio
-EXTRALIBS = $(WXDIR)\lib\ogl.lib
+EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
-OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj &
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj &
-  mainfrm.obj project.obj dialogs.obj csprint.obj
+  $(OUTPUTDIR)\doc.obj &
+  $(OUTPUTDIR)\shapes.obj &
+  $(OUTPUTDIR)\symbols.obj &
+  $(OUTPUTDIR)\view.obj &
+  $(OUTPUTDIR)\cspalette.obj &
+  $(OUTPUTDIR)\mainfrm.obj &
+  $(OUTPUTDIR)\project.obj &
+  $(OUTPUTDIR)\dialogs.obj &
+  $(OUTPUTDIR)\csprint.obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/svg/svgtest.rc

@@ -0,0 +1,11 @@
+aaaa                    ICON    "mondrian.ico"
+
+/* Useful if PROVIDE_DEFAULT_ICONS is set in wx_setup.h */
+#define IHaveMDIParentIcon
+#define IHaveMDIChildIcon
+
+mondrian 		ICON	"mondrian.ico"
+
+#include "wx/msw/wx.rc"
+
+svgbitmap               BITMAP  "SVGlogo24.bmp"

contrib/src/fl/panedrawpl.cpp

@@ -591,10 +591,14 @@ void cbPaneDrawPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event )
 
         // FIXME:: +/- 1s
 
+        int nNewHeight = bounds.height - 2 - bar.mDimInfo.mVertGap *2;
+        if(nNewHeight < 0)
+           nNewHeight = 0;
+
         bar.mpBarWnd->wxWindow::SetSize( bounds.x      + 1 + bar.mDimInfo.mHorizGap,     
                                          bounds.y      + 1 + bar.mDimInfo.mVertGap,
                                          bounds.width  - 2 - bar.mDimInfo.mHorizGap*2,
-                                         bounds.height - 2 - bar.mDimInfo.mVertGap *2 , 
+                                         nNewHeight,
                                          0 
                                        );
 

contrib/src/gizmos/makefile.wat

@@ -1,22 +1,29 @@
 # Gizmos makefile for Watcom C++
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 WXDIR = ..\..\..
 
 !include $(WXDIR)\src\makewat.env
 
-GIZMOSLIB = $(WXDIR)\lib\gizmos.lib
+GIZMOSLIB = $(WXDIR)\lib\gizmos_w.lib
 THISDIR = $(WXDIR)\contrib\src\gizmos
+OUTPUTDIR = $(THISDIR)\
 
 NAME = gizmos
 LNK = $(name).lnk
 
 OBJECTS =  multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
 
-all: $(GIZMOSLIB)
+all: $(GIZMOSLIB) .SYMBOLIC
 
 $(GIZMOSLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(GIZMOSLIB) $(OBJECTS)
 
 clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(GIZMOSLIB) *.lbc
+    -erase *.obj
+    -erase *.bak
+    -erase *.err 
+    -erase *.pch 
+    -erase $(GIZMOSLIB) 
+    -erase *.lbc
 

contrib/src/mmedia/makefile.wat

@@ -6,15 +6,38 @@
 #
 # Makefile : Builds MMedia library for Watcom C++, WIN32
 
-WXDIR = $(%WXWIN)
+!error This will not work - there is no digitalv.h in Open Watcom as of 26 Feb 03 
 
-LIBTARGET=$(WXDIR)\contrib\lib\mmedia.lib
+WXDIR = ..\..\..
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+
+!include $(WXDIR)\src\makewat.env
+
+THISDIR = $(WXDIR)\contrib\src\mmedia
+OUTPUTDIR = $(THISDIR)\
+
+NAME = mmedia
+LNK = $(name).lnk
+
+LIBTARGET=$(WXDIR)\lib\mmedia_w.lib
 
 OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj &
   g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj &
   sndcpcm.obj sndfile.obj sndg72x.obj sndpcm.obj sndulaw.obj &
   sndwav.obj sndwin.obj vidbase.obj vidwin.obj
 
-!include $(WXDIR)\src\makelib.wat
+all:     $(LIBTARGET) .SYMBOLIC
+    
+
+$(LIBTARGET): $(OBJECTS)
+	*wlib /b /c /n /P=256 $(SVGLIB) $(OBJECTS)
+
+clean:   .SYMBOLIC
+    -erase *.obj 
+    -erase *.bak
+    -erase *.err 
+    -erase *.pch 
+    -erase $(LIBTARGET) 
+    -erase *.lbc
 
 

contrib/src/net/smapi.cpp

@@ -301,7 +301,8 @@ bool wxMapiSession::Send(wxMailMessage& message)
     //Setup the "To" recipients
     int nRecipIndex = 0;
     int nToSize = message.m_to.GetCount();
-    for (int i=0; i<nToSize; i++)
+    int i;
+    for (i=0; i<nToSize; i++)
     {
         MapiRecipDesc& recip = mapiMessage.lpRecips[nRecipIndex];
         ZeroMemory(&recip, sizeof(MapiRecipDesc));

contrib/src/ogl/basic.cpp

@@ -30,12 +30,6 @@
 #undef new
 #endif
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>
@@ -607,7 +601,8 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
     return;
 
   wxShapeRegion *region = (wxShapeRegion *)node->Data();
-  region->SetText(s);
+  // region->SetText(s);  // don't set the formatted text yet, it will be done below
+  region->m_regionText = s;
   dc.SetFont(* region->GetFont());
 
   region->GetSize(&w, &h);

contrib/src/ogl/basic2.cpp

@@ -30,12 +30,6 @@
 #undef new
 #endif
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>

contrib/src/ogl/canvas.cpp

@@ -30,12 +30,6 @@
 #undef new
 #endif
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>

contrib/src/ogl/lines.cpp

@@ -31,12 +31,6 @@
 #undef new
 #endif
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-
 #include <ctype.h>
 #include <math.h>
 

contrib/src/ogl/makefile.wat

@@ -1,13 +1,13 @@
 # Objects makefile
 
 WXDIR = ..\..\..
+EXTRACPPFLAGS=-I$(WXDIR)\contrib\include;/DPROLOGIO
 
 !include $(WXDIR)\src\makewat.env
 
-EXTRACPPFLAGS=/DPROLOGIO
+OGLLIB = $(WXDIR)\lib\ogl_w.lib
-
+THISDIR = $(WXDIR)\contrib\src\ogl
-OGLLIB = $(WXDIR)\lib\ogl.lib
+OUTPUTDIR = $(THISDIR)\
-THISDIR = $(WXDIR)\src\ogl
 
 NAME = ogl
 LNK = $(name).lnk
@@ -15,11 +15,16 @@ LNK = $(name).lnk
 OBJECTS =  basic.obj basic2.obj canvas.obj lines.obj divided.obj constrnt.obj &
     composit.obj drawn.obj bmpshape.obj mfutils.obj ogldiag.obj oglmisc.obj
 
-all: $(OGLLIB)
+all: $(OGLLIB) .SYMBOLIC
 
 $(OGLLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(OGLLIB) $(OBJECTS)
 
 clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(OGLLIB) *.lbc
+    -erase *.obj 
+    -erase *.bak 
+    -erase *.err 
+    -erase *.pch 
+    -erase $(OGLLIB) 
+    -erase *.lbc
 

contrib/src/ogl/misc.cpp

@@ -32,11 +32,6 @@
 #undef new
 #endif
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>

contrib/src/ogl/ogldiag.cpp

@@ -30,17 +30,6 @@
 #undef new
 #endif
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#include <fstream.h>
-#else
-#include <iostream>
-#include <fstream>
-#ifdef _MSC_VER
-//using namespace std;
-#endif
-#endif
-
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>

contrib/src/ogl/oglmisc.cpp

@@ -32,11 +32,6 @@
 #undef new
 #endif
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>

contrib/src/stc/PlatWX.cpp

@@ -430,9 +430,11 @@ int SurfaceImpl::WidthText(Font &font, const char *s, int len) {
 
 
 void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positions) {
+
     wxString str = stc2wx(s, len);
     SetFont(font);
 
+#ifndef __WXMAC__
     // Calculate the position of each character based on the widths of
     // the previous characters
     int* tpos = new int[len];
@@ -444,9 +446,26 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
         totalWidth += w;
         tpos[i] = totalWidth;
     }
+#else
+    // Instead of a running total, remeasure from the begining of the
+    // text for each character's position.  This is because with AA fonts
+    // on OS X widths can be fractions of pixels wide when more than one
+    // are drawn together, so the sum of all character widths is not necessariy
+    // (and probably not) the same as the whole string width.
+    int* tpos = new int[len];
+    size_t i;
+    for (i=0; i<str.Length(); i++) {
+        int w, h;
+        hdc->GetTextExtent(str.Left(i+1), &w, &h);
+        tpos[i] = w;
+    }
+#endif
+
 
 #if wxUSE_UNICODE
     // Map the widths for UCS-2 characters back to the UTF-8 input string
+    // NOTE:  I don't think this is right for when sizeof(wxChar) > 2, ie wxGTK2
+    // so figure it out and fix it!
     i = 0;
     size_t ui = 0;
     while (i < len) {
@@ -812,7 +831,12 @@ int ListBox::Length() {
 }
 
 void ListBox::Select(int n) {
-    GETLB(id)->SetSelection(n);
+    bool select = TRUE;
+    if (n == -1) {
+        n = 0;
+        select = FALSE;
+    }
+    GETLB(id)->SetSelection(n, select);
 #ifdef __WXGTK__
     if (n > 4)
         n = n - 4;

contrib/src/stc/ScintillaWX.cpp

@@ -407,6 +407,11 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
 
 // This is called by the Editor base class whenever something is selected
 void ScintillaWX::ClaimSelection() {
+#if 0
+    // Until wxGTK is able to support using both the primary selection and the
+    // clipboard at the same time I think it causes more problems than it is
+    // worth to implement this method.  Selecting text should not clear the
+    // clipboard.  --Robin
 #ifdef __WXGTK__
     // Put the selected text in the PRIMARY selection
     if (currentPos != anchor) {
@@ -421,6 +426,7 @@ void ScintillaWX::ClaimSelection() {
         }
     }
 #endif
+#endif
 }
 
 
@@ -573,6 +579,8 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta,
         }
     }
     else { // otherwise just scroll the window
+        if ( !delta )
+            delta = 120;
         wheelRotation += rotation;
         lines = wheelRotation / delta;
         wheelRotation -= lines * delta;
@@ -678,7 +686,9 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* cons
     case WXK_RIGHT:             key = SCK_RIGHT;    break;
     case WXK_HOME:              key = SCK_HOME;     break;
     case WXK_END:               key = SCK_END;      break;
+    case WXK_PAGEUP:            // fall through
     case WXK_PRIOR:             key = SCK_PRIOR;    break;
+    case WXK_PAGEDOWN:          // fall through
     case WXK_NEXT:              key = SCK_NEXT;     break;
     case WXK_DELETE:            key = SCK_DELETE;   break;
     case WXK_INSERT:            key = SCK_INSERT;   break;

contrib/src/stc/StcVC.dsp

@@ -1,34 +1,35 @@
-# Microsoft Developer Studio Project File - Name="StcVC" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="stcVC" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=StcVC - Win32 Debug
+CFG=stcVC - Win32 Release DLL
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "StcVC.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
-!MESSAGE NMAKE /f "StcVC.mak" CFG="StcVC - Win32 Debug"
+!MESSAGE NMAKE /f "StcVC.mak" CFG="stcVC - Win32 Release DLL"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
-!MESSAGE "StcVC - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "stcVC - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "StcVC - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "stcVC - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE "stcVC - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "stcVC - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
 
-!IF  "$(CFG)" == "StcVC - Win32 Release"
+!IF  "$(CFG)" == "stcVC - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -40,9 +41,11 @@ RSC=rc.exe
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
+LINK32=link.exe
+CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c
-# SUBTRACT CPP /YX
+RSC=rc.exe
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe
@@ -52,7 +55,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\stc.lib"
 
-!ELSEIF  "$(CFG)" == "StcVC - Win32 Debug"
+!ELSEIF  "$(CFG)" == "stcVC - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -64,9 +67,11 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
+LINK32=link.exe
+CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /I "../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c
-# SUBTRACT CPP /YX
+RSC=rc.exe
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe
@@ -76,15 +81,85 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "stcVC - Win32 Debug DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug_DLL"
+# PROP BASE Intermediate_Dir "Debug_DLL"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\lib"
+# PROP Intermediate_Dir "Debug_DLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stcd.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_STC_DLL" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c
+# SUBTRACT CPP /u
+MTL=midl.exe
+RSC=rc.exe
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "stcVC - Win32 Release DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "stcVC___Win32_Release_DLL"
+# PROP BASE Intermediate_Dir "stcVC___Win32_Release_DLL"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\lib"
+# PROP Intermediate_Dir "Release_DLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stcd.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib"
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /D "WXBUILD_STC_DLL" /YX /FD /c
+# SUBTRACT BASE CPP /u
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdll" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_STC_DLL" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c
+# SUBTRACT CPP /u
+MTL=midl.exe
+RSC=rc.exe
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib"
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/stcdll.dll" /libpath:"../../../lib"
+# SUBTRACT LINK32 /pdb:none /incremental:no /debug
+
+!ENDIF
 
 # Begin Target
 
-# Name "StcVC - Win32 Release"
+# Name "stcVC - Win32 Release"
-# Name "StcVC - Win32 Debug"
+# Name "stcVC - Win32 Debug"
-# Begin Group "Stc"
+# Name "stcVC - Win32 Debug DLL"
+# Name "stcVC - Win32 Release DLL"
+# Begin Group "wxStyledTextCtrl Src"
 
-# PROP Default_Filter ""
+# PROP Default_Filter "*.cpp"
 # Begin Source File
 
 SOURCE=.\PlatWX.cpp
@@ -95,11 +170,23 @@ SOURCE=.\ScintillaWX.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\stc.cpp
+# End Source File
+# End Group
+# Begin Group "wxStyledTextCtrl Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\PlatWX.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\ScintillaWX.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\stc.cpp
+SOURCE=..\..\include\wx\stc\stc.h
 # End Source File
 # End Group
 # Begin Group "Scintilla"
@@ -107,6 +194,10 @@ SOURCE=.\stc.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\scintilla\include\Accessor.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\scintilla\src\AutoComplete.cxx
 # End Source File
 # Begin Source File
@@ -151,6 +242,10 @@ SOURCE=.\scintilla\src\DocumentAccessor.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\scintilla\src\DocumentAccessor.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\scintilla\src\Editor.cxx
 # End Source File
 # Begin Source File
@@ -179,6 +274,10 @@ SOURCE=.\scintilla\src\KeyWords.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\scintilla\include\KeyWords.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\scintilla\src\LexAda.cxx
 # End Source File
 # Begin Source File
@@ -263,14 +362,34 @@ SOURCE=.\scintilla\src\LineMarker.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\scintilla\include\Platform.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\scintilla\src\PropSet.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\scintilla\include\PropSet.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\scintilla\src\RESearch.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\scintilla\src\RESearch.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scintilla\include\SciLexer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scintilla\include\Scintilla.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\scintilla\src\ScintillaBase.cxx
 # End Source File
 # Begin Source File
@@ -279,6 +398,14 @@ SOURCE=.\scintilla\src\ScintillaBase.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\scintilla\include\ScintillaWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scintilla\include\SString.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\scintilla\src\Style.cxx
 # End Source File
 # Begin Source File
@@ -291,10 +418,22 @@ SOURCE=.\scintilla\src\StyleContext.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\scintilla\src\StyleContext.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\scintilla\src\SVector.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\scintilla\src\UniConversion.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=.\scintilla\src\UniConversion.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\scintilla\src\ViewStyle.cxx
 # End Source File
 # Begin Source File
@@ -305,6 +444,10 @@ SOURCE=.\scintilla\src\ViewStyle.h
 
 SOURCE=.\scintilla\src\WindowAccessor.cxx
 # End Source File
+# Begin Source File
+
+SOURCE=.\scintilla\include\WindowAccessor.h
+# End Source File
 # End Group
 # End Target
 # End Project

contrib/src/stc/makefile.b32

@@ -89,7 +89,6 @@ $(STCCFG): makefile.b32
 -w-par
 -w-aus
 -w-hid # virtual function A hides virtual function B
--WE
 -tWM
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff

contrib/src/stc/stc.h.in

@@ -24,11 +24,29 @@
 #include <wx/wx.h>
 #include <wx/dnd.h>
 
-#ifdef STCISDLL
+#ifndef SWIG
-#define STCDLLEXPORT WXDLLEXPORT
+/*
+ * If we're using wx in Dynamic Library format do we
+ * want wxStyledTextCtrl to be in DLL form as well?
+ */
+#if defined(WXUSINGDLL) && \
+    (defined(WXMAKING_STC_DLL) || defined(WXUSING_STC_DLL))
+
+#if defined(WXMAKING_STC_DLL)
+    // When building the DLL WXSTC_DECLSPEC exports classes
+#   define WXSTC_DECLSPEC            WXEXPORT
+#elif defined(WXUSING_STC_DLL)
+    // When using the DLL WXSTC_DECLSPEC imports classes
+#   define WXSTC_DECLSPEC            WXIMPORT
+#endif // defined(WXBUILD_STC_DLL)
+
 #else
-#define STCDLLEXPORT
+// When building the static library nullify the effect of WXSTC_DECLSPEC
-#endif
+#define WXSTC_DECLSPEC
+#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL)
+
+#endif // SWIG
+
 
 //----------------------------------------------------------------------
 
@@ -58,9 +76,9 @@ class  WordList;
 struct SCNotification;
 
 #ifndef SWIG
-extern STCDLLEXPORT const wxChar* wxSTCNameStr;
+extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr;
-class STCDLLEXPORT wxStyledTextCtrl;
+class WXSTC_DECLSPEC wxStyledTextCtrl;
-class STCDLLEXPORT wxStyledTextEvent;
+class WXSTC_DECLSPEC wxStyledTextEvent;
 #endif
 
 //----------------------------------------------------------------------

contrib/src/xrc/makefile.wat

@@ -2,12 +2,16 @@
 
 WXDIR = ..\..\..
 
-EXTRACPPFLAGS=/Id:\libxml\libxml2-2.1.1
+#XMLDIR=
+!error modify makefile.wat to include the path to the XML library
+
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include;-I$(XMLDIR)\libxml2-2.1.1
 
 !include $(WXDIR)\src\makewat.env
 
-WXXMLLIB = $(WXDIR)\lib\wxxrc.lib
+WXXMLLIB = $(WXDIR)\lib\wxxrc_w.lib
 THISDIR = $(WXDIR)\contrib\src\xrc
+OUTPUTDIR = $(THISDIR)\
 
 NAME = wxxrc
 LNK = $(name).lnk
@@ -18,14 +22,19 @@ OBJECTS=xml.obj xmlres.obj xmlrsall.obj &
         xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj &
         xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj &
         xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj &
-        xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj
+        xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj xh_split.obj
 
 
-all: $(WXXMLLIB)
+all: $(WXXMLLIB) .SYMBOLIC
 
 $(WXXMLLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(WXXMLLIB) $(OBJECTS)
 
 clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(WXXMLLIB) *.lbc
+    -erase *.obj 
+    -erase *.bak 
+    -erase *.err 
+    -erase *.pch
+    -erase $(WXXMLLIB) 
+    -erase *.lbc
 

contrib/src/xrc/xmlres.cpp

@@ -1182,10 +1182,21 @@ static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
     XRCID_record **rec_var = (oldrec == NULL) ?
                               &XRCID_Records[index] : &oldrec->next;
     *rec_var = new XRCID_record;
-    (*rec_var)->id = ++XRCID_LastID;
     (*rec_var)->key = wxStrdup(str_id);
     (*rec_var)->next = NULL;
 
+    wxChar *end;
+    int asint = wxStrtol(str_id, &end, 10);
+    if (*str_id && *end == 0)
+    {
+        // if str_id was integer, keep it verbosely:
+        (*rec_var)->id = asint;
+    }
+    else
+    {
+        (*rec_var)->id = ++XRCID_LastID;
+    }
+
     return (*rec_var)->id;
 }
 

contrib/utils/convertrc/makefile.wat

@@ -4,10 +4,16 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\utils\convertrc
 
 PROGRAM = wxconvert
-EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
+EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
-OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj
+OBJECTS=&
+    $(OUTPUTDIR)\convert.obj &
+    $(OUTPUTDIR)\rc2xml.obj &
+    $(OUTPUTDIR)\rc2wxr.obj &
+    $(OUTPUTDIR)\wxr2xml.obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/utils/convertrc/wxr2xml.h

@@ -8,6 +8,9 @@
 #include <wx/ffile.h>
 #include "wx/resource.h"
 
+#if !wxUSE_WX_RESOURCES
+#error  "convertc requires wxUSE_WX_RESOURCES"
+#endif  // wxUSE_WX_RESOURCES
 
 class wxr2xml : public wxObject  
 {

contrib/utils/wxrc/makefile.wat

@@ -4,10 +4,12 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\utils\wxrc
 
 PROGRAM = wxrc
-EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
+EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
-OBJECTS = $(PROGRAM).obj
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/utils/wxrcedit/editor.cpp

@@ -488,14 +488,14 @@ void EditorFrame::OnTreeSel(wxTreeEvent& event)
     if (node)
         PropertiesFrame::Get()->ShowProps(node);
 
-    if (m_TreeCtrl->GetParent(event.GetItem()) == m_TreeCtrl->GetRootItem())
+    if (m_TreeCtrl->GetItemParent(event.GetItem()) == m_TreeCtrl->GetRootItem())
     {
         wxTreeItemId it = event.GetOldItem();
 
         if (it.IsOk() && m_TreeCtrl->GetRootItem() != it)
         {
-            while (m_TreeCtrl->GetParent(it) != m_TreeCtrl->GetRootItem())
+            while (m_TreeCtrl->GetItemParent(it) != m_TreeCtrl->GetRootItem())
-                it = m_TreeCtrl->GetParent(it);
+                it = m_TreeCtrl->GetItemParent(it);
             m_TreeCtrl->Collapse(it);
         }
         RecursivelyExpand(m_TreeCtrl, event.GetItem());
@@ -563,7 +563,7 @@ void EditorFrame::OnToolbar(wxCommandEvent& event)
 void EditorFrame::DeleteSelectedNode()
 {
     XmlTreeData *dt = (XmlTreeData*)
-            (m_TreeCtrl->GetItemData(m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
+            (m_TreeCtrl->GetItemData(m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));
     wxXmlNode *n = (dt) ? dt->Node : NULL;
 
     m_SelectedNode->GetParent()->RemoveChild(m_SelectedNode);
@@ -579,7 +579,7 @@ void EditorFrame::OnNewNode(wxCommandEvent& event)
     {
         XmlTreeData *pardt = 
             (XmlTreeData*)(m_TreeCtrl->GetItemData(
-                m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
+                m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));
 
         if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
         {
@@ -683,7 +683,7 @@ void EditorFrame::OnRightClickTree(wxPoint pos)
 
         XmlTreeData *pardt = 
             (XmlTreeData*)(m_TreeCtrl->GetItemData(
-                m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
+                m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));
         if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
         {
             wxXmlNode *nd = pardt->Node;
@@ -748,7 +748,7 @@ void EditorFrame::OnClipboardAction(wxCommandEvent& event)
             {
             XmlTreeData *pardt = 
                 (XmlTreeData*)(m_TreeCtrl->GetItemData(
-                    m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
+                    m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));
 
             if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
             {

contrib/utils/wxrcedit/makefile.wat

@@ -4,10 +4,22 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\utils\wxrcedit
 
 PROGRAM = wxrcedit
-EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
+EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
-OBJECTS=edapp.obj editor.obj nodehnd.obj xmlhelpr.obj preview.obj nodesdb.obj pe_basic.obj pe_adv.obj propedit.obj propframe.obj splittree.obj
+OBJECTS=$(OUTPUTDIR)\edapp.obj &
+    $(OUTPUTDIR)\editor.obj &
+    $(OUTPUTDIR)\nodehnd.obj &
+    $(OUTPUTDIR)\xmlhelpr.obj &
+    $(OUTPUTDIR)\preview.obj &
+    $(OUTPUTDIR)\nodesdb.obj &
+    $(OUTPUTDIR)\pe_basic.obj &
+    $(OUTPUTDIR)\pe_adv.obj &
+    $(OUTPUTDIR)\propedit.obj &
+    $(OUTPUTDIR)\propframe.obj &
+    $(OUTPUTDIR)\splittree.obj
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/utils/wxrcedit/pe_basic.cpp

@@ -172,7 +172,7 @@ class PropEditCtrlCoordXY : public PropEditCtrlInt
             wxString prev = XmlReadValue(GetNode(), m_PropInfo->Name);
             if (prev[prev.Len()-1] == _T('d')) s << _T('d');
             XmlWriteValue(GetNode(), m_PropInfo->Name, s);
-            m_TreeCtrl->SetItemBold(m_TreeCtrl->GetParent(m_TreeItem), TRUE);
+            m_TreeCtrl->SetItemBold(m_TreeCtrl->GetItemParent(m_TreeItem), TRUE);
         }
         
         virtual wxString GetValueAsText(wxTreeItemId ti)
@@ -228,7 +228,7 @@ class PropEditCtrlCoordDlg : public PropEditCtrlBool
             wxString s = XmlReadValue(GetNode(), m_PropInfo->Name).BeforeFirst(_T('d'));
             if (m_Choice->GetSelection() == 1) s << _T('d');
             XmlWriteValue(GetNode(), m_PropInfo->Name, s);
-            m_TreeCtrl->SetItemBold(m_TreeCtrl->GetParent(m_TreeItem), TRUE);
+            m_TreeCtrl->SetItemBold(m_TreeCtrl->GetItemParent(m_TreeItem), TRUE);
         }
         
         virtual wxString GetValueAsText(wxTreeItemId ti)
@@ -309,7 +309,7 @@ class PropEditCtrlDimX : public PropEditCtrlInt
             s = m_c;
             if (dlg) s << _T('d');
             XmlWriteValue(GetNode(), m_PropInfo->Name, s);
-            m_TreeCtrl->SetItemBold(m_TreeCtrl->GetParent(m_TreeItem), TRUE);
+            m_TreeCtrl->SetItemBold(m_TreeCtrl->GetItemParent(m_TreeItem), TRUE);
         }
         
         virtual wxString GetValueAsText(wxTreeItemId ti)

debian/README.Debian

@@ -27,12 +27,12 @@ wxwin-i18n		message catalogs for native language support
 	The following three can be built from the source package
 	with the mingw32 cross compiler, but are not currently
 	distributed by Debian.  If you feel that should change,
-	please file a bug against the wxwindows2.2 package, or
+	please file a bug against the wxwindows2.4 package, or
 	append your views to a report already there if you're not
 	the first to do so.
 
 	[ you can check the current state of affairs at:
-	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.2 ]
+	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.4 ]
 
 	Oh and, please do *not* file bug reports for these packages
 	to the Debian bts.  But do feel free to email me personally
@@ -44,7 +44,9 @@ libwxbase-msw-dev	mingw32-cross wxBase libs.
 libwxbase-msw-dbg	mingw32-cross wxBase (debug) libs.
 wxwin-headers-msw	extra headers needed for wxMSW.
 
-libwxgtk-univ		wxUniversal for Gtk.
+libwxgtk-univ		wxUniversal for Gtk.  NOTE this package is obsolete
+			and will be replaced by wxX11 and wxX11-univ at
+			some future time.
 
 
  -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030

debian/changelog

@@ -1,6 +1,38 @@
+wxwindows2.4 (2.4.0.3) unstable; urgency=low
+
+  * Changed Conflict to Replaces so people can use 2.4 -dev before all
+    their 2.3 deps are gone.  Closes: #178305
+  * Added wxPy supplied 2.3 distutils to the source package, apparently the
+    standard 2.2 one is now insufficient.  This hopefully Closes: #178457
+
+ -- Ron Lee <ron@debian.org>  Mon, 27 Jan 2003 17:36:59 -0800
+
+wxwindows2.4 (2.4.0.2) unstable; urgency=low
+
+  * Added missing quantize.h to install.  Closes: #178135
+  * Removed unnecessary -dev deps.
+  * move wxwin.m4 &c out of the runtime package and conflict with earlier
+    versions that didn't.  Also nuke some empty dir cruft that slipped by.
+    Thanks for noticing the latter Josip.  Closes: #176033
+  * dinstall won't close bugs from earlier unreleased versions :(
+    see below for explanations.  Closes: #162948, #171258, #168148
+    Closes: #170748, #168250, #164557, #172390, #172447, #168887
+    Closes: #155476, #155478
+
+ -- Ron Lee <ron@debian.org>  Thu, 16 Jan 2003 16:46:31 -0800
+
 wxwindows2.4 (2.4.0) unstable; urgency=low
 
   * The fingers crossed release.
+  * de.po typo fix.  Closes: #174084
+  * tr.po stable tree patch.  Closes: #174667
+  * Add a manpage for the wxPython scripts pointing to the pydoc docs.
+  * Disabled generation of gtk-univ, it is a rather insensible combination
+    now and should be replaced by x11-univ instead.
+  * There had to be some payoff to all the delays -- a clean gcc3.2
+    transition :-)  This package certainly obsoletes 2.3.3.2 and I'll
+    be seeking to finally have 2.2.9.2 removed as well once Audacity
+    is updated.
 
  -- Ron Lee <ron@debian.org>  Thu, 19 Dec 2002 00:50:48 -0800
 

debian/control.in

@@ -1,9 +1,9 @@
 Source: wxwindows=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.2), python (<<2.3), python2.2-dev, zlib1g-dev, libjpeg62-dev, libpng3-dev, libtiff3g-dev, libgl-dev, libesd0-dev
+Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.2), python (<<2.3), python2.2-dev, zlib1g-dev, libjpeg62-dev, libpng12-0-dev, libtiff3g-dev, libgl-dev, libglu-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.5.7.0
+Standards-Version: 3.5.8.0
 
 Package: libwxbase=V
 Architecture: any
@@ -18,14 +18,14 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
  wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
  Solaris, HP-UX, ...), win32, and BeOS.
  .
- This package is only useful for non-gui apps.  It offers a subset of the
+ This package is only useful for non-GUI apps.  It offers a subset of the
- classes in libwx_gtk=V for use in console apps and daemons.  It is currently
+ classes in libwx_gtk=V for use in console apps and daemons.  You do not need
- under development and may not be as stable as the gui version.
+ this package to build or use wxWindows GUI apps.
 
 Package: libwxbase=V-dev
 Architecture: any
 Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), zlib1g-dev, libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
 Suggests: wxwin=V-doc, gettext
 Conflicts: libwxbase-dev
 Replaces: libwxbase-dev
@@ -81,7 +81,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
 Package: libwxgtk=V-dev
 Architecture: any
 Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng-dev, libtiff3g-dev, libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
 Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
 Conflicts: libwxgtk-dev
 Replaces: libwxgtk-dev, wxgtk2.1-dev
@@ -117,16 +117,18 @@ Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
 Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends}
-Suggests: wxwin=V-doc, wxwin=V-examples
+Suggests: wxwin=V-doc, wxwin=V-examples, python2.2-xml
-Conflicts: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-python
+Conflicts: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
-Replaces: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-python
+Replaces: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
+Provides: libwxgtk-python
 Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
  wxWindows is a class library for C++ providing GUI (Graphical User
  Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
  This package provides a Python binding to the wxGTK library and it's
- contrib libs.
+ contrib libs.  If you wish to use xrced you'll also need the python-xml
+ package installed.
 
 Package: libwxgtk=V-contrib
 Architecture: any
@@ -137,21 +139,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
  Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
- This package provides the contrib libs of the wxWindows source tree
+ This package provides the contrib libs from the wxWindows source tree
- (mmedia, ogl, stc)
-
-Package: libwxgtk=V-univ
-Architecture: any
-Section: libs
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng-dev, libtiff3g-dev, libc6-dev, ${shlibs:Depends}
-Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
-Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
- .
- This package is built to use the wxUNIVERSAL widget set instead of
- native gtk widgets.
 
 Package: libwxgtk=V-contrib-dev
 Architecture: any
@@ -166,13 +154,13 @@ Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs)
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
  Install this package if you wish to compile applications that use the
- contrib libs from the wxWindows source tree (mmedia, ogl, stc)
+ contrib libs from the wxWindows source tree.
 
 Package: wxwin=V-headers
 Architecture: any
 Section: devel
 Conflicts: wxwin-headers
-Replaces: wxwin-headers, wxgtk2.1-dev
+Replaces: wxwin-headers, wxgtk2.1-dev, libwxgtk2.3
 Provides: wxwin-headers
 Description: wxWindows Cross-platform C++ GUI toolkit (header files)
  wxWindows is a class library for C++ providing GUI (Graphical User
@@ -215,7 +203,21 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples)
  Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
- This package contains examples of using the wxWindows toolkit.
+ This package contains examples of using the wxWindows toolkit in
+ C++ and with the wxPython language binding.
+
+Package: libwxgtk=V-univ
+Architecture: any
+Section: libs
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev, ${shlibs:Depends}
+Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
+Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package is built to use the wxUNIVERSAL widget set instead of
+ native gtk widgets.
 
 Package: libwxbase-msw=V-dev
 Architecture: i386

debian/copyright

@@ -29,7 +29,8 @@ alters the actual terms of the authorative licence detailed below, it is
 intended to be purely informative of the fact that the Debian binary packages
 will be built primarily with features useful to Free Software developers and
 may not be suitable "as is" for compiling software for distribution that is
-licenced incompatibly with the LGPL.
+licenced incompatibly with the LGPL.  See /usr/share/common-licenses for
+the full text of the LGPL.
 
 Modifications and additions to the Library itself are encouraged to be
 placed under the wxWindows Library Licence.  We hope you find it useful.

debian/libwxbase-dev.files

@@ -1,4 +0,0 @@
-usr/bin/wxbase-=V-config
-usr/lib/wx/include/base-=V/wx/setup.h
-usr/lib/libwx_base*.so
-

debian/libwxbase.dirs

@@ -1,3 +1,2 @@
-usr/bin
 usr/lib
 

debian/libwxgtk-contrib-dev.files

@@ -1,12 +0,0 @@
-usr/include/wx/
-usr/lib/libwx_gtk_canvas-*.so
-usr/lib/libwx_gtk_dcsvg-*.so
-usr/lib/libwx_gtk_fl-*.so
-usr/lib/libwx_gtk_gizmos-*.so
-usr/lib/libwx_gtk_mmedia-*.so
-usr/lib/libwx_gtk_net-*.so
-usr/lib/libwx_gtk_ogl-*.so
-usr/lib/libwx_gtk_plot-*.so
-usr/lib/libwx_gtk_stc-*.so
-usr/lib/libwx_gtk_xrc-*.so
-

debian/libwxgtk-dev.files

@@ -1,4 +0,0 @@
-usr/bin/wxgtk-=V-config
-usr/lib/wx/include/gtk-=V/wx/setup.h
-usr/lib/libwx_gtk*.so
-

debian/libwxgtk-python.files

@@ -1,4 +0,0 @@
-usr/lib/=PY/site-packages/wxPython
-usr/lib/libwxPyHelpers*.so
-usr/lib/libwxPyHelpers*.so.*
-

debian/libwxgtk-python.menu

@@ -1,7 +1,7 @@
-?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
   title="pycrust" command="/usr/bin/pycrust"
-?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
   title="pyshell" command="/usr/bin/pyshell"
-?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
   title="xrced" command="/usr/bin/xrced"
 

debian/libwxgtk.dirs

@@ -1,3 +1,2 @@
 usr/lib
-usr/share/wx/afm
+usr/share
-usr/share/wx/gs_afm

debian/lintian-override

@@ -1,4 +1,3 @@
-libwxgtk2.3-dbg: non-dev-pkg-with-shlib-symlink
+libwxgtk2.4-dbg: non-dev-pkg-with-shlib-symlink
-libwxbase2.3-dbg: non-dev-pkg-with-shlib-symlink
+libwxbase2.4-dbg: non-dev-pkg-with-shlib-symlink
-libwxgtk2.3-univ: non-dev-pkg-with-shlib-symlink
 

debian/rules

@@ -49,6 +49,8 @@ objdir_wxbase_debug=objs_wxbase_d
 objdir_gtk_shared=objs_gtk_sh
 objdir_gtk_static=objs_gtk_st
 objdir_gtk_debug=objs_gtk_d
+objdir_gtk_install=objs_gtk_install
+objdir_gtk_contrib_install=objs_gtk_contrib_install
 objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
@@ -65,10 +67,13 @@ objdir_msw_static=objs_msw_st
 objdir_msw_dbg=objs_msw_d
 
 objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
-	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) $(objdir_gtk_univ) \
+	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)          \
-	$(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
+	$(objdir_gtk_install) $(objdir_gtk_contrib_install) $(objdir_gtk_univ) \
-	$(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static) $(objdir_wxbase_msw_dbg) \
+	$(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc)               \
-	$(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)
+	$(objdir_examples)                                                     \
+	$(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static)                \
+	$(objdir_wxbase_msw_dbg) $(objdir_msw_shared) $(objdir_msw_static)     \
+	$(objdir_msw_dbg)
 
 #	note that the i18n package is actually arch indep (once built)
 #	but must be built (and installed) during the arch any phase as
@@ -78,10 +83,12 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
                   build-wxbase-debug-stamp build-gtk-shared-stamp \
                   build-gtk-static-stamp build-gtk-debug-stamp \
-                  build-gtk-univ-stamp \
                   build-contrib-shared-stamp build-contrib-static-stamp \
                   build-gtk-py-stamp build-i18n-stamp
 
+# disable gtk-univ build, we'll  replace it with x11-univ later.
+#		  build-gtk-univ-stamp
+
 build_indep_stamps=build-examples-stamp build-doc-stamp
 
 build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
@@ -95,10 +102,12 @@ build_stamps=$(build_stamps_native) $(build_cross_stamps)
 # Install targets:
 install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
                  install-gtk-lib install-gtk-dev install-gtk-dbg \
-                 install-gtk-univ \
                  install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
                  install-headers install-i18n
 
+# disable gtk-univ build, we'll  replace it with x11-univ later.
+#                install-gtk-univ
+
 install_all_indep=install-examples install-doc
 
 install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
@@ -124,7 +133,7 @@ control-files-stamp: debian/control
 		echo "generating control file $(package_wxbase_lib).$$f"; \
 		cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
 	done;
-	@for f in dirs files links postinst prerm; do \
+	@for f in dirs links postinst prerm; do \
 		echo "generating control file $(package_wxbase_dev).$$f"; \
 		sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
 			> debian/$(package_wxbase_dev).$$f; \
@@ -138,7 +147,7 @@ control-files-stamp: debian/control
 		echo "generating control file $(package_gtk_lib).$$f"; \
 		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
 	done;
-	@for f in dirs files links postinst prerm; do \
+	@for f in dirs links postinst prerm; do \
 		echo "generating control file $(package_gtk_dev).$$f"; \
 		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
 			> debian/$(package_gtk_dev).$$f; \
@@ -148,12 +157,7 @@ control-files-stamp: debian/control
 		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
 			> debian/$(package_gtk_dbg).$$f; \
 	done;
-	@for f in dirs links postinst prerm; do \
+	@for f in dirs docs menu postinst prerm; do \
-		echo "generating control file $(package_gtk_univ).$$f"; \
-		sed -e 's/=V/$(release)/g' < debian/libwxgtk-univ.$$f \
-			> debian/$(package_gtk_univ).$$f; \
-	done;
-	@for f in dirs docs files postinst prerm; do \
 		echo "generating control file $(package_gtk_py).$$f"; \
 		sed -e 's/=PY/$(python_dir)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
 			> debian/$(package_gtk_py).$$f; \
@@ -162,15 +166,15 @@ control-files-stamp: debian/control
 		echo "generating control file $(package_gtk_contrib).$$f"; \
 		cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
 	done;
-	@for f in dirs files; do \
+	@for f in dirs; do \
 		echo "generating control file $(package_gtk_contrib_dev).$$f"; \
 		cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
 	done;
-	@for f in dirs files; do \
+	@for f in dirs; do \
 		echo "generating control file $(package_headers).$$f"; \
 		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
 	done;
-	@for f in dirs files; do \
+	@for f in dirs; do \
 		echo "generating control file $(package_i18n).$$f"; \
 		cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
 	done;
@@ -208,6 +212,11 @@ control-files-stamp: debian/control
 		sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
 			> debian/$(package_headers_msw).$$f; \
 	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_gtk_univ).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-univ.$$f \
+			> debian/$(package_gtk_univ).$$f; \
+	done;
 	touch $@
 
 build_arch: control-files-stamp $(build_arch_stamps)
@@ -222,7 +231,7 @@ build_all: control-files-stamp $(build_stamps_native)
 build: build_arch
 
 
-build-wxbase-shared-stamp:
+configure-wxbase-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_shared)
 	cd $(objdir_wxbase_shared) \
@@ -230,11 +239,15 @@ build-wxbase-shared-stamp:
 				--cache-file=$(config_cache) \
 				--disable-gui \
 				--enable-soname \
-				--with-zlib=sys \
+				--with-zlib=sys
-		&& $(MAKE)
 	touch $@
 
-build-wxbase-static-stamp:
+build-wxbase-shared-stamp: configure-wxbase-shared-stamp
+	dh_testdir
+	cd $(objdir_wxbase_shared) && $(MAKE)
+	touch $@
+
+configure-wxbase-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_static)
 	cd $(objdir_wxbase_static) \
@@ -242,11 +255,15 @@ build-wxbase-static-stamp:
 				--cache-file=$(config_cache) \
 				--disable-gui \
 				--disable-shared \
-				--with-zlib=sys \
+				--with-zlib=sys
-		&& $(MAKE)
 	touch $@
 
-build-wxbase-debug-stamp:
+build-wxbase-static-stamp: configure-wxbase-static-stamp
+	dh_testdir
+	cd $(objdir_wxbase_static) && $(MAKE)
+	touch $@
+
+configure-wxbase-debug-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_debug)
 	cd $(objdir_wxbase_debug) \
@@ -255,11 +272,15 @@ build-wxbase-debug-stamp:
 				--disable-gui \
 				--enable-debug \
 				--enable-soname \
-				--with-zlib=sys \
+				--with-zlib=sys
-		&& $(MAKE)
 	touch $@
 
-build-gtk-shared-stamp:
+build-wxbase-debug-stamp: configure-wxbase-debug-stamp
+	dh_testdir
+	cd $(objdir_wxbase_debug) && $(MAKE)
+	touch $@
+
+configure-gtk-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_shared)
 	cd $(objdir_gtk_shared) \
@@ -272,11 +293,15 @@ build-gtk-shared-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
-				--enable-dynamic-loader \
+				--enable-dynamic-loader
-		&& $(MAKE)
 	touch $@
 
-build-gtk-static-stamp:
+build-gtk-shared-stamp: configure-gtk-shared-stamp
+	dh_testdir
+	cd $(objdir_gtk_shared) && $(MAKE)
+	touch $@
+
+configure-gtk-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_static)
 	cd $(objdir_gtk_static) \
@@ -289,11 +314,15 @@ build-gtk-static-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
-				--enable-dynamic-loader \
+				--enable-dynamic-loader
-		&& $(MAKE)
 	touch $@
 
-build-gtk-debug-stamp:
+build-gtk-static-stamp: configure-gtk-static-stamp
+	dh_testdir
+	cd $(objdir_gtk_static) && $(MAKE)
+	touch $@
+
+configure-gtk-debug-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_debug)
 	cd $(objdir_gtk_debug) \
@@ -307,11 +336,15 @@ build-gtk-debug-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
-				--enable-dynamic-loader \
+				--enable-dynamic-loader
-		&& $(MAKE)
 	touch $@
 
-build-gtk-univ-stamp:
+build-gtk-debug-stamp: configure-gtk-debug-stamp
+	dh_testdir
+	cd $(objdir_gtk_debug) && $(MAKE)
+	touch $@
+
+configure-gtk-univ-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_univ)
 	cd $(objdir_gtk_univ) \
@@ -325,8 +358,12 @@ build-gtk-univ-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
-				--enable-dynamic-loader \
+				--enable-dynamic-loader
-		&& $(MAKE)
+	touch $@
+
+build-gtk-univ-stamp: configure-gtk-univ-stamp
+	dh_testdir
+	cd $(objdir_gtk_univ) && $(MAKE)
 	touch $@
 
 build-contrib-shared-stamp: build-gtk-shared-stamp
@@ -352,6 +389,7 @@ build-doc-stamp: build-gtk-shared-stamp
 	dh_testdir
 	cd $(objdir_gtk_shared)/utils/tex2rtf/src \
 		&& $(MAKE)
+	rm -rf $(objdir_doc)
 	mkdir $(objdir_doc)
 	mkdir $(objdir_doc_cruft)
 	cd $(objdir_doc_cruft) \
@@ -399,7 +437,7 @@ build-i18n-stamp: build-gtk-shared-stamp
 		&& $(MAKE) allmo
 	touch $@
 
-build-wxbase-msw-shared-stamp:
+configure-wxbase-msw-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_msw_shared)
 	cd $(objdir_wxbase_msw_shared) \
@@ -407,11 +445,15 @@ build-wxbase-msw-shared-stamp:
 				--cache-file=$(config_cache_cross) \
 				--host=$(cross_host) \
 				--build=$(cross_build) \
-				--disable-gui \
+				--disable-gui
-		&& $(MAKE)
 	touch $@
 
-build-wxbase-msw-static-stamp:
+build-wxbase-msw-shared-stamp: configure-wxbase-msw-shared-stamp
+	dh_testdir
+	cd $(objdir_wxbase_msw_shared) && $(MAKE)
+	touch $@
+
+configure-wxbase-msw-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_msw_static)
 	cd $(objdir_wxbase_msw_static) \
@@ -420,12 +462,16 @@ build-wxbase-msw-static-stamp:
 				--host=$(cross_host) \
 				--build=$(cross_build) \
 				--disable-gui \
-				--disable-shared \
+				--disable-shared
-		&& $(MAKE)
+	touch $@
+
+build-wxbase-msw-static-stamp: configure-wxbase-msw-static-stamp
+	dh_testdir
+	cd $(objdir_wxbase_msw_static) && $(MAKE)
 	touch $@
 
 # Note this builds dll only, since wxmsw static debug is > 130MB !
-build-wxbase-msw-dbg-stamp:
+configure-wxbase-msw-dbg-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_msw_dbg)
 	cd $(objdir_wxbase_msw_dbg) \
@@ -434,22 +480,30 @@ build-wxbase-msw-dbg-stamp:
 				--host=$(cross_host) \
 				--build=$(cross_build) \
 				--disable-gui \
-				--enable-debug \
+				--enable-debug
-		&& $(MAKE)
 	touch $@
 
-build-msw-shared-stamp:
+build-wxbase-msw-dbg-stamp: configure-wxbase-msw-dbg-stamp
+	dh_testdir
+	cd $(objdir_wxbase_msw_dbg) && $(MAKE)
+	touch $@
+
+configure-msw-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_msw_shared)
 	cd $(objdir_msw_shared) \
 		&& ../configure --prefix=/usr/$(cross_host) \
 				--cache-file=$(config_cache_cross) \
 				--host=$(cross_host) \
-				--build=$(cross_build) \
+				--build=$(cross_build)
-		&& $(MAKE)
 	touch $@
 
-build-msw-static-stamp:
+build-msw-shared-stamp: configure-msw-shared-stamp
+	dh_testdir
+	cd $(objdir_msw_shared) && $(MAKE)
+	touch $@
+
+configure-msw-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_msw_static)
 	cd $(objdir_msw_static) \
@@ -457,11 +511,15 @@ build-msw-static-stamp:
 				--cache-file=$(config_cache_cross) \
 				--host=$(cross_host) \
 				--build=$(cross_build) \
-				--disable-shared \
+				--disable-shared
-		&& $(MAKE)
 	touch $@
 
-build-msw-dbg-stamp:
+build-msw-static-stamp: configure-msw-static-stamp
+	dh_testdir
+	cd $(objdir_msw_static) && $(MAKE)
+	touch $@
+
+configure-msw-dbg-stamp:
 	dh_testdir
 	mkdir -p $(objdir_msw_dbg)
 	cd $(objdir_msw_dbg) \
@@ -469,8 +527,12 @@ build-msw-dbg-stamp:
 				--cache-file=$(config_cache_cross) \
 				--host=$(cross_host) \
 				--build=$(cross_build) \
-				--enable-debug \
+				--enable-debug
-		&& $(MAKE)
+	touch $@
+
+build-msw-dbg-stamp: configure-msw-dbg-stamp
+	dh_testdir
+	cd $(objdir_msw_dbg) && $(MAKE)
 	touch $@
 
 
@@ -478,13 +540,12 @@ clean: debian/control
 	dh_testdir
 	dh_testroot
 
-	rm -rf config_deb.cache config_deb_cross.cache control-files-stamp $(build_stamps) $(objdirs)
+	rm -rf config_deb.cache config_deb_cross.cache *-stamp $(objdirs)
 	rm -f docs/lgpl.txt
 	rm -f docs/latex/wx/manual.bb
 	rm -f $(objdir_i18n)/*.mo
 
 	cd wxPython \
-		&& ./setup.py clean \
 		&& rm -rf licence \
 		&& rm -rf build \
 		&& rm -rf contrib/gizmos/contrib \
@@ -493,6 +554,10 @@ clean: debian/control
 		&& rm -rf contrib/xrc/contrib \
 		&& rm -rf *.pyc
 
+# We do the equivalent of this above by removing build, unfortunately
+# its not enough by itself to get the tree properly clean again.
+#		&& ./setup.py clean
+
 	dh_clean
 	rm -f debian/$(package_wxbase_lib).*
 	rm -f debian/$(package_wxbase_dev).*
@@ -500,7 +565,6 @@ clean: debian/control
 	rm -f debian/$(package_gtk_lib).*
 	rm -f debian/$(package_gtk_dev).*
 	rm -f debian/$(package_gtk_dbg).*
-	rm -f debian/$(package_gtk_univ).*
 	rm -f debian/$(package_gtk_py).*
 	rm -f debian/$(package_gtk_contrib).*
 	rm -f debian/$(package_gtk_contrib_dev).*
@@ -508,6 +572,7 @@ clean: debian/control
 	rm -f debian/$(package_i18n).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
+	rm -f debian/$(package_gtk_univ).*
 	rm -f debian/$(package_wxbase_msw_dev).*
 	rm -f debian/$(package_wxbase_msw_dbg).*
 	rm -f debian/$(package_msw_dev).*
@@ -524,17 +589,17 @@ install-wxbase-lib: build-wxbase-shared-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/usr/lib
+	dh_install $(objdir_wxbase_shared)/lib/*.so.* 	usr/lib
-	cp $(objdir_wxbase_shared)/wxbase-$(release)-config debian/$(package_wxbase_lib)/usr/bin/
 
 install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
-install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
+install-wxbase-dev: build-wxbase-static-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_movefiles --sourcedir=debian/$(package_wxbase_lib)
+	dh_install $(objdir_wxbase_shared)/wxbase-$(release)-config 	usr/bin
-	cp $(objdir_wxbase_static)/lib/*.a debian/$(package_wxbase_dev)/usr/lib
+	dh_install $(objdir_wxbase_shared)/lib/{wx,*.so} 		usr/lib
+	dh_install $(objdir_wxbase_static)/lib/*.a 			usr/lib
 
 install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
 install-wxbase-dbg: build-wxbase-debug-stamp
@@ -542,29 +607,35 @@ install-wxbase-dbg: build-wxbase-debug-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
+	dh_install $(objdir_wxbase_debug)/wxbased-$(release)-config 	usr/bin
-	cp $(objdir_wxbase_debug)/wxbased-$(release)-config debian/$(package_wxbase_dbg)/usr/bin/
+	dh_install $(objdir_wxbase_debug)/lib 				usr
 	cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
 
+install-gtk-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_gtk_install)
+	cd $(objdir_gtk_shared) \
+		&& $(MAKE) install prefix=`pwd`/../$(objdir_gtk_install)
+	touch $@
+
 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
-install-gtk-lib: build-gtk-shared-stamp
+install-gtk-lib: build-gtk-shared-stamp install-gtk-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs 
-	cd $(objdir_gtk_shared) \
+	dh_install $(objdir_gtk_install)/share/wx 	usr/share
-		&& $(MAKE) install prefix=`pwd`/../debian/$(package_gtk_lib)/usr
+	dh_install $(objdir_gtk_install)/lib/*.so.* 	usr/lib
-	rm -f debian/$(package_gtk_lib)/usr/bin/wx-config
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
-install-gtk-dev: build-gtk-static-stamp install-gtk-lib
+install-gtk-dev: build-gtk-static-stamp install-gtk-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+	dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config 	usr/bin
-	cp $(objdir_gtk_static)/lib/libwx_gtk-*.a debian/$(package_gtk_dev)/usr/lib
+	dh_install $(objdir_gtk_install)/lib/{wx,*.so} 			usr/lib
-	cp $(objdir_gtk_static)/lib/libwx_gtk_gl-*.a debian/$(package_gtk_dev)/usr/lib
+	dh_install $(objdir_gtk_static)/lib/libwx_gtk{-,_gl}*.a 	usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -572,8 +643,8 @@ install-gtk-dbg: build-gtk-debug-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
+	dh_install $(objdir_gtk_debug)/wxgtkd-$(release)-config 	usr/bin
-	cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/
+	dh_install $(objdir_gtk_debug)/lib 				usr
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
 install-gtk-univ: DH_OPTIONS=-p$(package_gtk_univ)
@@ -582,29 +653,35 @@ install-gtk-univ: build-gtk-univ-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cp -a $(objdir_gtk_univ)/lib/* debian/$(package_gtk_univ)/usr/lib
+	dh_install $(objdir_gtk_univ)/wxgtkuniv-$(release)-config 	usr/bin
-	cp $(objdir_gtk_univ)/wxgtkuniv-$(release)-config debian/$(package_gtk_univ)/usr/bin/
+	dh_install $(objdir_gtk_univ)/lib 				usr
 	cp debian/lintian-override debian/$(package_gtk_univ)/usr/share/lintian/overrides/$(package_gtk_univ)
 
+install-gtk-contrib-stamp:
+	dh_testdir
+	mkdir -p $(objdir_gtk_contrib_install)/lib
+	cd $(objdir_gtk_shared)/contrib/src \
+		&& $(MAKE) install prefix=`pwd`/../../../$(objdir_gtk_contrib_install)
+	touch $@
+
 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
-install-gtk-contrib: build-contrib-shared-stamp
+install-gtk-contrib: build-contrib-shared-stamp install-gtk-contrib-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cd $(objdir_gtk_shared)/contrib/src \
+	dh_install $(objdir_gtk_contrib_install)/lib/*.so.* 	usr/lib
-		&& $(MAKE) install prefix=`pwd`/../../../debian/$(package_gtk_contrib)/usr
 
 install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
-install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
+install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_movefiles --sourcedir=debian/$(package_gtk_contrib)
+	dh_install $(objdir_gtk_contrib_install)/include 	usr
-	cp $(objdir_gtk_static)/lib/*.a debian/$(package_gtk_contrib_dev)/usr/lib
+	dh_install $(objdir_gtk_contrib_install)/lib/*.so 	usr/lib
-	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk-*.a
+	dh_install -Xlibwx_gtk- -Xlibwx_gtk_gl- \
-	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk_gl-*.a
+		   $(objdir_gtk_static)/lib/*.a 		usr/lib
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp
@@ -613,12 +690,23 @@ install-gtk-py: build-gtk-py-stamp
 	dh_clean -k
 	dh_installdirs
 	cd wxPython \
-		&& ./setup.py install --prefix=`pwd`/../debian/$(package_gtk_py)/usr
+		&& ./setup.py install \
+			      --prefix=`pwd`/../debian/$(package_gtk_py)/usr \
+			      WX_CONFIG='$(wxconfig)'
 	find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
 		-name '*.py?' -exec rm '{}' ';'
 
+	dh_installman debian/wxPython-tools.1
+	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1  \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1   \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1
+
 install-headers: DH_OPTIONS=-p$(package_headers)
-install-headers: install-gtk-lib
+install-headers: install-gtk-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -628,27 +716,22 @@ install-headers: install-gtk-lib
 # them.  Do that in a scratch dirs, and move the gtk ones last, so at least
 # they win in the result of any uncaught conflict.
 
-	cd $(objdir_gtk_univ) \
+#	cd $(objdir_gtk_univ) \
-		&& $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
+#		&& $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
 
-	dh_movefiles --sourcedir=$(objdir_univ_install)
+#	dh_movefiles --sourcedir=$(objdir_univ_install)
-	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+	dh_install $(objdir_gtk_install)/include 	usr
+	dh_install $(objdir_gtk_install)/share/aclocal 	usr/share
 
-	dh_installmanpages \
+	dh_installman debian/wx-config.1
-		ansi2knr.1 \
-		jpegtran.1 \
-		libpng.3   \
-		libpngpf.3 \
-		zlib.3     \
-		png.5
 
 install-i18n: DH_OPTIONS=-p$(package_i18n)
-install-i18n: build-i18n-stamp install-gtk-lib
+install-i18n: build-i18n-stamp install-gtk-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+	dh_install $(objdir_gtk_install)/share/locale 	usr/share
 
 install-doc: DH_OPTIONS=-p$(package_doc)
 install-doc: build-doc-stamp
@@ -756,13 +839,13 @@ binary-common:
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+		DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
 		binary-common
 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+		DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
 		binary-common
 
 # Build all packages target.

debian/wx-config.1

@@ -1,31 +1,31 @@
-.TH wx-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows 2.2"
+.TH wx\-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows"
 .SH NAME
-wx-config - generate compile time info for wxWindows
+wx-config \- generate compile time info for wxWindows
 .SH SYNOPSIS
 .nh
-.B wxbase-config
+.B wxbase\-config
 .br
-.B wxgtk-config
+.B wxgtk\-config
 .HP
-.B wx-config
+.B wx\-config
 [\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
 [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP]
 .SH DESCRIPTION
-\fIwx-config\fP is a tool to determine the compiler and linker
+\fIwx\-config\fP is a tool to determine the compiler and linker
 flags required for applications using the \fIwxWindows\fP toolkit(s).
 .PP
-\fIwx-config\fP is normally a symlink to one of the port-specific
+\fIwx\-config\fP is normally a symlink to one of the port\-specific
-versions like \fIwxbase-config\fP or \fIwxgtk-config\fP which
+versions like \fIwxbase\-config\fP or \fIwxgtk\-config\fP which
 designates the default port to compile applications with.
 You can override this default either by using one of the specific
 versions directly, or by changing which version the symlink points to.
 On Debian systems this can be done using the
-.BR update-alternatives (8)
+.BR update\-alternatives (8)
 mechanism.
 .hy
 .SH OPTIONS
 .l
-\fIwx-config\fP accepts the following options:
+\fIwx\-config\fP accepts the following options:
 .TP 8
 .B  \-\-version
 What to
@@ -58,7 +58,7 @@ before any \-\-libs or \-\-cflags options.
 .br
 .nh
 .HP
-(Translation:  this is the root path to the \fIwxWindows\fP headers -- [Ron])
+(Translation:  this is the root path to the \fIwxWindows\fP headers \-\- [Ron])
 .hy
 .TP 8
 .B  \-\-exec\-prefix=PREFIX
@@ -69,18 +69,18 @@ and \-\-libs options.  This option must be specified before any
 .br
 .nh
 .HP
-(Translation:  this is the root path to the \fIwxWindows\fP library -- [Ron])
+(Translation:  this is the root path to the \fIwxWindows\fP library \-\- [Ron])
 .hy
 .SH SEE ALSO
-.BR gtk-config (1),
+.BR gtk\-config (1),
-.BR update-alternatives (8)
+.BR update\-alternatives (8)
 .SH COPYRIGHT
-This manpage was copied whole-heartedly from the \fBgtk-config\fP(1) manpage
+This manpage was copied whole\-heartedly from the \fBgtk\-config\fP(1) manpage
 by Brian Bassett <brianb@debian.org> for the Debian GNU/Linux distribution of
 wxGTK.  It was then updated to include new options and otherwise bastardised
 generally by Ron Lee <ron@debian.org>
 
-The original gtk-config manpage copyright:
+The original gtk\-config manpage copyright:
 
 Copyright \(co  1995 Spencer Kimball and Peter Mattis
 

debian/wxPython-tools.1

@@ -0,0 +1,27 @@
+.TH wxPython\-tools 1 "3 Jan 2003" "Debian GNU/Linux" "wxWindows"
+.SH NAME
+img2py \- wxPython tools.
+.br
+img2png \- wxPython tools.
+.br
+img2xpm \- wxPython tools.
+.br
+pycrust \- wxPython tools.
+.br
+pyshell \- wxPython tools.
+.br
+xrced \- wxPython tools.
+.br
+helpviewer \- wxPython tools.
+
+.SH DESCRIPTION
+The real documentation for these tools is available in pydoc format.
+
+.SH SEE ALSO
+.BR pydoc (1)
+
+.SH COPYRIGHT
+This manpage was written by Ron Lee <ron@debian.org> for the Debian GNU/Linux
+distribution of wxWindows.  It may be freely distributed by anyone insane enough
+to find it useful.
+

debian/wxwin-headers.files

@@ -1 +0,0 @@
-usr/include/wx/

debian/wxwin-i18n.files

@@ -1,2 +0,0 @@
-/usr/share/locale/
-

demos/bombs/bombs.cpp

@@ -40,7 +40,7 @@ bool AppClass::OnInit()
   level=IDM_EASY;
 
   BombsFrame = 
-    new BombsFrameClass(NULL, "wxBombs", wxPoint(155, 165), wxSize(300, 300), wxMINIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION);
+    new BombsFrameClass(NULL, _T("wxBombs"), wxPoint(155, 165), wxSize(300, 300), wxMINIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION);
 
   int xmax=BombsFrame->BombsCanvas->field_width*BombsFrame->BombsCanvas->x_cell*X_UNIT;
   int ymax=BombsFrame->BombsCanvas->field_height*BombsFrame->BombsCanvas->y_cell*Y_UNIT;
@@ -72,17 +72,17 @@ BombsFrameClass::BombsFrameClass(wxFrame *parent, const wxString& title, const w
   // Create a menu bar for the frame
   wxMenuBar *menuBar1 = new wxMenuBar;
   wxMenu *menu1 = new wxMenu;
-  menu1->Append(IDM_EXIT, "E&xit"); // , "Quit the program");
+  menu1->Append(IDM_EXIT, _T("E&xit")); // , "Quit the program");
   menu1->AppendSeparator();
-  menu1->Append(IDM_ABOUT, "&About..."); // , "Infos on wxBombs");
+  menu1->Append(IDM_ABOUT, _T("&About...")); // , "Infos on wxBombs");
-  menuBar1->Append(menu1, "&File");
+  menuBar1->Append(menu1, _T("&File"));
   wxMenu *menu2 = new wxMenu;
-  menu2->Append(IDM_RESTART, "&Restart"); // , "Clear the play field");
+  menu2->Append(IDM_RESTART, _T("&Restart")); // , "Clear the play field");
   menu2->AppendSeparator();
-  menu2->Append(IDM_EASY, "&Easy", wxEmptyString, TRUE); // "10x10 play field", TRUE);
+  menu2->Append(IDM_EASY, _T("&Easy"), wxEmptyString, TRUE); // "10x10 play field", TRUE);
-  menu2->Append(IDM_MEDIUM, "&Medium", wxEmptyString, TRUE); // "15x15 play field", TRUE);
+  menu2->Append(IDM_MEDIUM, _T("&Medium"), wxEmptyString, TRUE); // "15x15 play field", TRUE);
-  menu2->Append(IDM_DIFFICULT, "&Difficult", wxEmptyString, TRUE); // "25x20 play field", TRUE);
+  menu2->Append(IDM_DIFFICULT, _T("&Difficult"), wxEmptyString, TRUE); // "25x20 play field", TRUE);
-  menuBar1->Append(menu2, "&Game");
+  menuBar1->Append(menu2, _T("&Game"));
   SetMenuBar(menuBar1);
   menuBar=menuBar1;
   menuBar->Check(wxGetApp().level, TRUE);
@@ -124,7 +124,7 @@ void BombsFrameClass::OnRestart(wxCommandEvent& event)
 
 void BombsFrameClass::OnAbout(wxCommandEvent& event)
 {
-    wxMessageBox("wxBombs (c) 1996 by P. Foggia\n<foggia@amalfi.dis.unina.it>", "About wxBombs");
+    wxMessageBox(_T("wxBombs (c) 1996 by P. Foggia\n<foggia@amalfi.dis.unina.it>"), _T("About wxBombs"));
 }
 
 void BombsFrameClass::OnEasy(wxCommandEvent& event)
@@ -162,7 +162,7 @@ BombsCanvasClass::BombsCanvasClass(wxFrame *parent, const wxPoint& pos, const wx
   dc.SetFont(font);
 
   long chw, chh;
-  char buf[]="M";
+  wxChar buf[]=_T("M");
 
   dc.GetTextExtent(buf, &chw, &chh);
   dc.SetFont(wxNullFont);

demos/bombs/bombs1.cpp

@@ -33,15 +33,15 @@
 /*---------------------------------------------------------------------*/
 void BombsCanvasClass::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
 { int x,y,xmax,ymax;
-  char buf[2];
+  wxChar buf[2];
   long chw, chh;
 
-  wxColour *wxBlack = wxTheColourDatabase->FindColour("BLACK");
+  wxColour *wxBlack = wxTheColourDatabase->FindColour(_T("BLACK"));
-  wxColour *wxWhite = wxTheColourDatabase->FindColour("WHITE");
+  wxColour *wxWhite = wxTheColourDatabase->FindColour(_T("WHITE"));
-  wxColour *wxRed = wxTheColourDatabase->FindColour("RED");
+  wxColour *wxRed = wxTheColourDatabase->FindColour(_T("RED"));
-  wxColour *wxBlue = wxTheColourDatabase->FindColour("BLUE");
+  wxColour *wxBlue = wxTheColourDatabase->FindColour(_T("BLUE"));
-  wxColour *wxGrey = wxTheColourDatabase->FindColour("LIGHT GREY");
+  wxColour *wxGrey = wxTheColourDatabase->FindColour(_T("LIGHT GREY"));
-  wxColour *wxGreen = wxTheColourDatabase->FindColour("GREEN");
+  wxColour *wxGreen = wxTheColourDatabase->FindColour(_T("GREEN"));
 
   wxPen *blackPen = wxThePenList->FindOrCreatePen(*wxBlack, 1, wxSOLID);
   wxPen *redPen = wxThePenList->FindOrCreatePen(*wxRed, 1, wxSOLID);
@@ -64,7 +64,7 @@ void BombsCanvasClass::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
   wxFont font= BOMBS_FONT;
   dc->SetFont(font); 
 
-  buf[1]='\0';
+  buf[1]=_T('\0');
   for(x=xc1; x<=xc2; x++)
     for(y=yc1; y<=yc2; y++)
       { if (wxGetApp().Game.IsMarked(x,y))
@@ -72,7 +72,7 @@ void BombsCanvasClass::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
             dc->SetBrush(* greyBrush);
             dc->DrawRectangle( x*x_cell*X_UNIT, y*y_cell*Y_UNIT,
                                x_cell*X_UNIT+1, y_cell*Y_UNIT+1);
-            *buf='M';
+            *buf=_T('M');
             if (!wxGetApp().Game.IsHidden(x,y) && wxGetApp().Game.IsBomb(x,y))
               dc->SetTextForeground(*wxBlue);
             else
@@ -102,7 +102,7 @@ void BombsCanvasClass::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
             dc->SetBrush(* redBrush);
             dc->DrawRectangle( x*x_cell*X_UNIT, y*y_cell*Y_UNIT,
                                x_cell*X_UNIT+1, y_cell*Y_UNIT+1);
-            *buf='B';
+            *buf=_T('B');
             dc->SetTextForeground(* wxBlack);
             dc->SetTextBackground(* wxRed);
             dc->GetTextExtent(buf, &chw, &chh);
@@ -123,11 +123,11 @@ void BombsCanvasClass::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
             dc->SetBrush(* whiteBrush);
             dc->DrawRectangle( x*x_cell*X_UNIT, y*y_cell*Y_UNIT,
                                x_cell*X_UNIT+1, y_cell*Y_UNIT+1);
-            *buf = (wxGetApp().Game.Get(x,y) & BG_MASK) + '0';
+            *buf = (wxGetApp().Game.Get(x,y) & BG_MASK) + _T('0');
             dc->GetTextExtent(buf, &chw, &chh);
             switch(*buf)
-              { case '0': dc->SetTextForeground(* wxGreen); break;
+              { case _T('0'): dc->SetTextForeground(* wxGreen); break;
-                case '1': dc->SetTextForeground(* wxBlue); break;
+                case _T('1'): dc->SetTextForeground(* wxBlue); break;
                 default:  dc->SetTextForeground(* wxBlack); break;
               }
             dc->SetTextBackground(* wxWhite);
@@ -140,9 +140,10 @@ void BombsCanvasClass::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
   dc->SetFont(wxNullFont);
 
   if (wxGetApp().BombsFrame)
-    { char buf[80];
+    { wxString buf;
-      sprintf(buf, "%d bombs  %d remaining cells",
+      buf.Printf(_T("%d bombs  %d remaining cells"),
-              wxGetApp().Game.GetBombs(), wxGetApp().Game.GetRemainingCells());
+                 wxGetApp().Game.GetBombs(),
+                 wxGetApp().Game.GetRemainingCells());
       wxGetApp().BombsFrame->SetStatusText(buf, 0);
     }
 }
@@ -172,7 +173,7 @@ void BombsCanvasClass::Uncover(int x, int y)
   if (wxGetApp().Game.IsBomb(x,y) || wxGetApp().Game.GetRemainingCells()==0)
     { wxBell();
       if (!wxGetApp().Game.IsBomb(x,y))
-       { wxMessageBox("Nice! You found all the bombs!", "wxWin Bombs",
+       { wxMessageBox(_T("Nice! You found all the bombs!"), _T("wxWin Bombs"),
                       wxOK|wxCENTRE, wxGetApp().BombsFrame);
        }
       else // x,y is a bomb

demos/forty/canvas.cpp

@@ -56,7 +56,7 @@ FortyCanvas::FortyCanvas(wxWindow* parent, int x, int y, int w, int h) :
 	m_arrowCursor = new wxCursor(wxCURSOR_ARROW);
 
 	wxString name = wxTheApp->GetAppName();
-	if (name.Length() <= 0) name = "forty";
+	if (name.Length() <= 0) name = _T("forty");
 	m_scoreFile = new ScoreFile(name);
 	m_game = new Game(0, 0, 0);
 	m_game->Deal();
@@ -159,8 +159,8 @@ Called when the main frame is closed
 bool FortyCanvas::OnCloseCanvas()
 {
 	if (m_game->InPlay() &&
-		wxMessageBox("Are you sure you want to\nabandon the current game?",
+		wxMessageBox(_T("Are you sure you want to\nabandon the current game?"),
-			"Warning", wxYES_NO | wxICON_QUESTION) == wxNO)
+			_T("Warning"), wxYES_NO | wxICON_QUESTION) == wxNO)
 	{
         return FALSE;
 	}

demos/forty/card.cpp

@@ -67,25 +67,25 @@ Card::Card(int value, WayUp way_up) :
 	if (!m_symbolBmap)
 	{
 #ifdef __WXMSW__
-		m_symbolBmap = new wxBitmap("CardSymbols", wxBITMAP_TYPE_BMP_RESOURCE);
+		m_symbolBmap = new wxBitmap(_T("CardSymbols"), wxBITMAP_TYPE_BMP_RESOURCE);
 #else
 		m_symbolBmap = new wxBitmap(Symbols_bits, Symbols_width, Symbols_height);
 #endif
 		if (!m_symbolBmap->Ok())
 		{
-			::wxMessageBox("Failed to load bitmap CardSymbols", "Error");
+			::wxMessageBox(_T("Failed to load bitmap CardSymbols"), _T("Error"));
 		}
 	}
 	if (!m_pictureBmap)
 	{
 #ifdef __WXMSW__
-		m_pictureBmap = new wxBitmap("CardPictures", wxBITMAP_TYPE_BMP_RESOURCE);
+		m_pictureBmap = new wxBitmap(_T("CardPictures"), wxBITMAP_TYPE_BMP_RESOURCE);
 #else
 		m_pictureBmap = new wxBitmap(Pictures);
 #endif
 		if (!m_pictureBmap->Ok())
 		{
-			::wxMessageBox("Failed to load bitmap CardPictures", "Error");
+			::wxMessageBox(_T("Failed to load bitmap CardPictures"), _T("Error"));
 		}
 	}
 
@@ -196,7 +196,7 @@ void Card::Draw(wxDC& dc, int x, int y)
 		dc.SetBackground(* wxRED_BRUSH);
 		dc.SetBackgroundMode(wxSOLID);
 		wxBrush* brush = wxTheBrushList->FindOrCreateBrush(
-							"BLACK", wxCROSSDIAG_HATCH
+							_T("BLACK"), wxCROSSDIAG_HATCH
 							);
 		dc.SetBrush(* brush);
 

demos/forty/forty.cpp

@@ -76,7 +76,7 @@ bool FortyApp::OnInit()
         bool largecards = FALSE;
         wxSize size(668,510);
 
-        if ((argc > 1) && (!wxStrcmp(argv[1],"-L")))
+        if ((argc > 1) && (!wxStrcmp(argv[1],_T("-L"))))
         {
             largecards = TRUE;
             size = wxSize(1000,750);
@@ -84,7 +84,7 @@ bool FortyApp::OnInit()
 
 	FortyFrame* frame = new FortyFrame(
 			0,
-			"Forty Thieves",
+			_T("Forty Thieves"),
                         -1, -1, size.x, size.y,largecards
 			);
 
@@ -120,14 +120,14 @@ const wxColour& FortyApp::TextColour()
 {
 	if (!m_textColour)
 	{
-		m_textColour = new wxColour("BLACK");
+		m_textColour = new wxColour(_T("BLACK"));
 	}
 
 	return *m_textColour;
 }
 
 // My frame constructor
-FortyFrame::FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,bool largecards):
+FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int w, int h,bool largecards):
 	wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {
 #ifdef __WXMAC__
@@ -136,7 +136,7 @@ FortyFrame::FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,b
 #endif
 	// set the icon
 #ifdef __WXMSW__
-	SetIcon(wxIcon("CardsIcon"));
+	SetIcon(wxIcon(_T("CardsIcon")));
 #else
 #ifdef GTK_TBD
 	SetIcon(wxIcon(Cards_bits, Cards_width, Cards_height));
@@ -145,28 +145,28 @@ FortyFrame::FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,b
 
 	// Make a menu bar
 	wxMenu* gameMenu = new wxMenu;
-	gameMenu->Append(NEW_GAME, "&New", "Start a new game");
+	gameMenu->Append(NEW_GAME, _T("&New"), _T("Start a new game"));
-	gameMenu->Append(SCORES, "&Scores...", "Displays scores");
+	gameMenu->Append(SCORES, _T("&Scores..."), _T("Displays scores"));
-	gameMenu->Append(EXIT, "E&xit", "Exits Forty Thieves");
+	gameMenu->Append(EXIT, _T("E&xit"), _T("Exits Forty Thieves"));
 
 	wxMenu* editMenu = new wxMenu;
-	editMenu->Append(UNDO, "&Undo", "Undo the last move");
+	editMenu->Append(UNDO, _T("&Undo"), _T("Undo the last move"));
-	editMenu->Append(REDO, "&Redo", "Redo a move that has been undone");
+	editMenu->Append(REDO, _T("&Redo"), _T("Redo a move that has been undone"));
 
 	wxMenu*	optionsMenu = new wxMenu;
 	optionsMenu->Append(RIGHT_BUTTON_UNDO,
-			"&Right button undo",
+			_T("&Right button undo"),
-			"Enables/disables right mouse button undo and redo",
+			_T("Enables/disables right mouse button undo and redo"),
 			TRUE
 			);
 	optionsMenu->Append(HELPING_HAND,
-			"&Helping hand",
+			_T("&Helping hand"),
-			"Enables/disables hand cursor when a card can be moved",
+			_T("Enables/disables hand cursor when a card can be moved"),
 			TRUE
 			);
         optionsMenu->Append(LARGE_CARDS,
-                        "&Large cards",
+                        _T("&Large cards"),
-                        "Enables/disables large cards for high resolution displays",
+                        _T("Enables/disables large cards for high resolution displays"),
                         TRUE
                         );
 	optionsMenu->Check(HELPING_HAND, TRUE);
@@ -174,13 +174,13 @@ FortyFrame::FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,b
         optionsMenu->Check(LARGE_CARDS, largecards ? TRUE : FALSE);
 
 	wxMenu* helpMenu = new wxMenu;
-	helpMenu->Append(ABOUT, "&About...", "Displays information about the game");
+	helpMenu->Append(ABOUT, _T("&About..."), _T("Displays information about the game"));
 
 	m_menuBar = new wxMenuBar;
-	m_menuBar->Append(gameMenu,    "&Game");
+	m_menuBar->Append(gameMenu,    _T("&Game"));
-	m_menuBar->Append(editMenu,    "&Edit");
+	m_menuBar->Append(editMenu,    _T("&Edit"));
-	m_menuBar->Append(optionsMenu, "&Options");
+	m_menuBar->Append(optionsMenu, _T("&Options"));
-	m_menuBar->Append(helpMenu,    "&Help");
+	m_menuBar->Append(helpMenu,    _T("&Help"));
 
 	SetMenuBar(m_menuBar);
 
@@ -243,14 +243,14 @@ FortyFrame::About(wxCommandEvent&)
 #endif
     {
         wxMessageBox(
-            "Forty Thieves\n\n"
+            _T("Forty Thieves\n\n")
-            "A freeware program using the wxWindows\n"
+            _T("A freeware program using the wxWindows\n")
-            "portable C++ GUI toolkit.\n"
+            _T("portable C++ GUI toolkit.\n")
-            "http://www.wxwindows.org\n"
+            _T("http://www.wxwindows.org\n")
-            "http://www.freiburg.linux.de/~wxxt\n\n"
+            _T("http://www.freiburg.linux.de/~wxxt\n\n")
-            "Author: Chris Breeze (c) 1992-1998\n"
+            _T("Author: Chris Breeze (c) 1992-1998\n")
-            "email: chris.breeze@iname.com",
+            _T("email: chris.breeze@iname.com"),
-            "About Forty Thieves",
+            _T("About Forty Thieves"),
             wxOK, this
             );
     }
@@ -331,7 +331,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
             wxFile file;
             file.Open(htmlFile, wxFile::read);
             long len = file.Length();
-            char* buf = htmlText.GetWriteBuf(len + 1);
+            wxChar* buf = htmlText.GetWriteBuf(len + 1);
             file.Read(buf, len);
             buf[len] = 0;
             htmlText.UngetWriteBuf();
@@ -349,7 +349,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
     verString.Printf("%.2f", stVERSION_NUMBER);
     htmlText.Replace(wxT("$VERSION$"), verString);
 #endif
-    htmlText.Replace(wxT("$DATE$"), __DATE__);
+    htmlText.Replace(wxT("$DATE$"), _T(__DATE__));
 
     wxSize htmlSize(400, 290);
 
@@ -373,7 +373,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
     wxASSERT( item1 );
     item0->Add( item1, 0, wxALIGN_CENTRE|wxALL, 5 );
 
-    wxButton *item2 = new wxButton( parent, wxID_CANCEL, "&Close", wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item2 = new wxButton( parent, wxID_CANCEL, _T("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
     item2->SetDefault();
     item2->SetFocus();
 

demos/forty/forty.h

@@ -34,7 +34,7 @@ class FortyCanvas;
 class FortyFrame: public wxFrame
 {
 public:
-        FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,bool largecards);
+        FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int w, int h,bool largecards);
 	virtual ~FortyFrame();
 
 	void OnCloseWindow(wxCloseEvent& event);

demos/forty/game.cpp

@@ -163,7 +163,7 @@ void Game::DoMove(wxDC& dc, Pile* src, Pile* dest)
     {
 		if (src == dest)
 		{
-			wxMessageBox("Game::DoMove() src == dest", "Debug message",
+			wxMessageBox(_T("Game::DoMove() src == dest"), _T("Debug message"),
 				   wxOK | wxICON_EXCLAMATION);
 		}
 		m_moves[m_moveIndex].src = src;
@@ -175,7 +175,7 @@ void Game::DoMove(wxDC& dc, Pile* src, Pile* dest)
     }
     else
     {
-		wxMessageBox("Game::DoMove() Undo buffer full", "Debug message",
+		wxMessageBox(_T("Game::DoMove() Undo buffer full"), _T("Debug message"),
 			   wxOK | wxICON_EXCLAMATION);
     }
 
@@ -203,8 +203,8 @@ void Game::DoMove(wxDC& dc, Pile* src, Pile* dest)
 		// Redraw the score box to update games won
 		DisplayScore(dc);
 
-		if (wxMessageBox("Do you wish to play again?",
+		if (wxMessageBox(_T("Do you wish to play again?"),
-			"Well Done, You have won!", wxYES_NO | wxICON_QUESTION) == wxYES)
+			_T("Well Done, You have won!"), wxYES_NO | wxICON_QUESTION) == wxYES)
 		{
 			Deal();
 			canvas->Refresh();
@@ -241,25 +241,25 @@ void Game::DisplayScore(wxDC& dc)
 	int w, h;
 	{
 		long width, height;
-		dc.GetTextExtent("Average score:m_x", &width, &height);
+		dc.GetTextExtent(_T("Average score:m_x"), &width, &height);
 		w = width;
 		h = height;
 	}
 	dc.DrawRectangle(x + w, y, 20, 4 * h);
 
-    char str[80];
+    wxString str;
-    sprintf(str, "%d", m_currentScore);
+    str.Printf(_T("%d"), m_currentScore);
-    dc.DrawText("Score:", x, y);
+    dc.DrawText(_T("Score:"), x, y);
     dc.DrawText(str, x + w, y);
     y += h;
 
-    sprintf(str, "%d", m_numGames);
+    str.Printf(_T("%d"), m_numGames);
-    dc.DrawText("Games played:", x, y);
+    dc.DrawText(_T("Games played:"), x, y);
     dc.DrawText(str, x + w, y);
     y += h;
 
-    sprintf(str, "%d", m_numWins);
+    str.Printf(_T("%d"), m_numWins);
-    dc.DrawText("Games won:", x, y);
+    dc.DrawText(_T("Games won:"), x, y);
     dc.DrawText(str, x + w, y);
     y += h;
 
@@ -268,8 +268,8 @@ void Game::DisplayScore(wxDC& dc)
 	{
 		average = (2 * (m_currentScore + m_totalScore) + m_numGames ) / (2 * m_numGames);
 	}
-    sprintf(str, "%d", average);
+    str.Printf(_T("%d"), average);
-    dc.DrawText("Average score:", x, y);
+    dc.DrawText(_T("Average score:"), x, y);
     dc.DrawText(str, x + w, y);
 }
 
@@ -798,8 +798,8 @@ void Pack::Redraw(wxDC& dc)
 {
     Pile::Redraw(dc);
 
-    char str[10];
+    wxString str;
-    sprintf(str, "%d  ", m_topCard + 1);
+    str.Printf(_T("%d  "), m_topCard + 1);
 
     dc.SetBackgroundMode( wxSOLID );
 	dc.SetTextBackground(FortyApp::BackgroundColour());
@@ -816,7 +816,7 @@ void Pack::AddCard(Card* card)
     }
     else
     {
-		wxMessageBox("Pack::AddCard() Undo error", "Forty Thieves: Warning",
+		wxMessageBox(_T("Pack::AddCard() Undo error"), _T("Forty Thieves: Warning"),
 		   wxOK | wxICON_EXCLAMATION);
     }
     card->TurnCard(facedown);

demos/forty/playerdg.cpp

@@ -44,7 +44,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 							wxWindow* parent,
 							ScoreFile* file
 							) :
-	wxDialog(parent, -1, "Player Selection",
+	wxDialog(parent, -1, _T("Player Selection"),
 			wxDefaultPosition, wxSize(320, 200),
 			wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
 	m_scoreFile(file)
@@ -52,7 +52,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 	// enable constraints
 	SetAutoLayout (TRUE);
 
-	wxStaticText* msg = new wxStaticText(this, -1, "Please select a name or type a new one:");
+	wxStaticText* msg = new wxStaticText(this, -1, _T("Please select a name or type a new one:"));
 
 	wxListBox* list = new wxListBox(
 						this, ID_LISTBOX,
@@ -68,10 +68,10 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 		list->Append(players[i]);
 	}
 
-	m_textField = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, 0);
+	m_textField = new wxTextCtrl(this, -1, _T(""), wxDefaultPosition, wxDefaultSize, 0);
 
-	m_OK = new wxButton(this, wxID_OK, "OK");
+	m_OK = new wxButton(this, wxID_OK, _T("OK"));
-	m_cancel = new wxButton(this, wxID_CANCEL, "Cancel");
+	m_cancel = new wxButton(this, wxID_CANCEL, _T("Cancel"));
 
 	wxLayoutConstraints* layout;
 
@@ -149,7 +149,7 @@ const wxString& PlayerSelectionDialog::GetPlayersName()
 
 void PlayerSelectionDialog::OnCloseWindow(wxCloseEvent& event)
 {
-	m_player = "";
+	m_player = _T("");
     EndModal(wxID_CANCEL);
 }
 
@@ -169,9 +169,9 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
 		wxString name = m_textField->GetValue();
 		if (!name.IsNull() && name.Length() > 0)
 		{
-			if (name.Contains('@'))
+			if (name.Contains(_T('@')))
 			{
-				wxMessageBox("Names should not contain the '@' character", "Forty Thieves");
+				wxMessageBox(_T("Names should not contain the '@' character"), _T("Forty Thieves"));
 			}
 			else
 			{
@@ -181,12 +181,12 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
 		}
 		else
 		{
- 			wxMessageBox("Please enter your name", "Forty Thieves");
+ 			wxMessageBox(_T("Please enter your name"), _T("Forty Thieves"));
 		}
 	}
 	else
 	{
-		m_player = "";
+		m_player = _T("");
 		EndModal(wxID_CANCEL);
 	}
 }

demos/forty/scoredg.cpp

@@ -27,16 +27,6 @@
 #include "wx/wx.h"
 #endif
 
-#if wxUSE_IOSTREAMH
-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__MWERKS__)
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
-#else
-#include <strstream>
-//using namespace std;
-#endif
 #include "scorefil.h"
 #include "scoredg.h"
 
@@ -66,9 +56,9 @@ ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
         wxArrayString players;
 	scoreFile->GetPlayerList( players);
 
-	ostrstream os;
+	wxString os;
 
-	os << "Player\tWins\tGames\tScore\n";
+	os << wxT("Player\tWins\tGames\tScore\n");
 	for (unsigned int i = 0; i < players.Count(); i++)
 	{
 		int wins, games, score;
@@ -79,15 +69,13 @@ ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
 			average = (2 * score + games) / (2 * games);
 		}
 
-		os << players[i] << '\t' 
+		os << players[i] << wxT('\t') 
-		   << wins  << '\t'
+		   << wins  << wxT('\t')
-		   << games << '\t'
+		   << games << wxT('\t')
-		   << average << '\n';
+		   << average << wxT('\n');
 	}
-	os << '\0';
+	os << wxT('\0');
-	char* str = os.str();
+	m_text = os;
-	m_text = str;
-	delete str;
 }
 
 ScoreCanvas::~ScoreCanvas()
@@ -98,7 +86,7 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 {
 	dc.SetFont(* m_font);
 
-	const char* str = m_text;
+	const wxChar* str = m_text;
 	unsigned int tab = 0;
 	unsigned int tabstops[] = { 5, 100, 150, 200 };
 
@@ -106,29 +94,29 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 	int lineSpacing;
 	{
 		long w, h;
-		dc.GetTextExtent("Testing", &w, &h);
+		dc.GetTextExtent(_T("Testing"), &w, &h);
 		lineSpacing = (int)h;
 	}
 
 	int y = 0;
 	while (*str)
 	{
-		char text[256];
+		wxChar text[256];
-		char* dest = text;
+		wxChar* dest = text;
 		
-		while (*str && *str >= ' ') *dest++ = *str++;
+		while (*str && *str >= _T(' ')) *dest++ = *str++;
-		*dest = '\0';
+		*dest = _T('\0');
 
 		dc.DrawText(text, tabstops[tab], y);
 
-		if (*str == '\t')
+		if (*str == _T('\t'))
 		{
 			if (tab < sizeof(tabstops) / sizeof(tabstops[0]) - 1)
 			{
 				tab++;
 			}
 		}
-		else if (*str == '\n')
+		else if (*str == _T('\n'))
 		{
 			tab = 0;
 			y += lineSpacing;
@@ -145,7 +133,7 @@ ScoreDialog::ScoreDialog(
 							wxWindow* parent,
 							ScoreFile* file
 							) :
-	wxDialog(parent, -1, "Scores",
+	wxDialog(parent, -1, _T("Scores"),
 			wxDefaultPosition, wxSize(310, 200),
 			wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
 	m_scoreFile(file)
@@ -154,7 +142,7 @@ ScoreDialog::ScoreDialog(
 	SetAutoLayout (TRUE);
 
 	ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile);
-	m_OK = new wxButton(this, wxID_OK, "OK");
+	m_OK = new wxButton(this, wxID_OK, _T("OK"));
 
 	wxLayoutConstraints* layout;
 

demos/forty/scorefil.cpp

@@ -38,7 +38,7 @@
 
 #include "scorefil.h"
 
-ScoreFile::ScoreFile(const char* appName)
+ScoreFile::ScoreFile(const wxString& appName)
 {
 #if 0
 	wxString filename;
@@ -68,7 +68,8 @@ ScoreFile::ScoreFile(const char* appName)
 	}
 #endif
 
-	m_config = new wxConfig(appName, "wxWindows", appName, "", wxCONFIG_USE_LOCAL_FILE);  // only local
+	m_config = new wxConfig(appName, _T("wxWindows"), appName, _T(""),
+                                wxCONFIG_USE_LOCAL_FILE);  // only local
 }
 
 ScoreFile::~ScoreFile()
@@ -84,7 +85,7 @@ ScoreFile::~ScoreFile()
 
 void ScoreFile::GetPlayerList( wxArrayString &list )
 {
-	m_config->SetPath("/Players");
+	m_config->SetPath(_T("/Players"));
 	int length = m_config->GetNumberOfGroups();
 
 	if (length <= 0) return;
@@ -106,12 +107,14 @@ void ScoreFile::GetPlayerList( wxArrayString &list )
 
 // Calculate an encrypted check number to prevent tampering with
 // score file
-long ScoreFile::CalcCheck(const char* name, int p1, int p2, int p3)
+long ScoreFile::CalcCheck(const wxString& name, int p1, int p2, int p3)
 {
     long check = 0;
-    while (*name)
+    size_t i, max = name.length();
+
+    for(i = 0; i < max; ++i )
 	{
-		check = (check << 1) ^ (long)*name++;
+		check = (check << 1) ^ (long)name[i];
 		check = ((check >> 23) ^ check) & 0xFFFFFF;
 	}
 	check = (check << 1) ^ (long)p1;
@@ -126,13 +129,13 @@ long ScoreFile::CalcCheck(const char* name, int p1, int p2, int p3)
 wxString ScoreFile::GetPreviousPlayer() const
 {
 	wxString result;
-	m_config->SetPath("/General");
+	m_config->SetPath(_T("/General"));
-	m_config->Read("LastPlayer", &result);
+	m_config->Read(_T("LastPlayer"), &result);
 	return result;
 }
 
 void ScoreFile::ReadPlayersScore(
-						const char* player,
+						const wxString& player,
 						int& wins,
 						int& games,
 						int& score)
@@ -142,17 +145,17 @@ void ScoreFile::ReadPlayersScore(
 
 	games = wins = score = 0;
 
-	m_config->SetPath("/Players");
+	m_config->SetPath(_T("/Players"));
 	m_config->SetPath(player);
-	if (m_config->Read("Score", &myScore, 0L) &&
+	if (m_config->Read(_T("Score"), &myScore, 0L) &&
-		m_config->Read("Games", &myGames, 0L) &&
+		m_config->Read(_T("Games"), &myGames, 0L) &&
-		m_config->Read("Wins",  &myWins, 0L) &&
+		m_config->Read(_T("Wins"),  &myWins, 0L) &&
-		m_config->Read("Check", &check, 0L))
+		m_config->Read(_T("Check"), &check, 0L))
 	{
 	    if (check != CalcCheck(player, myGames, myWins, myScore))
 		{
-			wxMessageBox("Score file corrupted", "Warning",
+			wxMessageBox(_T("Score file corrupted"), _T("Warning"),
-						wxOK | wxICON_EXCLAMATION);
+                                     wxOK | wxICON_EXCLAMATION);
 		}
 		else
 		{
@@ -165,18 +168,18 @@ void ScoreFile::ReadPlayersScore(
 }
 
 
-void ScoreFile::WritePlayersScore(const char* player, int wins, int games, int score)
+void ScoreFile::WritePlayersScore(const wxString& player, int wins, int games, int score)
 {
     if (player)
 	{
-		m_config->SetPath("/General");
+		m_config->SetPath(_T("/General"));
-		m_config->Write("LastPlayer", wxString(player)); // Without wxString tmp, thinks it's bool in VC++
+		m_config->Write(_T("LastPlayer"), wxString(player)); // Without wxString tmp, thinks it's bool in VC++
 
-		m_config->SetPath("/Players");
+		m_config->SetPath(_T("/Players"));
 		m_config->SetPath(player);
-		m_config->Write("Score", (long)score);
+		m_config->Write(_T("Score"), (long)score);
-		m_config->Write("Games", (long)games);
+		m_config->Write(_T("Games"), (long)games);
-		m_config->Write("Wins", (long)wins);
+		m_config->Write(_T("Wins"), (long)wins);
-		m_config->Write("Check", CalcCheck(player, games, wins, score));
+		m_config->Write(_T("Check"), CalcCheck(player, games, wins, score));
 	}
 }

demos/forty/scorefil.h

@@ -24,17 +24,17 @@
 
 class ScoreFile {
 public:
-	ScoreFile(const char* appName);
+	ScoreFile(const wxString& appName);
 	virtual ~ScoreFile();
 
 	void GetPlayerList( wxArrayString &list );
 	wxString GetPreviousPlayer() const;
 
-	void ReadPlayersScore(const char* player, int& wins, int& games, int &score);
+	void ReadPlayersScore(const wxString& player, int& wins, int& games, int &score);
-	void WritePlayersScore(const char* player, int wins, int games, int score);
+	void WritePlayersScore(const wxString& player, int wins, int games, int score);
 
 private:
-	long CalcCheck(const char* name, int p1, int p2, int p3);
+	long CalcCheck(const wxString& name, int p1, int p2, int p3);
 	wxString	    m_configFilename;
 	wxConfig*	    m_config;
 };

demos/fractal/fractal.cpp

@@ -90,13 +90,13 @@ DECLARE_EVENT_TABLE()
 bool MyApp::OnInit()
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, "Fractal Mountains for wxWindows", wxPoint(-1, -1), wxSize(640, 480));
+  MyFrame *frame = new MyFrame(NULL, _T("Fractal Mountains for wxWindows"), wxPoint(-1, -1), wxSize(640, 480));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
-  file_menu->Append(wxID_EXIT, "E&xit");
+  file_menu->Append(wxID_EXIT, _T("E&xit"));
   menuBar = new wxMenuBar;
-  menuBar->Append(file_menu, "&File");
+  menuBar->Append(file_menu, _T("&File"));
   frame->SetMenuBar(menuBar);
 
   int width, height;

demos/life/game.h

@@ -58,9 +58,18 @@ public:
         m_name        = name;
         m_description = description;
         m_rules       = _("");
-        m_shape.Add( wxString::Format("%i %i", -width/2, -height/2) );
+        m_shape.Add( wxString::Format(_T("%i %i"), -width/2, -height/2) );
         for(int j = 0; j < height; j++)
-            m_shape.Add( wxString(shape + (j * width), (size_t) width) );        
+        {
+            wxString tmp;
+
+            for(int i = 0; i < width; i++)
+            {
+                tmp += wxChar(shape[j * width + i]);
+            }
+
+            m_shape.Add( tmp );
+        }
     };
 
     wxString      m_name;

demos/life/life.cpp

@@ -194,9 +194,9 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
     SetIcon(wxICON(mondrian));
 
     // menu bar
-    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);
-    wxMenu *menuView = new wxMenu("", wxMENU_TEAROFF);
+    wxMenu *menuView = new wxMenu(_T(""), wxMENU_TEAROFF);
-    wxMenu *menuGame = new wxMenu("", wxMENU_TEAROFF);
+    wxMenu *menuGame = new wxMenu(_T(""), wxMENU_TEAROFF);
 
     menuFile->Append(ID_NEW, _("&New"), _("Start a new game"));
     menuFile->Append(ID_OPEN, _("&Open..."), _("Open an existing Life pattern"));

demos/poem/wxpoem.cpp

@@ -206,7 +206,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
     dc->SetFont(* NormalFont);
     long xx;
     long yy;
-    dc->GetTextExtent("X", &xx, &yy);
+    dc->GetTextExtent(_T("X"), &xx, &yy);
     char_height = (int)yy;
 
     if (current_page == 0)
@@ -844,9 +844,11 @@ int GetIndex()
 // Read preferences
 void ReadPreferences()
 {
+#if wxUSE_RESOURCES
   wxGetResource("wxPoem", "FontSize", &pointSize);
   wxGetResource("wxPoem", "X", &XPos);
   wxGetResource("wxPoem", "Y", &YPos);
+#endif
 }
 
 // Write preferences to disk
@@ -854,10 +856,12 @@ void WritePreferences()
 {
 #ifdef __WXMSW__
   TheMainWindow->GetPosition(&XPos, &YPos);
+#if wxUSE_RESOURCES
   wxWriteResource("wxPoem", "FontSize", pointSize);
   wxWriteResource("wxPoem", "X", XPos);
   wxWriteResource("wxPoem", "Y", YPos);
 #endif
+#endif
 }
 
 // Load a poem from given file, at given point in file.

distrib/mac/shared-ld-sh

@@ -21,7 +21,7 @@ while test $# -gt 0; do
         verbose=1
         ;;
 
-       -o|-compatibility_version|-current_version|-framework|-undefined)
+       -o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
         # collect these options and values
         args="$args $1 $2"
         shift

distrib/msw/contrib.rsp

@@ -120,6 +120,19 @@ contrib/samples/gizmos/dynsash_switch/*.rc
 contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
 contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw
 
+contrib/samples/gizmos/led/*.cpp
+contrib/samples/gizmos/led/*.h
+contrib/samples/gizmos/led/*.def
+contrib/samples/gizmos/led/makefile*
+contrib/samples/gizmos/led/*.xbm
+contrib/samples/gizmos/led/*.xpm
+contrib/samples/gizmos/led/*.txt
+contrib/samples/gizmos/led/*.ico
+contrib/samples/gizmos/led/*.bmp
+contrib/samples/gizmos/led/*.rc
+contrib/samples/gizmos/led/led.dsp
+contrib/samples/gizmos/led/led.dsw
+
 contrib/samples/animate/*.cpp
 contrib/samples/animate/*.h
 contrib/samples/animate/*.def

distrib/msw/copybase.bat

@@ -3,7 +3,7 @@
 rem VZ: this is quick and _very_ dirty, to be replaced by a script directly
 rem     parsing the files.txt and include/wx/version.h...
 
-set VER=2.3.4
+set VER=2.4.0
 set DEST=t:\wxBase-%VER%
 
 mkdir %DEST%
@@ -193,6 +193,7 @@ copy /q include\wx\datetime.h %DEST%\include\wx\datetime.h
 copy /q include\wx\datetime.inl %DEST%\include\wx\datetime.inl
 copy /q include\wx\datstrm.h %DEST%\include\wx\datstrm.h
 copy /q include\wx\db.h %DEST%\include\wx\db.h
+copy /q include\wx\dbkeyg.h %DEST%\include\wx\dbkeyg.h
 copy /q include\wx\dbtable.h %DEST%\include\wx\dbtable.h
 copy /q include\wx\dde.h %DEST%\include\wx\dde.h
 copy /q include\wx\debug.h %DEST%\include\wx\debug.h

distrib/msw/generic.rsp

@@ -629,6 +629,7 @@ samples/image/*.ico
 samples/image/*.cur
 samples/image/*.txt
 samples/image/*.pro
+samples/image/*.ani
 
 samples/internat/*.cpp
 samples/internat/*.h

distrib/msw/innobott.txt

@@ -15,6 +15,7 @@
 [INI]
 
 [Registry]
+    Root: HKCU; SubKey: Software\Environment\; ValueName: WXWIN; ValueType: string; ValueData: {app}; Flags: createvalueifdoesntexist
 
 [UninstallDelete]
 
@@ -31,7 +32,7 @@
 ; DO NOT DELETE THEM or you may be unable to reload the script
 
 ;[ScriptSetup]
-;VerNum=2.3.4
+;VerNum=2.4.0
 ;InnoVer=1.3
 ;AddVerTo=AppVerName
 ;SetupFilename=setup.exe

distrib/msw/makefile.rsp

@@ -121,6 +121,7 @@ contrib/samples/gizmos/splittree/Makefile.in
 contrib/samples/gizmos/editlbox/Makefile.in
 contrib/samples/gizmos/dynsash/Makefile.in
 contrib/samples/gizmos/dynsash_switch/Makefile.in
+contrib/samples/gizmos/led/Makefile.in
 contrib/samples/ogl/Makefile.in
 contrib/samples/ogl/ogledit/Makefile.in
 contrib/samples/ogl/studio/Makefile.in

distrib/msw/makerpm

@@ -0,0 +1,273 @@
+#!/bin/sh
+# Makes the wxWindows RPMs
+
+doupdatecvs()
+{
+  cd $WXSRC
+  echo Updating from CVS...
+  cvswx update -d -P
+}
+
+dospinwxgtk()
+{
+  echo Making wxGTK RPMs...
+  RPM_ROOT=$WXDEST/wxgtk/rpm-root
+
+  if [ ! -d $WXDEST ]; then
+    mkdir $WXDEST
+  fi
+
+  rm -f -r $WXDEST/wxgtk
+  mkdir $WXDEST/wxgtk
+  mkdir $WXDEST/wxgtk/release
+  mkdir $RPM_ROOT
+
+  cd $WXSRC
+  cd locale
+  make allmo
+  cd $WXDEST/wxgtk/release
+  echo Configuring...
+  $WXSRC/configure --no-recursion
+  echo Making...
+  make -j1 dist bzip-dist-only
+
+  echo Setting up RPM build dir $RPM_ROOT...
+  rm -f -r $RPM_ROOT
+  mkdir $RPM_ROOT
+  mkdir $RPM_ROOT/BUILD
+  mkdir $RPM_ROOT/RPMS
+  mkdir $RPM_ROOT/RPMS/i386
+  mkdir $RPM_ROOT/RPMS/i686
+  mkdir $RPM_ROOT/RPMS/noarch
+  mkdir $RPM_ROOT/SOURCES
+  mkdir $RPM_ROOT/SPECS
+  mkdir $RPM_ROOT/SRPMS
+
+  echo %_topdir $RPM_ROOT > ~/.rpmmacros
+
+  echo Copying wxGTK-$WXVER.tar.bz2 to $RPM_ROOT/SOURCES...
+  cp wxGTK-$WXVER.tar.bz2 $RPM_ROOT/SOURCES
+  echo Copying wxGTK.spec to $RPM_ROOT/SPECS...
+  cp $WXSRC/wxGTK.spec $RPM_ROOT/SPECS
+
+  echo Starting wxGTK RPM build...
+  cd $RPM_ROOT
+  rpmbuild -ba SPECS/wxGTK.spec 2>&1 | tee wxGTK.out
+
+  echo Finished wxBase RPM build, in $RPM_ROOT.
+  echo "SRPMS:"
+  ls SRPMS
+  echo "RPMS/i386:"
+  ls RPMS/i386
+
+  cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $WXDEST/wxgtk/release/*.tar.gz $WXDEST
+  cp $WXDEST/wxgtk/release/*.tar.bz2 $WXDEST
+
+  echo Now try the RPMs with rpm -i.
+}
+
+dospinwxbase()
+{
+  echo Making wxBase RPMs...
+  RPM_ROOT=$WXDEST/wxbase/rpm-root
+
+  if [ ! -d $WXDEST ]; then
+    mkdir $WXDEST
+  fi
+
+  rm -f -r $WXDEST/wxbase
+  mkdir $WXDEST/wxbase
+  mkdir $WXDEST/wxbase/release
+  mkdir $RPM_ROOT
+
+  cd $WXSRC
+  cd locale
+  make allmo
+  cd $WXDEST/wxbase/release
+  echo Configuring...
+  $WXSRC/configure --disable-gui --no-recursion
+  echo Making...
+  make -j1 dist bzip-dist-only
+
+  echo Setting up RPM build dir $RPM_ROOT...
+  rm -f -r $RPM_ROOT
+  mkdir $RPM_ROOT
+  mkdir $RPM_ROOT/BUILD
+  mkdir $RPM_ROOT/RPMS
+  mkdir $RPM_ROOT/RPMS/i386
+  mkdir $RPM_ROOT/RPMS/i686
+  mkdir $RPM_ROOT/RPMS/noarch
+  mkdir $RPM_ROOT/SOURCES
+  mkdir $RPM_ROOT/SPECS
+  mkdir $RPM_ROOT/SRPMS
+
+  echo %_topdir $RPM_ROOT > ~/.rpmmacros
+
+  echo Copying wxBase-$WXVER.tar.bz2 to $RPM_ROOT/SOURCES...
+  cp wxBase-$WXVER.tar.bz2 $RPM_ROOT/SOURCES
+  echo Copying wxBase.spec to $RPM_ROOT/SPECS...
+  cp $WXSRC/wxBase.spec $RPM_ROOT/SPECS
+
+  echo Starting wxBase RPM build...
+  cd $RPM_ROOT
+  rpmbuild -ba SPECS/wxBase.spec 2>&1 | tee wxBase.out
+
+  echo Finished wxBase RPM build, in $RPM_ROOT.
+  echo "SRPMS:"
+  ls SRPMS
+  echo "RPMS/i386:"
+  ls RPMS/i386
+
+  cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $WXDEST/wxbase/release/*.tar.gz $WXDEST
+  cp $WXDEST/wxbase/release/*.tar.bz2 $WXDEST
+
+  echo Now try the RPMs with rpm -i.
+}
+
+dospinwxx11()
+{
+  echo Making wxX11 RPMs...
+  RPM_ROOT=$WXDEST/wxx11/rpm-root
+
+  if [ ! -d $WXDEST ]; then
+    mkdir $WXDEST
+  fi
+
+  rm -f -r $WXDEST/wxx11
+  mkdir $WXDEST/wxx11
+  mkdir $WXDEST/wxx11/release
+  mkdir $RPM_ROOT
+
+  cd $WXSRC
+  cd locale
+  make allmo
+  cd $WXDEST/wxx11/release
+  echo Configuring...
+  $WXSRC/configure --with-x11 --no-recursion
+  echo Making...
+  make -j1 dist bzip-dist-only
+
+  echo Setting up RPM build dir $RPM_ROOT...
+  rm -f -r $RPM_ROOT
+  mkdir $RPM_ROOT
+  mkdir $RPM_ROOT/BUILD
+  mkdir $RPM_ROOT/RPMS
+  mkdir $RPM_ROOT/RPMS/i386
+  mkdir $RPM_ROOT/RPMS/i686
+  mkdir $RPM_ROOT/RPMS/noarch
+  mkdir $RPM_ROOT/SOURCES
+  mkdir $RPM_ROOT/SPECS
+  mkdir $RPM_ROOT/SRPMS
+
+  echo %_topdir $RPM_ROOT > ~/.rpmmacros
+
+  echo Copying wxX11-$WXVER.tar.bz2 to $RPM_ROOT/SOURCES...
+  cp wxX11-$WXVER.tar.bz2 $RPM_ROOT/SOURCES
+  echo Copying wxX11.spec to $RPM_ROOT/SPECS...
+  cp $WXSRC/wxX11.spec $RPM_ROOT/SPECS
+
+  echo Starting wxX11 RPM build...
+  cd $RPM_ROOT
+  rpmbuild -ba SPECS/wxX11.spec 2>&1 | tee wxX11.out
+
+  echo Finished wxX11 RPM build, in $RPM_ROOT.
+  echo "SRPMS:"
+  ls SRPMS
+  echo "RPMS/i386:"
+  ls RPMS/i386
+
+  cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $WXDEST/wxx11/release/*.tar.gz $WXDEST
+  cp $WXDEST/wxx11/release/*.tar.bz2 $WXDEST
+
+  echo Now try the RPMs with rpm -i.
+}
+
+init=""
+if [ "$1" = "" ]
+then
+  echo Usage: makerpm wx-dir output-dir version
+  exit
+fi
+
+if [ "$2" = "" ]
+then
+  echo Usage: makerpm wx-dir output-dir version
+  exit
+fi
+
+if [ "$3" = "" ]
+then
+  echo Usage: makerpm wx-dir output-dir version
+  exit
+fi
+
+PROGNAME=$0
+WXSRC=$1
+WXDEST=$2
+WXVER=$3
+
+SPINWXX11=0
+SPINWXGTK=0
+SPINWXBASE=0
+SPINEVERYTHING=0
+UPDATECVS=0
+
+usage()
+{
+    echo Usage: $PROGNAME "src-dir dest-dir version-number [ options ]"
+    echo Options:
+    echo "    --help         Display this help message"
+    echo "    --wxgtk        Spin wxGTK RPMs"
+    echo "    --wxbase       Spin wxBase RPMs"
+    echo "    --wxx11        Spin wxX11 RPMs"
+    echo "    --all          Spin EVERYTHING"
+    echo "    --updatecvs    Update from CVS"
+
+    exit 1
+}
+
+# Process command line options.
+shift 3
+for i in "$@"; do
+    case "$i" in
+	--wxx11) SPINWXX11=1 ;;
+	--wxgtk) SPINWXGTK=1 ;;
+	--wxbase) SPINWXBASE=1 ;;
+	--all) SPINEVERYTHING=1 ;;
+	--updatecvs) UPDATECVS=1 ;;
+	*)
+	    usage
+	    exit
+	    ;;
+    esac
+done
+
+echo About to make wxWindows RPMs:
+echo   From    $WXSRC
+echo   To      $WXDEST
+echo   Version $WXVER
+echo CTRL-C if this is not correct.
+read dummy
+
+if [ "$UPDATECVS" = "1" ]; then
+  doupdatecvs
+fi
+
+if [ "$SPINWXX11" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  dospinwxx11
+fi
+
+if [ "$SPINWXGTK" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  dospinwxgtk
+fi
+
+if [ "$SPINWXBASE" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  dospinwxbase
+fi
+

distrib/msw/stc.rsp

@@ -43,7 +43,6 @@ contrib/samples/stc/*.rc
 contrib/samples/stc/*.def
 contrib/samples/stc/*.xbm
 contrib/samples/stc/make*.*
-contrib/samples/stc/Makefile
 contrib/samples/stc/*.txt
 contrib/samples/stc/*.ico
 contrib/samples/stc/*.bmp

distrib/msw/tardist

@@ -66,7 +66,7 @@ dospinwxgtk()
 echo Tarring wxGTK...
 
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
+cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
 expandlines /tmp/wxgtk_in.txt /tmp/wxgtk.txt
 $TAR cf $WXDEST/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
 
@@ -87,7 +87,7 @@ dospinwxmotif()
 echo Tarring wxMotif...
 
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmotif_in.txt
+cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmotif_in.txt
 expandlines /tmp/wxmotif_in.txt /tmp/wxmotif.txt
 $TAR cf $WXDEST/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
 
@@ -109,7 +109,7 @@ echo Tarring wxX11...
 
 ### wxX11: combined wxMotif and wxX11 distributions
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
+cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
 expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
 $TAR cf $WXDEST/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
 

distrib/msw/tmake/filelist.txt

@@ -283,7 +283,7 @@ dcprint.cpp	MSW	LowLevel
 dcscreen.cpp	MSW	LowLevel
 dde.cpp	MSW	LowLevel,Base
 dialog.cpp	MSW
-dialup.cpp	MSW
+dialup.cpp	MSW	LowLevel
 dib.cpp	MSW	LowLevel
 dibutils.cpp	MSW
 dir.cpp	MSW	Base
@@ -307,13 +307,13 @@ gauge95.cpp	MSW	Win32Only
 gaugemsw.cpp	MSW	NotWin32
 gdiimage.cpp	MSW	LowLevel
 gdiobj.cpp	MSW	LowLevel
-glcanvas.cpp	MSW
+glcanvas.cpp	MSW	LowLevel
 helpchm.cpp	MSW	Win32Only,LowLevel
 helpwin.cpp	MSW	LowLevel
 icon.cpp	MSW	LowLevel
 imaglist.cpp	MSW	Win32Only
 iniconf.cpp	MSW
-joystick.cpp	MSW
+joystick.cpp	MSW	LowLevel
 listbox.cpp	MSW
 listctrl.cpp	MSW	Win32Only
 main.cpp	MSW	LowLevel,Base
@@ -353,21 +353,21 @@ statbr95.cpp	MSW	Win32Only
 statline.cpp	MSW
 stattext.cpp	MSW
 tabctrl.cpp	MSW
-taskbar.cpp	MSW	Win32Only
+taskbar.cpp	MSW	Win32Only,LowLevel
 tbar95.cpp	MSW	Win32Only
 tbarmsw.cpp	MSW	NotWin32
 textctrl.cpp	MSW
 tglbtn.cpp	MSW
 thread.cpp	MSW	Win32Only,Base,LowLevel
 timer.cpp	MSW	LowLevel
-tooltip.cpp	MSW	Win32Only
+tooltip.cpp	MSW	Win32Only,LowLevel
 toplevel.cpp	MSW	LowLevel
 treectrl.cpp	MSW	Win32Only
 utils.cpp	MSW	Base,LowLevel
 utilsexc.cpp	MSW	Base,LowLevel
 uuid.cpp	MSW	OLE
 volume.cpp	MSW	Base
-wave.cpp	MSW
+wave.cpp	MSW	LowLevel
 window.cpp	MSW	LowLevel
 
 dialup.cpp	Unix	NotMac
@@ -843,7 +843,7 @@ gdiobj.h	WXH
 geometry.h	WXH
 gifdecod.h	WXH
 xpmdecod.h	WXH
-dbkeyg.h	WXH
+dbkeyg.h	WXH	Base
 glcanvas.h	WXH
 grid.h	WXH
 gsocket.h	WXH	Base
@@ -915,6 +915,7 @@ progdlg.h	WXH
 prop.h	WXH
 propform.h	WXH
 proplist.h	WXH
+quantize.h	WXH
 radiobox.h	WXH
 radiobut.h	WXH
 regex.h	WXH	Base

distrib/msw/tmake/g95.t

@@ -110,7 +110,7 @@ DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32
 ifeq ($(wxUSE_GUI),0)
   DLL_LDLIBS = $(DLL_BASE_LDLIBS)
 else
-  DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+  DLL_LDLIBS = -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
               -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
                $(DLL_BASE_LDLIBS)
 endif
@@ -141,15 +141,12 @@ DOCDIR = $(WXDIR)/docs
 
 # Only use the WIN32 wxDirDialog if we have a recent
 # version of Mingw32
-ifeq ($(MINGW32),1)
+ifeq "$(strip $(RECENT_MINGW))" "yes"
-  ifneq "$(_GCC295)$(_GCC3)" ""
 		DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
-  else
-		DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
-  endif
 else
 		DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
 endif
+
 ifeq ($(wxUSE_GUI),0)
   DIRDLGOBJ =
 endif
@@ -305,12 +302,8 @@ TIFFOBJS = $(TIFFDIR)/tif_aux.o \
 		$(TIFFDIR)/tif_write.o \
 		$(TIFFDIR)/tif_zip.o
 
-ifeq ($(MINGW32),1)
+ifeq "$(strip $(RECENT_MINGW))" "yes"
-  ifneq "$(_GCC295)$(_GCC3)" ""
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
-  else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
-  endif
 else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
@@ -345,7 +338,7 @@ $(ARCHINCDIR)/wx:
 
 # Copy ALWAYS uses forward slashes now.
 
-$(SETUP_H): $(ARCHINCDIR)/wx
+$(SETUP_H): $(ARCHINCDIR)/wx $(WXDIR)/include/wx/msw/setup.h
 	$(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)
 
 #	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
@@ -364,11 +357,12 @@ else
 ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS)
-	$(CC) -shared -o $@ \
+	$(CXX) -shared -o $@ \
 	  -Wl,--output-def,$(WXDEF) \
 	  -Wl,--out-implib,$(WXLIB) \
 	  $(OBJECTS) $(EXTRAOBJS) \
-	  $(DLL_LDFLAGS) $(DLL_LDLIBS)
+	  $(DLL_LDFLAGS) $(DLL_LDLIBS) \
+      $(ALL_LDFLAGS_DLL)
 else
 
 ifeq ($(MINGW32),1)
@@ -389,11 +383,11 @@ $(WXDEF) $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
 	  $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS)
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF)
-	$(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF)
+	$(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)
 	$(DLLTOOL) $(DLL_STUFF)
-	$(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF)
+	$(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)
 	$(DLLTOOL) $(DLL_STUFF)
-	$(CC) -mdll wx.exp -o $@ $(LD_STUFF)
+	$(CC) -mdll wx.exp -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)
 	-$(RM) wx.base
 	-$(RM) wx.exp
 
@@ -424,7 +418,7 @@ $(REGEXLIB):
 $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
-	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+	$(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
 	$(COPY) ../common/dosyacc.c ../common/y_tab.c

distrib/msw/tmake/vc.t

@@ -92,7 +92,7 @@ PERIPH_CLEAN_TARGET=
 # Set to 0 if not using GLCanvas (only affects DLL build)
 USE_GLCANVAS=1
 
-# Set to 0 if you are using MSVC 5
+# Set to 1 if you are using MSVC 5
 USE_MSVC_5=0
 
 # These are absolute paths, so that the compiler
@@ -294,7 +294,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS) $(INCREMENTAL)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
-    $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
+    $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
 <<
 
 !endif
@@ -608,11 +608,11 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
 
 $(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp
 	cd $(DOCDIR)\mshtml\wx
-    copy $(DOCDIR)\latex\wx\wx.css .
+	copy $(DOCDIR)\latex\wx\wx.css .
 	-hhc wx.hhp
-    -mkdir ..\..\htmlhelp
+	-mkdir ..\..\htmlhelp
-    -erase $(DOCDIR)\htmlhelp\wx.chm
+	-erase $(DOCDIR)\htmlhelp\wx.chm
-    move wx.chm ..\..\htmlhelp
+	move wx.chm ..\..\htmlhelp
 	cd $(THISDIR)
 
 $(WXDIR)\docs\latex\wx\manual.dvi:	$(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex

distrib/msw/tmake/vc6base.t

@@ -7,6 +7,8 @@
 #! Version: $Id$
 #!#############################################################################
 #${
+    use wxVersion qw(GetVersion);
+
     #! include the code which parses filelist.txt file and initializes
     #! %wxCommon, %wxGeneric and %wxMSW hashes.
     IncludeTemplate("filelist.t");
@@ -44,7 +46,12 @@
 	$project{"WXMSWHEADERS"} .= $file . " "
     }
 
-    $project{"WXVERSION"} = "233";
+    #! LINK_VERSION is the value of the linker /version switch,
+    #! DLL_VERSION is the version string for the DLL filename
+    my %versions = GetVersion();
+    my ($verMaj, $verMin) = ( $versions{'MAJOR'}, $versions{'MINOR'} );
+    $project{"LINK_VERSION"} = "$verMaj.$verMin";
+    $project{"DLL_VERSION"} = "$verMaj$verMin";
 #$}
 # Microsoft Developer Studio Project File - Name="wxBase" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -106,8 +113,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . 'u.dll"'
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../lib/wxbase#$ $text = $project{"DLL_VERSION"} . 'u.dll"'
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . 'u.dll"'
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxbase' . $project{DLL_VERSION} . 'u.dll"'
 
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug Unicode DLL"
 
@@ -132,9 +139,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . 'ud.dll"'
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase#$ $text = $project{"DLL_VERSION"} . 'ud.dll"'
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . 'ud.dll"'
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxbase' . $project{DLL_VERSION} . 'ud.dll"'
-
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release Unicode"
 
 # PROP BASE Use_MFC 0
@@ -204,8 +210,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . '.dll"'
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../lib/wxbase#$ $text = $project{"DLL_VERSION"} . '.dll"'
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . '.dll"'
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxbase' . $project{DLL_VERSION} . '.dll"'
 
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug DLL"
 
@@ -230,8 +236,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . 'd.dll"'
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase#$ $text = $project{"DLL_VERSION"} . 'd.dll"'
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . 'd.dll"'
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxbase' . $project{DLL_VERSION} . 'd.dll"'
 
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release"
 

distrib/msw/tmake/vc6msw.t

@@ -9,6 +9,8 @@
 #! Version: $Id$
 #!#############################################################################
 #${
+    use wxVersion qw(GetVersion);
+
     #! include the code which parses filelist.txt file and initializes
     #! %wxCommon, %wxGeneric and %wxMSW hashes.
     IncludeTemplate("filelist.t");
@@ -60,7 +62,12 @@
 	$project{"WXHTMLHEADERS"} .= $file . " "
     }
 
-    $project{"WXVERSION"} = "233";
+    #! LINK_VERSION is the value of the linker /version switch,
+    #! DLL_VERSION is the version string for the DLL filename
+    my %versions = GetVersion();
+    my ($verMaj, $verMin) = ( $versions{'MAJOR'}, $versions{'MINOR'} );
+    $project{"LINK_VERSION"} = "$verMaj.$verMin";
+    $project{"DLL_VERSION"} = "$verMaj$verMin";
 #$}
 # Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -122,8 +129,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'u.dll"'
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"DLL_VERSION"} . 'u.dll"'
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'u.dll"'
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxmsw' . $project{DLL_VERSION} . 'u.dll"'
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
 
@@ -148,8 +155,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'ud.dll"'
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"DLL_VERSION"} . 'ud.dll"'
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'ud.dll"'
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxmsw' . $project{DLL_VERSION} . 'ud.dll"'
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
 
@@ -220,8 +227,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . '.dll"'
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"DLL_VERSION"} . '.dll"'
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . '.dll"'
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxmsw' . $project{DLL_VERSION} . '.dll"'
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
 
@@ -246,8 +253,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'd.dll"'
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"DLL_VERSION"} . 'd.dll"'
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'd.dll"'
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxmsw' . $project{DLL_VERSION} . 'd.dll"'
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 
@@ -336,15 +343,46 @@ SOURCE=.\common\dosyacc.c
 
 SOURCE=.\msw\dummy.cpp
 # ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\version.rc
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 #$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n");
 #$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
-# End Group
 # Begin Group "OLE Files"
 
 # PROP Default_Filter ""
 #$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n");
 # End Group
+# End Group
 # Begin Group "Headers"
 
 # PROP Default_Filter ""

distrib/msw/tmake/wat.t

@@ -2,13 +2,10 @@
 #! File:    wat.t
 #! Purpose: tmake template file from which makefile.wat is generated by running
 #!          tmake -t wat wxwin.pro -o makefile.wat
-#!          TODO:
-#!            - extended.c, unzip.c must be compiled with $(CC), not $(CCC).
-#!            - extended.c, unzip.c targets must be as per b32.t etc.
-#!            - OLE files not generated correctly (need 'ole/' directory)
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
 #! Version: $Id$
+#! Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes
@@ -49,7 +46,7 @@
         #! these files don't compile
         next if $file =~ /^pnghand\./;
 
-#!        next if $wxGeneric{$file} =~ /\b16\b/;
+        next if $wxMSW{$file} =~ /\b16\b/;
 
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         my $isCFile = $file =~ /\.c$/;
@@ -71,25 +68,9 @@
 # Created:  1998
 #
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
-#
+!include ..\makewat.env
-# NOTE: This file is generated from wat.t by tmake, but not all bugs have
-# been removed from this process. If wxWindows doesn't compile,
-# check the following and edit this makefile accordingly:
-#
-# - OLE-related files such as oleutils.cpp should have 'ole\' prepended
-#   to the path.
-# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC).
-#   They may also be wrongly specified as extended.cpp, etc.
 
-WXDIR = ..\..
+LIBTARGET   = $(WXDIR)\lib\$(LIBNAME).lib
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-
-LIBTARGET   = $(WXLIB)\wx.lib
-DUMMY=dummydll
-# ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
 EXTRATARGETS = png zlib jpeg tiff regex
 EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex
@@ -103,44 +84,42 @@ HTMLDIR=$(WXDIR)\src\html
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "", " &\n\t")
+GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.
-NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "", " &\n\t")
+NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
 
 COMMONOBJS = &
-	y_tab.obj &
+	$(OUTPUTDIR)\y_tab.obj &
-	#$ ExpandGlue("WXCOMMONOBJS", "", " &\n\t")
+	#$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
 
-MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")
+MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
 
-HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "", " &\n\t")
+HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
-ARCHINCDIR=$(WXDIR)\lib\msw
 SETUP_H=$(ARCHINCDIR)\wx\setup.h
 
-all:        $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+all: $(SETUP_H) $(OUTPUTDIR) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
 
 $(ARCHINCDIR)\wx:
-    mkdir $(ARCHINCDIR)
+	mkdir $(ARCHINCDIR)
-    mkdir $(ARCHINCDIR)\wx
+	mkdir $(ARCHINCDIR)\wx
+
+$(OUTPUTDIR):
+	@if not exist $^@ mkdir $^@
 
 $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
-    copy $(WXDIR)\include\wx\msw\setup.h $@
+	copy $(WXDIR)\include\wx\msw\setup.h $@
 
+LBCFILE=wx$(TOOLKIT).lbc
 $(LIBTARGET) : $(OBJECTS)
-    %create tmp.lbc
+    %create $(LBCFILE)
-    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    wlib /b /c /n /p=512 $^@ @tmp.lbc
+    wlib /b /c /n $(LIBPAGESIZE) $^@ @$(LBCFILE)
-
-#test : $(OBJECTS)
-#    %create tmp.lbc
-#    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
-#    wlib /b /c /n /p=512 $^@ @tmp.lbc
 
 
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
@@ -156,7 +135,7 @@ cleanall:   clean
     $_ = $project{"WXMSWOBJS"};
     my @objs = split;
     foreach (@objs) {
-        $text .= $_ . ':     $(';
+        $text .= "\$(OUTPUTDIR)\\" . $_ . ':     $(';
         s/\.obj$//;
         if ( $project{"WXOLEOBJS"} =~ /\b\Q$_\E\b/ ) {
             $text .= 'OLEDIR)\\';
@@ -167,13 +146,15 @@ cleanall:   clean
         if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
             $suffix = "c";
             $cc="CC";
+            $flags="CFLAGS";
         }
         else {
             $suffix = "cpp";
-            $cc="CCC";
+            $cc="CXX";
+            $flags="CXXFLAGS";
         }
         $text .= $_ . ".$suffix\n" .
-                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
+                 "  *\$($cc) \$($flags) \$<" . "\n\n";
     }
 #$}
 
@@ -184,27 +165,27 @@ cleanall:   clean
     $_ = $project{"WXCOMMONOBJS"};
     my @objs = split;
     foreach (@objs) {
-        $text .= $_;
+        $text .= "\$(OUTPUTDIR)\\" . $_;
         s/\.obj$//;
         $text .= ':     $(COMMDIR)\\';
         my $suffix, $cc;
         if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
             $suffix = "c";
             $cc="CC";
+            $flags="CFLAGS";
         }
         else {
             $suffix = "cpp";
-            $cc="CCC";
+            $cc="CXX";
+            $flags="CXXFLAGS";
         }
         $text .= $_ . ".$suffix\n" .
-                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
+                 "  *\$($cc) \$($flags) \$<" . "\n\n";
     }
 #$}
 
-y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+$(OUTPUTDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
+  *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
-
-#  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS $(COMMDIR)\y_tab.c
 
 $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
         copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
@@ -220,11 +201,11 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     $_ = $project{"WXGENERICOBJS"};
     my @objs = split;
     foreach (@objs) {
-        $text .= $_;
+        $text .= "\$(OUTPUTDIR)\\" . $_;
         s/\.obj$//;
         $text .= ':     $(GENDIR)\\';
         $text .= $_ . ".cpp\n" .
-                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
+                 '  *$(CXX) $(CXXFLAGS) $<' . "\n\n";
     }
 #$}
 
@@ -236,11 +217,11 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     $_ = $project{"WXHTMLOBJS"};
     my @objs = split;
     foreach (@objs) {
-        $text .= $_;
+        $text .= "\$(OUTPUTDIR)\\" . $_;
         s/\.obj$//;
         $text .= ':     $(HTMLDIR)\\';
         $text .= $_ . ".cpp\n" .
-                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
+                 '  *$(CXX) $(CXXFLAGS) $<' . "\n\n";
     }
 #$}
 

distrib/msw/tmake/watbase.t

@@ -0,0 +1,183 @@
+#!#############################################################################
+#! File:    wat.t
+#! Purpose: tmake template file from which makefile.wat is generated by running
+#!          tmake -t wat wxwin.pro -o makefile.wat
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#! Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
+#!#############################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} !~ /\bB\b/;
+
+        $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXCOMMONOBJS"} .= $file . " ";
+        $project{"WXCOBJS"} .= $file . " " if $isCFile;
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        next if $wxMSW{$file} !~ /\bB\b/;
+
+        my $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXMSWOBJS"} .= $file . " ";
+        $project{"WXCOBJS"} .= $file . " " if $isCFile;
+    }
+
+    foreach $file (sort keys %wxBase) {
+        my $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXCOMMONOBJS"} .= $file . " ";
+        $project{"WXCOBJS"} .= $file . " " if $isCFile;
+    }
+
+#$}
+#! an attempt to embed '#' directly in the string somehow didn't work...
+#$ $text = chr(35) . '!/binb/wmake.exe';
+
+# This file was automatically generated by tmake 
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WATBASE.T!
+
+##############################################################################
+# Name:         makebase.wat
+# Purpose:      Builds wxBase library for Watcom C++ under Win32
+# Author:       Vadim Zeitlin
+# Created:      21.01.03
+# RCS-ID:       $Id$
+# Copyright:    (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+# Licence:      wxWindows licence
+##############################################################################
+
+wxUSE_GUI=0
+
+!include ..\makewat.env
+
+LIBTARGET   = $(WXDIR)\lib\$(LIBNAME).lib
+
+EXTRATARGETS = zlib regex
+EXTRATARGETSCLEAN = clean_zlib clean_regex
+COMMDIR=$(WXDIR)\src\common
+MSWDIR=$(WXDIR)\src\msw
+OLEDIR=$(MSWDIR)\ole
+
+COMMONOBJS = &
+	#$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
+
+MSWOBJS = &
+	#$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
+
+OBJECTS = $(COMMONOBJS) $(MSWOBJS)
+
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
+all: $(SETUP_H) $(OUTPUTDIR) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+
+$(ARCHINCDIR)\wx:
+	mkdir $(ARCHINCDIR)
+	mkdir $(ARCHINCDIR)\wx
+
+$(OUTPUTDIR):
+	mkdir $(OUTPUTDIR)
+
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
+	copy $(WXDIR)\include\wx\msw\setup.h $@
+
+LBCFILE=$(OUTPUTDIR)\wx$(TOOLKIT).lbc
+$(LIBTARGET) : $(OBJECTS)
+    %create $(LBCFILE)
+    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
+    wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
+
+
+clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
+    -erase $(OUTPUTDIR)\*.obj
+    -erase $(LIBTARGET)
+    -erase $(OUTPUTDIR)\*.pch
+    -erase $(OUTPUTDIR)\*.err
+    -erase $(OUTPUTDIR)\*.lbc
+
+cleanall:   clean
+    -erase $(LBCFILE)
+
+#${
+    $_ = $project{"WXMSWOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= "\$(OUTPUTDIR)\\" . $_ . ':     $(';
+        s/\.obj$//;
+        $text .= 'MSWDIR)\\';
+
+        my $suffix, $cc;
+        if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
+            $suffix = "c";
+            $cc="CC";
+            $flags="CFLAGS";
+        }
+        else {
+            $suffix = "cpp";
+            $cc="CXX";
+            $flags="CXXFLAGS";
+        }
+        $text .= $_ . ".$suffix\n" .
+                 "  *\$($cc) \$($flags) \$<" . "\n\n";
+    }
+#$}
+
+########################################################
+# Common objects (always compiled)
+
+#${
+    $_ = $project{"WXCOMMONOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= "\$(OUTPUTDIR)\\" . $_;
+        s/\.obj$//;
+        $text .= ':     $(COMMDIR)\\';
+        my $suffix, $cc;
+        if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
+            $suffix = "c";
+            $cc="CC";
+            $flags="CFLAGS";
+        }
+        else {
+            $suffix = "cpp";
+            $cc="CXX";
+            $flags="CXXFLAGS";
+        }
+        $text .= $_ . ".$suffix\n" .
+                 "  *\$($cc) \$($flags) \$<" . "\n\n";
+    }
+#$}
+
+zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+regex:    .SYMBOLIC
+    cd $(WXDIR)\src\regex
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_regex:   .SYMBOLIC
+    cd $(WXDIR)\src\regex
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+MFTYPE=watbase
+self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXDIR)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makebase.wat
+	copy makebase.wat $(WXDIR)\src\msw

distrib/msw/tmake/wxVersion.pm

@@ -0,0 +1,53 @@
+package wxVersion;
+
+=head1 NAME
+
+wxVersion
+
+=head1 SYNOPSIS
+
+  use wxVersion qw(GetVersion);
+
+=head1 METHODS
+
+=cut
+
+use strict;
+
+use base 'Exporter';
+use vars qw(@EXPORT_OK);
+
+@EXPORT_OK = qw(GetVersion);
+
+sub GetVersion()
+{
+    my $filename = "../../../include/wx/version.h";
+    open(VERSION_H, $filename) or die "Can't open $filename: $!\n";
+
+    my %versions;
+    my $numGot = 0;
+
+    while ( defined($_ = <VERSION_H>) ) {
+        chomp;
+
+        if ( /\s*#define\s+wxMAJOR_VERSION\s+(\d+)/ ) {
+            $versions{'MAJOR'} = $1;
+            $numGot++;
+        }
+        elsif ( /\s*#define\s+wxMINOR_VERSION\s+(\d+)/ ) {
+            $versions{'MINOR'} = $1;
+            $numGot++;
+        }
+        elsif ( /\s*#define\s+wxRELEASE_NUMBER\s+(\d+)/ ) {
+            $versions{'MICRO'} = $1;
+            $numGot++;
+        }
+
+        last if $numGot == 3    # we've got everything we wanted
+    }
+
+    $numGot == 3 or die "Failed to read the version from $filename.\n";
+
+    return %versions;
+}
+

docs/base/readme.txt

@@ -25,20 +25,22 @@ threads, sockets and much more. Some of the other utility classes allow you to
 parse the command line, limit the number of instances of your program
 executing simultaneously (portably!) and so on.
 
+
 1. Requirements and supported platforms
 --------------------------------------
 
  wxBase can be compiled and used under Win32, mostly any modern Unix system
-(probably including Mac OS X but it wasn't tested there), VMS and BeOS (this
+(including Mac OS X), VMS and BeOS (this release couldn't be tested under
-release couldn't be tested under these platforms neither so you might
+these platforms so you might encounter some problems but they should be easy
-encounter some problems but they should be easy to solve - please contact us
+to solve -- please contact us in this case!)
-in this case!)
 
  It is written without using any modern C++ features (such as templates,
 exceptions, namespaces) for maximal portability and so you shouldn't have
 problems compiling it with any C++ compiler at all. However, we only provide
-the project files for Microsoft Visual C++ 6.0 for Win32 (any contributions
+the project files for Microsoft Visual C++ 6.0 and make files for Borland C++
-are welcome!) - but our Unix makefiles will work with any compiler.
+for Win32 (any contributions are welcome!) -- but our Unix makefiles should
+work with any compiler.
+
 
 2. Installing under Win32
 -------------------------
@@ -58,6 +60,7 @@ b) Cygwin
    Please refer to the Unix section below
 
 c) Borland
+
    Please refer to the docs/msw/install.txt. The console sample compiles and runs
    but does not pass all tests (04 sept 02)
 
@@ -67,6 +70,7 @@ d) Other compilers
 Please contact us if you would like to help us with creating one for the
 compiler you use.
 
+
 3. Installing under Unix/BeOS
 -----------------------------
 
@@ -74,12 +78,13 @@ NB: If you're building wxBase from the wxWindows distribution and not from a
     separate wxBase one you will need to add "--disable-gui" to configure
     arguments below!
 
-Please note that GNU make is required to build wxBase!
+Please note that GNU make may be required to build wxBase, please use it if
+you get any errors from the native Unix make.
 
 The recommended way to build wxBase is:
 
 	% cd ..../wxWindows
-	% mkdir base-release
+	% mkdir base-release # or any other directory of your liking
 	% cd base-release
 	% ../configure
 	# ignore the error messages about missing samples
@@ -120,6 +125,6 @@ namely:
 								 Vadim Zeitlin
 
 
-This file is accurate for the version 2.3.2 of wxBase. It was last modified on
+This file is accurate for the version 2.4.0 of wxBase. It was last modified on
-Dec 11, 2001.
+Dec 24, 2002.
 

docs/changes.txt

@@ -115,13 +115,13 @@ All (GUI):
 wxMSW:
 
 ! build system changed: setup.h is not a static file in include/wx any more
-  but is created as part of the build process under lib/<toolkit>/wx/include
+  but is created as part of the build process under lib/<toolkit>/wx
   where <toolkit> is of the form (msw|univ)[dll][u][d]. You'll need to update
   the include path in your make/project files appropriately. Furthermore,
   xpm.lib is no longer used by wxMSW, it was superseded by the wxXPMDecoder
   class. You'll need to remove all references to xpm.lib from your
   make/project files. Finally, the library names have changed as well and now
-  use the following consistent naming convention: wxmsw[u][d][ver].(lib|dll)
+  use the following consistent naming convention: wxmsw[ver][u][d].(lib|dll)
   where 'u' appears for Unicode version, 'd' -- for the debug one and version
   is only present for the DLLs builds.
 
@@ -170,6 +170,31 @@ wxThread and related classes:
 OTHER CHANGES
 =============
 
+2.4.1
+-----
+
+All:
+
+- fixed wxLANGUAGE_CHINESE_TAIWAN to use zh_TW catalogs
+- added missing wx/quantize.h to install
+
+Unix (GUI):
+
+- fixed the "close" button of dialogs under KDE 3.1
+
+wxBase
+
+- compilation with wxUSE_ODBC=1 fixed (dbkeyg.h file was missing in the archive)
+- bug in wxDateTime with timezones on systems with tm_gmtoff in struct tm fixed
+- fixed bug in wxArray::Shrink() (Seth Manley)
+
+wxGTK:
+
+- added wxEVT_MENU_OPEN event generation
+- fixed bug in generic file selector causing incomplete file extensions to
+  be appended to filenames with no extension
+
+
 2.4.0
 -----
 
@@ -203,10 +228,12 @@ Unix (Base/GUI):
 - shared library symbols are now versioned on platforms that support it (Linux)
 
 wxGTK:
+
 - Further work for GTK 2.0 and Unicode support.
 - Addition of native frame site grip.
 
 wxX11:
+
 - Unicode support through Pango library.
 
 wxMSW:

docs/html/faqmac.htm

@@ -37,6 +37,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <li><a href="#settings">What important settings are required in the CodeWarrior Project Preferences?</a></li>
 <li><a href="#smarterrors">What are the smart preprocessing errors with the Apple Developer Tools?</a></li>
 <li><a href="#aboutmenu">How does wxMac support the standard Apple About menu item and Help menu?</a></li>
+<li><a href="#findericon">How do I add an icon to my application?</a></li>
 </ul>
 <hr>
 
@@ -204,6 +205,15 @@ Because wxWindows does not have a specific API for the <i>About</i> menu item or
 </ul>
 <P>
 
+<h3><a name="findericon">How do I add an icon to my application?</a></h3>
+
+If you have Mac OS X, you have the icns editor somewhere in the
+Utilities folder. Create an icon using this tool and DeRez it, so that you have a .r
+file with a 'icns' resource with id (-16455). Include this .r file in
+your project and in the CodeWarrior Settings add a check mark under Linker:Output
+Flags/Finder Flags/Has Custom Icon.
+<P>
+
 </font>
 
 </BODY>

docs/latex/wx/category.tex

@@ -305,11 +305,11 @@ creation of objects given class names.
 \twocolitem{\helpref{RTTI macros}{rttimacros}}{Macros for manipulating run-time information}
 \end{twocollist}
 
-{\large {\bf Debugging features}}
+{\large {\bf Logging features}}
 
 \overview{Overview}{wxlogoverview}
 
-wxWindows provides several classes and functions for the message logging.
+wxWindows provides several classes and functions for message logging.
 Please see the \helpref{wxLog overview}{wxlogoverview} for more details.
 
 \twocolwidtha{6cm}

docs/latex/wx/combobox.tex

@@ -37,6 +37,8 @@ See also \helpref{window styles overview}{windowstyles}.
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_COMBOBOX(id, func)}}{Process a wxEVT\_COMMAND\_COMBOBOX\_SELECTED event,
 when an item on the list is selected.}
+\twocolitem{{\bf EVT\_TEXT\_ENTER(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_ENTER event,
+when return is pressed in the combobox.}
 \twocolitem{{\bf EVT\_TEXT(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_UPDATED event,
 when the combobox text changes.}
 \end{twocollist}

docs/latex/wx/docmanag.tex

@@ -358,6 +358,12 @@ followed by a file selector.
 
 This function is used in wxDocManager::CreateDocument.
 
+\perlnote{In wxPerl {\tt templates} is a reference to a list of templates.
+If you override this method in your document manager it must return
+two values, eg:\par
+  (doctemplate, path) = My::DocManager->SelectDocumentPath( ... );
+}
+
 \membersection{wxDocManager::SelectDocumentType}
 
 \func{wxDocTemplate *}{SelectDocumentType}{\param{wxDocTemplate **}{templates},
@@ -375,6 +381,8 @@ then this parameter indicates whether the list of templates that the user
 will have to choose from is sorted or not when shown the choice box dialog.  
 Default is FALSE.}
 
+\perlnote{In wxPerl {\tt templates} is a reference to a list of templates.}
+
 \membersection{wxDocManager::SelectViewType}
 
 \func{wxDocTemplate *}{SelectViewType}{\param{wxDocTemplate **}{templates},
@@ -394,6 +402,8 @@ then this parameter indicates whether the list of templates that the user
 will have to choose from is sorted or not when shown the choice box dialog.  
 Default is FALSE.}
 
+\perlnote{In wxPerl {\tt templates} is a reference to a list of templates.}
+
 \membersection{wxDocManager::SetLastDirectory}\label{wxdocmanagersetlastdirectory}
 
 \func{void}{SetLastDirectory}{\param{const wxString\&}{ dir}}

docs/latex/wx/doctempl.tex

@@ -121,6 +121,24 @@ member to return a new view instance on demand.
 \item wxDEFAULT\_TEMPLATE\_FLAGS Defined as wxTEMPLATE\_VISIBLE.
 \end{itemize}
 
+\perlnote{In wxPerl {\tt docClassInfo} and {\tt viewClassInfo} can be
+either {\tt Wx::ClassInfo} objects or strings which contain the name
+of the perl packages which are to be used as {\tt Wx::Document} and
+{\tt Wx::View} classes (they must have a constructor named {\tt
+new}):\par
+\indented{2cm}{\begin{twocollist}
+\twocolitem{{\bf Wx::DocTemplate->new( docmgr, descr, filter, dir,
+ext, docTypeName, viewTypeName, docClassInfo, viewClassInfo, flags
+)}}{ will construct document and view objects from the class information}
+\twocolitem{{\bf Wx::DocTemplate->new( docmgr, descr, filter, dir,
+ext, docTypeName, viewTypeName, docClassName, viewClassName, flags
+)}}{ will construct document and view objects from perl packages}
+\twocolitem{{\bf Wx::DocTemplate->new( docmgr, descr, filter, dir,
+ext, docTypeName, viewTypeName )}}{
+{\tt Wx::DocTemplate::CreateDocument()} and
+{\tt Wx::DocTemplate::CreateView()} must be overridden}
+\end{twocollist}}}
+
 \membersection{wxDocTemplate::\destruct{wxDocTemplate}}
 
 \func{void}{\destruct{wxDocTemplate}}{\void}

docs/latex/wx/encconv.tex

@@ -5,9 +5,20 @@
 
 \section{\class{wxEncodingConverter}}\label{wxencodingconverter}
 
-This class is capable of converting strings between any two
+This class is capable of converting strings between two
 8-bit encodings/charsets. It can also convert from/to Unicode (but only
-if you compiled wxWindows with wxUSE\_WCHAR\_T set to 1).
+if you compiled wxWindows with wxUSE\_WCHAR\_T set to 1). Only limited subset
+of encodings in supported by wxEncodingConverter:
+{\tt wxFONTENCODING\_ISO8859\_1..15}, {\tt wxFONTENCODING\_CP1250..1257} and 
+{\tt wxFONTENCODING\_KOI8}.
+
+\wxheading{Note}
+
+Please use \helpref{wxMBConv classes}{mbconvclasses} instead
+if possible. \helpref{wxCSConv}{wxcsconv} has much better support for various
+encodings than wxEncodingConverter. wxEncodingConverter is useful only
+if you rely on {\tt wxCONVERT\_SUBSTITUTE} mode of operation (see 
+\helpref{Init}{wxencodingconverterinit}).
 
 \wxheading{Derived from}
 

docs/latex/wx/filedlg.tex

@@ -38,6 +38,13 @@ types of file with a description for each, such as:
  "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
 \end{verbatim}
 
+It must be noted that wildcard support in the native Motif file
+dialog is quite limited: only one alternative is supported,
+and it is displayed without the descriptive test; ``BMP files (*.bmp)|*.bmp''
+is displayed as ``*.bmp'', and both
+``BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif'' and
+``Image files|*.bmp;*.gif'' are errors.
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxFileDialog::wxFileDialog}\label{wxfiledialogconstr}
@@ -58,7 +65,10 @@ Constructor. Use \helpref{wxFileDialog::ShowModal}{wxfiledialogshowmodal} to sho
 
 \docparam{defaultFile}{The default filename, or the empty string.}
 
-\docparam{wildcard}{A wildcard, such as ``*.*" or ``BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif".}
+\docparam{wildcard}{A wildcard, such as ``*.*" or ``BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif".
+
+Note that the native Motif dialog has some limitations with respect to
+wildcards; see the Remarks section above.}
 
 \docparam{style}{A dialog style. A bitlist of:
 
@@ -192,6 +202,9 @@ Sets the wildcard, which can contain multiple file types, for example:
 
 ``BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
 
+Note that the native Motif dialog has some limitations with respect to
+wildcards; see the Remarks section above.
+
 \membersection{wxFileDialog::ShowModal}\label{wxfiledialogshowmodal}
 
 \func{int}{ShowModal}{\void}

docs/latex/wx/fontmap.tex

@@ -23,14 +23,14 @@ and "interactive" is FALSE or user denied to choose any replacement),
 the class queries \helpref{wxEncodingConverter}{wxencodingconverter} 
 for "equivalent" encodings (e.g. iso8859-2 and cp1250) and tries them.
 
-\wxheading{Using wxFontMapper in conjunction with wxEncodingConverter}
+\wxheading{Using wxFontMapper in conjunction with wxMBConv classes}
 
 If you need to display text in encoding which is not available at
 host system (see \helpref{IsEncodingAvailable}{wxfontmapperisencodingavailable}),
 you may use these two classes to find font in some similar encoding
 (see \helpref{GetAltForEncoding}{wxfontmappergetaltforencoding})
 and convert the text to this encoding 
-(\helpref{wxEncodingConverter::Convert}{wxencodingconverterconvert}).
+(\helpref{wxMBConv classes}{mbconvclasses}).
 
 Following code snippet demonstrates it:
 
@@ -41,11 +41,9 @@ if (!wxFontMapper::Get()->IsEncodingAvailable(enc, facename))
    if (wxFontMapper::Get()->GetAltForEncoding(enc, &alternative,
                                               facename, FALSE))
    {
-       wxEncodingConverter encconv;
+       wxCSConv convFrom(wxFontMapper::Get()->GetEncodingName(enc));
-       if (!encconv.Init(enc, alternative))
+       wxCSConv convTo(wxFontMapper::Get()->GetEncodingName(alternative));
-           ...failure...
+       text = wxString(text.mb_str(convFrom), convTo);
-       else
-           text = encconv.Convert(text);
    }
    else
        ...failure (or we may try iso8859-1/7bit ASCII)...

docs/latex/wx/image.tex

@@ -397,12 +397,6 @@ available images.
 Number of available images. For most image handlers, this is 1 (exceptions
 are TIFF and ICO formats).
 
-\membersection{wxImage::GetRed}\label{wximagegetred}
-
-\constfunc{unsigned char}{GetRed}{\param{int}{ x}, \param{int}{ y}}
-
-Returns the red intensity at the given coordinate.
-
 \membersection{wxImage::GetHandlers}
 
 \func{static wxList\&}{GetHandlers}{\void}
@@ -446,6 +440,12 @@ used when converting to wxBitmap under Windows.
 
 Eventually wxImage handlers will set the palette if one exists in the image file.
 
+\membersection{wxImage::GetRed}\label{wximagegetred}
+
+\constfunc{unsigned char}{GetRed}{\param{int}{ x}, \param{int}{ y}}
+
+Returns the red intensity at the given coordinate.
+
 \membersection{wxImage::GetSubImage}\label{wximagegetsubimage}
 
 \constfunc{wxImage}{GetSubImage}{\param{const wxRect\&}{ rect}}
@@ -791,7 +791,7 @@ Example:
     // rescale it to have size of 32*32
     if ( bmp.GetWidth() != 32 || bmp.GetHeight() != 32 )
     {
-        wxImage image(bmp);
+        wxImage image = bmp.ConvertToImage();
         bmp = wxBitmap(image.Scale(32, 32));
 
         // another possibility:
@@ -828,7 +828,7 @@ Specifies whether there is a mask or not. The area of the mask is determined by
 
 \membersection{wxImage::SetMaskColour}\label{wximagesetmaskcolour}
 
-\func{void}{SetMaskColour}{\param{unsigned char }{red}, \param{unsigned char }{blue}, \param{unsigned char }{green}}
+\func{void}{SetMaskColour}{\param{unsigned char }{red}, \param{unsigned char }{green}, \param{unsigned char }{blue}}
 
 Sets the mask colour for this image (and tells the image to use the mask).
 

docs/latex/wx/log.tex

@@ -57,7 +57,7 @@ situations because it may easily lead to a loss of messages.
 \membersection{Logging functions}
 
 There are two functions which must be implemented by any derived class to
-actually process the log messages: \helpref{DoLog}{wxlogdolog} and 
+actually process the log messages: \helpref{DoLog}{wxlogdolog} and
 \helpref{DoLogString}{wxlogdologstring}. The second function receives a string
 which just has to be output in some way and the easiest way to write a new log
 target is to override just this function in the derived class. If more control
@@ -72,7 +72,7 @@ night in the current time zone).
 There also functions to support message buffering. Why are they needed?
 Some of wxLog implementations, most notably the standard wxLogGui class,
 buffer the messages (for example, to avoid showing the user a zillion of modal
-message boxes one after another - which would be really annoying). 
+message boxes one after another - which would be really annoying).
 \helpref{Flush()}{wxlogflush} shows them all and clears the buffer contents.
 Although this function doesn't do anything if the buffer is already empty,
 \helpref{HasPendingMessages()}{wxloghaspendingmessages} is also provided which
@@ -96,9 +96,9 @@ problem.
 
 As for the (real) trace messages, their handling depends on the settings of
 the (application global) {\it trace mask}. There are two ways to specify it:
-either by using \helpref{SetTraceMask}{wxlogsettracemask} and 
+either by using \helpref{SetTraceMask}{wxlogsettracemask} and
-\helpref{GetTraceMask}{wxloggettracemask} and using 
+\helpref{GetTraceMask}{wxloggettracemask} and using
-\helpref{wxLogTrace}{wxlogtrace} which takes an integer mask or by using 
+\helpref{wxLogTrace}{wxlogtrace} which takes an integer mask or by using
 \helpref{AddTraceMask}{wxlogaddtracemask} for string trace masks.
 
 The difference between bit-wise and string trace masks is that a message using
@@ -112,7 +112,7 @@ For example,
 // wxTraceOleCalls is one of standard bit masks
 wxLogTrace(wxTraceRefCount | wxTraceOleCalls, "Active object ref count: %d", nRef);
 \end{verbatim}
-will do something only if the current trace mask contains both 
+will do something only if the current trace mask contains both
 {\tt wxTraceRefCount} and {\tt wxTraceOle}, but
 
 \begin{verbatim}
@@ -131,7 +131,7 @@ the preferred way of working with trace messages. The integer trace mask is
 kept for compatibility and for additional (but very rarely needed) flexibility
 only.
 
-The standard trace masks are given in \helpref{wxLogTrace}{wxlogtrace} 
+The standard trace masks are given in \helpref{wxLogTrace}{wxlogtrace}
 documentation.
 
 Finally, the {\it wxLog::DoLog()} function automatically prepends a time stamp
@@ -145,7 +145,7 @@ format disables timestamping of the messages completely.
 {\bf NB:} Timestamping is disabled for Visual C++ users in debug builds by
 default because otherwise it would be impossible to directly go to the line
 from which the log message was generated by simply clicking in the debugger
-window on the corresponding error message. If you wish to enable it, please use 
+window on the corresponding error message. If you wish to enable it, please use
 \helpref{SetTimestamp}{wxlogsettimestamp} explicitly.
 
 \helpref{AddTraceMask}{wxlogaddtracemask}\\
@@ -171,7 +171,7 @@ window on the corresponding error message. If you wish to enable it, please use
 
 \func{static void}{AddTraceMask}{\param{const wxString\& }{mask}}
 
-Add the {\it mask} to the list of allowed masks for 
+Add the {\it mask} to the list of allowed masks for
 \helpref{wxLogTrace}{wxlogtrace}.
 
 \wxheading{See also}
@@ -182,7 +182,7 @@ Add the {\it mask} to the list of allowed masks for
 
 \func{static void}{ClearTraceMasks}{\void}
 
-Removes all trace masks previously set with 
+Removes all trace masks previously set with
 \helpref{AddTraceMask}{wxlogaddtracemask}.
 
 \wxheading{See also}
@@ -240,7 +240,7 @@ flushed, so Suspend() works as expected with it).
 
 \func{static void}{Resume}{\void}
 
-Resumes logging previously suspended by a call to 
+Resumes logging previously suspended by a call to
 \helpref{Suspend}{wxlogsuspend}. All messages logged in the meanwhile will be
 flushed soon.
 
@@ -253,7 +253,7 @@ of the message as specified in the call of {\it wxLogXXX()} function which
 generated it and {\it timestamp} is the moment when the message was generated.
 
 The base class version prepends the timestamp to the message, adds a prefix
-corresponding to the log level and then calls 
+corresponding to the log level and then calls
 \helpref{DoLogString}{wxlogdologstring} with the resulting string.
 
 \membersection{wxLog::DoLogString}\label{wxlogdologstring}
@@ -263,7 +263,7 @@ corresponding to the log level and then calls
 Called to log the specified string. The timestamp is already included into the
 string but still passed to this function.
 
-A simple implementation may just send the string to {\tt stdout} or, better, 
+A simple implementation may just send the string to {\tt stdout} or, better,
 {\tt stderr}.
 
 \membersection{wxLog::DontCreateOnDemand}\label{wxlogdontcreateondemand}
@@ -274,7 +274,7 @@ Instructs wxLog to not create new log targets on the fly if there is none
 currently. (Almost) for internal use only: it is supposed to be called by the
 application shutdown code.
 
-Note that this function also calls 
+Note that this function also calls
 \helpref{ClearTraceMasks}{wxlogcleartracemasks}.
 
 \membersection{wxLog::Flush}\label{wxlogflush}
@@ -314,6 +314,19 @@ logged as the normal ones instead of being silently dropped.
 
 Returns whether the verbose mode is currently active.
 
+\membersection{wxLog::SetLogLevel}\label{wxlogsetloglevel}
+
+\func{static void}{SetLogLevel}{\param{wxLogLevel }{ logLevel}}
+
+Specifies that log messages with $level > logLevel$ should be ignored
+and not sent to the active log target.
+
+\membersection{wxLog::GetLogLevel}\label{wxloggetloglevel}
+
+\func{static wxLogLevel}{GetLogLevel}{\void}
+
+Returns the current log level limit.
+
 \membersection{wxLog::SetTimestamp}\label{wxlogsettimestamp}
 
 \func{void}{SetTimestamp}{\param{const char * }{ format}}
@@ -345,17 +358,17 @@ for details.
 
 \func{static bool}{IsAllowedTraceMask}{\param{const wxChar *}{mask}}
 
-Returns TRUE if the {\it mask} is one of allowed masks for 
+Returns TRUE if the {\it mask} is one of allowed masks for
 \helpref{wxLogTrace}{wxlogtrace}.
 
-See also: \helpref{AddTraceMask}{wxlogaddtracemask}, 
+See also: \helpref{AddTraceMask}{wxlogaddtracemask},
 \helpref{RemoveTraceMask}{wxlogremovetracemask}
 
 \membersection{wxLog::RemoveTraceMask}\label{wxlogremovetracemask}
 
 \func{static void}{RemoveTraceMask}{\param{const wxString\& }{mask}}
 
-Remove the {\it mask} from the list of allowed masks for 
+Remove the {\it mask} from the list of allowed masks for
 \helpref{wxLogTrace}{wxlogtrace}.
 
 See also: \helpref{AddTraceMask}{wxlogaddtracemask}
@@ -365,7 +378,7 @@ See also: \helpref{AddTraceMask}{wxlogaddtracemask}
 \section{\class{wxLogChain}}\label{wxlogchain}
 
 This simple class allows to chain log sinks, that is to install a new sink but
-keep passing log messages to the old one instead of replacing it completely as 
+keep passing log messages to the old one instead of replacing it completely as
 \helpref{SetActiveTarget}{wxlogsetactivetarget} does.
 
 It is especially useful when you want to divert the logs somewhere (for
@@ -421,7 +434,7 @@ NULL}).
 \constfunc{bool}{IsPassingMessages}{\void}
 
 Returns {\tt TRUE} if the messages are passed to the previously active log
-target (default) or {\tt FALSE} if \helpref{PassMessages}{wxlogchainpassmessages} 
+target (default) or {\tt FALSE} if \helpref{PassMessages}{wxlogchainpassmessages}
 had been called.
 
 \membersection{wxLogChain::PassMessages}\label{wxlogchainpassmessages}
@@ -549,7 +562,7 @@ forwards the log messages to the previously installed one in addition to
 processing them itself.
 
 Unlike \helpref{wxLogChain}{wxlogchain} which is usually used directly as is,
-this class must be derived from to implement \helpref{DoLog}{wxlogdolog} 
+this class must be derived from to implement \helpref{DoLog}{wxlogdolog}
 and/or \helpref{DoLogString}{wxlogdologstring} methods.
 
 \wxheading{Derived from}
@@ -592,7 +605,7 @@ wxWindows applications which send all the output to {\tt stderr}.
 
 \func{}{wxLogStderr}{\param{FILE }{*fp = NULL}}
 
-Constructs a log target which sends all the log messages to the given 
+Constructs a log target which sends all the log messages to the given
 {\tt FILE}. If it is {\tt NULL}, the messages are sent to {\tt stderr}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% wxLogStream %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -623,7 +636,7 @@ the standard iostream library support ({\tt wxUSE\_STD\_IOSTREAM} must be on).
 
 \func{}{wxLogStream}{\param{std::ostream }{*ostr = NULL}}
 
-Constructs a log target which sends all the log messages to the given 
+Constructs a log target which sends all the log messages to the given
 output stream. If it is {\tt NULL}, the messages are sent to {\tt cerr}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% wxLogTextCtrl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -692,7 +705,7 @@ Creates the log frame window and starts collecting the messages in it.
 
 \docparam{title}{The title for the log frame}
 
-\docparam{show}{{\tt TRUE} to show the frame initially (default), otherwise 
+\docparam{show}{{\tt TRUE} to show the frame initially (default), otherwise
 \helpref{wxLogWindow::Show}{wxlogwindowshow} must be called later.}
 
 \docparam{passToOld}{{\tt TRUE} to process the log messages normally in addition to