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

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

Makefile.in

@@ -398,15 +398,11 @@ m4datainstall: preinstall
 
 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
@@ -800,7 +796,6 @@ 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
@@ -1052,7 +1047,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
 
@@ -1503,11 +1498,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); \

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

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

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.

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
 
@@ -1697,61 +1697,13 @@ if test "$wxUSE_ZLIB" != "no" ; then
     AC_DEFINE(wxUSE_ZLIB)
 
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
-        dnl don't test for zlib under Mac -- its verson there is 1.1.3 but we
-        dnl should still use it because hopefully (can someone confirm this?)
-        dnl Apple did fix the security problem in it and not using the system
-        dnl library results in a whole bunch of warnings when linking with
-        dnl Carbon framework
-        if test "$USE_DARWIN" = 1; then
-            system_zlib_h_ok="yes"
-        else
-            dnl we have troubles with ancient zlib versions (e.g. 1.0.4 is
-            dnl known to not work) and although I don't know which is
-            dnl the minimal required version it's safer to test for 1.1.4 as
-            dnl it fixes a security problem in 1.1.3 -- and hopefully nobody
-            dnl has anything more ancient (1.1.3 was released in July 1998)
-            dnl anyhow
-            AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
-                AC_TRY_RUN(
-                    [
-                        dnl zlib.h defines ZLIB_VERSION="x.y.z"
-                        #include <zlib.h>
-                        #include <stdio.h>
-
-                        dnl don't use the brackets as quotes, we need them
-                        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)
-                )
-            )
-
-            system_zlib_h_ok=$ac_cv_header_zlib_h
-        fi
-
-        if test "$system_zlib_h_ok" = "yes"; then
-            AC_CHECK_LIB(z, deflate, ZLIB_LINK=" -lz")
-        fi
+        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
@@ -1790,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
@@ -2541,10 +2471,10 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         TOOLKIT=PM
         GUIDIST=GTK_DIST
         AC_MSG_WARN([OS/2 PM requires old resource format, re-enabled])
-        wxUSE_PROLOGIO="yes"
-        wxUSE_RESOURCES="yes"
+	wxUSE_PROLOGIO="yes"
+	wxUSE_RESOURCES="yes"
         AC_MSG_WARN([OS/2 threads are not yet supported... disabled])
-        wxUSE_THREADS="no"
+	wxUSE_THREADS="no"
     fi
 
     dnl the name of the directory where the files for this toolkit live
@@ -2767,17 +2697,6 @@ case "${host}" in
         ;;
 
     *-*-darwin* )
-        dnl Under Mac OS X, the naming conventions for shared libraries
-        dnl are different: the number precedes the suffix.
-        
-        WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
-        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
-
-        WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
-        WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
-        WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
-        WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
-
         dnl Under Mac OS X, we should build real frameworks instead of simple
         dnl dynamic shared libraries (in order to embed the resources)
         if test "$wxUSE_MAC" = 1; then
@@ -2914,8 +2833,8 @@ if test "$wxUSE_SHARED" = "yes"; then
         dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
         SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
         PIC_FLAG="-dynamic -fPIC"
-        SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
-        SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
+        SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
+        SONAME_FLAGS_GL=${SONAME_FLAGS}
       ;;
 
       *-*-aix* )
@@ -2938,12 +2857,12 @@ if test "$wxUSE_SHARED" = "yes"; then
 
         PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 
-        dnl Don't build seperate GL library
-        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-
+        dnl install shared libs without symlinks
         if test "$wxUSE_OPENGL" = "yes"; then
-            LIBS="${LIBS} ${OPENGL_LIBS}"
+            WX_ALL_INSTALLED="preinstall_gl"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
+        else
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
       ;;
 
@@ -5481,10 +5400,6 @@ echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-n
 echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"
 echo "  Should wxWindows be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
 
-echo "  What level of wxWindows compatibility should be enabled?"
-echo "                                       wxWindows 2.0      ${WXWIN_COMPATIBILITY_2:-no}"
-echo "                                       wxWindows 2.2      ${WXWIN_COMPATIBILITY_2_2:-yes}"
-
 echo "  Which libraries should wxWindows use?"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
 echo "                                       png                ${wxUSE_LIBPNG-none}"

contrib/include/wx/gizmos/multicell.h

