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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_3_4@17994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
added arrow cursor for standard controls
2002-11-28 13:34:28 +00:00 · 2002-09-15 18:32:49 +00:00 · 2002-09-15 18:17:32 +00:00
2575 changed files with 89894 additions and 214236 deletions
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -19,29 +19,30 @@ varaibles and PATH entries.
 Continue with item c) below.


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

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

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

 The makefile might have small problems with Cygwin's tools
-so it is recommended to use MinGW and its toolchain instead
+so it is recommended to use Mingw32 and its toolchain instead
 if possible.

 -> Set your path so that it includes the directory
   where your compiler and tools reside

-> If your are using an old MinGW version (gcc-2.95 or older),
+-> If your are using an old Mingw32 version (gcc-2.95 or older),
   you might need to fix some headers with the patches contained
   in the wxWin\Mingw32-gcc295.patches file. PLEASE APPLY THESE
   PATCHES BY HAND! There are apparently a few different versions
   of the headers floating around. Note that these patches are
-   not needed if you are using MinGW gcc-2.95.2 or newer.
+   not needed if you are using Mingw32 gcc-2.95.2 or newer.
  
 -> Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
-   the file to either 1 (you have MinGW) or 0 (you have Cygwin).
-   Also set the MINGW32VERSION variable appropiately.
+   the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
+   If using MINGW32, also set the MINGW32VERSION variable
+   appropiately.


 c) Build instructions
@@ -50,8 +51,19 @@ c) Build instructions
   into c:\wxWin
 -> Copy c:\wxWin\include\wx\msw\setup0.h
   to   c:\wxWin\include\wx\msw\setup.h
-> Edit c:\wxWin\include\wx\msw\setup.h to choose
-   the features you would like to compile wxWindows with[out].
+-> Edit c:\wxWin\include\wx\msw\setup.h so that
+   most features are enabled (i.e. defined to 1), for example:
+   #define wxUSE_ODBC          0
+   #define wxUSE_SOCKETS       1
+   #define wxUSE_HTML          1
+   #define wxUSE_THREADS       1
+   #define wxUSE_FS_INET       0
+   #define wxUSE_FS_ZIP        1
+   #define wxUSE_BUSYINFO      1
+   #define wxUSE_DYNLIB_CLASS  1
+   #define wxUSE_ZIPSTREAM     1
+   #define wxUSE_LIBJPEG       1
+   #define wxUSE_LIBPNG        1

   and std iostreams are disabled with
   #define wxUSE_STD_IOSTREAM   0
@@ -60,8 +72,6 @@ c) Build instructions
 -> type: make -f makefile.g95  (if using GNU tools)
 or type: nmake -f makefile.vc   (if using MS VC++)

-   See also docs/msw/install.txt for additional compilation options.
-
 d) Borland (including free command line tools)
   Download tools from http://www.borland.com/downloads/
   
@@ -107,10 +117,11 @@ yet complete).
 III) Windows using configure
 ----------------------------------------

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

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

-First you'll need a cross-compiler; linux glibc binaries of MinGW and
-Cygwin (both based on egcs) can be found at
+First you'll need a cross-compiler; linux glibc binaries of mingw32 and
+cygwin32 (both based on egcs) can be found at
 ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
 based on the latest MinGW release can be found at
-http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
+http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html 
 Otherwise you can compile one yourself.

-[ A Note about Cygwin and MinGW: the main difference is that Cygwin
+[ A Note about cygwin32 and mingw32: the main difference is that cygwin32
 binaries are always linked against cygwin.dll. This dll encapsulates most
 standard Unix C extensions, which is very handy if you're porting unix
-software to windows. However, wxMSW doesn't need this, so MinGW is
+software to windows. However, wxMSW doesn't need this, so mingw32 is
 preferable if you write portable C(++). ]

 You might want to build both Unix and Windows binaries in the same source
@@ -192,7 +203,7 @@ yourself:
   DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
   ../configure --host=i586-mingw32 --with-mingw

-(all assuming you're using MinGW)
+(all assuming you're using mingw32)
 By default this will compile a DLL, if you want a static library,
 specify --disable-shared.

@@ -204,7 +215,7 @@ will be a compile error :-)
 NB: if you are using a very old compiler you risk to get quite a few warnings
    about "ANSI C++ forbids implicit conversion from 'void *'" in all places
    where va_arg macro is used. This is due to a bug in (some versions of)
-    MinGW headers which may be corrected by upgrading your compier,
+    mingw32 headers which may be corrected by upgrading your compier,
    otherwise you might edit the file

    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
@@ -227,7 +238,7 @@ typedef void *__gnuc_va_list;
    __gnuc_va_list is char *.

 If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
-(or just libwx_msw.a if you opted for a static build).
+( or just libwx_msw.a if you opted for a static build ).
 Now try building the minimal sample:

 -> cd samples/minimal
--- a/Makefile.in
+++ b/Makefile.in
@@ -324,7 +324,7 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
 #     but this seems to result in problems with libwx_gtk being linked in twice
 $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
 	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS)
+	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)

 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
 	@$(INSTALL) -d $(build_libdir)
@@ -391,23 +391,11 @@ afminstall: preinstall
 	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
 	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
 	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-
+        
 m4datainstall: preinstall
 	$(INSTALL) -d $(datadir)/aclocal
 	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal

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

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

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

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

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

-	mkdir $(DISTDIR)/samples/keyboard
-	cp $(SAMPDIR)/keyboard/Makefile.in $(DISTDIR)/samples/keyboard
-	cp $(SAMPDIR)/keyboard/*.cpp $(DISTDIR)/samples/keyboard
-
 	mkdir $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
@@ -1148,12 +1113,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/mobile/wxedit/Makefile.in $(DISTDIR)/samples/mobile/wxedit
 	cp $(SAMPDIR)/mobile/wxedit/*.cpp $(DISTDIR)/samples/mobile/wxedit
 	cp $(SAMPDIR)/mobile/wxedit/*.h $(DISTDIR)/samples/mobile/wxedit
-	mkdir $(DISTDIR)/samples/mobile/styles
-	cp $(SAMPDIR)/mobile/styles/Makefile.in $(DISTDIR)/samples/mobile/styles
-	cp $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles
-	cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
-	cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
-
+    
 	mkdir $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
@@ -1257,12 +1217,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub

-	mkdir $(DISTDIR)/samples/shaped
-	cp $(SAMPDIR)/shaped/Makefile.in $(DISTDIR)/samples/shaped
-	cp $(SAMPDIR)/shaped/makefile.unx $(DISTDIR)/samples/shaped
-	cp $(SAMPDIR)/shaped/*.cpp $(DISTDIR)/samples/shaped
-	cp $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped
-
 	mkdir $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
@@ -1354,19 +1308,6 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
 	cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src

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

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

 MISC_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/misc
@@ -1431,78 +1350,62 @@ MANUAL_DIST:

 # this target does not generate a complete wxPython dist, it only includes
 # those files needed for the Debian source package.
-# see wxPython/distrib for scripts to make a proper wxPython dist.
-#
-# first copy everything and then clean up the CVS stuff and etc...
+# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
 PYTHON_DIST:
-	for dir in \
-		wxPython \
-		wxPython/contrib \
-		wxPython/contrib/dllwidget \
-		wxPython/contrib/gizmos \
-		wxPython/contrib/glcanvas \
-		wxPython/contrib/glcanvas/gtk \
-		wxPython/contrib/ogl \
-		wxPython/contrib/stc \
-		wxPython/contrib/stc/gtk \
-		wxPython/contrib/xrc \
-		wxPython/demo \
-		wxPython/demo/bitmaps \
-		wxPython/demo/bmp_source \
-		wxPython/demo/data \
-		wxPython/demo/dllwidget \
-		wxPython/distrib \
-		wxPython/distutils \
-		wxPython/distutils/command \
-		wxPython/docs \
-		wxPython/docs/screenshots \
-		wxPython/samples/StyleEditor \
-		wxPython/samples/doodle \
-		wxPython/samples/embedded \
-		wxPython/samples/frogedit \
-		wxPython/samples/hangman \
-		wxPython/samples/pySketch \
-		wxPython/samples/pySketch/images \
-		wxPython/samples/wxProject \
-		wxPython/samples/wx_examples \
-		wxPython/samples/wx_examples/basic \
-		wxPython/samples/wx_examples/hello \
-		wxPython/scripts \
-		wxPython/src \
-		wxPython/src/gtk \
-		wxPython/wx \
-		wxPython/wx/lib \
-		wxPython/wx/lib/colourchooser \
-		wxPython/wx/lib/editor \
-		wxPython/wx/lib/mixins \
-		wxPython/wx/py \
-		wxPython/wx/tools \
-		wxPython/wx/tools/XRCed \
-		wxPython/wxPython \
-		wxPython/wxPython/lib \
-		wxPython/wxPython/lib/PyCrust \
-		wxPython/wxPython/lib/colourchooser \
-		wxPython/wxPython/lib/editor \
-		wxPython/wxPython/lib/mixins \
-		wxPython/wxPython/tools \
-		wxPython/wxPython/tools/XRCed \
-		wxPython/wxPython/tools/XRCed/src-images \
-		wxPython/wxPython/py \
-		wxPython/wxPython/py/tests \
-		wxPython/wxPython/py/wxd \
-		; do \
-			echo "Copying dir: $$dir..."; \
-			mkdir $(DISTDIR)/$$dir; \
-			cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
-		done; \
-		\
-		find $(DISTDIR)/wxPython -name "*~"           > RM_FILES; \
-		find $(DISTDIR)/wxPython -name "*.pyc"       >> RM_FILES; \
-		find $(DISTDIR)/wxPython -name "*.bat"       >> RM_FILES; \
-		find $(DISTDIR)/wxPython -name "core"        >> RM_FILES; \
-		find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
-		for f in `cat RM_FILES`; do rm $$f; done; \
-		rm RM_FILES
+	mkdir $(DISTDIR)/wxPython
+	mkdir $(DISTDIR)/wxPython/contrib
+	mkdir $(DISTDIR)/wxPython/contrib/dllwidget
+	mkdir $(DISTDIR)/wxPython/contrib/gizmos
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	mkdir $(DISTDIR)/wxPython/contrib/ogl
+	mkdir $(DISTDIR)/wxPython/contrib/stc
+	mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
+	mkdir $(DISTDIR)/wxPython/contrib/xrc
+	mkdir $(DISTDIR)/wxPython/demo
+	mkdir $(DISTDIR)/wxPython/demo/bitmaps
+	mkdir $(DISTDIR)/wxPython/demo/bmp_source
+	mkdir $(DISTDIR)/wxPython/demo/data
+	mkdir $(DISTDIR)/wxPython/demo/dllwidget
+	mkdir $(DISTDIR)/wxPython/src
+	mkdir $(DISTDIR)/wxPython/src/gtk
+	mkdir $(DISTDIR)/wxPython/scripts
+	mkdir $(DISTDIR)/wxPython/wxPython
+	mkdir $(DISTDIR)/wxPython/wxPython/lib
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
+	mkdir $(DISTDIR)/wxPython/wxPython/tools
+	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
+
+	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
+	cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
+	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
+	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+	-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
+	-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
+	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
+	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
+	-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
+	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
+	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
+	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
+	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
+	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
+	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
+	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
+	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
+	cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed

 distclean:
 	$(RM) -r _dist_dir
@@ -1526,11 +1429,6 @@ dist-only:

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

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

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

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

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

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

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

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

 # Apollos put the system type in the environment.
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.

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

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,8 +29,7 @@ timestamp='2003-01-03'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

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


 dnl ------------------------------------------------------------------------
@@ -58,14 +66,12 @@ dnl ------------------------------------------------------------------------

 dnl assume Unix
 USE_UNIX=1
-USE_OS2=0
 USE_WIN32=0
 USE_DOS=0
 USE_BEOS=0
 USE_MAC=0

 USE_LINUX=
-USE_GNU=
 USE_SGI=
 USE_HPUX=
 USE_SYSV=
@@ -145,16 +151,6 @@ case "${host}" in
    fi
    DEFAULT_DEFAULT_wxUSE_GTK=1
  ;;
-  *-*-gnu* )
-    USE_GNU=1
-    AC_DEFINE(__GNU__)
-    TMP=`uname -m`
-    if test "x$TMP" = "xalpha"; then
-      USE_ALPHA=1
-      AC_DEFINE(__ALPHA__)
-    fi
-    DEFAULT_DEFAULT_wxUSE_GTK=1
-  ;;
  *-*-irix5* | *-*-irix6* )
    USE_SGI=1
    USE_SVR4=1
@@ -232,7 +228,7 @@ case "${host}" in
    dnl
    dnl     Both archive libraries and shared libraries on AIX have an .a
    dnl     extension. This will explain why you can't link with an .so and
-    dnl     why it works with the name changed to .a.
+    dnl     why it works with the name changed to .a. 
    SO_SUFFIX=a
    AC_DEFINE(__AIX__)
    AC_DEFINE(__SYSV__)
@@ -261,14 +257,9 @@ case "${host}" in
  ;;

  *-pc-os2_emx | *-pc-os2-emx )
-    USE_OS2=1
-    dnl Now both USE_OS2 and USE_UNIX should be set to 1 !!
    AC_DEFINE(__EMX__)
    PROGRAM_EXT=".exe"
    DEFAULT_DEFAULT_wxUSE_PM=1
-    dnl "c++" wrapper is not always available, so always use plain gcc.
-    CXX=gcc
-    LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals"
  ;;

  powerpc-*-darwin* )
@@ -483,8 +474,6 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_IFF=no
  DEFAULT_wxUSE_XPM=no
  DEFAULT_wxUSE_ICO_CUR=no
-  DEFAULT_wxUSE_IMAGE_LOADING_IN_MSW=no
-  DEFAULT_wxUSE_RESOURCE_LOADING_IN_MSW=no
 else
  DEFAULT_wxUSE_UNIVERSAL=no

@@ -660,8 +649,6 @@ else
  DEFAULT_wxUSE_PNM=yes
  DEFAULT_wxUSE_XPM=yes
  DEFAULT_wxUSE_ICO_CUR=yes
-  DEFAULT_wxUSE_IMAGE_LOADING_IN_MSW=yes
-  DEFAULT_wxUSE_RESOURCE_LOADING_IN_MSW=yes
 fi

 dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -1048,8 +1035,6 @@ WX_ARG_ENABLE(iff,         [  --enable-iff            use iff images (IFF file f
 WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
 WX_ARG_ENABLE(xpm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
 WX_ARG_ENABLE(ico_cur,     [  --enable-icocur         use Windows ICO and CUR formats], wxUSE_ICO_CUR)
-WX_ARG_ENABLE(dynamic_dib, [  --disable-dynamic_dib   don't use dynamic DIB loading/saving code under MSW], wxUSE_IMAGE_LOADING_IN_MSW, disable)
-WX_ARG_ENABLE(dynamic_ico_cur, [  --disable-dynamic_ico_cur   don't use dynamic icon/cursor loading/saving code under MSW], wxUSE_RESOURCE_LOADING_IN_MSW, disable)

 fi

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

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

-dnl   make install path absolute (if not already);
-dnl   will fail with (some) MSDOS paths
+dnl   make install path absolute (if not already); will fail with MSDOS paths
 case ${INSTALL} in
  /* ) # Absolute
     ;;
-  ?:* ) # Drive letter, considered as absolute.
-     ;;
  *)
     INSTALL=`pwd`/${INSTALL} ;;
 esac
@@ -1357,49 +1360,6 @@ AC_PROG_LEX
 dnl needed for making link to setup.h
 AC_PROG_LN_S

-dnl ---------------------------------------------------------------------------
-dnl When we are using gcc on OS/2, we want to be either using resources (PM)
-dnl or a more complete POSIX emulation for Motif/GTK+/X11
-dnl Moreover we need to link explicitly against either stdcpp.a or stdcxx.a
-dnl (depending on compiler version), since we are using "gcc", not "g++/c++".
-dnl ---------------------------------------------------------------------------
-dnl (OS/2-only piece)
-case "${host}" in
-  *-pc-os2_emx | *-pc-os2-emx )
-      dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
-      LIBS="$LIBS -lstdcpp"
-      if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
-          dnl More complete Unix emulation for unix-like ports
-          dnl by linking in POSIX/2's cExt (if available).
-          AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
-      else
-          dnl Include resources for the "native" port (wxPM).
-          RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
-      fi
-      AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[
-          AC_TRY_COMPILE([#include <features.h>],
-              [
-                  #if (__GNUC__ < 3)
-                      #error old gcc
-                  #endif
-              ],
-              [
-                  wx_cv_gcc3=yes
-              ],
-              [
-                  wx_cv_gcc3=no
-              ]
-          )
-      ])
-      if test "$wx_cv_gcc3" = "no"; then
-          LIBS="$LIBS -lstdcpp"
-      else
-          LIBS="$LIBS -lstdcxx"
-      fi
-  ;;
-esac
-dnl (end of OS/2-only piece)
-
 dnl ------------------------------------------------------------------------
 dnl Check for headers
 dnl ------------------------------------------------------------------------
@@ -1437,17 +1397,8 @@ fi
 dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
 AC_CHECK_HEADERS(langinfo.h)

-case "${host}" in
-  *-pc-os2_emx | *-pc-os2-emx )
-      dnl Explicitly link -lintl if langinfo.h is available.
-      if test $ac_cv_header_langinfo_h = "yes"; then
-          LIBS="$LIBS -lintl"
-      fi
-  ;;
-esac
-
 if test "$wxUSE_GUI" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
+    if test "$wxUSE_UNIX" = "yes"; then
        dnl defines HAVE_X11_XKBLIB_H
        AC_CHECK_HEADERS(X11/XKBlib.h)
    fi
@@ -1650,7 +1601,7 @@ dnl check for glibc version
 dnl
 dnl VZ: I have no idea why had this check been there originally, but now
 dnl     we could probably do without it by just always adding _GNU_SOURCE
-if test "$USE_LINUX" = 1 || test "$USE_GNU" = 1 ; then
+if test "$USE_LINUX" = 1; then
    AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
        AC_TRY_COMPILE([#include <features.h>],
            [
@@ -1716,7 +1667,7 @@ if test "$wxUSE_REGEX" != "no"; then
    if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
        dnl according to Unix 98 specs, regcomp() is in libc but I believe that
        dnl on some old systems it may be in libregex - check for it too?
-        AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp)])
+        AC_CHECK_HEADER(regex.h, AC_CHECK_FUNCS(regcomp))

        if test "x$ac_cv_func_regcomp" != "xyes"; then
            if test "$wxUSE_REGEX" = "sys" ; then
@@ -1746,58 +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>
-
-                        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);
-                        }
-                    ],
-                    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
@@ -1836,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
@@ -1951,27 +1835,16 @@ dnl ------------------------------------------------------------------------

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

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

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

 AFMINSTALL=
-WIN32INSTALL=

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

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

 if test "$USE_DARWIN" = 1; then
@@ -2202,51 +2071,35 @@ equivalent variable and GTK+ is version 1.2.3 or above.
            AC_MSG_RESULT($MGL_ROOT)
        fi

-        AC_MSG_CHECKING(for libmgl location)
        dnl Find MGL library that we want
        dnl FIXME_MGL - test for MGL variants for freebsd etc.
        case "${host}" in
            *-*-linux* )
-              if test "x$wxUSE_SHARED" = xyes ; then
-                  mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc"
-              else
-                  mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so"
-              fi
+              mgl_os=linux/gcc/glibc
              ;;
            *-pc-msdosdjgpp )
-              mgl_os_candidates="dos32/dj2"
+              mgl_os=dos32/dj2
              ;;
            *)
              AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
        esac

        mgl_lib_type=""
-        mgl_os=""

-        for mgl_os_i in $mgl_os_candidates ; do
-            if test "x$mgl_os" = x ; then
-                if test "$wxUSE_DEBUG_FLAG" = yes ; then
-                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=debug
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-                if test "x$mgl_lib_type" = x ; then
-                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=release
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
+        if test "$wxUSE_DEBUG_FLAG" = yes ; then
+            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
+                    -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
+                mgl_lib_type=debug
+            fi
+        fi
+        if test "x$mgl_lib_type" = x ; then
+            if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
+                    -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then
+                mgl_lib_type=release
+            else
+                AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
            fi
-        done
-
-        if test "x$mgl_os" = x ; then
-            AC_MSG_RESULT(not found)
-            AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
        fi
-        AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")

        wxUSE_UNIVERSAL="yes"

@@ -2376,7 +2229,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.

        if test "$wxUSE_NANOX" = "yes"; then
            TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
-            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
            GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
        else
            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
@@ -2605,8 +2458,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"
    fi

    dnl the name of the directory where the files for this toolkit live
@@ -2829,24 +2684,12 @@ case "${host}" in
        ;;

    *-*-darwin* )
-        dnl Under Mac OS X, the naming conventions for shared libraries
-        dnl are different: the number precedes the suffix.
-
-        WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
-        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
-
-        WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
-        WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
-        WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
-        WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
-
        dnl Under Mac OS X, we should build real frameworks instead of simple
        dnl dynamic shared libraries (in order to embed the resources)
        if test "$wxUSE_MAC" = 1; then
-            dnl base name of the resource file for wxMac must be the same
-            dnl as library installation base name (-install_name)
-            WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
-            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
+            dnl the name of the resources file for wxMac
+            WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
+            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
        fi
        ;;
 esac
@@ -2925,7 +2768,7 @@ if test "$wxUSE_SHARED" = "yes"; then
        fi
      ;;

-      *-*-linux* | *-*-gnu* )
+      *-*-linux* )
        if test "$GCC" != "yes"; then
            AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc,
            [
@@ -2977,11 +2820,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"
-        dnl library installation base name and wxMac resources file base name
-        dnl must be identical in order for the resource file to be found at
-        dnl run time in src/mac/app.cpp
-        SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
-        SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
+        SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
+        SONAME_FLAGS_GL=${SONAME_FLAGS}
      ;;

      *-*-aix* )
@@ -3004,12 +2844,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
      ;;

@@ -3097,8 +2937,6 @@ if test "$wxUSE_MAC" = 1; then
 else
    if test "$wxUSE_PM" = 1; then
        LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
-    else
-        LIBWXMACRESCOMP="#"
    fi
 fi

@@ -3118,12 +2956,11 @@ dnl   defines uid_t and gid_t if not already defined
 AC_TYPE_UID_T

 dnl check what exactly size_t is on this machine - this is necessary to avoid
-dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
+dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 AC_CACHE_CHECK([if size_t is unsigned int],
    wx_cv_size_t_is_uint,
-    [
    dnl an obvious check like AC_TRY_COMPILE[struct Foo { ... };] doesn't work
    dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate
    dnl methods in a local class (i.e. class inside a function) declaration
@@ -3141,7 +2978,6 @@ AC_CACHE_CHECK([if size_t is unsigned int],
        wx_cv_size_t_is_uint=no,
        wx_cv_size_t_is_uint=yes
    )
-    ]
 )

 if test "$wx_cv_size_t_is_uint" = "yes"; then
@@ -3336,17 +3172,20 @@ AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
 )

 if test "$wx_cv_func_statfs" = "yes"; then
-    wx_cv_type_statvfs_t="struct statfs"
    AC_DEFINE(HAVE_STATFS)
 else
    AC_CACHE_CHECK(for statvfs, wx_cv_func_statvfs,
        AC_TRY_COMPILE(
            [
-                #include <stddef.h>
-                #include <sys/statvfs.h>
+                 #include <sys/statvfs.h>
            ],
            [
-                statvfs("/", NULL);
+                 long l;
+                 struct statvfs fs;
+                 statvfs("/", &fs);
+                 l = fs.f_bsize;
+                 l += fs.f_blocks;
+                 l += fs.f_bavail;
            ],
            [
                 wx_cv_func_statvfs=yes
@@ -3358,73 +3197,12 @@ else
    )

    if test "$wx_cv_func_statvfs" = "yes"; then
-        dnl we also have to check whether we should use statvfs_t (works under
-        dnl Solaris 8, doesn't work under Solaris 7) or "struct statvfs" (vice
-        dnl versa) as the argument for statvfs in 64 bit off_t mode (in 32 bit
-        dnl mode both work fine)
-        dnl
-        dnl for this check C++ compiler has to be used as passing incompatible
-        dnl pointers is just a warning and not an error in C
-        AC_LANG_SAVE
-        AC_LANG_CPLUSPLUS
-
-        AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t,
-            AC_TRY_COMPILE(
-                [
-                    #include <sys/statvfs.h>
-                ],
-                [
-                    long l;
-                    statvfs_t fs;
-                    statvfs("/", &fs);
-                    l = fs.f_bsize;
-                    l += fs.f_blocks;
-                    l += fs.f_bavail;
-                ],
-                [
-                    wx_cv_type_statvfs_t=statvfs_t
-                ],
-                [
-                    AC_TRY_COMPILE(
-                        [
-                            #include <sys/statvfs.h>
-                        ],
-                        [
-                            long l;
-                            struct statvfs fs;
-                            statvfs("/", &fs);
-                            l = fs.f_bsize;
-                            l += fs.f_blocks;
-                            l += fs.f_bavail;
-                        ],
-                        [
-                            wx_cv_type_statvfs_t="struct statvfs"
-                        ],
-                        [
-                            wx_cv_type_statvfs_t="unknown"
-                        ]
-                    )
-                ]
-            )
-        )
-
-        AC_LANG_RESTORE
-
-        if test "$wx_cv_type_statvfs_t" != "unknown"; then
-            AC_DEFINE(HAVE_STATVFS)
-        fi
+        AC_DEFINE(HAVE_STATVFS)
    else
-        dnl set it for the test below
-        wx_cv_type_statvfs_t="unknown"
+        AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
    fi
 fi

-if test "$wx_cv_type_statvfs_t" != "unknown"; then
-    AC_DEFINE_UNQUOTED(WX_STATFS_T, $wx_cv_type_statvfs_t)
-else
-    AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
-fi
-
 dnl check for fcntl() or at least flock() needed by Unix implementation of
 dnl wxSingleInstanceChecker
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
@@ -3499,16 +3277,12 @@ AC_CHECK_FUNCS(inet_addr,
    [
        AC_CHECK_LIB(nsl, inet_addr,
            INET_LINK="nsl",
-            [
-                AC_CHECK_LIB(resolv, inet_addr,
-                    INET_LINK="resolv",
-                    [
-                        AC_CHECK_LIB(socket, inet_addr,
-                            INET_LINK="socket"
-                        )
-                    ]
+            AC_CHECK_LIB(resolv, inet_addr,
+                INET_LINK="resolv",
+                AC_CHECK_LIB(socket, inet_addr,
+                    INET_LINK="socket"
                )
-            ]
+            )
        )
    ]
 )
@@ -3541,7 +3315,7 @@ dnl ---------------------------------------------------------------------------

 dnl under MSW (except mingw32) we always have thread support
 CPP_MT_FLAG=
-if test "$TOOLKIT" != "MSW" -a "$TOOLKIT" != "PM"; then
+if test "$TOOLKIT" != "MSW"; then

    dnl the code below:
    dnl
@@ -3720,17 +3494,17 @@ if test "$TOOLKIT" != "MSW" -a "$TOOLKIT" != "PM"; then
      dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
      HAVE_PRIOR_FUNCS=0
      AC_CHECK_FUNC(pthread_attr_getschedpolicy,
-                     [AC_CHECK_FUNC(pthread_attr_setschedparam,
-                       [AC_CHECK_FUNC(sched_get_priority_max,
+                     AC_CHECK_FUNC(pthread_attr_setschedparam,
+                       AC_CHECK_FUNC(sched_get_priority_max,
                           HAVE_PRIOR_FUNCS=1,
-                           [AC_CHECK_LIB([posix4], sched_get_priority_max,
+                           AC_CHECK_LIB([posix4], sched_get_priority_max,
                             [
                                HAVE_PRIOR_FUNCS=1
                                POSIX4_LINK=" -lposix4"
                             ],
-                           )]
-                       )]
-                     )]
+                           )
+                       )
+                     )
                   )

      if test "$HAVE_PRIOR_FUNCS" = 1; then
@@ -3837,11 +3611,6 @@ else
                CFLAGS="$CFLAGS_OLD"
            fi
        ;;
-        *-pc-os2*emx )
-	    CFLAGS="$CFLAGS -Zmt -D__ST_MT_ERRNO__"	
-	    CXXFLAGS="$CXXFLAGS -Zmt -D__ST_MT_ERRNO__"	
-	    LDFLAGS="$LDFLAGS -Zmt"	
-        ;;
      esac
    fi
 fi
@@ -4305,17 +4074,15 @@ if test "$wxUSE_SOCKETS" = "yes"; then
    if test "$TOOLKIT" != "MSW"; then
        dnl under Solaris and OS/2, socket functions live in -lsocket
        AC_CHECK_FUNC(socket,,
-            [
-                AC_CHECK_LIB(socket, socket,
-                    if test "$INET_LINK" != " -lsocket"; then
-                        INET_LINK="$INET_LINK -lsocket"
-                    fi,
-                    [
-                        AC_MSG_WARN([socket library not found - sockets will be disabled])
-                        wxUSE_SOCKETS=no
-                    ]
-                )
-            ]
+            AC_CHECK_LIB(socket, socket,
+                if test "$INET_LINK" != " -lsocket"; then
+                    INET_LINK="$INET_LINK -lsocket"
+                fi,
+                [
+                    AC_MSG_WARN([socket library not found - sockets will be disabled])
+                    wxUSE_SOCKETS=no
+                ]
+            )
        )
    fi
 fi
@@ -4425,9 +4192,8 @@ dnl ------------------------------------------------------------------------
 dnl DLL support
 dnl ------------------------------------------------------------------------

-dnl under MSW we always have LoadLibrary/GetProcAddress and
-dnl under OS/2 we always have DosLoadModule/DosQueryProcAddr
-if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
+dnl under MSW we always have LoadLibrary/GetProcAddress
+if test "$TOOLKIT" != "MSW"; then

    HAVE_DL_FUNCS=0
    HAVE_SHL_FUNCS=0
@@ -4470,11 +4236,8 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
        dnl check also for dlerror()
        if test "$HAVE_DL_FUNCS" = 1; then
            AC_CHECK_FUNCS(dlerror,
-                AC_DEFINE(HAVE_DLERROR),
-                [
-                    AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
-                ]
-            )
+                           AC_DEFINE(HAVE_DLERROR),
+                           AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)))
        fi
        fi

@@ -5182,14 +4945,6 @@ if test "$wxUSE_ICO_CUR" = "yes" ; then
  AC_DEFINE(wxUSE_ICO_CUR)
 fi

-if test "$wxUSE_IMAGE_LOADING_IN_MSW" = "yes"; then
-  AC_DEFINE(wxUSE_IMAGE_LOADING_IN_MSW)
-fi
-
-if test "$wxUSE_RESOURCE_LOADING_IN_MSW" = "yes"; then
-  AC_DEFINE(wxUSE_RESOURCE_LOADING_IN_MSW)
-fi
-
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
  dnl Must be done this late because -lunicows must be before all the other libs
  LIBS=" -lunicows $LIBS"
@@ -5362,7 +5117,7 @@ if test "$wxUSE_GUI" = "yes"; then
    dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                     drawing dynamic erase event exec font image \
-                     minimal propsize rotate shaped widgets"
+                     minimal propsize rotate widgets"

    dnl this is needed to be able to find AFM files
    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
@@ -5435,7 +5190,6 @@ AC_SUBST(WX_MINOR_VERSION_NUMBER)
 AC_SUBST(WX_RELEASE_NUMBER)
 AC_SUBST(WX_LIBRARY_NAME_STATIC)
 AC_SUBST(WX_LIBRARY_NAME_SHARED)
-AC_SUBST(WX_LIBRARY_BASENAME)
 AC_SUBST(WX_LIBRARY_IMPORTLIB)
 AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_LIBRARY_LINK1)
@@ -5471,7 +5225,6 @@ AC_SUBST(WXDEBUG_DEFINE)
 dnl toolkit options
 AC_SUBST(USE_GUI)
 AC_SUBST(AFMINSTALL)
-AC_SUBST(WIN32INSTALL)
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DIR)
 AC_SUBST(TOOLKIT_VPATH)
@@ -5632,10 +5385,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}"
--- a/contrib/include/wx/animate/animate.h
+++ b/contrib/include/wx/animate/animate.h
@@ -138,7 +138,7 @@ public:
 //// Implementation

    // Play the frame
-    virtual bool PlayFrame(int frame, wxWindow& window, const wxPoint& pos);
+    virtual bool PlayFrame(int frame, wxWindow& window, wxPoint& pos);
    virtual bool PlayFrame();
    virtual void DrawFrame(int frame, wxDC& dc, const wxPoint& pos);
    virtual void DrawBackground(wxDC& dc, const wxPoint& pos, const wxColour& colour);
--- a/contrib/include/wx/canvas/bbox.h
+++ b/contrib/include/wx/canvas/bbox.h
@@ -21,7 +21,7 @@ class wxBoundingBox
 {
 public:
    wxBoundingBox();
-    wxBoundingBox(const wxBoundingBox&);
+    wxBoundingBox(wxBoundingBox&);
    wxBoundingBox(const wxPoint2DDouble&);
    wxBoundingBox(double xmin, double ymin, double xmax, double ymax);

--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -239,7 +239,7 @@ public:
                         int alignment    = FL_ALIGN_TOP,
                         int rowNo        = 0,
                         int columnPos    = 0,
-                         const wxString& name = wxT("bar"),
+                         const wxString& name="bar",
                         bool spyEvents    = FALSE,
                         int state        = wxCBAR_DOCKED_HORIZONTALLY
                       );
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -148,12 +148,12 @@ public:
    virtual void AddTool( int toolIndex,
                              const wxString& imageFileName,
                              wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
-                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
+                              const wxString& labelText = "", bool alignTextRight = FALSE,
                              bool isFlat = TRUE );
        // Adds a tool. See the documentation for wxToolBar for details.

    virtual void AddTool( int toolIndex, wxBitmap labelBmp,
-                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
+                              const wxString& labelText = "", bool alignTextRight = FALSE,
                              bool isFlat = TRUE );

    // Method from wxToolBarBase (for compatibility), only
@@ -162,7 +162,7 @@ public:

    virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
               const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
-               const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
+               const wxString& helpString1 = "", const wxString& helpString2 = "");

        // Adds a separator. See the documentation for wxToolBar for details.

--- a/contrib/include/wx/fl/newbmpbtn.h
+++ b/contrib/include/wx/fl/newbmpbtn.h
@@ -110,7 +110,7 @@ public:

        // Constructor.
    wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
-                       const wxString& labelText   = wxT(""),
+                       const wxString& labelText   = "",
                       int   alignText             = NB_ALIGN_TEXT_BOTTOM,
                       bool  isFlat                = TRUE,
                       // this is the default type of fired events
@@ -124,7 +124,7 @@ public:
        // Use this constructor if buttons have to be persistant
    wxNewBitmapButton( const wxString& bitmapFileName,
                           const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,
-                           const wxString& labelText      = wxT(""),
+                           const wxString& labelText      = "",
                           int alignText                  = NB_ALIGN_TEXT_BOTTOM,
                           bool  isFlat                   = TRUE,
                           // this is the default type of fired events
@@ -143,7 +143,7 @@ public:
    virtual void Reshape();

        // Sets the label and optionally label text.
-    virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = wxT("") );
+    virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = "" );

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #endif
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -24,29 +24,11 @@
 #include <wx/wx.h>
 #include <wx/dnd.h>

-#ifndef SWIG
-/*
- * If we're using wx in Dynamic Library format do we
- * want wxStyledTextCtrl to be in DLL form as well?
- */
-#if defined(WXUSINGDLL) && \
-    (defined(WXMAKING_STC_DLL) || defined(WXUSING_STC_DLL))
-
-#if defined(WXMAKING_STC_DLL)
-    // When building the DLL WXSTC_DECLSPEC exports classes
-#   define WXSTC_DECLSPEC            WXEXPORT
-#elif defined(WXUSING_STC_DLL)
-    // When using the DLL WXSTC_DECLSPEC imports classes
-#   define WXSTC_DECLSPEC            WXIMPORT
-#endif // defined(WXBUILD_STC_DLL)
-
+#ifdef STCISDLL
+#define STCDLLEXPORT WXDLLEXPORT
 #else
