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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_4_0@18627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 20:00:45 +00:00
924 changed files with 21726 additions and 62958 deletions
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -19,29 +19,30 @@ varaibles and PATH entries.
 Continue with item c) below.


-b) If using the MinGW or Cygwin compilers
+b) If using the GNU Mingw32 or GNU Cygwin32 compilers

-You can get MinGW from  http://www.mingw.org/
+You can get Mingw32 from  http://www.mingw.org

-Cygwin is available at  http://sources.redhat.com/cygwin/
+Cygwin32 is available at  http://www.cygwin.com

 The makefile might have small problems with Cygwin's tools
-so it is recommended to use MinGW and its toolchain instead
+so it is recommended to use Mingw32 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 MinGW version (gcc-2.95 or older),
+-> If your are using an old Mingw32 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 MinGW gcc-2.95.2 or newer.
+   not needed if you are using Mingw32 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 MinGW) or 0 (you have Cygwin).
-   Also set the MINGW32VERSION variable appropiately.
+   the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
+   If using MINGW32, also set the MINGW32VERSION variable
+   appropiately.


 c) Build instructions
@@ -50,8 +51,19 @@ 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 to choose
-   the features you would like to compile wxWindows with[out].
+-> Edit c:\wxWin\include\wx\msw\setup.h so that
+   most features are enabled (i.e. defined to 1), for example:
+   #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
@@ -60,8 +72,6 @@ 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/
   
@@ -107,10 +117,11 @@ yet complete).
 III) Windows using configure
 ----------------------------------------

-wxWindows can be built on Windows using MSYS (see
-http://www.mingw.org/), which is a POSIX build environment
-for Windows. With MSYS you can just ./configure && make (see also VII,
-Unix->Windows cross-compiling using configure).
+Take a look at Unix->Windows cross compiling. With minor
+modifications, this should work in Windows if you've got the cygnus
+utilities (bash, GNU make, etc) and either mingw32 or cygwin32 installed.
+See http://www.cygnus.com for these programs, or go straight to their
+ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.

 Of course, you can also build the library using plain makefiles (see
 section I).
@@ -157,17 +168,17 @@ VI) OS/2
 VII) Unix->Windows cross-compiling using configure
 --------------------------------------------------

-First you'll need a cross-compiler; linux glibc binaries of MinGW and
-Cygwin (both based on egcs) can be found at
+First you'll need a cross-compiler; linux glibc binaries of mingw32 and
+cygwin32 (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 Cygwin and MinGW: the main difference is that Cygwin
+[ A Note about cygwin32 and mingw32: the main difference is that cygwin32
 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 MinGW is
+software to windows. However, wxMSW doesn't need this, so mingw32 is
 preferable if you write portable C(++). ]

 You might want to build both Unix and Windows binaries in the same source
@@ -192,7 +203,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 MinGW)
+(all assuming you're using mingw32)
 By default this will compile a DLL, if you want a static library,
 specify --disable-shared.

@@ -204,7 +215,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)
-    MinGW headers which may be corrected by upgrading your compier,
+    mingw32 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
@@ -227,7 +238,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
--- a/Makefile.in
+++ b/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,16 +1441,12 @@ 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
@@ -1474,16 +1470,12 @@ 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
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.

-timestamp='2003-01-03'
+timestamp='2001-09-07'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,8 +29,7 @@ timestamp='2003-01-03'
 # 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>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -118,7 +117,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* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -227,44 +226,32 @@ 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 \
-	| clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| c4x | clipper \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
 	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
 	| mn10200 | mn10300 \
-	| msp430 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| openrisc \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
+	| s390 | s390x \
+	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| stormy16 | strongarm \
 	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
+	| v850 \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -291,53 +278,38 @@ case $basic_machine in
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| alphapca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cray2-* | cydra-* \
+	| d10v-* | d30v-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
 	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| 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-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
+	| s390-* | s390x-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
+	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -402,10 +374,6 @@ 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
@@ -426,8 +394,16 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | j90)
-		basic_machine=j90-cray
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -442,14 +418,6 @@ 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
@@ -630,6 +598,14 @@ 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/'`
 		;;
@@ -644,10 +620,6 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -720,10 +692,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -731,10 +699,6 @@ 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
@@ -757,19 +721,19 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
+	pentium | p5 | k5 | k6 | nexgen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -784,22 +748,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/^[^-]*-//'`
 		;;
@@ -820,22 +784,10 @@ 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
 		;;
@@ -843,7 +795,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs | simso-wrs)
+	sparclite-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -910,17 +862,9 @@ case $basic_machine in
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=alphaev5-cray
+		basic_machine=t3e-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
@@ -931,10 +875,6 @@ case $basic_machine in
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -959,8 +899,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
@@ -981,13 +921,17 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
 		;;
-	ymp)
-		basic_machine=ymp-cray
+	xmp)
+		basic_machine=xmp-cray
 		os=-unicos
 		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -1008,6 +952,13 @@ 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
 		;;
@@ -1027,16 +978,13 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1051,6 +999,10 @@ 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.
 		;;
@@ -1113,12 +1065,10 @@ case $os in
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -microbsd*)
+	      | -os2* | -vos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1130,10 +1080,8 @@ case $os in
 			;;
 		esac
 		;;
-	-nto-qnx*)
-		;;
 	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		os=-nto-qnx
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1172,20 +1120,14 @@ 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
@@ -1224,8 +1166,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1258,11 +1200,10 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1289,9 +1230,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or32-*)
-		os=-coff
-		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1355,19 +1293,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)
@@ -1439,7 +1377,7 @@ case $basic_machine in
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)
--- a/1545
+++ b/1545
--- a/configure.in
+++ b/configure.in
@@ -1241,13 +1241,10 @@ dnl install checks
 dnl   defines INSTALL with the appropriate command
 AC_PROG_INSTALL