@@ -40,7 +40,7 @@
 enum wxResizable
 {
 	wxNOT_RESIZABLE =           0x00,
-	wxHORIZONTAL_RESIZABLE =    0x01,
+	wxHORIZENTAL_RESIZABLE =    0x01,
 	wxVERTICAL_RESIZABLE =      0x10,
 	wxRESIZABLE =               0x11
 };

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:

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 + \

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"
 

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 
 

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 
 

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 
 

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 
 

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 
 

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 
 

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 
 

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 
 

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 
 

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 
 

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)));

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 
 

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 
 

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 
 

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 
 

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"
 

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 
 

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 
 

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 
 

contrib/src/fl/Makefile.in

@@ -19,7 +19,6 @@ HEADERS = \
             cbcustom.h \
             dynbarhnd.h \
             dyntbarhnd.h \
-            fldefs.h \
             garbagec.h \
             hintanimpl.h \
             panedrawpl.h \

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();

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 

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    

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())
 				{

contrib/src/ogl/basic.cpp

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

contrib/src/ogl/basic2.cpp

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

contrib/src/ogl/canvas.cpp

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

contrib/src/ogl/lines.cpp

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

contrib/src/ogl/misc.cpp

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

contrib/src/ogl/ogldiag.cpp

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

contrib/src/ogl/oglmisc.cpp

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

contrib/src/stc/ScintillaWX.cpp

@@ -139,7 +139,6 @@ END_EVENT_TABLE()
 
 
 ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
-    capturedMouse = false;
     wMain = win;
     stc   = win;
     wheelRotation = 0;
@@ -221,16 +220,15 @@ void ScintillaWX::SetTicking(bool on) {
 
 
 void ScintillaWX::SetMouseCapture(bool on) {
-    if (on && !capturedMouse)
+    if (on && !stc->HasCapture())
         stc->CaptureMouse();
-    else if (!on && capturedMouse && stc->HasCapture())
+    else if (!on && stc->HasCapture())
         stc->ReleaseMouse();
-    capturedMouse = on;
 }
 
 
 bool ScintillaWX::HaveMouseCapture() {
-    return capturedMouse;
+    return stc->HasCapture();
 }
 
 
@@ -407,11 +405,6 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
 
 // This is called by the Editor base class whenever something is selected
 void ScintillaWX::ClaimSelection() {
-#if 0
-    // Until wxGTK is able to support using both the primary selection and the
-    // clipboard at the same time I think it causes more problems than it is
-    // worth to implement this method.  Selecting text should not clear the
-    // clipboard.  --Robin
 #ifdef __WXGTK__
     // Put the selected text in the PRIMARY selection
     if (currentPos != anchor) {
@@ -426,7 +419,6 @@ void ScintillaWX::ClaimSelection() {
         }
     }
 #endif
-#endif
 }
 
 
@@ -467,23 +459,9 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar
               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);
       }
@@ -579,8 +557,6 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta,
         }
     }
     else { // otherwise just scroll the window
-        if ( !delta )
-            delta = 120;
         wheelRotation += rotation;
         lines = wheelRotation / delta;
         wheelRotation -= lines * delta;

contrib/src/stc/ScintillaWX.h

@@ -151,7 +151,6 @@ public:
     void DoScrollToColumn(int column);
 
 private:
-    bool                capturedMouse;
     wxStyledTextCtrl*   stc;
 
 #if wxUSE_DRAG_AND_DROP

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));
         }
         

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;

contrib/src/xrc/xmlres.cpp

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

contrib/utils/convertrc/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 
 

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);
 
 }
 

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();

contrib/utils/convertrc/wxr2xml.h

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

contrib/utils/wxrc/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 
 

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

contrib/utils/wxrcedit/pe_basic.cpp

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

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 
 

debian/changelog

@@ -1,27 +1,7 @@
-wxwindows2.4 (2.4.0) unstable; urgency=low
-
-  * The fingers crossed release.
-  * de.po typo fix.  Closes: #174084
-  * tr.po stable tree patch.  Closes: #174667
-  * Add a manpage for the wxPython scripts pointing to the pydoc docs.
-  * Disabled generation of gtk-univ, it is a rather insensible combination
-    now and should be replaced by x11-univ instead.
-
- -- 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
 

debian/control.in

@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.2), python (<<2.3), python2.2-dev, zlib1g-dev, libjpeg62-dev, libpng3-dev, libtiff3g-dev, libgl-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.5.8.0
+Standards-Version: 3.5.7.0
 
 Package: libwxbase=V
 Architecture: any
@@ -117,18 +117,16 @@ Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
 Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends}
-Recommends: python2.2-xml
 Suggests: wxwin=V-doc, wxwin=V-examples
-Conflicts: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-python
-Replaces: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-python
+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
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
  This package provides a Python binding to the wxGTK library and it's
