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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_3_4@17994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
added arrow cursor for standard controls
2002-11-28 13:34:28 +00:00 · 2002-09-15 18:32:49 +00:00 · 2002-09-15 18:17:32 +00:00
640 changed files with 21407 additions and 33972 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -391,23 +391,11 @@ afminstall: preinstall
 	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
 	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
 	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-
+        
 m4datainstall: preinstall
 	$(INSTALL) -d $(datadir)/aclocal
 	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal

-win32install: preinstall
-	$(INSTALL) -d $(includedir)/wx/msw
-	$(INSTALL) -d $(includedir)/wx/msw/gnuwin32
-	$(INSTALL) -d $(includedir)/wx/msw/gnuwin32/gl
-	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/*.cur \
-			$(top_srcdir)/include/wx/msw/*.ico \
-			$(top_srcdir)/include/wx/msw/*.bmp \
-			$(top_srcdir)/include/wx/msw/wx.rc \
-				$(includedir)/wx/msw
-	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/*.h $(includedir)/wx/msw/gnuwin32
-	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/gl/*.h $(includedir)/wx/msw/gnuwin32/gl
-
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
 preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
@@ -474,7 +462,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
 	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@

-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
 	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@@ -505,7 +493,7 @@ uninstall:
 	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
 	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
 	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*
-	# FIXME: wxBase doesnt install these next 3 dirs.
+# FIXME: wxBase doesnt install these next 3 dirs.
 	@-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm
 	@-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm
 	@-rmdir $(datadir)/wx/$(VER_MAJMIN)
@@ -514,7 +502,6 @@ uninstall:
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(RM) $(includedir)/wx/$$p; \
 	done
-	# TODO: uninstall the files installed by win32install
 	@echo " Removing i18n files..."
 	@-for p in $(WX_LINGUAS); do \
 	  $(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
@@ -594,8 +581,7 @@ ALL_GUI_DIST: ALL_DIST
 	if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
 	  cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
 	cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt
-	if test -f $(DOCDIR)/$(TOOLKITDIR)/todo.txt ; then \
-	  cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt ; fi
+	cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
@@ -800,20 +786,10 @@ UNIV_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/univ
 	mkdir $(DISTDIR)/src/univ/themes
 	cp $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ
-	cp $(INCDIR)/wx/univ/setup0.h $(DISTDIR)/include/wx/univ/setup.h
 	cp $(SRCDIR)/univ/files.lst $(DISTDIR)/src/univ
 	cp $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
 	cp $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes

-MGL_DIST: UNIV_DIST
-	cp $(WXDIR)/wxMGL.spec $(DISTDIR)
-	cp $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
-	cp $(SRCDIR)/mgl/files.lst $(DISTDIR)/src/mgl
-	cp $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
-	cp $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
-	mkdir $(DISTDIR)/contrib
-	cp -R $(WXDIR)/contrib $(DISTDIR)
-
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
@@ -869,13 +845,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/configure $(DISTDIR)/samples
 	cp $(SAMPDIR)/configure.in $(DISTDIR)/samples

-	mkdir $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/Makefile.in $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/makefile.unx $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/*.cpp $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/*.h $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/*.xpm $(DISTDIR)/samples/artprov
-
 	mkdir $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
@@ -1052,7 +1021,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/*.mms $(DISTDIR)/samples/image
-	cp $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image
+	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image

@@ -1087,10 +1056,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
 	cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest

-	mkdir $(DISTDIR)/samples/keyboard
-	cp $(SAMPDIR)/keyboard/Makefile.in $(DISTDIR)/samples/keyboard
-	cp $(SAMPDIR)/keyboard/*.cpp $(DISTDIR)/samples/keyboard
-
 	mkdir $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
@@ -1148,11 +1113,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/mobile/wxedit/Makefile.in $(DISTDIR)/samples/mobile/wxedit
 	cp $(SAMPDIR)/mobile/wxedit/*.cpp $(DISTDIR)/samples/mobile/wxedit
 	cp $(SAMPDIR)/mobile/wxedit/*.h $(DISTDIR)/samples/mobile/wxedit
-	mkdir $(DISTDIR)/samples/mobile/styles
-	cp $(SAMPDIR)/mobile/styles/Makefile.in $(DISTDIR)/samples/mobile/styles
-	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
@@ -1348,18 +1308,6 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
 	cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src

-	mkdir $(DISTDIR)/utils/emulator
-	mkdir $(DISTDIR)/utils/emulator/src
-	mkdir $(DISTDIR)/utils/emulator/docs
-	cp $(UTILSDIR)/emulator/*.in $(DISTDIR)/utils/emulator
-	cp $(UTILSDIR)/emulator/src/*.h $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/src/*.in $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/src/*.cpp $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/src/*.jpg $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/src/*.wxe $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs
-	cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
-
 	mkdir $(DISTDIR)/utils/makegen
 	mkdir $(DISTDIR)/utils/makegen/templates
 	cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen
@@ -1374,29 +1322,7 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
 	cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src

-	mkdir $(DISTDIR)/utils/dialoged
-	mkdir $(DISTDIR)/utils/dialoged/src
-	mkdir $(DISTDIR)/utils/dialoged/src/bitmaps
-	mkdir $(DISTDIR)/utils/dialoged/docs
-	cp $(UTILSDIR)/dialoged/Makefile.in $(DISTDIR)/utils/dialoged
-	cp $(UTILSDIR)/dialoged/src/*.h $(DISTDIR)/utils/dialoged/src
-	cp $(UTILSDIR)/dialoged/src/*.cpp $(DISTDIR)/utils/dialoged/src
-	cp $(UTILSDIR)/dialoged/src/Makefile.in $(DISTDIR)/utils/dialoged/src
-	cp $(UTILSDIR)/dialoged/src/makefile.unx $(DISTDIR)/utils/dialoged/src
-	cp $(UTILSDIR)/dialoged/src/bitmaps/*.xpm $(DISTDIR)/utils/dialoged/src/bitmaps
-	cp $(UTILSDIR)/dialoged/docs/*.tex $(DISTDIR)/utils/dialoged/docs
-	cp $(UTILSDIR)/dialoged/docs/*.ini $(DISTDIR)/utils/dialoged/docs
-	cp $(UTILSDIR)/dialoged/docs/*.gif $(DISTDIR)/utils/dialoged/docs
-
-	mkdir $(DISTDIR)/utils/helpview
-	mkdir $(DISTDIR)/utils/helpview/src
-	mkdir $(DISTDIR)/utils/helpview/src/bitmaps
-	cp $(UTILSDIR)/helpview/Makefile.in $(DISTDIR)/utils/helpview
-	cp $(UTILSDIR)/helpview/src/*.h $(DISTDIR)/utils/helpview/src
-	cp $(UTILSDIR)/helpview/src/*.cpp $(DISTDIR)/utils/helpview/src
-	cp $(UTILSDIR)/helpview/src/Makefile.in $(DISTDIR)/utils/helpview/src
-	cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src
-	cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
+	cp -R $(UTILSDIR)/dialoged $(DISTDIR)/utils/dialoged

 MISC_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/misc
@@ -1503,11 +1429,6 @@ dist-only:

 dist: @GUIDIST@
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@# now prune away a lot of the crap included by using cp -R
-	@# in other dist targets.
-	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
-			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-			-print0 | xargs -0 rm -rf
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -397,17 +397,15 @@ AC_DEFUN([WX_VERSIONED_SYMBOLS],
 [
  found_versioning=no

-  dnl FIXME - doesn't work, Solaris linker doesn't accept wildcards
-  dnl         in the script.
-  dnl dnl Check for known non-gcc cases:
-  dnl case "${host}" in
-  dnl   *-*-solaris2* )
-  dnl     if test "x$GCC" != "xyes" ; then
-  dnl         LDFLAGS_VERSIONING="-M $1"
-  dnl         found_versioning=yes
-  dnl     fi
-  dnl   ;;
-  dnl esac
+  dnl Check for known non-gcc cases:
+  case "${host}" in
+    *-*-solaris2* )
+      if test "x$GCC" != "xyes" ; then
+          LDFLAGS_VERSIONING="-M $1"
+          found_versioning=yes
+      fi
+    ;;
+  esac
  
  dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
  if test $found_versioning = no ; then
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5

 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -409,17 +409,15 @@ AC_DEFUN([WX_VERSIONED_SYMBOLS],
 [
  found_versioning=no

-  dnl FIXME - doesn't work, Solaris linker doesn't accept wildcards
-  dnl         in the script.
-  dnl dnl Check for known non-gcc cases:
-  dnl case "${host}" in
-  dnl   *-*-solaris2* )
-  dnl     if test "x$GCC" != "xyes" ; then
-  dnl         LDFLAGS_VERSIONING="-M $1"
-  dnl         found_versioning=yes
-  dnl     fi
-  dnl   ;;
-  dnl esac
+  dnl Check for known non-gcc cases:
+  case "${host}" in
+    *-*-solaris2* )
+      if test "x$GCC" != "xyes" ; then
+          LDFLAGS_VERSIONING="-M $1"
+          found_versioning=yes
+      fi
+    ;;
+  esac
  
  dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
  if test $found_versioning = no ; then
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.

-timestamp='2002-11-30'
+timestamp='2002-09-03'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -109,7 +109,7 @@ trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
 ,,)    echo "int x;" > $dummy.c ;
 	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	  if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
@@ -178,18 +178,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		;;
 	esac
 	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
@@ -268,7 +257,7 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
 		case `$dummy` in
 			0-0)
@@ -448,7 +437,7 @@ EOF
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
+	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
 	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
 	rm -f $dummy.c $dummy && rmdir $tmpdir
@@ -460,7 +449,7 @@ EOF
    Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
 	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+    Night_Hawk:*:*:PowerMAX_OS)
 	echo powerpc-harris-powermax
 	exit 0 ;;
    Night_Hawk:Power_UNIX:*:*)
@@ -535,7 +524,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
 		rm -f $dummy.c $dummy && rmdir $tmpdir
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -634,7 +623,7 @@ EOF
                  exit (0);
              }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
 		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
 		    rm -f $dummy.c $dummy && rmdir $tmpdir
 		fi ;;
@@ -672,7 +661,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
 	rm -f $dummy.c $dummy && rmdir $tmpdir
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -780,16 +769,13 @@ EOF
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
    x86:Interix*:3*)
-	echo i586-pc-interix3
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
+	echo i386-pc-interix3
 	exit 0 ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
+	echo i386-pc-interix
 	exit 0 ;;
    i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
@@ -833,27 +819,7 @@ EOF
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	rm -f $dummy.c && rmdir $tmpdir
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
 	;;
    ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -966,23 +932,6 @@ EOF
        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1017,6 +966,9 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
    pc:*:*:*)
 	# Left here for compatibility:
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1043,12 +995,9 @@ EOF
    mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
 	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1065,6 +1014,9 @@ EOF
    mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
    TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1182,6 +1134,11 @@ EOF
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
    *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
 	exit 0 ;;
@@ -1200,6 +1157,12 @@ EOF
    *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1320,7 +1283,7 @@ main ()
 }
 EOF

-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
 rm -f $dummy.c $dummy && rmdir $tmpdir

 # Apollos put the system type in the environment.
--- a/1216
+++ b/1216
--- a/configure.in
+++ b/configure.in
@@ -47,15 +47,15 @@ dnl The resulting library name will be of the form:
 dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)

 WX_MAJOR_VERSION_NUMBER=2
-WX_MINOR_VERSION_NUMBER=4
-WX_RELEASE_NUMBER=0
+WX_MINOR_VERSION_NUMBER=3
+WX_RELEASE_NUMBER=4

 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER

 WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER

-WX_CURRENT=0
+WX_CURRENT=2
 WX_REVISION=0
 WX_AGE=0

@@ -1130,6 +1130,27 @@ else
    AC_MSG_RESULT(base ($host_alias hosted) only)
 fi

+dnl ---------------------------------------------------------------------------
+dnl When we are using gcc on OS/2, we want to be either using resources (PM)
+dnl or a more complete POSIX emulation for Motif/GTK+/X11
+dnl ---------------------------------------------------------------------------
+dnl (OS/2-only piece)
+case "${host}" in
+  *-pc-os2_emx | *-pc-os2-emx )
+      dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
+      LIBS="$LIBS -lstdcpp"
+      if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
+          dnl More complete Unix emulation for unix-like ports
+          dnl by linking in POSIX/2's cExt (if available).
+          AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
+      else
+          dnl Include resources for the "native" port (wxPM).
+          RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
+      fi
+  ;;
+esac
+dnl (end of OS/2-only piece)
+
 dnl ---------------------------------------------------------------------------
 dnl When we are using Cygwin with Motif/GTK+, we want it to appear like
 dnl 'just' a POSIX platform, so the Win32 API must not be available
@@ -1339,27 +1360,6 @@ AC_PROG_LEX
 dnl needed for making link to setup.h
 AC_PROG_LN_S

-dnl ---------------------------------------------------------------------------
-dnl When we are using gcc on OS/2, we want to be either using resources (PM)
-dnl or a more complete POSIX emulation for Motif/GTK+/X11
-dnl ---------------------------------------------------------------------------
-dnl (OS/2-only piece)
-case "${host}" in
-  *-pc-os2_emx | *-pc-os2-emx )
-      dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
-      LIBS="$LIBS -lstdcpp"
-      if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
-          dnl More complete Unix emulation for unix-like ports
-          dnl by linking in POSIX/2's cExt (if available).
-          AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
-      else
-          dnl Include resources for the "native" port (wxPM).
-          RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
-      fi
-  ;;
-esac
-dnl (end of OS/2-only piece)
-
 dnl ------------------------------------------------------------------------
 dnl Check for headers
 dnl ------------------------------------------------------------------------
@@ -1697,49 +1697,13 @@ if test "$wxUSE_ZLIB" != "no" ; then
    AC_DEFINE(wxUSE_ZLIB)

    if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
-        dnl we have troubles with ancient zlib versions (e.g. 1.0.4 is known
-        dnl to not work) and although I don't know which is the minimal
-        dnl required version it's safer to test for 1.1.4 as it fixes a
-        dnl security problem in 1.1.3 -- and hopefully nobody has anything
-        dnl more ancient (1.1.3 was released in July 1998) anyow
-        AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
-            AC_TRY_RUN(
-                [
-                    dnl zlib.h defines ZLIB_VERSION="x.y.z"
-                    #include <zlib.h>
-                    #include <stdio.h>
-
-                    dnl don't use the brackets as quotes, we need them
-                    changequote(,)
-                    int main()
-                    {
-                        FILE *f=fopen("conftestval", "w");
-                        if (!f) exit(1);
-                        fprintf(f, "%s",
-                                ZLIB_VERSION[0] == '1' &&
-                                (ZLIB_VERSION[2] > '1' ||
-                                (ZLIB_VERSION[2] == '1' &&
-                                 ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
-                        exit(0);
-                    }
-                    changequote([,])
-                ],
-                ac_cv_header_zlib_h=`cat conftestval`,
-                ac_cv_header_zlib_h=no,
-                dnl cross-compiling: test if we have any zlib.h
-                AC_CHECK_HEADER(zlib.h)
-            )
-        )
-
-        if test "$ac_cv_header_zlib_h" = "yes"; then
-            AC_CHECK_LIB(z, deflate, ZLIB_LINK=" -lz")
-        fi
+        AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, deflate, ZLIB_LINK=" -lz"))

        if test "x$ZLIB_LINK" = "x" ; then
            if test "$wxUSE_ZLIB" = "sys" ; then
-                AC_MSG_ERROR([zlib library not found or too old! Use --with-zlib=builtin to use built-in version])
+                AC_MSG_ERROR([system zlib compression library not found! Use --with-zlib=builtin to use built-in version])
            else
-                AC_MSG_WARN([zlib library not found or too old, will use built-in instead])
+                AC_MSG_WARN([system zlib compression library not found, will use built-in instead])
                wxUSE_ZLIB=builtin
            fi
        else
@@ -1778,40 +1742,18 @@ if test "$wxUSE_LIBPNG" != "no" ; then
    if test "$wxUSE_MGL" != 1 ; then
        dnl Don't check for libpng when building wxMGL, libmgl contains it
        if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
-            dnl libpng version 0.9 is known to not work, if an even newer
-            dnl version is required, just bump it up in the test below
-            AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
-                AC_TRY_RUN(
-                    [
-                        dnl png.h defines PNG_LIBPNG_VER=number
-                        #include <png.h>
-                        #include <stdio.h>
-
-                        int main()
-                        {
-                            FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
-                            fprintf(f, "%s",
-                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
-                            exit(0);
-                        }
-                    ],
-                    ac_cv_header_png_h=`cat conftestval`,
-                    ac_cv_header_png_h=no,
-                    dnl cross-compiling: test if we have any png.h
-                    AC_CHECK_HEADER(png.h)
-                )
-            )
-
-            if test "$ac_cv_header_png_h" = "yes"; then
-                AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng", , [-lz -lm])
-            fi
+            AC_CHECK_HEADER(png.h,
+                            AC_CHECK_LIB(png, png_check_sig,
+                                         PNG_LINK=" -lpng",
+                                         ,
+                                         [-lz -lm])
+                           )

            if test "x$PNG_LINK" = "x" ; then
                if test "$wxUSE_LIBPNG" = "sys" ; then
-                    AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
+                    AC_MSG_ERROR([system png library not found! Use --with-libpng=builtin to use built-in version])
                else
-                    AC_MSG_WARN([system png library not found or too old, will use built-in instead])
+                    AC_MSG_WARN([system png library not found, will use built-in instead])
                    wxUSE_LIBPNG=builtin
                fi
            else
@@ -1893,24 +1835,15 @@ dnl ------------------------------------------------------------------------

 TIFF_INCLUDE=
 TIFF_LINK=
-TIFF_PREREQ_LINKS=-lm
 if test "$wxUSE_LIBTIFF" != "no" ; then
    AC_DEFINE(wxUSE_LIBTIFF)

    if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
-        dnl libtiff may depend on libjpeg and libz so use them in the test
-        dnl below or it would fail
-        if test "$wxUSE_LIBJPEG" = "sys"; then
-            TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
-        fi
-        if test "$wxUSE_ZLIB" = "sys"; then
-            TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
-        fi
        AC_CHECK_HEADER(tiffio.h,
                        AC_CHECK_LIB(tiff, TIFFError,
                                     TIFF_LINK=" -ltiff",
                                     ,
-                                     $TIFF_PREREQ_LINKS)
+                                     -lm)
                       )

        if test "x$TIFF_LINK" = "x" ; then
@@ -1936,7 +1869,6 @@ dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------

 AFMINSTALL=
-WIN32INSTALL=

 TOOLKIT=
 TOOLKIT_INCLUDE=
@@ -1992,9 +1924,6 @@ if test "$USE_WIN32" = 1 ; then

    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
    RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
-
-    dnl install Win32-specific files in "make install"
-    WIN32INSTALL=win32install
 fi

 if test "$USE_DARWIN" = 1; then
@@ -2146,7 +2075,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
        dnl FIXME_MGL - test for MGL variants for freebsd etc.
        case "${host}" in
            *-*-linux* )
-              mgl_os="linux/gcc/glibc*"
+              mgl_os=linux/gcc/glibc
              ;;
            *-pc-msdosdjgpp )
              mgl_os=dos32/dj2
@@ -5261,7 +5190,6 @@ AC_SUBST(WX_MINOR_VERSION_NUMBER)
 AC_SUBST(WX_RELEASE_NUMBER)
 AC_SUBST(WX_LIBRARY_NAME_STATIC)
 AC_SUBST(WX_LIBRARY_NAME_SHARED)
-AC_SUBST(WX_LIBRARY_BASENAME)
 AC_SUBST(WX_LIBRARY_IMPORTLIB)
 AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_LIBRARY_LINK1)
@@ -5297,7 +5225,6 @@ AC_SUBST(WXDEBUG_DEFINE)
 dnl toolkit options
 AC_SUBST(USE_GUI)
 AC_SUBST(AFMINSTALL)
-AC_SUBST(WIN32INSTALL)
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DIR)
 AC_SUBST(TOOLKIT_VPATH)
--- a/contrib/include/wx/canvas/bbox.h
+++ b/contrib/include/wx/canvas/bbox.h
@@ -21,7 +21,7 @@ class wxBoundingBox
 {
 public:
    wxBoundingBox();
-    wxBoundingBox(const wxBoundingBox&);
+    wxBoundingBox(wxBoundingBox&);
    wxBoundingBox(const wxPoint2DDouble&);
    wxBoundingBox(double xmin, double ymin, double xmax, double ymax);

--- a/contrib/include/wx/gizmos/dynamicsash.h
+++ b/contrib/include/wx/gizmos/dynamicsash.h
@@ -142,21 +142,19 @@ typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashSplit
 /*
    wxDynamicSashWindow.  See above.
 */