-dnl   make install path absolute (if not already);
-dnl   will fail with (some) MSDOS paths
+dnl   make install path absolute (if not already); will fail with MSDOS paths
 case ${INSTALL} in
  /* ) # Absolute
     ;;
-  ?:* ) # Drive letter, considered as absolute.
-     ;;
  *)
     INSTALL=`pwd`/${INSTALL} ;;
 esac
@@ -1400,15 +1397,6 @@ 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
@@ -2166,52 +2154,36 @@ 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* )
-              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
+              mgl_os="linux/gcc/glibc*"
              ;;
            *-pc-msdosdjgpp )
-              mgl_os_candidates="dos32/dj2"
+              mgl_os=dos32/dj2
              ;;
            *)
              AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
        esac

        mgl_lib_type=""
-        mgl_os=""

-        for mgl_os_i in $mgl_os_candidates ; do
-            if test "x$mgl_os" = x ; then
-                if test "$wxUSE_DEBUG_FLAG" = yes ; then
-                    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
+        if test "$wxUSE_DEBUG_FLAG" = yes ; then
+            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
+                    -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
+                mgl_lib_type=debug
            fi
-        done
-
-        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")
- 
+        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
+
        wxUSE_UNIVERSAL="yes"

        TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
@@ -2809,10 +2781,9 @@ case "${host}" in
        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 base name of the resource file for wxMac must be the same
-            dnl as library installation base name (-install_name)
-            WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
-            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
+            dnl the name of the resources file for wxMac
+            WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
+            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
        fi
        ;;
 esac
@@ -2943,9 +2914,6 @@ 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"
-        dnl library installation base name and wxMac resources file base name
-        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}"
      ;;
@@ -3298,17 +3266,20 @@ 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 <stddef.h>
-                #include <sys/statvfs.h>
+                 #include <sys/statvfs.h>
            ],
            [
-                statvfs("/", NULL);
+                 long l;
+                 struct statvfs fs;
+                 statvfs("/", &fs);
+                 l = fs.f_bsize;
+                 l += fs.f_blocks;
+                 l += fs.f_bavail;
            ],
            [
                 wx_cv_func_statvfs=yes
@@ -3320,73 +3291,12 @@ else
    )

    if test "$wx_cv_func_statvfs" = "yes"; then
-        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
+        AC_DEFINE(HAVE_STATVFS)
    else
-        dnl set it for the test below
-        wx_cv_type_statvfs_t="unknown"
+        AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
    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
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -24,29 +24,11 @@
 #include <wx/wx.h>
 #include <wx/dnd.h>

-#ifndef SWIG
-/*
- * 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)
-
+#ifdef STCISDLL
+#define STCDLLEXPORT WXDLLEXPORT
 #else
-// When building the static library nullify the effect of WXSTC_DECLSPEC
-#define WXSTC_DECLSPEC
-#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL)
-
-#endif // SWIG
-
+#define STCDLLEXPORT
+#endif

 //----------------------------------------------------------------------

@@ -926,9 +908,9 @@ class  WordList;
 struct SCNotification;

 #ifndef SWIG
-extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr;
-class WXSTC_DECLSPEC wxStyledTextCtrl;
-class WXSTC_DECLSPEC wxStyledTextEvent;
+extern STCDLLEXPORT const wxChar* wxSTCNameStr;
+class STCDLLEXPORT wxStyledTextCtrl;
+class STCDLLEXPORT wxStyledTextEvent;
 #endif

 //----------------------------------------------------------------------
--- a/contrib/samples/animate/makefile.wat
+++ b/contrib/samples/animate/makefile.wat
@@ -6,12 +6,9 @@
 #

 WXDIR = $(%WXWIN)
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\samples\animate

 PROGRAM = anitest
-EXTRALIBS = $(WXDIR)\lib\anim_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+OBJECTS = $(PROGRAM).obj animate.obj

 !include $(WXDIR)\src\makeprog.wat

--- a/contrib/samples/gizmos/multicell/makefile.wat
+++ b/contrib/samples/gizmos/multicell/makefile.wat
@@ -3,13 +3,9 @@

 WXDIR = $(%WXWIN)

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\samples\gizmos\multicell
-
-
 PROGRAM = mtest
-EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+OBJECTS = $(PROGRAM).obj ..\src\multicell.obj
+EXTRAINC=-I..\include

 !include $(WXDIR)\src\makeprog.wat

--- a/contrib/samples/gizmos/splittree/makefile.wat
+++ b/contrib/samples/gizmos/splittree/makefile.wat
@@ -1,14 +1,14 @@
-# Purpose: makefile for multicell example (Watcom)
-# Created 2000-07-28
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#

 WXDIR = $(%WXWIN)

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\samples\gizmos\splittree
-
-PROGRAM = tree
-EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+PROGRAM = minimal
+OBJECTS = $(PROGRAM).obj

 !include $(WXDIR)\src\makeprog.wat

--- a/contrib/samples/mmedia/makefile.wat
+++ b/contrib/samples/mmedia/makefile.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)

 PROGRAM = mmboard
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj  mmbman.obj
+OBJECTS = $(PROGRAM).obj mmbman.obj

 !include $(WXDIR)\src\makeprog.wat

--- a/contrib/samples/ogl/ogledit/makefile.wat
+++ b/contrib/samples/ogl/ogledit/makefile.wat
@@ -7,12 +7,9 @@

 WXDIR = $(%WXWIN)

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit
-
 PROGRAM = ogledit
-EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\doc.obj $(OUTPUTDIR)\view.obj $(OUTPUTDIR)\palette.obj
+EXTRALIBS = $(WXDIR)\lib\ogl.lib
+OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj

 !include $(WXDIR)\src\makeprog.wat

--- a/contrib/samples/ogl/studio/makefile.wat
+++ b/contrib/samples/ogl/studio/makefile.wat
@@ -7,21 +7,10 @@

 WXDIR = $(%WXWIN)

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\samples\ogl\studio
-
 PROGRAM = studio
-EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).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
+EXTRALIBS = $(WXDIR)\lib\ogl.lib
+OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj &
+  mainfrm.obj project.obj dialogs.obj csprint.obj

 !include $(WXDIR)\src\makeprog.wat

--- a/contrib/samples/svg/svgtest.rc
+++ b/contrib/samples/svg/svgtest.rc
@@ -1,11 +0,0 @@
-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"
--- a/contrib/src/fl/panedrawpl.cpp
+++ b/contrib/src/fl/panedrawpl.cpp
@@ -591,14 +591,10 @@ 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,
-                                         nNewHeight,
+                                         bounds.height - 2 - bar.mDimInfo.mVertGap *2 , 
                                         0 
                                       );

--- a/contrib/src/gizmos/makefile.wat
+++ b/contrib/src/gizmos/makefile.wat
@@ -1,29 +1,22 @@
 # Gizmos makefile for Watcom C++

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 WXDIR = ..\..\..

 !include $(WXDIR)\src\makewat.env

-GIZMOSLIB = $(WXDIR)\lib\gizmos_w.lib
+GIZMOSLIB = $(WXDIR)\lib\gizmos.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) .SYMBOLIC
+all: $(GIZMOSLIB)

 $(GIZMOSLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(GIZMOSLIB) $(OBJECTS)

 clean:   .SYMBOLIC
-    -erase *.obj
-    -erase *.bak
-    -erase *.err 
-    -erase *.pch 
-    -erase $(GIZMOSLIB) 
-    -erase *.lbc
+    -erase *.obj *.bak *.err *.pch $(GIZMOSLIB) *.lbc

--- a/contrib/src/mmedia/makefile.wat
+++ b/contrib/src/mmedia/makefile.wat
@@ -6,38 +6,15 @@
 #
 # Makefile : Builds MMedia library for Watcom C++, WIN32

-!error This will not work - there is no digitalv.h in Open Watcom as of 26 Feb 03 
+WXDIR = $(%WXWIN)

-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
+LIBTARGET=$(WXDIR)\contrib\lib\mmedia.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

-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
+!include $(WXDIR)\src\makelib.wat


--- a/contrib/src/net/smapi.cpp
+++ b/contrib/src/net/smapi.cpp
@@ -301,8 +301,7 @@ bool wxMapiSession::Send(wxMailMessage& message)
    //Setup the "To" recipients
    int nRecipIndex = 0;
    int nToSize = message.m_to.GetCount();
-    int i;
-    for (i=0; i<nToSize; i++)
+    for (int i=0; i<nToSize; i++)
    {
        MapiRecipDesc& recip = mapiMessage.lpRecips[nRecipIndex];
        ZeroMemory(&recip, sizeof(MapiRecipDesc));
--- a/contrib/src/ogl/makefile.wat
+++ b/contrib/src/ogl/makefile.wat
@@ -1,13 +1,13 @@
 # Objects makefile

 WXDIR = ..\..\..
-EXTRACPPFLAGS=-I$(WXDIR)\contrib\include;/DPROLOGIO

 !include $(WXDIR)\src\makewat.env

-OGLLIB = $(WXDIR)\lib\ogl_w.lib
-THISDIR = $(WXDIR)\contrib\src\ogl
-OUTPUTDIR = $(THISDIR)\
+EXTRACPPFLAGS=/DPROLOGIO
+
+OGLLIB = $(WXDIR)\lib\ogl.lib
+THISDIR = $(WXDIR)\src\ogl

 NAME = ogl
 LNK = $(name).lnk
@@ -15,16 +15,11 @@ 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) .SYMBOLIC
+all: $(OGLLIB)

 $(OGLLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(OGLLIB) $(OBJECTS)

 clean:   .SYMBOLIC
-    -erase *.obj 
-    -erase *.bak 
-    -erase *.err 
-    -erase *.pch 
-    -erase $(OGLLIB) 
-    -erase *.lbc
+    -erase *.obj *.bak *.err *.pch $(OGLLIB) *.lbc

--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -430,11 +430,9 @@ 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];
@@ -446,26 +444,9 @@ 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) {
@@ -831,12 +812,7 @@ int ListBox::Length() {
 }

 void ListBox::Select(int n) {
-    bool select = TRUE;
-    if (n == -1) {
-        n = 0;
-        select = FALSE;
-    }
-    GETLB(id)->SetSelection(n, select);
+    GETLB(id)->SetSelection(n);
 #ifdef __WXGTK__
    if (n > 4)
        n = n - 4;
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -686,9 +686,7 @@ 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;
--- a/contrib/src/stc/StcVC.dsp
+++ b/contrib/src/stc/StcVC.dsp
@@ -1,35 +1,34 @@
-# 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 Release DLL
+CFG=StcVC - Win32 Debug
 !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 NMAKE /f "StcVC.mak" CFG="stcVC - Win32 Release DLL"
-!MESSAGE
+!MESSAGE 
+!MESSAGE NMAKE /f "StcVC.mak" CFG="StcVC - Win32 Debug"
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "stcVC - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stcVC - Win32 Debug" (based on "Win32 (x86) Static Library")
-!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
+!MESSAGE 
+!MESSAGE "StcVC - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "StcVC - Win32 Debug" (based on "Win32 (x86) Static 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
@@ -41,11 +40,9 @@ CFG=stcVC - Win32 Release DLL
 # 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 "../../../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
-RSC=rc.exe
+# 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
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe
@@ -55,7 +52,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
@@ -67,11 +64,9 @@ 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 /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
-RSC=rc.exe
+# 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
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe
@@ -81,85 +76,15 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib"

-!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
+!ENDIF 

 # Begin Target

-# Name "stcVC - Win32 Release"
-# Name "stcVC - Win32 Debug"
-# Name "stcVC - Win32 Debug DLL"
-# Name "stcVC - Win32 Release DLL"
-# Begin Group "wxStyledTextCtrl Src"
+# Name "StcVC - Win32 Release"
+# Name "StcVC - Win32 Debug"
+# Begin Group "Stc"

-# PROP Default_Filter "*.cpp"
+# PROP Default_Filter ""
 # Begin Source File

 SOURCE=.\PlatWX.cpp
@@ -170,23 +95,11 @@ 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=..\..\include\wx\stc\stc.h
+SOURCE=.\stc.cpp
 # End Source File
 # End Group
 # Begin Group "Scintilla"
@@ -194,10 +107,6 @@ SOURCE=..\..\include\wx\stc\stc.h
 # 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
@@ -242,10 +151,6 @@ 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
@@ -274,10 +179,6 @@ 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
@@ -362,34 +263,14 @@ 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
@@ -398,14 +279,6 @@ 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
@@ -418,22 +291,10 @@ 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
@@ -444,10 +305,6 @@ 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
--- a/contrib/src/stc/makefile.b32
+++ b/contrib/src/stc/makefile.b32
@@ -89,6 +89,7 @@ $(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
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -24,29 +24,11 @@
 #include <wx/wx.h>
 #include <wx/dnd.h>

-#ifndef SWIG
-/*
- * 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)
-
+#ifdef STCISDLL
+#define STCDLLEXPORT WXDLLEXPORT
 #else
-// When building the static library nullify the effect of WXSTC_DECLSPEC
-#define WXSTC_DECLSPEC
-#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL)
-
-#endif // SWIG
-
+#define STCDLLEXPORT
+#endif

 //----------------------------------------------------------------------

@@ -76,9 +58,9 @@ class  WordList;
 struct SCNotification;

 #ifndef SWIG
-extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr;
-class WXSTC_DECLSPEC wxStyledTextCtrl;
-class WXSTC_DECLSPEC wxStyledTextEvent;
+extern STCDLLEXPORT const wxChar* wxSTCNameStr;
+class STCDLLEXPORT wxStyledTextCtrl;
+class STCDLLEXPORT wxStyledTextEvent;
 #endif

 //----------------------------------------------------------------------
--- a/contrib/src/xrc/makefile.wat
+++ b/contrib/src/xrc/makefile.wat
@@ -2,16 +2,12 @@

 WXDIR = ..\..\..

-#XMLDIR=
-!error modify makefile.wat to include the path to the XML library
-
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include;-I$(XMLDIR)\libxml2-2.1.1
+EXTRACPPFLAGS=/Id:\libxml\libxml2-2.1.1

 !include $(WXDIR)\src\makewat.env

-WXXMLLIB = $(WXDIR)\lib\wxxrc_w.lib
+WXXMLLIB = $(WXDIR)\lib\wxxrc.lib
 THISDIR = $(WXDIR)\contrib\src\xrc
-OUTPUTDIR = $(THISDIR)\

 NAME = wxxrc
 LNK = $(name).lnk
@@ -22,19 +18,14 @@ 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_split.obj
+        xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj


-all: $(WXXMLLIB) .SYMBOLIC
+all: $(WXXMLLIB)

 $(WXXMLLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(WXXMLLIB) $(OBJECTS)

 clean:   .SYMBOLIC
-    -erase *.obj 
-    -erase *.bak 
-    -erase *.err 
-    -erase *.pch
-    -erase $(WXXMLLIB) 
-    -erase *.lbc
+    -erase *.obj *.bak *.err *.pch $(WXXMLLIB) *.lbc

--- a/contrib/utils/convertrc/makefile.wat
+++ b/contrib/utils/convertrc/makefile.wat
@@ -4,16 +4,10 @@
 #

 WXDIR = $(%WXWIN)
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\utils\convertrc

 PROGRAM = wxconvert
-EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
-OBJECTS=&
-    $(OUTPUTDIR)\convert.obj &
-    $(OUTPUTDIR)\rc2xml.obj &
-    $(OUTPUTDIR)\rc2wxr.obj &
-    $(OUTPUTDIR)\wxr2xml.obj
+EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
+OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj

 !include $(WXDIR)\src\makeprog.wat

--- a/contrib/utils/wxrc/makefile.wat
+++ b/contrib/utils/wxrc/makefile.wat
@@ -4,12 +4,10 @@
 #

 WXDIR = $(%WXWIN)
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\utils\wxrc

 PROGRAM = wxrc
-EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
+EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
+OBJECTS = $(PROGRAM).obj

 !include $(WXDIR)\src\makeprog.wat

--- a/contrib/utils/wxrcedit/makefile.wat
+++ b/contrib/utils/wxrcedit/makefile.wat
@@ -4,22 +4,10 @@
 #

 WXDIR = $(%WXWIN)
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-THISDIR = $(WXDIR)\contrib\utils\wxrcedit

 PROGRAM = wxrcedit
-EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
-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
+EXTRALIBS = $(WXDIR)\lib\wxxrc.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

 !include $(WXDIR)\src\makeprog.wat

--- a/debian/README.Debian
+++ b/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.4 package, or
+	please file a bug against the wxwindows2.2 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.4 ]
+	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.2 ]

 	Oh and, please do *not* file bug reports for these packages
 	to the Debian bts.  But do feel free to email me personally
@@ -44,9 +44,7 @@ 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.  NOTE this package is obsolete
-			and will be replaced by wxX11 and wxX11-univ at
-			some future time.
+libwxgtk-univ		wxUniversal for Gtk.


 -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,3 @@
-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.
@@ -29,10 +6,6 @@ wxwindows2.4 (2.4.0) unstable; urgency=low
  * 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

--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,7 @@
 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, libpng12-0-dev, libtiff3g-dev, libgl-dev, libglu-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, libpng3-dev, libtiff3g-dev, libgl-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.5.8.0

@@ -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
- classes in libwx_gtk=V for use in console apps and daemons.  You do not need
- this package to build or use wxWindows GUI apps.
+ 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
+ under development and may not be as stable as the gui version.

 Package: libwxbase=V-dev
 Architecture: any
 Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), zlib1g-dev, 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}), libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng-dev, libtiff3g-dev, libc6-dev
 Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
 Conflicts: libwxgtk-dev
 Replaces: libwxgtk-dev, wxgtk2.1-dev
@@ -117,10 +117,10 @@ Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
 Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends}
-Suggests: wxwin=V-doc, wxwin=V-examples, python2.2-xml
-Conflicts: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
-Replaces: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
-Provides: libwxgtk-python
+Recommends: python2.2-xml
+Suggests: wxwin=V-doc, wxwin=V-examples
+Conflicts: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-python
+Replaces: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-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
@@ -139,7 +139,21 @@ 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 from the wxWindows source tree
+ This package provides the contrib libs of 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
@@ -154,13 +168,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.
+ contrib libs from the wxWindows source tree (mmedia, ogl, stc)

 Package: wxwin=V-headers
 Architecture: any
 Section: devel
 Conflicts: wxwin-headers
-Replaces: wxwin-headers, wxgtk2.1-dev, libwxgtk2.3
+Replaces: wxwin-headers, wxgtk2.1-dev
 Provides: wxwin-headers
 Description: wxWindows Cross-platform C++ GUI toolkit (header files)
 wxWindows is a class library for C++ providing GUI (Graphical User
@@ -203,21 +217,7 @@ 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 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.
+ This package contains examples of using the wxWindows toolkit.

 Package: libwxbase-msw=V-dev
 Architecture: i386
--- a/debian/libwxbase-dev.files
+++ b/debian/libwxbase-dev.files
@@ -0,0 +1,4 @@
+usr/bin/wxbase-=V-config
+usr/lib/wx/include/base-=V/wx/setup.h
+usr/lib/libwx_base*.so
+
--- a/debian/libwxbase.dirs
+++ b/debian/libwxbase.dirs
@@ -1,2 +1,3 @@
+usr/bin
 usr/lib

--- a/debian/libwxgtk-contrib-dev.files
+++ b/debian/libwxgtk-contrib-dev.files
@@ -0,0 +1,12 @@
+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
+
--- a/debian/libwxgtk-dev.files
+++ b/debian/libwxgtk-dev.files
@@ -0,0 +1,4 @@
+usr/bin/wxgtk-=V-config
+usr/lib/wx/include/gtk-=V/wx/setup.h
+usr/lib/libwx_gtk*.so
+
--- a/debian/libwxgtk-python.files
+++ b/debian/libwxgtk-python.files
@@ -0,0 +1,4 @@
+usr/lib/=PY/site-packages/wxPython
+usr/lib/libwxPyHelpers*.so
+usr/lib/libwxPyHelpers*.so.*
+
--- a/debian/libwxgtk-python.menu
+++ b/debian/libwxgtk-python.menu
@@ -1,7 +1,7 @@
-?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\
  title="pycrust" command="/usr/bin/pycrust"
-?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\
  title="pyshell" command="/usr/bin/pyshell"
-?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\
  title="xrced" command="/usr/bin/xrced"

--- a/debian/libwxgtk.dirs
+++ b/debian/libwxgtk.dirs
@@ -1,2 +1,3 @@
 usr/lib
-usr/share
+usr/share/wx/afm
+usr/share/wx/gs_afm
--- a/debian/lintian-override
+++ b/debian/lintian-override
@@ -1,3 +1,4 @@
 libwxgtk2.4-dbg: non-dev-pkg-with-shlib-symlink
 libwxbase2.4-dbg: non-dev-pkg-with-shlib-symlink
+libwxgtk2.4-univ: non-dev-pkg-with-shlib-symlink

--- a/debian/rules
+++ b/debian/rules
@@ -49,8 +49,6 @@ 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
@@ -67,13 +65,10 @@ 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_install) $(objdir_gtk_contrib_install) $(objdir_gtk_univ) \
-	$(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc)               \
-	$(objdir_examples)                                                     \
-	$(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static)                \
-	$(objdir_wxbase_msw_dbg) $(objdir_msw_shared) $(objdir_msw_static)     \
-	$(objdir_msw_dbg)
+	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) $(objdir_gtk_univ) \
+	$(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc) $(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
@@ -133,7 +128,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 links postinst prerm; do \
+	@for f in dirs files 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; \
@@ -147,7 +142,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 links postinst prerm; do \
+	@for f in dirs files 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; \
@@ -157,7 +152,12 @@ 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 docs menu postinst prerm; do \
+	@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;
+	@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; \
@@ -166,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; do \
+	@for f in dirs files; 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; do \
+	@for f in dirs files; do \
 		echo "generating control file $(package_headers).$$f"; \
 		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
 	done;
-	@for f in dirs; do \
+	@for f in dirs files; do \
 		echo "generating control file $(package_i18n).$$f"; \
 		cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
 	done;
@@ -212,11 +212,6 @@ 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)
@@ -231,7 +226,7 @@ build_all: control-files-stamp $(build_stamps_native)
 build: build_arch


-configure-wxbase-shared-stamp:
+build-wxbase-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_shared)
 	cd $(objdir_wxbase_shared) \
@@ -239,15 +234,11 @@ configure-wxbase-shared-stamp:
 				--cache-file=$(config_cache) \
 				--disable-gui \
 				--enable-soname \
-				--with-zlib=sys
+				--with-zlib=sys \
+		&& $(MAKE)
 	touch $@

-build-wxbase-shared-stamp: configure-wxbase-shared-stamp
-	dh_testdir
-	cd $(objdir_wxbase_shared) && $(MAKE)
-	touch $@
-
-configure-wxbase-static-stamp:
+build-wxbase-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_static)
 	cd $(objdir_wxbase_static) \
@@ -255,15 +246,11 @@ configure-wxbase-static-stamp:
 				--cache-file=$(config_cache) \
 				--disable-gui \
 				--disable-shared \
-				--with-zlib=sys
+				--with-zlib=sys \
+		&& $(MAKE)
 	touch $@

-build-wxbase-static-stamp: configure-wxbase-static-stamp
-	dh_testdir
-	cd $(objdir_wxbase_static) && $(MAKE)
-	touch $@
-
-configure-wxbase-debug-stamp:
+build-wxbase-debug-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_debug)
 	cd $(objdir_wxbase_debug) \
@@ -272,15 +259,11 @@ configure-wxbase-debug-stamp:
 				--disable-gui \
 				--enable-debug \
 				--enable-soname \
-				--with-zlib=sys
+				--with-zlib=sys \
+		&& $(MAKE)
 	touch $@

-build-wxbase-debug-stamp: configure-wxbase-debug-stamp
-	dh_testdir
-	cd $(objdir_wxbase_debug) && $(MAKE)
-	touch $@
-
-configure-gtk-shared-stamp:
+build-gtk-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_shared)
 	cd $(objdir_gtk_shared) \
@@ -293,15 +276,11 @@ configure-gtk-shared-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
-				--enable-dynamic-loader
+				--enable-dynamic-loader \
+		&& $(MAKE)
 	touch $@

-build-gtk-shared-stamp: configure-gtk-shared-stamp
-	dh_testdir
-	cd $(objdir_gtk_shared) && $(MAKE)
-	touch $@
-
-configure-gtk-static-stamp:
+build-gtk-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_static)
 	cd $(objdir_gtk_static) \
@@ -314,15 +293,11 @@ configure-gtk-static-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
-				--enable-dynamic-loader
+				--enable-dynamic-loader \
+		&& $(MAKE)
 	touch $@

-build-gtk-static-stamp: configure-gtk-static-stamp
-	dh_testdir
-	cd $(objdir_gtk_static) && $(MAKE)
-	touch $@
-
-configure-gtk-debug-stamp:
+build-gtk-debug-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_debug)
 	cd $(objdir_gtk_debug) \
@@ -336,15 +311,11 @@ configure-gtk-debug-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
-				--enable-dynamic-loader
+				--enable-dynamic-loader \
+		&& $(MAKE)
 	touch $@

-build-gtk-debug-stamp: configure-gtk-debug-stamp
-	dh_testdir
-	cd $(objdir_gtk_debug) && $(MAKE)
-	touch $@
-
-configure-gtk-univ-stamp:
+build-gtk-univ-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_univ)
 	cd $(objdir_gtk_univ) \
@@ -358,12 +329,8 @@ configure-gtk-univ-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
-				--enable-dynamic-loader
-	touch $@
-
-build-gtk-univ-stamp: configure-gtk-univ-stamp
-	dh_testdir
-	cd $(objdir_gtk_univ) && $(MAKE)
+				--enable-dynamic-loader \
+		&& $(MAKE)
 	touch $@

 build-contrib-shared-stamp: build-gtk-shared-stamp
@@ -389,7 +356,6 @@ 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) \
@@ -437,7 +403,7 @@ build-i18n-stamp: build-gtk-shared-stamp
 		&& $(MAKE) allmo
 	touch $@

-configure-wxbase-msw-shared-stamp:
+build-wxbase-msw-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_msw_shared)
 	cd $(objdir_wxbase_msw_shared) \
@@ -445,15 +411,11 @@ configure-wxbase-msw-shared-stamp:
 				--cache-file=$(config_cache_cross) \
 				--host=$(cross_host) \
 				--build=$(cross_build) \
-				--disable-gui
+				--disable-gui \
+		&& $(MAKE)
 	touch $@

-build-wxbase-msw-shared-stamp: configure-wxbase-msw-shared-stamp
-	dh_testdir
-	cd $(objdir_wxbase_msw_shared) && $(MAKE)
-	touch $@
-
-configure-wxbase-msw-static-stamp:
+build-wxbase-msw-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_msw_static)
 	cd $(objdir_wxbase_msw_static) \
@@ -462,16 +424,12 @@ configure-wxbase-msw-static-stamp:
 				--host=$(cross_host) \
 				--build=$(cross_build) \
 				--disable-gui \
-				--disable-shared
-	touch $@
-
-build-wxbase-msw-static-stamp: configure-wxbase-msw-static-stamp
-	dh_testdir
-	cd $(objdir_wxbase_msw_static) && $(MAKE)
+				--disable-shared \
+		&& $(MAKE)
 	touch $@

 # Note this builds dll only, since wxmsw static debug is > 130MB !
-configure-wxbase-msw-dbg-stamp:
+build-wxbase-msw-dbg-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_msw_dbg)
 	cd $(objdir_wxbase_msw_dbg) \
@@ -480,30 +438,22 @@ configure-wxbase-msw-dbg-stamp:
 				--host=$(cross_host) \
 				--build=$(cross_build) \
 				--disable-gui \
-				--enable-debug
+				--enable-debug \
+		&& $(MAKE)
 	touch $@

-build-wxbase-msw-dbg-stamp: configure-wxbase-msw-dbg-stamp
-	dh_testdir
-	cd $(objdir_wxbase_msw_dbg) && $(MAKE)
-	touch $@
-
-configure-msw-shared-stamp:
+build-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-shared-stamp: configure-msw-shared-stamp
-	dh_testdir
-	cd $(objdir_msw_shared) && $(MAKE)
-	touch $@
-
-configure-msw-static-stamp:
+build-msw-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_msw_static)
 	cd $(objdir_msw_static) \
@@ -511,15 +461,11 @@ configure-msw-static-stamp:
 				--cache-file=$(config_cache_cross) \
 				--host=$(cross_host) \
 				--build=$(cross_build) \
-				--disable-shared
+				--disable-shared \
+		&& $(MAKE)
 	touch $@

-build-msw-static-stamp: configure-msw-static-stamp
-	dh_testdir
-	cd $(objdir_msw_static) && $(MAKE)
-	touch $@
-
-configure-msw-dbg-stamp:
+build-msw-dbg-stamp:
 	dh_testdir
 	mkdir -p $(objdir_msw_dbg)
 	cd $(objdir_msw_dbg) \
@@ -527,12 +473,8 @@ configure-msw-dbg-stamp:
 				--cache-file=$(config_cache_cross) \
 				--host=$(cross_host) \
 				--build=$(cross_build) \
-				--enable-debug
-	touch $@
-
-build-msw-dbg-stamp: configure-msw-dbg-stamp
-	dh_testdir
-	cd $(objdir_msw_dbg) && $(MAKE)
+				--enable-debug \
+		&& $(MAKE)
 	touch $@


@@ -540,7 +482,7 @@ clean: debian/control
 	dh_testdir
 	dh_testroot

-	rm -rf config_deb.cache config_deb_cross.cache *-stamp $(objdirs)
+	rm -rf config_deb.cache config_deb_cross.cache control-files-stamp $(build_stamps) $(objdirs)
 	rm -f docs/lgpl.txt
 	rm -f docs/latex/wx/manual.bb
 	rm -f $(objdir_i18n)/*.mo
@@ -565,6 +507,7 @@ 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).*
@@ -572,7 +515,6 @@ 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).*
@@ -589,17 +531,17 @@ install-wxbase-lib: build-wxbase-shared-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_wxbase_shared)/lib/*.so.* 	usr/lib
+	cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/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-dev: build-wxbase-static-stamp install-wxbase-lib
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_wxbase_shared)/wxbase-$(release)-config 	usr/bin
-	dh_install $(objdir_wxbase_shared)/lib/{wx,*.so} 		usr/lib
-	dh_install $(objdir_wxbase_static)/lib/*.a 			usr/lib
+	dh_movefiles --sourcedir=debian/$(package_wxbase_lib)
+	cp $(objdir_wxbase_static)/lib/*.a debian/$(package_wxbase_dev)/usr/lib

 install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
 install-wxbase-dbg: build-wxbase-debug-stamp
@@ -607,35 +549,29 @@ install-wxbase-dbg: build-wxbase-debug-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_wxbase_debug)/wxbased-$(release)-config 	usr/bin
-	dh_install $(objdir_wxbase_debug)/lib 				usr
+	cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
+	cp $(objdir_wxbase_debug)/wxbased-$(release)-config debian/$(package_wxbase_dbg)/usr/bin/
 	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-shared-stamp
+install-gtk-lib: build-gtk-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs 
-	dh_install $(objdir_gtk_install)/share/wx 	usr/share
-	dh_install $(objdir_gtk_install)/lib/*.so.* 	usr/lib
+	cd $(objdir_gtk_shared) \
+		&& $(MAKE) install prefix=`pwd`/../debian/$(package_gtk_lib)/usr
+	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-shared-stamp
+install-gtk-dev: build-gtk-static-stamp install-gtk-lib
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config 	usr/bin
-	dh_install $(objdir_gtk_install)/lib/{wx,*.so} 			usr/lib
-	dh_install $(objdir_gtk_static)/lib/libwx_gtk{-,_gl}*.a 	usr/lib
+	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+	cp $(objdir_gtk_static)/lib/libwx_gtk-*.a debian/$(package_gtk_dev)/usr/lib
+	cp $(objdir_gtk_static)/lib/libwx_gtk_gl-*.a debian/$(package_gtk_dev)/usr/lib

 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -643,8 +579,8 @@ install-gtk-dbg: build-gtk-debug-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_debug)/wxgtkd-$(release)-config 	usr/bin
-	dh_install $(objdir_gtk_debug)/lib 				usr
+	cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
+	cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)

 install-gtk-univ: DH_OPTIONS=-p$(package_gtk_univ)
@@ -653,35 +589,29 @@ install-gtk-univ: build-gtk-univ-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_univ)/wxgtkuniv-$(release)-config 	usr/bin
-	dh_install $(objdir_gtk_univ)/lib 				usr
+	cp -a $(objdir_gtk_univ)/lib/* debian/$(package_gtk_univ)/usr/lib
+	cp $(objdir_gtk_univ)/wxgtkuniv-$(release)-config debian/$(package_gtk_univ)/usr/bin/
 	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-stamp
+install-gtk-contrib: build-contrib-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_contrib_install)/lib/*.so.* 	usr/lib
+	cd $(objdir_gtk_shared)/contrib/src \
+		&& $(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-contrib-stamp
+install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_contrib_install)/include 	usr
-	dh_install $(objdir_gtk_contrib_install)/lib/*.so 	usr/lib
-	dh_install -Xlibwx_gtk- -Xlibwx_gtk_gl- \
-		   $(objdir_gtk_static)/lib/*.a 		usr/lib
+	dh_movefiles --sourcedir=debian/$(package_gtk_contrib)
+	cp $(objdir_gtk_static)/lib/*.a debian/$(package_gtk_contrib_dev)/usr/lib
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk-*.a
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk_gl-*.a

 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp
@@ -706,7 +636,7 @@ install-gtk-py: build-gtk-py-stamp
 		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1

 install-headers: DH_OPTIONS=-p$(package_headers)
-install-headers: install-gtk-shared-stamp
+install-headers: install-gtk-lib
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -720,18 +650,17 @@ install-headers: install-gtk-shared-stamp
 #		&& $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr

 #	dh_movefiles --sourcedir=$(objdir_univ_install)
-	dh_install $(objdir_gtk_install)/include 	usr
-	dh_install $(objdir_gtk_install)/share/aclocal 	usr/share
+	dh_movefiles --sourcedir=debian/$(package_gtk_lib)

 	dh_installman debian/wx-config.1

 install-i18n: DH_OPTIONS=-p$(package_i18n)
-install-i18n: build-i18n-stamp install-gtk-shared-stamp
+install-i18n: build-i18n-stamp install-gtk-lib
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_install)/share/locale 	usr/share
+	dh_movefiles --sourcedir=debian/$(package_gtk_lib)

 install-doc: DH_OPTIONS=-p$(package_doc)
 install-doc: build-doc-stamp
--- a/debian/wxwin-headers.files
+++ b/debian/wxwin-headers.files
@@ -0,0 +1 @@
+usr/include/wx/
--- a/debian/wxwin-i18n.files
+++ b/debian/wxwin-i18n.files
@@ -0,0 +1,2 @@
+/usr/share/locale/
+
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@@ -40,7 +40,7 @@ bool AppClass::OnInit()
  level=IDM_EASY;

  BombsFrame = 
-    new BombsFrameClass(NULL, _T("wxBombs"), wxPoint(155, 165), wxSize(300, 300), wxMINIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION);
+    new BombsFrameClass(NULL, "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, _T("E&xit")); // , "Quit the program");
+  menu1->Append(IDM_EXIT, "E&xit"); // , "Quit the program");
  menu1->AppendSeparator();
-  menu1->Append(IDM_ABOUT, _T("&About...")); // , "Infos on wxBombs");
-  menuBar1->Append(menu1, _T("&File"));
+  menu1->Append(IDM_ABOUT, "&About..."); // , "Infos on wxBombs");
+  menuBar1->Append(menu1, "&File");
  wxMenu *menu2 = new wxMenu;
-  menu2->Append(IDM_RESTART, _T("&Restart")); // , "Clear the play field");
+  menu2->Append(IDM_RESTART, "&Restart"); // , "Clear the play field");
  menu2->AppendSeparator();
-  menu2->Append(IDM_EASY, _T("&Easy"), wxEmptyString, TRUE); // "10x10 play field", TRUE);
-  menu2->Append(IDM_MEDIUM, _T("&Medium"), wxEmptyString, TRUE); // "15x15 play field", TRUE);
-  menu2->Append(IDM_DIFFICULT, _T("&Difficult"), wxEmptyString, TRUE); // "25x20 play field", TRUE);
-  menuBar1->Append(menu2, _T("&Game"));
+  menu2->Append(IDM_EASY, "&Easy", wxEmptyString, TRUE); // "10x10 play field", TRUE);
+  menu2->Append(IDM_MEDIUM, "&Medium", wxEmptyString, TRUE); // "15x15 play field", TRUE);
+  menu2->Append(IDM_DIFFICULT, "&Difficult", wxEmptyString, TRUE); // "25x20 play field", TRUE);
+  menuBar1->Append(menu2, "&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(_T("wxBombs (c) 1996 by P. Foggia\n<foggia@amalfi.dis.unina.it>"), _T("About wxBombs"));
+    wxMessageBox("wxBombs (c) 1996 by P. Foggia\n<foggia@amalfi.dis.unina.it>", "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;
-  wxChar buf[]=_T("M");
+  char buf[]="M";

  dc.GetTextExtent(buf, &chw, &chh);
  dc.SetFont(wxNullFont);
--- a/demos/bombs/bombs1.cpp
+++ b/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;
-  wxChar buf[2];
+  char buf[2];
  long chw, chh;

-  wxColour *wxBlack = wxTheColourDatabase->FindColour(_T("BLACK"));
-  wxColour *wxWhite = wxTheColourDatabase->FindColour(_T("WHITE"));
-  wxColour *wxRed = wxTheColourDatabase->FindColour(_T("RED"));
-  wxColour *wxBlue = wxTheColourDatabase->FindColour(_T("BLUE"));
-  wxColour *wxGrey = wxTheColourDatabase->FindColour(_T("LIGHT GREY"));
-  wxColour *wxGreen = wxTheColourDatabase->FindColour(_T("GREEN"));
+  wxColour *wxBlack = wxTheColourDatabase->FindColour("BLACK");
+  wxColour *wxWhite = wxTheColourDatabase->FindColour("WHITE");
+  wxColour *wxRed = wxTheColourDatabase->FindColour("RED");
+  wxColour *wxBlue = wxTheColourDatabase->FindColour("BLUE");
+  wxColour *wxGrey = wxTheColourDatabase->FindColour("LIGHT GREY");
+  wxColour *wxGreen = wxTheColourDatabase->FindColour("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]=_T('\0');
+  buf[1]='\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=_T('M');
+            *buf='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=_T('B');
+            *buf='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) + _T('0');
+            *buf = (wxGetApp().Game.Get(x,y) & BG_MASK) + '0';
            dc->GetTextExtent(buf, &chw, &chh);
            switch(*buf)
-              { case _T('0'): dc->SetTextForeground(* wxGreen); break;
-                case _T('1'): dc->SetTextForeground(* wxBlue); break;
+              { case '0': dc->SetTextForeground(* wxGreen); break;
+                case '1': dc->SetTextForeground(* wxBlue); break;
                default:  dc->SetTextForeground(* wxBlack); break;
              }
            dc->SetTextBackground(* wxWhite);
@@ -140,10 +140,9 @@ void BombsCanvasClass::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
  dc->SetFont(wxNullFont);

  if (wxGetApp().BombsFrame)
-    { wxString buf;
-      buf.Printf(_T("%d bombs  %d remaining cells"),
-                 wxGetApp().Game.GetBombs(),
-                 wxGetApp().Game.GetRemainingCells());
+    { char buf[80];
+      sprintf(buf, "%d bombs  %d remaining cells",
+              wxGetApp().Game.GetBombs(), wxGetApp().Game.GetRemainingCells());
      wxGetApp().BombsFrame->SetStatusText(buf, 0);
    }
 }
@@ -173,7 +172,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(_T("Nice! You found all the bombs!"), _T("wxWin Bombs"),
+       { wxMessageBox("Nice! You found all the bombs!", "wxWin Bombs",
                      wxOK|wxCENTRE, wxGetApp().BombsFrame);
       }
      else // x,y is a bomb
--- a/demos/forty/canvas.cpp
+++ b/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 = _T("forty");
+	if (name.Length() <= 0) name = "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(_T("Are you sure you want to\nabandon the current game?"),
-			_T("Warning"), wxYES_NO | wxICON_QUESTION) == wxNO)
+		wxMessageBox("Are you sure you want to\nabandon the current game?",
+			"Warning", wxYES_NO | wxICON_QUESTION) == wxNO)
 	{
        return FALSE;
 	}
--- a/demos/forty/card.cpp
+++ b/demos/forty/card.cpp
@@ -67,25 +67,25 @@ Card::Card(int value, WayUp way_up) :
 	if (!m_symbolBmap)
 	{
 #ifdef __WXMSW__
-		m_symbolBmap = new wxBitmap(_T("CardSymbols"), wxBITMAP_TYPE_BMP_RESOURCE);
+		m_symbolBmap = new wxBitmap("CardSymbols", wxBITMAP_TYPE_BMP_RESOURCE);
 #else
 		m_symbolBmap = new wxBitmap(Symbols_bits, Symbols_width, Symbols_height);
 #endif
 		if (!m_symbolBmap->Ok())
 		{
-			::wxMessageBox(_T("Failed to load bitmap CardSymbols"), _T("Error"));
+			::wxMessageBox("Failed to load bitmap CardSymbols", "Error");
 		}
 	}
 	if (!m_pictureBmap)
 	{
 #ifdef __WXMSW__
-		m_pictureBmap = new wxBitmap(_T("CardPictures"), wxBITMAP_TYPE_BMP_RESOURCE);
+		m_pictureBmap = new wxBitmap("CardPictures", wxBITMAP_TYPE_BMP_RESOURCE);
 #else
 		m_pictureBmap = new wxBitmap(Pictures);
 #endif
 		if (!m_pictureBmap->Ok())
 		{
-			::wxMessageBox(_T("Failed to load bitmap CardPictures"), _T("Error"));
+			::wxMessageBox("Failed to load bitmap CardPictures", "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(
-							_T("BLACK"), wxCROSSDIAG_HATCH
+							"BLACK", wxCROSSDIAG_HATCH
 							);
 		dc.SetBrush(* brush);

--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -76,7 +76,7 @@ bool FortyApp::OnInit()
        bool largecards = FALSE;
        wxSize size(668,510);

-        if ((argc > 1) && (!wxStrcmp(argv[1],_T("-L"))))
+        if ((argc > 1) && (!wxStrcmp(argv[1],"-L")))
        {
            largecards = TRUE;
            size = wxSize(1000,750);
@@ -84,7 +84,7 @@ bool FortyApp::OnInit()

 	FortyFrame* frame = new FortyFrame(
 			0,
-			_T("Forty Thieves"),
+			"Forty Thieves",
                        -1, -1, size.x, size.y,largecards
 			);

@@ -120,14 +120,14 @@ const wxColour& FortyApp::TextColour()
 {
 	if (!m_textColour)
 	{
-		m_textColour = new wxColour(_T("BLACK"));
+		m_textColour = new wxColour("BLACK");
 	}

 	return *m_textColour;
 }

 // My frame constructor
-FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int w, int h,bool largecards):
+FortyFrame::FortyFrame(wxFrame* frame, char* 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, const wxString& title, int x, int y, int
 #endif
 	// set the icon
 #ifdef __WXMSW__
-	SetIcon(wxIcon(_T("CardsIcon")));
+	SetIcon(wxIcon("CardsIcon"));
 #else
 #ifdef GTK_TBD
 	SetIcon(wxIcon(Cards_bits, Cards_width, Cards_height));
@@ -145,28 +145,28 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int

 	// Make a menu bar
 	wxMenu* gameMenu = new wxMenu;
-	gameMenu->Append(NEW_GAME, _T("&New"), _T("Start a new game"));
-	gameMenu->Append(SCORES, _T("&Scores..."), _T("Displays scores"));
-	gameMenu->Append(EXIT, _T("E&xit"), _T("Exits Forty Thieves"));
+	gameMenu->Append(NEW_GAME, "&New", "Start a new game");
+	gameMenu->Append(SCORES, "&Scores...", "Displays scores");
+	gameMenu->Append(EXIT, "E&xit", "Exits Forty Thieves");

 	wxMenu* editMenu = new wxMenu;
-	editMenu->Append(UNDO, _T("&Undo"), _T("Undo the last move"));
-	editMenu->Append(REDO, _T("&Redo"), _T("Redo a move that has been undone"));
+	editMenu->Append(UNDO, "&Undo", "Undo the last move");
+	editMenu->Append(REDO, "&Redo", "Redo a move that has been undone");

 	wxMenu*	optionsMenu = new wxMenu;
 	optionsMenu->Append(RIGHT_BUTTON_UNDO,
-			_T("&Right button undo"),
-			_T("Enables/disables right mouse button undo and redo"),
+			"&Right button undo",
+			"Enables/disables right mouse button undo and redo",
 			TRUE
 			);
 	optionsMenu->Append(HELPING_HAND,
-			_T("&Helping hand"),
-			_T("Enables/disables hand cursor when a card can be moved"),
+			"&Helping hand",
+			"Enables/disables hand cursor when a card can be moved",
 			TRUE
 			);
        optionsMenu->Append(LARGE_CARDS,
-                        _T("&Large cards"),
-                        _T("Enables/disables large cards for high resolution displays"),
+                        "&Large cards",
+                        "Enables/disables large cards for high resolution displays",
                        TRUE
                        );
 	optionsMenu->Check(HELPING_HAND, TRUE);
@@ -174,13 +174,13 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int
        optionsMenu->Check(LARGE_CARDS, largecards ? TRUE : FALSE);

 	wxMenu* helpMenu = new wxMenu;
-	helpMenu->Append(ABOUT, _T("&About..."), _T("Displays information about the game"));
+	helpMenu->Append(ABOUT, "&About...", "Displays information about the game");

 	m_menuBar = new wxMenuBar;
-	m_menuBar->Append(gameMenu,    _T("&Game"));
-	m_menuBar->Append(editMenu,    _T("&Edit"));
-	m_menuBar->Append(optionsMenu, _T("&Options"));
-	m_menuBar->Append(helpMenu,    _T("&Help"));
+	m_menuBar->Append(gameMenu,    "&Game");
+	m_menuBar->Append(editMenu,    "&Edit");
+	m_menuBar->Append(optionsMenu, "&Options");
+	m_menuBar->Append(helpMenu,    "&Help");

 	SetMenuBar(m_menuBar);

@@ -243,14 +243,14 @@ FortyFrame::About(wxCommandEvent&)
 #endif
    {
        wxMessageBox(
-            _T("Forty Thieves\n\n")
-            _T("A freeware program using the wxWindows\n")
-            _T("portable C++ GUI toolkit.\n")
-            _T("http://www.wxwindows.org\n")
-            _T("http://www.freiburg.linux.de/~wxxt\n\n")
-            _T("Author: Chris Breeze (c) 1992-1998\n")
-            _T("email: chris.breeze@iname.com"),
-            _T("About Forty Thieves"),
+            "Forty Thieves\n\n"
+            "A freeware program using the wxWindows\n"
+            "portable C++ GUI toolkit.\n"
+            "http://www.wxwindows.org\n"
+            "http://www.freiburg.linux.de/~wxxt\n\n"
+            "Author: Chris Breeze (c) 1992-1998\n"
+            "email: chris.breeze@iname.com",
+            "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();
-            wxChar* buf = htmlText.GetWriteBuf(len + 1);
+            char* 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$"), _T(__DATE__));
+    htmlText.Replace(wxT("$DATE$"), __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, _T("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item2 = new wxButton( parent, wxID_CANCEL, "&Close", wxDefaultPosition, wxDefaultSize, 0 );
    item2->SetDefault();
    item2->SetFocus();

--- a/demos/forty/forty.h
+++ b/demos/forty/forty.h
@@ -34,7 +34,7 @@ class FortyCanvas;
 class FortyFrame: public wxFrame
 {
 public:
-        FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int w, int h,bool largecards);
+        FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,bool largecards);
 	virtual ~FortyFrame();

 	void OnCloseWindow(wxCloseEvent& event);
--- a/demos/forty/game.cpp
+++ b/demos/forty/game.cpp
@@ -163,7 +163,7 @@ void Game::DoMove(wxDC& dc, Pile* src, Pile* dest)
    {
 		if (src == dest)
 		{
-			wxMessageBox(_T("Game::DoMove() src == dest"), _T("Debug message"),
+			wxMessageBox("Game::DoMove() src == dest", "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(_T("Game::DoMove() Undo buffer full"), _T("Debug message"),
+		wxMessageBox("Game::DoMove() Undo buffer full", "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(_T("Do you wish to play again?"),
-			_T("Well Done, You have won!"), wxYES_NO | wxICON_QUESTION) == wxYES)
+		if (wxMessageBox("Do you wish to play again?",
+			"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(_T("Average score:m_x"), &width, &height);
+		dc.GetTextExtent("Average score:m_x", &width, &height);
 		w = width;
 		h = height;
 	}
 	dc.DrawRectangle(x + w, y, 20, 4 * h);

-    wxString str;
-    str.Printf(_T("%d"), m_currentScore);
-    dc.DrawText(_T("Score:"), x, y);
+    char str[80];
+    sprintf(str, "%d", m_currentScore);
+    dc.DrawText("Score:", x, y);
    dc.DrawText(str, x + w, y);
    y += h;

-    str.Printf(_T("%d"), m_numGames);
-    dc.DrawText(_T("Games played:"), x, y);
+    sprintf(str, "%d", m_numGames);
+    dc.DrawText("Games played:", x, y);
    dc.DrawText(str, x + w, y);
    y += h;

-    str.Printf(_T("%d"), m_numWins);
-    dc.DrawText(_T("Games won:"), x, y);
+    sprintf(str, "%d", m_numWins);
+    dc.DrawText("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);
 	}
-    str.Printf(_T("%d"), average);
-    dc.DrawText(_T("Average score:"), x, y);
+    sprintf(str, "%d", average);
+    dc.DrawText("Average score:", x, y);
    dc.DrawText(str, x + w, y);
 }

@@ -798,8 +798,8 @@ void Pack::Redraw(wxDC& dc)
 {
    Pile::Redraw(dc);

-    wxString str;
-    str.Printf(_T("%d  "), m_topCard + 1);
+    char str[10];
+    sprintf(str, "%d  ", m_topCard + 1);

    dc.SetBackgroundMode( wxSOLID );
 	dc.SetTextBackground(FortyApp::BackgroundColour());
@@ -816,7 +816,7 @@ void Pack::AddCard(Card* card)
    }
    else
    {
-		wxMessageBox(_T("Pack::AddCard() Undo error"), _T("Forty Thieves: Warning"),
+		wxMessageBox("Pack::AddCard() Undo error", "Forty Thieves: Warning",
 		   wxOK | wxICON_EXCLAMATION);
    }
    card->TurnCard(facedown);
--- a/demos/forty/playerdg.cpp
+++ b/demos/forty/playerdg.cpp
@@ -44,7 +44,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 							wxWindow* parent,
 							ScoreFile* file
 							) :
-	wxDialog(parent, -1, _T("Player Selection"),
+	wxDialog(parent, -1, "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, _T("Please select a name or type a new one:"));
+	wxStaticText* msg = new wxStaticText(this, -1, "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, _T(""), wxDefaultPosition, wxDefaultSize, 0);
+	m_textField = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, 0);

-	m_OK = new wxButton(this, wxID_OK, _T("OK"));
-	m_cancel = new wxButton(this, wxID_CANCEL, _T("Cancel"));
+	m_OK = new wxButton(this, wxID_OK, "OK");
+	m_cancel = new wxButton(this, wxID_CANCEL, "Cancel");

 	wxLayoutConstraints* layout;

@@ -149,7 +149,7 @@ const wxString& PlayerSelectionDialog::GetPlayersName()

 void PlayerSelectionDialog::OnCloseWindow(wxCloseEvent& event)
 {
-	m_player = _T("");
+	m_player = "";
    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(_T('@')))
+			if (name.Contains('@'))
 			{
-				wxMessageBox(_T("Names should not contain the '@' character"), _T("Forty Thieves"));
+				wxMessageBox("Names should not contain the '@' character", "Forty Thieves");
 			}
 			else
 			{
@@ -181,12 +181,12 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
 		}
 		else
 		{
- 			wxMessageBox(_T("Please enter your name"), _T("Forty Thieves"));
+ 			wxMessageBox("Please enter your name", "Forty Thieves");
 		}
 	}
 	else
 	{
-		m_player = _T("");
+		m_player = "";
 		EndModal(wxID_CANCEL);
 	}
 }
--- a/demos/forty/scoredg.cpp
+++ b/demos/forty/scoredg.cpp
@@ -27,6 +27,16 @@
 #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"

@@ -56,9 +66,9 @@ ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
        wxArrayString players;
 	scoreFile->GetPlayerList( players);

-	wxString os;
+	ostrstream os;

-	os << wxT("Player\tWins\tGames\tScore\n");
+	os << "Player\tWins\tGames\tScore\n";
 	for (unsigned int i = 0; i < players.Count(); i++)
 	{
 		int wins, games, score;
@@ -69,13 +79,15 @@ ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
 			average = (2 * score + games) / (2 * games);
 		}

-		os << players[i] << wxT('\t') 
-		   << wins  << wxT('\t')
-		   << games << wxT('\t')
-		   << average << wxT('\n');
+		os << players[i] << '\t' 
+		   << wins  << '\t'
+		   << games << '\t'
+		   << average << '\n';
 	}
-	os << wxT('\0');
-	m_text = os;
+	os << '\0';
+	char* str = os.str();
+	m_text = str;
+	delete str;
 }

 ScoreCanvas::~ScoreCanvas()
@@ -86,7 +98,7 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 {
 	dc.SetFont(* m_font);

-	const wxChar* str = m_text;
+	const char* str = m_text;
 	unsigned int tab = 0;
 	unsigned int tabstops[] = { 5, 100, 150, 200 };

@@ -94,29 +106,29 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 	int lineSpacing;
 	{
 		long w, h;
-		dc.GetTextExtent(_T("Testing"), &w, &h);
+		dc.GetTextExtent("Testing", &w, &h);
 		lineSpacing = (int)h;
 	}

 	int y = 0;
 	while (*str)
 	{
-		wxChar text[256];
-		wxChar* dest = text;
+		char text[256];
+		char* dest = text;
 		
-		while (*str && *str >= _T(' ')) *dest++ = *str++;
-		*dest = _T('\0');
+		while (*str && *str >= ' ') *dest++ = *str++;
+		*dest = '\0';

 		dc.DrawText(text, tabstops[tab], y);

-		if (*str == _T('\t'))
+		if (*str == '\t')
 		{
 			if (tab < sizeof(tabstops) / sizeof(tabstops[0]) - 1)
 			{
 				tab++;
 			}
 		}
-		else if (*str == _T('\n'))
+		else if (*str == '\n')
 		{
 			tab = 0;
 			y += lineSpacing;
@@ -133,7 +145,7 @@ ScoreDialog::ScoreDialog(
 							wxWindow* parent,
 							ScoreFile* file
 							) :
-	wxDialog(parent, -1, _T("Scores"),
+	wxDialog(parent, -1, "Scores",
 			wxDefaultPosition, wxSize(310, 200),
 			wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
 	m_scoreFile(file)
@@ -142,7 +154,7 @@ ScoreDialog::ScoreDialog(
 	SetAutoLayout (TRUE);

 	ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile);
-	m_OK = new wxButton(this, wxID_OK, _T("OK"));
+	m_OK = new wxButton(this, wxID_OK, "OK");

 	wxLayoutConstraints* layout;

--- a/demos/forty/scorefil.cpp
+++ b/demos/forty/scorefil.cpp
@@ -38,7 +38,7 @@

 #include "scorefil.h"

-ScoreFile::ScoreFile(const wxString& appName)
+ScoreFile::ScoreFile(const char* appName)
 {
 #if 0
 	wxString filename;
@@ -68,8 +68,7 @@ ScoreFile::ScoreFile(const wxString& appName)
 	}
 #endif

-	m_config = new wxConfig(appName, _T("wxWindows"), appName, _T(""),
-                                wxCONFIG_USE_LOCAL_FILE);  // only local
+	m_config = new wxConfig(appName, "wxWindows", appName, "", wxCONFIG_USE_LOCAL_FILE);  // only local
 }

 ScoreFile::~ScoreFile()
@@ -85,7 +84,7 @@ ScoreFile::~ScoreFile()

 void ScoreFile::GetPlayerList( wxArrayString &list )
 {
-	m_config->SetPath(_T("/Players"));
+	m_config->SetPath("/Players");
 	int length = m_config->GetNumberOfGroups();

 	if (length <= 0) return;
@@ -107,14 +106,12 @@ void ScoreFile::GetPlayerList( wxArrayString &list )

 // Calculate an encrypted check number to prevent tampering with
 // score file
-long ScoreFile::CalcCheck(const wxString& name, int p1, int p2, int p3)
+long ScoreFile::CalcCheck(const char* name, int p1, int p2, int p3)
 {
    long check = 0;
-    size_t i, max = name.length();
-
-    for(i = 0; i < max; ++i )
+    while (*name)
 	{
-		check = (check << 1) ^ (long)name[i];
+		check = (check << 1) ^ (long)*name++;
 		check = ((check >> 23) ^ check) & 0xFFFFFF;
 	}
 	check = (check << 1) ^ (long)p1;
@@ -129,13 +126,13 @@ long ScoreFile::CalcCheck(const wxString& name, int p1, int p2, int p3)
 wxString ScoreFile::GetPreviousPlayer() const
 {
 	wxString result;
-	m_config->SetPath(_T("/General"));
-	m_config->Read(_T("LastPlayer"), &result);
+	m_config->SetPath("/General");
+	m_config->Read("LastPlayer", &result);
 	return result;
 }

 void ScoreFile::ReadPlayersScore(
-						const wxString& player,
+						const char* player,
 						int& wins,
 						int& games,
 						int& score)
@@ -145,17 +142,17 @@ void ScoreFile::ReadPlayersScore(

 	games = wins = score = 0;

-	m_config->SetPath(_T("/Players"));
+	m_config->SetPath("/Players");
 	m_config->SetPath(player);
-	if (m_config->Read(_T("Score"), &myScore, 0L) &&
-		m_config->Read(_T("Games"), &myGames, 0L) &&
-		m_config->Read(_T("Wins"),  &myWins, 0L) &&
-		m_config->Read(_T("Check"), &check, 0L))
+	if (m_config->Read("Score", &myScore, 0L) &&
+		m_config->Read("Games", &myGames, 0L) &&
+		m_config->Read("Wins",  &myWins, 0L) &&
+		m_config->Read("Check", &check, 0L))
 	{
 	    if (check != CalcCheck(player, myGames, myWins, myScore))
 		{
-			wxMessageBox(_T("Score file corrupted"), _T("Warning"),
-                                     wxOK | wxICON_EXCLAMATION);
+			wxMessageBox("Score file corrupted", "Warning",
+						wxOK | wxICON_EXCLAMATION);
 		}
 		else
 		{
@@ -168,18 +165,18 @@ void ScoreFile::ReadPlayersScore(
 }


-void ScoreFile::WritePlayersScore(const wxString& player, int wins, int games, int score)
+void ScoreFile::WritePlayersScore(const char* player, int wins, int games, int score)
 {
    if (player)
 	{
-		m_config->SetPath(_T("/General"));
-		m_config->Write(_T("LastPlayer"), wxString(player)); // Without wxString tmp, thinks it's bool in VC++
+		m_config->SetPath("/General");
+		m_config->Write("LastPlayer", wxString(player)); // Without wxString tmp, thinks it's bool in VC++

-		m_config->SetPath(_T("/Players"));
+		m_config->SetPath("/Players");
 		m_config->SetPath(player);
-		m_config->Write(_T("Score"), (long)score);
-		m_config->Write(_T("Games"), (long)games);
-		m_config->Write(_T("Wins"), (long)wins);
-		m_config->Write(_T("Check"), CalcCheck(player, games, wins, score));
+		m_config->Write("Score", (long)score);
+		m_config->Write("Games", (long)games);
+		m_config->Write("Wins", (long)wins);
+		m_config->Write("Check", CalcCheck(player, games, wins, score));
 	}
 }
--- a/demos/forty/scorefil.h
+++ b/demos/forty/scorefil.h
@@ -24,17 +24,17 @@

 class ScoreFile {
 public:
-	ScoreFile(const wxString& appName);
+	ScoreFile(const char* appName);
 	virtual ~ScoreFile();

 	void GetPlayerList( wxArrayString &list );
 	wxString GetPreviousPlayer() const;

-	void ReadPlayersScore(const wxString& player, int& wins, int& games, int &score);
-	void WritePlayersScore(const wxString& player, int wins, int games, int score);
+	void ReadPlayersScore(const char* player, int& wins, int& games, int &score);
+	void WritePlayersScore(const char* player, int wins, int games, int score);

 private:
-	long CalcCheck(const wxString& name, int p1, int p2, int p3);
+	long CalcCheck(const char* name, int p1, int p2, int p3);
 	wxString	    m_configFilename;
 	wxConfig*	    m_config;
 };
--- a/demos/fractal/fractal.cpp
+++ b/demos/fractal/fractal.cpp
@@ -90,13 +90,13 @@ DECLARE_EVENT_TABLE()
 bool MyApp::OnInit()
 {
  // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, _T("Fractal Mountains for wxWindows"), wxPoint(-1, -1), wxSize(640, 480));
+  MyFrame *frame = new MyFrame(NULL, "Fractal Mountains for wxWindows", wxPoint(-1, -1), wxSize(640, 480));

  // Make a menubar
  wxMenu *file_menu = new wxMenu;
-  file_menu->Append(wxID_EXIT, _T("E&xit"));
+  file_menu->Append(wxID_EXIT, "E&xit");
  menuBar = new wxMenuBar;
-  menuBar->Append(file_menu, _T("&File"));
+  menuBar->Append(file_menu, "&File");
  frame->SetMenuBar(menuBar);

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

    wxString      m_name;
--- a/demos/life/life.cpp
+++ b/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(_T(""), wxMENU_TEAROFF);
-    wxMenu *menuView = new wxMenu(_T(""), wxMENU_TEAROFF);
-    wxMenu *menuGame = new wxMenu(_T(""), wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+    wxMenu *menuView = new wxMenu("", wxMENU_TEAROFF);
+    wxMenu *menuGame = new wxMenu("", wxMENU_TEAROFF);

    menuFile->Append(ID_NEW, _("&New"), _("Start a new game"));
    menuFile->Append(ID_OPEN, _("&Open..."), _("Open an existing Life pattern"));
--- a/demos/poem/wxpoem.cpp
+++ b/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(_T("X"), &xx, &yy);
+    dc->GetTextExtent("X", &xx, &yy);
    char_height = (int)yy;

    if (current_page == 0)
@@ -844,11 +844,9 @@ 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
@@ -856,12 +854,10 @@ 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.
--- a/distrib/msw/copybase.bat
+++ b/distrib/msw/copybase.bat
@@ -193,7 +193,6 @@ 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
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -843,7 +843,7 @@ gdiobj.h	WXH
 geometry.h	WXH
 gifdecod.h	WXH
 xpmdecod.h	WXH
-dbkeyg.h	WXH	Base
+dbkeyg.h	WXH
 glcanvas.h	WXH
 grid.h	WXH
 gsocket.h	WXH	Base
@@ -915,7 +915,6 @@ 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
--- a/distrib/msw/tmake/g95.t
+++ b/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 = -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+  DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
               $(DLL_BASE_LDLIBS)
 endif
@@ -141,12 +141,15 @@ DOCDIR = $(WXDIR)/docs

 # Only use the WIN32 wxDirDialog if we have a recent
 # version of Mingw32
-ifeq "$(strip $(RECENT_MINGW))" "yes"
+ifeq ($(MINGW32),1)
+  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
@@ -302,8 +305,12 @@ TIFFOBJS = $(TIFFDIR)/tif_aux.o \
 		$(TIFFDIR)/tif_write.o \
 		$(TIFFDIR)/tif_zip.o

-ifeq "$(strip $(RECENT_MINGW))" "yes"
-  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
+ifeq ($(MINGW32),1)
+  ifneq "$(_GCC295)$(_GCC3)" ""
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
+  else
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
+  endif
 else
  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
@@ -338,7 +345,7 @@ $(ARCHINCDIR)/wx:

 # Copy ALWAYS uses forward slashes now.

-$(SETUP_H): $(ARCHINCDIR)/wx $(WXDIR)/include/wx/msw/setup.h
+$(SETUP_H): $(ARCHINCDIR)/wx
 	$(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)

 #	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
@@ -357,12 +364,11 @@ else
 ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"

 $(WXDLL): $(OBJECTS) $(EXTRAOBJS)
-	$(CXX) -shared -o $@ \
+	$(CC) -shared -o $@ \
 	  -Wl,--output-def,$(WXDEF) \
 	  -Wl,--out-implib,$(WXLIB) \
 	  $(OBJECTS) $(EXTRAOBJS) \
-	  $(DLL_LDFLAGS) $(DLL_LDLIBS) \
-      $(ALL_LDFLAGS_DLL)
+	  $(DLL_LDFLAGS) $(DLL_LDLIBS)
 else

 ifeq ($(MINGW32),1)
@@ -383,11 +389,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) $(ALL_LDFLAGS_DLL)
+	$(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF)
 	$(DLLTOOL) $(DLL_STUFF)
-	$(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)
+	$(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF)
 	$(DLLTOOL) $(DLL_STUFF)
-	$(CC) -mdll wx.exp -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)
+	$(CC) -mdll wx.exp -o $@ $(LD_STUFF)
 	-$(RM) wx.base
 	-$(RM) wx.exp

@@ -418,7 +424,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 $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+	$(CCLEX) -c $(CPPFLAGS) -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
--- a/distrib/msw/tmake/vc.t
+++ b/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 1 if you are using MSVC 5
+# Set to 0 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 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 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)
 <<

 !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
-	-erase $(DOCDIR)\htmlhelp\wx.chm
-	move wx.chm ..\..\htmlhelp
+    -mkdir ..\..\htmlhelp
+    -erase $(DOCDIR)\htmlhelp\wx.chm
+    move wx.chm ..\..\htmlhelp
 	cd $(THISDIR)

 $(WXDIR)\docs\latex\wx\manual.dvi:	$(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
--- a/distrib/msw/tmake/vc6base.t
+++ b/distrib/msw/tmake/vc6base.t
@@ -7,8 +7,6 @@
 #! Version: $Id$
 #!#############################################################################
 #${
-    use wxVersion qw(GetVersion);
-
    #! include the code which parses filelist.txt file and initializes
    #! %wxCommon, %wxGeneric and %wxMSW hashes.
    IncludeTemplate("filelist.t");
@@ -46,12 +44,7 @@
 	$project{"WXMSWHEADERS"} .= $file . " "
    }

-    #! 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";
+    $project{"WXVERSION"} = "233";
 #$}
 # Microsoft Developer Studio Project File - Name="wxBase" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -113,8 +106,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{"DLL_VERSION"} . '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"'
+# 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 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"'

 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug Unicode DLL"

@@ -139,8 +132,9 @@ 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{"DLL_VERSION"} . '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"'
+# 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 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"'
+
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release Unicode"

 # PROP BASE Use_MFC 0
@@ -210,8 +204,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{"DLL_VERSION"} . '.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"'
+# 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 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"'

 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug DLL"

@@ -236,8 +230,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{"DLL_VERSION"} . '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"'
+# 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 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"'

 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release"

--- a/distrib/msw/tmake/vc6msw.t
+++ b/distrib/msw/tmake/vc6msw.t
@@ -9,8 +9,6 @@
 #! Version: $Id$
 #!#############################################################################
 #${
-    use wxVersion qw(GetVersion);
-
    #! include the code which parses filelist.txt file and initializes
    #! %wxCommon, %wxGeneric and %wxMSW hashes.
    IncludeTemplate("filelist.t");
@@ -62,12 +60,7 @@
 	$project{"WXHTMLHEADERS"} .= $file . " "
    }

-    #! 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";
+    $project{"WXVERSION"} = "233";
 #$}
 # Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -129,8 +122,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{"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 #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxmsw' . $project{DLL_VERSION} . '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{"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 /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'u.dll"'

 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"

@@ -155,8 +148,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{"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 #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxmsw' . $project{DLL_VERSION} . '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{"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 /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'ud.dll"'

 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"

@@ -227,8 +220,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{"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 #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxmsw' . $project{DLL_VERSION} . '.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{"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 /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . '.dll"'

 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"

@@ -253,8 +246,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{"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 #$ $text = '/version:' . $project{LINK_VERSION} . ' /dll /machine:I386 /out:"../lib/wxmsw' . $project{DLL_VERSION} . '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{"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 /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'd.dll"'

 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"

@@ -343,46 +336,15 @@ 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 ""
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -2,10 +2,13 @@
 #! 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
@@ -46,7 +49,7 @@
        #! these files don't compile
        next if $file =~ /^pnghand\./;

-        next if $wxMSW{$file} =~ /\b16\b/;
+#!        next if $wxGeneric{$file} =~ /\b16\b/;

        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
        my $isCFile = $file =~ /\.c$/;
@@ -68,9 +71,25 @@
 # 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.

-LIBTARGET   = $(WXDIR)\lib\$(LIBNAME).lib
+WXDIR = ..\..
+
+!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
@@ -84,42 +103,44 @@ HTMLDIR=$(WXDIR)\src\html

 DOCDIR = $(WXDIR)\docs

-GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
+GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "", " &\n\t")

 # 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", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
+NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "", " &\n\t")

 COMMONOBJS = &
-	$(OUTPUTDIR)\y_tab.obj &
-	#$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
+	y_tab.obj &
+	#$ ExpandGlue("WXCOMMONOBJS", "", " &\n\t")

-MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
+MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")

-HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
+HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "", " &\n\t")

 # 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) $(OUTPUTDIR) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+all:        $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC

 $(ARCHINCDIR)\wx:
-	mkdir $(ARCHINCDIR)
-	mkdir $(ARCHINCDIR)\wx
-
-$(OUTPUTDIR):
-	@if not exist $^@ mkdir $^@
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx

 $(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 $(LBCFILE)
-    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    wlib /b /c /n $(LIBPAGESIZE) $^@ @$(LBCFILE)
+    %create tmp.lbc
+    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+    wlib /b /c /n /p=512 $^@ @tmp.lbc
+
+#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)
@@ -135,7 +156,7 @@ cleanall:   clean
    $_ = $project{"WXMSWOBJS"};
    my @objs = split;
    foreach (@objs) {
-        $text .= "\$(OUTPUTDIR)\\" . $_ . ':     $(';
+        $text .= $_ . ':     $(';
        s/\.obj$//;
        if ( $project{"WXOLEOBJS"} =~ /\b\Q$_\E\b/ ) {
            $text .= 'OLEDIR)\\';
@@ -146,15 +167,13 @@ cleanall:   clean
        if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
            $suffix = "c";
            $cc="CC";
-            $flags="CFLAGS";
        }
        else {
            $suffix = "cpp";
-            $cc="CXX";
-            $flags="CXXFLAGS";
+            $cc="CCC";
        }
        $text .= $_ . ".$suffix\n" .
-                 "  *\$($cc) \$($flags) \$<" . "\n\n";
+                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
    }
 #$}

@@ -165,27 +184,27 @@ cleanall:   clean
    $_ = $project{"WXCOMMONOBJS"};
    my @objs = split;
    foreach (@objs) {
-        $text .= "\$(OUTPUTDIR)\\" . $_;
+        $text .= $_;
        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";
+            $cc="CCC";
        }
        $text .= $_ . ".$suffix\n" .
-                 "  *\$($cc) \$($flags) \$<" . "\n\n";
+                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
    }
 #$}

-$(OUTPUTDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-  *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
+y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) -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
@@ -201,11 +220,11 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
    $_ = $project{"WXGENERICOBJS"};
    my @objs = split;
    foreach (@objs) {
-        $text .= "\$(OUTPUTDIR)\\" . $_;
+        $text .= $_;
        s/\.obj$//;
        $text .= ':     $(GENDIR)\\';
        $text .= $_ . ".cpp\n" .
-                 '  *$(CXX) $(CXXFLAGS) $<' . "\n\n";
+                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
    }
 #$}

@@ -217,11 +236,11 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
    $_ = $project{"WXHTMLOBJS"};
    my @objs = split;
    foreach (@objs) {
-        $text .= "\$(OUTPUTDIR)\\" . $_;
+        $text .= $_;
        s/\.obj$//;
        $text .= ':     $(HTMLDIR)\\';
        $text .= $_ . ".cpp\n" .
-                 '  *$(CXX) $(CXXFLAGS) $<' . "\n\n";
+                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
    }
 #$}

--- a/distrib/msw/tmake/watbase.t
+++ b/distrib/msw/tmake/watbase.t
@@ -1,183 +0,0 @@
-#!#############################################################################
-#! 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
--- a/distrib/msw/tmake/wxVersion.pm
+++ b/distrib/msw/tmake/wxVersion.pm
@@ -1,53 +0,0 @@
-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;
-}
-
--- a/docs/changes.txt
+++ b/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
+  but is created as part of the build process under lib/<toolkit>/wx/include
  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[ver][u][d].(lib|dll)
+  use the following consistent naming convention: wxmsw[u][d][ver].(lib|dll)
  where 'u' appears for Unicode version, 'd' -- for the debug one and version
  is only present for the DLLs builds.

@@ -170,31 +170,6 @@ 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
 -----

@@ -228,12 +203,10 @@ 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:
--- a/docs/latex/wx/category.tex
+++ b/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 Logging features}}
+{\large {\bf Debugging features}}

 \overview{Overview}{wxlogoverview}

-wxWindows provides several classes and functions for message logging.
+wxWindows provides several classes and functions for the message logging.
 Please see the \helpref{wxLog overview}{wxlogoverview} for more details.

 \twocolwidtha{6cm}
--- a/docs/latex/wx/combobox.tex
+++ b/docs/latex/wx/combobox.tex
@@ -37,8 +37,6 @@ 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}
--- a/docs/latex/wx/encconv.tex
+++ b/docs/latex/wx/encconv.tex
@@ -5,20 +5,9 @@

 \section{\class{wxEncodingConverter}}\label{wxencodingconverter}

-This class is capable of converting strings between two
+This class is capable of converting strings between any 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). 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}).
+if you compiled wxWindows with wxUSE\_WCHAR\_T set to 1).

 \wxheading{Derived from}

--- a/docs/latex/wx/filedlg.tex
+++ b/docs/latex/wx/filedlg.tex
@@ -38,13 +38,6 @@ 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}
@@ -65,10 +58,7 @@ 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".
-
-Note that the native Motif dialog has some limitations with respect to
-wildcards; see the Remarks section above.}
+\docparam{wildcard}{A wildcard, such as ``*.*" or ``BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif".}

 \docparam{style}{A dialog style. A bitlist of:

@@ -202,9 +192,6 @@ 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}
--- a/docs/latex/wx/fontmap.tex
+++ b/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 wxMBConv classes}
+\wxheading{Using wxFontMapper in conjunction with wxEncodingConverter}

 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{wxMBConv classes}{mbconvclasses}).
+(\helpref{wxEncodingConverter::Convert}{wxencodingconverterconvert}).

 Following code snippet demonstrates it:

@@ -41,9 +41,11 @@ if (!wxFontMapper::Get()->IsEncodingAvailable(enc, facename))
   if (wxFontMapper::Get()->GetAltForEncoding(enc, &alternative,
                                              facename, FALSE))
   {
-       wxCSConv convFrom(wxFontMapper::Get()->GetEncodingName(enc));
-       wxCSConv convTo(wxFontMapper::Get()->GetEncodingName(alternative));
-       text = wxString(text.mb_str(convFrom), convTo);
+       wxEncodingConverter encconv;
+       if (!encconv.Init(enc, alternative))
+           ...failure...
+       else
+           text = encconv.Convert(text);
   }
   else
       ...failure (or we may try iso8859-1/7bit ASCII)...
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -397,6 +397,12 @@ 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}
@@ -440,12 +446,6 @@ 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.ConvertToImage();
+        wxImage image(bmp);
        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 }{green}, \param{unsigned char }{blue}}
+\func{void}{SetMaskColour}{\param{unsigned char }{red}, \param{unsigned char }{blue}, \param{unsigned char }{green}}

 Sets the mask colour for this image (and tells the image to use the mask).

--- a/docs/latex/wx/pagedlg.tex
+++ b/docs/latex/wx/pagedlg.tex
@@ -50,13 +50,13 @@ Destructor.

 Returns the \helpref{page setup data}{wxpagesetupdialogdata} associated with the dialog.

-%\membersection{wxPageSetupDialog::Ok}\label{wxpagesetupdialogok}
-%
-%\constfunc{bool}{Ok}{\void}
-%
-%Returns TRUE if the print data associated with the dialog data is valid.
-%This can return FALSE on Windows if the current printer is not set, for example.
-%On all other platforms, it returns TRUE.
+\membersection{wxPageSetupDialog::Ok}\label{wxpagesetupdialogok}
+
+\constfunc{bool}{Ok}{\void}
+
+Returns TRUE if the print data associated with the dialog data is valid.
+This can return FALSE on Windows if the current printer is not set, for example.
+On all other platforms, it returns TRUE.

 \membersection{wxPageSetupDialog::ShowModal}\label{wxpagesetupdialogshowmodal}

@@ -250,7 +250,7 @@ selected printer properties. Windows only. Units are in millimetres

 \membersection{wxPageSetupDialogData::SetMarginTopLeft}\label{wxpagesetupdialogdatasetmargintopleft}

-\func{void}{SetMarginTopLeft}{\param{const wxPoint\& }{pt}}
+\func{void}{GetMarginTopLeft}{\param{const wxPoint\& }{pt}}

 Sets the left (x) and top (y) margins in millimetres.

--- a/docs/latex/wx/print.tex
+++ b/docs/latex/wx/print.tex
@@ -119,7 +119,7 @@ printer should be used.

 \membersection{wxPrintData::GetQuality}\label{wxprintdatagetquality}

-\constfunc{wxPrintQuality}{GetQuality}{\void}
+\constfunc{wxPaperQuality}{GetQuality}{\void}

 Returns the current print quality. This can be a positive integer, denoting the number of dots per inch, or
 one of the following identifiers:
@@ -264,7 +264,7 @@ printer should be used.

 \membersection{wxPrintData::SetQuality}\label{wxprintdatasetquality}

-\func{void}{SetQuality}{\param{wxPrintQuality}{ quality}}
+\func{void}{SetQuality}{\param{wxPaperQuality}{ quality}}

 Sets the desired print quality. This can be a positive integer, denoting the number of dots per inch, or
 one of the following identifiers:
--- a/docs/latex/wx/sashwin.tex
+++ b/docs/latex/wx/sashwin.tex
@@ -203,5 +203,5 @@ Call this function to give the sash a border, or remove the border.

 \wxheading{See also}

-\helpref{wxSashWindow::HasBorder}{wxsashwindowhasborder}
+\helpref{wxSashWindow::HashBorder}{wxsashwindowhasborder}

--- a/docs/latex/wx/tbitmap.tex
+++ b/docs/latex/wx/tbitmap.tex
@@ -18,16 +18,18 @@ version of the graphic which appears on the main window.

 See \helpref{wxMemoryDC}{wxmemorydc} for an example of drawing onto a bitmap.

-All wxWindows platforms support XPMs for small bitmaps and icons.
-You may include the XPM inline as below, since it's C code, or you
-can load it at run-time.
+The following shows the conditional compilation required to load a
+bitmap under Unix and in Windows. The alternative is to use the string
+version of the bitmap constructor, which loads a file under Unix and a
+resource or file under Windows, but has the disadvantage of requiring the
+XPM icon file to be available at run-time.

 \begin{verbatim}
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
 #include "mondrian.xpm"
+#endif
 \end{verbatim}

-Sometimes you wish to use a .ico resource on Windows, and XPMs on
-other platforms (for example to take advantage of Windows' support for multiple icon resolutions).
 A macro, \helpref{wxICON}{wxiconmacro}, is available which creates an icon using an XPM
 on the appropriate platform, or an icon resource on Windows.

@@ -66,9 +68,8 @@ wxBitmap bmp(wxBITMAP(bmpname));
 \end{verbatim}

 You should always use wxICON and wxBITMAP macros because they work for any
-platform (unlike the code above which doesn't deal with wxMac, wxX11, ...) and
-are more short and clear than versions with {\tt \#ifdef}s. Even better,
-use the same XPMs on all platforms.
+platform (unlike the code above which doesn't deal with wxMac, wxBe, ...) and
+are more short and clear than versions with {\tt \#ifdef}s.

 \subsection{Supported bitmap file formats}\label{supportedbitmapformats}

@@ -100,7 +101,7 @@ Under wxGTK, wxBitmap may load the following formats:
 \item All formats that are supported by the \helpref{wxImage}{wximage} class.
 \end{itemize}

-Under wxMotif and wxX11, wxBitmap may load the following formats:
+Under wxMotif, wxBitmap may load the following formats:

 \begin{itemize}\itemsep=0pt
 \item XBM data and file (wxBITMAP\_TYPE\_XBM)
@@ -125,12 +126,12 @@ Under wxGTK, wxIcon may load the following formats:
 \item All formats that are supported by the \helpref{wxImage}{wximage} class.
 \end{itemize}

-Under wxMotif and wxX11, wxIcon may load the following formats:
+Under wxMotif, wxIcon may load the following formats:

 \begin{itemize}\itemsep=0pt
 \item XBM data and file (wxBITMAP\_TYPE\_XBM)
 \item XPM data and file (wxBITMAP\_TYPE\_XPM)
-\item All formats that are supported by the \helpref{wxImage}{wximage} class.
+\item All formats that are supported by the \helpref{wxImage}{wximage} class (?).
 \end{itemize}

 \wxheading{wxCursor}
@@ -151,7 +152,7 @@ to stock cursors):
 \item None (stock cursors only).
 \end{itemize}

-Under wxMotif and wxX11, wxCursor may load the following formats:
+Under wxMotif, wxCursor may load the following formats:

 \begin{itemize}\itemsep=0pt
 \item XBM data and file (wxBITMAP\_TYPE\_XBM)
@@ -167,8 +168,27 @@ have special requirements, you may wish to initialise the wxBitmap class with
 some extra handlers which you write yourself or receive from a third party.

 To add a handler object to wxBitmap, your application needs to include the header which implements it, and
-then call the static function \helpref{wxBitmap::AddHandler}{wxbitmapaddhandler}.
+then call the static function \helpref{wxBitmap::AddHandler}{wxbitmapaddhandler}. For example:

-{\bf Note:} bitmap handlers are not implemented on all platforms, and new ones rarely need
-to be implemented since wxImage can be used for loading most formats, as noted earlier.
+{\small
+\begin{verbatim}
+  #include <wx/xpmhand.h>
+  ...
+  // Initialisation
+  wxBitmap::AddHandler(new wxXPMFileHandler);
+  wxBitmap::AddHandler(new wxXPMDataHandler);
+  ...
+\end{verbatim}
+}
+
+Assuming the handlers have been written correctly, you should now be able to load and save
+XPM files using the usual wxBitmap API.
+
+{\bf Note:} bitmap handlers are not implemented on all platforms. Currently, the above is only necessary on
+Windows, to save the extra overhead of formats that may not be necessary (if you don't use them, they
+are not linked into the executable). Unix platforms have XPM capability built-in (where supported).
+
+Also, just because a handler (such as a PNG handler) is not present does not mean that
+wxBitmap does not support that file format. If wxBitmap fails to find a suitable handler,
+the file-loading capabilities of wxImage are used instead.

--- a/docs/latex/wx/tdb.tex
+++ b/docs/latex/wx/tdb.tex
@@ -341,7 +341,7 @@ to when first starting to use the classes. Throughout the steps, small
 snippets of code are provided to show the syntax of performing the step. A 
 complete code snippet is provided at the end of this overview that shows a 
 complete working flow of all these steps (see 
-\helpref{wxODBC - Sample Code}{wxodbcsamplecode1}).
+\helpref{wxODBC - Sample Code {\tt\#}1}{wxodbcsamplecode1}).

 {\bf Define datasource connection information}

@@ -938,13 +938,13 @@ The ODBC classes support for Unicode is yet in early experimental stage and
 hasn't been tested extensively. It might work for you or it might not: please
 report the bugs/problems you have encountered in the latter case.

-\subsection{wxODBC - Sample Code}\label{wxodbcsamplecode1}
+\subsection{wxODBC - Sample Code {\tt\#}1}\label{wxodbcsamplecode1}

-This is the simplest example of establishing/opening a connection to an ODBC datasource, 
+Simplest example of establishing/opening a connection to an ODBC datasource, 
 binding variables to the columns for read/write usage, opening an 
 existing table in the datasource, setting the query parameters 
 (where/orderBy/from), querying the datasource, reading each row of the 
-result set, and then cleaning up.
+result set, then cleaning up.

 NOTE: Not all error trapping is shown here, to reduce the size of the 
 code and to make it more easily readable.
--- a/docs/latex/wx/tdnd.tex
+++ b/docs/latex/wx/tdnd.tex
@@ -20,7 +20,7 @@ and identify its format(s) using the \helpref{wxDataFormat}{wxdataformat}
 class.

 To be a {\it drag source}, i.e. to provide the data which may be dragged by
-the user elsewhere, you should implement the following steps:
+user elsewhere, you should implement the following steps:

 \begin{itemize}\itemsep=0pt
 \item {\bf Preparation:} First of all, a data object must be created and
@@ -29,7 +29,7 @@ initialized with the data you wish to drag. For example:
 \begin{verbatim}
 	wxTextDataObject my_data("This text will be dragged.");
 \end{verbatim}
-\item{\bf Drag start:} To start the dragging process (typically in response to a
+\item{\bf Drag start:} To start dragging process (typically in response to a
 mouse click) you must call \helpref{wxDropSource::DoDragDrop}{wxdropsourcedodragdrop}
 like this:

@@ -38,8 +38,8 @@ like this:
 	dragSource.SetData( my_data );
 	wxDragResult result = dragSource.DoDragDrop( TRUE );
 \end{verbatim}
-\item {\bf Dragging:} The call to DoDragDrop() blocks the program until the user releases the
-mouse button (unless you override the \helpref{GiveFeedback}{wxdropsourcegivefeedback} function
+\item {\bf Dragging:} The call to DoDragDrop() blocks the program until the user release the
+mouse button (unless you override \helpref{GiveFeedback}{wxdropsourcegivefeedback} function
 to do something special). When the mouse moves in a window of a program which understands the
 same drag-and-drop protocol (any program under Windows or any program supporting the
 XDnD protocol under X Windows), the corresponding \helpref{wxDropTarget}{wxdroptarget} methods
@@ -57,28 +57,28 @@ is one of the values of {\tt wxDragResult} enum (explained \helpref{here}{wxdrop
 \end{verbatim}
 \end{itemize}

-To be a {\it drop target}, i.e. to receive the data dropped by the user you should
+To be a {\it drop target}, i.e. to receive the data dropped by user you should
 follow the instructions below:

 \begin{itemize}\itemsep=0pt
-\item {\bf Initialization:} For a window to be a drop target, it needs to have
+\item {\bf Initialization:} For a window to be drop target, it needs to have
 an associated \helpref{wxDropTarget}{wxdroptarget} object. Normally, you will
 call \helpref{wxWindow::SetDropTarget}{wxwindowsetdroptarget} during window
-creation associating your drop target with it. You must derive a class from
+creation associating you drop target with it. You must derive a class from
 wxDropTarget and override its pure virtual methods. Alternatively, you may
 derive from \helpref{wxTextDropTarget}{wxtextdroptarget} or
 \helpref{wxFileDropTarget}{wxfiledroptarget} and override their OnDropText()
 or OnDropFiles() method.
 \item {\bf Drop:} When the user releases the mouse over a window, wxWindows
-asks the associated wxDropTarget object if it accepts the data. For this,
+queries the associated wxDropTarget object if it accepts the data. For this,
 a \helpref{wxDataObject}{wxdataobject} must be associated with the drop target
 and this data object will be responsible for the format negotiation between
 the drag source and the drop target. If all goes well, then \helpref{OnData}{wxdroptargetondata} 
 will get called and the wxDataObject belonging to the drop target can get 
 filled with data.
 \item {\bf The end:} After processing the data, DoDragDrop() returns either
-wxDragCopy or wxDragMove depending on the state of the keys <Ctrl>, <Shift>
-and <Alt> at the moment of the drop. There is currently no way for the drop
+wxDragCopy or wxDragMove depending on the state of the keys (<Ctrl>, <Shift>
+and <Alt>) at the moment of drop. There is currently no way for the drop
 target to change this return code.
 \end{itemize}

--- a/docs/latex/wx/tnoneng.tex
+++ b/docs/latex/wx/tnoneng.tex
@@ -90,22 +90,24 @@ user's operating system. This is default behaviour of the

 \wxheading{Font mapping}

-You can use \helpref{wxMBConv classes}{mbconvclasses} and 
+You can use \helpref{wxEncodingConverter}{wxencodingconverter} and 
 \helpref{wxFontMapper}{wxfontmapper} to display text:

 \begin{verbatim}
 if (!wxFontMapper::Get()->IsEncodingAvailable(enc, facename))
 {
   wxFontEncoding alternative;
-   if (wxFontMapper::Get()->GetAltForEncoding(enc, &alternative,
-                                              facename, false))
+   if (wxTheFontMapper->GetAltForEncoding(enc, &alternative, 
+                                          facename, FALSE))
   {
-       wxCSConv convFrom(wxFontMapper::Get()->GetEncodingName(enc));
-       wxCSConv convTo(wxFontMapper::Get()->GetEncodingName(alternative));
-       text = wxString(text.mb_str(convFrom), convTo);
+       wxEncodingConverted encconv;
+       if (!encconv.Init(enc, alternative))
+           ...failure...
+       else
+           text = encconv.Convert(text);
   }
   else
-       ...failure (or we may try iso8859-1/7bit ASCII)...
+       ...failure...
 }
 ...display text...
 \end{verbatim}
@@ -113,10 +115,8 @@ if (!wxFontMapper::Get()->IsEncodingAvailable(enc, facename))
 \wxheading{Converting data}

 You may want to store all program data (created documents etc.) in
-the same encoding, let's say {\tt utf-8}. You can use
-\helpref{wxCSConv}{wxcsconv} class to convert data to encoding used by the
-system your application is running on (see
-\helpref{wxLocale::GetSystemEncoding}{wxlocalegetsystemencoding}).
+the same encoding, let's say windows1250. Obviously, the best way would
+be to use \helpref{wxEncodingConverter}{wxencodingconverter}.

 \wxheading{Help files}

--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -677,7 +677,7 @@ and not the eventual size of the tool button.

 \membersection{wxToolBar::SetToolClientData}\label{wxtoolbarsettoolclientdata}

-\func{void}{SetToolClientData}{\param{int }{id}, \param{wxObject* }{clientData}}
+\func{void}{GetToolClientData}{\param{wxObject* }{clientData}}

 Sets the client data associated with the tool.

--- a/docs/latex/wx/tunicode.tex
+++ b/docs/latex/wx/tunicode.tex
@@ -182,7 +182,7 @@ compile your program in ANSI mode you can still define {\tt wxUSE\_WCHAR\_T}
 to get some limited support for {\tt wchar\_t} type.

 This will allow your program to perform conversions between Unicode strings and
-ANSI ones (using \helpref{wxMBConv classes}{mbconvclasses}) 
-and construct wxString objects from Unicode strings (presumably read
+ANSI ones (\helpref{wxEncodingConverter}{wxencodingconverter} depends on this
+partially) and construct wxString objects from Unicode strings (presumably read
 from some external file or elsewhere).

--- a/docs/latex/wx/txtstrm.tex
+++ b/docs/latex/wx/txtstrm.tex
@@ -39,11 +39,8 @@ For example:

 \func{}{wxTextInputStream}{\param{wxInputStream\&}{ stream}}

-\func{}{wxTextInputStream}{\param{wxInputStream\&}{ stream}, \param{wxMBConv\&}{ conv = wxMBConvUTF8}}
-
 Constructs a text stream object from an input stream. Only read methods will
-be available. The second form is available only in Unicode mode and lets
-you set the encoding of the text.
+be available.

 \wxheading{Parameters}

@@ -142,10 +139,11 @@ and Unix in their native formats (concerning the line ending).

 \membersection{wxTextOutputStream::wxTextOutputStream}\label{wxtextoutputstreamconstr}

-\func{}{wxTextOutputStream}{\param{wxOutputStream\&}{ stream}, \param{wxEOL}{ mode = wxEOL\_NATIVE}, \param{wxMBConv\&}{ conv = wxMBConvUTF8}}
+\func{}{wxTextOutputStream}{\param{wxOutputStream\&}{ stream}, \param{wxEOL}{ mode = wxEOL\_NATIVE}}

 Constructs a text stream object from an output stream. Only write methods will
-be available. The second form is only available in Unicode mode.
+be available.
+
 \wxheading{Parameters}

 \docparam{stream}{The output stream.}
--- a/docs/latex/wx/wx.css
+++ b/docs/latex/wx/wx.css
@@ -1,6 +1,6 @@
 body
 {
-  padding: 0px 0px 0px 0px;
+  padding: 0px 0px 0px 26px;
  background: #ffffff; 
  color: #000000;
  font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -17,6 +17,7 @@ div
 h1, h2, h3, h4
 {
  font-family: Verdana, Arial, Helvetica, sans-serif;
+  margin-left: -26px;
 }
  
 h1
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -3,7 +3,7 @@ Installing wxWindows 2.4.0
 --------------------------

 This is wxWindows 2.4.0 for Microsoft Windows 9x/ME, Windows NT,
-Windows 2000 and Windows XP. This is an official release.
+Windows 2000 and Windows XP. This is an unstable development release.

 Please note that the library naming conventions for VC++
 compilation have changed after 2.3.1. This means that
@@ -63,7 +63,7 @@ General installation notes
 --------------------------

 Alter your WXWIN environment variable to point to the root directory of the
-wxWindows installation. For Cygwin or MinGW compilation, make sure WXWIN
+wxWindows installation. For Cygwin or Mingw32 compilation, make sure WXWIN
 contains only forward slashes.

 If installing from the CVS server, copy include/wx/msw/setup0.h to
@@ -154,7 +154,7 @@ Makefile notes:
  doesn't occur when using project files to build wxWindows.

  To build Unicode versions of the libraries, add UNICODE=1
-  to the nmake invocation (default is UNICODE=0). If you want to
+  to the nmake invocation ( default is UNICODE=0 ). If you want to
  be able to use Unicode version on Windows9x, you will need 
  MSLU (Microsoft Layer for Unicode) runtime DLL and import lib.
  The former can be downloaded from Microsoft, the latter is part
@@ -172,7 +172,7 @@ Makefile notes:

 To build the DLL version using makefiles:

-1. Change directory to wx\src\msw. Type 'nmake -f makefile.vc dll'
+1. Change directory to wx\src\msw. Type 'nmake -f makefile.vc dll pch'
   to make both a suitable DLL and import library, and to build a
   suitable precompiled header file for compiling applications.
   See the previous section for library names.
@@ -393,49 +393,25 @@ Borland C++Builder IDE compilation
   samples [mak for Cbuilder 1-3; bpr for v4]. Execute this in the sample
   directory, passing the name of the cpp files on the command line.

-Watcom C++ 10.6/11 and OpenWatcom compilation
---------------------------------------------
+Watcom C++ 10.6/11 compilation
+---------------------------

 1. Make sure your WXWIN variable is set, and uses the DOS short
   name form.
-2. Change directory to wx\src\msw. Type 'wmake -f makefile.wat' to
+2. Change directory to wx\src\msw. Type 'wmake -f makefile.wat all' to
   make the wxWindows core library.
-3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat'
-   to make this sample. The exe will be placed in a watcom subdirectory.
-   Repeat for other samples of interest.
-
-
-There are several makefile variables which may be modified:
-
- FINAL may be set to 1 (e.g. 'wmake -f makefile.wat FINAL=1') to build
-  the release version of the library, i.e. without debug info and with
-  optimizations enabled
-
- WATCOM_SUFFIX is appended to the names of all libraries produced by the
-  makefile -- this allows to use several compilers in the same wxWindows
-  source tree. If you only use Watcom compiler, set WATCOM_SUFFIX to nothing.
-
- OUTPUTDIR may be set to the name of the directory where you want all the
-  object files to be generated (the library files are always created in
-  %WXWIN\lib). Compilation will fail if you set it to an empty string 
-  to create them in the same directory as the source. If you change OUTPUTDIR, 
-  make sure that it does not have a trailing backslash!
-
- In the samples, you may use EXEDIR=adir to build the samples in adir. Setting
-  EXEDIR=. will build in the current directory,
-
-
-Note (1): if your installation of Watcom doesn't have odbc32.lib file and
-          you need it (i.e. you have wxUSE_ODBC=1), you can use the file
-          from lib\watcom directory. See the notes in that directory.
-
-Note (2): if variant.cpp is compiled with date/time class options, the linker
-          gives up. So the date/time option is switched off for Watcom C++.
-          Also, wxAutomationObject is not compiled with Watcom C++ 10.
-
-Note (3): if Watcom can't read the precompiled header when building a sample,
-          try deleting src\msw\watcom.pch and compiling the sample again.
+3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat all'
+   to make this sample. Repeat for other samples of interest.

+Note (1): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
+directory. See the notes in that directory.
+Note (2): if variant.cpp is compiled with date/time class
+options, the linker gives up. So the date/time option is switched
+off for Watcom C++. Also, wxAutomationObject is not compiled with
+Watcom C++.
+Note (3): if Watcom can't read the precompiled header when
+building a sample, try deleting src\msw\watcom.pch and
+compiling the sample again.

 Metrowerks CodeWarrior compilation
 ----------------------------------
@@ -492,34 +468,34 @@ Metrowerks CodeWarrior compilation
         minimal.rc and minimal.cpp and adding the files griddemo.rc and 
         griddemo.cpp.  Build and run....

-Cygwin/MinGW compilation
+Cygwin/Mingw32 compilation
 ----------------------------------

 wxWindows 2 supports Cygwin (formerly GnuWin32) betas and
-releases, and MinGW. Cygwin can be downloaded from:
+releases, and Mingw32. Cygwin can be downloaded from:

-    http://sources.redhat.com/cygwin/
+    http://sources.redhat.com/cygwin

-and MinGW from:
+and Mingw32 from:

-    http://www.mingw.org/
+    http://www.mingw.org

-Both Cygwin and MinGW can be used with the same makefiles, and both can be
-used with configure.
+Both Cygwin and MinGW can be used with the same makefiles.

-NOTE: some notes specific to old Cygwin (< 1.1.x)
-      and MinGW (< 1.0) are at the end of this section
-      (see OLD VERSIONS)
+NOTE: some notes specific to old Cygwin ( < 1.1.x )
+      and MinGW ( < 1.0 ) are at the end of this section
+      ( see OLD VERSIONS )

 There are two methods of compiling wxWindows, by using the
 makefiles provided or by using 'configure'.

-Retrieve and install the latest version of Cygwin, or MinGW, as per
+Retrieve and install the latest version of Cygwin, or Mingw32, as per
 the instructions with either of these packages.

-If using MinGW, you can download the add-on MSYS package to
+If using Mingw32, you can download the add-on MSYS package to
 provide Unix-like tools that you'll need to build wxWindows.
-If you do not want to use MSYS, then you need to download extra utilities from
+
+The solution prior to MSYS was to download extra utilities from
 ports/mingw32 on the wxWindows ftp site or CD-ROM:

  ftp://biolpc22.york.ac.uk/pub/ports/mingw32/extra.zip
@@ -554,13 +530,13 @@ NOTE: The makefile are for compilation under Cygwin, MSYS, or
 Here are the steps required using the provided makefiles:

 - Set your WXWIN variable to where wxWindows is installed.
-  *** IMPORTANT: For Cygwin/MinGW, use forward slashes in the path, not
+  *** IMPORTANT: For Cygwin/Mingw32, use forward slashes in the path, not
  backslashes.

 - Edit src/makeg95.env and set the MINGW32 variable at the top of
-  the file to either 1 (you have MinGW) or 0 (if you have
-  Cygwin); also set the MINGW32VERSION variable appropriately for your
-  GCC version.
+  the file to either 1 (you have Mingw32) or 0 (if you have
+  Cygwin). If using Mingw32, also set the MINGW32VERSION variable
+  appropriately.

 - Use the makefile.g95 files for compiling wxWindows and samples,
  e.g. to compile a debugging version of wxWindows:
@@ -595,12 +571,11 @@ Here are the steps required using the provided makefiles:
  > make -f makefile.g95 cleanall
  > make -f makefile.g95 UNICODE=1

-  Options can be combined (e.g.: UNICODE=1 FINAL=1)
+  Options can be combined ( e.g.: UNICODE=1 FINAL=1 )

  Ignore the warning about the default entry point.

- Use the 'strip' command to reduce executable/dll size (note that
-  stripping an executable/dll will remove debug information!).
+- Use the 'strip' command to reduce executable size.

 - With Cygwin, you can invoke gdb --nw myfile.exe to
  debug an executable. If there are memory leaks, they will be
@@ -619,7 +594,8 @@ system to generate appropriate makefiles, as used on Unix
 and Mac OS X systems.

 Change directory to the root of the wxWindows distribution,
-make a build directory, and run configure and make in this directory.
+make a build directory, run 'sh', and then from this shell
+run configure and make.

 For example:

@@ -635,13 +611,13 @@ For example:

 Notes:

-1. See also the Cygwin/MinGW on the web site or CD-ROM for
+1. See also the Cygwin/Mingw32 on the web site or CD-ROM for
   further information about using wxWindows with these compilers.

 2. libwx.a is 100 MB or more - but much less if compiled with no
   debug info (-g0) and level 4 optimization (-O4).

-3. If you get a link error under MinGW 2.95.2 referring to:
+3. If you get a link error under Mingw32 2.95.2 referring to:

   EnumDAdvise__11IDataObjectPP13IEnumSTATDATA@8

@@ -650,7 +626,7 @@ Notes:

   STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**) PURE;

-4. There's a bug in MinGW headers for some early distributions.
+4. There's a bug in Mingw32 headers for some early distributions.

   in include/windows32/defines.h, where it says:

@@ -669,7 +645,7 @@ Notes:
 6. If there's a problem executing the windres program, try
   commenting out RCPREPROCESSOR in makeg95.env.

-7. OpenGL support should work with MinGW as-is. However,
+7. OpenGL support should work with Mingw32 as-is. However,
   if you wish to generate import libraries appropriate either for
   the MS OpenGL libraries or the SGI OpenGL libraries, go to
   include/wx/msw/gl and use:
@@ -694,9 +670,9 @@ Notes:

 OLD VERSIONS:

- If using MinGW 2.95 and below with wxWindows 2.1 or above, you
+- If using Mingw32 2.95 and below with wxWindows 2.1 or above, you
  must hand-patch with Mingw32-gcc295.patches (located in the
-  top-level of the wxWindows 2 installation). MinGW 2.95.2
+  top-level of the wxWindows 2 installation). Mingw32 2.95.2
  and above contain the fixes already.

 - Modify the file wx/src/cygnus.bat (or mingw32.bat or mingegcs.bat)
@@ -709,7 +685,7 @@ OLD VERSIONS:
  supplied).

 - If using GnuWin32 b18, you will need to copy windres.exe
-  from e.g. the MinGW distribution, to a directory in your path.
+  from e.g. the Mingw32 distribution, to a directory in your path.

 Symantec C++ compilation
 ------------------------
--- a/docs/publicity/announce.txt
+++ b/docs/publicity/announce.txt
@@ -1,7 +1,7 @@
 Announcing wxWindows 2.4.0: a cross-platform GUI toolkit
 ----------------------------------------------------------------

-January 7th, 2003 -- the wxWindows team is pleased to announce
+January 6th, 2003 -- the wxWindows team is pleased to announce
 an official 2.4.0 release of the mature cross-platform C++
 application framework.

@@ -64,9 +64,9 @@ handlers for eading and writing many image types, resizeable panels
 and dialogs on all platforms, document/view, OpenGL support,
 HTML-based and context-sensitive help, wizards, drag and drop,
 a grid class, ODBC support, threads, sockets, container classes,
-a styled text control, and much more. An 1800-page reference manual
-is provided in HTML, MS HTML Help, WinHelp, wxWindows Help and PDF
-formats, and there are over 70 samples and demos.
+and much more. An 1800-page reference manual is provided in HTML,
+MS HTML Help, WinHelp, wxWindows Help and PDF, and there are over
+70 samples and demos.

 If you're an MFC user, you'll find many wxWindows concepts
 reassuringly familiar, while often clearer and more consistent.
--- a/docs/publicity/publicity.txt
+++ b/docs/publicity/publicity.txt
@@ -4,7 +4,7 @@ Publicity notes and ideas
 Release announcments can be made to the following
 newsgroups.

-Windows:
+Microsoft:

 comp.os.ms-windows.programmer.misc
 comp.os.ms-windows.programmer.tools
@@ -14,11 +14,8 @@ comp.os.ms-windows.programmer.win32
 comp.windows.ms.programmer
 microsoft.public.win32.programmer.tools
 microsoft.public.win32.programmer.ui
-microsoft.public.vc.3rdparty

-borland.public.cppbuilder.thirdpartytools (newsgroups.borland.com)
-
-Non-Windows:
+Non-Microsoft:

 comp.programming
 comp.os.linux.development.apps
@@ -31,7 +28,7 @@ comp.windows.x
 comp.windows.x.announce
 comp.windows.x.motif

-Note: submissions to comp.os.linux.announce must be
+Note: submissions to comp.windows.linux.announce must be
 sent to cola@stump.algebra.com, with short descr
 of software and location. See http://stump.algebra.com/~cola/
 NO CROSSPOSTING when sending to this address.
@@ -68,51 +65,6 @@ http://sal.kachinatech.com/index.shtml: SAL (Scientific Applications on Linux)
   is a collection of information and links to software that will be of interest
   to scientists and engineers.

-MacDev developers list
-
-To submit a posting to MacDev-1, mailto:press_releases@mactech.com.  To
-subscribe to MacDev-1, send mail to listserv@listmail.xplain.com with
-the SUBJECT line reading "SUBSCRIBE MACDEV-1".  To unsubscribe, the
-SUBJECT line should read "UNSUBSCRIBE MACDEV-1".
-
-ct-Newsticker : mailto:presse@ct.heise.de
-
-List of sites and addresses from tn0013.txt:
-
-a) FreshMeat:
-   - http://freshmeat.net/projects/wxwindowsgtk/
-   - username and password are "wxgtk" for logging in
-   - hit "new release" at the top
-   - follow the step by step
-
-b) wx-announce mailing list: mailto:wx-announce@lists.wxwindows.org
-
-   [where is the announcement text? TODO]
-
-c) update www.wxwindows.org
-
-d) GNOME (very effective, stays on front page for days):
-    - http://www.gnome.org/applist
-    - Search for wxWindows
-    - Update the version number
-    - Ignore the error message
-
-e) MacNN:
-   - http://www.macnn.com
-   - Contact or Contribute or something
-   - email news@macnn.com <news@macnn.com>
-
-f) MacRumors:
-   - http://www.macrumors.com
-   - Contact or Contribute or something
-
-g) Apple Developer Connection:
-    mailto: adcnews@apple.com
-
-h) LinuxDevices.com:
-    Interesting for wxUniversal.
-
-
 Shareware sites
 ----------------

@@ -136,30 +88,4 @@ PC Magazines:

 CD-ROM distributions for PC Plus, PCW

-PUBLICITY RECORD
-================
-
-The 2.4.0 release has been publicised at
-the following places:
-
-wx-users@lists.wxwindows.org
-
-comp.os.ms-windows.programmer.misc
-comp.os.ms-windows.programmer.tools.mfc
-comp.os.ms-windows.programmer.tools.misc
-comp.os.ms-windows.programmer.win32
-comp.windows.ms.programmer
-comp.os.linux.announce (pending acceptance)
-comp.sys.mac.programmer.tools
-comp.lang.c++
-comp.windows.x.announce
-microsoft.public.win32.programmer.tools
-microsoft.public.win32.programmer.ui
-microsoft.public.vc.3rdparty
-borland.public.cppbuilder.thirdpartytools
-
-news@macnn.com
-adcnews@apple.com
-presse@ct.heise.de
-press_releases@mactech.com

--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -17,6 +17,22 @@
    #pragma interface "appbase.h"
 #endif

+// ----------------------------------------------------------------------------
+// typedefs
+// ----------------------------------------------------------------------------
+
+#if (defined(__WXMSW__) && !defined(__WXMICROWIN__)) || defined (__WXPM__)
+    class WXDLLEXPORT wxApp;
+    typedef wxApp* (*wxAppInitializerFunction)();
+#else
+    // returning wxApp* won't work with gcc
+    #include "wx/object.h"
+
+    typedef wxObject* (*wxAppInitializerFunction)();
+#endif
+
+class WXDLLEXPORT wxCmdLineParser;
+
 // ----------------------------------------------------------------------------
 // headers we have to include here
 // ----------------------------------------------------------------------------
@@ -33,25 +49,6 @@

 #include "wx/build.h"

-// ----------------------------------------------------------------------------
-// typedefs
-// ----------------------------------------------------------------------------
-// Do includes first to insure that even wxBase consistently uses
-// the wxMSW case for defining wxAppInitializerFunction.
-// (otherwise, __WXMSW__ will not yet be set, if app.h is the
-//  first file to be included).
-
-#if (defined(__WXMSW__) && !defined(__WXMICROWIN__)) || defined (__WXPM__)
-    class WXDLLEXPORT wxApp;
-    typedef wxApp* (*wxAppInitializerFunction)();
-#else
-    // returning wxApp* won't work with gcc
-    #include "wx/object.h"
-
-    typedef wxObject* (*wxAppInitializerFunction)();
-#endif
-
-class WXDLLEXPORT wxCmdLineParser;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxMessageOutput;

--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -12,10 +12,10 @@
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */

 /*
-   this global setting determines what should we do if the setting FOO
+   this global setting determintes what should we do if the setting FOO
   requires BAR and BAR is not set: we can either silently define BAR
   (default, recommended) or give an error and abort (mainly useful for
-   developers only)
+   developpers only)
 */
 #define wxABORT_ON_CONFIG_ERROR