- contrib libs.  If you wish to use xrced you'll also need the python-xml
- package installed.
+ contrib libs.
 
 Package: libwxgtk=V-contrib
 Architecture: any

debian/copyright

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

debian/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"
-

debian/lintian-override

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

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)
 
@@ -78,12 +77,10 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
                   build-wxbase-debug-stamp build-gtk-shared-stamp \
                   build-gtk-static-stamp build-gtk-debug-stamp \
+                  build-gtk-univ-stamp \
                   build-contrib-shared-stamp build-contrib-static-stamp \
                   build-gtk-py-stamp build-i18n-stamp
 
-# disable gtk-univ build, we'll  replace it with x11-univ later.
-#		  build-gtk-univ-stamp
-
 build_indep_stamps=build-examples-stamp build-doc-stamp
 
 build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
@@ -97,12 +94,10 @@ build_stamps=$(build_stamps_native) $(build_cross_stamps)
 # Install targets:
 install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
                  install-gtk-lib install-gtk-dev install-gtk-dbg \
+                 install-gtk-univ \
                  install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
                  install-headers install-i18n
 
-# disable gtk-univ build, we'll  replace it with x11-univ later.
-#                install-gtk-univ
-
 install_all_indep=install-examples install-doc
 
 install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
@@ -488,6 +483,7 @@ clean: debian/control
 	rm -f $(objdir_i18n)/*.mo
 
 	cd wxPython \
+		&& ./setup.py clean \
 		&& rm -rf licence \
 		&& rm -rf build \
 		&& rm -rf contrib/gizmos/contrib \
@@ -496,10 +492,6 @@ clean: debian/control
 		&& rm -rf contrib/xrc/contrib \
 		&& rm -rf *.pyc
 
-# We do the equivalent of this above by removing build, unfortunately
-# its not enough by itself to get the tree properly clean again.
-#		&& ./setup.py clean
-
 	dh_clean
 	rm -f debian/$(package_wxbase_lib).*
 	rm -f debian/$(package_wxbase_dev).*
@@ -620,39 +612,24 @@ install-gtk-py: build-gtk-py-stamp
 	dh_clean -k
 	dh_installdirs
 	cd wxPython \
-		&& ./setup.py install \
-			      --prefix=`pwd`/../debian/$(package_gtk_py)/usr \
-			      WX_CONFIG='$(wxconfig)'
+		&& ./setup.py install --prefix=`pwd`/../debian/$(package_gtk_py)/usr
 	find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
 		-name '*.py?' -exec rm '{}' ';'
 
-	dh_installman debian/wxPython-tools.1
-	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1  \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1   \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1
-
 install-headers: DH_OPTIONS=-p$(package_headers)
 install-headers: install-gtk-lib
 	dh_testdir
 	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_installman debian/wx-config.1
+	dh_installmanpages \
+		ansi2knr.1 \
+		jpegtran.1 \
+		libpng.3   \
+		libpngpf.3 \
+		zlib.3     \
+		png.5
 
 install-i18n: DH_OPTIONS=-p$(package_i18n)
 install-i18n: build-i18n-stamp install-gtk-lib
@@ -745,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
@@ -768,13 +744,13 @@ binary-common:
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
+		DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
 		binary-common
 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
+		DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
 		binary-common
 
 # Build all packages target.

debian/wx-config.1

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

debian/wxPython-tools.1

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

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

distrib/mac/shared-ld-sh

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

distrib/msw/contrib.rsp

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

distrib/msw/copybase.bat

@@ -3,7 +3,7 @@
 rem VZ: this is quick and _very_ dirty, to be replaced by a script directly
 rem     parsing the files.txt and include/wx/version.h...
 
-set VER=2.4.0
+set VER=2.3.4
 set DEST=t:\wxBase-%VER%
 
 mkdir %DEST%

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
 

distrib/msw/generic.rsp

@@ -551,7 +551,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
@@ -629,7 +628,6 @@ samples/image/*.ico
 samples/image/*.cur
 samples/image/*.txt
 samples/image/*.pro
-samples/image/*.ani
 
 samples/internat/*.cpp
 samples/internat/*.h

distrib/msw/innobott.txt

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

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
 

distrib/msw/makefile.rsp

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

distrib/msw/makerpm

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

distrib/msw/stc.rsp

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

distrib/msw/tardist

@@ -66,7 +66,7 @@ dospinwxgtk()
 echo Tarring wxGTK...
 
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
+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
 
@@ -87,7 +87,7 @@ dospinwxmotif()
 echo Tarring wxMotif...
 
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmotif_in.txt
+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
 
@@ -109,7 +109,7 @@ echo Tarring wxX11...
 
 ### wxX11: combined wxMotif and wxX11 distributions
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
+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
 
@@ -148,15 +148,6 @@ 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 ..
@@ -197,8 +188,6 @@ 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
@@ -207,14 +196,7 @@ 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
-
+cd wxWindows-${WXVER}
 $TAR xf ../wxAll-${WXVER}.tar
 
 # Translate all .dsp and .dsw files to DOS format

distrib/msw/tmake/filelist.txt

@@ -80,7 +80,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
@@ -283,7 +283,7 @@ dcprint.cpp	MSW	LowLevel
 dcscreen.cpp	MSW	LowLevel
 dde.cpp	MSW	LowLevel,Base
 dialog.cpp	MSW
-dialup.cpp	MSW	LowLevel
+dialup.cpp	MSW
 dib.cpp	MSW	LowLevel
 dibutils.cpp	MSW
 dir.cpp	MSW	Base
@@ -292,12 +292,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
@@ -307,13 +307,13 @@ gauge95.cpp	MSW	Win32Only
 gaugemsw.cpp	MSW	NotWin32
 gdiimage.cpp	MSW	LowLevel
 gdiobj.cpp	MSW	LowLevel
-glcanvas.cpp	MSW	LowLevel
-helpchm.cpp	MSW	Win32Only,LowLevel
-helpwin.cpp	MSW	LowLevel
+glcanvas.cpp	MSW
+helpchm.cpp	MSW	Win32Only
+helpwin.cpp	MSW
 icon.cpp	MSW	LowLevel
 imaglist.cpp	MSW	Win32Only
 iniconf.cpp	MSW
-joystick.cpp	MSW	LowLevel
+joystick.cpp	MSW
 listbox.cpp	MSW
 listctrl.cpp	MSW	Win32Only
 main.cpp	MSW	LowLevel,Base
@@ -353,21 +353,21 @@ statbr95.cpp	MSW	Win32Only
 statline.cpp	MSW
 stattext.cpp	MSW
 tabctrl.cpp	MSW
-taskbar.cpp	MSW	Win32Only,LowLevel
+taskbar.cpp	MSW	Win32Only
 tbar95.cpp	MSW	Win32Only
 tbarmsw.cpp	MSW	NotWin32
 textctrl.cpp	MSW
 tglbtn.cpp	MSW
 thread.cpp	MSW	Win32Only,Base,LowLevel
 timer.cpp	MSW	LowLevel
-tooltip.cpp	MSW	Win32Only,LowLevel
+tooltip.cpp	MSW	Win32Only
 toplevel.cpp	MSW	LowLevel
 treectrl.cpp	MSW	Win32Only
 utils.cpp	MSW	Base,LowLevel
 utilsexc.cpp	MSW	Base,LowLevel
 uuid.cpp	MSW	OLE
 volume.cpp	MSW	Base
-wave.cpp	MSW	LowLevel
+wave.cpp	MSW
 window.cpp	MSW	LowLevel
 
 dialup.cpp	Unix	NotMac

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

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

docs/base/readme.txt

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

docs/changes.txt

@@ -177,16 +177,6 @@ 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
 -----
 

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

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

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>

docs/html/faqmac.htm

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

docs/latex/wx/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}}

docs/latex/wx/docmanag.tex

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

docs/latex/wx/doctempl.tex

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

docs/latex/wx/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}
-

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}.

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".

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}
 

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}

docs/latex/wx/log.tex

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

docs/latex/wx/manual.tex

@@ -26,13 +26,13 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{wxWindows 2.4.0: A portable C++ and Python GUI toolkit}
+\title{wxWindows 2.3.4: A portable C++ and Python GUI toolkit}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
-\date{January 2003}
+\date{November 2002}
 }
 \makeindex
 \begin{document}

docs/latex/wx/mutexlck.tex

@@ -23,10 +23,10 @@ None.
 
 \membersection{wxMutexLocker::wxMutexLocker}\label{wxmutexlockerctor}
 
-\func{}{wxMutexLocker}{\param{wxMutex\&}{ mutex}}
+\func{}{wxMutexLocker}{\param{wxMutex *}{mutex}}
 
-Constructs a wxMutexLocker object associated with mutex and locks it.
-Call \helpref{IsLocked}{wxmutexlockerisok} to check if the mutex was
+Constructs a wxMutexLocker object associated with mutex which must be non-NULL
+and locks it. Call \helpref{IsLocked}{wxmutexlockerisok} to check if the mutex was
 successfully locked.
 
 \membersection{wxMutexLocker::\destruct{wxMutexLocker}}\label{wxmutexlockerdtor}