-extern const wxChar* GIZMODLLEXPORT wxDynamicSashWindowNameStr;
-
 class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow {
 public:
    wxDynamicSashWindow();
    wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
-                        const wxString& name = wxDynamicSashWindowNameStr);
+                        const wxString& name = "dynamicSashWindow");
    virtual ~wxDynamicSashWindow();

    virtual bool Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
-                        const wxString& name = wxDynamicSashWindowNameStr);
+                        const wxString& name = "dynamicSashWindow");
    virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
    virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;

--- a/contrib/include/wx/gizmos/multicell.h
+++ b/contrib/include/wx/gizmos/multicell.h
@@ -40,7 +40,7 @@
 enum wxResizable
 {
 	wxNOT_RESIZABLE =           0x00,
-	wxHORIZONTAL_RESIZABLE =    0x01,
+	wxHORIZENTAL_RESIZABLE =    0x01,
 	wxVERTICAL_RESIZABLE =      0x10,
 	wxRESIZABLE =               0x11
 };
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -353,7 +353,7 @@ class wxShape: public wxShapeEvtHandler
  virtual int GetRegionId(const wxString& name);

  // Construct names for regions, unique even for children of a composite.
-  virtual void NameRegions(const wxString& parentName = wxEmptyString);
+  virtual void NameRegions(const wxString& parentName = "");

  // Get list of regions
  inline wxList& GetRegions() const { return (wxList&) m_regions; }
--- a/contrib/include/wx/ogl/basicp.h
+++ b/contrib/include/wx/ogl/basicp.h
@@ -22,7 +22,7 @@ class wxShapeTextLine: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxShapeTextLine)
 public:
-   wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = wxEmptyString);
+   wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = "");
   ~wxShapeTextLine();

   inline double GetX() const { return m_x; }
--- a/contrib/include/wx/ogl/constrnt.h
+++ b/contrib/include/wx/ogl/constrnt.h
@@ -25,8 +25,7 @@ class wxOGLConstraintType: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxOGLConstraintType)
 public:
-  wxOGLConstraintType(int type = 0, const wxString& name = wxEmptyString,
-                      const wxString& phrase = wxEmptyString);
+  wxOGLConstraintType(int type = 0, const wxString& name = "", const wxString& phrase = "");
  ~wxOGLConstraintType();

 public:
@@ -61,10 +60,8 @@ class wxOGLConstraint: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxOGLConstraint)
 public:
-  wxOGLConstraint() {
-     m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0;
-     m_constraintName = wxEmptyString; m_constraintId = 0;
-     m_constrainingObject = NULL; }
+  wxOGLConstraint() { m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0; m_constraintName = ""; m_constraintId = 0;
+                        m_constrainingObject = NULL; }
  wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
  ~wxOGLConstraint();

--- a/contrib/include/wx/ogl/drawn.h
+++ b/contrib/include/wx/ogl/drawn.h
@@ -48,7 +48,7 @@ class wxPseudoMetaFile: public wxObject
  // Rotate about the given axis by theta radians from the x axis.
  void Rotate(double x, double y, double theta);

-  bool LoadFromMetaFile(const wxString& filename, double *width, double *height);
+  bool LoadFromMetaFile(char *filename, double *width, double *height);

  void GetBounds(double *minX, double *minY, double *maxX, double *maxY);

@@ -157,7 +157,7 @@ class wxDrawnShape: public wxRectangleShape
  inline double GetRotation() const { return m_rotation; }

  void SetSize(double w, double h, bool recursive = TRUE);
-  bool LoadFromMetaFile(const wxString& filename);
+  bool LoadFromMetaFile(char *filename);

  inline void SetSaveToFile(bool save) { m_saveToFile = save; }
  inline wxPseudoMetaFile& GetMetaFile(int which = 0) const { return (wxPseudoMetaFile&) m_metafiles[which]; }
--- a/contrib/include/wx/ogl/lines.h
+++ b/contrib/include/wx/ogl/lines.h
@@ -51,7 +51,7 @@ class wxArrowHead: public wxObject
 DECLARE_DYNAMIC_CLASS(wxArrowHead)

 public:
-  wxArrowHead(WXTYPE type = 0, int end = 0, double size = 0.0, double dist = 0.0, const wxString& name = wxEmptyString, wxPseudoMetaFile *mf = NULL,
+  wxArrowHead(WXTYPE type = 0, int end = 0, double size = 0.0, double dist = 0.0, const wxString& name = "", wxPseudoMetaFile *mf = NULL,
            long arrowId = -1);
  ~wxArrowHead();
  wxArrowHead(wxArrowHead& toCopy);
@@ -210,9 +210,8 @@ class wxLineShape: public wxShape

  // Add an arrowhead.
  wxArrowHead *AddArrow(WXTYPE type, int end = ARROW_POSITION_END,
-                        double arrowSize = 10.0, double xOffset = 0.0,
-                        const wxString& name = wxEmptyString,
-                        wxPseudoMetaFile *mf = NULL, long arrowId = -1);
+                double arrowSize = 10.0, double xOffset = 0.0, const wxString& name = "",
+                wxPseudoMetaFile *mf = NULL, long arrowId = -1);

  // Add an arrowhead in the position indicated by the reference
  // list of arrowheads, which contains all legal arrowheads for this
--- a/contrib/include/wx/ogl/mfutils.h
+++ b/contrib/include/wx/ogl/mfutils.h
@@ -195,7 +195,7 @@ class wxXMetaFile: public wxObject
  wxList metaRecords;
  wxList gdiObjects; // List of wxMetaRecord objects created with Create...,
                     // referenced by position in list by SelectObject
-  wxXMetaFile(const wxChar* file = NULL);
+  wxXMetaFile(char *file = NULL);
  ~wxXMetaFile(void);

  // After this is called, the metafile cannot be used for anything
@@ -204,7 +204,7 @@ class wxXMetaFile: public wxObject

  bool Play(wxDC *dc);
  inline bool Ok(void) const { return ok; }
-  bool ReadFile(const wxChar *file);
+  bool ReadFile(char *file);
 };

 #endif
--- a/contrib/include/wx/xrc/xml.h
+++ b/contrib/include/wx/xrc/xml.h
@@ -164,7 +164,7 @@ private:
 class WXXMLDLLEXPORT wxXmlDocument : public wxObject
 {
 public:
-    wxXmlDocument();
+    wxXmlDocument() : wxObject(), m_version(wxT("1.0")), m_root(NULL)  {}
    wxXmlDocument(const wxString& filename,
                  const wxString& encoding = wxT("UTF-8"));
    wxXmlDocument(wxInputStream& stream,
@@ -180,7 +180,7 @@ public:
              const wxString& encoding = wxT("UTF-8"));
    bool Load(wxInputStream& stream,
              const wxString& encoding = wxT("UTF-8"));
-    
+
    // Saves document as .xml file.
    bool Save(const wxString& filename) const;
    bool Save(wxOutputStream& stream) const;
@@ -193,7 +193,7 @@ public:
    // Returns version of document (may be empty).
    wxString GetVersion() const { return m_version; }
    // Returns encoding of document (may be empty).
-    // Note: this is the encoding original file was saved in, *not* the
+    // Note: this is the encoding original fail was saved in, *not* the
    // encoding of in-memory representation!
    wxString GetFileEncoding() const { return m_fileEncoding; }

@@ -207,7 +207,6 @@ public:
    // (same as passed to Load or ctor, defaults to UTF-8).
    // NB: this is meaningless in Unicode build where data are stored as wchar_t*
    wxString GetEncoding() const { return m_encoding; }
-    void SetEncoding(const wxString& enc) { m_encoding = enc; }
 #endif

 private:
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -58,7 +58,7 @@ class wxXmlResourceModule;
 #define WX_XMLRES_CURRENT_VERSION_MINOR            3
 #define WX_XMLRES_CURRENT_VERSION_RELEASE          0
 #define WX_XMLRES_CURRENT_VERSION_REVISION         1
-#define WX_XMLRES_CURRENT_VERSION_STRING    wxT("2.3.0.1")
+#define WX_XMLRES_CURRENT_VERSION_STRING    "2.3.0.1"

 #define WX_XMLRES_CURRENT_VERSION \
                (WX_XMLRES_CURRENT_VERSION_MAJOR * 256*256*256 + \
--- a/contrib/samples/animate/AniTestVC.dsp
+++ b/contrib/samples/animate/AniTestVC.dsp
@@ -111,7 +111,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/anitest.exe" /pdbtype:sept /libpath:"../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/anitest.exe" /pdbtype:sept /libpath:"../../../lib"

 !ELSEIF  "$(CFG)" == "AniTestVC - Win32 Release DLL"

@@ -138,7 +138,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../lib"

 !ELSEIF  "$(CFG)" == "AniTestVC - Win32 UnivRelease"

--- a/contrib/samples/canvas/simple/SimpleVC.dsp
+++ b/contrib/samples/canvas/simple/SimpleVC.dsp
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/simple.exe" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "SimpleVC - Win32 Release DLL"

@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/canvas/test/TestVC.dsp
+++ b/contrib/samples/canvas/test/TestVC.dsp
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/test.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/test.exe" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "TestVC - Win32 Release DLL"

@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/test.exe" /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/test.exe" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_demo1/fl_demo.dsp
+++ b/contrib/samples/fl/fl_demo1/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "fl_demo1 - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_demo2/fl_demo.dsp
+++ b/contrib/samples/fl/fl_demo2/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "fl_demo2 - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_sample1/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample1/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "fl_sample1 - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_sample2/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample2/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "fl_sample2 - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_sample3/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample3/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "fl_sample3 - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/gizmos/dynsash/dynsash.dsp
+++ b/contrib/samples/gizmos/dynsash/dynsash.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dynsash.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dynsash.exe" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "dynsash - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dynsash.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dynsash.exe" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
+++ b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dynsash_switch.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dynsash_switch.exe" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "dynsash_switch - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dynsash_switch.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dynsash_switch.exe" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/gizmos/editlbox/editlbox.dsp
+++ b/contrib/samples/gizmos/editlbox/editlbox.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/editlbox.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/editlbox.exe" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "editlbox - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/editlbox.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/editlbox.exe" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/gizmos/multicell/mtest.cpp
+++ b/contrib/samples/gizmos/multicell/mtest.cpp
@@ -79,7 +79,7 @@ wxFrame(frame, -1, title, pos, size, wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCRO
 		// add first row
 		sizer->Add(
 				  new wxButton( this, -1, "B1 - 0,0, horizontal resizable" ),
-				  0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZONTAL_RESIZABLE, wxSize(2,2)));
+				  0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZENTAL_RESIZABLE, wxSize(2,2)));
 		sizer->Add(
 				  new wxButton( this, -1, "B2 - 0,1, vertical resizable" ),
 				  0, 0, 0, new wxMultiCellItemHandle(0,1,1,1, wxDefaultSize, wxVERTICAL_RESIZABLE, wxSize(2, 2)));
--- a/contrib/samples/gizmos/multicell/multicell.dsp
+++ b/contrib/samples/gizmos/multicell/multicell.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mtest.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mtest.exe" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "multicell - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mtest.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mtest.exe" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/gizmos/splittree/TreeVC.dsp
+++ b/contrib/samples/gizmos/splittree/TreeVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/tree.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/tree.exe" /pdbtype:sept /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "TreeVC - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/tree.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw234.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/tree.exe" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/mmedia/MMboardVC.dsp
+++ b/contrib/samples/mmedia/MMboardVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

--- a/contrib/samples/ogl/ogledit/OGLEditVC.dsp
+++ b/contrib/samples/ogl/ogledit/OGLEditVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ENDIF 

--- a/contrib/samples/ogl/studio/StudioVC.dsp
+++ b/contrib/samples/ogl/studio/StudioVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"

--- a/contrib/samples/plot/PlotVC.dsp
+++ b/contrib/samples/plot/PlotVC.dsp
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "PlotVC - Win32 Release DLL"

@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

--- a/contrib/samples/stc/StcTestVC.dsp
+++ b/contrib/samples/stc/StcTestVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "StcTestVC - Win32 Release DLL"

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

--- a/contrib/samples/xrc/XrcDemoVC.dsp
+++ b/contrib/samples/xrc/XrcDemoVC.dsp
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Release DLL"

@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

--- a/contrib/src/canvas/bbox.cpp
+++ b/contrib/src/canvas/bbox.cpp
@@ -26,7 +26,7 @@ wxBoundingBox::wxBoundingBox()
 }