-// When building the static library nullify the effect of WXSTC_DECLSPEC
-#define WXSTC_DECLSPEC
-#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL)
-
-#endif // SWIG
-
+#define STCDLLEXPORT
+#endif

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

@@ -77,9 +59,6 @@
 // The SC_CP_UTF8 value can be used to enter Unicode mode.
 // This is the same value as CP_UTF8 in Windows
 #define wxSTC_CP_UTF8 65001
-
-// The SC_CP_DBCS value can be used to indicate a DBCS mode for GTK+.
-#define wxSTC_CP_DBCS 1
 #define wxSTC_MARKER_MAX 31
 #define wxSTC_MARK_CIRCLE 0
 #define wxSTC_MARK_ROUNDRECT 1
@@ -110,7 +89,6 @@
 #define wxSTC_MARK_BACKGROUND 22
 #define wxSTC_MARK_DOTDOTDOT 23
 #define wxSTC_MARK_ARROWS 24
-#define wxSTC_MARK_PIXMAP 25
 #define wxSTC_MARK_CHARACTER 10000

 // Markers used for outlining column.
@@ -166,7 +144,6 @@
 #define wxSTC_INDIC_TT 2
 #define wxSTC_INDIC_DIAGONAL 3
 #define wxSTC_INDIC_STRIKE 4
-#define wxSTC_INDIC_HIDDEN 5
 #define wxSTC_INDIC0_MASK 0x20
 #define wxSTC_INDIC1_MASK 0x40
 #define wxSTC_INDIC2_MASK 0x80
@@ -190,21 +167,10 @@
 #define wxSTC_FIND_MATCHCASE 4
 #define wxSTC_FIND_WORDSTART 0x00100000
 #define wxSTC_FIND_REGEXP 0x00200000
-#define wxSTC_FIND_POSIX 0x00400000
 #define wxSTC_FOLDLEVELBASE 0x400
 #define wxSTC_FOLDLEVELWHITEFLAG 0x1000
 #define wxSTC_FOLDLEVELHEADERFLAG 0x2000
-#define wxSTC_FOLDLEVELBOXHEADERFLAG 0x4000
-#define wxSTC_FOLDLEVELBOXFOOTERFLAG 0x8000
-#define wxSTC_FOLDLEVELCONTRACTED 0x10000
-#define wxSTC_FOLDLEVELUNINDENT 0x20000
 #define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
-#define wxSTC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
-#define wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
-#define wxSTC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
-#define wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
-#define wxSTC_FOLDFLAG_LEVELNUMBERS 0x0040
-#define wxSTC_FOLDFLAG_BOX 0x0001
 #define wxSTC_TIME_FOREVER 10000000
 #define wxSTC_WRAP_NONE 0
 #define wxSTC_WRAP_WORD 1
@@ -216,7 +182,7 @@
 #define wxSTC_EDGE_LINE 1
 #define wxSTC_EDGE_BACKGROUND 2
 #define wxSTC_CURSORNORMAL -1
-#define wxSTC_CURSORWAIT 4
+#define wxSTC_CURSORWAIT 3

 // Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.
 #define wxSTC_VISIBLE_SLOP 0x01
@@ -248,9 +214,6 @@
 // where most code reside, and the lines after the caret, eg. the body of a function.
 #define wxSTC_CARET_EVEN 0x08

-// Maximum value of keywordSet parameter of SetKeyWords.
-#define wxSTC_KEYWORDSET_MAX 8
-
 // Notifications
 // Type of modification and the action which caused the modification.
 // These are defined as a bit mask to make it easy to specify which notifications are wanted.
@@ -327,17 +290,6 @@
 #define wxSTC_LEX_BAAN 31
 #define wxSTC_LEX_MATLAB 32
 #define wxSTC_LEX_SCRIPTOL 33
-#define wxSTC_LEX_ASM 34
-#define wxSTC_LEX_CPPNOCASE 35
-#define wxSTC_LEX_FORTRAN 36
-#define wxSTC_LEX_F77 37
-#define wxSTC_LEX_CSS 38
-#define wxSTC_LEX_POV 39
-#define wxSTC_LEX_LOUT 40
-#define wxSTC_LEX_ESCRIPT 41
-#define wxSTC_LEX_PS 42
-#define wxSTC_LEX_NSIS 43
-#define wxSTC_LEX_MMIXAL 44

 // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 // value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -379,7 +331,6 @@
 #define wxSTC_C_WORD2 16
 #define wxSTC_C_COMMENTDOCKEYWORD 17
 #define wxSTC_C_COMMENTDOCKEYWORDERROR 18
-#define wxSTC_C_GLOBALCLASS 19

 // Lexical states for SCLEX_HTML, SCLEX_XML
 #define wxSTC_H_DEFAULT 0
@@ -591,8 +542,6 @@
 #define wxSTC_LUA_WORD4 15
 #define wxSTC_LUA_WORD5 16
 #define wxSTC_LUA_WORD6 17
-#define wxSTC_LUA_WORD7 18
-#define wxSTC_LUA_WORD8 19

 // Lexical states for SCLEX_ERRORLIST
 #define wxSTC_ERR_DEFAULT 0
@@ -609,9 +558,6 @@
 #define wxSTC_ERR_DIFF_ADDITION 11
 #define wxSTC_ERR_DIFF_DELETION 12
 #define wxSTC_ERR_DIFF_MESSAGE 13
-#define wxSTC_ERR_PHP 14
-#define wxSTC_ERR_ELF 15
-#define wxSTC_ERR_IFC 16

 // Lexical states for SCLEX_BATCH
 #define wxSTC_BAT_DEFAULT 0
@@ -658,31 +604,24 @@
 #define wxSTC_AVE_COMMENT 1
 #define wxSTC_AVE_NUMBER 2
 #define wxSTC_AVE_WORD 3
+#define wxSTC_AVE_KEYWORD 4
+#define wxSTC_AVE_STATEMENT 5
 #define wxSTC_AVE_STRING 6
 #define wxSTC_AVE_ENUM 7
 #define wxSTC_AVE_STRINGEOL 8
 #define wxSTC_AVE_IDENTIFIER 9
 #define wxSTC_AVE_OPERATOR 10
-#define wxSTC_AVE_WORD1 11
-#define wxSTC_AVE_WORD2 12
-#define wxSTC_AVE_WORD3 13
-#define wxSTC_AVE_WORD4 14
-#define wxSTC_AVE_WORD5 15
-#define wxSTC_AVE_WORD6 16

 // Lexical states for SCLEX_ADA
 #define wxSTC_ADA_DEFAULT 0
-#define wxSTC_ADA_WORD 1
-#define wxSTC_ADA_IDENTIFIER 2
-#define wxSTC_ADA_NUMBER 3
-#define wxSTC_ADA_DELIMITER 4
+#define wxSTC_ADA_COMMENT 1
+#define wxSTC_ADA_NUMBER 2
+#define wxSTC_ADA_WORD 3
+#define wxSTC_ADA_STRING 4
 #define wxSTC_ADA_CHARACTER 5
-#define wxSTC_ADA_CHARACTEREOL 6
-#define wxSTC_ADA_STRING 7
+#define wxSTC_ADA_OPERATOR 6
+#define wxSTC_ADA_IDENTIFIER 7
 #define wxSTC_ADA_STRINGEOL 8
-#define wxSTC_ADA_LABEL 9
-#define wxSTC_ADA_COMMENTLINE 10
-#define wxSTC_ADA_ILLEGAL 11

 // Lexical states for SCLEX_BAAN
 #define wxSTC_BAAN_DEFAULT 0
@@ -763,158 +702,10 @@
 #define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR 18
 #define wxSTC_SCRIPTOL_COMMENTBASIC 19