@@ -1061,7 +1061,7 @@
 #endif /* wxUSE_RADIOBTN */

 #if wxUSE_WXHTML_HELP
-#   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK
+#   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "Built in help controller can't be compiled"
 #       else
@@ -1071,8 +1071,6 @@
 #           define wxUSE_HTML 1
 #           undef wxUSE_COMBOBOX
 #           define wxUSE_COMBOBOX 1
-#           undef wxUSE_NOTEBOOK
-#           define wxUSE_NOTEBOOK 1
 #       endif
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -50,11 +50,15 @@ class WXDLLEXPORT wxDateSpan;
 // set this to the corresponding value in seconds 1/1/1970 has on your
 // systems c-runtime

-#if defined(__WXMAC__) && !defined(__DARWIN__) && __MSL__ < 0x6000
+#ifdef __WXMAC__
+#if __MSL__ < 0x6000
    #define WX_TIME_BASE_OFFSET ( 2082844800L + 126144000L )
 #else
    #define WX_TIME_BASE_OFFSET 0
 #endif
+#else
+    #define WX_TIME_BASE_OFFSET 0
+#endif
 /*
 * TODO
 *
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -118,9 +118,6 @@ enum wxStockCursor
 #ifdef __WXGTK__
    wxCURSOR_DEFAULT, // standard X11 cursor
 #endif
-#ifdef __WXMAC__
-	wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow 
-#endif
 #ifdef __X__
    // Not yet implemented for Windows
    wxCURSOR_CROSS_REVERSE,
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -328,7 +328,7 @@ protected: \
 \
        CopyHashTable( (_wxHashTable_NodeBase**)srcTable, srcBuckets, \
                       this, (_wxHashTable_NodeBase**)m_table, \
-                       (BucketFromNode)GetBucketForNode,\
+                       (BucketFromNode)&GetBucketForNode,\
                       (ProcessNode)&DummyProcessNode ); \
        free(srcTable); \
    } \
@@ -340,8 +340,8 @@ protected: \
        CopyHashTable( (_wxHashTable_NodeBase**)ht.m_table, ht.m_tableBuckets,\
                       (_wxHashTableBase2*)this, \
                       (_wxHashTable_NodeBase**)m_table, \
-                       (BucketFromNode)GetBucketForNode, \
-                       (ProcessNode)CopyNode ); \
+                       (BucketFromNode)&GetBucketForNode, \
+                       (ProcessNode)&CopyNode ); \
    } \
 };

--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -147,8 +147,6 @@ public:
    // return the new image with size width*height
    wxImage Scale( int width, int height ) const;

-    wxImage ShrinkBy( int xFactor , int yFactor ) const ;
-
    // rescales the image in place
    wxImage& Rescale( int width, int height ) { return *this = Scale(width, height); }

--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -203,7 +203,7 @@ public:
  inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }
  
  WXHMETAFILE GetPict() const;
-  void SetPict(WXHMETAFILE pict) ;
+
  bool FreeResource(bool force = FALSE);
 };
 #endif
--- a/include/wx/mac/cursor.h
+++ b/include/wx/mac/cursor.h
@@ -29,11 +29,7 @@ public:
    ~wxCursorRefData();

 protected:
-    WXHCURSOR     m_hCursor;
-    bool        m_disposeHandle;
-    bool        m_releaseHandle;
-    bool        m_isColorCursor ;
-    long        m_themeCursor ;
+    WXHCURSOR m_hCursor;
 };

 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
@@ -55,17 +51,13 @@ public:
  wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
    const char maskBits[] = NULL);

-    wxCursor(const wxImage & image) ;
-    wxCursor(const char **bits) ;
-    wxCursor(char **bits) ;
  wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
   int hotSpotX = 0, int hotSpotY = 0);

  wxCursor(int cursor_type);
  ~wxCursor();

-	bool CreateFromXpm(const char **bits) ;
-  virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }
+  virtual bool Ok() const { return (m_refData != NULL && M_CURSORDATA->m_hCursor != NULL ) ; }

  inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
  inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
@@ -75,8 +67,6 @@ public:

  void SetHCURSOR(WXHCURSOR cursor);
  inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
-private :
-    void CreateFromImage(const wxImage & image) ;
 };

 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
--- a/include/wx/mac/dnd.h
+++ b/include/wx/mac/dnd.h
@@ -43,7 +43,7 @@ class WXDLLEXPORT wxDropSource;
 // the icon 'name' from an XPM file under GTK, but will expand to something
 // else under MSW. If you don't use it, you will have to use #ifdef in the
 // application code.
-#define wxDROP_ICON(X)   wxCursor( (const char**) X##_xpm )
+#define wxDROP_ICON(name)   wxICON(name)

 //-------------------------------------------------------------------------
 // wxDropTarget
@@ -74,32 +74,19 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase
 class WXDLLEXPORT wxDropSource: public wxDropSourceBase
 {
 public:
-    // only left in for binary compatibility
    /* constructor. set data later with SetData() */