-wxBoundingBox::wxBoundingBox(const wxBoundingBox &other)
+wxBoundingBox::wxBoundingBox(wxBoundingBox &other)
 {
    m_minx = other.m_minx;
    m_miny = other.m_miny;
--- a/contrib/src/fl/Makefile.in
+++ b/contrib/src/fl/Makefile.in
@@ -19,7 +19,6 @@ HEADERS = \
            cbcustom.h \
            dynbarhnd.h \
            dyntbarhnd.h \
-            fldefs.h \
            garbagec.h \
            hintanimpl.h \
            panedrawpl.h \
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -1155,9 +1155,6 @@ void wxFrameLayout::PositionPanes()

 void wxFrameLayout::OnSize( wxSizeEvent& event )
 {
-    mpFrame->ProcessEvent( event );
-    event.Skip( FALSE ); // stop its progpagation
-
    if ( event.GetEventObject() == (wxObject*) mpFrame )
    {
        GetUpdatesManager().OnStartChanges();
--- a/contrib/src/fl/flVC.dsp
+++ b/contrib/src/fl/flVC.dsp
@@ -111,7 +111,7 @@ BSC32=bscmake.exe
 # 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 wxmsw240d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
+# 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 wxmsw234d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none

 !ELSEIF  "$(CFG)" == "flVC - Win32 Release DLL"
@@ -144,9 +144,9 @@ 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 wxmsw240d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
+# 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 wxmsw234d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.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 wxmsw240.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
+# 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 wxmsw234.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no /debug

 !ENDIF 
--- a/contrib/src/fl/newbmpbtn.cpp
+++ b/contrib/src/fl/newbmpbtn.cpp
@@ -523,7 +523,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
    }
    destDc.SelectObject( wxNullBitmap );
    
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#ifdef __WXMSW__
    // Map to system colours
    (void) wxToolBar::MapBitmap(destBmp->GetHBITMAP(), destBmp->GetWidth(), destBmp->GetHeight());
 #endif    
--- a/contrib/src/gizmos/dynamicsash.cpp
+++ b/contrib/src/gizmos/dynamicsash.cpp
@@ -29,10 +29,6 @@

 #include "wx/gizmos/dynamicsash.h"

-
-const wxChar* wxDynamicSashWindowNameStr = wxT("dynamicSashWindow");
-
-
 /*
    wxDynamicSashWindow works by internally storing a tree of Implementation
    objects (wxDynamicSsahWindowImpl) and Leaf objects
--- a/contrib/src/gizmos/multicell.cpp
+++ b/contrib/src/gizmos/multicell.cpp
@@ -321,7 +321,7 @@ void wxMultiCellSizer::RecalcSizes()
 				minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
 				minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
 			}
-			if (rect->GetStyle() & wxHORIZONTAL_RESIZABLE ||
+			if (rect->GetStyle() & wxHORIZENTAL_RESIZABLE ||
 				rect->GetWidth() > 1
 				|| m_minSizes[rect->GetColumn()]->GetWidth() < 0)
 			{
@@ -489,7 +489,7 @@ void wxMultiCellSizer :: GetMinimums()
 			// For each column, calculate the max width for those fields which are not
 			// resizable in the horizontal pane

-			if (!(rect->GetStyle() & wxHORIZONTAL_RESIZABLE || m_minSizes[col]->GetWidth() < 0))
+			if (!(rect->GetStyle() & wxHORIZENTAL_RESIZABLE || m_minSizes[col]->GetWidth() < 0))
 			{
 				if (m_minSizes[col]->GetWidth())
 				{
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@@ -286,7 +286,7 @@ wxShape::wxShape(wxShapeCanvas *can)
  m_brush = wxWHITE_BRUSH;
  m_font = g_oglNormalFont;
  m_textColour = wxBLACK;
-  m_textColourName = wxT("BLACK");
+  m_textColourName = "BLACK";
  m_visible = FALSE;
  m_selected = FALSE;
  m_attachmentMode = ATTACHMENT_MODE_NONE;
@@ -305,7 +305,7 @@ wxShape::wxShape(wxShapeCanvas *can)
  m_shadowBrush = wxBLACK_BRUSH;
  m_textMarginX = 5;
  m_textMarginY = 5;
-  m_regionName = wxT("0");
+  m_regionName = "0";
  m_centreResize = TRUE;
  m_maintainAspectRatio = FALSE;
  m_highlighted = FALSE;
@@ -319,10 +319,10 @@ wxShape::wxShape(wxShapeCanvas *can)
  // the region eventually (the duplication is for compatibility)
  wxShapeRegion *region = new wxShapeRegion;
  m_regions.Append(region);
-  region->SetName(wxT("0"));
+  region->SetName("0");
  region->SetFont(g_oglNormalFont);
  region->SetFormatMode(FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT);
-  region->SetColour(wxT("BLACK"));
+  region->SetColour("BLACK");
 }

 wxShape::~wxShape()
@@ -616,7 +616,7 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
  node = stringList->First();
  while (node)
  {
-    wxChar *s = (wxChar *)node->Data();
+    char *s = (char *)node->Data();
    wxShapeTextLine *line = new wxShapeTextLine(0.0, 0.0, s);
    region->GetFormattedText().Append((wxObject *)line);
    node = node->Next();
@@ -776,7 +776,7 @@ wxString wxShape::GetTextColour(int regionId) const
 {
  wxNode *node = m_regions.Nth(regionId);
  if (!node)
-    return wxEmptyString;
+    return wxString("");
  wxShapeRegion *region = (wxShapeRegion *)node->Data();
  return region->GetColour();
 }
@@ -794,7 +794,7 @@ wxString wxShape::GetRegionName(int regionId)
 {
  wxNode *node = m_regions.Nth(regionId);
  if (!node)
-    return wxEmptyString;
+    return wxString("");
  wxShapeRegion *region = (wxShapeRegion *)node->Data();
  return region->GetName();
 }
@@ -822,7 +822,7 @@ void wxShape::NameRegions(const wxString& parentName)
  for (int i = 0; i < n; i++)
  {
    if (parentName.Length() > 0)
-      buff << parentName << wxT(".") << i;
+      buff << parentName << "." << i;
    else
      buff << i;
    SetRegionName(buff, i);
@@ -834,7 +834,7 @@ void wxShape::NameRegions(const wxString& parentName)
    buff.Empty();
    wxShape *child = (wxShape *)node->Data();
    if (parentName.Length() > 0)
-      buff << parentName << wxT(".") << j;
+      buff << parentName << "." << j;
    else
      buff << j;
    child->NameRegions(buff);
--- a/contrib/src/ogl/basic2.cpp
+++ b/contrib/src/ogl/basic2.cpp
@@ -1761,7 +1761,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxShapeRegion, wxObject)

 wxShapeRegion::wxShapeRegion()
 {
-  m_regionText = wxEmptyString;
+  m_regionText = "";
  m_font = g_oglNormalFont;
  m_minHeight = 5.0;
  m_minWidth = 5.0;
@@ -1773,9 +1773,9 @@ wxShapeRegion::wxShapeRegion()
  m_regionProportionX = -1.0;
  m_regionProportionY = -1.0;
  m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
-  m_regionName = wxEmptyString;
-  m_textColour = wxT("BLACK");
-  m_penColour = wxT("BLACK");
+  m_regionName = "";
+  m_textColour = "BLACK";
+  m_penColour = "BLACK";
  m_penStyle = wxSOLID;
  m_actualColourObject = NULL;
  m_actualPenObject = NULL;
@@ -1897,7 +1897,7 @@ wxPen *wxShapeRegion::GetActualPen()
    return m_actualPenObject;

  if (!m_penColour) return NULL;
-  if (m_penColour == wxT("Invisible"))
+  if (m_penColour == "Invisible")
    return NULL;
  m_actualPenObject = wxThePenList->FindOrCreatePen(m_penColour, 1, m_penStyle);
  return m_actualPenObject;
--- a/contrib/src/ogl/bmpshape.cpp
+++ b/contrib/src/ogl/bmpshape.cpp
@@ -41,7 +41,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxShape)

 wxBitmapShape::wxBitmapShape():wxRectangleShape(100.0, 50.0)
 {
-  m_filename = wxEmptyString;
+  m_filename = "";
 }

 wxBitmapShape::~wxBitmapShape()
--- a/contrib/src/ogl/composit.cpp
+++ b/contrib/src/ogl/composit.cpp
@@ -827,10 +827,10 @@ wxDivisionShape::wxDivisionShape()
  m_handleSide = DIVISION_SIDE_NONE;
  m_leftSidePen = wxBLACK_PEN;
  m_topSidePen = wxBLACK_PEN;
-  m_leftSideColour = wxT("BLACK");
-  m_topSideColour = wxT("BLACK");
-  m_leftSideStyle = wxT("Solid");
-  m_topSideStyle = wxT("Solid");
+  m_leftSideColour = "BLACK";
+  m_topSideColour = "BLACK";
+  m_leftSideStyle = "Solid";
+  m_topSideStyle = "Solid";
  ClearRegions();
 }

@@ -1574,11 +1574,11 @@ bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
 class OGLPopupDivisionMenu : public wxMenu {
 public:
    OGLPopupDivisionMenu() : wxMenu() {
-        Append(DIVISION_MENU_SPLIT_HORIZONTALLY, wxT("Split horizontally"));
-        Append(DIVISION_MENU_SPLIT_VERTICALLY, wxT("Split vertically"));
+        Append(DIVISION_MENU_SPLIT_HORIZONTALLY, "Split horizontally");
+        Append(DIVISION_MENU_SPLIT_VERTICALLY, "Split vertically");
        AppendSeparator();
-        Append(DIVISION_MENU_EDIT_LEFT_EDGE, wxT("Edit left edge"));
-        Append(DIVISION_MENU_EDIT_TOP_EDGE, wxT("Edit top edge"));
+        Append(DIVISION_MENU_EDIT_LEFT_EDGE, "Edit left edge");
+        Append(DIVISION_MENU_EDIT_TOP_EDGE, "Edit top edge");
    }

    void OnMenu(wxCommandEvent& event);
@@ -1626,7 +1626,7 @@ void OGLPopupDivisionMenu::OnMenu(wxCommandEvent& event)

 void wxDivisionShape::EditEdge(int side)
 {
-  wxMessageBox(wxT("EditEdge() not implemented"), wxT("OGL"), wxOK);
+  wxMessageBox("EditEdge() not implemented", "OGL", wxOK);

 #if 0
  wxBeginBusyCursor();
--- a/contrib/src/ogl/constrnt.cpp
+++ b/contrib/src/ogl/constrnt.cpp
@@ -58,51 +58,51 @@ void OGLInitializeConstraintTypes()
    wxOGLConstraintTypes = new wxList(wxKEY_INTEGER);

    wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_VERTICALLY,
-        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_VERTICALLY, wxT("Centre vertically"), wxT("centred vertically w.r.t.")));
+        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_VERTICALLY, "Centre vertically", "centred vertically w.r.t."));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_HORIZONTALLY,
-        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_HORIZONTALLY, wxT("Centre horizontally"), wxT("centred horizontally w.r.t.")));
+        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_HORIZONTALLY, "Centre horizontally", "centred horizontally w.r.t."));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_BOTH,
-        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_BOTH, wxT("Centre"), wxT("centred w.r.t.")));
+        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_BOTH, "Centre", "centred w.r.t."));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_LEFT_OF,
-        new wxOGLConstraintType(gyCONSTRAINT_LEFT_OF, wxT("Left of"), wxT("left of")));
+        new wxOGLConstraintType(gyCONSTRAINT_LEFT_OF, "Left of", "left of"));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_RIGHT_OF,
-        new wxOGLConstraintType(gyCONSTRAINT_RIGHT_OF, wxT("Right of"), wxT("right of")));
+        new wxOGLConstraintType(gyCONSTRAINT_RIGHT_OF, "Right of", "right of"));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_ABOVE,
-        new wxOGLConstraintType(gyCONSTRAINT_ABOVE, wxT("Above"), wxT("above")));
+        new wxOGLConstraintType(gyCONSTRAINT_ABOVE, "Above", "above"));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_BELOW,
-        new wxOGLConstraintType(gyCONSTRAINT_BELOW, wxT("Below"), wxT("below")));
+        new wxOGLConstraintType(gyCONSTRAINT_BELOW, "Below", "below"));

    // Alignment
    wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_TOP,
-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_TOP, wxT("Top-aligned"), wxT("aligned to the top of")));
+        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_TOP, "Top-aligned", "aligned to the top of"));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_BOTTOM,
-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_BOTTOM, wxT("Bottom-aligned"), wxT("aligned to the bottom of")));
+        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_BOTTOM, "Bottom-aligned", "aligned to the bottom of"));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_LEFT,
-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_LEFT, wxT("Left-aligned"), wxT("aligned to the left of")));
+        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_LEFT, "Left-aligned", "aligned to the left of"));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_RIGHT,
-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_RIGHT, wxT("Right-aligned"), wxT("aligned to the right of")));
+        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_RIGHT, "Right-aligned", "aligned to the right of"));

    // Mid-alignment
    wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_TOP,
-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_TOP, wxT("Top-midaligned"), wxT("centred on the top of")));
+        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_TOP, "Top-midaligned", "centred on the top of"));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_BOTTOM,
-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_BOTTOM, wxT("Bottom-midaligned"), wxT("centred on the bottom of")));
+        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_BOTTOM, "Bottom-midaligned", "centred on the bottom of"));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_LEFT,
-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_LEFT, wxT("Left-midaligned"), wxT("centred on the left of")));
+        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_LEFT, "Left-midaligned", "centred on the left of"));

    wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_RIGHT,
-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_RIGHT, wxT("Right-midaligned"), wxT("centred on the right of")));
+        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_RIGHT, "Right-midaligned", "centred on the right of"));
 }

 void OGLCleanUpConstraintTypes()
@@ -137,7 +137,7 @@ wxOGLConstraint::wxOGLConstraint(int type, wxShape *constraining, wxList& constr
  m_constrainingObject = constraining;

  m_constraintId = 0;
-  m_constraintName = wxT("noname");
+  m_constraintName = "noname";

  wxNode *node = constrained.First();
  while (node)
--- a/contrib/src/ogl/divided.cpp
+++ b/contrib/src/ogl/divided.cpp
@@ -434,7 +434,7 @@ void wxDividedShape::ReadAttributes(wxExpr *clause)

 void wxDividedShape::EditRegions()
 {
-  wxMessageBox(wxT("EditRegions() is unimplemented."), wxT("OGL"), wxOK);
+  wxMessageBox("EditRegions() is unimplemented.", "OGL", wxOK);

  // TODO
 #if 0
--- a/contrib/src/ogl/drawn.cpp
+++ b/contrib/src/ogl/drawn.cpp
@@ -292,7 +292,7 @@ void wxDrawnShape::Copy(wxShape& copy)
  drawnCopy.m_currentAngle = m_currentAngle;
 }

-bool wxDrawnShape::LoadFromMetaFile(const wxString& filename)
+bool wxDrawnShape::LoadFromMetaFile(char *filename)
 {
  return m_metafiles[0].LoadFromMetaFile(filename, &m_width, &m_height);
 }
@@ -1825,7 +1825,7 @@ void wxPseudoMetaFile::Copy(wxPseudoMetaFile& copy)
 *
 */

-bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double *rwidth, double *rheight)
+bool wxPseudoMetaFile::LoadFromMetaFile(char *filename, double *rwidth, double *rheight)
 {
  if (!wxFileExists(filename))
    return NULL;
--- a/contrib/src/ogl/lines.cpp
+++ b/contrib/src/ogl/lines.cpp
@@ -77,17 +77,17 @@ wxLineShape::wxLineShape()
  // and make the three line regions.
  ClearRegions();
  wxShapeRegion *newRegion = new wxShapeRegion;
-  newRegion->SetName(wxT("Middle"));
+  newRegion->SetName("Middle");
  newRegion->SetSize(150, 50);
  m_regions.Append((wxObject *)newRegion);

  newRegion = new wxShapeRegion;
-  newRegion->SetName(wxT("Start"));
+  newRegion->SetName("Start");
  newRegion->SetSize(150, 50);
  m_regions.Append((wxObject *)newRegion);

  newRegion = new wxShapeRegion;
-  newRegion->SetName(wxT("End"));
+  newRegion->SetName("End");
  newRegion->SetSize(150, 50);
  m_regions.Append((wxObject *)newRegion);

@@ -234,7 +234,7 @@ void wxLineShape::FormatText(wxDC& dc, const wxString& s, int i)
  node = string_list->First();
  while (node)
  {
-    wxChar *s = (wxChar *)node->Data();
+    char *s = (char *)node->Data();
    wxShapeTextLine *line = new wxShapeTextLine(0.0, 0.0, s);
    region->GetFormattedText().Append((wxObject *)line);
    node = node->Next();
--- a/contrib/src/ogl/mfutils.cpp
+++ b/contrib/src/ogl/mfutils.cpp
@@ -98,7 +98,7 @@ wxMetaRecord::~wxMetaRecord(void)
  if (stringParam) delete[] stringParam;
 }

-wxXMetaFile::wxXMetaFile(const wxChar *file)
+wxXMetaFile::wxXMetaFile(char *file)
 {
  ok = FALSE;
  top = 0.0;
@@ -162,11 +162,11 @@ int AddMetaRecordHandle(wxMetaRecord *record)
  return (HandleTableSize - 1);
 }

-bool wxXMetaFile::ReadFile(const wxChar *file)
+bool wxXMetaFile::ReadFile(char *file)
 {
  HandleTableSize = 0;

-  FILE *handle = wxFopen(file, wxT("rb"));
+  FILE *handle = fopen(file, "rb");
  if (!handle) return FALSE;

  // Read placeable metafile header, if any
--- a/contrib/src/ogl/misc.cpp
+++ b/contrib/src/ogl/misc.cpp
@@ -423,7 +423,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
  {
    wxString oldBuffer(buffer);

-    wxChar *s = (wxChar *)node->Data();
+    char *s = (char *)node->Data();
    if (!s)
    {
      // FORCE NEW LINE
@@ -435,7 +435,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
    else
    {
      if (buffer.Length() != 0)
-        buffer += wxT(" ");
+        buffer += " ";

      buffer += s;
      dc.GetTextExtent(buffer, &x, &y);
@@ -782,7 +782,7 @@ void UpdateListBox(wxListBox *item, wxList *list)
  wxNode *node = list->First();
  while (node)
  {
-    wxChar *s = (wxChar *)node->Data();
+    char *s = (char *)node->Data();
    item->Append(s);
    node = node->Next();
  }
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -817,7 +817,7 @@ void ListBox::Select(int n) {
    if (n > 4)
        n = n - 4;
    else
-        n = 0;
+        n = 1;
    GETLB(id)->SetFirstItem(n);
 #endif
 }
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -223,7 +223,7 @@ void ScintillaWX::SetTicking(bool on) {
 void ScintillaWX::SetMouseCapture(bool on) {
    if (on && !capturedMouse)
        stc->CaptureMouse();
-    else if (!on && capturedMouse && stc->HasCapture())
+    else if (!on && capturedMouse)
        stc->ReleaseMouse();
    capturedMouse = on;
 }
@@ -429,59 +429,13 @@ long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/
 }

 long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) {
-      switch (iMessage) {
-      case SCI_CALLTIPSHOW: {
-          // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx
-          // because of the little tweak that needs done below.  When updating
-          // new versions double check that this is still needed, and that any
-          // new code there is copied here too.
-          AutoCompleteCancel();
-          if (!ct.wCallTip.Created()) {
-              Point pt = LocationFromPosition(wParam);
-              pt.y += vs.lineHeight;
-              PRectangle rc = ct.CallTipStart(currentPos, pt,
-                                              reinterpret_cast<char *>(lParam),
-                                              vs.styles[STYLE_DEFAULT].fontName,
-                                              vs.styles[STYLE_DEFAULT].sizeZoomed,
-                                              IsUnicodeMode());
-              // If the call-tip window would be out of the client
-              // space, adjust so it displays above the text.
-              PRectangle rcClient = GetClientRectangle();
-              if (rc.bottom > rcClient.bottom) {
-#ifdef __WXGTK__
-                  int offset = int(vs.lineHeight * 1.25)  + rc.Height();
-#else
-                  int offset = vs.lineHeight + rc.Height();
-#endif
-                  rc.top -= offset;
-                  rc.bottom -= offset;
-              }
-              // Now display the window.
-              CreateCallTipWindow(rc);
-              ct.wCallTip.SetPositionRelative(rc, wMain);
-              ct.wCallTip.Show();
-          }
-          break;
-      }
-
-      case SCI_SETCARETWIDTH:
-          // NOTE: Allows a caet width of zero.  This one has been added to
-          // Scintilla CVS so it can be removed from here when we update to
-          // version 1.50.
-          if (wParam <= 0)
-              vs.caretWidth = 0;
-          else if (wParam >= 3)
-              vs.caretWidth = 3;
-          else
-              vs.caretWidth = wParam;
-          InvalidateStyleRedraw();
-          break;
-
-
-      default:
-          return ScintillaBase::WndProc(iMessage, wParam, lParam);
-      }
-      return 0;
+//      switch (iMessage) {
+//      case EM_CANPASTE:
+//          return CanPaste();
+//      default:
+        return ScintillaBase::WndProc(iMessage, wParam, lParam);
+//      }
+//      return 0;
 }


@@ -653,10 +607,11 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {

 void ScintillaWX::DoAddChar(int key) {
 #if wxUSE_UNICODE
-    wxChar wszChars[2];
-    wszChars[0] = key;
-    wszChars[1] = 0;
-    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars);
+    char ansiChars[3];
+    ansiChars[0] = key;
+    ansiChars[1] = 0;
+    wxString uniChar(ansiChars, wxConvLocal);
+    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(uniChar);
    AddCharUTF((char*)buf.data(), strlen(buf));
 #else
    AddChar(key);
--- a/contrib/src/xrc/xh_sizer.cpp
+++ b/contrib/src/xrc/xh_sizer.cpp
@@ -150,12 +150,7 @@ wxObject *wxSizerXmlHandler::DoCreateResource()
        else if (m_class == wxT("wxStaticBoxSizer"))
        {
            sizer = new wxStaticBoxSizer(
-                         new wxStaticBox(m_parentAsWindow,
-                                         GetID(),
-                                         GetText(wxT("label")),
-                                         wxDefaultPosition, wxDefaultSize,
-                                         0/*style*/,
-                                         GetName()),
+                         new wxStaticBox(m_parentAsWindow, -1, GetText(wxT("label"))),
                         GetStyle(wxT("orient"), wxHORIZONTAL));
        }
        
--- a/contrib/src/xrc/xml.cpp
+++ b/contrib/src/xrc/xml.cpp
@@ -10,6 +10,7 @@

 #ifdef __GNUG__
 #pragma implementation "xml.h"
+#pragma implementation "xmlio.h"
 #endif

 // For compilers that support precompilation, includes "wx.h".
@@ -273,14 +274,6 @@ bool wxXmlNode::DeleteProperty(const wxString& name)
 //  wxXmlDocument
 //-----------------------------------------------------------------------------

-wxXmlDocument::wxXmlDocument()
-    : m_version(wxT("1.0")), m_fileEncoding(wxT("utf-8")), m_root(NULL)
-{
-#if !wxUSE_UNICODE
-    m_encoding = wxT("UTF-8");
-#endif
-}
-
 wxXmlDocument::wxXmlDocument(const wxString& filename, const wxString& encoding)
                          : wxObject(), m_root(NULL)
 {
@@ -360,9 +353,9 @@ inline static wxString CharToString(wxMBConv *conv,
        wchar_t *buf = new wchar_t[nLen+1];
        wxConvUTF8.MB2WC(buf, s, nLen);
        buf[nLen] = 0;
-        wxString str(buf, *conv, len);
+        wxString s(buf, *conv, len);
        delete[] buf;
-        return str;
+        return s;
    }
    else
        return wxString(s, len);
@@ -472,29 +465,26 @@ static void DefaultHnd(void *userData, const char *s, int len)
 }

 static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
-                              const XML_Char *name, XML_Encoding *info)
+                               const XML_Char *name, XML_Encoding *info)
 {
    // We must build conversion table for expat. The easiest way to do so
    // is to let wxCSConv convert as string containing all characters to
    // wide character representation:
    wxCSConv conv(wxString(name, wxConvLibc));
-    char mbBuf[2];
-    wchar_t wcBuf[10];
+    char mbBuf[255];
+    wchar_t wcBuf[255];
    size_t i;

-    mbBuf[1] = 0;
+    for (i = 0; i < 255; i++)
+        mbBuf[i] = (char) (i+1);
+    mbBuf[255] = 0;
+    conv.MB2WC(wcBuf, mbBuf, 255);
+    wcBuf[255] = 0;
+
    info->map[0] = 0;
    for (i = 0; i < 255; i++)
-    {
-        mbBuf[0] = (char)(i+1);
-        if (conv.MB2WC(wcBuf, mbBuf, 2) == (size_t)-1)
-        {
-            // invalid/undefined byte in the encoding:
-            info->map[i+1] = -1;
-        }
-        info->map[i+1] = (int)wcBuf[0];
-    }
-    
+        info->map[i+1] = (int)wcBuf[i];
+
    info->data = NULL;
    info->convert = NULL;
    info->release = NULL;
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -407,25 +407,10 @@ wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent,
        if ( node->GetType() == wxXML_ELEMENT_NODE &&
                 (node->GetName() == wxT("object") ||
                  node->GetName() == wxT("object_ref")) &&
-             node->GetPropVal(wxT("name"), &dummy) && dummy == name )
-        {
-            wxString cls(node->GetPropVal(wxT("class"), wxEmptyString));
-            if (!classname || cls == classname)
-                return node;
-            // object_ref may not have 'class' property:
-            if (cls.empty() && node->GetName() == wxT("object_ref"))
-            {
-                wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
-                if (refName.empty())
-                    continue;
-                wxXmlNode* refNode = FindResource(refName, wxEmptyString, TRUE);
-                if (refNode &&
-                    refNode->GetPropVal(wxT("class"), wxEmptyString) == classname)
-                {
-                    return node;
-                }
-            }
-        }
+                (!classname ||
+                 node->GetPropVal(wxT("class"), wxEmptyString) == classname) &&
+                node->GetPropVal(wxT("name"), &dummy) && dummy == name )
+            return node;
    }

    if ( recursive )
@@ -1110,7 +1095,7 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent, bool this_hnd_only)
    while (n)
    {
        if (n->GetType() == wxXML_ELEMENT_NODE &&
-           (n->GetName() == wxT("object") || n->GetName() == wxT("object_ref")))
+            n->GetName() == wxT("object"))
        {
            if (this_hnd_only && CanHandle(n))
                CreateResource(n, parent, NULL);
--- a/contrib/utils/convertrc/ConvertVC.dsp
+++ b/contrib/utils/convertrc/ConvertVC.dsp
@@ -110,7 +110,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxconvert.exe" /pdbtype:sept /libpath:"..\..\..\lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxconvert.exe" /pdbtype:sept /libpath:"..\..\..\lib"

 !ELSEIF  "$(CFG)" == "ConvertVC - Win32 Release DLL"

@@ -137,7 +137,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxconvert.exe" /libpath:"..\..\..\lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxconvert.exe" /libpath:"..\..\..\lib"

 !ENDIF 

--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -101,8 +101,6 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile)
    m_xmlfile.Write("</resource>\n");
    m_xmlfile.Close();
    m_rc.Close();
-    wxMessageBox(_("Conversion complete."), _("Done"), 
-                            wxOK | wxICON_INFORMATION);

 return TRUE;
 }
@@ -118,8 +116,7 @@ microsoft reuses the keyword DIALOG for other things
 */
    token=PeekToken();
 //Microsoft notation?
-    while ((token=="DISCARDABLE")
-            ||(token=="LOADONCALL")||(token=="MOVEABLE"))
+    if (token=="DISCARDABLE")
    {
    token=GetToken();
    token=PeekToken();
@@ -180,60 +177,32 @@ END
 void rc2xml::ParseControls()
 {
    wxString token;
-    wxString label,varname;

    token=GetToken();
    while ((token!="END")&(token!="}"))
        {
        if (token=="AUTOCHECKBOX")
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParseCheckBox(label,varname);
-            }
+            ParseCheckBox();
        else
        if (token=="AUTORADIOBUTTON")
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParseRadioButton(label,varname);
-           }
+            ParseRadioButton();
        else
        if (token=="LTEXT")
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParseStaticText(label,varname);
-            }
+            ParseStaticText();
        else if (token=="EDITTEXT")
-           {
-            varname=GetToken();
-            ParseTextCtrl(varname);
-            }
-        else if ((token=="PUSHBUTTON")||(token=="DEFPUSHBUTTON"))
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParsePushButton(label,varname);
-            }
+            ParseTextCtrl();
+        else if (token=="PUSHBUTTON")
+            ParsePushButton();
+        else if (token=="DEFPUSHBUTTON")
+            ParsePushButton();
        else if (token=="GROUPBOX")
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParseGroupBox(label,varname);
-            }
+            ParseGroupBox();
        else if (token=="COMBOBOX")