-// Lexical states for SCLEX_ASM
-#define wxSTC_ASM_DEFAULT 0
-#define wxSTC_ASM_COMMENT 1
-#define wxSTC_ASM_NUMBER 2
-#define wxSTC_ASM_STRING 3
-#define wxSTC_ASM_OPERATOR 4
-#define wxSTC_ASM_IDENTIFIER 5
-#define wxSTC_ASM_CPUINSTRUCTION 6
-#define wxSTC_ASM_MATHINSTRUCTION 7
-#define wxSTC_ASM_REGISTER 8
-#define wxSTC_ASM_DIRECTIVE 9
-#define wxSTC_ASM_DIRECTIVEOPERAND 10
-
-// Lexical states for SCLEX_FORTRAN
-#define wxSTC_F_DEFAULT 0
-#define wxSTC_F_COMMENT 1
-#define wxSTC_F_NUMBER 2
-#define wxSTC_F_STRING1 3
-#define wxSTC_F_STRING2 4
-#define wxSTC_F_STRINGEOL 5
-#define wxSTC_F_OPERATOR 6
-#define wxSTC_F_IDENTIFIER 7
-#define wxSTC_F_WORD 8
-#define wxSTC_F_WORD2 9
-#define wxSTC_F_WORD3 10
-#define wxSTC_F_PREPROCESSOR 11
-#define wxSTC_F_OPERATOR2 12
-#define wxSTC_F_LABEL 13
-#define wxSTC_F_CONTINUATION 14
-
-// Lexical states for SCLEX_CSS
-#define wxSTC_CSS_DEFAULT 0
-#define wxSTC_CSS_TAG 1
-#define wxSTC_CSS_CLASS 2
-#define wxSTC_CSS_PSEUDOCLASS 3
-#define wxSTC_CSS_UNKNOWN_PSEUDOCLASS 4
-#define wxSTC_CSS_OPERATOR 5
-#define wxSTC_CSS_IDENTIFIER 6
-#define wxSTC_CSS_UNKNOWN_IDENTIFIER 7
-#define wxSTC_CSS_VALUE 8
-#define wxSTC_CSS_COMMENT 9
-#define wxSTC_CSS_ID 10
-#define wxSTC_CSS_IMPORTANT 11
-#define wxSTC_CSS_DIRECTIVE 12
-#define wxSTC_CSS_DOUBLESTRING 13
-#define wxSTC_CSS_SINGLESTRING 14
-
-// Lexical states for SCLEX_POV
-#define wxSTC_POV_DEFAULT 0
-#define wxSTC_POV_COMMENT 1
-#define wxSTC_POV_COMMENTLINE 2
-#define wxSTC_POV_NUMBER 3
-#define wxSTC_POV_OPERATOR 4
-#define wxSTC_POV_IDENTIFIER 5
-#define wxSTC_POV_STRING 6
-#define wxSTC_POV_STRINGEOL 7
-#define wxSTC_POV_DIRECTIVE 8
-#define wxSTC_POV_BADDIRECTIVE 9
-#define wxSTC_POV_WORD2 10
-#define wxSTC_POV_WORD3 11
-#define wxSTC_POV_WORD4 12
-#define wxSTC_POV_WORD5 13
-#define wxSTC_POV_WORD6 14
-#define wxSTC_POV_WORD7 15
-#define wxSTC_POV_WORD8 16
-
-// Lexical states for SCLEX_LOUT
-#define wxSTC_LOUT_DEFAULT 0
-#define wxSTC_LOUT_COMMENT 1
-#define wxSTC_LOUT_NUMBER 2
-#define wxSTC_LOUT_WORD 3
-#define wxSTC_LOUT_WORD2 4
-#define wxSTC_LOUT_WORD3 5
-#define wxSTC_LOUT_WORD4 6
-#define wxSTC_LOUT_STRING 7
-#define wxSTC_LOUT_OPERATOR 8
-#define wxSTC_LOUT_IDENTIFIER 9
-#define wxSTC_LOUT_STRINGEOL 10
-
-// Lexical states for SCLEX_ESCRIPT
-#define wxSTC_ESCRIPT_DEFAULT 0
-#define wxSTC_ESCRIPT_COMMENT 1
-#define wxSTC_ESCRIPT_COMMENTLINE 2
-#define wxSTC_ESCRIPT_COMMENTDOC 3
-#define wxSTC_ESCRIPT_NUMBER 4
-#define wxSTC_ESCRIPT_WORD 5
-#define wxSTC_ESCRIPT_STRING 6
-#define wxSTC_ESCRIPT_OPERATOR 7
-#define wxSTC_ESCRIPT_IDENTIFIER 8
-#define wxSTC_ESCRIPT_BRACE 9
-#define wxSTC_ESCRIPT_WORD2 10
-#define wxSTC_ESCRIPT_WORD3 11
-
-// Lexical states for SCLEX_PS
-#define wxSTC_PS_DEFAULT 0
-#define wxSTC_PS_COMMENT 1
-#define wxSTC_PS_DSC_COMMENT 2
-#define wxSTC_PS_DSC_VALUE 3
-#define wxSTC_PS_NUMBER 4
-#define wxSTC_PS_NAME 5
-#define wxSTC_PS_KEYWORD 6
-#define wxSTC_PS_LITERAL 7
-#define wxSTC_PS_IMMEVAL 8
-#define wxSTC_PS_PAREN_ARRAY 9
-#define wxSTC_PS_PAREN_DICT 10
-#define wxSTC_PS_PAREN_PROC 11
-#define wxSTC_PS_TEXT 12
-#define wxSTC_PS_HEXSTRING 13
-#define wxSTC_PS_BASE85STRING 14
-#define wxSTC_PS_BADSTRINGCHAR 15
-
-// Lexical states for SCLEX_NSIS
-#define wxSTC_NSIS_DEFAULT 0
-#define wxSTC_NSIS_COMMENT 1
-#define wxSTC_NSIS_STRINGDQ 2
-#define wxSTC_NSIS_STRINGLQ 3
-#define wxSTC_NSIS_STRINGRQ 4
-#define wxSTC_NSIS_FUNCTION 5
-#define wxSTC_NSIS_VARIABLE 6
-#define wxSTC_NSIS_LABEL 7
-#define wxSTC_NSIS_USERDEFINED 8
-#define wxSTC_NSIS_SECTIONDEF 9
-#define wxSTC_NSIS_SUBSECTIONDEF 10
-#define wxSTC_NSIS_IFDEFINEDEF 11
-#define wxSTC_NSIS_MACRODEF 12
-#define wxSTC_NSIS_STRINGVAR 13
-
-// Lexical states for SCLEX_MMIXAL
-#define wxSTC_MMIXAL_LEADWS 0
-#define wxSTC_MMIXAL_COMMENT 1
-#define wxSTC_MMIXAL_LABEL 2
-#define wxSTC_MMIXAL_OPCODE 3
-#define wxSTC_MMIXAL_OPCODE_PRE 4
-#define wxSTC_MMIXAL_OPCODE_VALID 5
-#define wxSTC_MMIXAL_OPCODE_UNKNOWN 6
-#define wxSTC_MMIXAL_OPCODE_POST 7
-#define wxSTC_MMIXAL_OPERANDS 8
-#define wxSTC_MMIXAL_NUMBER 9
-#define wxSTC_MMIXAL_REF 10
-#define wxSTC_MMIXAL_CHAR 11
-#define wxSTC_MMIXAL_STRING 12
-#define wxSTC_MMIXAL_REGISTER 13
-#define wxSTC_MMIXAL_HEX 14
-#define wxSTC_MMIXAL_OPERATOR 15
-#define wxSTC_MMIXAL_SYMBOL 16
-#define wxSTC_MMIXAL_INCLUDE 17
-

 //-----------------------------------------
 // Commands that can be bound to keystrokes

-
 // Redoes the next action on the undo history.
 #define wxSTC_CMD_REDO 2011

@@ -1058,9 +849,6 @@
 // Switch the current line with the previous.
 #define wxSTC_CMD_LINETRANSPOSE 2339

-// Duplicate the current line.
-#define wxSTC_CMD_LINEDUPLICATE 2404
-
 // Transform the selection to lower case.
 #define wxSTC_CMD_LOWERCASE 2340

@@ -1091,18 +879,6 @@
 // caret position.
 #define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348

-// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-// except they behave differently when word-wrap is enabled:
-// They go first to the start / end of the display line, like (Home|LineEnd)Display
-// The difference is that, the cursor is already at the point, it goes on to the start
-// or end of the document line, as appropriate for (Home|LineEnd|VCHome)Extend.
-#define wxSTC_CMD_HOMEWRAP 2349
-#define wxSTC_CMD_HOMEWRAPEXTEND 2450
-#define wxSTC_CMD_LINEENDWRAP 2451
-#define wxSTC_CMD_LINEENDWRAPEXTEND 2452
-#define wxSTC_CMD_VCHOMEWRAP 2453
-#define wxSTC_CMD_VCHOMEWRAPEXTEND 2454
-
 // Move to the previous change in capitalisation.
 #define wxSTC_CMD_WORDPARTLEFT 2390

@@ -1123,12 +899,6 @@
 // Delete forwards from the current position to the end of the line.
 #define wxSTC_CMD_DELLINERIGHT 2396

-// Move caret between paragraphs (delimited by empty lines)
-#define wxSTC_CMD_PARADOWN 2413
-#define wxSTC_CMD_PARADOWNEXTEND 2414
-#define wxSTC_CMD_PARAUP 2415
-#define wxSTC_CMD_PARAUPEXTEND 2416
-

 // END of generated section
 //----------------------------------------------------------------------
@@ -1138,9 +908,9 @@ class  WordList;
 struct SCNotification;

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

 //----------------------------------------------------------------------
@@ -1303,8 +1073,8 @@ public:
    // Set the symbol used for a particular marker number,
    // and optionally the fore and background colours.
    void MarkerDefine(int markerNumber, int markerSymbol,
-                const wxColour& foreground = wxNullColour,
-                const wxColour& background = wxNullColour);
+                         const wxColour& foreground = wxNullColour,
+                         const wxColour& background = wxNullColour);

    // Set the foreground colour used for a particular marker number.
    void MarkerSetForeground(int markerNumber, const wxColour& fore);
@@ -1330,9 +1100,6 @@ public:
    // Find the previous line before lineStart that includes a marker in mask.
    int MarkerPrevious(int lineStart, int markerMask);

-    // Define a marker from a bitmap
-    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
-
    // Set a margin to be either numeric or symbolic.
    void SetMarginType(int margin, int marginType);

@@ -1393,9 +1160,6 @@ public:
    // Set the character set of the font in a style.
    void StyleSetCharacterSet(int style, int characterSet);

-    // Set a style to be a hotspot or not.
-    void StyleSetHotSpot(int style, bool hotspot);
-
    // Set the foreground colour of the selection and whether to use this setting.
    void SetSelForeground(bool useSetting, const wxColour& fore);

@@ -1557,19 +1321,6 @@ public:
    // after the inserted text upon completion.
    bool AutoCompGetDropRestOfWord();

-    // Register an image for use in autocompletion lists.
-    void RegisterImage(int type, const wxBitmap& bmp);
-
-    // Clear all the registered images.
-    void ClearRegisteredImages();
-
-    // Retrieve the auto-completion list type-separator character.
-    int AutoCompGetTypeSeparator();
-
-    // Change the type-separator character in the string setting up an auto-completion list.
-    // Default is '?' but can be changed if items contain '?'.
-    void AutoCompSetTypeSeparator(int separatorCharacter);
-
    // Set the number of spaces used for one level of indentation.
    void SetIndent(int indentSize);

@@ -1658,14 +1409,14 @@ public:

    // On Windows, will draw the document into a display context such as a printer.
    int FormatRange(bool   doDraw,
-               int    startPos,
-               int    endPos,
-               wxDC*  draw,
-               wxDC*  target,  // Why does it use two? Can they be the same?
-               wxRect renderRect,
-               wxRect pageRect);
+                               int    startPos,
+                               int    endPos,
+                               wxDC*  draw,
+                               wxDC*  target,  // Why does it use two? Can they be the same?
+                               wxRect renderRect,
+                               wxRect pageRect);

-    // Retrieve the display line at the top of the display.
+    // Retrieve the line at the top of the display.
    int GetFirstVisibleLine();

    // Retrieve the contents of a line.
@@ -1820,12 +1571,6 @@ public:
    // Set the background colour for the call tip.
    void CallTipSetBackground(const wxColour& back);

-    // Set the foreground colour for the call tip.
-    void CallTipSetForeground(const wxColour& fore);
-
-    // Set the foreground colour for the highlighted part of the call tip.
-    void CallTipSetForegroundHighlight(const wxColour& fore);
-
    // Find the display line of a document line taking hidden lines into account.
    int VisibleFromDocLine(int line);

@@ -1867,7 +1612,7 @@ public:
    // Ensure a particular line is visible by expanding any header line hiding it.
    void EnsureVisible(int line);

-    // Set some style options for folding.
+    // Set some debugging options for folding.
    void SetFoldFlags(int flags);

    // Ensure a particular line is visible by expanding any header line hiding it.
@@ -1933,39 +1678,6 @@ public:
    // Retrieve the height of a particular line of text in pixels.
    int TextHeight(int line);

-    // Show or hide the vertical scroll bar.
-    void SetUseVerticalScrollBar(bool show);
-
-    // Is the vertical scroll bar visible?
-    bool GetUseVerticalScrollBar();
-
-    // Append a string to the end of the document without changing the selection.
-    void AppendText(int length, const wxString& text);
-
-    // Is drawing done in two phases with backgrounds drawn before foregrounds?
-    bool GetTwoPhaseDraw();
-
-    // In twoPhaseDraw mode, drawing is performed in two phases, first the background
-    // and then the foreground. This avoids chopping off characters that overlap the next run.
-    void SetTwoPhaseDraw(bool twoPhase);
-
-    // Make the target range start and end be the same as the selection range start and end.
-    void TargetFromSelection();
-
-    // Join the lines in the target.
-    void LinesJoin();
-
-    // Split the lines in the target into lines that are less wide than pixelWidth
-    // where possible.
-    void LinesSplit(int pixelWidth);
-
-    // Set the colours used as a chequerboard pattern in the fold margin
-    void SetFoldMarginColour(bool useSetting, const wxColour& back);
-    void SetFoldMarginHiColour(bool useSetting, const wxColour& fore);
-
-    // Duplicate the current line.
-    void LineDuplicate();
-
    // Move caret to first position on display line.
    void HomeDisplay();

@@ -1980,9 +1692,6 @@ public:
    // caret position.
    void LineEndDisplayExtend();

-    // Copy the line containing the caret.
-    void LineCopy();
-
    // Move the caret inside current view if it's not there already.
    void MoveCaretInsideView();

@@ -2093,10 +1802,10 @@ public:
    bool GetMouseDownCaptures();

    // Sets the cursor to one of the SC_CURSOR* values.
-    void SetSTCCursor(int cursorType);
+    void SetCursor(int cursorType);

    // Get cursor type.
-    int GetSTCCursor();
+    int GetCursor();

    // Change the way control characters are displayed:
    // If symbol is < 32, keep the drawn way, else, use the given character.
@@ -2133,9 +1842,6 @@ public:
    void SetXOffset(int newOffset);
    int GetXOffset();

-    // Set the last x chosen value to be the caret x position
-    void ChooseCaretX();
-
    // Set the way the caret is kept visible when going sideway.
    // The exclusion zone is given in pixels.
    void SetXCaretPolicy(int caretPolicy, int caretSlop);
@@ -2144,35 +1850,6 @@ public:
    // The exclusion zone is given in lines.
    void SetYCaretPolicy(int caretPolicy, int caretSlop);

-    // Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
-    void SetPrintWrapMode(int mode);
-
-    // Is printing line wrapped.
-    int GetPrintWrapMode();
-
-    // Set a fore colour for active hotspots.
-    void SetHotspotActiveForeground(bool useSetting, const wxColour& fore);
-
-    // Set a back colour for active hotspots.
-    void SetHotspotActiveBackground(bool useSetting, const wxColour& back);
-
-    // Enable / Disable underlining active hotspots.
-    void SetHotspotActiveUnderline(bool underline);
-
-    // Given a valid document position, return the previous position taking code
-    // page into account. Returns 0 if passed 0.
-    int PositionBefore(int pos);
-
-    // Given a valid document position, return the next position taking code
-    // page into account. Maximum value returned is the last position in the document.
-    int PositionAfter(int pos);
-
-    // Copy a range of text to the clipboard. Positions are clipped into the document.
-    void CopyRange(int start, int end);
-
-    // Copy argument text to the clipboard.
-    void CopyText(int length, const wxString& text);
-
    // Start notifying the container of all key presses and commands.
    void StartRecord();

@@ -2278,18 +1955,6 @@ public:
    bool GetLastKeydownProcessed() { return m_lastKeyDownConsumed; }
    void SetLastKeydownProcessed(bool val) { m_lastKeyDownConsumed = val; }

-    // Write the contents of the editor to filename
-    bool SaveFile(const wxString& filename);
-
-    // Load the contents of filename into the editor
-    bool LoadFile(const wxString& filename);
-
-    // Allow for simulating a DnD DragOver
-    wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
-
-    // Allow for simulating a DnD DropText
-    bool DoDropText(long x, long y, const wxString& data);
-

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

@@ -2322,11 +1987,11 @@ private:
    void NotifyChange();
    void NotifyParent(SCNotification* scn);

+
+private:
    DECLARE_EVENT_TABLE()
    DECLARE_CLASS(wxStyledTextCtrl)

-protected:
-
    ScintillaWX*        m_swx;
    wxStopWatch         m_stopWatch;
    wxScrollBar*        m_vScrollBar;
@@ -2445,8 +2110,6 @@ private:
 #endif
 };

-
-
 #ifndef SWIG
 BEGIN_DECLARE_EVENT_TYPES()
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHANGE,                  1650)
@@ -2472,9 +2135,6 @@ BEGIN_DECLARE_EVENT_TYPES()
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER,               1670)
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP,                 1671)
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ZOOM,                    1672)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_HOTSPOT_CLICK,           1673)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_HOTSPOT_DCLICK,          1674)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CALLTIP_CLICK,           1675)
 END_DECLARE_EVENT_TYPES()
 #else
    enum {
@@ -2501,9 +2161,6 @@ END_DECLARE_EVENT_TYPES()
        wxEVT_STC_DRAG_OVER,
        wxEVT_STC_DO_DROP,
        wxEVT_STC_ZOOM,
-        wxEVT_STC_HOTSPOT_CLICK,
-        wxEVT_STC_HOTSPOT_DCLICK,
-        wxEVT_STC_CALLTIP_CLICK
    };
 #endif

@@ -2535,10 +2192,6 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_DRAG_OVER(id, fn)               DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER,             id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_DO_DROP(id, fn)                 DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_ZOOM(id, fn)                    DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM,                  id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_CLICK(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK,         id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_DCLICK(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK,        id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_CALLTIP_CLICK(id, fn))          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK          id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-
 #endif

 //----------------------------------------------------------------------
@@ -2554,14 +2207,13 @@ inline wxString stc2wx(const char* str) {
 #endif
 }

-#if wxUSE_UNICODE
-wxString stc2wx(const char* str, size_t len);
-#else
 inline wxString stc2wx(const char* str, size_t len) {
+#if wxUSE_UNICODE
+    return wxString(str, wxConvUTF8, len);
+#else
    return wxString(str, len);
-}
 #endif
-
+}

 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {
--- a/contrib/include/wx/xrc/xh_all.h
+++ b/contrib/include/wx/xrc/xh_all.h
@@ -47,7 +47,5 @@
 #include "wx/xrc/xh_gdctl.h"
 #include "wx/xrc/xh_frame.h"
 #include "wx/xrc/xh_scwin.h"
-#include "wx/xrc/xh_split.h"
-#include "wx/xrc/xh_wizrd.h"

 #endif // _WX_XMLRES_H_
--- a/contrib/include/wx/xrc/xh_chckl.h
+++ b/contrib/include/wx/xrc/xh_chckl.h
@@ -17,10 +17,10 @@

 #include "wx/xrc/xmlres.h"

-class WXXMLDLLEXPORT wxCheckListBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
 {
 public:
-    wxCheckListBoxXmlHandler();
+    wxCheckListXmlHandler();
    virtual wxObject *DoCreateResource();
    virtual bool CanHandle(wxXmlNode *node);
 private:
--- a/contrib/include/wx/xrc/xh_split.h
+++ b/contrib/include/wx/xrc/xh_split.h
@@ -1,28 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_split.h
-// Purpose:     XRC resource for wxSplitterWindow
-// Author:      panga@freemail.hu, Vaclav Slavik
-// Created:     2003/01/26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 panga@freemail.hu, Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SPLIT_H_
-#define _WX_XH_SPLIT_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_split.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxSplitterWindowXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // _WX_XH_SPLIT_H_
--- a/contrib/include/wx/xrc/xh_wizrd.h
+++ b/contrib/include/wx/xrc/xh_wizrd.h
@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_wizrd.h
-// Purpose:     XML resource handler for wxWizard
-// Author:      Vaclav Slavik
-// Created:     2003/03/02
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_WIZRD_H_
-#define _WX_XH_WIZRDL_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_wizrd.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_WIZARDDLG
-
-#include "wx/wizard.h"
-
-class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxWizardXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    wxWizard *m_wizard;
-    wxWizardPageSimple *m_lastSimplePage;
-};
-
-#endif
-
-#endif // _WX_XH_PANEL_H_
--- a/contrib/include/wx/xrc/xml.h
+++ b/contrib/include/wx/xrc/xml.h
@@ -164,7 +164,7 @@ private:
 class WXXMLDLLEXPORT wxXmlDocument : public wxObject
 {
 public:
-    wxXmlDocument();
+    wxXmlDocument() : wxObject(), m_version(wxT("1.0")), m_root(NULL)  {}
    wxXmlDocument(const wxString& filename,
                  const wxString& encoding = wxT("UTF-8"));
    wxXmlDocument(wxInputStream& stream,
@@ -180,7 +180,7 @@ public:
              const wxString& encoding = wxT("UTF-8"));
    bool Load(wxInputStream& stream,
              const wxString& encoding = wxT("UTF-8"));
-    
+
    // Saves document as .xml file.
    bool Save(const wxString& filename) const;
    bool Save(wxOutputStream& stream) const;
@@ -193,7 +193,7 @@ public:
    // Returns version of document (may be empty).
    wxString GetVersion() const { return m_version; }
    // Returns encoding of document (may be empty).
-    // Note: this is the encoding original file was saved in, *not* the
+    // Note: this is the encoding original fail was saved in, *not* the
    // encoding of in-memory representation!
    wxString GetFileEncoding() const { return m_fileEncoding; }

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

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

 #define WX_XMLRES_CURRENT_VERSION \
                (WX_XMLRES_CURRENT_VERSION_MAJOR * 256*256*256 + \
@@ -240,18 +240,8 @@ protected:
    wxXmlNode *DoFindResource(wxXmlNode *parent, const wxString& name, const wxString& classname, bool recursive);

    // Creates a resource from information in the given node.
-    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent,
-                                wxObject *instance = NULL);
+    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);

-    // Creates a resource from information in the given node
-    // (Uses only 'handlerToUse' if != NULL)
-    //
-    // ATTENTION: Do *NOT* use this function, it will disappear in
-    //            wxWindows 2.5.0! It exists *only* as a hack to preserve
-    //            binary compatibility in 2.4.x branch.
-    wxObject *CreateResFromNode2(wxXmlNode *node, wxObject *parent,
-                                 wxObject *instance = NULL,
-                                 wxXmlResourceHandler *handlerToUse = NULL);
 private:
    long m_version;

--- a/contrib/samples/animate/AniTestVC.dsp
+++ b/contrib/samples/animate/AniTestVC.dsp
@@ -111,7 +111,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../lib"

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

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

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

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

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

--- a/contrib/samples/canvas/simple/SimpleVC.dsp
+++ b/contrib/samples/canvas/simple/SimpleVC.dsp
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/canvas/test/TestVC.dsp
+++ b/contrib/samples/canvas/test/TestVC.dsp
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/test.exe" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/test.exe" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_demo1/fl_demo.dsp
+++ b/contrib/samples/fl/fl_demo1/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_demo2/fl_demo.dsp
+++ b/contrib/samples/fl/fl_demo2/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_demo2/fl_demo2.h
+++ b/contrib/samples/fl/fl_demo2/fl_demo2.h
@@ -153,7 +153,7 @@ public:
    void OnMouseUp( wxMouseEvent& event );
    void OnPaint( wxPaintEvent& event );
    
-    DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE();
 };

 #endif