-    wxDropSource( wxWindow *win ,
-                  const wxIcon &copy ,
-                  const wxIcon &move ,
-                  const wxIcon &none );
-
-    // only left in for binary compatibility
-    /* constructor for setting one data object */
-    wxDropSource( wxDataObject& data,
-                  wxWindow *win,
-                  const wxIcon &copy ,
-                  const wxIcon &move ,
-                  const wxIcon &none );
-
    wxDropSource( wxWindow *win = (wxWindow *)NULL,
-                 const wxCursor &cursorCopy = wxNullCursor,
-                 const wxCursor &cursorMove = wxNullCursor,
-                 const wxCursor &cursorStop = wxNullCursor);
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);

    /* constructor for setting one data object */
    wxDropSource( wxDataObject& data,
                  wxWindow *win,
-                 const wxCursor &cursorCopy = wxNullCursor,
-                 const wxCursor &cursorMove = wxNullCursor,
-                 const wxCursor &cursorStop = wxNullCursor);
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);
+

    ~wxDropSource();

@@ -109,7 +96,6 @@ public:
    wxWindow*     GetWindow() { return m_window ; }
    void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
    void* GetCurrentDrag() { return m_currentDrag ; }
-	bool			MacInstallDefaultCursor(wxDragResult effect) ;
  protected :
    wxWindow        *m_window;
    void* m_currentDrag ;
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -214,10 +214,6 @@ OSStatus UMAGetHelpMenu(

 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;

-// clipboard
-
-OSStatus UMAPutScrap( Size size , OSType type , void *data ) ;
-
 // accessor helpers

 #if !TARGET_CARBON
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -10,10 +10,6 @@
            #define HAVE_W32API_H
        #endif
    #endif
-#elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H )
-    #if ( __GNUC__ > 2 )
-        #define HAVE_W32API_H
-    #endif
 #endif

 // check for MinGW/Cygwin w32api version ( releases >= 0.5, only )
@@ -52,8 +48,7 @@

 // Mingw runtime 1.0-20010604 has some missing _tXXXX functions,
 // so let's define them ourselves:
-#if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \
-    && !wxCHECK_W32API_VERSION( 1, 1 )
+#if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 )
    #ifndef _tsetlocale
      #if wxUSE_UNICODE
      #define _tsetlocale _wsetlocale
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -159,9 +159,8 @@ typedef struct tagNMLVDISPINFOW {
 #endif
 #endif

-#if ((defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__GNUWIN32__)) && !defined(HDN_GETDISPINFOW)
+#if defined(__GNUWIN32__) && !defined(HDN_GETDISPINFOW)
 #define HDN_GETDISPINFOW (HDN_FIRST-29)
-#if !wxCHECK_W32API_VERSION(2, 2)
 typedef struct {
        NMHDR hdr;
        int iItem;
@@ -172,7 +171,6 @@ typedef struct {
        LPARAM lParam;
 } NMHDDISPINFOW, *LPNMHDDISPINFOW;
 #endif
-#endif


 // ----------------------------------------------------------------------------
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -344,7 +344,7 @@ class MemoryHDC
 {
 public:
    MemoryHDC() { m_hdc = ::CreateCompatibleDC(NULL); }
-   ~MemoryHDC() { ::DeleteDC(m_hdc);                  }
+   ~MemoryHDC() { ::DeleteObject(m_hdc);              }

    operator HDC() const { return m_hdc; }

--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -161,31 +161,29 @@
 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //
-// Unicode is currently only fully supported under Windows NT/2000/XP
-// (Windows 9x doesn't support it and the programs compiled in Unicode mode
-// will not run under 9x -- but see wxUSE_UNICODE_MSLU bellow).
+// Unicode is currently only fully supported under Windows NT/2000/XP (Windows 9x
+// doesn't support it and the programs compiled in Unicode mode will not run
+// under 9x).
 //
 // Default is 0
 //
 // Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 0
-#endif
+#define wxUSE_UNICODE 0

 // Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
-// and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/Articles/mslu_announce.asp). Note that
-// you will have to modify the makefiles to include unicows.lib import library
-// as the first library (if you use MSVC, you can run the makefile with "nmake
-// MSLU=1 UNICODE=1" command).
+// and be able to run compiled apps under Windows 9x as well as NT/2000/XP. This
+// setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
+// http://www.microsoft.com/globaldev/Articles/mslu_announce.asp). Note that you
+// will have to modify the makefiles to include unicows.lib import library as the first
+// library (if you use MSVC, you can run the makefile with "nmake MSLU=1 UNICODE=1"
+// command).
 //
 // If your compiler doesn't have unicows.lib, you can get a version of it at
 // http://libunicows.sourceforge.net
 //
 // Default is 0
 //
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
+// Recommended setting: 0
 #define wxUSE_UNICODE_MSLU 0

 // Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
@@ -1064,7 +1062,7 @@
 // ----------------------------------------------------------------------------

 #ifndef wxUSE_NORLANDER_HEADERS
-#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
+#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
 #   define wxUSE_NORLANDER_HEADERS 1
 #else
 #   define wxUSE_NORLANDER_HEADERS 0
--- a/Show More
+++ b/Show More