-            {
-            varname=GetToken();
-            ParseComboBox(varname);
-             }
+            ParseComboBox();
        else if (token=="CONTROL")
            ParseControlMS();
        else if (token=="LISTBOX")
-           {
-            varname=GetToken();
-            ParseListBox(varname);
-            }
+            ParseListBox();
        else if (token=="ICON")
            ParseIconStatic();
        else if (token=="SCROLLBAR")
@@ -243,15 +212,12 @@ void rc2xml::ParseControls()

 }
 //LTEXT           "Radius",IDC_STATIC,9,67,23,8
-void rc2xml::ParseStaticText(wxString phrase, wxString varname)
+void rc2xml::ParseStaticText()
 {
    wxString token;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
+    wxString phrase,varname;
+    phrase=GetQuoteField();
+    varname=GetToken();
    int x,y,width,height;
    ReadRect(x,y,width,height);

@@ -261,16 +227,11 @@ void rc2xml::ParseStaticText(wxString phrase, wxString varname)

 }
 //EDITTEXT        IDC_RADIUS,36,65,40,14,ES_AUTOHSCROLL
-void rc2xml::ParseTextCtrl(wxString varname)
+void rc2xml::ParseTextCtrl()
 {
    wxString token;
-    wxString style;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
+    wxString varname,style;
+    varname=GetToken();
    int x,y,width,height;
    ReadRect(x,y,width,height);
 //TODO
@@ -281,15 +242,13 @@ void rc2xml::ParseTextCtrl(wxString varname)

 }
 //AUTOCHECKBOX "&log.", ID_XLOG, 25, 24, 21, 12
-void rc2xml::ParseCheckBox(wxString phrase, wxString varname)
+void rc2xml::ParseCheckBox()
 {
    wxString token;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
+    wxString phrase,varname;
+    phrase=GetQuoteField();
+    varname=GetToken();
+
    int x,y,width,height;
    ReadRect(x,y,width,height);

@@ -300,14 +259,15 @@ void rc2xml::ParseCheckBox(wxString phrase, wxString varname)

 }
 //AUTORADIOBUTTON "&text", ID_SW10, 13, 12, 68, 10, BS_AUTORADIOBUTTON | WS_GROUP
-void rc2xml::ParseRadioButton(wxString phrase, wxString varname)
+void rc2xml::ParseRadioButton()
 {
    wxString token,style;
+    wxString phrase,varname;
+    phrase=GetQuoteField();
+    varname=GetToken();
+
    int x,y,width,height;
-    bool GotOrs;
-    GotOrs = ReadOrs(token);
    if (ReadRect(x,y,width,height))
-        if (GotOrs==FALSE)
      ReadOrs(token);
    if (token.Find("WS_GROUP") != -1)
        style += "wxRB_GROUP";
@@ -321,16 +281,13 @@ void rc2xml::ParseRadioButton(wxString phrase, wxString varname)
 }

 //PUSHBUTTON      "Create/Update",IDC_CREATE,15,25,53,13,NOT WS_TABSTOP
-void rc2xml::ParsePushButton(wxString phrase, wxString varname)
+void rc2xml::ParsePushButton()
 {
    wxString token;
+    wxString phrase,varname;
+    phrase=GetQuoteField();
+    varname=GetToken();

-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
    int x,y,width,height;
    ReadRect(x,y,width,height);

@@ -357,16 +314,13 @@ bool rc2xml::Seperator(int ch)
    return FALSE;
 }