--- a/contrib/samples/fl/fl_sample1/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample1/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_sample2/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample2/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

--- a/contrib/samples/fl/fl_sample3/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample3/fl_demo.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"

 !ENDIF 

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

 !ENDIF 

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

 !ENDIF 

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

 !ENDIF 

--- a/contrib/samples/gizmos/multicell/makefile.bcc
+++ b/contrib/samples/gizmos/multicell/makefile.bcc
@@ -0,0 +1,15 @@
+# Purpose: makefile for multicell example (BC++ 16bit)
+# Created 2000-07-28
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=mtest
+OBJECTS=$(TARGET).obj ..\src\multicell.obj
+EXTRAINC=-I..\include
+
+!include $(WXDIR)\src\makeprog.bcc
+
--- a/contrib/samples/gizmos/multicell/makefile.wat
+++ b/contrib/samples/gizmos/multicell/makefile.wat
@@ -3,10 +3,9 @@

 WXDIR = $(%WXWIN)

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

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

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

 !ENDIF 

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

 !ENDIF 

--- a/contrib/samples/gizmos/splittree/makefile.bcc
+++ b/contrib/samples/gizmos/splittree/makefile.bcc
@@ -0,0 +1,19 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=minimal
+OBJECTS=$(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.bcc
+
--- a/contrib/samples/gizmos/splittree/makefile.wat
+++ b/contrib/samples/gizmos/splittree/makefile.wat
@@ -1,13 +1,14 @@
-# Purpose: makefile for multicell example (Watcom)
-# Created 2000-07-28
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#

 WXDIR = $(%WXWIN)

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

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

--- a/contrib/samples/mmedia/MMboardVC.dsp
+++ b/contrib/samples/mmedia/MMboardVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

--- a/contrib/samples/mmedia/makefile.b32
+++ b/contrib/samples/mmedia/makefile.b32
@@ -10,7 +10,7 @@
 WXDIR = $(WXWIN)

 TARGET=mmboard
-EXTRALIBS=$(WXDIR)\lib\mmedia.lib
+EXTRALIBS=$(WXDIR)\contrib\lib\mmedia.lib
 OBJECTS = $(TARGET).obj mmbman.obj

 !include $(WXDIR)\src\makeprog.b32
--- a/contrib/samples/mmedia/makefile.bcc
+++ b/contrib/samples/mmedia/makefile.bcc
@@ -0,0 +1,20 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=mmboard
+EXTRALIBS=$(WXDIR)\contrib\lib\mmedia.lib
+OBJECTS=$(TARGET).obj mmbman.obj
+
+!include $(WXDIR)\src\makeprog.bcc
+
--- a/contrib/samples/mmedia/makefile.wat
+++ b/contrib/samples/mmedia/makefile.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)

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

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

--- a/contrib/samples/ogl/ogledit/OGLEditVC.dsp
+++ b/contrib/samples/ogl/ogledit/OGLEditVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ENDIF 

--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/contrib/samples/ogl/ogledit/doc.cpp
@@ -92,9 +92,7 @@ wxOutputStream& DiagramDocument::SaveObject(wxOutputStream& stream)
  char buf[400];
  (void) wxGetTempFileName("diag", buf);

-#if wxUSE_PROLOGIO
  diagram.SaveFile(buf);
-#endif

  wxTransferFileToStream(buf, stream);

@@ -115,11 +113,7 @@ wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
  wxTransferStreamToFile(stream, buf);

  diagram.DeleteAllShapes();
-
-#if wxUSE_PROLOGIO
  diagram.LoadFile(buf);
-#endif
-
  wxRemoveFile(buf);

  return stream;
@@ -554,7 +548,6 @@ void MyEvtHandler::OnEndSize(double x, double y)
 * Diagram
 */
 
-#if wxUSE_PROLOGIO
 bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 {
  wxDiagram::OnShapeSave(db, shape, expr);
@@ -575,7 +568,6 @@ bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
    delete[] label;
  return TRUE;
 }
-#endif

 /*
 * New shapes
--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/contrib/samples/ogl/ogledit/doc.h
@@ -35,10 +35,8 @@ class MyDiagram: public wxDiagram
 {
 public:
  MyDiagram(void) {}
-#if wxUSE_PROLOGIO
  bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
  bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-#endif
 };

 /*
--- a/contrib/samples/ogl/ogledit/makefile.bcc
+++ b/contrib/samples/ogl/ogledit/makefile.bcc
@@ -0,0 +1,20 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=ogledit
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
+OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
+
+!include $(WXDIR)\src\makeprog.b32
+
--- a/contrib/samples/ogl/ogledit/makefile.wat
+++ b/contrib/samples/ogl/ogledit/makefile.wat
@@ -7,11 +7,9 @@

 WXDIR = $(%WXWIN)

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

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

--- a/contrib/samples/ogl/studio/StudioVC.dsp
+++ b/contrib/samples/ogl/studio/StudioVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

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

--- a/contrib/samples/ogl/studio/dialogs.cpp
+++ b/contrib/samples/ogl/studio/dialogs.cpp
@@ -25,11 +25,6 @@
 #endif

 #include <wx/resource.h>
-
-#if !wxUSE_WX_RESOURCES 
-#error "OGL studio sample requires wxUSE_WX_RESOURCES" 
-#endif // wxUSE_WX_RESOURCES 
-
 #include "dialogs.h"
 #include "doc.h"
 #include "view.h"
--- a/contrib/samples/ogl/studio/doc.cpp
+++ b/contrib/samples/ogl/studio/doc.cpp
@@ -60,7 +60,6 @@ bool csDiagramDocument::OnSaveDocument(const wxString& file)
  if (file == "")
    return FALSE;

-#if wxUSE_PROLOGIO
  if (!m_diagram.SaveFile(file))
  {
    wxString msgTitle;
@@ -73,7 +72,6 @@ bool csDiagramDocument::OnSaveDocument(const wxString& file)
      GetDocumentWindow());
    return FALSE;
  }
-#endif

  Modify(FALSE);
  SetFilename(file);
@@ -92,14 +90,12 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
    msgTitle = wxString("File error");

  m_diagram.DeleteAllShapes();
-#if wxUSE_PROLOGIO
  if (!m_diagram.LoadFile(file))
  {
    (void)wxMessageBox("Sorry, could not open this file.", msgTitle, wxOK|wxICON_EXCLAMATION,
     GetDocumentWindow());
    return FALSE;
  }
-#endif
  SetFilename(file, TRUE);
  Modify(FALSE);
  UpdateAllViews();
--- a/contrib/samples/ogl/studio/makefile.bcc
+++ b/contrib/samples/ogl/studio/makefile.bcc
@@ -0,0 +1,21 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=studio
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
+OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
+  mainfrm.obj project.obj dialogs.obj csprint.obj
+
+!include $(WXDIR)\src\makeprog.bcc
+
--- a/contrib/samples/ogl/studio/makefile.wat
+++ b/contrib/samples/ogl/studio/makefile.wat
@@ -7,20 +7,10 @@

 WXDIR = $(%WXWIN)

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-
 PROGRAM = studio
-EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj &
-  $(OUTPUTDIR)\doc.obj &
-  $(OUTPUTDIR)\shapes.obj &
-  $(OUTPUTDIR)\symbols.obj &
-  $(OUTPUTDIR)\view.obj &
-  $(OUTPUTDIR)\cspalette.obj &
-  $(OUTPUTDIR)\mainfrm.obj &
-  $(OUTPUTDIR)\project.obj &
-  $(OUTPUTDIR)\dialogs.obj &
-  $(OUTPUTDIR)\csprint.obj
+EXTRALIBS = $(WXDIR)\lib\ogl.lib
+OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj &
+  mainfrm.obj project.obj dialogs.obj csprint.obj

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

--- a/contrib/samples/ogl/studio/shapes.cpp
+++ b/contrib/samples/ogl/studio/shapes.cpp
@@ -705,7 +705,6 @@ bool csEvtHandler::EditProperties()
 * Diagram
 */
 
-#if wxUSE_PROLOGIO
 bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 {
  wxDiagram::OnShapeSave(db, shape, expr);
@@ -724,7 +723,6 @@ bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
  
  return TRUE;
 }
-#endif

 IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)

--- a/contrib/samples/ogl/studio/shapes.h
+++ b/contrib/samples/ogl/studio/shapes.h
@@ -37,10 +37,8 @@ DECLARE_CLASS(csDiagram)
 public:
    csDiagram(csDiagramDocument* doc) { m_doc = doc; }
    ~csDiagram();
-#if wxUSE_PROLOGIO
    bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
    bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-#endif

    inline csDiagramDocument* GetDocument() const { return m_doc; }
    virtual void Redraw(wxDC& dc);
--- a/contrib/samples/ogl/studio/studio.cpp
+++ b/contrib/samples/ogl/studio/studio.cpp
@@ -25,10 +25,6 @@
 #include "wx/config.h"
 #include "wx/laywin.h"

-#if !wxUSE_WX_RESOURCES 
-#error "OGL studio sample requires wxUSE_WX_RESOURCES" 
-#endif // wxUSE_WX_RESOURCES 
-
 #include "studio.h"
 #include "view.h"
 #include "doc.h"
--- a/contrib/samples/plot/PlotVC.dsp
+++ b/contrib/samples/plot/PlotVC.dsp
@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

--- a/contrib/samples/stc/Makefile.in
+++ b/contrib/samples/stc/Makefile.in
@@ -11,7 +11,7 @@ program_dir = contrib/samples/stc

 PROGRAM=stctest

-OBJECTS=$(PROGRAM).o edit.o prefs.o
+OBJECTS=$(PROGRAM).o

 APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_stc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
--- a/contrib/samples/stc/Makefile.sc
+++ b/contrib/samples/stc/Makefile.sc
@@ -1,6 +0,0 @@
-#Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..
-TARGET=stctest
-OBJECTS = $(TARGET).obj edit.obj prefs.obj
-EXTRALIBS=$(WXDIR)\lib\stc_sc.lib
-include $(WXDIR)\src\makeprog.sc
--- a/contrib/samples/stc/StcTestVC.dsp
+++ b/contrib/samples/stc/StcTestVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24.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 

@@ -147,44 +147,6 @@ LINK32=link.exe
 # Name "StcTestVC - Win32 Release DLL"
 # Begin Source File

-SOURCE=.\edit.cpp
-
-!IF  "$(CFG)" == "StcTestVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug DLL"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\prefs.cpp
-
-!IF  "$(CFG)" == "StcTestVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug DLL"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\stctest.cpp

 !IF  "$(CFG)" == "StcTestVC - Win32 Release"