-void rc2xml::ParseGroupBox(wxString phrase, wxString varname)
+void rc2xml::ParseGroupBox()
 {
 //    GROUPBOX        "Rotate",IDC_STATIC,1,1,71,79
    wxString token;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
+    wxString phrase,varname;
+    phrase=GetQuoteField();
+    varname=GetToken();
    int x,y,width,height;
    ReadRect(x,y,width,height);

@@ -441,8 +395,9 @@ wxString rc2xml::GetQuoteField()

    while (ch!=34)
        ReadChar(ch);
-    ReadChar(ch);
  
+    ReadChar(ch);
+
    while (ch!=34)
    {
    phrase+=(char)ch;
@@ -451,49 +406,6 @@ wxString rc2xml::GetQuoteField()
    return phrase;
 }

-// string in stringtable may contain embedded quotes
-// escape characters retained to allow strings to be rewritten
-wxString rc2xml::GetStringQuote()
-{
-    wxString phrase;
-    //ASCII code 34 "
-    bool done=FALSE;
-    int p,ch=0,lastch=0;
-    ReadChar(ch);
-
-    while (ch!=34)
-        ReadChar(ch);
-    ReadChar(ch);
-    while (done==FALSE)
-        {
-        if ((ch==34)&&(lastch!='\\'))
-            {
-            p=m_rc.Tell();
-            ReadChar(ch);
-// RC supports "", for embedded quote, as well as  \"
-            if (ch==34)              
-                phrase+='\\';         
-            else
-    {
-                m_rc.Seek(p);
-                done = TRUE;
-                }
-            }
-         if (done==TRUE)
-             break;
-         if (ch=='\r')
-             ReadChar(ch);                    // skip
-         if ((ch=='\n')&&(lastch=='\\'))      // lastch <should> be this
-             phrase+='n';                     // escape
-         else
-    phrase+=(char)ch;
-         lastch=ch;
-    ReadChar(ch);
-    }
-
-    return phrase;
-}
-
 void rc2xml::ReadChar(int &ch)
 {
    int result;
@@ -511,16 +423,15 @@ void rc2xml::ReadChar(int &ch)
        m_done=TRUE;
 }

-void rc2xml::ParseComboBox(wxString varname)
+void rc2xml::ParseComboBox()
 {
 /* COMBOBOX        IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT | 
                    WS_VSCROLL | WS_TABSTOP */
    wxString token,style;
+    wxString varname;
+    varname=GetToken();
    int x,y,width,height;
-    bool GotOrs;
-    GotOrs = ReadOrs(token);
    if (ReadRect(x,y,width,height))
-        if (GotOrs==FALSE)
      ReadOrs(token);

    m_xmlfile.Write("\t\t<object class=\"wxComboBox\"");
@@ -552,8 +463,6 @@ void rc2xml::ParseMenu(wxString varname)
    while ((token!="END")&(token!="}"))
    {
    token=GetToken();
-    token.MakeUpper();
-
    if (token=="POPUP")
        {
        ParsePopupMenu();
@@ -588,8 +497,6 @@ void rc2xml::ParsePopupMenu()
    while ((token!="END")&(token!="}"))
    {
    token=GetToken();
-    token.MakeUpper();
-
    if (token=="POPUP")
        ParsePopupMenu();
 	
@@ -682,27 +589,34 @@ bool rc2xml::ReadOrs(wxString & orstring)
    return TRUE;
 }

-//Is it a checkbutton or a radiobutton or a pushbutton or a groupbox
+//Is it a check button or a radio button
 void rc2xml::ParseCtrlButton(wxString label, wxString varname)
 {
    wxString token;
-    int p;
-    p=m_rc.Tell();
    ReadOrs(token);
-    m_rc.Seek(p);
+    int x,y,width,height;

    if (token.Find("BS_AUTOCHECKBOX")!=-1)
-        ParseCheckBox(label, varname);
-    else if ((token.Find("BS_AUTORADIOBUTTON")!=-1)||
-                  (token.Find("BS_RADIOBUTTON")!=-1))
-        ParseRadioButton(label, varname);
-    else if (token.Find("BS_GROUPBOX")!=-1)
-        ParseGroupBox(label, varname);        
-    else  // if ((token.Find("BS_PUSHBUTTON")!=-1)||
-//                (token.Find("BS_DEFPUSHBUTTON")!=-1))
-        ParsePushButton(label, varname);           // make default case
+        {
+        ReadRect(x,y,width,height);
+        m_xmlfile.Write("\t\t<object class=\"wxCheckBox\"");
+        WriteBasicInfo(x,y,width,height,varname);
+        WriteLabel(label);
+        m_xmlfile.Write("\t\t</object>\n");
+        }
+
+    if (token.Find("BS_AUTORADIOBUTTON")!=-1)
+        {
+        ReadRect(x,y,width,height);
+        m_xmlfile.Write("\t\t<object class=\"wxRadioButton\"");
+        WriteBasicInfo(x,y,width,height,varname);
+        WriteLabel(label);
+        m_xmlfile.Write("\t\t</object>\n");
+        }
+
 }

+
 void rc2xml::WriteSize(int width, int height)
 {
    wxString msg;
@@ -799,15 +713,11 @@ void rc2xml::WriteStyle(wxString style)
    LISTBOX         IDC_LIST1,16,89,48,40,LBS_SORT | LBS_MULTIPLESEL | 
                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
 */
-void rc2xml::ParseListBox(wxString varname)
+void rc2xml::ParseListBox()
 {
    wxString token;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
+    wxString varname;
+    varname=GetToken();
    int x,y,width,height;
    ReadRect(x,y,width,height);

@@ -901,7 +811,7 @@ void rc2xml::SecondPass()
    while (!m_done)
        {
        token=GetToken();
-        if ((token=="DIALOG")||(token=="DIALOGEX"))
+        if (token=="DIALOG")
            ParseDialog(prevtok);
        else if (token=="MENU")
            ParseMenu(prevtok);
@@ -945,7 +855,7 @@ void rc2xml::ParseToolBar(wxString varname)
    int c=0;	
    wxString buttonname,msg,tip,longhelp;
    token=GetToken();
-    while ((token!="BEGIN")&(token!="{"))
+    while ((token!="BEGIN"))
        token=GetToken();

    while ((token!="END")&(token!="}"))
@@ -995,7 +905,7 @@ void rc2xml::ParseStringTable(wxString varname)
 {
    wxString token;
    token=GetToken();
-    while ((token!="BEGIN")&(token!="{"))
+    while ((token!="BEGIN"))
        token=GetToken();
    token=GetToken();
    wxString *msg;
@@ -1003,7 +913,7 @@ void rc2xml::ParseStringTable(wxString varname)
    while ((token!="END")&(token!="}"))
        {
        msg=new wxString;
-        *msg=GetStringQuote();
+        *msg=GetQuoteField();
        m_stringtable->Append(token,msg);
        token=GetToken();
        }
@@ -1059,8 +969,7 @@ void rc2xml::ParseMenuItem()
    m_xmlfile.Write(">\n");
    WriteLabel(token);
 //Look up help if any listed in stringtable
-//can't assume numbers correlate, restrict to string identifiers
-    if ((!name.IsNumber())&&(LookUpString(name,msg)))  
+    if (LookUpString(name,msg))
        {
        SplitHelp(msg,tip,longhelp);
        m_xmlfile.Write("\t\t\t<help>"
@@ -1069,11 +978,9 @@ void rc2xml::ParseMenuItem()
 //look for extra attributes like checked and break
    wxString ptoken;
    ptoken=PeekToken();
-    ptoken.MakeUpper();
    while ((ptoken!="MENUITEM")&(ptoken!="POPUP")&(ptoken!="END"))
        {
        token=GetToken();
-        ptoken.MakeUpper();
        if (token=="CHECKED")
            m_xmlfile.Write("\t\t\t<checkable>1</checkable>\n");
        else if (token=="MENUBREAK");
@@ -1083,7 +990,6 @@ void rc2xml::ParseMenuItem()
            wxLogError("Unknown Menu Item token:"+token);
        
        ptoken=PeekToken();
-        ptoken.MakeUpper();
        }
    m_xmlfile.Write("\t\t\t</object>\n"); 

@@ -1094,10 +1000,6 @@ void rc2xml::ParseIconStatic()
 {
    wxString token;
    wxString varname,iconname;
-    token = PeekToken();
-    if (token.Contains("\""))
-        iconname = GetQuoteField();
-    else
    iconname=GetToken();
 //Look up icon
    varname=GetToken();
@@ -1144,7 +1046,8 @@ void rc2xml::ParseStaticBitmap(wxString bitmapname, wxString varname)
 {
    wxString token;
    //Grab SS_BITMAP
-    ReadOrs(token);
+    token=GetToken();
+


    int x,y,width,height;
@@ -1182,23 +1085,6 @@ kindctrl.MakeUpper();
        ParseCtrlButton(label,varname);
    if (kindctrl=="RICHEDIT")
        ParseRichEdit(label,varname);
-    if (kindctrl=="STATIC")
-        {
-        wxString token;
-        int p=m_rc.Tell();
-        ReadOrs(token);
-        m_rc.Seek(p);
-        if (token.Find("SS_BITMAP")!=-1)
-            ParseStaticBitmap(label,varname);
-        else
-            ParseStaticText(label,varname);
-        }
-    if (kindctrl=="EDIT")
-        ParseTextCtrl(varname);
-    if (kindctrl=="LISTBOX")
-        ParseListBox(varname);
-    if (kindctrl=="COMBOBOX")
-        ParseComboBox(varname);

 }

--- a/contrib/utils/convertrc/rc2xml.h
+++ b/contrib/utils/convertrc/rc2xml.h
@@ -52,20 +52,19 @@ protected:
    void ParseRichEdit(wxString label, wxString varname);
    void ParseDialog(wxString dlgname);
    void ParseControls();
-    void ParseListBox(wxString varname);
-    void ParseStaticText(wxString phrase,wxString varname);
-    void ParseTextCtrl(wxString varname);
-    void ParseRadioButton(wxString phrase,wxString varname);
-    void ParseCheckBox(wxString phrase,wxString varname);
-    void ParsePushButton(wxString phrase, wxString varname);
+    void ParseListBox();
+    void ParseStaticText();
+    void ParseTextCtrl();
+    void ParseRadioButton();
+    void ParseCheckBox();
+    void ParsePushButton();
    bool Seperator(int ch);
-    void ParseGroupBox(wxString phrase, wxString varname);
+    void ParseGroupBox();
    bool ReadRect(int & x, int & y, int & width, int & height);
    wxString GetToken(bool *listseperator = 0);
    wxString GetQuoteField();
-    wxString GetStringQuote();
    void ReadChar(int &ch);
-    void ParseComboBox(wxString varname);
+    void ParseComboBox();
    void ParseMenu(wxString varname);
    void ParsePopupMenu();
    wxString PeekToken();
--- a/contrib/utils/wxrc/wxRcVC.dsp
+++ b/contrib/utils/wxrc/wxRcVC.dsp
@@ -110,7 +110,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrc.exe" /pdbtype:sept /libpath:"..\..\..\lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrc.exe" /pdbtype:sept /libpath:"..\..\..\lib"

 !ELSEIF  "$(CFG)" == "wxRcVC - Win32 Release DLL"

@@ -137,7 +137,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrc.exe" /libpath:"..\..\..\lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrc.exe" /libpath:"..\..\..\lib"

 !ENDIF 

--- a/contrib/utils/wxrcedit/editor.cpp
+++ b/contrib/utils/wxrcedit/editor.cpp
@@ -92,7 +92,7 @@ void wxXmlRcEditDocument::Upgrade()
        UpgradeNode(node);
    }
    node->DeleteProperty(wxT("version"));
-    node->AddProperty(wxT("version"), WX_XMLRES_CURRENT_VERSION_STRING);
+    node->AddProperty(wxT("version"), wxT(WX_XMLRES_CURRENT_VERSION_STRING));
 }


@@ -341,12 +341,6 @@ void EditorFrame::NewFile()
    m_FileName = "";
    m_Resource = new wxXmlRcEditDocument;
    m_Resource->SetRoot(new wxXmlNode(wxXML_ELEMENT_NODE, _("resource")));
-	m_Resource->SetFileEncoding("utf-8");
-#if !wxUSE_UNICODE
-    m_Resource->SetEncoding(wxLocale::GetSystemEncodingName());
-#endif
-	m_Resource->GetRoot()->AddProperty(_T("version"),
-                                       WX_XMLRES_CURRENT_VERSION_STRING);
    
    m_Modified = FALSE;
    RefreshTree();
--- a/contrib/utils/wxrcedit/wxRcEditVC.dsp
+++ b/contrib/utils/wxrcedit/wxRcEditVC.dsp
@@ -110,7 +110,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrcedit.exe" /pdbtype:sept /libpath:"..\..\..\lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrcedit.exe" /pdbtype:sept /libpath:"..\..\..\lib"

 !ELSEIF  "$(CFG)" == "wxRcEditVC - Win32 Release DLL"

@@ -137,7 +137,7 @@ BSC32=bscmake.exe
 # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrcedit.exe" /libpath:"..\..\..\lib"
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrcedit.exe" /libpath:"..\..\..\lib"

 !ENDIF 

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,7 @@
-wxwindows2.4 (2.4.0) unstable; urgency=low
-
-  * The fingers crossed release.
-
- -- Ron Lee <ron@debian.org>  Thu, 19 Dec 2002 00:50:48 -0800
-
-wxwindows2.3 (2.3.4.1) unstable; urgency=low
+wxwindows2.3 (2.3.4) unstable; urgency=low

  * 2.4.0pre1 I guess.
  * Added -ffunction-sections for broken hppa linker. Closes: #162948
-  * Conflict/Replace wxPython2.2.  Since its nmu these two packages
-    can no longer currently coexist.  Closes: #171258
-  * xrced.py path search fixed.  Closes: #168148, #170748
-  * Actually install all wxUniv headers to the header package.
-    Closes: #168250, #164557
-  * Robin tells me this one should be fixed in 2.3 too, I can't confirm
-    so please reopen if it's not.  Closes: #172390
-  * Added menu items for pycrust/pyshell, thanks Martin.  Closes: #172447
-  * Broken header fixed.  Closes: #168887

 -- Ron Lee <ron@debian.org>  Mon, 18 Nov 2002 18:54:21 -0800

--- a/debian/control.in
+++ b/debian/control.in
@@ -118,8 +118,8 @@ Architecture: any
 Section: interpreters
 Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends}
 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
+Conflicts: libwxgtk=V-python-contrib, python-wxwin
+Replaces: libwxgtk=V-python-contrib, python-wxwin
 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
--- a/debian/libwxgtk-python.menu
+++ b/debian/libwxgtk-python.menu
@@ -1,7 +0,0 @@
-?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\
-  title="pycrust" command="/usr/bin/pycrust"
-?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\
-  title="pyshell" command="/usr/bin/pyshell"
-?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\
-  title="xrced" command="/usr/bin/xrced"
-
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,6 @@ objdir_examples=docs/examples
 objdir_i18n=locale

 objdir_gtk_univ=objs_gtk_univ
-objdir_univ_install=objs_univ_install

 objdir_wxbase_msw_shared=objs_wxbase_msw_sh
 objdir_wxbase_msw_static=objs_wxbase_msw_st
@@ -66,7 +65,7 @@ objdir_msw_dbg=objs_msw_d

 objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) $(objdir_gtk_univ) \
-	$(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
+	$(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)

@@ -623,17 +622,7 @@ install-headers: install-gtk-lib
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
-# The only way to be really sure we get the univ headers correct is to install
-# them.  Do that in a scratch dirs, and move the gtk ones last, so at least
-# they win in the result of any uncaught conflict.
-
-	cd $(objdir_gtk_univ) \
-		&& $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
-
-	dh_movefiles --sourcedir=$(objdir_univ_install)
 	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
-
 	dh_installmanpages \
 		ansi2knr.1 \
 		jpegtran.1 \
@@ -733,7 +722,6 @@ binary-common:
 	dh_installdocs
 	dh_installchangelogs
 	dh_installexamples
-	dh_installmenu
 	dh_link

 	@# Don't strip debug libs at all, and strip cross libs elsewhere
--- a/demos/bombs/bombs.dsp
+++ b/demos/bombs/bombs.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240.lib /nologo /subsystem:windows /machine:I386
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386

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

@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

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

--- a/demos/dbbrowse/dbbrowse.dsp
+++ b/demos/dbbrowse/dbbrowse.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240.lib /nologo /subsystem:windows /machine:I386
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386

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

@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

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

--- a/demos/forty/forty.dsp
+++ b/demos/forty/forty.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240.lib /nologo /subsystem:windows /machine:I386
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386

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

@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

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

--- a/demos/fractal/fractal.dsp
+++ b/demos/fractal/fractal.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240.lib /nologo /subsystem:windows /machine:I386
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386

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

@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

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

--- a/demos/life/life.dsp
+++ b/demos/life/life.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240.lib /nologo /subsystem:windows /machine:I386
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386

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

@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

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

--- a/demos/poem/poem.dsp
+++ b/demos/poem/poem.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240.lib /nologo /subsystem:windows /machine:I386
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386

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

@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # 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 comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw240d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

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

--- a/distrib/msw/copybase.bat
+++ b/distrib/msw/copybase.bat
@@ -1,10 +1,9 @@
@echo off

-rem VZ: this is quick and _very_ dirty, to be replaced by a script directly
-rem     parsing the files.txt and include/wx/version.h...
+rem VZ: this is quick and _very_ dirty

-set VER=2.3.4
-set DEST=t:\wxBase-%VER%
+set VER=2.3.3
+set DEST=q:\wxBase-%VER%

 mkdir %DEST%
 mkdir %DEST%\include
@@ -27,18 +26,6 @@ chdir %WXWIN%

 rem Copy the files to the root directory

-copy /q configure.in %DEST%
-copy /q configure %DEST%
-copy /q wxwin.m4 %DEST%
-copy /q aclocal.m4 %DEST%
-copy /q config.sub %DEST%
-copy /q config.guess %DEST%
-copy /q install-sh %DEST%
-copy /q mkinstalldirs %DEST%
-copy /q wx-config.in %DEST%
-copy /q setup.h.in %DEST%
-copy /q Makefile.in %DEST%
-copy /q wxBase.spec %DEST%
 copy /q docs\changes.txt %DEST%\CHANGES.txt
 copy /q docs\licence.txt %DEST%\LICENCE.txt
 copy /q docs\base\readme.txt %DEST%\README.txt
@@ -52,15 +39,12 @@ copy /q src\makeb32.env %DEST%\src\makeb32.env
 copy /q src\makelib.b32 %DEST%\src\makelib.b32
 copy /q src\makeprog.b32 %DEST%\src\makeprog.b32
 copy /q src\msw\makebase.b32 %DEST%\src\msw\makebase.b32
-copy /q src\*.in %DEST%\src

 rem Copy the sample

 copy /q samples\console\console.cpp %DEST%\samples\console\console.cpp
 copy /q samples\console\console.dsp %DEST%\samples\console\console.dsp
 copy /q samples\console\makefile.b32 %DEST%\samples\console\makefile.b32
-copy /q samples\console\makefile.unx %DEST%\samples\console
-copy /q samples\console\Makefile.in %DEST%\samples\console
 copy /q samples\console\testdata.fc %DEST%\samples\console\testdata.fc

 rem Copy regex and zlib files
@@ -271,7 +255,6 @@ copy /q include\wx\zstream.h %DEST%\include\wx\zstream.h
 copy /q include\wx\unix\gsockunx.h %DEST%\include\wx\unix\gsockunx.h
 copy /q include\wx\unix\mimetype.h %DEST%\include\wx\unix\mimetype.h
 copy /q include\wx\msw\dde.h %DEST%\include\wx\msw\dde.h
-copy /q include\wx\msw\gccpriv.h %DEST%\include\wx\msw\gccpriv.h
 copy /q include\wx\msw\mimetype.h %DEST%\include\wx\msw\mimetype.h
 copy /q include\wx\msw\winundef.h %DEST%\include\wx\msw\winundef.h
 copy /q include\wx\protocol\file.h %DEST%\include\wx\protocol\file.h
--- a/distrib/msw/docsrc.rsp
+++ b/distrib/msw/docsrc.rsp
@@ -32,6 +32,7 @@ utils/dialoged/docs/*.gif

 contrib/docs/latex/svg/*.gif
 contrib/docs/latex/svg/*.tex
+contrib/docs/latex/svg/*.gif
 contrib/docs/latex/svg/*.ini
 contrib/docs/latex/svg/*.sty

--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -8,9 +8,11 @@ config.sub
 configure.in
 setup.h.in
 install-sh
+missing
 mkinstalldirs
+modules
+template.mak
 wx-config.in
-version-script.in
 setup.h_vms

 distrib/msw/*.rsp
@@ -26,18 +28,19 @@ distrib/msw/tmake/makeall.bat
 distrib/msw/tmake/makeall.sh
 distrib/msw/tmake/wxwin.pro
 distrib/msw/tmake/tmake.conf
+distrib/gtk/*

 locale/*.po
+locale/*.mo
 locale/Makefile

 art/*.xpm
-art/*.ico
-art/*.png
 art/motif/*.xpm
 art/gtk/*.xpm

 docs/readme.txt
 docs/readme_vms.txt
+docs/install.txt
 docs/changes.txt
 docs/todo.txt
 docs/licence.txt
@@ -45,10 +48,18 @@ docs/licendoc.txt
 docs/preamble.txt
 docs/gpl.txt
 docs/lgpl.txt
+docs/symbols.txt
+docs/bugs.txt
 docs/index.htm
 docs/html/*.htm
 docs/html/*.gif
+docs/html/*.png
+docs/html/icons/*.gif
+docs/html/icons/*.png
+docs/html/icons/*.jpg
 docs/html/images/*.gif
+docs/html/images/*.png
+docs/html/images/*.jpg
 docs/tech/*.txt
 docs/tech/*.htm

@@ -141,9 +152,19 @@ lib/dummy

 tools/gettext/*.*

+bitmaps/xpm/16x16/*.*
+bitmaps/xpm/32x32/*.*
+bitmaps/xpm/64x64/*.*
+bitmaps/xpm/misc/*.*
+bitmaps/*.*
+bitmaps/bmp/16x15/*.*
+bitmaps/bmp/10x8/*.*
+bitmaps/ico/32x32/*.*
+
 misc/afm/*.afm
 misc/gs_afm/*.afm

+utils/*.txt
 utils/make*.*
 utils/configure
 utils/configure.in
@@ -551,7 +572,6 @@ samples/html/test/*.ico
 samples/html/test/*.htm
 samples/html/test/*.html
 samples/html/test/*.pro
-samples/html/test/*.gif

 samples/html/virtual/*.cpp
 samples/html/virtual/*.h
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -6,6 +6,7 @@
    Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
    Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
    Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+;    Name: {group}\Debug View; Filename: {app}\bin\DBGVIEW.EXE; WorkingDir: {app}\bin; IconFilename: {app}\bin\DBGVIEW.EXE; IconIndex: 0
    Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
    Name: {group}\wxWindows Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -4,13 +4,13 @@

 [Setup]
    MinVersion=4.0,4.0
-    AppName=wxWindows 2.4.0
+    AppName=wxWindows 2.3.4
    AppId=wxWindows
    CreateUninstallRegKey=1
    UsePreviousAppDir=0
    UsePreviousGroup=0
-    AppVersion=2.4.0
-    AppVerName=wxWindows 2.4.0
+    AppVersion=2.3.4
+    AppVerName=wxWindows 2.3.4
    AppCopyright=Copyright <20> The wxWindows Team
    BackColor=$FF0000
    BackColor2=$000000
@@ -19,7 +19,7 @@
    WindowStartMaximized=1
    WindowVisible=1
    WindowResizable=1
-    UninstallDisplayName=wxWindows 2.4.0
+    UninstallDisplayName=wxWindows 2.3.4
    UninstallLogMode=Append
    DirExistsWarning=auto
    UninstallFilesDir={app}
@@ -28,10 +28,10 @@
    CreateAppDir=1
    DisableProgramGroupPage=0
    AlwaysCreateUninstallIcon=1
-    UninstallIconName=Uninstall wxWindows 2.4.0
+    UninstallIconName=Uninstall wxWindows 2.3.4
    Uninstallable=1
-    DefaultDirName=c:\wxWindows_2.4.0
-    DefaultGroupName=wxWindows 2.4.0
+    DefaultDirName=c:\wxWindows_2.3.4
+    DefaultGroupName=wxWindows 2.3.4
    LicenseFile=C:\wx24\wxWindows\docs\licence.txt
    InfoBeforeFile=C:\wx24\wxWindows\docs\readme.txt
    InfoAfterFile=C:\wx24\wxWindows\docs\msw\install.txt
@@ -41,6 +41,6 @@
    DiskClusterSize=512
    ReserveBytes=0
    UseSetupLdr=1
-    SourceDir=c:\wx24\wxWindows\deliver\wxWindows-2.4.0
+    SourceDir=c:\wx24\wxWindows\deliver\wxWindows-2.3.4
    OutputDir=c:\wx24\wxWindows\deliver

--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -29,357 +29,6 @@ expandlines()
    done
 }

-doinit()
-{
-  cd $WXSRC
-  echo Removing backup files...
-  rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
-
-  rm -f $WXDEST/wx*-${WXVER}*.tar.gz
-  # Copy setup files
-  cp $WXSRC/include/wx/os2/SETUP0.H $WXSRC/include/wx/os2/setup.h
-  cp $WXSRC/include/wx/msw/setup0.h $WXSRC/include/wx/msw/setup.h
-  cp $WXSRC/include/wx/univ/setup0.h $WXSRC/include/wx/univ/setup.h
-
-  # Copy readme and other files
-
-  cp $WXSRC/docs/readme.txt $WXDEST/readme-${WXVER}.txt
-  cp $WXSRC/docs/changes.txt $WXDEST/changes-${WXVER}.txt
-  cp $WXSRC/docs/mgl/readme.txt $WXDEST/readme-mgl-${WXVER}.txt
-  cp $WXSRC/docs/mgl/install.txt $WXDEST/install-mgl-${WXVER}.txt
-  cp $WXSRC/docs/x11/readme.txt $WXDEST/readme-x11-${WXVER}.txt
-  cp $WXSRC/docs/x11/readme-nanox.txt $WXDEST/readme-nanox-${WXVER}.txt
-  cp $WXSRC/docs/x11/install.txt $WXDEST/install-x11-${WXVER}.txt
-  cp $WXSRC/docs/motif/readme.txt $WXDEST/readme-motif-${WXVER}.txt
-  cp $WXSRC/docs/motif/install.txt $WXDEST/install-motif-${WXVER}.txt
-  cp $WXSRC/docs/msw/readme.txt $WXDEST/readme-msw-${WXVER}.txt
-  cp $WXSRC/docs/msw/install.txt $WXDEST/install-msw-${WXVER}.txt
-  cp $WXSRC/docs/gtk/readme.txt $WXDEST/readme-gtk-${WXVER}.txt
-  cp $WXSRC/docs/gtk/install.txt $WXDEST/install-gtk-${WXVER}.txt
-  cp $WXSRC/docs/mac/readme.txt $WXDEST/readme-mac-${WXVER}.txt
-  cp $WXSRC/docs/mac/install.txt $WXDEST/install-mac-${WXVER}.txt
-  cp $WXSRC/docs/os2/install.txt $WXDEST/install-os2-${WXVER}.txt
-}
-
-dospinwxgtk()
-{
-echo Tarring wxGTK...
-
-cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
-expandlines /tmp/wxgtk_in.txt /tmp/wxgtk.txt
-$TAR cf $WXDEST/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
-
-echo Re-tarring wxGTK in a subdirectory...
-cd $WXDEST
-mkdir wxGTK-${WXVER}
-cd wxGTK-${WXVER}
-$TAR xf ../wxGTK-${WXVER}.tar
-cd ..
-rm -f wxGTK-${WXVER}.tar
-$TAR cf $WXDEST/wxGTK-${WXVER}.tar wxGTK-${WXVER}/*
-rm -f -r wxGTK-${WXVER}
-gzip $WXDEST/wxGTK-${WXVER}.tar
-}
-
-dospinwxmotif()
-{
-echo Tarring wxMotif...
-
-cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmotif_in.txt
-expandlines /tmp/wxmotif_in.txt /tmp/wxmotif.txt
-$TAR cf $WXDEST/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
-
-echo Re-tarring wxMotif in a subdirectory...
-cd $WXDEST
-mkdir wxMotif-${WXVER}
-cd wxMotif-${WXVER}
-$TAR xf ../wxMotif-${WXVER}.tar
-cd ..
-rm -f wxMotif-${WXVER}.tar
-$TAR cf $WXDEST/wxMotif-${WXVER}.tar wxMotif-${WXVER}/*
-rm -f -r wxMotif-${WXVER}
-gzip $WXDEST/wxMotif-${WXVER}.tar
-}
-
-dospinwxx11()
-{
-echo Tarring wxX11...
-
-### wxX11: combined wxMotif and wxX11 distributions
-cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
-expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
-$TAR cf $WXDEST/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
-
-echo Re-tarring wxX11 in a subdirectory...
-cd $WXDEST
-mkdir wxX11-${WXVER}
-cd wxX11-${WXVER}
-$TAR xf ../wxX11-${WXVER}.tar
-cd ..
-rm -f wxX11-${WXVER}.tar
-$TAR cf $WXDEST/wxX11-${WXVER}.tar wxX11-${WXVER}/*
-rm -f -r wxX11-${WXVER}
-gzip $WXDEST/wxX11-${WXVER}.tar
-}
-
-### wxMSW
-# cd $WXSRC
-# cat $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/bc.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmsw_in.txt
-# expandlines /tmp/wxmsw_in.txt /tmp/wxmsw.txt
-# $TAR cf $WXDEST/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
-# gzip $WXDEST/wxMSW-${WXVER}.tar
-
-dospinwxmac()
-{
-echo Tarring wxMac...
-### wxMac
-cp $WXSRC/include/wx/mac/setup0.h $WXSRC/include/wx/setup.h
-cd $WXSRC
-cat $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
-expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
-$TAR cf $WXDEST/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
-
-rm -f $WXSRC/include/wx/setup.h
-
-echo Re-tarring wxMac in a subdirectory...
-cd $WXDEST
-mkdir wxMac-${WXVER}
-cd wxMac-${WXVER}
-
-# If we have the full set of Mac CW project files,
-# get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
-else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
-fi
-
-$TAR xf ../wxMac-${WXVER}.tar
-rm -f -r contrib/src/mmedia contrib/samples/mmedia
-cd ..
-rm -f wxMac-${WXVER}.tar
-$TAR cf $WXDEST/wxMac-${WXVER}.tar wxMac-${WXVER}/*
-rm -f -r wxMac-${WXVER}
-gzip $WXDEST/wxMac-${WXVER}.tar
-}
-
-### wxUniv: universal-specific files
-#cd $WXSRC
-#cat $WXSRC/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
-#expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
-#
-#echo Re-tarring wxUniversal in a subdirectory...
-#cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-Univ.tar
-#cd ..
-#rm -f wxWindows-${WXVER}-Univ.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-Univ.tar
-
-dospinwxall()
-{
-echo Tarring wxAll...
-
-### wxAll: all distributions in one giant archive
-cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/cw.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/os2.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/mgl.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/utilmake.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/mmedia.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp $WXSRC/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
-expandlines /tmp/wxall_in.txt /tmp/wxall.txt
-$TAR cf $WXDEST/wxAll-${WXVER}.tar -T /tmp/wxall.txt
-
-echo Re-tarring wxAll in a subdirectory...
-cd $WXDEST
-mkdir wxWindows-${WXVER}
-
-cd wxWindows-${WXVER}
-
-# If we have the full set of VC++ project files,
-# get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-VC.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-VC.zip
-else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-VC.zip"
-fi
-
-# If we have the full set of Mac CW project files,
-# get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
-else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
-fi
-
-$TAR xf ../wxAll-${WXVER}.tar
-
-# Translate all .dsp and .dsw files to DOS format
-unix2dos --unix2dos `cat $WXSRC/distrib/msw/vc.rsp`
-
-# Copy OS/2 specific configure files
-cp $WXSRC/distrib/os2/os2-specific.zip docs/os2
-
-# Copy the OS/2 files which probably haven't been copied yet
-mkdir include/wx/os2
-mkdir src/os2
-cp $WXSRC/include/wx/os2/*.H include/wx/os2
-cp $WXSRC/src/os2/*.CPP $WXSRC/src/os2/*.I src/os2
-
-# Make all OS/2 files lower case
-$WXSRC/distrib/msw/namedown include/wx/os2/*.H
-$WXSRC/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
-
-cd ..
-rm -f wxAll-${WXVER}.tar
-$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxAll-${WXVER}.tar
-}
-
-dospinwxdocs()
-{
-echo Tarring wxDocs...
-
-### Doc sources
-#cd $WXSRC
-#cat $WXSRC/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
-#expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
-#
-#echo Re-tarring docs in a subdirectory...
-#cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-doc.tar
-#cd ..
-#rm -f wxWindows-${WXVER}-doc.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-doc.tar
-
-### HTML docs
-cd $WXSRC
-cat $WXSRC/distrib/msw/wx_html.rsp > /tmp/html_in.txt
-expandlines /tmp/html_in.txt /tmp/html.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
-
-echo Re-tarring HTML in a subdirectory...
-cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-HTML.tar
-cd ..
-rm -f wxWindows-${WXVER}-HTML.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-HTML.tar
-
-### HTB docs
-cd $WXSRC
-cat $WXSRC/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt
-expandlines /tmp/htb_in.txt /tmp/htb.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
-
-echo Re-tarring HTB in a subdirectory...
-cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-HTB.tar
-cd ..
-rm -f wxWindows-${WXVER}-HTB.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-HTB.tar
-
-### PDF docs
-cd $WXSRC
-cat $WXSRC/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
-expandlines /tmp/pdf_in.txt /tmp/pdf.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
-
-echo Re-tarring PDF in a subdirectory...
-cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-PDF.tar
-cd ..
-rm -f wxWindows-${WXVER}-PDF.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-PDF.tar
-}
-
-### Tex2RTF
-#cd $WXSRC
-#cat $WXSRC/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
-#expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
-#
-#echo Re-tarring Tex2RTF in a subdirectory...
-#cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-tex2rtf.tar
-#cd ..
-#rm -f wxWindows-${WXVER}-tex2rtf.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-tex2rtf.tar
-
-### OGL
-#cd $WXSRC
-#cat $WXSRC/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
-#expandlines /tmp/ogl_in.txt /tmp/ogl.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar -T /tmp/ogl.txt
-#
-#echo Re-tarring OGL in a subdirectory...
-#cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-ogl.tar
-#cd ..
-#rm -f wxWindows-${WXVER}-ogl.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-ogl.tar
-
-### JPEG
-#cd $WXSRC
-#cat $WXSRC/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
-#expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
-#
-#echo Re-tarring jpeg in a subdirectory...
-#cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-jpeg.tar
-#cd ..
-#rm -f wxWindows-${WXVER}-jpeg.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-jpeg.tar
-
-### TIFF
-#cd $WXSRC
-#cat $WXSRC/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
-#expandlines /tmp/tiff_in.txt /tmp/tiff.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar -T /tmp/tiff.txt
-#
-#echo Re-tarring docs in a subdirectory...
-#cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-tiff.tar
-#cd ..
-#rm -f wxWindows-${WXVER}-tiff.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-tiff.tar

 init=""
 if [ "$1" = "" ]
@@ -400,84 +49,328 @@ then
  exit
 fi

-PROGNAME=$0
-WXSRC=$1
-WXDEST=$2
 WXVER=$3

-SPINWXALL=0
-SPINWXX11=0
-SPINWXGTK=0
-SPINWXMOTIF=0
-SPINWXMAC=0
-SPINWXDOCS=0
-SPINEVERYTHING=0
-
-usage()
-{
-    echo Usage: $PROGNAME "src-dir dest-dir version-number [ options ]"
-    echo Options:
-    echo "    --help         Display this help message"
-    echo "    --wxall        Spin wxAll"
-    echo "    --wxgtk        Spin wxGTK"
-    echo "    --wxmotif      Spin wxMotif"
-    echo "    --wxmac        Spin wxMac"
-    echo "    --wxx11        Spin wxX11"
-    echo "    --wxdocs       Spin docs"
-    echo "    --all          Spin EVERYTHING"
-
-    exit 1
-}
-
-# Process command line options.
-shift 3
-for i in "$@"; do
-    case "$i" in
-	--wxall) SPINWXALL=1 ;;
-	--wxx11) SPINWXX11=1 ;;
-	--wxgtk) SPINWXGTK=1 ;;
-	--wxmotif) SPINWXMOTIF=1 ;;
-	--wxmac) SPINWXMAC=1 ;;
-	--wxdocs) SPINWXDOCS=1 ;;
-	--all) SPINEVERYTHING=1 ;;
-	*)
-	    usage
-	    exit
-	    ;;
-    esac
-done
-
 echo About to archive wxWindows:
-echo   From    $WXSRC
-echo   To      $WXDEST
-echo   Version $WXVER
+echo   From   $1
+echo   To     $2
 echo CTRL-C if this is not correct.
 read dummy

-doinit
+cd $1

-if [ "$SPINWXX11" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
-  dospinwxx11
+echo Removing backup files...
+rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
+
+rm -f $2/wx*-${WXVER}*.tar.gz
+
+# Copy setup files
+cp $1/include/wx/os2/SETUP0.H $1/include/wx/os2/setup.h
+cp $1/include/wx/msw/setup0.h $1/include/wx/msw/setup.h
+cp $1/include/wx/univ/setup0.h $1/include/wx/univ/setup.h
+
+echo Tarring...
+
+### Generic
+#cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp > /tmp/wxgen_in.txt
+#expandlines /tmp/wxgen_in.txt /tmp/wxgen.txt
+#$TAR cf $2/wxWindows-${WXVER}-gen.tar -T /tmp/wxgen.txt
+#gzip $2/wxWindows-${WXVER}-gen.tar
+#mv $2/wxWindows-${WXVER}-gen.tar.gz $2/wxWindows-${WXVER}-gen.tgz
+
+### wxGTK
+cd $1
+cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
+expandlines /tmp/wxgtk_in.txt /tmp/wxgtk.txt
+$TAR cf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
+
+echo Re-tarring wxGTK in a subdirectory...
+cd $2
+mkdir wxGTK-${WXVER}
+cd wxGTK-${WXVER}
+$TAR xf ../wxGTK-${WXVER}.tar
+cd ..
+rm -f wxGTK-${WXVER}.tar
+$TAR cf $2/wxGTK-${WXVER}.tar wxGTK-${WXVER}/*
+rm -f -r wxGTK-${WXVER}
+gzip $2/wxGTK-${WXVER}.tar
+
+### wxMotif
+cd $1
+cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmotif_in.txt
+expandlines /tmp/wxmotif_in.txt /tmp/wxmotif.txt
+$TAR cf $2/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
+
+echo Re-tarring wxMotif in a subdirectory...
+cd $2
+mkdir wxMotif-${WXVER}
+cd wxMotif-${WXVER}
+$TAR xf ../wxMotif-${WXVER}.tar
+cd ..
+rm -f wxMotif-${WXVER}.tar
+$TAR cf $2/wxMotif-${WXVER}.tar wxMotif-${WXVER}/*
+rm -f -r wxMotif-${WXVER}
+gzip $2/wxMotif-${WXVER}.tar
+
+### wxX11: combined wxMotif and wxX11 distributions
+cd $1
+cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
+expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
+$TAR cf $2/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
+
+echo Re-tarring wxX11 in a subdirectory...
+cd $2
+mkdir wxX11-${WXVER}
+cd wxX11-${WXVER}
+$TAR xf ../wxX11-${WXVER}.tar
+cd ..
+rm -f wxX11-${WXVER}.tar
+$TAR cf $2/wxX11-${WXVER}.tar wxX11-${WXVER}/*
+rm -f -r wxX11-${WXVER}
+gzip $2/wxX11-${WXVER}.tar
+
+### wxMSW
+# cd $1
+# cat $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/bc.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmsw_in.txt
+# expandlines /tmp/wxmsw_in.txt /tmp/wxmsw.txt
+# $TAR cf $2/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
+# gzip $2/wxMSW-${WXVER}.tar
+
+### wxMac
+cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
+cd $1
+cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
+expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
+$TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
+
+rm -f $1/include/wx/setup.h
+
+echo Re-tarring wxMac in a subdirectory...
+cd $2
+mkdir wxMac-${WXVER}
+cd wxMac-${WXVER}
+$TAR xf ../wxMac-${WXVER}.tar
+rm -f -r contrib/src/mmedia contrib/samples/mmedia
+cd ..
+rm -f wxMac-${WXVER}.tar
+$TAR cf $2/wxMac-${WXVER}.tar wxMac-${WXVER}/*
+rm -f -r wxMac-${WXVER}
+gzip $2/wxMac-${WXVER}.tar
+
+### wxUniv: universal-specific files
+#cd $1
+#cat $1/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
+#expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
+#$TAR cf $2/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
+#
+#echo Re-tarring wxUniversal in a subdirectory...
+#cd $2
+#mkdir wxWindows-${WXVER}
+#cd wxWindows-${WXVER}
+#$TAR xf ../wxWindows-${WXVER}-Univ.tar
+#cd ..
+#rm -f wxWindows-${WXVER}-Univ.tar
+#$TAR cf $2/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
+#rm -f -r wxWindows-${WXVER}
+#gzip $2/wxWindows-${WXVER}-Univ.tar
+
+### wxAll: all distributions in one giant archive
+cd $1
+cat $1/distrib/msw/generic.rsp $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/mac.rsp $1/distrib/msw/os2.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/mgl.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/mmedia.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
+expandlines /tmp/wxall_in.txt /tmp/wxall.txt
+$TAR cf $2/wxAll-${WXVER}.tar -T /tmp/wxall.txt
+
+echo Re-tarring wxAll in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+
+# If we have the full set of VC++ project files,
+# get them
+if [ -f $2/extra/wxWindows-${WXVER}-VC.zip ]; then
+  unzip -o $2/extra/wxWindows-${WXVER}-VC.zip
+else
+  echo "Warning - did not find $2/deliver/extra/wxWindows-${WXVER}-VC.zip"
 fi

-if [ "$SPINWXGTK" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
-  dospinwxgtk
-fi
+cd wxWindows-${WXVER}
+$TAR xf ../wxAll-${WXVER}.tar

-if [ "$SPINWXMAC" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
-  dospinwxmac
-fi
+# Translate all .dsp and .dsw files to DOS format
+unix2dos --unix2dos `cat $1/distrib/msw/vc.rsp`

-if [ "$SPINWXMOTIF" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
-  dospinwxmotif
-fi
+# Copy OS/2 specific configure files
+cp $1/distrib/os2/os2-specific.zip docs/os2

-if [ "$SPINWXDOCS" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
-  dospinwxdocs
-fi
+# Copy the OS/2 files which probably haven't been copied yet
+mkdir include/wx/os2
+mkdir src/os2
+cp $1/include/wx/os2/*.H include/wx/os2
+cp $1/src/os2/*.CPP $1/src/os2/*.I src/os2

-if [ "$SPINWXALL" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
-  dospinwxall
-fi
+# Make all OS/2 files lower case
+$1/distrib/msw/namedown include/wx/os2/*.H
+$1/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
+
+cd ..
+rm -f wxAll-${WXVER}.tar
+$TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxAll-${WXVER}.tar


+### Doc sources
+#cd $1
+#cat $1/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
+#expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
+#$TAR cf $2/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
+#
+#echo Re-tarring docs in a subdirectory...
+#cd $2
+#mkdir wxWindows-${WXVER}
+#cd wxWindows-${WXVER}
+#$TAR xf ../wxWindows-${WXVER}-doc.tar
+#cd ..
+#rm -f wxWindows-${WXVER}-doc.tar
+#$TAR cf $2/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
+#rm -f -r wxWindows-${WXVER}
+#gzip $2/wxWindows-${WXVER}-doc.tar
+
+### HTML docs
+cd $1
+cat $1/distrib/msw/wx_html.rsp > /tmp/html_in.txt
+expandlines /tmp/html_in.txt /tmp/html.txt
+$TAR cf $2/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
+
+echo Re-tarring HTML in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-HTML.tar
+cd ..
+rm -f wxWindows-${WXVER}-HTML.tar
+$TAR cf $2/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxWindows-${WXVER}-HTML.tar
+
+### HTB docs
+cd $1
+cat $1/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt
+expandlines /tmp/htb_in.txt /tmp/htb.txt
+$TAR cf $2/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
+
+echo Re-tarring HTB in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-HTB.tar
+cd ..
+rm -f wxWindows-${WXVER}-HTB.tar
+$TAR cf $2/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxWindows-${WXVER}-HTB.tar
+
+### PDF docs
+cd $1
+cat $1/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
+expandlines /tmp/pdf_in.txt /tmp/pdf.txt
+$TAR cf $2/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
+
+echo Re-tarring PDF in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-PDF.tar
+cd ..
+rm -f wxWindows-${WXVER}-PDF.tar
+$TAR cf $2/wxWindows-${WXVER}-PDF.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxWindows-${WXVER}-PDF.tar
+
+### Tex2RTF
+#cd $1
+#cat $1/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
+#expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
+#$TAR cf $2/wxWindows-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
+#
+#echo Re-tarring Tex2RTF in a subdirectory...
+#cd $2
+#mkdir wxWindows-${WXVER}
+#cd wxWindows-${WXVER}
+#$TAR xf ../wxWindows-${WXVER}-tex2rtf.tar
+#cd ..
+#rm -f wxWindows-${WXVER}-tex2rtf.tar
+#$TAR cf $2/wxWindows-${WXVER}-tex2rtf.tar wxWindows-${WXVER}/*
+#rm -f -r wxWindows-${WXVER}
+#gzip $2/wxWindows-${WXVER}-tex2rtf.tar
+
+### OGL
+#cd $1
+#cat $1/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
+#expandlines /tmp/ogl_in.txt /tmp/ogl.txt
+#$TAR cf $2/wxWindows-${WXVER}-ogl.tar -T /tmp/ogl.txt
+#
+#echo Re-tarring OGL in a subdirectory...
+#cd $2
+#mkdir wxWindows-${WXVER}
+#cd wxWindows-${WXVER}
+#$TAR xf ../wxWindows-${WXVER}-ogl.tar
+#cd ..
+#rm -f wxWindows-${WXVER}-ogl.tar
+#$TAR cf $2/wxWindows-${WXVER}-ogl.tar wxWindows-${WXVER}/*
+#rm -f -r wxWindows-${WXVER}
+#gzip $2/wxWindows-${WXVER}-ogl.tar
+
+### JPEG
+#cd $1
+#cat $1/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
+#expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
+#$TAR cf $2/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
+#
+#echo Re-tarring jpeg in a subdirectory...
+#cd $2
+#mkdir wxWindows-${WXVER}
+#cd wxWindows-${WXVER}
+#$TAR xf ../wxWindows-${WXVER}-jpeg.tar
+#cd ..
+#rm -f wxWindows-${WXVER}-jpeg.tar
+#$TAR cf $2/wxWindows-${WXVER}-jpeg.tar wxWindows-${WXVER}/*
+#rm -f -r wxWindows-${WXVER}
+#gzip $2/wxWindows-${WXVER}-jpeg.tar
+
+### TIFF
+#cd $1
+#cat $1/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
+#expandlines /tmp/tiff_in.txt /tmp/tiff.txt
+#$TAR cf $2/wxWindows-${WXVER}-tiff.tar -T /tmp/tiff.txt
+#
+#echo Re-tarring docs in a subdirectory...
+#cd $2
+#mkdir wxWindows-${WXVER}
+#cd wxWindows-${WXVER}
+#$TAR xf ../wxWindows-${WXVER}-tiff.tar
+#cd ..
+#rm -f wxWindows-${WXVER}-tiff.tar
+#$TAR cf $2/wxWindows-${WXVER}-tiff.tar wxWindows-${WXVER}/*
+#rm -f -r wxWindows-${WXVER}
+#gzip $2/wxWindows-${WXVER}-tiff.tar
+
+# Copy readme and other files
+cd $1
+cp $1/docs/readme.txt $2/readme-${WXVER}.txt
+cp $1/docs/changes.txt $2/changes-${WXVER}.txt
+cp $1/docs/mgl/readme.txt $2/readme-mgl-${WXVER}.txt
+cp $1/docs/mgl/install.txt $2/install-mgl-${WXVER}.txt
+cp $1/docs/x11/readme.txt $2/readme-x11-${WXVER}.txt
+cp $1/docs/x11/readme-nanox.txt $2/readme-nanox-${WXVER}.txt
+cp $1/docs/x11/install.txt $2/install-x11-${WXVER}.txt
+cp $1/docs/motif/readme.txt $2/readme-motif-${WXVER}.txt
+cp $1/docs/motif/install.txt $2/install-motif-${WXVER}.txt
+cp $1/docs/msw/readme.txt $2/readme-msw-${WXVER}.txt
+cp $1/docs/msw/install.txt $2/install-msw-${WXVER}.txt
+cp $1/docs/gtk/readme.txt $2/readme-gtk-${WXVER}.txt
+cp $1/docs/gtk/install.txt $2/install-gtk-${WXVER}.txt
+cp $1/docs/mac/readme.txt $2/readme-mac-${WXVER}.txt
+cp $1/docs/mac/install.txt $2/install-mac-${WXVER}.txt
+cp $1/docs/os2/install.txt $2/install-os2-${WXVER}.txt
+
+echo Done!
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -97,8 +97,6 @@
            $wxGTKINCLUDE{$filename} = $fileflags;
        } elsif ( $filetype eq "OS2H" ) {
            $wxOS2PMINCLUDE{$filename} = $fileflags;
-        } elsif ( $filetype eq "MGLH" ) {
-            $wxMGLINCLUDE{$filename} = $fileflags;
        } elsif ( $filetype eq "X11H" ) {
            $wxX11INCLUDE{$filename} = $fileflags;
        } elsif ( $filetype eq "UnivH" ) {
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -30,7 +30,6 @@
 #  MotifH	/include/wx/motif
 #  MSWH	/include/wx/msw
 #  OS2H	/include/wx/os2
-#  MGLH /include/wx/mgl
 #  X11H	/include/wx/x11
 #  GenericH	/include/wx/generic
 #  HtmlH	/include/wx/html
@@ -80,7 +79,7 @@ dirctrlg.cpp	Generic
 dirdlgg.cpp	Generic	NotWin32
 dragimgg.cpp	Generic	NotOS2
 fdrepdlg.cpp	Generic	NotMSW
-filedlgg.cpp	Generic	Generic,NotX,NotOS2,NotMac
+filedlgg.cpp	Generic	NotMSW,NotX,NotOS2,NotMac
 fontdlgg.cpp	Generic	Generic,NotOS2
 grid.cpp	Generic
 gridctrl.cpp	Generic
@@ -292,12 +291,12 @@ dragimag.cpp	MSW
 dropsrc.cpp	MSW	OLE
 droptgt.cpp	MSW	OLE
 enhmeta.cpp	MSW	Win32Only
-helpbest.cpp	MSW	Win32Only,LowLevel
+helpbest.cpp	MSW	Win32Only
 evtloop.cpp	MSW	LowLevel
 fdrepdlg.cpp	MSW	Win32Only
 # FIXME: the generic implementation doesn't work under MSW, so we must
 #        the native dialog under MSW
-filedlg.cpp	MSW
+filedlg.cpp	MSW	LowLevel
 font.cpp	MSW	LowLevel
 fontdlg.cpp	MSW
 fontenum.cpp	MSW	LowLevel
@@ -308,8 +307,8 @@ gaugemsw.cpp	MSW	NotWin32
 gdiimage.cpp	MSW	LowLevel
 gdiobj.cpp	MSW	LowLevel
 glcanvas.cpp	MSW
-helpchm.cpp	MSW	Win32Only,LowLevel
-helpwin.cpp	MSW	LowLevel
+helpchm.cpp	MSW	Win32Only
+helpwin.cpp	MSW
 icon.cpp	MSW	LowLevel
 imaglist.cpp	MSW	Win32Only
 iniconf.cpp	MSW
@@ -1230,28 +1229,6 @@ textctrl.h	X11H
 toplevel.h	X11H
 window.h	X11H

-app.h	MGLH
-bitmap.h	MGLH
-brush.h	MGLH
-clipbrd.h	MGLH
-colour.h	MGLH
-cursor.h	MGLH
-dc.h	MGLH
-dcclient.h	MGLH
-dcmemory.h	MGLH
-dcscreen.h	MGLH
-font.h	MGLH
-fontutil.h	MGLH
-gdiobj.h	MGLH
-icon.h	MGLH
-palette.h	MGLH
-pen.h	MGLH
-popupwin.h	MGLH
-private.h	MGLH
-region.h	MGLH
-toplevel.h	MGLH
-window.h	MGLH
-
 accel.h	MSWH
 app.h	MSWH
 bitmap.h	MSWH
@@ -1289,7 +1266,7 @@ fontdlg.h	MSWH
 frame.h	MSWH
 gauge95.h	MSWH
 gaugemsw.h	MSWH
-gccpriv.h	MSWH	Base
+gccpriv.h	MSWH
 gdiimage.h	MSWH
 gdiobj.h	MSWH
 glcanvas.h	MSWH
--- a/distrib/msw/tmake/mgl.t
+++ b/distrib/msw/tmake/mgl.t
@@ -13,6 +13,7 @@
    IncludeTemplate("filelist.t");

    #! find all our sources
+    $project{"COMMONOBJS"} .= "parser.o ";

    foreach $file (sort keys %wxGeneric) {
        next if $wxGeneric{$file} =~ /\bNotMGL\b/;
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -51,8 +51,6 @@ samples/db/db.dsw

 samples/dialogs/dialogs.dsp
 samples/dialogs/dialogs.dsw
-samples/dialogs/dialogsUniv.dsp
-samples/dialogs/dialogsUniv.dsw

 samples/dialup/dialup.dsp
 samples/dialup/dialup.dsw
@@ -247,7 +245,6 @@ samples/wizard/wizard.dsw
 samples/widgets/widgets.dsp
 samples/widgets/widgets.dsw
 samples/widgets/widgetsUniv.dsp
-samples/widgets/widgetsUniv.dsw

 samples/opengl/cube/cube.dsp
 samples/opengl/cube/cube.dsw
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -7,7 +7,7 @@ set webfiles=c:\wx2dev\wxWebSite
 set inno=0

 Rem Set this to the required version
-set version=2.4.0
+set version=2.3.4

 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -119,8 +119,6 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp

-zip32 -@ %dest%\wxWindows-%version%-CW-Mac.zip < %src%\distrib\msw\cw_mac.rsp
-
 erase /Y %src%\include\wx\setup.h

 if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
@@ -156,71 +154,51 @@ zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utils.rsp
 zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utilmake.rsp
 zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\univ.rsp

-echo Re-archiving wxWindows-%version%-win.zip
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-win.zip wxWindows-%version% %dest%

-echo Removing .mms files
-zip32 -d %dest%\wxWindows-%version%-win.zip wxWindows-%version%/src/gtk/descrip.mms wxWindows-%version%/src/motif/descrip.mms
+zip32 -d %dest%\wxWindows-%version%-win.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms

-echo Creating %dest\wxWindows-%version%-DocSource.zip
 zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-DocSource.zip wxWindows-%version% %dest%

-echo Creating %dest\wxWindows-%version%-WinHelp.zip
 zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-WinHelp.zip wxWindows-%version% %dest%

-echo Creating %dest\wxWindows-%version%-HTML.zip
 zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTML.zip wxWindows-%version% %dest%

-echo Creating %dest\wxWindows-%version%-PDF.zip
 zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-PDF.zip wxWindows-%version% %dest%

 Rem zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
 Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Word.zip wxWindows-%version% %dest%

-echo Creating %dest\wxWindows-%version%-HTB.zip
 zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTB.zip wxWindows-%version% %dest%

-echo Creating %dest\wxWindows-%version%-HTMLHelp.zip
 zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTMLHelp.zip wxWindows-%version% %dest%

-Rem Add Linuxy docs to a separate archive to be transported to Linux for the
-Rem Linux-based releases
-echo Creating %dest\wxWindows-%version%-LinuxDocs.zip
-zip32 -@ %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_html.rsp
-zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_pdf.rsp
-zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_htb.rsp
-
 Rem PDF/HTML docs that should go into the Windows setup because
 Rem there are no WinHelp equivalents
-echo Creating %dest\wxWindows-%version%-ExtraDoc.zip
 zip32 -@ %dest\wxWindows-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-ExtraDoc.zip wxWindows-%version% %dest%

 Rem zip up Univ-specific files
-echo Creating %dest\wxWindows-%version%-Univ.zip
 zip32 -@ %dest\wxWindows-%version%-Univ.zip < %src\distrib\msw\univ.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Univ.zip wxWindows-%version% %dest%

 rem VC++ project files
-echo Creating %dest\wxWindows-%version%-VC.zip
 zip32 -@ %dest\wxWindows-%version%-VC.zip < %src\distrib\msw\vc.rsp
-Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-VC.zip wxWindows-%version% %dest%
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-VC.zip wxWindows-%version% %dest%

 rem BC++ project files
-echo Creating %dest\wxWindows-%version%-BC.zip
 zip32 -@ %dest\wxWindows-%version%-BC.zip < %src\distrib\msw\bc.rsp
-Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-BC.zip wxWindows-%version% %dest%
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-BC.zip wxWindows-%version% %dest%

 rem CodeWarrior project files
-echo Creating %dest\wxWindows-%version%-CW.zip
 zip32 -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp
-Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest%
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest%

 rem Dialog Editor source and binary
 Rem erase %dest\dialoged-source.zip
@@ -261,16 +239,11 @@ Rem zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*

 cd %dest

-rem Put all archives for transit to Linux in a zip file
-echo Creating %dest\wxWindows-%version%-LinuxTransit.zip
-erase %dest\wxWindows-%version%-LinuxTransit.zip
-zip32 %dest\wxWindows-%version%-LinuxTransit.zip wxWindows-%version%-LinuxDocs.zip wxWindows-%version%-VC.zip wxWindows-%version%-CW-Mac.zip
-
-echo Unzipping the Windows files into wxWindows-%version%
+rem Unzip the Windows files into 'wxWindows-%version%'

 unzip32 -o wxWindows-%version%-win.zip
-unzip32 -o wxWindows-%version%-VC.zip -d wxWindows-%version
-unzip32 -o wxWindows-%version%-BC.zip -d wxWindows-%version
+unzip32 -o wxWindows-%version%-VC.zip
+unzip32 -o wxWindows-%version%-BC.zip
 unzip32 -o wxWindows-%version%-HTMLHelp.zip
 unzip32 -o wxWindows-%version%-ExtraDoc.zip
 Rem Need Word file, for Remstar DB classes
--- a/distrib/os2/os2-specific.zip
+++ b/distrib/os2/os2-specific.zip
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -170,23 +170,6 @@ wxThread and related classes:
 OTHER CHANGES
 =============

-2.4.0
-----
-
-wxMSW:
-
- fixed loss of client data in wxChoice::SetString()
-
-wxGTK:
-
- fixed wxMenu::Remove (John Skiff and Benjamin Williams)
-
-All:
-
- Improved contrib/utils/convertrc parsing (David J. Cooke)
- Fixed handling of URLs and filenames in wxFileSystem
- Implemented alignment for wxGrid bool editor and renderer
-
 2.3.4
 -----

--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -1,4 +1,4 @@
-wxWindows 2.4 for GTK installation
+wxWindows 2.3 for GTK installation
 ----------------------------------

 IMPORTANT NOTE:
@@ -11,7 +11,7 @@ IMPORTANT NOTE:

  When sending bug reports tell us what version of wxWindows you are
  using (including the beta) and what compiler on what system. One
-  example: wxGTK 2.4.0, gcc 2.95.4, Redhat 6.2
+  example: wxGTK 2.3.4, gcc 2.95.4, Redhat 6.2

 * The simplest case
 -------------------
@@ -44,7 +44,7 @@ If you want to remove wxWindows on Unix you can do this:
 * The GTK+ 2 case
 -----------------

-wxGTK 2.4.0 has support for the new version 2.0.X of GTK+. This means
+wxGTK 2.3.4 has support for the new version 2.0.X of GTK+. This means
 that wxGTK apps can now make use Unicode as the underlying encoding
 for all text operations. This is a very fundamental change and will
 need time to stabilize, so be careful. Anyways, after installing a
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,7 +1,7 @@

-   Welcome to wxWindows/Gtk 2.4
+   Welcome to wxWindows/Gtk 2.3

-you have downloaded version 2.4 of the GTK port of the 
+you have downloaded version 2.3 of the GTK port of the 
 wxWindows GUI library.

 wxWindows no longer supports GTK 1.0 (as did some early
--- a/docs/html/faq.htm
+++ b/docs/html/faq.htm
@@ -1,4 +1,3 @@
-
 <html>

 <head>
@@ -37,7 +36,7 @@ Welcome to the wxWindows FAQ. Please select a category:<p>

 For further information, please see the
 <a href="http://www.wxwindows.org" target=_top>wxWindows Web site</a>,
-<a href="http://wiki.wxwindows.org" target=_top>wxWiki</a>
+<a href="http://mintzer.pqdot.net/cgi-bin/wiki/wiki.pl" target=_top>wxWiki</a>
 and install.txt (per port), todo.txt (per port), and bugs.txt (all ports) files
 in your wxWindows installation.
 <p>
--- a/docs/html/faqgtk.htm
+++ b/docs/html/faqgtk.htm
@@ -32,7 +32,6 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <li><a href="#redhat">Warning about GTK libraries supplied with RedHat</a></li>
 <li><a href="#bincompat">What range of Intel Linux platforms will a given application binary be usable on?</a></li>
 <li><a href="#static">Can I statically link the GTK+ library?</a></li>
-<li><a href="#charinframe">Why does my simple program using <tt>EVT_CHAR</tt> doesn't work?</a></li>
 </ul>

 <hr>
@@ -98,17 +97,6 @@ the image libraries and std C++ lib)."
 No, this is not possible. It leads to crashes in GTK+.
 <P>

-<h3><a name="#charinframe">Why does my simple program using
-<tt>EVT_CHAR</tt> doesn't work?</a></h3>
-
-In wxGTK, the frames never get focus and so can never receive <tt>CHAR</tt>
-nor <tt>KEY</tt> events so an <tt>EVT_CHAR</tt> handler for a frame will be
-never called. To receive these events, you should create a <tt>wxPanel</tt>
-inside the frame and register the key event handlers for the panel, not the
-frame.
-
-<p>
-
 </font>

 </BODY>
--- a/docs/latex/wx/cmdproc.tex
+++ b/docs/latex/wx/cmdproc.tex
@@ -20,13 +20,13 @@ if you want different behaviour.

 \membersection{wxCommandProcessor::wxCommandProcessor}

-\func{}{wxCommandProcessor}{\param{int}{ maxCommands = $-1$}}
+\func{}{wxCommandProcessor}{\param{int}{ maxCommands = 100}}

 Constructor.

-{\it maxCommands} may be set to a positive integer to limit the number of
-commands stored to it, otherwise (and by default) the list of commands can grow
-arbitrarily.
+{\it maxCommands} defaults to a rather arbitrary 100, but can be set from 1 to any integer.
+If your wxCommand classes store a lot of data, you may wish the limit the number of
+commands stored to a smaller number.

 \membersection{wxCommandProcessor::\destruct{wxCommandProcessor}}

@@ -46,9 +46,9 @@ Returns TRUE if the currently-active command can be undone, FALSE otherwise.

 Deletes all the commands in the list and sets the current command pointer to NULL.

-\membersection{wxCommandProcessor::Redo}
+\membersection{wxCommandProcessor::Do}

-\func{virtual bool}{Redo}{\void}
+\func{virtual bool}{Do}{\void}

 Executes (redoes) the current command (the command that has just been undone if any).

@@ -76,24 +76,12 @@ Returns the edit menu associated with the command processor.

 Returns the string that will be appended to the Redo menu item.

-\membersection{wxCommandProcessor::GetRedoMenuLabel}\label{wxcommandprocessorgetredomenulabel}
-
-\constfunc{wxString}{GetRedoMenuLabel}{\void}
-
-Returns the string that will be shown for the redo menu item.
-
 \membersection{wxCommandProcessor::GetUndoAccelerator}\label{wxcommandprocessorgetundoaccelerator}

 \constfunc{const wxString\&}{GetUndoAccelerator}{\void}

 Returns the string that will be appended to the Undo menu item.

-\membersection{wxCommandProcessor::GetUndoMenuLabel}\label{wxcommandprocessorgetundomenulabel}
-
-\constfunc{wxString}{GetUndoMenuLabel}{\void}
-
-Returns the string that will be shown for the undo menu item.
-
 \membersection{wxCommandProcessor::Initialize}

 \func{virtual void}{Initialize}{\void}
@@ -111,13 +99,6 @@ menu as appropriate. Set this to NULL if the menu is about to be
 destroyed and command operations may still be performed, or the command
 processor may try to access an invalid pointer.

-\membersection{wxCommandProcessor::SetMenuStrings}
-
-\func{void}{SetMenuStrings}{\void}
-
-Sets the menu labels according to the currently set menu and the current
-command state.
-
 \membersection{wxCommandProcessor::SetRedoAccelerator}\label{wxcommandprocessorsetredoaccelerator}

 \func{void}{SetRedoAccelerator}{\param{const wxString\&}{accel}}
--- a/docs/latex/wx/filename.tex
+++ b/docs/latex/wx/filename.tex
@@ -89,7 +89,7 @@ on the file name format and the only portable way to answer to this question is
 to use \helpref{IsAbsolute}{wxfilenameisabsolute} method. To ensure that the
 filename is absolute you may use \helpref{Normalize}{wxfilenamenormalize}. There
 is also an inverse function \helpref{MakeRelativeTo}{wxfilenamemakerelativeto} 
-which undoes what \helpref{Normalize(wxPATH\_NORM\_DOTS)}{wxfilenamenormalize} 
+which undoes what \helpref{Normalize(wxPATH\_NORM\_DOTS}{wxfilenamenormalize} 
 does.

 Other functions returning information about the file format provided by this
--- a/docs/latex/wx/filesys.tex
+++ b/docs/latex/wx/filesys.tex
@@ -59,28 +59,28 @@ Sets the current location. {\it location} parameter passed to
 \helpref{OpenFile}{wxfilesystemopenfile} is relative to this path.

 {\bf Caution! } Unless {\it is\_dir} is TRUE the {\it location} parameter
-is not the directory name but the name of the file in this directory. All these
-commands change the path to "dir/subdir/":
+is not directory name but the name of the file in this directory!! All these
+commands change path to "dir/subdir/" :

 \begin{verbatim}
-  ChangePathTo("dir/subdir/xh.htm");
-  ChangePathTo("dir/subdir", TRUE);
-C  hangePathTo("dir/subdir/", TRUE);
+ChangePathTo("dir/subdir/xh.htm");
+ChangePathTo("dir/subdir", TRUE);
+ChangePathTo("dir/subdir/", TRUE);
 \end{verbatim}

 \wxheading{Parameters}

-\docparam{location}{the new location. Its meaning depends on the value of {\it is\_dir}}
+\docparam{location}{the new location. Its meaning depends on value of {\it is\_dir}}

-\docparam{is\_dir}{if TRUE {\it location} is new directory. If FALSE (default) 
+\docparam{is\_dir}{if TRUE {\it location} is new directory. If FALSE (default)
 {\it location} is {\bf file in} the new directory.}

 \wxheading{Example}

 \begin{verbatim}
-  f = fs -> OpenFile("hello.htm"); // opens file 'hello.htm'
-  fs -> ChangePathTo("subdir/folder", TRUE);
-  f = fs -> OpenFile("hello.htm"); // opens file 'subdir/folder/hello.htm' !!
+f = fs -> OpenFile("hello.htm"); // opens file 'hello.htm'
+fs -> ChangePathTo("subdir/folder", TRUE);
+f = fs -> OpenFile("hello.htm"); // opens file 'subdir/folder/hello.htm' !!
 \end{verbatim}

 \membersection{wxFileSystem::GetPath}\label{wxfilesystemgetpath}
@@ -89,16 +89,6 @@ C  hangePathTo("dir/subdir/", TRUE);

 Returns actual path (set by \helpref{ChangePathTo}{wxfilesystemchangepathto}).

-\membersection{wxFileSystem::FileNameToURL}\label{wxfilesystemfilenametourl}
-
-\func{static wxString}{FileNameToURL}{\param{wxFileName }{filename}}
-
-Converts filename into URL.
-
-\wxheading{See also}
-
-\helpref{wxFileSystem::URLToFileName}{wxfilesystemurltofilename},
-\helpref{wxFileName}{wxfilename}

 \membersection{wxFileSystem::FindFirst}\label{wxfilesystemfindfirst}

@@ -112,26 +102,15 @@ wxFILE (only files), wxDIR (only directories) or 0 (both).

 \func{wxString}{FindNext}{\void}

-Returns the next filename that matches parameters passed to \helpref{FindFirst}{wxfilesystemfindfirst}.
+Returns next filename that matches parameters passed to \helpref{FindFirst}{wxfilesystemfindfirst}.
+

 \membersection{wxFileSystem::OpenFile}\label{wxfilesystemopenfile}

 \func{wxFSFile*}{OpenFile}{\param{const wxString\& }{location}}

-Opens the file and returns a pointer to a \helpref{wxFSFile}{wxfsfile} object
+Opens file and returns pointer to \helpref{wxFSFile}{wxfsfile} object
 or NULL if failed. It first tries to open the file in relative scope
 (based on value passed to ChangePathTo() method) and then as an
 absolute path.

-\membersection{wxFileSystem::URLToFileName}\label{wxfilesystemurltofilename}
-
-\func{static wxFileName}{URLToFileName}{\param{const wxString& }{url}}
-
-Converts URL into a well-formed filename. The URL must use the {\tt file} 
-protocol.
-
-\wxheading{See also}
-
-\helpref{wxFileSystem::FileNameToURL}{wxfilesystemfilenametourl}, 
-\helpref{wxFileName}{wxfilename}
-
--- a/docs/latex/wx/frame.tex
+++ b/docs/latex/wx/frame.tex
@@ -52,14 +52,14 @@ a wxEVT\_HELP event if the user clicked on an application window. {\it Note} tha
 style and must be set by calling \helpref{SetExtraStyle}{wxwindowsetextrastyle} before Create is called (two-step construction).
 You cannot use this style together with wxMAXIMIZE\_BOX or wxMINIMIZE\_BOX, so
 you should use 
-{\tt wxDEFAULT\_FRAME\_STYLE \& (wxMINIMIZE\_BOX | wxMAXIMIZE\_BOX)} for the
+{\tt wxDEFAULT\_FRAME\_STYLE \& \verb$~$ (wxMINIMIZE\_BOX | wxMAXIMIZE\_BOX)} for the
 frames having this style (the dialogs don't have minimize nor maximize box by
 default)}
 \end{twocollist}

 The default frame style is for normal, resizeable frames. To create a frame
 which can not be resized by user, you may use the following combination of
-styles: {\tt wxDEFAULT\_FRAME\_STYLE \& (wxRESIZE\_BORDER \pipe wxRESIZE\_BOX \pipe wxMAXIMIZE\_BOX)}.
+styles: {\tt wxDEFAULT\_FRAME\_STYLE \& \verb$~$ (wxRESIZE\_BORDER \pipe wxRESIZE\_BOX \pipe wxMAXIMIZE\_BOX)}.
 % Note: the space after the tilde is necessary or Tex2RTF complains.

 See also \helpref{window styles overview}{windowstyles}.
--- a/docs/latex/wx/fs.tex
+++ b/docs/latex/wx/fs.tex
@@ -47,8 +47,8 @@ protocols - for example you may want to access files in a ZIP archive:

 file:archives/cpp\_doc.zip\#zip:reference/fopen.htm\#syntax

-In this example, the protocol is "zip", right location is
-"reference/fopen.htm", anchor is "syntax" and left location
+In this example, the protocol is "zip", the left location is
+"reference/fopen.htm", the anchor is "syntax" and the right location
 is "file:archives/cpp\_doc.zip". 

 There are {\bf two} protocols used in this example: "zip" and "file".
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -371,8 +371,7 @@ call to this function.

 \membersection{::wxSafeYield}\label{wxsafeyield}

-\func{bool}{wxSafeYield}{\param{wxWindow*}{ win = NULL}, \param{bool}{
-    onlyIfNeeded = FALSE}}
+\func{bool}{wxSafeYield}{\param{wxWindow*}{ win = NULL}}

 This function is similar to wxYield, except that it disables the user input to
 all program windows before calling wxYield and re-enables it again
@@ -402,7 +401,7 @@ once for each previous successful call to \helpref{wxInitialize}{wxinitialize}.

 Calls \helpref{wxApp::Yield}{wxappyield}.

-This function is kept only for backwards compatibility. Please use
+This function is kept only for backwards compatibility. Please use 
 the \helpref{wxApp::Yield}{wxappyield} method instead in any new code.

 \wxheading{Include files}
@@ -477,10 +476,10 @@ case of using DDE under Windows for command execution). In particular, in this,
 and only this, case the calling code will not get the notification about
 process termination.

-If callback isn't NULL and if execution is asynchronous,
+If callback isn't NULL and if execution is asynchronous, 
 \helpref{wxProcess::OnTerminate}{wxprocessonterminate} will be called when
 the process finishes. Specifying this parameter also allows you to redirect the
-standard input and/or output of the process being launched by calling
+standard input and/or output of the process being launched by calling 
 \helpref{Redirect}{wxprocessredirect}. If the child process IO is redirected,
 under Windows the process window is not shown by default (this avoids having to
 flush an unnecessary console for the processes which don't create any windows
@@ -510,7 +509,7 @@ single string.}
 array, any additional ones are the command parameters and the array must be
 terminated with a NULL pointer.}

-\docparam{flags}{Combination of bit masks {\tt wxEXEC\_ASYNC},
+\docparam{flags}{Combination of bit masks {\tt wxEXEC\_ASYNC}, 
 {\tt wxEXEC\_SYNC} and {\tt wxEXEC\_NOHIDE}}

 \docparam{callback}{An optional pointer to \helpref{wxProcess}{wxprocess}}
@@ -618,7 +617,7 @@ See also \helpref{wxExecute}{wxexecute}, \helpref{Exec sample}{sampleexec}.

 \func{bool}{wxShutdown}{\param{wxShutdownFlags}{flags}}

-This function shuts down or reboots the computer depending on the value of the
+This function shuts down or reboots the computer depending on the value of the 
 {\it flags}. Please notice that doing this requires the corresponding access
 rights (superuser under Unix, {\tt SE\_SHUTDOWN} privelege under Windows NT)
 and that this function is only implemented under Unix and Win32.
@@ -732,7 +731,7 @@ Returns time of last modification of given file.

 \func{char *}{wxFileNameFromPath}{\param{char *}{path}}

-{\bf NB:} This function is obsolete, please use
+{\bf NB:} This function is obsolete, please use 
 \helpref{wxFileName::SplitPath}{wxfilenamesplitpath} instead.

 Returns the filename for a full path. The second form returns a pointer to
@@ -926,7 +925,7 @@ Under MS Windows, the current drive is also changed if {\it dir} contains a driv

 \func{void}{wxSplitPath}{\param{const char *}{ fullname}, \param{wxString *}{ path}, \param{wxString *}{ name}, \param{wxString *}{ ext}}

-{\bf NB:} This function is obsolete, please use
+{\bf NB:} This function is obsolete, please use 
 \helpref{wxFileName::SplitPath}{wxfilenamesplitpath} instead.

 This function splits a full file name into components: the path (including possible disk/drive
@@ -1128,7 +1127,7 @@ Gets operating system version information.
 \func{const wxChar *}{wxGetUserHome}{\param{const wxString\& }{user = ""}}

 Returns the home directory for the given user. If the username is empty
-(default value), this function behaves like
+(default value), this function behaves like 
 \helpref{wxGetHomeDir}{wxgethomedir}.

 \wxheading{Include files}
@@ -2225,7 +2224,7 @@ Find a menu item identifier associated with the given frame's menu bar.

 \func{wxWindow *}{wxFindWindowByLabel}{\param{const wxString\& }{label}, \param{wxWindow *}{parent=NULL}}

-{\bf NB:} This function is obsolete, please use
+{\bf NB:} This function is obsolete, please use 
 \helpref{wxWindow::FindWindowByLabel}{wxwindowfindwindowbylabel} instead.

 Find a window by its label. Depending on the type of window, the label may be a window title
@@ -2241,7 +2240,7 @@ The search is recursive in both cases.

 \func{wxWindow *}{wxFindWindowByName}{\param{const wxString\& }{name}, \param{wxWindow *}{parent=NULL}}

-{\bf NB:} This function is obsolete, please use
+{\bf NB:} This function is obsolete, please use 
 \helpref{wxWindow::FindWindowByName}{wxwindowfindwindowbyname} instead.

 Find a window by its name (as given in a window constructor or {\bf Create} function call).
@@ -2419,7 +2418,7 @@ See also \helpref{wxGetDisplayName}{wxgetdisplayname}.

 \func{void}{wxStripMenuCodes}{\param{char *}{in}, \param{char *}{out}}

-{\bf NB:} This function is obsolete, please use
+{\bf NB:} This function is obsolete, please use 
 \helpref{wxMenuItem::GetLabelFromText}{wxmenuitemgetlabelfromtext} instead.

 Strips any menu codes from {\it in} and places the result
@@ -3072,7 +3071,7 @@ instead.

 \func{void}{wxError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWindows Internal Error"}}

-{\bf NB:} This function is now obsolete, please use \helpref{wxLogError}{wxlogerror}
+{\bf NB:} This function is now obsolete, please use \helpref{wxLogError}{wxlogerror} 
 instead.

 Displays {\it msg} and continues. This writes to standard error under
@@ -3087,7 +3086,7 @@ wxWindows errors. See also \helpref{wxFatalError}{wxfatalerror}.

 \func{void}{wxFatalError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWindows Fatal Error"}}

-{\bf NB:} This function is now obsolete, please use
+{\bf NB:} This function is now obsolete, please use 
 \helpref{wxLogFatalError}{wxlogfatalerror} instead.

 Displays {\it msg} and exits. This writes to standard error under Unix,
@@ -3252,7 +3251,7 @@ trace masks.
 This function shows a message to the user in a safe way and should be safe to
 call even before the application has been initialized or if it is currently in
 some other strange state (for example, about to crash). Under Windows this
-function shows a message box using a native dialog instead of
+function shows a message box using a native dialog instead of 
 \helpref{wxMessageBox}{wxmessagebox} (which might be unsafe to call), elsewhere
 it simply prints the message to the standard output using the title as prefix.

@@ -3495,7 +3494,7 @@ builds the \helpref{wxCHECK}{wxcheck} failures don't result in anything.

 To override the default behaviour in the debug builds which is to show the user
 a dialog asking whether he wants to abort the program, continue or continue
-ignoring any subsequent assert failures, you may override
+ignoring any subsequent assert failures, you may override 
 \helpref{wxApp::OnAssert}{wxapponassert} which is called by this function if
 the global application object exists.

@@ -3518,7 +3517,7 @@ because it will not be executed in release mode at all.

 \func{}{wxASSERT\_MIN\_BITSIZE}{\param{}{type}, \param{}{size}}

-This macro results in a
+This macro results in a 
 \helpref{compile time assertion failure}{wxcompiletimeassert} if the size
 of the given type {\it type} is less than {\it size} bits.

@@ -3552,14 +3551,14 @@ specified {\it condition} is false. The compiler error message should include
 the {\it msg} identifier - please note that it must be a valid C++ identifier
 and not a string unlike in the other cases.

-This macro is mostly useful for testing the expressions involving the
+This macro is mostly useful for testing the expressions involving the 
 {\tt sizeof} operator as they can't be tested by the preprocessor but it is
 sometimes desirable to test them at the compile time.

 Note that this macro internally declares a struct whose name it tries to make
 unique by using the {\tt \_\_LINE\_\_} in it but it may still not work if you
 use it on the same line in two different source files. In this case you may
-either change the line in which either of them appears on or use the
+either change the line in which either of them appears on or use the 
 \helpref{wxCOMPILE\_TIME\_ASSERT2}{wxcompiletimeassert2} macro.

 \wxheading{See also}
@@ -3571,7 +3570,7 @@ either change the line in which either of them appears on or use the

 \func{}{wxCOMPILE\_TIME\_ASSERT}{\param{}{condition}, \param{}{msg}, \param{}{name}}

-This macro is identical to \helpref{wxCOMPILE\_TIME\_ASSERT2}{wxcompiletimeassert2}
+This macro is identical to \helpref{wxCOMPILE\_TIME\_ASSERT2}{wxcompiletimeassert2} 
 except that it allows you to specify a unique {\it name} for the struct
 internally defined by this macro to avoid getting the compilation errors
 described \helpref{above}{wxcompiletimeassert}.
--- a/docs/latex/wx/hthelpct.tex
+++ b/docs/latex/wx/hthelpct.tex
@@ -81,27 +81,17 @@ all other sections (sections, subsections, ...) have a folder icon.}

 \membersection{wxHtmlHelpController::AddBook}\label{wxhtmlhelpcontrolleraddbook}

-\func{bool}{AddBook}{\param{const wxFileName\& }{book\_file}, \param{bool }{show\_wait\_msg}}
-
-\func{bool}{AddBook}{\param{const wxString\& }{book\_url}, \param{bool }{show\_wait\_msg}}
+\func{bool}{AddBook}{\param{const wxString\& }{book}, \param{bool }{show\_wait\_msg}}

 Adds book (\helpref{.hhp file}{helpformat} - HTML Help Workshop project file) into the list of loaded books.
 This must be called at least once before displaying  any help.

-{\it book\_file} or {\it book\_url}  may be either .hhp file or ZIP archive
-that contains arbitrary number of .hhp files in 
+{\it book} may be either .hhp file or ZIP archive that contains arbitrary number of .hhp files in 
 top-level directory. This ZIP archive must have .zip or .htb extension
-(the latter stands for "HTML book"). In other words,
-{\tt AddBook(wxFileName("help.zip"))}
-is possible and, in fact, recommended way.
+(the latter stands for "HTML book"). In other words, {\tt AddBook("help.zip")} is possible and, in fact,
+recommended way.

-\wxheading{Parameters}
-
-\docparam{show\_wait\_msg}{If TRUE then a decoration-less window with progress message is displayed.}
-\docparam{book\_file}{Help book filename. It is recommended to use this prototype
-instead of the one taking URL, because it is less error-prone.}
-\docparam{book\_url}{Help book URL (note that syntax of filename and URL is 
-different on most platforms)}
+If {\it show\_wait\_msg} is TRUE then a decoration-less window with progress message is displayed.

 \wxheading{Note}

--- a/docs/latex/wx/hthlpdat.tex
+++ b/docs/latex/wx/hthlpdat.tex
@@ -28,11 +28,11 @@ Constructor.

 \membersection{wxHtmlHelpData::AddBook}\label{wxhtmlhelpdataaddbook}

-\func{bool}{AddBook}{\param{const wxString\& }{book\_url}}
+\func{bool}{AddBook}{\param{const wxString\& }{book}}

-Adds new book. {\it book} is URL (not filename!) of HTML help project (hhp)
-or ZIP file that contains arbitrary number of .hhp projects (this zip
-file can have either .zip or .htb extension, htb stands for "html book").
+Adds new book. 'book' is location of HTML help project (hhp) or ZIP file
+that contains arbitrary number of .hhp projects (this zip file can have
+either .zip or .htb extension, htb stands for "html book").
 Returns success.

 \membersection{wxHtmlHelpData::FindPageById}\label{wxhtmlhelpdatafindpagebyid}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bryan Petty	979c18d30b	This commit was manufactured by cvs2svn to create tag 'WX_2_3_4'. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_3_4@17994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775	2002-11-28 13:34:28 +00:00
Stefan Csomor	bf4a027ddb	added arrow cursor for standard controls git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775	2002-09-15 18:32:49 +00:00
Vadim Zeitlin	418b74a078	don't mention GUI-only changes in the base section git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775	2002-09-15 18:17:32 +00:00