--- a/contrib/samples/stc/defsext.h
+++ b/contrib/samples/stc/defsext.h
@@ -1,104 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        defsext.h extensions
-// Purpose:     STC test declarations
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DEFSEXT_H_
-#define _WX_DEFSEXT_H_
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-//! wxWindows headers
-#include <wx/print.h>    // printing support
-#include <wx/printdlg.h> // printing dialog
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-#define DEFAULT_LANGUAGE _("<default>")
-
-#define PAGE_COMMON _("Common")
-#define PAGE_LANGUAGES _("Languages")
-#define PAGE_STYLE_TYPES _("Style types")
-
-#define STYLE_TYPES_COUNT 32
-
-
-// ----------------------------------------------------------------------------
-// standard IDs
-// ----------------------------------------------------------------------------
-
-enum {
-    // menu IDs
-    myID_PROPERTIES = wxID_HIGHEST,
-    myID_INDENTINC,
-    myID_INDENTRED,
-    myID_FINDNEXT,
-    myID_REPLACE,
-    myID_REPLACENEXT,
-    myID_BRACEMATCH,
-    myID_GOTO,
-    myID_PAGEACTIVE,
-    myID_DISPLAYEOL,
-    myID_INDENTGUIDE,
-    myID_LINENUMBER,
-    myID_LONGLINEON,
-    myID_WHITESPACE,
-    myID_FOLDTOGGLE,
-    myID_OVERTYPE,
-    myID_READONLY,
-    myID_WRAPMODEON,
-    myID_CHANGECASE,
-    myID_CHANGELOWER,
-    myID_CHANGEUPPER,
-    myID_HILIGHTLANG,
-    myID_HILIGHTFIRST,
-    myID_HILIGHTLAST = myID_HILIGHTFIRST + 99,
-    myID_CONVERTEOL,
-    myID_CONVERTCR,
-    myID_CONVERTCRLF,
-    myID_CONVERTLF,
-    myID_USECHARSET,
-    myID_CHARSETANSI,
-    myID_CHARSETMAC,
-    myID_PAGEPREV,
-    myID_PAGENEXT,
-    myID_SELECTLINE,
-
-    // other IDs
-    myID_STATUSBAR,
-    myID_TITLEBAR,
-    myID_ABOUTTIMER,
-    myID_UPDATETIMER,
-
-    // dialog find IDs
-    myID_DLG_FIND_TEXT,
-
-    // preferences IDs
-    myID_PREFS_LANGUAGE,
-    myID_PREFS_STYLETYPE,
-    myID_PREFS_KEYWORDS,
-};
-
-// ----------------------------------------------------------------------------
-// global items
-// ----------------------------------------------------------------------------
-
-//! global application name
-extern wxString *g_appname;
-
-//! global print data, to remember settings during the session
-extern wxPrintData *g_printData;
-extern wxPageSetupData *g_pageSetupData;
-
-#endif // _WX_DEFSEXT_H_
-
--- a/contrib/samples/stc/edit.cpp
+++ b/contrib/samples/stc/edit.cpp
@@ -1,824 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// File:        edit.cpp
-// Purpose:     STC test module
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-// informations
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes <wx/wx.h>.
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
-#ifndef WX_PRECOMP
-    #include <wx/wx.h>
-#endif
-
-//! wxWindows headers
-#include <wx/file.h>     // raw file io support
-#include <wx/filename.h> // filename support
-
-//! application headers
-#include "defsext.h"     // additional definitions
-
-#include "edit.h"        // edit module
-
-
-//----------------------------------------------------------------------------
-// resources
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-
-//============================================================================
-// implementation
-//============================================================================
-
-//----------------------------------------------------------------------------
-// Edit
-//----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE (Edit, wxStyledTextCtrl)
-    // common
-    EVT_SIZE (                         Edit::OnSize)
-    // edit
-    EVT_MENU (wxID_CLEAR,              Edit::OnEditClear)
-    EVT_MENU (wxID_CUT,                Edit::OnEditCut)
-    EVT_MENU (wxID_COPY,               Edit::OnEditCopy)
-    EVT_MENU (wxID_PASTE,              Edit::OnEditPaste)
-    EVT_MENU (myID_INDENTINC,          Edit::OnEditIndentInc)
-    EVT_MENU (myID_INDENTRED,          Edit::OnEditIndentRed)
-    EVT_MENU (wxID_SELECTALL,          Edit::OnEditSelectAll)
-    EVT_MENU (myID_SELECTLINE,         Edit::OnEditSelectLine)
-    EVT_MENU (wxID_REDO,               Edit::OnEditRedo)
-    EVT_MENU (wxID_UNDO,               Edit::OnEditUndo)
-    // find
-    EVT_MENU (wxID_FIND,               Edit::OnFind)
-    EVT_MENU (myID_FINDNEXT,           Edit::OnFindNext)
-    EVT_MENU (myID_REPLACE,            Edit::OnReplace)
-    EVT_MENU (myID_REPLACENEXT,        Edit::OnReplaceNext)
-    EVT_MENU (myID_BRACEMATCH,         Edit::OnBraceMatch)
-    EVT_MENU (myID_GOTO,               Edit::OnGoto)
-    // view
-    EVT_MENU_RANGE (myID_HILIGHTFIRST, myID_HILIGHTLAST,
-                                       Edit::OnHilightLang)
-    EVT_MENU (myID_DISPLAYEOL,         Edit::OnDisplayEOL)
-    EVT_MENU (myID_INDENTGUIDE,        Edit::OnIndentGuide)
-    EVT_MENU (myID_LINENUMBER,         Edit::OnLineNumber)
-    EVT_MENU (myID_LONGLINEON,         Edit::OnLongLineOn)
-    EVT_MENU (myID_WHITESPACE,         Edit::OnWhiteSpace)
-    EVT_MENU (myID_FOLDTOGGLE,         Edit::OnFoldToggle)
-    EVT_MENU (myID_OVERTYPE,           Edit::OnSetOverType)
-    EVT_MENU (myID_READONLY,           Edit::OnSetReadOnly)
-    EVT_MENU (myID_WRAPMODEON,         Edit::OnWrapmodeOn)
-    EVT_MENU (myID_CHARSETANSI,        Edit::OnUseCharset)
-    EVT_MENU (myID_CHARSETMAC,         Edit::OnUseCharset)
-    // extra
-    EVT_MENU (myID_CHANGELOWER,        Edit::OnChangeCase)
-    EVT_MENU (myID_CHANGEUPPER,        Edit::OnChangeCase)
-    EVT_MENU (myID_CONVERTCR,          Edit::OnConvertEOL)
-    EVT_MENU (myID_CONVERTCRLF,        Edit::OnConvertEOL)
-    EVT_MENU (myID_CONVERTLF,          Edit::OnConvertEOL)
-    // stc
-    EVT_STC_MARGINCLICK (-1,           Edit::OnMarginClick)
-    EVT_STC_CHARADDED (-1,             Edit::OnCharAdded)
-END_EVENT_TABLE()
-
-Edit::Edit (wxWindow *parent, wxWindowID id,
-            const wxPoint &pos,
-            const wxSize &size,
-            long style)
-    : wxStyledTextCtrl (parent, id, pos, size, style) {
-
-    m_filename = _T("");
-
-    m_LineNrID = 0;
-    m_DividerID = 1;
-    m_FoldingID = 2;
-
-    // initialize language
-    m_language = NULL;
-
-    // default font for all styles
-    SetViewEOL (g_CommonPrefs.displayEOLEnable);
-    SetIndentationGuides (g_CommonPrefs.indentGuideEnable);
-    SetEdgeMode (g_CommonPrefs.longLineOnEnable?
-                 wxSTC_EDGE_LINE: wxSTC_EDGE_NONE);
-    SetViewWhiteSpace (g_CommonPrefs.whiteSpaceEnable?
-                       wxSTC_WS_VISIBLEALWAYS: wxSTC_WS_INVISIBLE);
-    SetOvertype (g_CommonPrefs.overTypeInitial);
-    SetReadOnly (g_CommonPrefs.readOnlyInitial);
-    SetWrapMode (g_CommonPrefs.wrapModeInitial?
-                 wxSTC_WRAP_WORD: wxSTC_WRAP_NONE);
-    wxFont font (10, wxMODERN, wxNORMAL, wxNORMAL);
-    StyleSetFont (wxSTC_STYLE_DEFAULT, font);
-    StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour (_T("BLACK")));
-    StyleSetBackground (wxSTC_STYLE_DEFAULT, wxColour (_T("WHITE")));
-    StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (_T("DARK GREY")));
-    StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour (_T("WHITE")));
-    StyleSetForeground(wxSTC_STYLE_INDENTGUIDE, wxColour (_T("DARK GREY")));
-    InitializePrefs (DEFAULT_LANGUAGE);
-
-    // set visibility
-    SetVisiblePolicy (wxSTC_VISIBLE_STRICT|wxSTC_VISIBLE_SLOP, 1);
-    SetXCaretPolicy (wxSTC_CARET_EVEN|wxSTC_VISIBLE_STRICT|wxSTC_CARET_SLOP, 1);
-    SetYCaretPolicy (wxSTC_CARET_EVEN|wxSTC_VISIBLE_STRICT|wxSTC_CARET_SLOP, 1);
-
-    // markers
-    MarkerDefine (wxSTC_MARKNUM_FOLDER,        wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("BLACK"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDEROPEN,    wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("BLACK"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDERSUB,     wxSTC_MARK_EMPTY,     _T("BLACK"), _T("BLACK"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDEREND,     wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("WHITE"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("WHITE"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY,     _T("BLACK"), _T("BLACK"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDERTAIL,    wxSTC_MARK_EMPTY,     _T("BLACK"), _T("BLACK"));
-
-    // miscelaneous
-    m_LineNrMargin = TextWidth (wxSTC_STYLE_LINENUMBER, _T("_999999"));
-    m_FoldingMargin = 16;
-    SetMarginWidth (m_LineNrID,
-                    g_CommonPrefs.lineNumberEnable? m_LineNrMargin: 0);
-    CmdKeyClear (wxSTC_KEY_TAB, 0); // this is done by the menu accelerator key
-    SetLayoutCache (wxSTC_CACHE_PAGE);
-
-}
-
-Edit::~Edit () {}
-
-//----------------------------------------------------------------------------
-// common event handlers
-void Edit::OnSize( wxSizeEvent& event ) {
-    int x = GetClientSize().x +
-            (g_CommonPrefs.lineNumberEnable? m_LineNrMargin: 0) +
-            (g_CommonPrefs.foldEnable? m_FoldingMargin: 0);
-    if (x > 0) SetScrollWidth (x);
-    event.Skip();
-}
-
-// edit event handlers
-void Edit::OnEditRedo (wxCommandEvent &WXUNUSED(event)) {
-    if (!CanRedo()) return;
-    Redo ();
-}
-
-void Edit::OnEditUndo (wxCommandEvent &WXUNUSED(event)) {
-    if (!CanUndo()) return;
-    Undo ();
-}
-
-void Edit::OnEditClear (wxCommandEvent &WXUNUSED(event)) {
-    if (GetReadOnly()) return;
-    Clear ();
-}
-
-void Edit::OnEditCut (wxCommandEvent &WXUNUSED(event)) {
-    if (GetReadOnly() || (GetSelectionEnd()-GetSelectionStart() <= 0)) return;
-    Cut ();
-}
-
-void Edit::OnEditCopy (wxCommandEvent &WXUNUSED(event)) {
-    if (GetSelectionEnd()-GetSelectionStart() <= 0) return;
-    Copy ();
-}
-
-void Edit::OnEditPaste (wxCommandEvent &WXUNUSED(event)) {
-    if (!CanPaste()) return;
-    Paste ();
-}
-
-void Edit::OnFind (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnFindNext (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnReplace (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnReplaceNext (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnBraceMatch (wxCommandEvent &WXUNUSED(event)) {
-    int min = GetCurrentPos ();
-    int max = BraceMatch (min);
-    if (max > (min+1)) {
-        BraceHighlight (min+1, max);
-        SetSelection (min+1, max);
-    }else{
-        BraceBadLight (min);
-    }
-}
-
-void Edit::OnGoto (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnEditIndentInc (wxCommandEvent &WXUNUSED(event)) {
-    CmdKeyExecute (wxSTC_CMD_TAB);
-}
-
-void Edit::OnEditIndentRed (wxCommandEvent &WXUNUSED(event)) {
-    CmdKeyExecute (wxSTC_CMD_DELETEBACK);
-}
-
-void Edit::OnEditSelectAll (wxCommandEvent &WXUNUSED(event)) {
-    SetSelection (0, GetTextLength ());
-}
-
-void Edit::OnEditSelectLine (wxCommandEvent &WXUNUSED(event)) {
-    int lineStart = PositionFromLine (GetCurrentLine());
-    int lineEnd = PositionFromLine (GetCurrentLine() + 1);
-    SetSelection (lineStart, lineEnd);
-}
-
-void Edit::OnHilightLang (wxCommandEvent &event) {
-    InitializePrefs (g_LanguagePrefs [event.GetId() - myID_HILIGHTFIRST].name);
-}
-
-void Edit::OnDisplayEOL (wxCommandEvent &WXUNUSED(event)) {
-    SetViewEOL (!GetViewEOL());
-}
-
-void Edit::OnIndentGuide (wxCommandEvent &WXUNUSED(event)) {
-    SetIndentationGuides (!GetIndentationGuides());
-}
-
-void Edit::OnLineNumber (wxCommandEvent &WXUNUSED(event)) {
-    SetMarginWidth (m_LineNrID,
-                    GetMarginWidth (m_LineNrID) == 0? m_LineNrMargin: 0);
-}
-
-void Edit::OnLongLineOn (wxCommandEvent &WXUNUSED(event)) {
-    SetEdgeMode (GetEdgeMode() == 0? wxSTC_EDGE_LINE: wxSTC_EDGE_NONE);
-}
-
-void Edit::OnWhiteSpace (wxCommandEvent &WXUNUSED(event)) {
-    SetViewWhiteSpace (GetViewWhiteSpace() == 0?
-                       wxSTC_WS_VISIBLEALWAYS: wxSTC_WS_INVISIBLE);
-}
-
-void Edit::OnFoldToggle (wxCommandEvent &WXUNUSED(event)) {
-    ToggleFold (GetFoldParent(GetCurrentLine()));
-}
-
-void Edit::OnSetOverType (wxCommandEvent &WXUNUSED(event)) {
-    SetOvertype (!GetOvertype());
-}
-
-void Edit::OnSetReadOnly (wxCommandEvent &WXUNUSED(event)) {
-    SetReadOnly (!GetReadOnly());
-}
-
-void Edit::OnWrapmodeOn (wxCommandEvent &WXUNUSED(event)) {
-    SetWrapMode (GetWrapMode() == 0? wxSTC_WRAP_WORD: wxSTC_WRAP_NONE);
-}
-
-void Edit::OnUseCharset (wxCommandEvent &event) {
-    int Nr;
-    int charset = GetCodePage();
-    switch (event.GetId()) {
-        case myID_CHARSETANSI: {charset = wxSTC_CHARSET_ANSI; break;}
-        case myID_CHARSETMAC: {charset = wxSTC_CHARSET_ANSI; break;}
-    }
-    for (Nr = 0; Nr < wxSTC_STYLE_LASTPREDEFINED; Nr++) {
-        StyleSetCharacterSet (Nr, charset);
-    }
-    SetCodePage (charset);
-}
-
-void Edit::OnChangeCase (wxCommandEvent &event) {
-    switch (event.GetId()) {
-        case myID_CHANGELOWER: {
-            CmdKeyExecute (wxSTC_CMD_LOWERCASE);
-            break;
-        }
-        case myID_CHANGEUPPER: {
-            CmdKeyExecute (wxSTC_CMD_UPPERCASE);
-            break;
-        }
-    }
-}
-
-void Edit::OnConvertEOL (wxCommandEvent &event) {
-    int eolMode = GetEOLMode();
-    switch (event.GetId()) {
-        case myID_CONVERTCR: { eolMode = wxSTC_EOL_CR; break;}
-        case myID_CONVERTCRLF: { eolMode = wxSTC_EOL_CRLF; break;}
-        case myID_CONVERTLF: { eolMode = wxSTC_EOL_LF; break;}
-    }
-    ConvertEOLs (eolMode);
-    SetEOLMode (eolMode);
-}
-
-//! misc
-void Edit::OnMarginClick (wxStyledTextEvent &event) {
-    if (event.GetMargin() == 2) {
-        int lineClick = LineFromPosition (event.GetPosition());
-        int levelClick = GetFoldLevel (lineClick);
-        if ((levelClick & wxSTC_FOLDLEVELHEADERFLAG) > 0) {
-            ToggleFold (lineClick);
-        }
-    }
-}
-
-void Edit::OnCharAdded (wxStyledTextEvent &event) {
-    char chr = event.GetKey();
-    int currentLine = GetCurrentLine();
-    // Change this if support for mac files with \r is needed
-    if (chr == '\n') {
-        int lineInd = 0;
-        if (currentLine > 0) {
-            lineInd = GetLineIndentation(currentLine - 1);
-        }
-        if (lineInd == 0) return;
-        SetLineIndentation (currentLine, lineInd);
-        GotoPos(PositionFromLine (currentLine) + lineInd);
-    }
-}
-
-
-//----------------------------------------------------------------------------
-// private functions
-wxString Edit::DeterminePrefs (const wxString &filename) {
-
-    LanguageInfo const* curInfo;
-
-    // determine language from filepatterns
-    int languageNr;
-    for (languageNr = 0; languageNr < g_LanguagePrefsSize; languageNr++) {
-        curInfo = &g_LanguagePrefs [languageNr];
-        wxString filepattern = curInfo->filepattern;
-        filepattern.Lower();
-        while (!filepattern.IsEmpty()) {
-            wxString cur = filepattern.BeforeFirst (';');
-            if ((cur == filename) ||
-                (cur == (filename.BeforeLast ('.') + _T(".*"))) ||
-                (cur == (_T("*.") + filename.AfterLast ('.')))) {
-                return curInfo->name;
-            }
-            filepattern = filepattern.AfterFirst (';');
-        }
-    }
-    return wxEmptyString;
-
-}
-
-bool Edit::InitializePrefs (const wxString &name) {
-
-    // initialize styles
-    StyleClearAll();
-    LanguageInfo const* curInfo = NULL;
-
-    // determine language
-    bool found = false;
-    int languageNr;
-    for (languageNr = 0; languageNr < g_LanguagePrefsSize; languageNr++) {
-        curInfo = &g_LanguagePrefs [languageNr];
-        if (curInfo->name == name) {
-            found = true;
-            break;
-        }
-    }
-    if (!found) return false;
-
-    // set lexer and language
-    SetLexer (curInfo->lexer);
-    m_language = curInfo;
-
-    // set margin for line numbers
-    SetMarginType (m_LineNrID, wxSTC_MARGIN_NUMBER);
-    StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (_T("DARK GREY")));
-    StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour (_T("WHITE")));
-    SetMarginWidth (m_LineNrID,
-                    g_CommonPrefs.lineNumberEnable? m_LineNrMargin: 0);
-
-    // default fonts for all styles!
-    int Nr;
-    for (Nr = 0; Nr < wxSTC_STYLE_LASTPREDEFINED; Nr++) {
-        wxFont font (10, wxMODERN, wxNORMAL, wxNORMAL);
-        StyleSetFont (Nr, font);
-    }
-
-    // set common styles
-    StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour (_T("DARK GREY")));
-    StyleSetForeground (wxSTC_STYLE_INDENTGUIDE, wxColour (_T("DARK GREY")));
-
-    // initialize settings
-    if (g_CommonPrefs.syntaxEnable) {
-        int keywordnr = 0;
-        for (Nr = 0; Nr < STYLE_TYPES_COUNT; Nr++) {
-            if (curInfo->styles[Nr].type == -1) continue;
-            const StyleInfo &curType = g_StylePrefs [curInfo->styles[Nr].type];
-            wxFont font (curType.fontsize, wxMODERN, wxNORMAL, wxNORMAL, false,
-                         curType.fontname);
-            StyleSetFont (Nr, font);
-            if (curType.foreground) {
-                StyleSetForeground (Nr, wxColour (curType.foreground));
-            }
-            if (curType.background) {
-                StyleSetBackground (Nr, wxColour (curType.background));
-            }
-            StyleSetBold (Nr, (curType.fontstyle & mySTC_STYLE_BOLD) > 0);
-            StyleSetItalic (Nr, (curType.fontstyle & mySTC_STYLE_ITALIC) > 0);
-            StyleSetUnderline (Nr, (curType.fontstyle & mySTC_STYLE_UNDERL) > 0);
-            StyleSetVisible (Nr, (curType.fontstyle & mySTC_STYLE_HIDDEN) == 0);
-            StyleSetCase (Nr, curType.lettercase);
-            const wxChar *pwords = curInfo->styles[Nr].words;
-            if (pwords) {
-                SetKeyWords (keywordnr, pwords);
-                keywordnr += 1;
-            }
-        }
-    }
-
-    // set margin as unused
-    SetMarginType (m_DividerID, wxSTC_MARGIN_SYMBOL);
-    SetMarginWidth (m_DividerID, 0);
-    SetMarginSensitive (m_DividerID, false);
-
-    // folding
-    SetMarginType (m_FoldingID, wxSTC_MARGIN_SYMBOL);
-    SetMarginMask (m_FoldingID, wxSTC_MASK_FOLDERS);
-    StyleSetBackground (m_FoldingID, wxColour (_T("WHITE")));
-    SetMarginWidth (m_FoldingID, 0);
-    SetMarginSensitive (m_FoldingID, false);
-    if (g_CommonPrefs.foldEnable) {
-        SetMarginWidth (m_FoldingID, curInfo->folds != 0? m_FoldingMargin: 0);
-        SetMarginSensitive (m_FoldingID, curInfo->folds != 0);
-        SetProperty (_T("fold"), curInfo->folds != 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.comment"),
-                     (curInfo->folds & mySTC_FOLD_COMMENT) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.compact"),
-                     (curInfo->folds & mySTC_FOLD_COMPACT) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.preprocessor"),
-                     (curInfo->folds & mySTC_FOLD_PREPROC) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.html"),
-                     (curInfo->folds & mySTC_FOLD_HTML) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.html.preprocessor"),
-                     (curInfo->folds & mySTC_FOLD_HTMLPREP) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.comment.python"),
-                     (curInfo->folds & mySTC_FOLD_COMMENTPY) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.quotes.python"),
-                     (curInfo->folds & mySTC_FOLD_QUOTESPY) > 0? _T("1"): _T("0"));
-    }
-    SetFoldFlags (wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED |
-                  wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED);
-
-    // set spaces and indention
-    SetTabWidth (4);
-    SetUseTabs (false);
-    SetTabIndents (true);
-    SetBackSpaceUnIndents (true);
-    SetIndent (g_CommonPrefs.indentEnable? 4: 0);
-
-    // others
-    SetViewEOL (g_CommonPrefs.displayEOLEnable);
-    SetIndentationGuides (g_CommonPrefs.indentGuideEnable);
-    SetEdgeColumn (80);
-    SetEdgeMode (g_CommonPrefs.longLineOnEnable? wxSTC_EDGE_LINE: wxSTC_EDGE_NONE);
-    SetViewWhiteSpace (g_CommonPrefs.whiteSpaceEnable?
-                       wxSTC_WS_VISIBLEALWAYS: wxSTC_WS_INVISIBLE);
-    SetOvertype (g_CommonPrefs.overTypeInitial);
-    SetReadOnly (g_CommonPrefs.readOnlyInitial);
-    SetWrapMode (g_CommonPrefs.wrapModeInitial?
-                 wxSTC_WRAP_WORD: wxSTC_WRAP_NONE);
-
-    return true;
-}
-
-bool Edit::LoadFile () {
-
-    // get filname
-    if (!m_filename) {
-        wxFileDialog dlg (this, _T("Open file"), _T(""), _T(""),
-                          _T("Any file (*)|*"), wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR);
-        if (dlg.ShowModal() != wxID_OK) return false;
-        m_filename = dlg.GetPath();
-    }
-
-    // load file
-    return LoadFile (m_filename);
-}
-
-bool Edit::LoadFile (const wxString &filename) {
-
-    // load file in edit and clear undo
-    if (!filename.IsEmpty()) m_filename = filename;
-//     wxFile file (m_filename);
-//     if (!file.IsOpened()) return false;
-    ClearAll ();
-//     long lng = file.Length ();
-//     if (lng > 0) {
-//         wxString buf;
-//         wxChar *buff = buf.GetWriteBuf (lng);
-//         file.Read (buff, lng);
-//         buf.UngetWriteBuf ();
-//         InsertText (0, buf);
-//     }
-//     file.Close();
-    
-    wxStyledTextCtrl::LoadFile(m_filename);
-    
-    EmptyUndoBuffer();
-
-    // determine lexer language
-    wxFileName fname (m_filename);
-    InitializePrefs (DeterminePrefs (fname.GetFullName()));
-
-    return true;
-}
-
-bool Edit::SaveFile () {
-
-    // return if no change
-    if (!Modified()) return true;
-
-    // get filname
-    if (!m_filename) {
-        wxFileDialog dlg (this, _T("Save file"), _T(""), _T(""), _T("Any file (*)|*"),
-                          wxSAVE | wxOVERWRITE_PROMPT);
-        if (dlg.ShowModal() != wxID_OK) return false;
-        m_filename = dlg.GetPath();
-    }
-
-    // save file
-    return SaveFile (m_filename);
-}
-
-bool Edit::SaveFile (const wxString &filename) {
-
-    // return if no change
-    if (!Modified()) return true;
-
-//     // save edit in file and clear undo
-//     if (!filename.IsEmpty()) m_filename = filename;
-//     wxFile file (m_filename, wxFile::write);
-//     if (!file.IsOpened()) return false;
-//     wxString buf = GetText();
-//     bool okay = file.Write (buf);
-//     file.Close();
-//     if (!okay) return false;
-//     EmptyUndoBuffer();
-//     SetSavePoint();
-
-//     return true;
-
-    return wxStyledTextCtrl::SaveFile(filename);
-    
-}
-
-bool Edit::Modified () {
-
-    // return modified state
-    return (GetModify() && !GetReadOnly());
-}
-
-//----------------------------------------------------------------------------
-// EditProperties
-//----------------------------------------------------------------------------
-
-EditProperties::EditProperties (Edit *edit,
-                                long style)
-        : wxDialog (edit, -1, wxEmptyString,
-                    wxDefaultPosition, wxDefaultSize,
-                    style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) {
-
-    // sets the application title
-    SetTitle (_("Properties"));
-    wxString text;
-
-    // fullname
-    wxBoxSizer *fullname = new wxBoxSizer (wxHORIZONTAL);
-    fullname->Add (10, 0);
-    fullname->Add (new wxStaticText (this, -1, _("Full filename"),
-                                     wxDefaultPosition, wxSize(80, -1)),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL);
-    fullname->Add (new wxStaticText (this, -1, edit->GetFilename()),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL);
-
-    // text info
-    wxGridSizer *textinfo = new wxGridSizer (4, 0, 2);
-    textinfo->Add (new wxStaticText (this, -1, _("Language"),
-                                     wxDefaultPosition, wxSize(80, -1)),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    textinfo->Add (new wxStaticText (this, -1, edit->m_language->name),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    textinfo->Add (new wxStaticText (this, -1, _("Lexer-ID: "),
-                                     wxDefaultPosition, wxSize(80, -1)),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetLexer());
-    textinfo->Add (new wxStaticText (this, -1, text),
-                   0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    wxString EOLtype = _T("");
-    switch (edit->GetEOLMode()) {
-        case wxSTC_EOL_CR: {EOLtype = _T("CR (Unix)"); break; }
-        case wxSTC_EOL_CRLF: {EOLtype = _T("CRLF (Windows)"); break; }
-        case wxSTC_EOL_LF: {EOLtype = _T("CR (Macintosh)"); break; }
-    }
-    textinfo->Add (new wxStaticText (this, -1, _("Line endings"),
-                                     wxDefaultPosition, wxSize(80, -1)),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    textinfo->Add (new wxStaticText (this, -1, EOLtype),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-
-    // text info box
-    wxStaticBoxSizer *textinfos = new wxStaticBoxSizer (
-                     new wxStaticBox (this, -1, _("Informations")),
-                     wxVERTICAL);
-    textinfos->Add (textinfo, 0, wxEXPAND);
-    textinfos->Add (0, 6);
-
-    // statistic
-    wxGridSizer *statistic = new wxGridSizer (4, 0, 2);
-    statistic->Add (new wxStaticText (this, -1, _("Total lines"),
-                                     wxDefaultPosition, wxSize(80, -1)),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetLineCount());
-    statistic->Add (new wxStaticText (this, -1, text),
-                    0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    statistic->Add (new wxStaticText (this, -1, _("Total chars"),
-                                     wxDefaultPosition, wxSize(80, -1)),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetTextLength());
-    statistic->Add (new wxStaticText (this, -1, text),
-                    0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    statistic->Add (new wxStaticText (this, -1, _("Current line"),
-                                     wxDefaultPosition, wxSize(80, -1)),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetCurrentLine());
-    statistic->Add (new wxStaticText (this, -1, text),
-                    0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    statistic->Add (new wxStaticText (this, -1, _("Current pos"),
-                                     wxDefaultPosition, wxSize(80, -1)),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetCurrentPos());
-    statistic->Add (new wxStaticText (this, -1, text),
-                    0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-
-    // char/line statistics
-    wxStaticBoxSizer *statistics = new wxStaticBoxSizer (
-                     new wxStaticBox (this, -1, _("Statistics")),
-                     wxVERTICAL);
-    statistics->Add (statistic, 0, wxEXPAND);
-    statistics->Add (0, 6);
-
-    // total pane
-    wxBoxSizer *totalpane = new wxBoxSizer (wxVERTICAL);
-    totalpane->Add (fullname, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, 10);
-    totalpane->Add (0, 6);
-    totalpane->Add (textinfos, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
-    totalpane->Add (0, 10);
-    totalpane->Add (statistics, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
-    totalpane->Add (0, 6);
-    wxButton *okButton = new wxButton (this, wxID_OK, _("OK"));
-    okButton->SetDefault();
-    totalpane->Add (okButton, 0, wxALIGN_CENTER | wxALL, 10);
-
-    SetSizerAndFit (totalpane);
-
-    ShowModal();
-}
-
-//----------------------------------------------------------------------------
-// EditPrint
-//----------------------------------------------------------------------------
-
-EditPrint::EditPrint (Edit *edit, wxChar *title)
-              : wxPrintout(title) {
-    m_edit = edit;
-    m_printed = 0;
-
-}
-
-bool EditPrint::OnPrintPage (int page) {
-
-    wxDC *dc = GetDC();
-    if (!dc) return false;
-
-    // scale DC
-    PrintScaling (dc);
-
-    // print page
-    if (page == 1) m_printed = 0;
-    m_printed = m_edit->FormatRange (1, m_printed, m_edit->GetLength(),
-                                     dc, dc, m_printRect, m_pageRect);
-
-    return true;
-}
-
-bool EditPrint::OnBeginDocument (int startPage, int endPage) {
-
-    if (!wxPrintout::OnBeginDocument (startPage, endPage)) {
-        return false;
-    }
-
-    return true;
-}
-
-void EditPrint::GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) {
-
-    // initialize values
-    *minPage = 0;
-    *maxPage = 0;
-    *selPageFrom = 0;
-    *selPageTo = 0;
-
-    // scale DC if possible
-    wxDC *dc = GetDC();
-    if (!dc) return;
-    PrintScaling (dc);
-
-    // get print page informations and convert to printer pixels
-    wxSize ppiScr;
-    GetPPIScreen (&ppiScr.x, &ppiScr.y);
-    wxSize page = g_pageSetupData->GetPaperSize();
-    page.x = static_cast<int> (page.x * ppiScr.x / 25.4);
-    page.y = static_cast<int> (page.y * ppiScr.y / 25.4);
-    m_pageRect = wxRect (0,
-                         0,
-                         page.x,
-                         page.y);
-
-    // get margins informations and convert to printer pixels
-    int  top = 25; // default 25
-    int  bottom = 25; // default 25
-    int  left = 20; // default 20
-    int  right = 20; // default 20
-    wxPoint (top, left) = g_pageSetupData->GetMarginTopLeft();
-    wxPoint (bottom, right) = g_pageSetupData->GetMarginBottomRight();
-    top = static_cast<int> (top * ppiScr.y / 25.4);
-    bottom = static_cast<int> (bottom * ppiScr.y / 25.4);
-    left = static_cast<int> (left * ppiScr.x / 25.4);
-    right = static_cast<int> (right * ppiScr.x / 25.4);
-    m_printRect = wxRect (left,
-                          top,
-                          page.x - (left + right),
-                          page.y - (top + bottom));
-
-    // count pages
-    while (HasPage (*maxPage)) {
-        m_printed = m_edit->FormatRange (0, m_printed, m_edit->GetLength(),
-                                       dc, dc, m_printRect, m_pageRect);
-        *maxPage += 1;
-    }
-    if (*maxPage > 0) *minPage = 1;
-    *selPageFrom = *minPage;
-    *selPageTo = *maxPage;
-}
-
-bool EditPrint::HasPage (int WXUNUSED(page)) {
-
-    return (m_printed < m_edit->GetLength());
-}
-
-bool EditPrint::PrintScaling (wxDC *dc){
-
-    // check for dc, return if none
-    if (!dc) return false;
-
-    // get printer and screen sizing values
-    wxSize ppiScr;
-    GetPPIScreen (&ppiScr.x, &ppiScr.y);
-    if (ppiScr.x == 0) { // most possible guess 96 dpi
-        ppiScr.x = 96;
-        ppiScr.y = 96;
-    }
-    wxSize ppiPrt;
-    GetPPIPrinter (&ppiPrt.x, &ppiPrt.y);
-    if (ppiPrt.x == 0) { // scaling factor to 1
-        ppiPrt.x = ppiScr.x;
-        ppiPrt.y = ppiScr.y;
-    }
-    wxSize dcSize = dc->GetSize();
-    wxSize pageSize;
-    GetPageSizePixels (&pageSize.x, &pageSize.y);
-
-    // set user scale
-    float scale_x = (float)(ppiPrt.x * dcSize.x) /
-                    (float)(ppiScr.x * pageSize.x);
-    float scale_y = (float)(ppiPrt.y * dcSize.y) /
-                    (float)(ppiScr.y * pageSize.y);
-    dc->SetUserScale (scale_x, scale_y);
-
-    return true;
-}
-
--- a/contrib/samples/stc/edit.h
+++ b/contrib/samples/stc/edit.h
@@ -1,169 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// File:        edit.h
-// Purpose:     STC test module
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef _EDIT_H_
-#define _EDIT_H_
-
-//----------------------------------------------------------------------------
-// informations
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-//! wxWindows headers
-
-//! wxWindows/contrib headers
-#include <wx/stc/stc.h>  // styled text control
-
-//! application headers
-#include "prefs.h"       // preferences
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-class EditPrint;
-class EditProperties;
-
-
-//----------------------------------------------------------------------------
-//! Edit
-class Edit: public wxStyledTextCtrl {
-    friend class EditProperties;
-    friend class EditPrint;
-
-public:
-    //! constructor
-    Edit (wxWindow *parent, wxWindowID id = -1,
-          const wxPoint &pos = wxDefaultPosition,
-          const wxSize &size = wxDefaultSize,
-          long style = wxSUNKEN_BORDER|wxVSCROLL
-         );
-
-    //! destructor
-    ~Edit ();
-
-    // event handlers
-    // common
-    void OnSize( wxSizeEvent &event );
-    // edit
-    void OnEditRedo (wxCommandEvent &event);
-    void OnEditUndo (wxCommandEvent &event);
-    void OnEditClear (wxCommandEvent &event);
-    void OnEditCut (wxCommandEvent &event);
-    void OnEditCopy (wxCommandEvent &event);
-    void OnEditPaste (wxCommandEvent &event);
-    // find
-    void OnFind (wxCommandEvent &event);
-    void OnFindNext (wxCommandEvent &event);
-    void OnReplace (wxCommandEvent &event);
-    void OnReplaceNext (wxCommandEvent &event);
-    void OnBraceMatch (wxCommandEvent &event);
-    void OnGoto (wxCommandEvent &event);
-    void OnEditIndentInc (wxCommandEvent &event);
-    void OnEditIndentRed (wxCommandEvent &event);
-    void OnEditSelectAll (wxCommandEvent &event);
-    void OnEditSelectLine (wxCommandEvent &event);
-    //! view
-    void OnHilightLang (wxCommandEvent &event);
-    void OnDisplayEOL (wxCommandEvent &event);
-    void OnIndentGuide (wxCommandEvent &event);
-    void OnLineNumber (wxCommandEvent &event);
-    void OnLongLineOn (wxCommandEvent &event);
-    void OnWhiteSpace (wxCommandEvent &event);
-    void OnFoldToggle (wxCommandEvent &event);
-    void OnSetOverType (wxCommandEvent &event);
-    void OnSetReadOnly (wxCommandEvent &event);
-    void OnWrapmodeOn (wxCommandEvent &event);
-    void OnUseCharset (wxCommandEvent &event);
-    //! extra
-    void OnChangeCase (wxCommandEvent &event);
-    void OnConvertEOL (wxCommandEvent &event);
-    // stc
-    void OnMarginClick (wxStyledTextEvent &event);
-    void OnCharAdded  (wxStyledTextEvent &event);
-
-    //! language/lexer
-    wxString DeterminePrefs (const wxString &filename);
-    bool InitializePrefs (const wxString &filename);
-    bool UserSettings (const wxString &filename);
-    LanguageInfo const* GetLanguageInfo () {return m_language;};
-
-    //! load/save file
-    bool LoadFile ();
-    bool LoadFile (const wxString &filename);
-    bool SaveFile ();
-    bool SaveFile (const wxString &filename);
-    bool Modified ();
-    wxString GetFilename () {return m_filename;};
-    void SetFilename (const wxString &filename) {m_filename = filename;};
-
-private:
-    // file
-    wxString m_filename;
-
-    // lanugage properties
-    LanguageInfo const* m_language;
-
-    // margin variables
-    int m_LineNrID;
-    int m_LineNrMargin;
-    int m_FoldingID;
-    int m_FoldingMargin;
-    int m_DividerID;
-
-    DECLARE_EVENT_TABLE()
-};
-
-//----------------------------------------------------------------------------
-//! EditProperties
-class EditProperties: public wxDialog {
-
-public:
-
-    //! constructor
-    EditProperties (Edit *edit, long style = 0);
-
-private:
-
-};
-
-//----------------------------------------------------------------------------
-//! EditPrint
-class EditPrint: public wxPrintout {
-
-public:
-
-    //! constructor
-    EditPrint (Edit *edit, wxChar *title = _T(""));
-
-    //! event handlers
-    bool OnPrintPage (int page);
-    bool OnBeginDocument (int startPage, int endPage);
-
-    //! print functions
-    bool HasPage (int page);
-    void GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
-
-private:
-    Edit *m_edit;
-    int m_printed;
-    wxRect m_pageRect;
-    wxRect m_printRect;
-
-    bool PrintScaling (wxDC *dc);
-};
-
-#endif // _EDIT_H_
-
--- a/contrib/samples/stc/makefile.b32
+++ b/contrib/samples/stc/makefile.b32
@@ -11,8 +11,8 @@ WXDIR = $(WXWIN)

 TARGET=stctest

-EXTRALIBS=$(WXDIR)\lib\stc.lib
-OBJECTS = $(TARGET).obj edit.obj prefs.obj
+EXTRALIBS=$(WXDIR)\contrib\lib\stc.lib
+OBJECTS = $(TARGET).obj

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

--- a/contrib/samples/stc/makefile.g95
+++ b/contrib/samples/stc/makefile.g95
@@ -6,7 +6,7 @@
 WXDIR = ../../..

 TARGET = stctest
-OBJECTS = $(TARGET).o edit.o prefs.o
+OBJECTS = $(TARGET).o
 EXTRAINC = -I$(WXDIR)/contrib/include
 EXTRALIBS = -lstc

--- a/contrib/samples/stc/makefile.vc
+++ b/contrib/samples/stc/makefile.vc
@@ -6,7 +6,7 @@
 WXDIR = $(WXWIN)
 PROGRAM = stctest

-OBJECTS = $(PROGRAM).obj edit.obj prefs.obj
+OBJECTS = $(PROGRAM).obj
 EXTRALIBS = $(WXDIR)\lib\stc$(LIBEXT).lib
 EXTRAINC = -I$(WXDIR)\contrib\include

--- a/contrib/samples/stc/makefile.wat
+++ b/contrib/samples/stc/makefile.wat
@@ -1,13 +0,0 @@
-# Purpose: makefile for SVG example (Watcom)
-# Created 2000-07-28
-
-WXDIR = $(%WXWIN)
-
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-PROGRAM = stctest
-EXTRALIBS = $(WXDIR)\lib\stc_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\edit.obj $(OUTPUTDIR)\prefs.obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
--- a/contrib/samples/stc/mondrian.xpm
+++ b/contrib/samples/stc/mondrian.xpm
@@ -1,44 +0,0 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-"                                ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-"                                ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++      ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++                    ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-"                                "
-};
--- a/contrib/samples/stc/prefs.cpp
+++ b/contrib/samples/stc/prefs.cpp
@@ -1,379 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// File:        prefs.cpp
-// Purpose:     STC test Preferences initialization
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes <wx/wx.h>.
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
-#ifndef WX_PRECOMP
-    #include <wx/wx.h>
-#endif
-
-//! wxWindows headers
-
-//! wxWindows/contrib headers
-
-//! application headers
-#include "defsext.h"     // Additional definitions
-#include "prefs.h"       // Preferences
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-//----------------------------------------------------------------------------
-//! language types
-const CommonInfo g_CommonPrefs = {
-    // editor functionality prefs
-    true,  // syntaxEnable
-    true,  // foldEnable
-    true,  // indentEnable
-    // display defaults prefs
-    false, // overTypeInitial
-    false, // readOnlyInitial
-    false,  // wrapModeInitial
-    false, // displayEOLEnable
-    false, // IndentGuideEnable
-    true,  // lineNumberEnable
-    false, // longLineOnEnable
-    false, // whiteSpaceEnable
-};
-
-//----------------------------------------------------------------------------
-// keywordlists
-// C++
-wxChar* CppWordlist1 =
-    _T("asm auto bool break case catch char class const const_cast \
-       continue default delete do double dynamic_cast else enum explicit \
-       export extern false float for friend goto if inline int long \
-       mutable namespace new operator private protected public register \
-       reinterpret_cast return short signed sizeof static static_cast \
-       struct switch template this throw true try typedef typeid \
-       typename union unsigned using virtual void volatile wchar_t \
-       while");
-wxChar* CppWordlist2 =
-    _T("file");
-wxChar* CppWordlist3 =
-    _T("a addindex addtogroup anchor arg attention author b brief bug c \
-       class code date def defgroup deprecated dontinclude e em endcode \
-       endhtmlonly endif endlatexonly endlink endverbatim enum example \
-       exception f$ f[ f] file fn hideinitializer htmlinclude \
-       htmlonly if image include ingroup internal invariant interface \
-       latexonly li line link mainpage name namespace nosubgrouping note \
-       overload p page par param post pre ref relates remarks return \
-       retval sa section see showinitializer since skip skipline struct \
-       subsection test throw todo typedef union until var verbatim \
-       verbinclude version warning weakgroup $ @ "" & < > # { }");
-
-// Python
-wxChar* PythonWordlist1 =
-    _T("and assert break class continue def del elif else except exec \
-       finally for from global if import in is lambda None not or pass \
-       print raise return try while yield");
-wxChar* PythonWordlist2 =
-    _T("ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN \
-       BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS \
-       COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX \
-       DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE \
-       LISTBOX LTEXT MENU MENUEX MENUITEM MESSAGETABLE POPUP PUSHBUTTON \
-       RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 \
-       STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY");
-
-
-//----------------------------------------------------------------------------
-//! languages
-const LanguageInfo g_LanguagePrefs [] = {
-    // C++
-    {_T("C++"),
-     _T("*.c;*.cc;*.cpp;*.cxx;*.cs;*.h;*.hh;*.hpp;*.hxx;*.sma"),
-     wxSTC_LEX_CPP,
-     {{mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_COMMENT, NULL},
-      {mySTC_TYPE_COMMENT_LINE, NULL},
-      {mySTC_TYPE_COMMENT_DOC, NULL},
-      {mySTC_TYPE_NUMBER, NULL},
-      {mySTC_TYPE_WORD1, CppWordlist1}, // KEYWORDS
-      {mySTC_TYPE_STRING, NULL},
-      {mySTC_TYPE_CHARACTER, NULL},
-      {mySTC_TYPE_UUID, NULL},
-      {mySTC_TYPE_PREPROCESSOR, NULL},
-      {mySTC_TYPE_OPERATOR, NULL},
-      {mySTC_TYPE_IDENTIFIER, NULL},
-      {mySTC_TYPE_STRING_EOL, NULL},
-      {mySTC_TYPE_DEFAULT, NULL}, // VERBATIM
-      {mySTC_TYPE_REGEX, NULL},
-      {mySTC_TYPE_COMMENT_SPECIAL, NULL}, // DOXY
-      {mySTC_TYPE_WORD2, CppWordlist2}, // EXTRA WORDS
-      {mySTC_TYPE_WORD3, CppWordlist3}, // DOXY KEYWORDS
-      {mySTC_TYPE_ERROR, NULL}, // KEYWORDS ERROR
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL}},
-     mySTC_FOLD_COMMENT | mySTC_FOLD_COMPACT | mySTC_FOLD_PREPROC},
-    // Python
-    {_T("Python"),
-     _T("*.py;*.pyw"),
-     wxSTC_LEX_PYTHON,
-     {{mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_COMMENT_LINE, NULL},
-      {mySTC_TYPE_NUMBER, NULL},
-      {mySTC_TYPE_STRING, NULL},
-      {mySTC_TYPE_CHARACTER, NULL},
-      {mySTC_TYPE_WORD1, PythonWordlist1}, // KEYWORDS
-      {mySTC_TYPE_DEFAULT, NULL}, // TRIPLE
-      {mySTC_TYPE_DEFAULT, NULL}, // TRIPLEDOUBLE
-      {mySTC_TYPE_DEFAULT, NULL}, // CLASSNAME
-      {mySTC_TYPE_DEFAULT, PythonWordlist2}, // DEFNAME
-      {mySTC_TYPE_OPERATOR, NULL},
-      {mySTC_TYPE_IDENTIFIER, NULL},
-      {mySTC_TYPE_DEFAULT, NULL}, // COMMENT_BLOCK
-      {mySTC_TYPE_STRING_EOL, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL}},
-     mySTC_FOLD_COMMENTPY | mySTC_FOLD_QUOTESPY},
-    // * (any)
-    {(wxChar *)DEFAULT_LANGUAGE,
-     _T("*.*"),
-     wxSTC_LEX_PROPERTIES,
-     {{mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_DEFAULT, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL}},
-     0},
-    };
-
-const int g_LanguagePrefsSize = WXSIZEOF(g_LanguagePrefs);
-
-//----------------------------------------------------------------------------
-//! style types
-const StyleInfo g_StylePrefs [] = {
-    // mySTC_TYPE_DEFAULT
-    {_T("Default"),
-     _T("BLACK"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD1
-    {_T("Keyword1"),
-     _T("BLUE"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_BOLD, 0},
-
-    // mySTC_TYPE_WORD2
-    {_T("Keyword2"),
-     _T("DARK BLUE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD3
-    {_T("Keyword3"),
-     _T("CORNFLOWER BLUE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD4
-    {_T("Keyword4"),
-     _T("CYAN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD5
-    {_T("Keyword5"),
-     _T("DARK GREY"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD6
-    {_T("Keyword6"),
-     _T("GREY"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMENT
-    {_T("Comment"),
-     _T("FOREST GREEN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMENT_DOC
-    {_T("Comment (Doc)"),
-     _T("FOREST GREEN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMENT_LINE
-    {_T("Comment line"),
-     _T("FOREST GREEN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMENT_SPECIAL
-    {_T("Special comment"),
-     _T("FOREST GREEN"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_ITALIC, 0},
-
-    // mySTC_TYPE_CHARACTER
-    {_T("Character"),
-     _T("KHAKI"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_CHARACTER_EOL
-    {_T("Character (EOL)"),
-     _T("KHAKI"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_STRING
-    {_T("String"),
-     _T("BROWN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_STRING_EOL
-    {_T("String (EOL)"),
-     _T("BROWN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_DELIMITER
-    {_T("Delimiter"),
-     _T("ORANGE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_PUNCTUATION
-    {_T("Punctuation"),
-     _T("ORANGE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_OPERATOR
-    {_T("Operator"),
-     _T("BLACK"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_BOLD, 0},
-
-    // mySTC_TYPE_BRACE
-    {_T("Label"),
-     _T("VIOLET"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMAND
-    {_T("Command"),
-     _T("BLUE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_IDENTIFIER
-    {_T("Identifier"),
-     _T("BLACK"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_LABEL
-    {_T("Label"),
-     _T("VIOLET"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_NUMBER
-    {_T("Number"),
-     _T("SIENNA"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_PARAMETER
-    {_T("Parameter"),
-     _T("VIOLET"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_ITALIC, 0},
-
-    // mySTC_TYPE_REGEX
-    {_T("Regular expression"),
-     _T("ORCHID"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_UUID
-    {_T("UUID"),
-     _T("ORCHID"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_VALUE
-    {_T("Value"),
-     _T("ORCHID"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_ITALIC, 0},
-
-    // mySTC_TYPE_PREPROCESSOR
-    {_T("Preprocessor"),
-     _T("GREY"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_SCRIPT
-    {_T("Script"),
-     _T("DARK GREY"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_ERROR
-    {_T("Error"),
-     _T("RED"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_UNDEFINED
-    {_T("Undefined"),
-     _T("ORANGE"), _T("WHITE"),
-     _T(""), 10, 0, 0}
-
-    };
-
-const int g_StylePrefsSize = WXSIZEOF(g_StylePrefs);
-
--- a/contrib/samples/stc/prefs.h
+++ b/contrib/samples/stc/prefs.h
@@ -1,153 +0,0 @@
-    //////////////////////////////////////////////////////////////////////////////
-// File:        prefs.h
-// Purpose:     STC test Preferences initialization
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef _PREFS_H_
-#define _PREFS_H_
-
-//----------------------------------------------------------------------------
-// informations
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-//! wxWindows headers
-
-//! wxWindows/contrib headers
-#include <wx/stc/stc.h>  // styled text control
-
-//! application headers
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-//! general style types
-#define mySTC_TYPE_DEFAULT 0
-
-#define mySTC_TYPE_WORD1 1
-#define mySTC_TYPE_WORD2 2
-#define mySTC_TYPE_WORD3 3
-#define mySTC_TYPE_WORD4 4
-#define mySTC_TYPE_WORD5 5
-#define mySTC_TYPE_WORD6 6
-
-#define mySTC_TYPE_COMMENT 7
-#define mySTC_TYPE_COMMENT_DOC 8
-#define mySTC_TYPE_COMMENT_LINE 9
-#define mySTC_TYPE_COMMENT_SPECIAL 10
-
-#define mySTC_TYPE_CHARACTER 11
-#define mySTC_TYPE_CHARACTER_EOL 12
-#define mySTC_TYPE_STRING 13
-#define mySTC_TYPE_STRING_EOL 14
-
-#define mySTC_TYPE_DELIMITER 15
-
-#define mySTC_TYPE_PUNCTUATION 16
-
-#define mySTC_TYPE_OPERATOR 17
-
-#define mySTC_TYPE_BRACE 18
-
-#define mySTC_TYPE_COMMAND 19
-#define mySTC_TYPE_IDENTIFIER 20
-#define mySTC_TYPE_LABEL 21
-#define mySTC_TYPE_NUMBER 22
-#define mySTC_TYPE_PARAMETER 23
-#define mySTC_TYPE_REGEX 24
-#define mySTC_TYPE_UUID 25
-#define mySTC_TYPE_VALUE 26
-
-#define mySTC_TYPE_PREPROCESSOR 27
-#define mySTC_TYPE_SCRIPT 28
-
-#define mySTC_TYPE_ERROR 29
-
-//----------------------------------------------------------------------------
-//! style bits types
-#define mySTC_STYLE_BOLD 1
-#define mySTC_STYLE_ITALIC 2
-#define mySTC_STYLE_UNDERL 4
-#define mySTC_STYLE_HIDDEN 8
-
-//----------------------------------------------------------------------------
-//! general folding types
-#define mySTC_FOLD_COMMENT 1
-#define mySTC_FOLD_COMPACT 2
-#define mySTC_FOLD_PREPROC 4
-
-#define mySTC_FOLD_HTML 16
-#define mySTC_FOLD_HTMLPREP 32
-
-#define mySTC_FOLD_COMMENTPY 64
-#define mySTC_FOLD_QUOTESPY 128
-
-//----------------------------------------------------------------------------
-//! flags
-#define mySTC_FLAG_WRAPMODE 16
-
-//----------------------------------------------------------------------------
-// CommonInfo
-
-struct CommonInfo {
-    // editor functionality prefs
-    bool syntaxEnable;
-    bool foldEnable;
-    bool indentEnable;
-    // display defaults prefs
-    bool readOnlyInitial;
-    bool overTypeInitial;
-    bool wrapModeInitial;
-    bool displayEOLEnable;
-    bool indentGuideEnable;
-    bool lineNumberEnable;
-    bool longLineOnEnable;
-    bool whiteSpaceEnable;
-};
-extern const CommonInfo g_CommonPrefs;
-
-//----------------------------------------------------------------------------
-// LanguageInfo
-
-struct LanguageInfo {
-    wxChar *name;
-    wxChar *filepattern;
-    int lexer;
-    struct {
-        int type;
-        const wxChar *words;
-    } styles [STYLE_TYPES_COUNT];
-    int folds;
-};
-
-extern const LanguageInfo g_LanguagePrefs[];
-extern const int g_LanguagePrefsSize;
-
-//----------------------------------------------------------------------------
-// StyleInfo
-struct StyleInfo {
-    wxChar *name;
-    wxChar *foreground;
-    wxChar *background;
-    wxChar *fontname;
-    int fontsize;
-    int fontstyle;
-    int lettercase;
-};
-
-extern const StyleInfo g_StylePrefs[];
-extern const int g_StylePrefsSize;
-
-#endif // _PREFS_H_
-
--- a/contrib/samples/stc/stctest.cpp
+++ b/contrib/samples/stc/stctest.cpp
@@ -1,662 +1,194 @@
-//////////////////////////////////////////////////////////////////////////////
-// File:        app.cpp
-// Purpose:     STC test application
-// Maintainer:  Otto Wyss
-// Created:     2003-09-01
+/////////////////////////////////////////////////////////////////////////////
+// Name:        stctest.cpp
+// Purpose:     sample of using wxStyledTextCtrl
+// Author:      Robin Dunn
+// Modified by:
+// Created:     3-Feb-2000
 // RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
+// Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////

-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma implementation "stctest.cpp"
+    #pragma interface "stctest.cpp"
+#endif

-// For compilers that support precompilation, includes <wx/wx.h>.
-#include <wx/wxprec.h>
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif

 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
-    #include <wx/wx.h>
+    #include "wx/wx.h"
 #endif

-//! wxWindows headers
-#include <wx/config.h>   // configuration support
-#include <wx/filedlg.h>  // file dialog support
-#include <wx/filename.h> // filename support
-#include <wx/notebook.h> // notebook support
-#include <wx/settings.h> // system settings
-#include <wx/string.h>   // strings support
-#include <wx/image.h>    // images support
+#include <wx/wfstream.h>

-//! application headers
-#include "defsext.h"     // Additional definitions
-#include "edit.h"        // Edit module
-#include "prefs.h"       // Prefs
+#include <wx/stc/stc.h>

+//----------------------------------------------------------------------

-//----------------------------------------------------------------------------
-// resources
-//----------------------------------------------------------------------------
-
-// the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
-    #include "mondrian.xpm"
-#endif
-
-//============================================================================
-// declarations
-//============================================================================
-
-#define APP_NAME _T("STC-Test")
-#define APP_DESCR _("See http://wxguide.sourceforge.net/")
-
-#define APP_MAINT _T("Otto Wyss")
-#define APP_VENDOR _T("wxWindows")
-#define APP_COPYRIGTH _T("(C) 2003 Otto Wyss")
-#define APP_LICENCE _T("wxWindows")
-
-#define APP_VERSION _T("0.1.alpha")
-#define APP_BUILD __DATE__
-
-#define APP_WEBSITE _T("http://www.wxWindows.org")
-#define APP_MAIL _T("mailto://???")
-
-#define NONAME _("<untitled>")
-
-class AppBook;
-
-
-//----------------------------------------------------------------------------
-//! global application name
-wxString *g_appname = NULL;
-
-//! global print data, to remember settings during the session
-wxPrintData *g_printData = (wxPrintData*) NULL;
-wxPageSetupData *g_pageSetupData = (wxPageSetupData*) NULL;
-
-
-//----------------------------------------------------------------------------
-//! application APP_VENDOR-APP_NAME.
-class App: public wxApp {
-    friend class AppFrame;
-
+class MyApp : public wxApp
+{
 public:
-    //! the main function called durning application start
-    virtual bool OnInit ();
-
-    //! application exit function
-    virtual int OnExit ();
-
-private:
-    //! frame window
-    AppFrame* m_frame;
-
+    virtual bool OnInit();
 };

-// created dynamically by wxWindows
-DECLARE_APP (App);
-
-//----------------------------------------------------------------------------
-//! frame of the application APP_VENDOR-APP_NAME.
-class AppFrame: public wxFrame {
-    friend class App;
-    friend class AppBook;
-    friend class AppAbout;
+//----------------------------------------------------------------------

+// Define a new frame type: this is going to be our main frame
+class MyFrame : public wxFrame
+{
 public:
-    //! constructor
-    AppFrame (const wxString &title);
+    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);

-    //! destructor
-    ~AppFrame ();
-
-    //! event handlers
-    //! common
-    void OnClose (wxCloseEvent &event);
-    void OnAbout (wxCommandEvent &event);
-    void OnExit (wxCommandEvent &event);
-    void OnTimerEvent (wxTimerEvent &event);
-    //! file
-    void OnFileNew (wxCommandEvent &event);
-    void OnFileNewFrame (wxCommandEvent &event);
-    void OnFileOpen (wxCommandEvent &event);
-    void OnFileOpenFrame (wxCommandEvent &event);
-    void OnFileSave (wxCommandEvent &event);
-    void OnFileSaveAs (wxCommandEvent &event);
-    void OnFileClose (wxCommandEvent &event);
-    //! properties
-    void OnProperties (wxCommandEvent &event);
-    //! print
-    void OnPrintSetup (wxCommandEvent &event);
-    void OnPrintPreview (wxCommandEvent &event);
-    void OnPrint (wxCommandEvent &event);
-    //! edit events
-    void OnEdit (wxCommandEvent &event);
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);

 private:
-    // edit object
-    Edit *m_edit;
-    void FileOpen (wxString fname);
-
-    //! creates the application menu bar
-    wxMenuBar *m_menuBar;
-    void CreateMenu ();
-
-    // print preview position and size
-    wxRect DeterminePrintSize ();
-
-    DECLARE_EVENT_TABLE()
-};
-
-//----------------------------------------------------------------------------
-//! about box of the application APP_VENDOR-APP_NAME
-class AppAbout: public wxDialog {
-
-public:
-    //! constructor
-    AppAbout (wxWindow *parent,
-              int milliseconds = 0,
-              long style = 0);
-
-    //! destructor
-    ~AppAbout ();
-
-    // event handlers
-    void OnTimerEvent (wxTimerEvent &event);
-
-private:
-    // timer
-    wxTimer *m_timer;
+    wxStyledTextCtrl* ed;

    DECLARE_EVENT_TABLE()
 };


-//============================================================================
-// implementation
-//============================================================================
+// IDs for the controls and the menu commands
+enum
+{
+    // menu items
+    ID_Quit = 1,
+    ID_About,
+    ID_ED
+};

-IMPLEMENT_APP (App)
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU            (ID_Quit,  MyFrame::OnQuit)
+    EVT_MENU            (ID_About, MyFrame::OnAbout)
+END_EVENT_TABLE()

-//----------------------------------------------------------------------------
-// App
-//----------------------------------------------------------------------------
+IMPLEMENT_APP(MyApp)

-bool App::OnInit () {
+//----------------------------------------------------------------------
+// `Main program' equivalent: the program execution "starts" here

-    wxInitAllImageHandlers();
-    
-    // set application and vendor name
-    SetAppName (APP_NAME);
-    SetVendorName (APP_VENDOR);
-    g_appname = new wxString ();
-    g_appname->Append (APP_VENDOR);
-    g_appname->Append (_T("-"));
-    g_appname->Append (APP_NAME);
+bool MyApp::OnInit()
+{
+    MyFrame *frame = new MyFrame("Testing wxStyledTextCtrl",
+                                 wxPoint(5, 5), wxSize(400, 600));

-    // initialize print data and setup
-    g_printData = new wxPrintData;
-    g_pageSetupData = new wxPageSetupDialogData;
-
-    // create application frame
-    m_frame = new AppFrame (*g_appname);
-
-    // open application frame
-    m_frame->Layout ();
-    m_frame->Show (true);
-    SetTopWindow (m_frame);
-
-    return true;
+    frame->Show(TRUE);
+    return TRUE;
 }

-int App::OnExit () {
+//----------------------------------------------------------------------

-    // delete global appname
-    delete g_appname;
+// frame constructor
+MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
+       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+{
+#ifdef __WXMAC__
+    // we need this in order to allow the about menu relocation, since ABOUT is
+    // not the default id of the about menu
+    wxApp::s_macAboutMenuItemId = ID_About;
+#endif

-    // delete global print data and setup
-    if (g_printData) delete g_printData;
-    if (g_pageSetupData) delete g_pageSetupData;

-    return 0;
-}
+    // create a menu bar
+    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);

-//----------------------------------------------------------------------------
-// AppFrame
-//----------------------------------------------------------------------------
+    // the "About" item should be in the help menu
+    wxMenu *helpMenu = new wxMenu;
+    helpMenu->Append(ID_About, "&About...\tCtrl-A", "Show about dialog");

-BEGIN_EVENT_TABLE (AppFrame, wxFrame)
-    // common
-    EVT_CLOSE (                      AppFrame::OnClose)
-    // file
-    EVT_MENU (wxID_OPEN,             AppFrame::OnFileOpen)
-    EVT_MENU (wxID_SAVE,             AppFrame::OnFileSave)
-    EVT_MENU (wxID_SAVEAS,           AppFrame::OnFileSaveAs)
-    EVT_MENU (wxID_CLOSE,            AppFrame::OnFileClose)
-    // properties
-    EVT_MENU (myID_PROPERTIES,       AppFrame::OnProperties)
-    // print and exit
-    EVT_MENU (wxID_PRINT_SETUP,      AppFrame::OnPrintSetup)
-    EVT_MENU (wxID_PREVIEW,          AppFrame::OnPrintPreview)
-    EVT_MENU (wxID_PRINT,            AppFrame::OnPrint)
-    EVT_MENU (wxID_EXIT,             AppFrame::OnExit)
-    // edit
-    EVT_MENU (wxID_CLEAR,            AppFrame::OnEdit)
-    EVT_MENU (wxID_CUT,              AppFrame::OnEdit)
-    EVT_MENU (wxID_COPY,             AppFrame::OnEdit)
-    EVT_MENU (wxID_PASTE,            AppFrame::OnEdit)
-    EVT_MENU (myID_INDENTINC,        AppFrame::OnEdit)
-    EVT_MENU (myID_INDENTRED,        AppFrame::OnEdit)
-    EVT_MENU (wxID_SELECTALL,        AppFrame::OnEdit)
-    EVT_MENU (myID_SELECTLINE,       AppFrame::OnEdit)
-    EVT_MENU (wxID_REDO,             AppFrame::OnEdit)
-    EVT_MENU (wxID_UNDO,             AppFrame::OnEdit)
-    // find
-    EVT_MENU (wxID_FIND,             AppFrame::OnEdit)
-    EVT_MENU (myID_FINDNEXT,         AppFrame::OnEdit)
-    EVT_MENU (myID_REPLACE,          AppFrame::OnEdit)
-    EVT_MENU (myID_REPLACENEXT,      AppFrame::OnEdit)
-    EVT_MENU (myID_BRACEMATCH,       AppFrame::OnEdit)
-    EVT_MENU (myID_GOTO,             AppFrame::OnEdit)
-    // view
-    EVT_MENU_RANGE (myID_HILIGHTFIRST, myID_HILIGHTLAST,
-                                     AppFrame::OnEdit)
-    EVT_MENU (myID_DISPLAYEOL,       AppFrame::OnEdit)
-    EVT_MENU (myID_INDENTGUIDE,      AppFrame::OnEdit)
-    EVT_MENU (myID_LINENUMBER,       AppFrame::OnEdit)
-    EVT_MENU (myID_LONGLINEON,       AppFrame::OnEdit)
-    EVT_MENU (myID_WHITESPACE,       AppFrame::OnEdit)
-    EVT_MENU (myID_FOLDTOGGLE,       AppFrame::OnEdit)
-    EVT_MENU (myID_OVERTYPE,         AppFrame::OnEdit)
-    EVT_MENU (myID_READONLY,         AppFrame::OnEdit)
-    EVT_MENU (myID_WRAPMODEON,       AppFrame::OnEdit)
-    // extra
-    EVT_MENU (myID_CHANGELOWER,      AppFrame::OnEdit)
-    EVT_MENU (myID_CHANGEUPPER,      AppFrame::OnEdit)
-    EVT_MENU (myID_CONVERTCR,        AppFrame::OnEdit)
-    EVT_MENU (myID_CONVERTCRLF,      AppFrame::OnEdit)
-    EVT_MENU (myID_CONVERTLF,        AppFrame::OnEdit)
-    EVT_MENU (myID_CHARSETANSI,      AppFrame::OnEdit)
-    EVT_MENU (myID_CHARSETMAC,       AppFrame::OnEdit)
-    // help
-    EVT_MENU (wxID_ABOUT,            AppFrame::OnAbout)
-END_EVENT_TABLE ()
+    menuFile->Append(ID_Quit, "E&xit\tAlt-X", "Quit this program");

-AppFrame::AppFrame (const wxString &title)
-        : wxFrame ((wxFrame *)NULL, -1, title, wxDefaultPosition, wxDefaultSize,
-                    wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) {
+    // now append the freshly created menu to the menu bar...
+    wxMenuBar *menuBar = new wxMenuBar();
+    menuBar->Append(menuFile, "&File");
+    menuBar->Append(helpMenu, "&Help");

-    // intitialize important variables
-    m_edit = NULL;
+    // ... and attach this menu bar to the frame
+    SetMenuBar(menuBar);

-    // set icon and background
-    SetTitle (*g_appname);
-    SetIcon (wxICON (mondrian));
-    SetBackgroundColour (_T("WHITE"));
+#if wxUSE_STATUSBAR
+    CreateStatusBar(2);
+    SetStatusText("Testing wxStyledTextCtrl");
+#endif // wxUSE_STATUSBAR

-    // about box shown for 1 seconds
-    AppAbout (this, 1000);

-    // create menu
-    m_menuBar = new wxMenuBar;
-    CreateMenu ();
+    //----------------------------------------
+    // Setup the editor
+    ed = new wxStyledTextCtrl(this, ID_ED);

-    // open first page
-    m_edit = new Edit (this, -1);
-    m_edit->SetFocus();
+    // Default font
+    wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL);
+    ed->StyleSetFont(wxSTC_STYLE_DEFAULT, font);
+    ed->StyleClearAll();

-    FileOpen (_T("stctest.cpp"));
-}
+    ed->StyleSetForeground(0,  wxColour(0x80, 0x80, 0x80));
+    ed->StyleSetForeground(1,  wxColour(0x00, 0x7f, 0x00));
+    //ed->StyleSetForeground(2,  wxColour(0x00, 0x7f, 0x00));
+    ed->StyleSetForeground(3,  wxColour(0x7f, 0x7f, 0x7f));
+    ed->StyleSetForeground(4,  wxColour(0x00, 0x7f, 0x7f));
+    ed->StyleSetForeground(5,  wxColour(0x00, 0x00, 0x7f));
+    ed->StyleSetForeground(6,  wxColour(0x7f, 0x00, 0x7f));
+    ed->StyleSetForeground(7,  wxColour(0x7f, 0x00, 0x7f));
+    ed->StyleSetForeground(8,  wxColour(0x00, 0x7f, 0x7f));
+    ed->StyleSetForeground(9,  wxColour(0x7f, 0x7f, 0x7f));
+    ed->StyleSetForeground(10, wxColour(0x00, 0x00, 0x00));
+    ed->StyleSetForeground(11, wxColour(0x00, 0x00, 0x00));
+    ed->StyleSetBold(5,  TRUE);
+    ed->StyleSetBold(10, TRUE);

-AppFrame::~AppFrame () {
-}
+#ifdef __WXMSW__
+    ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:9");
+#else
+    ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:9");
+#endif

-// common event handlers
-void AppFrame::OnClose (wxCloseEvent &event) {
-    wxCommandEvent evt;
-    OnFileClose (evt);
-    if (m_edit && m_edit->Modified()) {
-        if (event.CanVeto()) event.Veto (true);
-        return;
-    }
-    Destroy();
-}
+    // give it some text to play with
+    wxFile   file("stctest.cpp");
+    wxString st;

-void AppFrame::OnAbout (wxCommandEvent &WXUNUSED(event)) {
-    AppAbout (this);
-}
+    char* buff = st.GetWriteBuf(file.Length());
+    file.Read(buff, file.Length());
+    st.UngetWriteBuf();

-void AppFrame::OnExit (wxCommandEvent &WXUNUSED(event)) {
-    Close (true);
-}
+    ed->InsertText(0, st);
+    ed->EmptyUndoBuffer();

-// file event handlers
-void AppFrame::OnFileOpen (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-    wxString fname;
-    wxFileDialog dlg (this, _T("Open file"), _T(""), _T(""), _T("Any file (*)|*"),
-                      wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR);
-    if (dlg.ShowModal() != wxID_OK) return;
-    fname = dlg.GetPath ();
-    FileOpen (fname);
-}
-
-void AppFrame::OnFileSave (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-    if (!m_edit->Modified()) {
-        wxMessageBox (_("There is nothing to save!"), _("Save file"),
-                      wxOK | wxICON_EXCLAMATION);
-        return;
-    }
-    m_edit->SaveFile ();
-}
-
-void AppFrame::OnFileSaveAs (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-    wxString filename = wxEmptyString;
-    wxFileDialog dlg (this, _T("Save file"), _T(""), _T(""), _T("Any file (*)|*"), wxSAVE|wxOVERWRITE_PROMPT);
-    if (dlg.ShowModal() != wxID_OK) return;
-    filename = dlg.GetPath();
-    m_edit->SaveFile (filename);
-}
-
-void AppFrame::OnFileClose (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-    if (m_edit->Modified()) {
-        if (wxMessageBox (_("Text is not saved, save before closing?"), _("Close"),
-                          wxYES_NO | wxICON_QUESTION) == wxYES) {
-            m_edit->SaveFile();
-            if (m_edit->Modified()) {
-                wxMessageBox (_("Text could not be saved!"), _("Close abort"),
-                              wxOK | wxICON_EXCLAMATION);
-                return;
-            }
-        }
-        Destroy();
-    }
-}
-
-// properties event handlers
-void AppFrame::OnProperties (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-    EditProperties (m_edit, 0);
-}
-
-// print event handlers
-void AppFrame::OnPrintSetup (wxCommandEvent &WXUNUSED(event)) {
-    (*g_pageSetupData) = * g_printData;
-    wxPageSetupDialog pageSetupDialog(this, g_pageSetupData);
-    pageSetupDialog.ShowModal();
-    (*g_printData) = pageSetupDialog.GetPageSetupData().GetPrintData();
-    (*g_pageSetupData) = pageSetupDialog.GetPageSetupData();
-}
-
-void AppFrame::OnPrintPreview (wxCommandEvent &WXUNUSED(event)) {
-    wxPrintDialogData printDialogData( *g_printData);
-    wxPrintPreview *preview =
-        new wxPrintPreview (new EditPrint (m_edit),
-                            new EditPrint (m_edit),
-                            &printDialogData);
-    if (!preview->Ok()) {
-        delete preview;
-        wxMessageBox (_("There was a problem with previewing.\n\
-                         Perhaps your current printer is not correctly?"),
-                      _("Previewing"), wxOK);
-        return;
-    }
-    wxRect rect = DeterminePrintSize();
-    wxPreviewFrame *frame = new wxPreviewFrame (preview, this, _("Print Preview"));
-    frame->SetSize (rect);
-    frame->Centre(wxBOTH);
-    frame->Initialize();
-    frame->Show(true);
-}
-
-void AppFrame::OnPrint (wxCommandEvent &WXUNUSED(event)) {
-    wxPrintDialogData printDialogData( *g_printData);
-    wxPrinter printer (&printDialogData);
-    EditPrint printout (m_edit);
-    if (!printer.Print (this, &printout, true)) {
-        if (wxPrinter::GetLastError() == wxPRINTER_ERROR) {
-        wxMessageBox (_("There was a problem with printing.\n\
-                         Perhaps your current printer is not correctly?"),
-                      _("Previewing"), wxOK);
-            return;
-        }
-    }
-    (*g_printData) = printer.GetPrintDialogData().GetPrintData();
-}
-
-// edit events
-void AppFrame::OnEdit (wxCommandEvent &event) {
-    if (m_edit) m_edit->ProcessEvent (event);
-}
-
-// private functions
-void AppFrame::CreateMenu () {
-
-    // File menu
-    wxMenu *menuFile = new wxMenu;
-    menuFile->Append (wxID_OPEN, _("&Open ..\tCtrl+O"));
-    menuFile->Append (wxID_SAVE, _("&Save\tCtrl+S"));
-    menuFile->Append (wxID_SAVEAS, _("Save &as ..\tCtrl+Shift+S"));
-    menuFile->Append (wxID_CLOSE, _("&Close\tCtrl+W"));
-    menuFile->AppendSeparator();
-    menuFile->Append (myID_PROPERTIES, _("Proper&ties ..\tCtrl+I"));
-    menuFile->AppendSeparator();
-    menuFile->Append (wxID_PRINT_SETUP, _("Print Set&up .."));
-    menuFile->Append (wxID_PREVIEW, _("Print Pre&view\tCtrl+Shift+P"));
-    menuFile->Append (wxID_PRINT, _("&Print ..\tCtrl+P"));
-    menuFile->AppendSeparator();
-    menuFile->Append (wxID_EXIT, _("&Quit\tCtrl+Q"));
-
-    // Edit menu
-    wxMenu *menuEdit = new wxMenu;
-    menuEdit->Append (wxID_UNDO, _("&Undo\tCtrl+Z"));
-    menuEdit->Append (wxID_REDO, _("&Redo\tCtrl+Shift+Z"));
-    menuEdit->AppendSeparator();
-    menuEdit->Append (wxID_CUT, _("Cu&t\tCtrl+X"));
-    menuEdit->Append (wxID_COPY, _("&Copy\tCtrl+C"));
-    menuEdit->Append (wxID_PASTE, _("&Paste\tCtrl+V"));
-    menuEdit->Append (wxID_CLEAR, _("&Delete\tDel"));
-    menuEdit->AppendSeparator();
-    menuEdit->Append (wxID_FIND, _("&Find\tCtrl+F"));
-    menuEdit->Enable (wxID_FIND, false);
-    menuEdit->Append (myID_FINDNEXT, _("Find &next\tF3"));
-    menuEdit->Enable (myID_FINDNEXT, false);
-    menuEdit->Append (myID_REPLACE, _("&Replace\tCtrl+H"));
-    menuEdit->Enable (myID_REPLACE, false);
-    menuEdit->Append (myID_REPLACENEXT, _("Replace &again\tShift+F4"));
-    menuEdit->Enable (myID_REPLACENEXT, false);
-    menuEdit->AppendSeparator();
-    menuEdit->Append (myID_BRACEMATCH, _("&Match brace\tCtrl+M"));
-    menuEdit->Append (myID_GOTO, _("&Goto\tCtrl+G"));
-    menuEdit->Enable (myID_GOTO, false);
-    menuEdit->AppendSeparator();
-    menuEdit->Append (myID_INDENTINC, _("&Indent increase\tTab"));
-    menuEdit->Append (myID_INDENTRED, _("I&ndent reduce\tBksp"));
-    menuEdit->AppendSeparator();
-    menuEdit->Append (wxID_SELECTALL, _("&Select all\tCtrl+A"));
-    menuEdit->Append (myID_SELECTLINE, _("Select &line\tCtrl+L"));
-
-    // hilight submenu
-    wxMenu *menuHilight = new wxMenu;
-    int Nr;
-    for (Nr = 0; Nr < g_LanguagePrefsSize; Nr++) {
-        menuHilight->Append (myID_HILIGHTFIRST + Nr,
-                             g_LanguagePrefs [Nr].name);
-    }
-
-    // charset submenu
-    wxMenu *menuCharset = new wxMenu;
-    menuCharset->Append (myID_CHARSETANSI, _("&ANSI (Windows)"));
-    menuCharset->Append (myID_CHARSETMAC, _("&MAC (Macintosh)"));
-
-    // View menu
-    wxMenu *menuView = new wxMenu;
-    menuView->Append (myID_HILIGHTLANG, _("&Hilight language .."), menuHilight);
-    menuView->AppendSeparator();
-    menuView->AppendCheckItem (myID_FOLDTOGGLE, _("&Toggle current fold\tCtrl+T"));
-    menuView->AppendCheckItem (myID_OVERTYPE, _("&Overwrite mode\tIns"));
-    menuView->AppendCheckItem (myID_WRAPMODEON, _("&Wrap mode\tCtrl+U"));
-    menuView->AppendSeparator();
-    menuView->AppendCheckItem (myID_DISPLAYEOL, _("Show line &endings"));
-    menuView->AppendCheckItem (myID_INDENTGUIDE, _("Show &indent guides"));
-    menuView->AppendCheckItem (myID_LINENUMBER, _("Show line &numbers"));
-    menuView->AppendCheckItem (myID_LONGLINEON, _("Show &long line marker"));
-    menuView->AppendCheckItem (myID_WHITESPACE, _("Show white&space"));
-    menuView->AppendSeparator();
-    menuView->Append (myID_USECHARSET, _("Use &code page of .."), menuCharset);
-
-    // change case submenu
-    wxMenu *menuChangeCase = new wxMenu;
-    menuChangeCase->Append (myID_CHANGEUPPER, _("&Upper case"));
-    menuChangeCase->Append (myID_CHANGELOWER, _("&Lower case"));
-
-    // convert EOL submenu
-    wxMenu *menuConvertEOL = new wxMenu;
-    menuConvertEOL->Append (myID_CONVERTCR, _("CR (&Linux)"));
-    menuConvertEOL->Append (myID_CONVERTCRLF, _("CR+LF (&Windows)"));
-    menuConvertEOL->Append (myID_CONVERTLF, _("LF (&Macintosh)"));
-
-    // Extra menu
-    wxMenu *menuExtra = new wxMenu;
-    menuExtra->AppendCheckItem (myID_READONLY, _("&Readonly mode"));
-    menuExtra->AppendSeparator();
-    menuExtra->Append (myID_CHANGECASE, _("Change &case to .."), menuChangeCase);
-    menuExtra->AppendSeparator();
-    menuExtra->Append (myID_CONVERTEOL, _("Convert line &endings to .."), menuConvertEOL);
-
-    // Window menu
-    wxMenu *menuWindow = new wxMenu;
-    menuWindow->Append (myID_PAGEPREV, _("&Previous\tCtrl+Shift+Tab"));
-    menuWindow->Append (myID_PAGENEXT, _("&Next\tCtrl+Tab"));
-
-    // Help menu
-    wxMenu *menuHelp = new wxMenu;
-    menuHelp->Append (wxID_ABOUT, _("&About ..\tShift+F1"));
-
-    // construct menu
-    m_menuBar->Append (menuFile, _("&File"));
-    m_menuBar->Append (menuEdit, _("&Edit"));
-    m_menuBar->Append (menuView, _("&View"));
-    m_menuBar->Append (menuExtra, _("E&xtra"));
-    m_menuBar->Append (menuWindow, _("&Window"));
-    m_menuBar->Append (menuHelp, _("&Help"));
-    SetMenuBar (m_menuBar);
+    ed->SetLexer(wxSTC_LEX_CPP);
+    ed->SetKeyWords(0,
+                    "asm auto bool break case catch char class const "
+                    "const_cast continue default delete do double "
+                    "dynamic_cast else enum explicit export extern "
+                    "false float for friend goto if inline int long "
+                    "mutable namespace new operator private protected "
+                    "public register reinterpret_cast return short signed "
+                    "sizeof static static_cast struct switch template this "
+                    "throw true try typedef typeid typename union unsigned "
+                    "using virtual void volatile wchar_t while");

 }

-void AppFrame::FileOpen (wxString fname) {
-    wxFileName w(fname); w.Normalize(); fname = w.GetFullPath();
-    m_edit->LoadFile (fname);
-}

-wxRect AppFrame::DeterminePrintSize () {
-
-    wxSize scr = wxGetDisplaySize();
-
-    // determine position and size (shifting 16 left and down)
-    wxRect rect = GetRect();
-    rect.x += 16;
-    rect.y += 16;
-    rect.width = wxMin (rect.width, (scr.x - rect.x));
-    rect.height = wxMin (rect.height, (scr.x - rect.y));
-
-    return rect;
-}
-
-
-//----------------------------------------------------------------------------
-// AppAbout
-//----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE (AppAbout, wxDialog)
-    EVT_TIMER (myID_ABOUTTIMER, AppAbout::OnTimerEvent)
-END_EVENT_TABLE ()
-
-AppAbout::AppAbout (wxWindow *parent,
-                    int milliseconds,
-                    long style)
-        : wxDialog (parent, -1, wxEmptyString,
-                    wxDefaultPosition, wxDefaultSize,
-                    style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) {
-
-    // set timer if any
-    m_timer = NULL;
-    if (milliseconds > 0) {
-        m_timer = new wxTimer (this, myID_ABOUTTIMER);
-        m_timer->Start (milliseconds, wxTIMER_ONE_SHOT);
-    }
-
-    // sets the application title
-    SetTitle (_("About .."));
-
-    // about info
-    wxGridSizer *aboutinfo = new wxGridSizer (2, 0, 2);
-    aboutinfo->Add (new wxStaticText(this, -1, _("Written by: ")),
-                    0, wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, -1, APP_MAINT),
-                    1, wxEXPAND | wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, -1, _("Version: ")),
-                    0, wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, -1, APP_VERSION),
-                    1, wxEXPAND | wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, -1, _("Licence type: ")),
-                    0, wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, -1, APP_LICENCE),
-                    1, wxEXPAND | wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, -1, _("Copyright: ")),
-                    0, wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, -1, APP_COPYRIGTH),
-                    1, wxEXPAND | wxALIGN_LEFT);
-
-    // about icontitle//info
-    wxBoxSizer *aboutpane = new wxBoxSizer (wxHORIZONTAL);
-    wxBitmap bitmap = wxBitmap(wxICON (mondrian));
-    aboutpane->Add (new wxStaticBitmap (this, -1, bitmap),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 20);
-    aboutpane->Add (aboutinfo, 1, wxEXPAND);
-    aboutpane->Add (60, 0);
-
-    // about complete
-    wxBoxSizer *totalpane = new wxBoxSizer (wxVERTICAL);
-    totalpane->Add (0, 20);
-    wxStaticText *appname = new wxStaticText(this, -1, *g_appname);
-    appname->SetFont (wxFont (24, wxDEFAULT, wxNORMAL, wxBOLD));
-    totalpane->Add (appname, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, 40);
-    totalpane->Add (0, 10);
-    totalpane->Add (aboutpane, 0, wxEXPAND | wxALL, 4);
-    totalpane->Add (new wxStaticText(this, -1, APP_DESCR),
-                    0, wxALIGN_CENTER | wxALL, 10);
-    wxButton *okButton = new wxButton (this, wxID_OK, _("OK"));
-    okButton->SetDefault();
-    totalpane->Add (okButton, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT | wxBOTTOM, 10);
-
-    SetSizerAndFit (totalpane);
-
-    CenterOnScreen();    
-    ShowModal();
-}
-
-AppAbout::~AppAbout () {
-    if (m_timer)  {
-        delete m_timer;
-        m_timer = NULL;
-    }
-}
-
-//----------------------------------------------------------------------------
 // event handlers
-void AppAbout::OnTimerEvent (wxTimerEvent &WXUNUSED(event)) {
-    if (m_timer) delete m_timer;
-    m_timer = NULL;
-    EndModal (wxID_OK);
+
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    // TRUE is to force the frame to close
+    Close(TRUE);
 }

+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    wxString msg;
+    msg.Printf( _T("Testing wxStyledTextCtrl...\n"));
+
+    wxMessageBox(msg, "About This Test", wxOK | wxICON_INFORMATION, this);
+}
--- a/contrib/samples/stc/stctest.rc
+++ b/contrib/samples/stc/stctest.rc
@@ -1,5 +1 @@
-mondrian ICON "mondrian.ico"
 #include "wx/msw/wx.rc"
-
-
-
--- a/contrib/samples/svg/makefile.sc
+++ b/contrib/samples/svg/makefile.sc
@@ -1,6 +0,0 @@
-#Digital Mars (was Symantec) C++ makefile 
-WXDIR = ..\..\..
-EXTRALIBS=dcsvg_sc
-TARGET=svgtest
-OBJECTS = $(TARGET).obj 
-include $(WXDIR)\src\makeprog.sc
--- a/contrib/samples/svg/makefile.wat
+++ b/contrib/samples/svg/makefile.wat
@@ -1,13 +0,0 @@
-# Purpose: makefile for SVG example (Watcom)
-# Created 2000-07-28
-
-WXDIR = $(%WXWIN)
-
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-PROGRAM = svgtest
-EXTRALIBS = $(WXDIR)\lib\svg_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
-
-!include $(WXDIR)\src\makeprog.wat
-
-
--- a/contrib/samples/svg/svgtest.rc
+++ b/contrib/samples/svg/svgtest.rc
@@ -1,11 +0,0 @@
-aaaa                    ICON    "mondrian.ico"
-
-/* Useful if PROVIDE_DEFAULT_ICONS is set in wx_setup.h */
-#define IHaveMDIParentIcon
-#define IHaveMDIChildIcon
-
-mondrian 		ICON	"mondrian.ico"
-
-#include "wx/msw/wx.rc"
-
-svgbitmap               BITMAP  "SVGlogo24.bmp"
--- a/contrib/samples/xrc/XrcDemoVC.dsp
+++ b/contrib/samples/xrc/XrcDemoVC.dsp
@@ -99,8 +99,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX- /Zi /Od /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -110,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 wxmsw24d.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"

@@ -126,7 +125,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX- /O2 /Ob1 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -137,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 wxmsw24.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

--- a/contrib/samples/xrc/rc/controls.xrc
+++ b/contrib/samples/xrc/rc/controls.xrc
@@ -130,7 +130,7 @@
                    </object>
                </object>
                <object class="notebookpage">
-                    <label>wxCheckListBox</label>
+                    <label>wxCheckList</label>
                    <object class="wxPanel" name="checklist">
                        <object class="wxFlexGridSizer">
                            <cols>1</cols>
@@ -142,7 +142,7 @@
                            <object class="sizeritem">
                                <flag>wxALIGN_CENTRE|wxALL</flag>
                                <border>5</border>
-                                <object class="wxCheckListBox" name="conrols_checklist">
+                                <object class="wxCheckList" name="conrols_checklist">
                                <size>180,180</size>
                                    <content>
                                        <item checked="1">Download library</item>
--- a/contrib/src/Makefile.in
+++ b/contrib/src/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$

-CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc animate #applet
+CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc #applet

 all:
 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
--- a/contrib/src/animate/animate.cpp
+++ b/contrib/src/animate/animate.cpp
@@ -212,7 +212,7 @@ bool wxAnimationPlayer::GetTransparentColour(wxColour& col) const
 }

 // Play the frame
-bool wxAnimationPlayer::PlayFrame(int frame, wxWindow& window, const wxPoint& pos)
+bool wxAnimationPlayer::PlayFrame(int frame, wxWindow& window, wxPoint& pos)
 {
    wxMemoryDC dc;
    dc.SelectObject(m_backingStore);
--- a/contrib/src/animate/makefile.wat
+++ b/contrib/src/animate/makefile.wat
@@ -1,13 +0,0 @@
-# ANIM src makefile for Watcom C++
-
-WXDIR = ..\..\..
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-
-LIBTARGET = $(WXDIR)\lib\anim_w.lib
-
-OBJECTS =  &
-    $(OUTPUTDIR)\animate.obj &
-
-!include $(WXDIR)\src\makelib.wat
-
-
--- a/contrib/src/canvas/bbox.cpp
+++ b/contrib/src/canvas/bbox.cpp
@@ -26,7 +26,7 @@ wxBoundingBox::wxBoundingBox()
 }


-wxBoundingBox::wxBoundingBox(const wxBoundingBox &other)
+wxBoundingBox::wxBoundingBox(wxBoundingBox &other)
 {
    m_minx = other.m_minx;
    m_miny = other.m_miny;
--- a/contrib/src/fl/Makefile.in
+++ b/contrib/src/fl/Makefile.in
@@ -19,7 +19,6 @@ HEADERS = \
            cbcustom.h \
            dynbarhnd.h \
            dyntbarhnd.h \
-            fldefs.h \
            garbagec.h \
            hintanimpl.h \
            panedrawpl.h \
--- a/contrib/src/fl/bardragpl.cpp
+++ b/contrib/src/fl/bardragpl.cpp
@@ -669,7 +669,7 @@ void cbBarDragPlugin::OnLButtonDown( cbLeftDownEvent& event )
 {
 	if ( mBarDragStarted  )
 	{
-		wxMessageBox(wxT("DblClick!"));
+		wxMessageBox("DblClick!");
 	}

 	event.Skip();
--- a/contrib/src/fl/cbcustom.cpp
+++ b/contrib/src/fl/cbcustom.cpp
@@ -97,8 +97,8 @@ void cbSimpleCustomizationPlugin::OnCustomizeBar( cbCustomizeBarEvent& event )

 void cbSimpleCustomizationPlugin::OnCustomizeLayout( cbCustomizeLayoutEvent& event )
 {
-	wxString helpStr1 = wxT("Select this item to show the corresponding control bar");
-	wxString helpStr2 = wxT("Select this itme to hide the corresponding control bar");
+	wxString helpStr1 = "Select this item to show the corresponding control bar";
+	wxString helpStr2 = "Select this itme to hide the corresponding control bar";

 	int id = CB_CUSTOMIZE_MENU_FIRST_ITEM_ID;

@@ -153,7 +153,7 @@ void cbSimpleCustomizationPlugin::OnMenuItemSelected( wxCommandEvent& event )
 {
 	if ( event.GetId() == mCustMenuItemId )
 	{
-		wxMessageBox(wxT("Customization dialog box is not supported by this plugin yet"));
+		wxMessageBox("Customization dialog box is not supported by this plugin yet");

 		return;
 	}
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -976,7 +976,7 @@ void wxFrameLayout::RemoveBar( cbBarInfo* pBarInfo )
            return;
        }
    }
-    wxFAIL_MSG(wxT("bar info should be present in the list of all bars of all panes"));
+    wxFAIL_MSG("bar info should be present in the list of all bars of all panes");
 }

 bool wxFrameLayout::LocateBar( cbBarInfo* pBarInfo, 
@@ -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();
@@ -1483,7 +1480,7 @@ void wxFrameLayout::OnIdle( wxIdleEvent& event )

    if ( !focus && mCheckFocusWhenIdle )
    {
-        wxMessageBox(wxT("Hi, no more focus in this app!"));
+        wxMessageBox( "Hi, no more focus in this app!" );

        mCheckFocusWhenIdle = FALSE;
        //ShowFloatedWindows( FALSE );
@@ -3015,7 +3012,7 @@ int cbDockPane::GetRowIndex( cbRowInfo* pRow )
            return i;
    }

-    wxFAIL_MSG(wxT("Row must be present to call cbDockPane::GetRowIndex()"));
+    wxFAIL_MSG("Row must be present to call cbDockPane::GetRowIndex()");

    return 0;
 }
@@ -3063,7 +3060,7 @@ bool cbDockPane::MatchesMask( int paneMask )
        case FL_ALIGN_RIGHT  : thisMask = FL_ALIGN_RIGHT_PANE; break;

        default:
-            wxFAIL_MSG(wxT("Bad FL alignment type detected in cbDockPane::MatchesMask()"));
+            wxFAIL_MSG("Bad FL alignment type detected in cbDockPane::MatchesMask()");
    }

    return ( thisMask & paneMask ) != 0;
--- a/contrib/src/fl/flVC.dsp
+++ b/contrib/src/fl/flVC.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Static Library" 0x0104

-CFG=flVC - Win32 Debug Unicode DLL
+CFG=flVC - Win32 Release DLL
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -14,7 +14,7 @@ CFG=flVC - Win32 Debug Unicode DLL
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "flVC.mak" CFG="flVC - Win32 Debug Unicode DLL"
+!MESSAGE NMAKE /f "flVC.mak" CFG="flVC - Win32 Release DLL"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -22,10 +22,6 @@ CFG=flVC - Win32 Debug Unicode DLL
 !MESSAGE "flVC - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "flVC - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "flVC - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "flVC - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "flVC - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "flVC - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "flVC - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 

 # Begin Project
@@ -115,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 wxmsw24d.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"
@@ -138,7 +134,7 @@ LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /D "WXBUILD_FL_DLL" /YX /FD /c
 # SUBTRACT BASE CPP /u
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdll" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
 # SUBTRACT CPP /u
 MTL=midl.exe
 RSC=rc.exe
@@ -148,133 +144,11 @@ 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 wxmsw24d.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 wxmsw24.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

-!ELSEIF  "$(CFG)" == "flVC - Win32 Release Unicode"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "flVC___Win32_Release_Unicode"
-# PROP BASE Intermediate_Dir "flVC___Win32_Release_Unicode"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_Unicode"
-# PROP Intermediate_Dir "Release_Unicode"
-# PROP Target_Dir ""
-LINK32=link.exe
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswu" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "UNICODE" /D "_UNICODE" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fl.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\flu.lib"
-
-!ELSEIF  "$(CFG)" == "flVC - Win32 Release Unicode DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flVC___Win32_Release_Unicode_DLL"
-# PROP BASE Intermediate_Dir "flVC___Win32_Release_Unicode_DLL"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Release_Unicode_DLL"
-# PROP Intermediate_Dir "Release_Unicode_DLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
-# SUBTRACT BASE CPP /u
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdllu" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /D "_UNICODE" /D "UNICODE" /YX /FD /c
-# SUBTRACT CPP /u
-MTL=midl.exe
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
-# SUBTRACT BASE LINK32 /pdb:none /incremental:no /debug
-# 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 wxmsw24u.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldllu.dll" /libpath:"../../../lib"
-# SUBTRACT LINK32 /pdb:none /incremental:no /debug
-
-!ELSEIF  "$(CFG)" == "flVC - Win32 Debug Unicode"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flVC___Win32_Debug_Unicode"
-# PROP BASE Intermediate_Dir "flVC___Win32_Debug_Unicode"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_Unicode"
-# PROP Intermediate_Dir "Debug_Unicode"
-# PROP Target_Dir ""
-LINK32=link.exe
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswud" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "UNICODE" /D "_UNICODE" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\flud.lib"
-
-!ELSEIF  "$(CFG)" == "flVC - Win32 Debug Unicode DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flVC___Win32_Debug_Unicode_DLL"
-# PROP BASE Intermediate_Dir "flVC___Win32_Debug_Unicode_DLL"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_Unicode_DLL"
-# PROP Intermediate_Dir "Debug_Unicode_DLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
-# SUBTRACT BASE CPP /u
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdllud" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /D "UNICODE" /D "_UNICODE" /YX /FD /c
-# SUBTRACT CPP /u
-MTL=midl.exe
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24d.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 wxmsw24ud.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldllud.dll" /libpath:"../../../lib"
-# SUBTRACT LINK32 /pdb:none
-
 !ENDIF 

 # Begin Target
@@ -283,10 +157,6 @@ LINK32=link.exe
 # Name "flVC - Win32 Debug"
 # Name "flVC - Win32 Debug DLL"
 # Name "flVC - Win32 Release DLL"
-# Name "flVC - Win32 Release Unicode"
-# Name "flVC - Win32 Release Unicode DLL"
-# Name "flVC - Win32 Debug Unicode"
-# Name "flVC - Win32 Debug Unicode DLL"
 # Begin Group "Headers"

 # PROP Default_Filter ""
--- a/contrib/src/fl/newbmpbtn.cpp
+++ b/contrib/src/fl/newbmpbtn.cpp
@@ -433,7 +433,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
        }
        else 
        {
-            wxFAIL_MSG(wxT("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()"));
+            wxFAIL_MSG("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()");
        }
    }
    else
@@ -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    
@@ -731,7 +731,7 @@ void wxNewBitmapButton::Reshape( )
        // in the case of loading button from stream, check if we
        // have non-empty image-file name, load if possible 

-        if ( mImageFileName != wxT("") )
+        if ( mImageFileName != "" )
        {
            mDepressedBmp.LoadFile( mImageFileName, mImageFileType );

@@ -796,6 +796,6 @@ void wxNewBitmapButton::OnKillFocus( wxFocusEvent& event )
 {
    // useless

-    wxMessageBox(wxT("kill-focus for button!"));
+    wxMessageBox("kill-focus for button!");
 }

--- a/contrib/src/fl/panedrawpl.cpp
+++ b/contrib/src/fl/panedrawpl.cpp
@@ -591,14 +591,10 @@ void cbPaneDrawPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event )

        // FIXME:: +/- 1s

-        int nNewHeight = bounds.height - 2 - bar.mDimInfo.mVertGap *2;
-        if(nNewHeight < 0)
-           nNewHeight = 0;
-
        bar.mpBarWnd->wxWindow::SetSize( bounds.x      + 1 + bar.mDimInfo.mHorizGap,     
                                         bounds.y      + 1 + bar.mDimInfo.mVertGap,
                                         bounds.width  - 2 - bar.mDimInfo.mHorizGap*2,
-                                         nNewHeight,
+                                         bounds.height - 2 - bar.mDimInfo.mVertGap *2 , 
                                         0 
                                       );

--- a/contrib/src/fl/rowlayoutpl.cpp
+++ b/contrib/src/fl/rowlayoutpl.cpp
@@ -456,9 +456,6 @@ void cbRowLayoutPlugin::ApplyLengthRatios( cbRowInfo* pRow )
        }
    }  // for

-    if (pcntSum == 0.0)
-        pcntSum = 1.0;
-
    if ( haveSquished )
        unit = freeSpc / pcntSum;

--- a/contrib/src/fl/toolwnd.cpp
+++ b/contrib/src/fl/toolwnd.cpp
@@ -81,7 +81,7 @@ wxToolWindow::wxToolWindow()
 	  mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL ),
 #else
 	  // just to simulate MS-Dev style
-	  mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL, FALSE, wxT("MS Sans Serif") ),
+	  mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL, FALSE, "MS Sans Serif" ),
 #endif

      mTitleHeight  ( 16 ),
@@ -572,7 +572,7 @@ void wxToolWindow::OnMotion( wxMouseEvent& event )
 			DrawHintRect( mPrevHintRect );
 			DrawHintRect( finalRect );

-            ::wxLogTrace(wxT("%d,%d / %d,%d\n"), finalRect.x, finalRect.y, finalRect.width, finalRect.height);
+            ::wxLogTrace("%d,%d / %d,%d\n", finalRect.x, finalRect.y, finalRect.width, finalRect.height);
 		}

 		mPrevHintRect = finalRect;
--- a/contrib/src/gizmos/dynamicsash.cpp
+++ b/contrib/src/gizmos/dynamicsash.cpp
@@ -29,10 +29,6 @@

 #include "wx/gizmos/dynamicsash.h"

-
-const wxChar* wxDynamicSashWindowNameStr = wxT("dynamicSashWindow");
-
-
 /*
    wxDynamicSashWindow works by internally storing a tree of Implementation
    objects (wxDynamicSsahWindowImpl) and Leaf objects
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bryan Petty	979c18d30b	This commit was manufactured by cvs2svn to create tag 'WX_2_3_4'. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_3_4@17994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775	2002-11-28 13:34:28 +00:00
Stefan Csomor	bf4a027ddb	added arrow cursor for standard controls git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775	2002-09-15 18:32:49 +00:00
Vadim Zeitlin	418b74a078	don't mention GUI-only changes in the base section git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775	2002-09-15 18:17:32 +00:00