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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_3_2b1@11557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-04 06:35:05 +00:00
2488 changed files with 136970 additions and 676435 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -25,10 +25,6 @@ Release
 Debug
 ReleaseDLL
 DebugDLL
-UnivRelease
-UnivDebug
-BaseRelease
-BaseDebug
 robert
 stamp-h.in
 Makefile
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -125,15 +125,11 @@ Refer to the readme.txt and install.txt files in docs/mac to build
 wxWindows under Classic Mac OS using CodeWarrior.

 If you are checking out the CVS sources using cvs under Mac OS X and
-compiling under Classic Mac OS:
-
- make sure that all text files have a Mac OS type of 'TEXT' otherwise
-  CodeWarrior may ignore them. Checking out the CVS sources using cvs
-  under Mac OS X creates untyped files which can lead to compilation
-  errors under CodeWarrior which are hard to track down.
-
- convert the xml files to CodeWarrior binary projects using the supplied
-  AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
+compiling under Classic Mac OS, make sure that all text files have a
+Mac OS type of 'TEXT' otherwise CodeWarrior may ignore them. Checking
+out the CVS sources using cvs under Mac OS X creates untyped files
+which can lead to compialtion errors under CodeWarrior which are hard
+to track down.

 V) MacOS X using configure and the Developer Tools
 ----------------------------------------
@@ -162,10 +158,8 @@ VII) Unix->Windows cross-compiling using configure

 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 
-Otherwise you can compile one yourself.
+ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Otherwise you can
+compile one yourself. Check the relevant FAQs.

 [ A Note about cygwin32 and mingw32: the main difference is that cygwin32
 binaries are always linked against cygwin.dll. This dll encapsulates most
@@ -185,7 +179,8 @@ To cross compile the windows library, do
 -> cd win32
 (or whatever you called it)
 Now run configure. There are two ways to do this
-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
+-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw \
+   --enable-dnd=no --without-odbc
 where --build= should read whatever platform you're building on. Configure
 will notice that build and host platforms differ, and automatically prepend
 i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
@@ -193,22 +188,29 @@ The other way to run configure is by specifying the names of the binaries
 yourself:
 -> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
   DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
-   ../configure --host=i586-mingw32 --with-mingw
+   ../configure --host=i586-mingw32 --with-mingw --enable-dnd=no

 (all assuming you're using mingw32)
-By default this will compile a DLL, if you want a static library,
-specify --disable-shared.
+Drag'n'drop is disabled because mingw32 lacks (AFAIK) OLE headers.
+
+[ Update: some new mingw32 versions now have a new set of windows header
+files, which apparently can handle ole. Untested at the moment ]
+
+ODBC files don't compile as of 13.10.99 - may be this will be fixed by the
+moment you're reading these lines.
+
+Configure will conclude that shared libraries are out of the question and
+opt for a static one. I haven't looked into DLL creation yet.

 Type
 -> make
 and wait, wait, wait. Don't leave the room, because the minute you do there
 will be a compile error :-)

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

    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h

@@ -229,9 +231,8 @@ typedef void *__gnuc_va_list;
    and adding "|| defined(_WIN32)" to the list of platforms on which
    __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 ).
-Now try building the minimal sample:
+If this is successful, you end up with a libwx_msw.a in win32/lib.  Now try
+building the minimal sample:

 -> cd samples/minimal
 -> make
@@ -251,5 +252,6 @@ Cross-compiling TODO:
 - resource compiling must be done manually for now (should/can we link the
 default wx resources into libwx_msw.a?) [ No we can't; the linker won't
 link it in... you have to supply an object file ]
+- dynamic libraries
 - static executables are HUGE -- there must be room for improvement.

--- a/Makefile.in
+++ b/Makefile.in
@@ -1,12 +1,11 @@
 #
 # File:     makefile.unx
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 # Created:  1993
-# Updated:  2001
+# Updated:  1999
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
-# Copyright:(c) 2001, Ron Lee
 #
 # Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a

@@ -16,17 +15,17 @@ include ./src/make.env

 ############## override make.env for PIC ##########################

-%.o : %.c
-	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
+# Clears all default suffixes
+.SUFFIXES:	.o .cpp .c .cxx

-%.o : %.cpp
-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
+.c.o :
+	$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<

-%.o : %.cxx
-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
+.cpp.o :
+	$(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<

-%.r : %.rsrc
-	$(DEREZ) $^ Carbon.r -useDF > $@
+.cxx.o :
+	$(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<

 ########################### Paths #################################

@@ -45,31 +44,55 @@ VP9 = @top_srcdir@/src/zlib
 VPA = @top_srcdir@/src/regex
 VP10 = @top_srcdir@/src/iodbc
 VP11 = @top_srcdir@/src/msw/ole
+VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@

 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf

 prefix = @prefix@
 exec_prefix = @exec_prefix@

 bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
 datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
 libdir = @libdir@
+infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =

 localedir = $(datadir)/locale

+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
 top_builddir = .
-build_libdir = $(top_builddir)/lib

 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+# my autoconf doesn't set this
+#INSTALL_SCRIPT = @INSTALL_SCRIPT@
+# maybe do an additional chmod if needed?
 INSTALL_SCRIPT = @INSTALL@
+transform = @program_transform_name@

+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
@@ -94,7 +117,6 @@ PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
 TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
-REGEXDIR = $(WXDIR)/src/regex
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
@@ -114,7 +136,6 @@ INTLDIR  = $(WXDIR)/locale
 ########################## Archive name ###############################

 # append a version suffix x.y.z to all file names
-VER_MAJMIN=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)
 VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
 WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
 WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
@@ -145,6 +166,7 @@ HEADERS = $(ALL_HEADERS)
 # for the objects and depfiles, we might be bulding only part of them
 # depending on configure arguments, so select a subset of ALL
 OBJECTS = @ALL_OBJECTS@
+DEPFILES = @ALL_DEPFILES@

 # the object files of sublibraries (we assume that they don't change [often],
 # so we don't generate these lists with tmake but embed them here)
@@ -306,56 +328,85 @@ IODBCOBJS = \
 		prepare.o \
 		result.o

+OLEOBJS = \
+		automtn.o \
+		dataobj.o \
+		dropsrc.o \
+		droptgt.o \
+		oleutils.o \
+		uuid.o

 ############################## Rules ##################################

-SONAME_FLAGS = @SONAME_FLAGS@
-SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
+BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@

 all: @WX_ALL@

-$(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
-	@$(INSTALL) -d $(build_libdir)
-	@$(RM) $@
-	$(AR) $(AROPTIONS) $@ $(OBJECTS)
-	$(RANLIB) $@
+@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
+	@$(INSTALL) -d ./lib
+	$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
+	$(RANLIB) ./lib/$@

-$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
-	@$(INSTALL) -d $(build_libdir)
-	@$(RM) $@
-	$(AR) $(AROPTIONS) $@ glcanvas.o
-	$(RANLIB) $@
+@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
+	@$(INSTALL) -d ./lib
+	$(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
+	$(RANLIB) ./lib/$@

-$(build_libdir)/@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
-	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
+@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
+	@$(INSTALL) -d ./lib
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)

-$(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 -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
+@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o @WX_LIBRARY_NAME_SHARED@
+	@$(INSTALL) -d ./lib
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o ./lib/@WX_LIBRARY_NAME_SHARED@ $(EXTRALIBS) $(OPENGLLIBS)

-$(build_libdir)/@WX_RESOURCES_MACOSX@: $(MACRESOURCES)
-	@$(INSTALL) -d $(build_libdir)
-	$(RESCOMP) -d __UNIX__ -useDF $^ -o $@
+./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc
+	$(DEREZ) $^ $(DEREZFLAGS) > $@

-$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@
-	cd $(build_libdir) \
+./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc: $(MACRESOURCES)
+	$(REZ) $(REZFLAGS) $^ -o $@
+
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
+	@$(RM) ./lib/@WX_LIBRARY_LINK1@
+	@$(RM) ./lib/@WX_LIBRARY_LINK2@
+	@$(RM) ./lib/@WX_LIBRARY_LINK3@
+	cd lib \
 		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@

-$(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@
-	cd $(build_libdir) \
+CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+	cd lib \
 		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
+
+CREATE_INSTALLED_LINKS: preinstall
+	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
+
+CREATE_INSTALLED_LINKS_GL: preinstall_gl
+	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@

 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h

 parser.o:    parser.c lexer.c
-	$(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c
+	$(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c

 parser.c:	$(COMMDIR)/parser.y lexer.c
 	$(YACC) $(COMMDIR)/parser.y
@@ -375,39 +426,19 @@ lexer.c:	$(COMMDIR)/lexer.l
 	sed -e "s/unput/PROIO_unput/g"      > lexer.c
 	@$(RM) @LEX_STEM@.c

-include $(OBJECTS:.o=.d)
-
-
-CREATE_INSTALLED_LINKS: preinstall
-	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
-	cd $(libdir) \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@
-
-CREATE_INSTALLED_LINKS_GL: preinstall_gl
-	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
-	cd $(libdir) \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
+-include $(DEPFILES)

 afminstall: preinstall
 	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
 	$(INSTALL) -d $(datadir)/wx
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
-	$(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
+	$(INSTALL) -d $(datadir)/wx/afm
+	$(INSTALL) -d $(datadir)/wx/gs_afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm

 # 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
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -416,29 +447,20 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 	@if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi

-	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
-	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
-	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-	@if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then	\
-		$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
+	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
+	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
+	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@

 	$(INSTALL) -d $(libdir)/wx
 	$(INSTALL) -d $(libdir)/wx/include
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
-	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
-                    $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
+	$(INSTALL) -d $(libdir)/wx/include/wx
+	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
+	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h

 	$(INSTALL) -d $(includedir)/wx
-	@# FIXME: This will erroneously install a wx/base dir for wxBase..
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
-	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
-
-	@# always install msw headers for wxBase, it's much simpler
-	@if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi
-
 	$(INSTALL) -d $(includedir)/wx/protocol
 	$(INSTALL) -d $(includedir)/wx/unix
 	@list='$(HEADERS)'; for p in $$list; do \
@@ -454,21 +476,14 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
 	done

-preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@
-	@echo " "
-	@echo " Installing wxWindows Mac resource ..."
-	@echo " "
-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
-	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@ $(libdir)/@WX_RESOURCES_MACOSX_COMPILED@
-
-preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
+preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
 	@echo " "
 	@echo " Installing wxWindows OpenGl add-on..."
 	@echo " "
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
-	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@

-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
 	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@@ -489,14 +504,16 @@ uninstall:
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
 	@echo " Removing GL library..."
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
 	@echo " Removing helper files..."
-	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
+	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
 	@$(RM) $(bindir)/wx-config
-	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
+	@$(RM) $(bindir)/wx@TOOLKIT_NAME@-config
 	@$(RM) $(datadir)/wx/afm/*
 	@$(RM) $(datadir)/wx/gs_afm/*
 # FIXME: wxBase doesnt install these next 3 dirs.
@@ -515,8 +532,8 @@ uninstall:
 	done
 	@echo " Removing directories..."
 	@-rmdir $(localedir)
-	@if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; fi
-	@if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@; fi
+	@if test -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_NAME@; fi
+	@if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
 	@if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
 	@if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
 	@if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
@@ -533,8 +550,8 @@ uninstall:
 ALL_DIST: distclean
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
-	cp $(WXDIR)/wxwin.m4 $(DISTDIR)
-	cp $(WXDIR)/aclocal.m4 $(DISTDIR)
+	cp $(WXDIR)/configure.in $(DISTDIR)
+	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
 	cp $(WXDIR)/config.guess $(DISTDIR)
 	cp $(WXDIR)/install-sh $(DISTDIR)
@@ -544,42 +561,27 @@ ALL_DIST: distclean
 	cp $(WXDIR)/setup.h_vms $(DISTDIR)
 	cp $(WXDIR)/descrip.mms $(DISTDIR)
 	cp $(WXDIR)/Makefile.in $(DISTDIR)
-	cp $(WXDIR)/wxBase.spec $(DISTDIR)
 	cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
 	cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
 	cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
-	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	mkdir $(DISTDIR)/lib
 	cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
 	cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
 	mkdir $(DISTDIR)/src
-	cp $(SRCDIR)/files.lst $(DISTDIR)/src/
 	mkdir $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
-	mkdir $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/README $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/tests $(DISTDIR)/src/regex

 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
-	cp $(WXDIR)/configure.in $(DISTDIR)
-	cp $(WXDIR)/configure $(DISTDIR)
-	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
+	cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+	cp $(WXDIR)/wxBase.spec $(DISTDIR)
 	cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
-	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
+	cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+	cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
@@ -606,6 +608,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/tiff
 	mkdir $(DISTDIR)/src/iodbc
 	mkdir $(DISTDIR)/src/unix
+	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -639,25 +642,18 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc

 BASE_DIST: ALL_DIST
-	# make --disable-gui the default
-	sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
-		$(WXDIR)/configure.in > $(DISTDIR)/configure.in
-	sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
-		$(WXDIR)/configure > $(DISTDIR)/configure
-	chmod +x $(DISTDIR)/configure
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
-	mkdir $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/unix
-	mkdir $(DISTDIR)/src/msw
-	cp @PORT_FILES@ $(DISTDIR)
-	cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
-	cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
+	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
+	cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
+	cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
+	cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
-	cp $(DOCDIR)/install.txt $(DISTDIR)/README.txt
+	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
@@ -678,14 +674,11 @@ BASE_DIST: ALL_DIST
 	cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
 	cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
 	cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console
 	cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console

 GTK_DIST: ALL_GUI_DIST
-	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
 	cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
 	cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
-	cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
@@ -694,11 +687,9 @@ GTK_DIST: ALL_GUI_DIST
 	cp -R $(WXDIR)/contrib $(DISTDIR)

 MOTIF_DIST: ALL_GUI_DIST
-	cp $(WXDIR)/wxMotif.spec $(DISTDIR)
+	cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
 	cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
-	cp $(MOTIFDIR)/files.lst $(DISTDIR)/src/motif
 	cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
-	cp $(MOTIFDIR)/*.c $(DISTDIR)/src/motif
 	cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
 	mkdir $(DISTDIR)/src/motif/xmcombo
 	cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
@@ -706,58 +697,29 @@ MOTIF_DIST: ALL_GUI_DIST
 	cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo

 MACX_DIST: ALL_GUI_DIST
-	cp $(INCDIR)/*.* $(DISTDIR)/include
-	cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
-	cp $(MACDIR)/files.lst $(DISTDIR)/src/mac
-	cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac
-	cp $(MACDIR)/*.c $(DISTDIR)/src/mac
-	cp $(MACDIR)/*.h $(DISTDIR)/src/mac
-	cp $(MACDIR)/*.r $(DISTDIR)/src/mac
-	mkdir $(DISTDIR)/src/mac/morefile
-	cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile
-	cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile
-	mkdir $(DISTDIR)/src/mac/macsock
-	cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
+	echo "Apple Mac OS X specific distribution not complete"

 MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
-	mkdir $(DISTDIR)/include/wx/msw/ctl3d
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
-	mkdir $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
-	cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
-	cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
-	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
-	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
-	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
-
-	mkdir $(DISTDIR)/src/msw/ole
-	cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
+	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole

-UNIV_DIST: ALL_GUI_DIST
-	mkdir $(DISTDIR)/include/wx/univ
-	mkdir $(DISTDIR)/src/univ
-	mkdir $(DISTDIR)/src/univ/themes
-	cp $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ
-	cp $(SRCDIR)/univ/files.lst $(DISTDIR)/src/univ
-	cp $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
-	cp $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
-
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
 	cp $(DEMODIR)/configure $(DISTDIR)/demos
 	cp $(DEMODIR)/configure.in $(DISTDIR)/demos

+	cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+
 	mkdir $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
@@ -766,8 +728,6 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs

-	cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
-
 	mkdir $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
@@ -1243,14 +1203,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard

-	mkdir $(DISTDIR)/samples/widgets
-	mkdir $(DISTDIR)/samples/widgets/icons
-	cp $(SAMPDIR)/widgets/Makefile.in $(DISTDIR)/samples/widgets
-	cp $(SAMPDIR)/widgets/*.cpp $(DISTDIR)/samples/widgets
-	cp $(SAMPDIR)/widgets/*.h $(DISTDIR)/samples/widgets
-	cp $(SAMPDIR)/widgets/*.rc $(DISTDIR)/samples/widgets
-	cp $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons
-
 UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
 	cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
@@ -1299,7 +1251,6 @@ MANUAL_DIST:
 	mkdir $(DISTDIR)/docs/latex
 	mkdir $(DISTDIR)/docs/latex/wx
 	cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
-	cp $(DOCDIR)/latex/wx/*.inc $(DISTDIR)/docs/latex/wx
 	cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
 	cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
 	cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
@@ -1311,13 +1262,10 @@ MANUAL_DIST:
 PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython
 	mkdir $(DISTDIR)/wxPython/contrib
-	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/data
@@ -1326,19 +1274,16 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/wxPython
 	mkdir $(DISTDIR)/wxPython/wxPython/lib
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers

 	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/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/data/* $(DISTDIR)/wxPython/demo/data
@@ -1347,7 +1292,6 @@ PYTHON_DIST:
 	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/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
-	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins

 distclean:
 	$(RM) -r _dist_dir
@@ -1370,6 +1314,7 @@ dist-only:
 	fi

 dist: @GUIDIST@
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
 	@if test "$(USE_GUI)" = 1; then \
@@ -1400,6 +1345,7 @@ bzip-dist-only:
 	fi

 bzip-dist: @GUIDIST@
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
 	@if test "$(USE_GUI)" = 1; then \
@@ -1412,48 +1358,31 @@ bzip-dist: @GUIDIST@
 	mv wxDemos demos; \
 	fi

-debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
+debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
 	mkdir $(DISTDIR)/debian
 	-cp $(WXDIR)/debian/* $(DISTDIR)/debian
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	cp $(DOCDIR)/licence.txt $(DISTDIR)/docs
 	cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
 	cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs
 	rm -f $(DISTDIR)/*.spec
-
-	@# now prune away a lot of the crap included by using cp -R
-	@# in other dist targets.  Ugly and hardly portable but it
-	@# will run on any Debian box and that's enough for now.
-
-	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
-
 	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)

-debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
-
-debian-msw-dirs:
-	mkdir $(DISTDIR)/include/wx/msw
-	mkdir $(DISTDIR)/src/msw
-
-
 clean:
 	$(RM) *.o
 	$(RM) *.d
 	$(RM) parser.c
 	$(RM) lexer.c
-	$(RM) $(build_libdir)/lib*
-    # Don't remove this lot, configure will reuse it
-    # if it's still good
-	# $(RM) -r $(build_libdir)/wx/*
+	# $(RM) -r ./lib/wx/*
+	$(RM) ./lib/lib*

 cleanall: clean


 RPMTOP=_dist_dir/_rpm_top

-rpm: bzip-dist
+rpm: dist
 	@echo "*** Building RPMs ***"
 	-mkdir $(RPMTOP)
 	-mkdir $(RPMTOP)/SOURCES
@@ -1461,7 +1390,6 @@ rpm: bzip-dist
 	-mkdir $(RPMTOP)/BUILD
 	-mkdir $(RPMTOP)/RPMS
 	-mkdir $(RPMTOP)/SRPMS
-	cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
+	cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
 	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
 	mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .
-
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.

-timestamp='2001-09-04'
+version='2000-10-23'

 # 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
@@ -32,41 +32,30 @@ timestamp='2001-09-04'
 # exits with 0.  Otherwise, it exits with 1.
 #
 # The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#

 me=`echo "$0" | sed -e 's,.*/,,'`

 usage="\
 Usage: $0 [OPTION]

-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of this system.

 Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+  -h, --help               print this help, then exit
+  -V, --version            print version number, then exit"

 help="
 Try \`$me --help' for more information."

 # Parse command line
 while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
+  case "$1" in
+    --version | --vers* | -V )
       echo "$version" ; exit 0 ;;
    --help | --h* | -h )
       echo "$usage"; exit 0 ;;
@@ -75,7 +64,9 @@ while test $# -gt 0 ; do
    - )	# Use stdin as input.
       break ;;
    -* )
-       echo "$me: invalid option $1$help" >&2
+       exec >&2
+       echo "$me: invalid option $1"
+       echo "$help"
       exit 1 ;;
    * )
       break ;;
@@ -87,42 +78,34 @@ if test $# != 0; then
  exit 1
 fi

+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+  if test x"$HOST_CC" != x; then
+    CC_FOR_BUILD="$HOST_CC"
+  else
+    if test x"$CC" != x; then
+      CC_FOR_BUILD="$CC"
+    else
+      CC_FOR_BUILD=cc
+    fi
+  fi
+fi

-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'

 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
+# (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi

 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
+
 # Note: order is significant - the case branches are not exclusive.

 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -146,25 +129,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
+	# The Operating System including object format.
+	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep __ELF__ >/dev/null
+	then
+	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+	    # Return netbsd for either.  FIX?
+	    os=netbsd
+	else
+	    os=netbsdelf
+	fi
 	# The OS release
 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -205,7 +179,6 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
-	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
 		case `./$dummy` in
@@ -227,9 +200,6 @@ EOF
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
@@ -277,7 +247,7 @@ EOF
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+    SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -333,9 +303,6 @@ EOF
    aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    sparc*:NetBSD:*)
-	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
-	exit 0 ;;
    atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -393,7 +360,6 @@ EOF
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -417,13 +383,10 @@ EOF
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
+	  && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
    Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -471,20 +434,11 @@ EOF
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
+    i?86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
    *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
 		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>

@@ -496,7 +450,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -505,9 +459,9 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
-    *:AIX:*:[45])
+    *:AIX:*:4)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -515,7 +469,7 @@ EOF
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=4.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 	exit 0 ;;
@@ -541,29 +495,10 @@ EOF
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                        esac ;;
-                    esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-	      eval $set_cc_for_build
              sed 's/^              //' << EOF >$dummy.c

              #define _HPUX_SOURCE
@@ -597,19 +532,13 @@ EOF
                  exit (0);
              }
 EOF
-	    (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
-	fi ;;
+	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	rm -f $dummy.c $dummy
 	esac
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -635,7 +564,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -645,7 +574,7 @@ EOF
    9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -654,7 +583,7 @@ EOF
    hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
-    i*86:OSF1:*:*)
+    i?86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
@@ -689,22 +618,18 @@ EOF
 	echo xmp-cray-unicos
        exit 0 ;;
    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo ymp-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
    CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
    CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -712,16 +637,18 @@ EOF
    CRAY-2:*:*:*)
 	echo cray2-cray-unicos
        exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+    F300:UNIX_System_V:*:*)
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
    hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    sparc*:BSD/OS:*:*)
@@ -766,93 +693,205 @@ EOF
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
-	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-	esac
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
+    *:Linux:*:*)
+
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_supported_targets=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
+	ld_supported_emulations=`cd /; ld --help 2>&1 \
+			 | sed -ne '/supported emulations:/!d
 				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
+				    s/.*supported emulations: *//
 				    s/ .*//
 				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
+        case "$ld_supported_emulations" in
+	  *ia64)
+		echo "${UNAME_MACHINE}-unknown-linux"
+		exit 0
+		;;
+	  i?86linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0
+		;;
+	  elf_i?86)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
-	  coff-i386)
+	  i?86coff)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit 0
+		;;
+	  sparclinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  armlinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32arm*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
+		exit 0
+		;;
+	  armelf_linux*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  m68klinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32ppc | elf32ppclinux)
+		# Determine Lib Version
+		cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#if defined(__GLIBC__)
+  printf("%s %s\n", __libc_version, __libc_release);
+#else
+  printf("unkown\n");
+#endif
+  return 0;
+}
+EOF
+		LIBC=""
+		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./$dummy | grep 1\.99 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi
+		rm -f $dummy.c $dummy
+		echo powerpc-unknown-linux-gnu${LIBC}
+		exit 0
+		;;
+	  shelf_linux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
 	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	cat >$dummy.c <<EOF
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		cat <<EOF >$dummy.s
+			.data
+		\$Lformat:
+			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+			.text
+			.globl main
+			.align 4
+			.ent main
+		main:
+			.frame \$30,16,\$26,0
+			ldgp \$29,0(\$27)
+			.prologue 1
+			.long 0x47e03d80 # implver \$0
+			lda \$2,-1
+			.long 0x47e20c21 # amask \$2,\$1
+			lda \$16,\$Lformat
+			mov \$0,\$17
+			not \$1,\$18
+			jsr \$26,printf
+			ldgp \$29,0(\$26)
+			mov 0,\$16
+			jsr \$26,exit
+			.end main
+EOF
+		LIBC=""
+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			case `./$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			esac
+
+			objdump --private-headers $dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi
+		rm -f $dummy.s $dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >$dummy.c <<EOF
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
+	elif test "${UNAME_MACHINE}" = "s390"; then
+	  echo s390-ibm-linux && exit 0
+	elif test "${UNAME_MACHINE}" = "x86_64"; then
+	  echo x86_64-unknown-linux-gnu && exit 0
+	elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa"; then
+	  # Look for CPU level
+	  case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	    PA7*)
+		echo hppa1.1-unknown-linux-gnu
+		;;
+	    PA8*)
+		echo hppa2.0-unknown-linux-gnu
+		;;
+	    *)
+		echo hppa-unknown-linux-gnu
+		;;
+	  esac
+	  exit 0
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  test -z "$ld_supported_emulations" \
+	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  # Determine whether the default compiler is a.out or elf
+	  cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -863,30 +902,29 @@ EOF
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
-    printf ("%s-pc-linux-gnu\n", argv[1]);
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
 #  else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
 #  endif
 # else
-   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
 # endif
 #else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
 #endif
  return 0;
 }
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
+	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+    i?86:DYNIX/ptx:4*:*)
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
+    i?86:UNIX_SV:4.2MP:2.*)
        # Unixware is an offshoot of SVR4, but it has its own version
        # number series starting with 2...
        # I am not positive that other SVR4 systems won't match this,
@@ -894,7 +932,7 @@ EOF
        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+    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
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -902,15 +940,16 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+    i?86:*:5:7*)
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+	else
+	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
 	exit 0 ;;
-    i*86:*:3.2:*)
+    i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
@@ -928,7 +967,7 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i*86:*DOS:*:*)
+    i?86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 	exit 0 ;;
    pc:*:*:*)
@@ -967,24 +1006,21 @@ EOF
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+    m68*:LynxOS:2.*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    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*:*)
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
    SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
@@ -1002,8 +1038,8 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
        echo i586-unisys-sysv4
        exit 0 ;;
    *:UNIX_System_V:4*:FTX*)
@@ -1015,10 +1051,6 @@ EOF
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
 	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
    mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
@@ -1088,41 +1120,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 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *: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
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2

-eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1209,24 +1211,11 @@ main ()
 #endif

 #if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
+#if !defined (ultrix)
+  printf ("vax-dec-bsd\n"); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
 #endif

 #if defined (alliant) && defined (i860)
@@ -1237,7 +1226,7 @@ main ()
 }
 EOF

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

 # Apollos put the system type in the environment.
@@ -1273,9 +1262,8 @@ fi
 cat >&2 <<EOF
 $0: unable to guess system type

-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+The $version version of this script cannot recognize your system type.
+Please download the most up to date version of the config scripts:

    ftp://ftp.gnu.org/pub/gnu/config/

@@ -1284,7 +1272,7 @@ send the following data and any information you think might be
 pertinent to <config-patches@gnu.org> in order to provide the needed
 information to handle your system.

-config.guess timestamp = $timestamp
+config.guess version = $version

 uname -m = `(uname -m) 2>/dev/null || echo unknown`
 uname -r = `(uname -r) 2>/dev/null || echo unknown`
@@ -1311,7 +1299,7 @@ exit 1

 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
+# time-stamp-start: "version='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
--- 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
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.

-timestamp='2001-09-07'
+version='2000-11-04'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -60,30 +60,16 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS
 Canonicalize a configuration name.

 Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+  -h, --help               print this help, then exit
+  -V, --version            print version number, then exit"

 help="
 Try \`$me --help' for more information."

 # Parse command line
 while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
+  case "$1" in
+    --version | --vers* | -V )
       echo "$version" ; exit 0 ;;
    --help | --h* | -h )
       echo "$usage"; exit 0 ;;
@@ -92,7 +78,9 @@ while test $# -gt 0 ; do
    - )	# Use stdin as input.
       break ;;
    -* )
-       echo "$me: invalid option $1$help"
+       exec >&2
+       echo "$me: invalid option $1"
+       echo "$help"
       exit 1 ;;

    *local*)
@@ -117,7 +105,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | storm-chaos*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -157,14 +145,6 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -223,36 +203,22 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| s390 | s390x \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
-	| stormy16 | strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 \
-	| we32k \
-	| x86 | xscale \
-	| z8k)
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | armv[2345] | armv[345][lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+		| hppa64 \
+		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+		| alphaev6[78] \
+		| we32k | ns16k | clipper | i370 | sh | sh[34] \
+		| powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+		| mips64vr5000 | miprs64vr5000el | mcore \
+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+		| thumb | d10v | d30v | fr30 | avr)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -260,13 +226,13 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
 		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
+	i[234567]86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -275,43 +241,28 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
-	| d10v-* | d30v-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| 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-* \
-	| 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-* | xmp-* | xps100-* | xscale-* \
-	| ymp-* \
-	| z8k-*)
+	# FIXME: clean up the formatting here.
+	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	      | xmp-* | ymp-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	      | hppa2.0n-* | hppa64-* \
+	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+	      | alphaev6[78]-* \
+	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	      | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-* \
+	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	      | mipstx39-* | mipstx39el-* | mcore-* \
+	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -402,8 +353,8 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
+	[ctj]90-cray)
+		basic_machine=c90-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -459,10 +410,6 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -538,19 +485,19 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
+	i[34567]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i*86v4*)
+	i[34567]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i*86v)
+	i[34567]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i*86sol2)
+	i[34567]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -562,6 +509,18 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
+	i386-go32 | go32)
+		basic_machine=i386-unknown
+		os=-go32
+		;;
+	i386-mingw32 | mingw32)
+		basic_machine=i386-unknown
+		os=-mingw32
+		;;
+	i[34567]86-pw32 | pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -587,10 +546,6 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -621,7 +576,7 @@ case $basic_machine in
 		os=-coff
 		;;
 	msdos)
-		basic_machine=i386-pc
+		basic_machine=i386-unknown
 		os=-msdos
 		;;
 	mvs)
@@ -731,7 +686,7 @@ case $basic_machine in
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i686-pc
+		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
@@ -740,12 +695,12 @@ case $basic_machine in
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=power-ibm
+	power)	basic_machine=rs6000-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
 	        ;;
@@ -757,23 +712,9 @@ case $basic_machine in
 	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/^[^-]*-//'`
-		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -921,10 +862,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -968,20 +905,16 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb)
+	sh3 | sh4)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
        cydra)
@@ -1003,9 +936,6 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -1062,18 +992,15 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* | -storm-chaos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
-		    x86-* | i*86-*)
+		    x86-* | i[34567]86-*)
 			;;
 		    *)
 			os=-nto$os
@@ -1166,7 +1093,7 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+        -*mint | -*MiNT)
 	        os=-mint
 		;;
 	-none)
@@ -1200,9 +1127,6 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	pdp10-*)
-		os=-tops20
-		;;
        pdp11-*)
 		os=-none
 		;;
@@ -1311,7 +1235,7 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f30[01]-fujitsu | f700-fujitsu)
+	f301-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1389,12 +1313,9 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+			-*mint | -*MiNT)
 				vendor=atari
 				;;
-			-vos*)
-				vendor=stratus
-				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
@@ -1405,7 +1326,7 @@ exit 0

 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
+# time-stamp-start: "version='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
--- a/5104
+++ b/5104
--- a/configure.in
+++ b/configure.in
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -3,13 +3,13 @@
 #

 all:
-	cd src; $(MAKE)
+	cd src; make

 clean:
-	cd src; $(MAKE) clean
-	cd samples; $(MAKE) clean
-	cd utils; $(MAKE) clean
+	cd src; make clean
+	cd samples; make clean
+	cd utils; make clean
    

 samples:
-	cd samples; $(MAKE)
+	cd samples; make
--- a/contrib/include/wx/applet/plugin.h
+++ b/contrib/include/wx/applet/plugin.h
@@ -1,57 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the wxQlet class
-*
-****************************************************************************/
-
-#ifndef __WX_PLUGIN_H
-#define __WX_PLUGIN_H
-
-// Forward declaration
-class wxHtmlAppletWindow;
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Defines the abstract base class for wxQlet objects.
-****************************************************************************/
-class wxPlugIn : public wxObject {
-private:
-    DECLARE_ABSTRACT_CLASS(wxPlugIn);
-
-    wxHtmlAppletWindow *m_parent;
-public:
-            // Constructor (called during dynamic creation)
-            wxPlugIn() { m_parent = NULL; };
-
-            // Psuedo virtual constructor
-    virtual bool Create(wxHtmlAppletWindow *parent);
-
-            // Virtual destructor
-    virtual ~wxPlugIn();
-    };
-#endif // __WX_PLUGIN_H
-
--- a/contrib/include/wx/applet/prepinclude.h
+++ b/contrib/include/wx/applet/prepinclude.h
@@ -41,9 +41,10 @@ wxIncludePrep class Definition
 class wxIncludePrep : public wxHtmlProcessor {
 private:
    //DECLARE_DYNAMIC_CLASS(wxIncludePrep);
-    wxFileSystem *m_FS;
+    wxString DOC_ROOT;
+
 public:
-    wxIncludePrep() : wxHtmlProcessor() {}
+    wxIncludePrep() : wxHtmlProcessor() {DOC_ROOT = wxString("");}
    ~wxIncludePrep() {}
 	
 	// Process input text and return processed result
@@ -53,7 +54,8 @@ public:
    // is the processor applied to the text.
    int GetPriority() const { return wxHTML_PRIORITY_SYSTEM; }
 	
-    void ChangeDirectory(wxFileSystem *);
+    void ChangeDirectory(const wxString &dir);
+    wxString GetDirectory() { return DOC_ROOT; }
    };
 	
 	
--- a/contrib/include/wx/applet/window.h
+++ b/contrib/include/wx/applet/window.h
@@ -5,19 +5,23 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
+*  ======================================================================
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  |                                                                    |
+*  |This copyrighted computer code is a proprietary trade secret of     |
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
+*  |written authorization from SciTech to possess or use this code, you |
+*  |may be subject to civil and/or criminal penalties.                  |
+*  |                                                                    |
+*  |If you received this code in error or you would like to report      |
+*  |improper use, please immediately contact SciTech Software, Inc. at  |
+*  |530-894-8400.                                                       |
+*  |                                                                    |
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  ======================================================================
 *
 * Language:     ANSI C++
 * Environment:  Any
@@ -34,11 +38,9 @@

 // Forward declare
 class wxApplet;
-class wxQlet;
 class wxLoadPageEvent;
 class wxPageLoadedEvent;
 class wxIncludePrep;
-class wxToolBarBase;

 // Declare a linked list of wxApplet pointers
 WX_DECLARE_LIST(wxApplet, wxAppletList);
@@ -62,8 +64,6 @@ public:
                wxString& group,
                wxString& href );

-            VirtualData();
-
            // Gets
            wxString GetName(){ return m_name;};
            wxString GetGroup(){ return m_group;};
@@ -86,21 +86,15 @@ private:
    DECLARE_CLASS(wxHtmlAppletWindow);
    DECLARE_EVENT_TABLE();

-    bool                m_mutexLock;
-    wxIncludePrep       *incPreprocessor;  // deleted by list it is added too in constructor
-
+    bool m_mutexLock;
+    wxIncludePrep *incPreprocessor;  // deleted by list it is added too in constructor
 protected:
 	wxAppletList		m_AppletList;		
 	static wxHashTable	m_Cookies;
-    bool                m_NavBarEnabled;
    wxToolBarBase       *m_NavBar;
    int                 m_NavBackId;
    int                 m_NavForwardId;
-    wxPalette           m_globalPalette;
-    	
-            // Override this so we can do proper palette management!!
-    virtual void OnDraw(wxDC& dc);
-
+	wxString            m_DocRoot;	
 public:
            // Constructor
            wxHtmlAppletWindow(
@@ -113,7 +107,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxHW_SCROLLBAR_AUTO,
                const wxString& name = "htmlAppletWindow",
-                const wxPalette& globalPalette = wxNullPalette);
+                const wxString& docroot = "" );

            // Destructor
            ~wxHtmlAppletWindow();
@@ -125,9 +119,6 @@ public:
                const wxHtmlTag &params,
                const wxSize& size);

-            // Create an instance of an Qlet based on it's class name
-            bool CreatePlugIn(const wxString& classId );
-
            // Find an instance of an applet based on it's class name
            wxApplet *FindApplet(const wxString& className);

@@ -146,14 +137,6 @@ public:
            // Handles backwards navigation within the HTML stack
            bool HistoryBack();

-            // Disables Nav bars
-            void DisableNavBar();
-
-            // Enables Nav bars
-            void EnableNavBar();
-
-            void SetNavBar(wxToolBarBase *navBar);
-
            // Broadcast a message to all applets on the page
            void SendMessage(wxEvent& msg);

@@ -203,24 +186,6 @@ public:

    };

-/****************************************************************************
-REMARKS:
-Defines the class for wxHtmlAppletCell
-***************************************************************************/
-class wxHtmlAppletCell : public wxHtmlCell
-{
-public:
-    wxHtmlAppletCell(wxWindow *wnd, int w = 0);
-    ~wxHtmlAppletCell() { m_Wnd->Destroy(); }
-    virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
-    virtual void DrawInvisible(wxDC& dc, int x, int y);
-    virtual void Layout(int w);
-
-protected:
-    wxWindow* m_Wnd;
-            // width float is used in adjustWidth (it is in percents)
-};
-

 #endif // __WX_APPLET_WINDOW_H

--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -79,7 +79,7 @@ WX_DEFINE_ARRAY( RowInfoPtrT, RowArrayT );

 #define wxALL_PANES    0x000F

-// enumeration of hittest results, see cbDockPane::HitTestPaneItems(..)
+// enumeration of hittest results, see cbDockPane::HitTestPaneItems(..) 

 enum CB_HITTEST_RESULT
 {
@@ -100,7 +100,7 @@ enum CB_HITTEST_RESULT
 // helper class, used for spying for not-handled mouse events on control-bars
 // and forwarding them to the frame layout

-class cbBarSpy : public wxEvtHandler
+class cbBarSpy : public wxEvtHandler 
 {
 public:
 	DECLARE_DYNAMIC_CLASS( cbBarSpy )
@@ -120,8 +120,8 @@ public:
 	virtual bool ProcessEvent(wxEvent& event);
 };

-/* wxFrameLayout manages containment and docking of control bars.
- * which can be docked along top, bottom, righ, or left side of the
+/* wxFrameLayout manages containment and docking of control bars. 
+ * which can be docked along top, bottom, righ, or left side of the 
 * parent frame
 */

@@ -130,8 +130,8 @@ class wxFrameLayout : public wxEvtHandler
 public:
 	wxFrameLayout(void); // used only while serializing

-	wxFrameLayout( wxWindow* pParentFrame,
-				   wxWindow* pFrameClient = NULL,
+	wxFrameLayout( wxWindow* pParentFrame, 
+				   wxWindow* pFrameClient = NULL, 
 				   bool      activateNow  = TRUE );

 	// (doesn't destroy bar windows)
@@ -143,7 +143,7 @@ public:
 	// Can be called after some other layout has been deactivated,
 	// and this one must "take over" the current contents of frame window.
 	//
-	// Effectively hooks itself to the frame window, re-displays all not-hidden
+	// Effectively hooks itself to the frame window, re-displays all not-hidden 
 	// bar-windows and repaints decorations

 	virtual void Activate();
@@ -151,7 +151,7 @@ public:
 	// unhooks itself from frame window, and hides all not-hidden windows
 	//
 	// NOTE:: two frame-layouts should not be active at the same time in the
-	//        same frame window, it would cause messy overlapping of bar windows
+	//        same frame window, it would cause messy overlapping of bar windows 
 	//        from both layouts

 	virtual void Deactivate();
@@ -163,8 +163,8 @@ public:
 	virtual void DestroyBarWindows();

 	// passes the client window (e.g. MDI-client frame) to be controled by
-	// frame layout, the size and position of which should be adjusted to be
-	// surrounded by controlbar panes, whenever frame is resized, or dimensions
+	// frame layout, the size and position of which should be adjusted to be 
+	// surrounded by controlbar panes, whenever frame is resized, or dimensions 
 	// of control panes change

 	void SetFrameClient( wxWindow* pFrameClient );
@@ -176,7 +176,7 @@ public:
 	// used by updates-managers
 	cbDockPane** GetPanesArray() { return mPanes; }

-	// see pane alignment types
+	// see pane alignment types 
 	cbDockPane* GetPane( int alignment )

 		{ return mPanes[alignment]; }
@@ -187,11 +187,11 @@ public:
 	// NOTES:: argument pBarWnd can by NULL, resulting bar decorations to be drawn
 	//         around the empty rectangle (filled with default background colour).
 	//         Argument dimInfo, can be re-used for adding any number of bars, since
-	//         it is not used directly, instead it's members are copied. If dimensions-
-	//         handler is present, it's instance shared (reference counted). Dimension
+	//         it is not used directly, instead it's members are copied. If dimensions- 
+	//         handler is present, it's instance shared (reference counted). Dimension 
 	//         handler should always be allocated on the heap!)

-	virtual void AddBar( wxWindow*        pBarWnd,
+	virtual void AddBar( wxWindow*        pBarWnd, 
                         const cbDimInfo&       dimInfo,

 						 // defaults:
@@ -201,13 +201,13 @@ public:
 						 const wxString& name="bar",// name, by which the bar could be referred
 						                            // in layout customization dialogs

-						 bool spyEvents    = FALSE,	// if TRUE - input events for the bar should
-													// be "spyed" in order to forward not-handled
-													// mouse clicks to frame layout (e.g. to enable
-													// easy-draggablity of toolbars just by clicking
-													// on their interior regions). For widgets like
-													// text/tree control this value should be FALSE
-													// (since there's _no_ certain way to detect
+						 bool spyEvents    = FALSE,	// if TRUE - input events for the bar should 
+													// be "spyed" in order to forward not-handled 
+													// mouse clicks to frame layout (e.g. to enable 
+													// easy-draggablity of toolbars just by clicking 
+													// on their interior regions). For widgets like 
+													// text/tree control this value should be FALSE 
+													// (since there's _no_ certain way to detect 
 													//  whether the event was actually handled...)

 						 int state        = wxCBAR_DOCKED_HORIZONTALLY // e.g. wxCBAR_FLOATING
@@ -217,10 +217,10 @@ public:
 	// can be used for repositioning already existing bars. The given bar is first removed
 	// from the pane it currently belongs to, and inserted into the pane, which "matches"
 	// the given recantular area. If pToPane is not NULL, bar is docked to this given pane
-
+	
 	// to dock the bar which is floated, use wxFrameLayout::DockBar(..) method

-	virtual bool RedockBar( cbBarInfo* pBar, const wxRect& shapeInParent,
+	virtual bool RedockBar( cbBarInfo* pBar, const wxRect& shapeInParent, 
 							cbDockPane* pToPane = NULL, bool updateNow = TRUE );

 	// methods for access and modification of bars in frame layout
@@ -255,9 +255,9 @@ public:
 	wxRect& GetClientRect()		{ return mClntWndBounds;     }

 	// NOTE:: in future ubdates-manager will become a normal plugin
-
+	
 	cbUpdatesManagerBase& GetUpdatesManager();
-
+	
 	// destroys the previous manager if any, set the new one

 	void SetUpdatesManager( cbUpdatesManagerBase* pUMgr );
@@ -266,7 +266,7 @@ public:

 	virtual void GetPaneProperties( cbCommonPaneProperties& props, int alignment = FL_ALIGN_TOP );

-	virtual void SetPaneProperties( const cbCommonPaneProperties& props,
+	virtual void SetPaneProperties( const cbCommonPaneProperties& props, 
 		                            int paneMask = wxALL_PANES );

 	// TODO:: margins should go into cbCommonPaneProperties in the future
@@ -295,11 +295,11 @@ public:
 	/*** plugin-related methods ***/

 	// should be used, instead of passing the event to ProcessEvent(..) method
-	// of the top-plugin directly. This method checks if events are currently
+	// of the top-plugin directly. This method checks if events are currently 
 	// captured and ensures that plugin-event is routed correctly.

 	virtual void FirePluginEvent( cbPluginEvent& event );
-
+	
 	// captures/releases user-input event's for the given plugin
 	// Input events are: mouse movement, mouse clicks, keyboard input

@@ -312,7 +312,7 @@ public:

 	// returns current top-level plugin (the one which receives events first,
 	// with an exception if input-events are currently captured by some other plugin)
-
+	
 	virtual cbPluginBase& GetTopPlugin();

 	// hooking custom plugins to frame layout
@@ -340,7 +340,7 @@ public:
 	// default plugins are : cbPaneDrawPlugin, cbRowLayoutPlugin, cbBarDragPlugin,
 	// 						 cbAntiflickerPlugin, cbSimpleCustomizePlugin
 	//
-	// this method is automatically invoked, if no plugins were found upon
+	// this method is automatically invoked, if no plugins were found upon 
 	// fireing of the first plugin-event, i.e. wxFrameLayout *CONFIGURES* itself

 	virtual void PushDefaultPlugins();
@@ -348,7 +348,7 @@ public:
 	/* "Advanced" methods for plugin-configuration	using their */
 	/* dynamic class information (e.g. CLASSINFO(pluginClass) ) */

-	// first checks if plugin of the given class is already "hooked up",
+	// first checks if plugin of the given class is already "hooked up", 
 	// if not, adds it to the top of plugins chain

 	virtual void AddPlugin( wxClassInfo* pPlInfo, int paneMask = wxALL_PANES );
@@ -363,14 +363,14 @@ public:
 	//        thefore the former should be hooked before the one
 	//        who's functionality is being overriden

-	virtual void AddPluginBefore( wxClassInfo* pNextPlInfo, wxClassInfo* pPlInfo,
+	virtual void AddPluginBefore( wxClassInfo* pNextPlInfo, wxClassInfo* pPlInfo, 
 								  int paneMask = wxALL_PANES );

 	// checks if plugin of the given class is hooked, removes
 	// it if found
 	//
 	// @param pPlInfo class information structure for the plugin
-	// @note
+	// @note  
 	// @see wxFrameLayout::Method


@@ -417,7 +417,7 @@ public: /* protected really, acessed only by plugins and serializers */

 	// pane, from which mouse pointer had just left

-	cbDockPane*  mpLRUPane;
+	cbDockPane*  mpLRUPane;	   

 	// bounds of client window in parent frame's coordinates

@@ -432,11 +432,11 @@ public: /* protected really, acessed only by plugins and serializers */

 	cbPluginBase* mpTopPlugin;

-	// plugin, which currently has captured all input events, otherwise NULL
+	// plugin, which currently has captured all input events, otherwise NULL 

 	cbPluginBase* mpCaputesInput;

-	// list of event handlers which are "pushed" onto each bar, to catch
+	// list of event handlers which are "pushed" onto each bar, to catch 
 	// mouse events which are not handled by bars, and froward them to the ,
 	// frome-layout and further to plugins

@@ -457,7 +457,7 @@ public: /* protected really, acessed only by plugins and serializers */

 public: /* protected really (accessed only by plugins) */

-	// refrence to custom updates manager
+	// refrence to custom updates manager 
 	cbUpdatesManagerBase* mpUpdatesMgr;

 	// called to set calculated layout to window objects
@@ -468,7 +468,7 @@ public: /* protected really (accessed only by plugins) */
 	void RepositionFloatedBar( cbBarInfo* pBar );
 	void DoSetBarState( cbBarInfo* pBar );

-	bool LocateBar( cbBarInfo* pBarInfo,
+	bool LocateBar( cbBarInfo* pBarInfo, 
 					cbRowInfo**  ppRow,
 					cbDockPane** ppPane );

@@ -481,7 +481,7 @@ public: /* protected really (accessed only by plugins) */
 	cbDockPane* GetBarPane( cbBarInfo* pBar );

 	// delegated from "bar-spy"
-	void ForwardMouseEvent( wxMouseEvent& event,
+	void ForwardMouseEvent( wxMouseEvent& event, 
 							cbDockPane*   pToPane,
 							int           eventType );

@@ -513,8 +513,8 @@ public: /* protected really (accessed only by plugins) */

 /* structure, which is present in each item of layout,
 * it used by any specific updates-manager to store
- * auxilary information to be used by it's specific
- * updating algorithm
+ * auxilary information to be used by it's specific 
+ * updating algorithm 
 */

 class cbUpdateMgrData : public wxObject
@@ -525,7 +525,7 @@ public:

 	bool   mIsDirty;         // overrides result of current-against-previous bounds comparison,
 	                         // i.e. requires item to be updated, regardless of it's current area
-
+	
 	wxObject*  mpCustomData; // any custom data stored by specific updates mgr.

 	cbUpdateMgrData();   // is-dirty flag is set TRUE initially
@@ -540,8 +540,8 @@ public:
 };

 /* Abstract interface for bar-size handler classes.
- * These objects receive notifications, whenever the docking
- * state of the bar is changed, thus they have a possibility
+ * These objects receive notifications, whenever the docking 
+ * state of the bar is changed, thus they have a possibility 
 * to adjust the values in cbDimInfo::mSizes accordingly.
 * Specific handlers can be hooked to specific types of bars.
 */
@@ -590,7 +590,7 @@ public:
 	// from the bar's actual window, filled
 	// with frame's beckground color, default: 0

-	int    mVertGap;
+	int    mVertGap;	

 	// left/right gap, separates decorations
 	// from the bar's actual window, filled
@@ -604,7 +604,7 @@ public:

 	bool   mIsFixed;

-	cbBarDimHandlerBase* mpHandler; // NULL, if no handler present
+	cbBarDimHandlerBase* mpHandler; // NULL, if no handler present 

 public:

@@ -625,18 +625,18 @@ public:
 			   cbBarDimHandlerBase* pDimHandler = NULL
 			 );

-    cbDimInfo( int x, int y,
-               bool isFixed  = TRUE,
-               int  gap = 6,
+    cbDimInfo( int x, int y,  
+               bool isFixed  = TRUE, 
+               int  gap = 6, 
               cbBarDimHandlerBase* pDimHandler = NULL
-             );
+             ); 

 	const cbDimInfo& operator=( const cbDimInfo& other );

 	// destroys handler automatically, if present
 	~cbDimInfo();

-	inline cbBarDimHandlerBase* GetDimHandler() { return mpHandler; }
+	inline cbBarDimHandlerBase* GetDimHandler() { return mpHandler; } 
 };

 WX_DEFINE_ARRAY(float, cbArrayFloat);
@@ -679,7 +679,7 @@ public:

 	// convenience method

-	inline cbBarInfo* GetFirstBar()
+	inline cbBarInfo* GetFirstBar() 

 		{ return mBars.GetCount() ? mBars[0] : NULL; }
 };
@@ -692,20 +692,20 @@ public:
 	wxString      mName;

 	// stores bar's bounds in pane's coordinates
-	wxRect        mBounds;
+	wxRect        mBounds;             

 	// stores precalculated bar's bounds in parent frame's coordinates
-	wxRect        mBoundsInParent;
+	wxRect        mBoundsInParent;     

 	// back-ref to the row, which contains this bar
-	cbRowInfo*    mpRow;
+	cbRowInfo*    mpRow;               

 	// are set up according to the types of the surrounding bars in the row
 	bool          mHasLeftHandle;
 	bool          mHasRightHandle;

 	cbDimInfo     mDimInfo;       // preferred sizes for each, control bar state
-
+								  
 	int           mState;         // (see definition of controlbar states)

 	int           mAlignment;     // alignment of the pane to which this
@@ -721,7 +721,7 @@ public:

 	wxPoint       mPosIfFloated;  // stored last position when bar was in "floated" state
 								  // poistion is stored in parent-window's coordinates
-
+	
 	cbUpdateMgrData mUMgrData;    // info stored for updates-manager

 	cbBarInfo*    mpNext;         // next. bar in the row
@@ -760,14 +760,14 @@ public:

 	void Reset();
 	bool Next(); // TRUE, if next bar is available
-
+	
 	cbBarInfo& BarInfo();

 	// returns reference to currently traversed row
 	cbRowInfo& RowInfo();
 };

-/* structure holds configuration options,
+/* structure holds configuration options, 
 * which are usually the same for all panes in
 * frame layout
 */
@@ -795,16 +795,16 @@ class cbCommonPaneProperties : public wxObject

 	// minimal dimensions for not-fixed bars in this pane (16x16 default)

-	wxSize mMinCBarDim;
+	wxSize mMinCBarDim; 

 	// width/height of resizing sash
-
+	
 	int    mResizeHandleSize;

 	cbCommonPaneProperties(void);
 };

-/* class manages containment and control of control-bars
+/* class manages containment and control of control-bars 
 * along one of the four edges of the parent frame
 */

@@ -822,10 +822,10 @@ public:
 	int             mRightMargin;	 // default: 2 pixels
 	int             mTopMargin;		 // default: 2 pixels
 	int             mBottomMargin;   // default: 2 pixels
-
+	                           
 public:
 	// position of the pane in frame's coordinates
-	wxRect          mBoundsInParent;
+	wxRect          mBoundsInParent; 

 	// pane width and height in pane's coordinates
 	int             mPaneWidth;
@@ -843,7 +843,7 @@ public: /* protected really */

 	// transient properties

-	wxList          mRowShapeData;   // shapes of bars of recently modified row,
+	wxList          mRowShapeData;   // shapes of bars of recently modified row, 
 								     // stored when in "non-destructive-firction" mode
 	cbRowInfo*      mpStoredRow;     // row-info for which the shapes are stored

@@ -859,8 +859,8 @@ public: /* protected really (accessed only by plugins) */
 	int     GetRowAt( int paneY );
 	int     GetRowAt( int upperY, int lowerY );

-	// re-setups flags in the row-information structure, so that
-	// the would match the changed state of row-items correctly
+	// re-setups flags in the row-information structure, so that 
+	// the would match the changed state of row-items correctly 
 	void SyncRowFlags( cbRowInfo* pRow );

 	// layout "AI" helpers:
@@ -886,7 +886,7 @@ public: /* protected really (accessed only by plugins) */
 	void InitLinksForRow( cbRowInfo* pRow );
 	void InitLinksForRows();

-	// coordinate translation between parent's frame and this pane
+	// coordinate translation between parent's frame and this pane 

 	void FrameToPane( int* x, int* y );
 	void PaneToFrame( int* x, int* y );
@@ -904,7 +904,7 @@ public: /* protected really (accessed only by plugins) */

 public: /* protected really (accessed only by plugins) */

-	// methods for incramental on-screen refreshing of the pane
+	// methods for incramental on-screen refreshing of the pane 
 	// (simply, they are wrappers around corresponding plugin-events)

 	virtual void PaintBarDecorations( cbBarInfo* pBar, wxDC& dc );
@@ -941,7 +941,7 @@ public: /* public members */
 	virtual void RemoveBar( cbBarInfo* pBar );

 	// rect given in the parent frame's coordinates
-
+	
 	virtual void InsertBar( cbBarInfo* pBar, const wxRect& atRect );

 	// inserts bar into the given row, with dimensions and position
@@ -949,7 +949,7 @@ public: /* public members */

 	virtual void InsertBar( cbBarInfo* pBar, cbRowInfo* pIntoRow );

-	// inserts bar, sets its position according to the preferred settings
+	// inserts bar, sets its position according to the preferred settings 
 	// given in (*pBarInfo) structure

 	virtual void InsertBar( cbBarInfo* pBarInfo );
@@ -957,7 +957,7 @@ public: /* public members */
 	// does not destroy the row object, only removes the corresponding
 	// node from this pane
 	virtual void RemoveRow( cbRowInfo* pRow );
-
+	
 	// does not refresh the inserted row immediately,
 	// if pBeforeRowNode arg. is NULL, row is appended to the end of pane's row list
 	virtual void InsertRow( cbRowInfo* pRow, cbRowInfo* pBeforeRow );
@@ -975,8 +975,8 @@ public: /* public members */

 	// convenience method

-	inline cbRowInfo* GetFirstRow()
-
+	inline cbRowInfo* GetFirstRow() 
+	
 		{ return mRows.GetCount() ? mRows[0] : NULL; }

 	// TRUE, if the given bar node presents in this pane
@@ -1052,8 +1052,6 @@ public:
 	cbUpdatesManagerBase( wxFrameLayout* pPanel )
 		: mpLayout( pPanel ) {}

-	virtual ~cbUpdatesManagerBase() {}
-
 	void SetLayout( wxFrameLayout* pLayout ) { mpLayout = pLayout; }

 	// notificiactions received from frame-layout (in the order, in which
@@ -1089,7 +1087,7 @@ public:
 	cbDockPane* mpPane; // NULL, if event is not addressed to any specific pane

 	/* OLD STUFF::
-	// FOR NOW FOR NOW:: all-in-one plugin event structure
+	// FOR NOW FOR NOW:: all-in-one plugin event structure 
 	wxNode* mpObjNode;
 	wxNode* mpObjNodeAux;
 	wxPoint mPos;
@@ -1098,18 +1096,15 @@ public:
 	bool    mAuxBoolVal;
 	*/

-	// Not used, but required
-    virtual wxEvent* Clone() const { return NULL; }
-
 #if wxCHECK_VERSION(2,3,0)
 	cbPluginEvent( wxEventType eventType, cbDockPane* pPane )
 		: mpPane( pPane )
-
+		  
 		{ m_eventType = eventType; }
 #else
 	cbPluginEvent( int eventType, cbDockPane* pPane )
 		: mpPane( pPane )
-
+		  
 		{ m_eventType = eventType; }
 #endif
 };
@@ -1163,7 +1158,7 @@ public:

 	#define cbEVT_PL_LEFT_DCLICK         5

-	#define cbEVT_PL_LAYOUT_ROW          6
+	#define cbEVT_PL_LAYOUT_ROW          6 
 	#define cbEVT_PL_RESIZE_ROW          7
 	#define cbEVT_PL_LAYOUT_ROWS         8
 	#define cbEVT_PL_INSERT_BAR          9
@@ -1227,7 +1222,7 @@ class cbCustomizeBarEvent;
 class cbCustomizeLayoutEvent;

 // defs. for handler-methods
-
+ 
 typedef void (wxEvtHandler::*cbLeftDownHandler        )(cbLeftDownEvent&);
 typedef void (wxEvtHandler::*cbLeftUpHandler          )(cbLeftUpEvent&);
 typedef void (wxEvtHandler::*cbRightDownHandler       )(cbRightDownEvent&);
@@ -1269,7 +1264,7 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)
 	#define EVT_PL_RIGHT_UP(func)		     wxEventTableEntry( cbEVT_PL_RIGHT_UP,		     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightUpHandler         ) & func, (wxObject *) NULL ),
 	#define EVT_PL_MOTION(func)			     wxEventTableEntry( cbEVT_PL_MOTION,		         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbMotionHandler          ) & func, (wxObject *) NULL ),
 	#define EVT_PL_LEFT_DCLICK(func)	     wxEventTableEntry( cbEVT_PL_LEFT_DCLICK,		 -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDClickHandler      ) & func, (wxObject *) NULL ),
-
+																																						 
 	#define EVT_PL_LAYOUT_ROW(func)		     wxEventTableEntry( cbEVT_PL_LAYOUT_ROW,	         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowHandler       ) & func, (wxObject *) NULL ),
 	#define EVT_PL_RESIZE_ROW(func)		     wxEventTableEntry( cbEVT_PL_RESIZE_ROW,	         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeRowHandler       ) & func, (wxObject *) NULL ),
 	#define EVT_PL_LAYOUT_ROWS(func)	     wxEventTableEntry( cbEVT_PL_LAYOUT_ROWS,	     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowsHandler      ) & func, (wxObject *) NULL ),
@@ -1277,7 +1272,7 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)
 	#define EVT_PL_RESIZE_BAR(func)		     wxEventTableEntry( cbEVT_PL_RESIZE_BAR,	         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeBarHandler       ) & func, (wxObject *) NULL ),
 	#define EVT_PL_REMOVE_BAR(func)		     wxEventTableEntry( cbEVT_PL_REMOVE_BAR,	         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRemoveBarHandler       ) & func, (wxObject *) NULL ),
 	#define EVT_PL_SIZE_BAR_WND(func)	     wxEventTableEntry( cbEVT_PL_SIZE_BAR_WND,	     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbSizeBarWndHandler      ) & func, (wxObject *) NULL ),
-
+																																						 
 	#define EVT_PL_DRAW_BAR_DECOR(func)      wxEventTableEntry( cbEVT_PL_DRAW_BAR_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarDecorHandler    ) & func, (wxObject *) NULL ),
 	#define EVT_PL_DRAW_ROW_DECOR(func)      wxEventTableEntry( cbEVT_PL_DRAW_ROW_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowDecorHandler    ) & func, (wxObject *) NULL ),
 	#define EVT_PL_DRAW_PANE_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_PANE_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneDecorHandler   ) & func, (wxObject *) NULL ),
@@ -1285,7 +1280,7 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)
 	#define EVT_PL_DRAW_ROW_HANDLES(func)    wxEventTableEntry( cbEVT_PL_DRAW_ROW_HANDLES,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowHandlesHandler  ) & func, (wxObject *) NULL ),
 	#define EVT_PL_DRAW_ROW_BKGROUND(func)   wxEventTableEntry( cbEVT_PL_DRAW_ROW_BKGROUND,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowBkGroundHandler ) & func, (wxObject *) NULL ),
 	#define EVT_PL_DRAW_PANE_BKGROUND(func)  wxEventTableEntry( cbEVT_PL_DRAW_PANE_BKGROUND,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneBkGroundHandler) & func, (wxObject *) NULL ),
-
+																																						 
 	#define EVT_PL_START_BAR_DRAGGING(func)  wxEventTableEntry( cbEVT_PL_START_BAR_DRAGGING,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartBarDraggingHandler) & func, (wxObject *) NULL ),
 	#define EVT_PL_DRAW_HINT_RECT(func)      wxEventTableEntry( cbEVT_PL_DRAW_HINT_RECT,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawHintRectHandler    ) & func, (wxObject *) NULL ),

@@ -1302,7 +1297,7 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)
 	#define EVT_PL_RIGHT_UP(func)		     { cbEVT_PL_RIGHT_UP,		     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightUpHandler         ) & func },
 	#define EVT_PL_MOTION(func)			     { cbEVT_PL_MOTION,		         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbMotionHandler          ) & func },
 	#define EVT_PL_LEFT_DCLICK(func)	     { cbEVT_PL_LEFT_DCLICK,		 -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDClickHandler      ) & func },
-
+																																						 
 	#define EVT_PL_LAYOUT_ROW(func)		     { cbEVT_PL_LAYOUT_ROW,	         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowHandler       ) & func },
 	#define EVT_PL_RESIZE_ROW(func)		     { cbEVT_PL_RESIZE_ROW,	         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeRowHandler       ) & func },
 	#define EVT_PL_LAYOUT_ROWS(func)	     { cbEVT_PL_LAYOUT_ROWS,	     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowsHandler      ) & func },
@@ -1310,7 +1305,7 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)
 	#define EVT_PL_RESIZE_BAR(func)		     { cbEVT_PL_RESIZE_BAR,	         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeBarHandler       ) & func },
 	#define EVT_PL_REMOVE_BAR(func)		     { cbEVT_PL_REMOVE_BAR,	         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRemoveBarHandler       ) & func },
 	#define EVT_PL_SIZE_BAR_WND(func)	     { cbEVT_PL_SIZE_BAR_WND,	     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbSizeBarWndHandler      ) & func },
-
+																																						 
 	#define EVT_PL_DRAW_BAR_DECOR(func)      { cbEVT_PL_DRAW_BAR_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarDecorHandler    ) & func },
 	#define EVT_PL_DRAW_ROW_DECOR(func)      { cbEVT_PL_DRAW_ROW_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowDecorHandler    ) & func },
 	#define EVT_PL_DRAW_PANE_DECOR(func)     { cbEVT_PL_DRAW_PANE_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneDecorHandler   ) & func },
@@ -1318,7 +1313,7 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)
 	#define EVT_PL_DRAW_ROW_HANDLES(func)    { cbEVT_PL_DRAW_ROW_HANDLES,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowHandlesHandler  ) & func },
 	#define EVT_PL_DRAW_ROW_BKGROUND(func)   { cbEVT_PL_DRAW_ROW_BKGROUND,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowBkGroundHandler ) & func },
 	#define EVT_PL_DRAW_PANE_BKGROUND(func)  { cbEVT_PL_DRAW_PANE_BKGROUND,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneBkGroundHandler) & func },
-
+																																						 
 	#define EVT_PL_START_BAR_DRAGGING(func)  { cbEVT_PL_START_BAR_DRAGGING,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartBarDraggingHandler) & func },
 	#define EVT_PL_DRAW_HINT_RECT(func)      { cbEVT_PL_DRAW_HINT_RECT,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawHintRectHandler    ) & func },

@@ -1328,8 +1323,8 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)
 	#define EVT_PL_CUSTOMIZE_BAR(func)       { cbEVT_PL_CUSTOMIZE_BAR,       -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbCustomizeBarHandler)     & func },
 	#define EVT_PL_CUSTOMIZE_LAYOUT(func)    { cbEVT_PL_CUSTOMIZE_LAYOUT,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbCustomizeLayoutHandler)  & func },
 #endif
-/*
- * abstract base class for all control-bar related plugins
+/* 
+ * abstract base class for all control-bar related plugins 
 */

 class cbPluginBase : public wxEvtHandler
@@ -1337,23 +1332,23 @@ class cbPluginBase : public wxEvtHandler
 	DECLARE_ABSTRACT_CLASS( cbPluginBase )
 public:

-	wxFrameLayout* mpLayout; // back-reference to the frame layout
+	wxFrameLayout* mpLayout; // back-reference to the frame layout 

 	// specifies panes, for which this plugin receives events
 	// (see pane masks definitions)
-	int            mPaneMask;
+	int            mPaneMask; 

 	bool           mIsReady; // is TRUE, when plugin is ready to handle events

 public:
-	cbPluginBase(void)
+	cbPluginBase(void) 

 		: mpLayout  ( 0 ),
 		  mPaneMask( wxALL_PANES ),
 		  mIsReady ( FALSE )
 	{}

-	cbPluginBase( wxFrameLayout* pPanel, int paneMask = wxALL_PANES )
+	cbPluginBase( wxFrameLayout* pPanel, int paneMask = wxALL_PANES ) 

 		: mpLayout  ( pPanel ),
 		  mPaneMask( paneMask ),
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -116,17 +116,17 @@ public:
 	// overridables

 	virtual void AddTool( int toolIndex, 
-                              wxWindow* pToolWindow, 
-                              const wxSize& size = wxDefaultSize );
+						  wxWindow* pToolWindow, 
+						  const wxSize& size = wxDefaultSize );

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

 	// method from wxToolBarBase (for compatibility), only
 	// first two arguments are valid
--- a/contrib/include/wx/fl/newbmpbtn.h
+++ b/contrib/include/wx/fl/newbmpbtn.h
@@ -50,7 +50,7 @@ protected:

 	wxString mLabelText;
 	wxString mImageFileName;
-	wxBitmapType mImageFileType;
+	int      mImageFileType;

 	wxBitmap mDepressedBmp; // source image for rendering
 	                        // labels for particular state
@@ -114,17 +114,17 @@ public:
 	// use this constructor if buttons have to be persistant 
 	 
 	wxNewBitmapButton( const wxString& bitmapFileName,
-                           const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,
-                           const wxString& labelText      = "",
-                           int alignText                  = NB_ALIGN_TEXT_BOTTOM,
-                           bool  isFlat                   = TRUE,
-                           // this is the default type of fired events
-                           int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
-                           int marginX        = 2,
-                           int marginY        = 2,
-                           int textToLabelGap = 2,
-                           bool isSticky      = FALSE
-                             );
+		               const int       bitmapFileType = wxBITMAP_TYPE_BMP,
+					   const wxString& labelText      = "",
+		               int alignText                  = NB_ALIGN_TEXT_BOTTOM,
+					   bool  isFlat                   = TRUE,
+					   // this is the default type of fired events
+					   int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
+					   int marginX        = 2,
+	                   int marginY        = 2,
+					   int textToLabelGap = 2,
+					   bool isSticky      = FALSE
+		             );

 	~wxNewBitmapButton();

--- a/contrib/include/wx/gizmos/dynamicsash.h
+++ b/contrib/include/wx/gizmos/dynamicsash.h
@@ -13,13 +13,6 @@
 #ifndef _WX_DYNAMICSASH_H_
 #define _WX_DYNAMICSASH_H_

-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
-
 /*

    wxDynamicSashWindow
@@ -51,7 +44,7 @@
    for instance, you wish to scroll a subwindow of the view you add to
    your wxDynamicSashWindow object, rather than scrolling the whole view.)
    In this case, you will need to construct your wxDynamicSashWindow without
-    the wxDS_MANAGE_SCROLLBARS style and  you will need to use the
+    the wxMANAGE_SCROLLBARS style and  you will need to use the
    GetHScrollBar() and GetVScrollBar() methods to retrieve the scrollbar
    controls and call SetEventHanler() on them to redirect the scrolling
    events whenever your window is reparented by wxDyanmicSashWindow.
@@ -80,19 +73,11 @@ class wxScrollBar;


 /*
-    wxDS_MANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
+    wxMANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
    will cause it to respond to scrollbar events for your application by
    automatically scrolling the child view.
 */
-#define wxDS_MANAGE_SCROLLBARS  0x0010
-
-
-/*
-  wxDS_DRAG_CORNER style indicates that the views can also be resized by
-  dragging the corner piece between the scrollbars, and which is reflected up
-  to the frame if necessary.
-*/
-#define wxDS_DRAG_CORNER        0x0020
+#define wxMANAGE_SCROLLBARS     0x00800000


 /*
@@ -102,14 +87,11 @@ class wxScrollBar;
    a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
    automatically reparent it to the proper place in its window hierarchy.
 */
-class GIZMODLLEXPORT wxDynamicSashSplitEvent : public wxCommandEvent {
+class wxDynamicSashSplitEvent : public wxCommandEvent {
 public:
    wxDynamicSashSplitEvent();
-    wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { }
    wxDynamicSashSplitEvent(wxObject *target);

-    virtual wxEvent* Clone() const { return new wxDynamicSashSplitEvent(*this); }
-
 private:
    DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent)
 };
@@ -124,14 +106,11 @@ private:
    the scrollbars' event handlers connected to your view's event handler
    class.
 */
-class GIZMODLLEXPORT wxDynamicSashUnifyEvent : public wxCommandEvent {
+class wxDynamicSashUnifyEvent : public wxCommandEvent {
 public:
    wxDynamicSashUnifyEvent();
-    wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}
    wxDynamicSashUnifyEvent(wxObject *target);

-    virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
-
 private:
    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
 };
@@ -139,18 +118,18 @@ private:
 /*
    wxDynamicSashWindow.  See above.
 */
-class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow {
+class 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,
+                        long style = wxCLIP_CHILDREN | wxMANAGE_SCROLLBARS,
                        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,
+                        long style = wxCLIP_CHILDREN | wxMANAGE_SCROLLBARS,
                        const wxString& name = "dynamicSashWindow");
    virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
    virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;
--- a/contrib/include/wx/gizmos/editlbox.h
+++ b/contrib/include/wx/gizmos/editlbox.h
@@ -17,21 +17,15 @@

 #include "wx/panel.h"

-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-

 class WXDLLEXPORT wxBitmapButton;
 class WXDLLEXPORT wxListCtrl;
 class WXDLLEXPORT wxListEvent;
-
+               
 // This class provides a composite control that lets the
 // user easily enter list of strings

-class GIZMODLLEXPORT wxEditableListBox : public wxPanel
+class WXDLLEXPORT wxEditableListBox : public wxPanel
 {
 	DECLARE_CLASS(wxEditableListBox);

--- a/contrib/include/wx/gizmos/ledctrl.h
+++ b/contrib/include/wx/gizmos/ledctrl.h
@@ -1,89 +0,0 @@
-#ifndef _WX_LEDNUMBERCTRL_H_
-#define _WX_LEDNUMBERCTRL_H_
-
-#ifdef __GNUG__
-    #pragma interface "wxLEDNumberCtrl.h"
-#endif
-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
-
-#include <wx/window.h>
-#include <wx/control.h>
-
-class wxEraseEvent;
-class wxPaintEvent;
-class wxSizeEvent;
-
-// ----------------------------------------------------------------------------
-// enum and styles
-// ----------------------------------------------------------------------------
-
-enum wxLEDValueAlign
-{
-    wxLED_ALIGN_LEFT   = 0x01,
-    wxLED_ALIGN_RIGHT  = 0x02,
-    wxLED_ALIGN_CENTER = 0x04,
-
-    wxLED_ALIGN_MASK   = 0x04
-};
-
-#define wxLED_DRAW_FADED 0x08
-
-// ----------------------------------------------------------------------------
-// wxLEDNumberCtrl
-// ----------------------------------------------------------------------------
-
-class GIZMODLLEXPORT wxLEDNumberCtrl :	public wxControl
-{
-public:
-    // Constructors.
-    wxLEDNumberCtrl();
-    wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);
-
-    // Create functions.
-    bool Create(wxWindow *parent, wxWindowID id = -1,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = 0);
-
-    wxLEDValueAlign GetAlignment() const { return m_Alignment; }
-    bool GetDrawFaded() const { return m_DrawFaded; }
-    const wxString &GetValue() const { return m_Value; }
-
-    void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = TRUE);
-    void SetDrawFaded(bool DrawFaded, bool Redraw = TRUE);
-    void SetValue(const wxString &Value, bool Redraw = TRUE);
-
-private:
-    // Members.
-    wxString m_Value;
-    wxLEDValueAlign m_Alignment;
-
-    int m_LineMargin;
-    int m_DigitMargin;
-    int m_LineLength;
-    int m_LineWidth;
-    bool m_DrawFaded;
-    int m_LeftStartPos;
-
-    // Functions.
-    void DrawDigit(wxDC &Dc, int Digit, int Column);
-    void RecalcInternals(const wxSize &CurrentSize);
-
-    // Events.
-    DECLARE_EVENT_TABLE()
-
-    void OnEraseBackground(wxEraseEvent &Event);
-    void OnPaint(wxPaintEvent &Event);
-    void OnSize(wxSizeEvent &Event);
-};
-
-#endif
--- a/contrib/include/wx/gizmos/multicell.h
+++ b/contrib/include/wx/gizmos/multicell.h
@@ -19,14 +19,6 @@
 	#pragma interface "multicell.h"
 #endif

-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -53,7 +45,7 @@ enum wxResizable
 // wxMultiCellItemHandle
 //---------------------------------------------------------------------------

-class GIZMODLLEXPORT wxMultiCellItemHandle: public wxObject
+class WXDLLEXPORT wxMultiCellItemHandle: public wxObject
 {
 	DECLARE_CLASS(wxMultiCellItemHandle);
 protected:
@@ -89,7 +81,7 @@ private:
 // wxMultiCellSizer
 //---------------------------------------------------------------------------

-class GIZMODLLEXPORT wxMultiCellSizer : virtual public wxSizer
+class WXDLLEXPORT wxMultiCellSizer : virtual public wxSizer
 {
 	DECLARE_CLASS(wxMultiCellSizer);

@@ -139,7 +131,7 @@ class wxCell;
 // wxMultiCellCanvas
 //---------------------------------------------------------------------------

-class GIZMODLLEXPORT wxMultiCellCanvas : public wxFlexGridSizer
+class wxMultiCellCanvas : public wxFlexGridSizer
 {
 public:
 	wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);
--- a/contrib/include/wx/gizmos/splittree.h
+++ b/contrib/include/wx/gizmos/splittree.h
@@ -15,13 +15,7 @@
 #define _WX_SPLITTREE_H_

 #ifdef __GNUG__
-    #pragma interface "splittree.h"
-#endif
-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
+	#pragma interface "splittree.h"
 #endif

 // Set this to 1 to use generic tree control (doesn't yet work properly)
@@ -52,19 +46,18 @@ class wxSplitterScrolledWindow;
 * It also updates the scrolled window vertical scrollbar as appropriate.
 */

-class GIZMODLLEXPORT wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
+class wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
 {
-    DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
+	DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
 public:
    wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
        const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
-    ~wxRemotelyScrolledTreeCtrl();
+	~wxRemotelyScrolledTreeCtrl();

 //// Events
-    void OnSize(wxSizeEvent& event);
-    void OnExpand(wxTreeEvent& event);
+	void OnSize(wxSizeEvent& event);
+	void OnExpand(wxTreeEvent& event);
    void OnScroll(wxScrollWinEvent& event);
-    void OnPaint(wxPaintEvent& event);

 //// Overrides
    // Override this in case we're using the generic tree control.
@@ -89,18 +82,18 @@ public:
    virtual int GetScrollPos(int orient) const;

 //// Helpers
-    void HideVScrollbar();
+	void HideVScrollbar();

-    // Calculate the tree overall size so we can set the scrollbar
-    // correctly
-    void CalcTreeSize(wxRect& rect);
-    void CalcTreeSize(const wxTreeItemId& id, wxRect& rect);
+	// Calculate the tree overall size so we can set the scrollbar
+	// correctly
+	void CalcTreeSize(wxRect& rect);
+	void CalcTreeSize(const wxTreeItemId& id, wxRect& rect);

-    // Adjust the containing wxScrolledWindow's scrollbars appropriately
-    void AdjustRemoteScrollbars();
+	// Adjust the containing wxScrolledWindow's scrollbars appropriately
+	void AdjustRemoteScrollbars();

-    // Find the scrolled window that contains this control
-    wxScrolledWindow* GetScrolledWindow() const;
+	// Find the scrolled window that contains this control
+	wxScrolledWindow* GetScrolledWindow() const;

    // Scroll to the given line (in scroll units where each unit is
    // the height of an item)
@@ -108,16 +101,15 @@ public:

 //// Accessors

-    // The companion window is one which will get notified when certain
-    // events happen such as node expansion
-    void SetCompanionWindow(wxWindow* companion) { m_companionWindow = companion; }
-    wxWindow* GetCompanionWindow() const { return m_companionWindow; }
+	// The companion window is one which will get notified when certain
+	// events happen such as node expansion
+	void SetCompanionWindow(wxWindow* companion) { m_companionWindow = companion; }
+	wxWindow* GetCompanionWindow() const { return m_companionWindow; }


    DECLARE_EVENT_TABLE()
 protected:
-    wxWindow*   m_companionWindow;
-    bool        m_drawRowLines;
+	wxWindow*	m_companionWindow;
 };

 /*
@@ -126,7 +118,7 @@ protected:
 * A window displaying values associated with tree control items.
 */

-class GIZMODLLEXPORT wxTreeCompanionWindow: public wxWindow
+class wxTreeCompanionWindow: public wxWindow
 {
 public:
    DECLARE_CLASS(wxTreeCompanionWindow)
@@ -137,22 +129,22 @@ public:
      long style = 0);

 //// Overrides
-    virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect);
+	virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect);

 //// Events
-    void OnPaint(wxPaintEvent& event);
+	void OnPaint(wxPaintEvent& event);    
    void OnScroll(wxScrollWinEvent& event);
-    void OnExpand(wxTreeEvent& event);
+	void OnExpand(wxTreeEvent& event);

 //// Operations

 //// Accessors
-    wxRemotelyScrolledTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; };
-    void SetTreeCtrl(wxRemotelyScrolledTreeCtrl* treeCtrl) { m_treeCtrl = treeCtrl; }
+	wxRemotelyScrolledTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; };
+	void SetTreeCtrl(wxRemotelyScrolledTreeCtrl* treeCtrl) { m_treeCtrl = treeCtrl; }

 //// Data members
 protected:
-    wxRemotelyScrolledTreeCtrl* m_treeCtrl;
+	wxRemotelyScrolledTreeCtrl*	m_treeCtrl;

    DECLARE_EVENT_TABLE()
 };
@@ -165,7 +157,7 @@ protected:
 * than the usual one.
 */

-class GIZMODLLEXPORT wxThinSplitterWindow: public wxSplitterWindow
+class wxThinSplitterWindow: public wxSplitterWindow
 {
 public:
    DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)
@@ -181,10 +173,10 @@ public:
    // Tests for x, y over sash. Overriding this allows us to increase
    // the tolerance.
    bool SashHitTest(int x, int y, int tolerance = 2);
-    void DrawSash(wxDC& dc);
+	void DrawSash(wxDC& dc);

 //// Events
-
+    
    void OnSize(wxSizeEvent& event);

 //// Operations
@@ -205,7 +197,7 @@ protected:
 * scroll appropriately.
 */

-class GIZMODLLEXPORT wxSplitterScrolledWindow: public wxScrolledWindow
+class wxSplitterScrolledWindow: public wxScrolledWindow
 {
 public:
    DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)
@@ -218,7 +210,7 @@ public:
 //// Overrides

 //// Events
-
+    
    void OnScroll(wxScrollWinEvent& event);
    void OnSize(wxSizeEvent& event);

--- a/contrib/include/wx/net/email.h
+++ b/contrib/include/wx/net/email.h
@@ -33,8 +33,7 @@ public:

    // Send a message.
    // Specify profile, or leave it to wxWindows to find the current user name
-    static bool Send(wxMailMessage& message, const wxString& profileName = wxEmptyString,
-        const wxString& sendMail = wxT("/usr/lib/sendmail -t"));
+    static bool Send(wxMailMessage& message, const wxString& profileName = wxEmptyString );
    
 protected:
 };
--- a/contrib/include/wx/net/msg.h
+++ b/contrib/include/wx/net/msg.h
@@ -27,14 +27,12 @@ public:

    // A common usage
    wxMailMessage(const wxString& subject, const wxString& to,
-        const wxString& body, const wxString& from = wxEmptyString,
-        const wxString& attachment = wxEmptyString,
+        const wxString& body, const wxString& attachment = wxEmptyString,
        const wxString& attachmentTitle = wxEmptyString)
    {
        m_to.Add(to);
        m_subject = subject;
        m_body = body;
-        m_from = from;
        if (!attachment.IsEmpty())
        {
            m_attachments.Add(attachment);
@@ -54,11 +52,9 @@ public:

    void SetSubject(const wxString& subject) { m_subject = subject; }
    void SetBody(const wxString& body) { m_body = body; }
-    void SetFrom(const wxString& from) { m_from = from; }

 public:
    wxArrayString  m_to;               //The To: Recipients
-    wxString       m_from;             //The From: email address (optional)
    wxArrayString  m_cc;               //The CC: Recipients
    wxArrayString  m_bcc;              //The BCC Recipients
    wxString       m_subject;         //The Subject of the message
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -124,7 +124,7 @@ class WXDLLEXPORT wxExprDatabase;



-class wxShapeEvtHandler: public wxObject, public wxClientDataContainer
+class wxShapeEvtHandler: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxShapeEvtHandler)

@@ -299,6 +299,8 @@ class wxShape: public wxShapeEvtHandler

  void SetPen(wxPen *pen);
  void SetBrush(wxBrush *brush);
+  inline void SetClientData(wxObject *client_data) { m_clientData = client_data; };
+  inline wxObject *GetClientData() const { return m_clientData; };

  virtual void Show(bool show);
  virtual bool IsShown() const { return m_visible; }
@@ -513,10 +515,8 @@ class wxShape: public wxShapeEvtHandler
  // Clears points from a list of wxRealPoints
  void ClearPointList(wxList& list);

-  // Return pen or brush of the right colour for the background
-  wxPen GetBackgroundPen();
-  wxBrush GetBackgroundBrush();
-
+ private:
+  wxObject*             m_clientData;

 protected:
  wxShapeEvtHandler*    m_eventHandler;
--- a/contrib/include/wx/ogl/misc.h
+++ b/contrib/include/wx/ogl/misc.h
@@ -53,20 +53,20 @@ void oglDrawFormattedText(wxDC& context, wxList *text_list,
 // Give it a list of points, finds the centre.
 void oglFindPolylineCentroid(wxList *points, double *x, double *y);

-void oglCheckLineIntersection(double x1, double y1, double x2, double y2,
+void oglCheckLineIntersection(double x1, double y1, double x2, double y2, 
                             double x3, double y3, double x4, double y4,
                             double *ratio1, double *ratio2);

-void oglFindEndForPolyline(double n, double xvec[], double yvec[],
+void oglFindEndForPolyline(double n, double xvec[], double yvec[], 
                           double x1, double y1, double x2, double y2, double *x3, double *y3);


-void oglFindEndForBox(double width, double height,
+void oglFindEndForBox(double width, double height, 
                      double x1, double y1,         // Centre of box (possibly)
                      double x2, double y2,         // other end of line
                      double *x3, double *y3);      // End on box edge

-void oglFindEndForCircle(double radius,
+void oglFindEndForCircle(double radius, 
                         double x1, double y1,  // Centre of circle
                         double x2, double y2,  // Other end of line
                         double *x3, double *y3);
@@ -83,7 +83,7 @@ void oglGetArrowPoints(double x1, double y1, double x2, double y2,
 * This function assumes that the centre of the ellipse is at x1, y1, and the
 * ellipse has a width of a1 and a height of b1. It also assumes you are
 * wanting to draw an arc FROM point x2, y2 TOWARDS point x3, y3.
- * This function calculates the x,y coordinates of the intersection point of
+ * This function calculates the x,y coordinates of the intersection point of 
 * the arc with the ellipse.
 * Author: Ian Harrison
 */
@@ -99,6 +99,7 @@ extern wxPen*           g_oglWhiteBackgroundPen;
 extern wxPen*           g_oglTransparentPen;
 extern wxBrush*         g_oglWhiteBackgroundBrush;
 extern wxPen*           g_oglBlackForegroundPen;
+extern wxCursor*        g_oglBullseyeCursor;

 extern wxFont*          oglMatchFont(int point_size);

--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -22,7 +22,6 @@


 #include <wx/wx.h>
-#include <wx/dnd.h>

 //----------------------------------------------------------------------
 // BEGIN generated section.  The following code is automatically generated
@@ -73,7 +72,6 @@
 #define wxSTC_MARK_CIRCLEPLUSCONNECTED 19
 #define wxSTC_MARK_CIRCLEMINUS 20
 #define wxSTC_MARK_CIRCLEMINUSCONNECTED 21
-#define wxSTC_MARK_CHARACTER 10000

 // Markers used for outlining column
 #define wxSTC_MARKNUM_FOLDEREND 25
@@ -85,16 +83,12 @@
 #define wxSTC_MARKNUM_FOLDEROPEN 31
 #define wxSTC_MARGIN_SYMBOL 0
 #define wxSTC_MARGIN_NUMBER 1
-
-// Styles in range 32..37 are predefined for parts of the UI and are not used as normal styles.
-// Styles 38 and 39 are for future use.
 #define wxSTC_STYLE_DEFAULT 32
 #define wxSTC_STYLE_LINENUMBER 33
 #define wxSTC_STYLE_BRACELIGHT 34
 #define wxSTC_STYLE_BRACEBAD 35
 #define wxSTC_STYLE_CONTROLCHAR 36
 #define wxSTC_STYLE_INDENTGUIDE 37
-#define wxSTC_STYLE_LASTPREDEFINED 39
 #define wxSTC_STYLE_MAX 127

 // Character set identifiers are used in StyleSetCharacterSet.
@@ -301,7 +295,6 @@
 #define wxSTC_LEX_EIFFEL 23
 #define wxSTC_LEX_EIFFELKW 24
 #define wxSTC_LEX_TCL 25
-#define wxSTC_LEX_NNCRONTAB 26

 // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 // value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -341,8 +334,6 @@
 #define wxSTC_C_REGEX 14
 #define wxSTC_C_COMMENTLINEDOC 15
 #define wxSTC_C_WORD2 16
-#define wxSTC_C_COMMENTDOCKEYWORD 17
-#define wxSTC_C_COMMENTDOCKEYWORDERROR 18

 // Lexical states for SCLEX_HTML, SCLEX_XML
 #define wxSTC_H_DEFAULT 0
@@ -374,17 +365,7 @@
 #define wxSTC_H_XCCOMMENT 20

 // SGML
-#define wxSTC_H_SGML_DEFAULT 21
-#define wxSTC_H_SGML_COMMAND 22
-#define wxSTC_H_SGML_1ST_PARAM 23
-#define wxSTC_H_SGML_DOUBLESTRING 24
-#define wxSTC_H_SGML_SIMPLESTRING 25
-#define wxSTC_H_SGML_ERROR 26
-#define wxSTC_H_SGML_SPECIAL 27
-#define wxSTC_H_SGML_ENTITY 28
-#define wxSTC_H_SGML_COMMENT 29
-#define wxSTC_H_SGML_1ST_PARAM_COMMENT 30
-#define wxSTC_H_SGML_BLOCK_DEFAULT 31
+#define wxSTC_H_SGML 21

 // Embedded Javascript
 #define wxSTC_HJ_START 40
@@ -623,19 +604,6 @@
 #define wxSTC_EIFFEL_IDENTIFIER 7
 #define wxSTC_EIFFEL_STRINGEOL 8

-// Lexical states for the SCLEX_NNCRONTAB (nnCron crontab Lexer)
-#define wxSTC_NNCRONTAB_DEFAULT 0
-#define wxSTC_NNCRONTAB_COMMENT 1
-#define wxSTC_NNCRONTAB_TASK 2
-#define wxSTC_NNCRONTAB_SECTION 3
-#define wxSTC_NNCRONTAB_KEYWORD 4
-#define wxSTC_NNCRONTAB_MODIFIER 5
-#define wxSTC_NNCRONTAB_ASTERISK 6
-#define wxSTC_NNCRONTAB_NUMBER 7
-#define wxSTC_NNCRONTAB_STRING 8
-#define wxSTC_NNCRONTAB_ENVIRONMENT 9
-#define wxSTC_NNCRONTAB_IDENTIFIER 10
-
 // END of generated section
 //----------------------------------------------------------------------
 // Others
@@ -663,8 +631,6 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const char* name = "styledtext");
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-
 #else
    wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
                     const wxPoint& pos = wxDefaultPosition,
@@ -768,11 +734,7 @@ public:

    // Retrieve the text of the line containing the caret.
    // Returns the index of the caret on the line.
-    #ifdef SWIG
-    wxString GetCurLine(int* OUTPUT);
-#else
-    wxString GetCurLine(int* linePos=NULL);
-#endif
+    wxString GetCurLine(int* OUTPUT=NULL);

    // Retrieve the position of the last correctly styled character.
    int GetEndStyled();
@@ -1255,12 +1217,10 @@ public:
    int GetTargetEnd();

    // Replace the target text with the argument text.
-    // Text is counted so it can contain nulls.
    // Returns the length of the replacement text.
    int ReplaceTarget(const wxString& text);

    // Replace the target text with the argument text after \d processing.
-    // Text is counted so it can contain nulls.
    // Looks for \d where d is between 1 and 9 and replaces these with the strings
    // matched in the last search operation which were surrounded by \( and \).
    // Returns the length of the replacement text including any change
@@ -1268,7 +1228,7 @@ public:
    int ReplaceTargetRE(const wxString& text);

    // Search for a counted string in the target and set the target to the found
-    // range. Text is counted so it can contain nulls.
+    // range.
    // Returns length of range or -1 for failure in which case target is not moved.
    int SearchInTarget(const wxString& text);

@@ -1457,10 +1417,10 @@ public:
    int GetModEventMask();

    // Change internal focus flag
-    void SetSTCFocus(bool focus);
+    void SetFocus(bool focus);

    // Get internal focus flag
-    bool GetSTCFocus();
+    bool GetFocus();

    // Change error status - 0 = OK
    void SetStatus(int statusCode);
@@ -1594,14 +1554,6 @@ public:
    // Send a message to Scintilla
    long SendMsg(int msg, long wp=0, long lp=0);

-
-    // Set the vertical scrollbar to use instead of the ont that's built-in.
-    void SetVScrollBar(wxScrollBar* bar) { m_vScrollBar = bar; }
-
-
-    // Set the horizontal scrollbar to use instead of the ont that's built-in.
-    void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
-
 //----------------------------------------------------------------------


@@ -1610,12 +1562,10 @@ private:
    // Event handlers
    void OnPaint(wxPaintEvent& evt);
    void OnScrollWin(wxScrollWinEvent& evt);
-    void OnScroll(wxScrollEvent& evt);
    void OnSize(wxSizeEvent& evt);
    void OnMouseLeftDown(wxMouseEvent& evt);
    void OnMouseMove(wxMouseEvent& evt);
    void OnMouseLeftUp(wxMouseEvent& evt);
-    void OnMouseRightUp(wxMouseEvent& evt);
    void OnContextMenu(wxContextMenuEvent& evt);
    void OnMouseWheel(wxMouseEvent& evt);
    void OnChar(wxKeyEvent& evt);
@@ -1632,17 +1582,13 @@ private:
    void NotifyChange();
    void NotifyParent(SCNotification* scn);

-
 private:
    DECLARE_EVENT_TABLE()
    DECLARE_CLASS(wxStyledTextCtrl)

    ScintillaWX*        m_swx;
    wxStopWatch         m_stopWatch;
-    wxScrollBar*        m_vScrollBar;
-    wxScrollBar*        m_hScrollBar;

-    bool                m_lastKeyDownConsumed;

    friend class ScintillaWX;
    friend class Platform;
@@ -1654,33 +1600,25 @@ private:
 class wxStyledTextEvent : public wxCommandEvent {
 public:
    wxStyledTextEvent(wxEventType commandType=0, int id=0);
-#ifndef SWIG
-    wxStyledTextEvent(const wxStyledTextEvent& event);
-#endif
    ~wxStyledTextEvent() {}

-    void SetPosition(int pos)             { m_position = pos; }
-    void SetKey(int k)                    { m_key = k; }
-    void SetModifiers(int m)              { m_modifiers = m; }
-    void SetModificationType(int t)       { m_modificationType = t; }
-    void SetText(const char* t)           { m_text = t; }
-    void SetLength(int len)               { m_length = len; }
-    void SetLinesAdded(int num)           { m_linesAdded = num; }
-    void SetLine(int val)                 { m_line = val; }
-    void SetFoldLevelNow(int val)         { m_foldLevelNow = val; }
-    void SetFoldLevelPrev(int val)        { m_foldLevelPrev = val; }
-    void SetMargin(int val)               { m_margin = val; }
-    void SetMessage(int val)              { m_message = val; }
-    void SetWParam(int val)               { m_wParam = val; }
-    void SetLParam(int val)               { m_lParam = val; }
-    void SetListType(int val)             { m_listType = val; }
-    void SetX(int val)                    { m_x = val; }
-    void SetY(int val)                    { m_y = val; }
-#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
-    void SetDragText(const wxString& val) { m_dragText = val; }
-    void SetDragAllowMove(bool val)       { m_dragAllowMove = val; }
-    void SetDragResult(wxDragResult val)  { m_dragResult = val; }
-#endif
+    void SetPosition(int pos)        { m_position = pos; }
+    void SetKey(int k)               { m_key = k; }
+    void SetModifiers(int m)         { m_modifiers = m; }
+    void SetModificationType(int t)  { m_modificationType = t; }
+    void SetText(const char* t)      { m_text = t; }
+    void SetLength(int len)          { m_length = len; }
+    void SetLinesAdded(int num)      { m_linesAdded = num; }
+    void SetLine(int val)            { m_line = val; }
+    void SetFoldLevelNow(int val)    { m_foldLevelNow = val; }
+    void SetFoldLevelPrev(int val)   { m_foldLevelPrev = val; }
+    void SetMargin(int val)          { m_margin = val; }
+    void SetMessage(int val)         { m_message = val; }
+    void SetWParam(int val)          { m_wParam = val; }
+    void SetLParam(int val)          { m_lParam = val; }
+    void SetListType(int val)        { m_listType = val; }
+    void SetX(int val)               { m_x = val; }
+    void SetY(int val)               { m_y = val; }

    int  GetPosition() const         { return m_position; }
    int  GetKey()  const             { return m_key; }
@@ -1699,17 +1637,12 @@ public:
    int  GetListType() const         { return m_listType; }
    int  GetX() const                { return m_x; }
    int  GetY() const                { return m_y; }
-#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
-    wxString GetDragText()           { return m_dragText; }
-    bool GetDragAllowMove()          { return m_dragAllowMove; }
-    wxDragResult GetDragResult()     { return m_dragResult; }
-#endif

    bool GetShift() const;
    bool GetControl() const;
    bool GetAlt() const;

-    virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
+    void CopyObject(wxObject& obj) const;

 #ifndef SWIG
 private:
@@ -1736,13 +1669,6 @@ private:
    int m_listType;
    int m_x;
    int m_y;
-
-#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
-    wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
-    bool     m_dragAllowMove;   // wxEVT_STC_START_DRAG
-
-    wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP
-#endif
 #endif
 };

@@ -1767,11 +1693,6 @@ BEGIN_DECLARE_EVENT_TYPES()
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED,              1666)
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART,              1667)
    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND,                1668)
-#if wxUSE_DRAG_AND_DROP
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG,              1669)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER,               1670)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP,                 1671)
-#endif
 END_DECLARE_EVENT_TYPES()
 #else
    enum {
@@ -1794,11 +1715,6 @@ END_DECLARE_EVENT_TYPES()
        wxEVT_STC_URIDROPPED,
        wxEVT_STC_DWELLSTART,
        wxEVT_STC_DWELLEND,
-#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
-        wxEVT_STC_START_DRAG,
-        wxEVT_STC_DRAG_OVER,
-        wxEVT_STC_DO_DROP,
-#endif
    };
 #endif

@@ -1826,11 +1742,8 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_URIDROPPED(id, fn)              DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED,            id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_DWELLSTART(id, fn)              DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART,            id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_DWELLEND(id, fn)                DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND,              id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#if wxUSE_DRAG_AND_DROP
-#define EVT_STC_START_DRAG(id, fn)              DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG,            id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#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 ),
-#endif
+
+
 #endif

 //----------------------------------------------------------------------
--- a/contrib/samples/Makefile.in
+++ b/contrib/samples/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$

-CONTRIB_SAMPLES=canvas fl gizmos mmedia net ogl plot stc xrc #applet
+CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet fl

 all:
 	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
--- a/contrib/samples/animate/AniTestVC.dsp
+++ b/contrib/samples/animate/AniTestVC.dsp
@@ -47,7 +47,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -58,7 +58,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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/anitest.exe" /libpath:"../../../lib"

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

@@ -74,7 +74,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/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -85,7 +85,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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/anitest.exe" /pdbtype:sept /libpath:"../../../lib"

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

@@ -101,7 +101,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 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /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"
@@ -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 wxmsw232d.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 wx23_2d.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"

@@ -127,7 +127,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 /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
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /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
@@ -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 wxmsw232.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 wx23_2.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"

@@ -218,8 +218,6 @@ SOURCE=.\anitest.h
 # Begin Source File

 SOURCE=.\anitest.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/applet/applet.cpp
+++ b/contrib/samples/applet/applet.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/

 // For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+#include <wx/wxprec.h>
 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif
--- a/contrib/samples/applet/combobox.cpp
+++ b/contrib/samples/applet/combobox.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/

 // For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+#include <wx/wxprec.h>
 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif
--- a/contrib/samples/applet/monitors.c
+++ b/contrib/samples/applet/monitors.c
--- a/contrib/samples/canvas/simple/SimpleVC.dsp
+++ b/contrib/samples/canvas/simple/SimpleVC.dsp
@@ -45,18 +45,18 @@ RSC=rc.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 /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /i "../../../include" /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/simple.exe" /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "SimpleVC - Win32 Debug"

@@ -72,18 +72,18 @@ 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/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # 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"
-# ADD RSC /l 0x809 /i "../../../include" /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/simple.exe" /pdbtype:sept /libpath:"../../../../lib"

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

@@ -99,17 +99,17 @@ 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 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /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"
-# ADD RSC /l 0x809 /i "../../../include" /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 wxmsw232d.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 wxdlld.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"

@@ -125,18 +125,18 @@ 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 /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
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /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
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /i "../../../include" /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 wxmsw232.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 wxdll.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"

 !ENDIF 

@@ -169,8 +169,7 @@ SOURCE=.\simple.cpp

 SOURCE=.\simple.rc
 # ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include" /i "..\..\include"
-# SUBTRACT RSC /i "../../../include"
+# ADD RSC /l 0x809 /i "..\..\include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/canvas/test/TestVC.dsp
+++ b/contrib/samples/canvas/test/TestVC.dsp
@@ -45,7 +45,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -56,7 +56,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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/test.exe" /libpath:"../../../../lib"

 !ELSEIF  "$(CFG)" == "TestVC - Win32 Debug"

@@ -72,7 +72,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/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -83,7 +83,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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/test.exe" /pdbtype:sept /libpath:"../../../../lib"

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

@@ -99,7 +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 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /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"
@@ -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 wxmsw232d.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 wxdlld.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"

@@ -125,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 /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
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /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
@@ -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 wxmsw232.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 wxdll.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/test.exe" /libpath:"../../../../lib"

 !ENDIF 

@@ -169,7 +169,7 @@ SOURCE=.\test.cpp

 SOURCE=.\test.rc
 # ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include"
+# ADD RSC /l 0x809 /i "..\..\..\include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/fl/fl_demo1/fl_demo.dsp
+++ b/contrib/samples/fl/fl_demo1/fl_demo.dsp
@@ -43,7 +43,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -53,7 +53,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 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 wx.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"

 !ELSEIF  "$(CFG)" == "fl_demo1 - Win32 Debug"

@@ -69,7 +69,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/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /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"
@@ -79,7 +79,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 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 wxd.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"

 !ENDIF 

@@ -103,8 +103,6 @@ SOURCE=.\fl_demo1.cpp
 # Begin Source File

 SOURCE=.\fl_demo1.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/fl/fl_demo1/fl_demo1.cpp
+++ b/contrib/samples/fl/fl_demo1/fl_demo1.cpp
@@ -78,8 +78,8 @@ bool MyApp::OnInit(void)
    SetTopWindow(frame);
    
    
-    wxMessageBox("Hello, this demo has a bunch of yet-not-fixed-bugs and missing functionality\n" \
-                 "The ONLY purpose is to demonstrate self-layouting toolbars,\nflat-bitmapped-buttons and 2-new FL-plugins" \
+    wxMessageBox("Hello, this demo has a bunch of yet-not-fixed-bugs and misssing functionality\n" \
+                 "The ONLY purpose is to demostrate self-layouting toolbars,\nflat-bitmapped-buttons and 2-new FL-plugins" \
                 "(cbRowDragPlugin & cbBarHintsPlugin)\n\n" \
                 "BTW, disabled images and label-text are rendered at run-time" );
    
@@ -203,7 +203,7 @@ MyFrame::MyFrame(wxFrame *frame)
                      sizes1, FL_ALIGN_TOP,     // alignment ( 0-top,1-bottom, etc)
                      0,                        // insert into 0th row (vert. position)
                      0,                        // offset from the start of row (in pixels)
-                      "ToolBar1",               // name to refer in customization pop-ups
+                      "ToolBar1",               // name to refere in customization pop-ups
                      TRUE
                    );
    
--- a/contrib/samples/fl/fl_demo2/fl_demo.dsp
+++ b/contrib/samples/fl/fl_demo2/fl_demo.dsp
@@ -43,7 +43,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -53,7 +53,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 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 wx.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"

 !ELSEIF  "$(CFG)" == "fl_demo2 - Win32 Debug"

@@ -69,7 +69,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/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /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"
@@ -79,7 +79,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 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 wxd.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"

 !ENDIF 

@@ -103,8 +103,6 @@ SOURCE=.\fl_demo2.cpp
 # Begin Source File

 SOURCE=.\fl_demo2.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/fl/fl_sample1/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample1/fl_demo.dsp
@@ -43,7 +43,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -53,7 +53,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 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 wx.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"

 !ELSEIF  "$(CFG)" == "fl_sample1 - Win32 Debug"

@@ -69,7 +69,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/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /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"
@@ -79,7 +79,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 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 wxd.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"

 !ENDIF 

@@ -103,8 +103,6 @@ SOURCE=.\fl_sample1.cpp
 # Begin Source File

 SOURCE=.\fl_sample1.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/fl/fl_sample2/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample2/fl_demo.dsp
@@ -43,7 +43,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -53,7 +53,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 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 wx.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"

 !ELSEIF  "$(CFG)" == "fl_sample2 - Win32 Debug"

@@ -69,7 +69,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/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /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"
@@ -79,7 +79,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 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 wxd.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"

 !ENDIF 

@@ -103,8 +103,6 @@ SOURCE=.\fl_sample2.cpp
 # Begin Source File

 SOURCE=.\fl_sample2.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/fl/fl_sample3/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample3/fl_demo.dsp
@@ -43,7 +43,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -53,7 +53,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 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 wx.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"

 !ELSEIF  "$(CFG)" == "fl_sample3 - Win32 Debug"

@@ -69,7 +69,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/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /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"
@@ -79,7 +79,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 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 wxd.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"

 !ENDIF 

@@ -103,8 +103,6 @@ SOURCE=.\fl_sample3.cpp
 # Begin Source File

 SOURCE=.\fl_sample3.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/gizmos/multicell/makefile.unx
+++ b/contrib/samples/gizmos/multicell/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for multicell example (Unix)
 # Created 2000-07-28

-CXX = $(shell wx-config --cxx)
+CC = gcc

 PROGRAM = mtest

@@ -13,12 +13,12 @@ EXTRAINC=-I../include
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
+	$(CC) -c `wx-config --cflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/contrib/samples/gizmos/splittree/TreeVC.dsp
+++ b/contrib/samples/gizmos/splittree/TreeVC.dsp
@@ -45,7 +45,7 @@ RSC=rc.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 /O1 /Ob2 /I "..\..\..\..\include" /I "..\..\include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "..\..\..\..\include" /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -56,7 +56,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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib gizmos.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" /nodefaultlib:"msvcrtd.lib" /out:"Release/tree.exe" /libpath:"../../../../lib"
+# ADD LINK32 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib gizmos.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" /nodefaultlib:"msvcrtd.lib" /out:"Release/tree.exe" /libpath:"d:\wx2\wxWindows\lib"

 !ELSEIF  "$(CFG)" == "TreeVC - Win32 Debug"

@@ -72,7 +72,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 "..\..\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" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /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"
@@ -82,7 +82,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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib gizmosd.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" /nodefaultlib:"msvcrt.lib" /out:"Debug/tree.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib gizmosd.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" /nodefaultlib:"msvcrt.lib" /out:"Debug/tree.exe" /pdbtype:sept /libpath:"d:\wx2\wxWindows\lib"

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

@@ -98,7 +98,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 "..\..\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 CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\include" /I "..\..\include" /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"
@@ -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 wxmsw232d.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 wxdlld.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" /libpath:"../../contrib/lib"

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

@@ -124,7 +124,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 /O1 /Ob2 /I "..\..\..\..\include" /I "..\..\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 "..\..\include" /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
@@ -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 wxmsw232.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 wxdll.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" /libpath:"../../contrib/lib"

 !ENDIF 

@@ -181,7 +181,7 @@ SOURCE=.\tree.h

 SOURCE=.\tree.rc
 # ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include"
+# ADD RSC /l 0x809 /i "d:\wx2\wxWindows\include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/gizmos/splittree/makefile.unx
+++ b/contrib/samples/gizmos/splittree/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CXX = $(shell wx-config --cxx)
+CC = gcc

 PROGRAM = minimal

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
+	$(CC) -c `wx-config --cflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ b/contrib/samples/gizmos/splittree/tree.cpp
@@ -169,10 +169,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
    m_splitter = new wxThinSplitterWindow(m_scrolledWindow, idSPLITTER_WINDOW, wxDefaultPosition,
 		wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN /* | wxSP_LIVE_UPDATE */);
 	m_splitter->SetSashSize(2);
-
-	/* Note the wxTR_ROW_LINES style: draws horizontal lines between items */
-    m_tree = new TestTree(m_splitter , idTREE_CTRL, wxDefaultPosition,
-		wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES );
+    m_tree = new TestTree(m_splitter, idTREE_CTRL, wxDefaultPosition,
+		wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER );
    m_valueWindow = new TestValueWindow(m_splitter, idVALUE_WINDOW, wxDefaultPosition,
 		wxDefaultSize, wxNO_BORDER);
    m_splitter->SplitVertically(m_tree, m_valueWindow);
@@ -232,6 +230,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 IMPLEMENT_CLASS(TestTree, wxRemotelyScrolledTreeCtrl)

 BEGIN_EVENT_TABLE(TestTree, wxRemotelyScrolledTreeCtrl)
+	EVT_PAINT(TestTree::OnPaint)
 END_EVENT_TABLE()

 TestTree::TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt,
@@ -274,6 +273,39 @@ TestTree::~TestTree()
 	delete m_imageList;
 }

+void TestTree::OnPaint(wxPaintEvent& event)
+{
+	wxPaintDC dc(this);
+
+	wxTreeCtrl::OnPaint(event);
+
+    // Reset the device origin since it may have been set
+    dc.SetDeviceOrigin(0, 0);
+
+	wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
+	dc.SetPen(pen);
+	dc.SetBrush(* wxTRANSPARENT_BRUSH);
+
+    wxSize clientSize = GetClientSize();
+	wxRect itemRect;
+	int cy=0;
+	wxTreeItemId h, lastH;
+	for(h=GetFirstVisibleItem();h;h=GetNextVisible(h))
+	{
+		if (GetBoundingRect(h, itemRect))
+		{
+			cy = itemRect.GetTop();
+			dc.DrawLine(0, cy, clientSize.x, cy);
+			lastH = h;
+		}
+	}
+	if (GetBoundingRect(lastH, itemRect))
+	{
+		cy = itemRect.GetBottom();
+		dc.DrawLine(0, cy, clientSize.x, cy);
+	}
+}
+
 /*
 * TestValueWindow
 */
--- a/contrib/samples/gizmos/splittree/tree.h
+++ b/contrib/samples/gizmos/splittree/tree.h
@@ -45,7 +45,6 @@ protected:
    wxRemotelyScrolledTreeCtrl*        m_tree;
    wxThinSplitterWindow*   m_splitter;
 	wxSplitterScrolledWindow* m_scrolledWindow;
-	//wxScrolledWindow* m_scrolledWindow;
    TestValueWindow*		m_valueWindow;

 private:
@@ -79,6 +78,7 @@ public:
        const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
 	~TestTree();

+	void OnPaint(wxPaintEvent& event);
    DECLARE_EVENT_TABLE()
 protected:
 	wxImageList*	m_imageList;
--- a/contrib/samples/mmedia/MMboardVC.dsp
+++ b/contrib/samples/mmedia/MMboardVC.dsp
@@ -1,5 +1,6 @@
 # Microsoft Developer Studio Project File - Name="MMboardVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
 # ** DO NOT EDIT **

 # TARGTYPE "Win32 (x86) Application" 0x0101
@@ -7,24 +8,23 @@
 CFG=MMboardVC - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "MMboardVC.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "MMboardVC.mak" CFG="MMboardVC - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "MMboardVC - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE "MMboardVC - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "MMboardVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
 !MESSAGE "MMboardVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE 
+!MESSAGE

 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -45,10 +45,10 @@ RSC=rc.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 /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -56,7 +56,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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"

@@ -72,9 +72,9 @@ 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/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" /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 CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /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"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -82,7 +82,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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

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

@@ -98,9 +98,9 @@ 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 /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 CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /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"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -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 wxmsw232d.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 wx23_2d.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"

@@ -124,10 +124,10 @@ 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 /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
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /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
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -135,9 +135,9 @@ 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 wxmsw232.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 wx23_2.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

-!ENDIF 
+!ENDIF

 # Begin Target

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

-SOURCE=.\mmbman.cpp
-
-!IF  "$(CFG)" == "MMboardVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmbman.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\mmboard.cpp

 !IF  "$(CFG)" == "MMboardVC - Win32 Release"
@@ -186,39 +162,74 @@ SOURCE=.\mmboard.cpp

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

-!ENDIF 
+!ENDIF

 # End Source File
 # Begin Source File

 SOURCE=.\mmboard.h
+
+!IF  "$(CFG)" == "MMboardVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\mmbman.cpp
+
+!IF  "$(CFG)" == "MMboardVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\mmbman.h
+
+!IF  "$(CFG)" == "MMboardVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
+
+!ENDIF
+
 # End Source File
 # Begin Source File

 SOURCE=.\mmboard.rc
-
-!IF  "$(CFG)" == "MMboardVC - Win32 Release"
-
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
-
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
-
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
-
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
-
-!ENDIF 
-
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/mmedia/MMboardVC.dsw
+++ b/contrib/samples/mmedia/MMboardVC.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
+Microsoft Developer Studio Workspace File, Format Version 5.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

 ###############################################################################
--- a/contrib/samples/ogl/ogledit/OGLEditVC.dsp
+++ b/contrib/samples/ogl/ogledit/OGLEditVC.dsp
@@ -45,7 +45,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -56,7 +56,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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"

@@ -72,7 +72,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/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" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /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"
@@ -82,7 +82,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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

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

@@ -98,7 +98,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 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /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"
@@ -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 wxmsw232d.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 wx23_2d.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"

@@ -124,7 +124,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 /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
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /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
@@ -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 wxmsw232.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 wx23_2.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
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/ogledit/makefile.unx
+++ b/contrib/samples/ogl/ogledit/makefile.unx
@@ -12,7 +12,8 @@
 # on your system.
 #

-CXX = $(shell wx-config --cxx)
+CPP = gcc -g
+CC = gcc
 WXCONFIG=../../../../wx-config
 WXINCLUDE=-I../../../../include -I../../../include
 WXLIB=-L../../../../lib -L../../../src/ogl
@@ -20,19 +21,19 @@ WXLIB=-L../../../../lib -L../../../src/ogl
 OBJECTS=ogledit.o palette.o doc.o view.o

 ogledit: $(OBJECTS)
-	$(CXX) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
+	$(CPP) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl

 ogledit.o: ogledit.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c ogledit.cpp

 palette.o: palette.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c palette.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c palette.cpp

 doc.o: doc.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp

 view.o: view.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp

 clean: 
 	rm -f *.o ogledit
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ b/contrib/samples/ogl/ogledit/ogledit.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/ogledit/palette.cpp
+++ b/contrib/samples/ogl/ogledit/palette.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/ogledit/view.cpp
+++ b/contrib/samples/ogl/ogledit/view.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/StudioVC.dsp
+++ b/contrib/samples/ogl/studio/StudioVC.dsp
@@ -45,7 +45,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -56,7 +56,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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/studio.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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"

@@ -72,7 +72,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/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" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /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"
@@ -82,7 +82,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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

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

@@ -98,7 +98,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 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /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"
@@ -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 wxmsw232d.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 wx23_2d.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"

@@ -124,7 +124,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 /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
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /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
@@ -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 wx232.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/studio.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 wx23_2.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ENDIF 

--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ b/contrib/samples/ogl/studio/cspalette.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/csprint.cpp
+++ b/contrib/samples/ogl/studio/csprint.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/dialogs.cpp
+++ b/contrib/samples/ogl/studio/dialogs.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/doc.cpp
+++ b/contrib/samples/ogl/studio/doc.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/makefile.unx
+++ b/contrib/samples/ogl/studio/makefile.unx
@@ -12,7 +12,8 @@
 # on your system.
 #

-CXX = $(shell wx-config --cxx)
+CPP = gcc -g
+CC = gcc
 WXCONFIG=../../../../wx-config
 WXINCLUDE=-I../../../../include -I../../../include
 WXLIB=-L../../../../lib -L../../../src/ogl
@@ -20,37 +21,37 @@ WXLIB=-L../../../../lib -L../../../src/ogl
 OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o

 studio: $(OBJECTS)
-	$(CXX) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
+	$(CPP) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl

 studio.o: studio.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c studio.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c studio.cpp

 cspalette.o: cspalette.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c cspalette.cpp

 doc.o: doc.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp

 view.o: view.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp

 dialogs.o: dialogs.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c dialogs.cpp

 mainfrm.o: mainfrm.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp

 project.o: project.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c project.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c project.cpp

 shapes.o: shapes.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c shapes.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c shapes.cpp

 symbols.o: symbols.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c symbols.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c symbols.cpp

 csprint.o: csprint.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c csprint.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c csprint.cpp

 clean: 
 	rm -f *.o studio
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ b/contrib/samples/ogl/studio/shapes.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
@@ -168,7 +168,7 @@ void csEvtHandler::OnRightClick(double x, double y, int keys, int attachment)

    int viewStartX, viewStartY;
    int unitX, unitY;
-    GetShape()->GetCanvas()->GetViewStart(& viewStartX, & viewStartY);
+    GetShape()->GetCanvas()->ViewStart(& viewStartX, & viewStartY);
    GetShape()->GetCanvas()->GetScrollPixelsPerUnit(& unitX, & unitY);

    int x1 = (int)(x * GetShape()->GetCanvas()->GetScaleX());
--- a/contrib/samples/ogl/studio/symbols.cpp
+++ b/contrib/samples/ogl/studio/symbols.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/view.cpp
+++ b/contrib/samples/ogl/studio/view.cpp
@@ -14,7 +14,7 @@
 #endif

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

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/plot/PlotVC.dsp
+++ b/contrib/samples/plot/PlotVC.dsp
@@ -56,7 +56,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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "PlotVC - Win32 Debug"

@@ -83,7 +83,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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

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

@@ -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 wxmsw232d.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 wxdlld.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 wxmsw232.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 wxdll.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

@@ -169,7 +169,7 @@ SOURCE=.\plot.cpp

 SOURCE=.\plot.rc
 # ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "..\..\..\include" /i "..\..\..\contrib\include"
+# ADD RSC /l 0x809 /i "..\..\..\include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/stc/StcTestVC.dsp
+++ b/contrib/samples/stc/StcTestVC.dsp
@@ -1,5 +1,6 @@
 # Microsoft Developer Studio Project File - Name="StcTestVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
 # ** DO NOT EDIT **

 # TARGTYPE "Win32 (x86) Application" 0x0101
@@ -7,24 +8,23 @@
 CFG=StcTestVC - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "StcTestVC.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "StcTestVC.mak" CFG="StcTestVC - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "StcTestVC - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE "StcTestVC - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "StcTestVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
 !MESSAGE "StcTestVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE 
+!MESSAGE

 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -45,10 +45,10 @@ RSC=rc.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 /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -56,7 +56,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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug"

@@ -72,9 +72,9 @@ 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/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" /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 CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /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"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -82,7 +82,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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

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

@@ -98,9 +98,9 @@ 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 /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 CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /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"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -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 wxmsw232d.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 wx23_2d.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"

@@ -124,10 +124,10 @@ 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 /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
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /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
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -135,9 +135,9 @@ 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 wxmsw232.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 wx23_2.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

-!ENDIF 
+!ENDIF

 # Begin Target

@@ -162,7 +162,7 @@ SOURCE=.\stctest.cpp

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

-!ENDIF 
+!ENDIF

 # End Source File
 # Begin Source File
--- a/contrib/samples/stc/StcTestVC.dsw
+++ b/contrib/samples/stc/StcTestVC.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
+Microsoft Developer Studio Workspace File, Format Version 5.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

 ###############################################################################
--- a/contrib/samples/stc/stctest.cpp
+++ b/contrib/samples/stc/stctest.cpp
@@ -49,6 +49,7 @@ public:

    void OnQuit(wxCommandEvent& event);
    void OnAbout(wxCommandEvent& event);
+    void OnStyleNeeded(wxStyledTextEvent& event);

 private:
    wxStyledTextCtrl* ed;
@@ -69,6 +70,7 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
    EVT_MENU            (ID_Quit,  MyFrame::OnQuit)
    EVT_MENU            (ID_About, MyFrame::OnAbout)
+    EVT_STC_STYLENEEDED (ID_ED, MyFrame::OnStyleNeeded)
 END_EVENT_TABLE()

 IMPLEMENT_APP(MyApp)
@@ -126,7 +128,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
    ed = new wxStyledTextCtrl(this, ID_ED);

    // Default font
-    wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL);
+    wxFont font(8, wxMODERN, wxNORMAL, wxNORMAL);
    ed->StyleSetFont(wxSTC_STYLE_DEFAULT, font);
    ed->StyleClearAll();

@@ -146,9 +148,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
    ed->StyleSetBold(10, TRUE);

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

    // give it some text to play with
@@ -179,6 +181,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

 // event handlers

+void MyFrame::OnStyleNeeded(wxStyledTextEvent& event) {
+    int currEndStyled = ed->GetEndStyled();
+    ed->Colourise(currEndStyled, event.GetPosition());
+}
+
+
+
+
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
    // TRUE is to force the frame to close
--- a/contrib/samples/xrc/XrcDemoVC.dsp
+++ b/contrib/samples/xrc/XrcDemoVC.dsp
@@ -45,7 +45,7 @@ RSC=rc.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 /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -56,7 +56,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 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Debug"

@@ -72,7 +72,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/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -83,7 +83,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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

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

@@ -99,7 +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 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /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"
@@ -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 wxmsw232d.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 wxdlld.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"

@@ -125,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 /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
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /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
@@ -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 wxmsw232.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 wxdll.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

@@ -168,8 +168,6 @@ SOURCE=.\xrcdemo.cpp
 # Begin Source File

 SOURCE=.\xrcdemo.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../include"
 # End Source File
 # End Target
 # End Project
--- 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 xrc #applet
+CONTRIB_SUBDIRS=ogl mmedia stc xrc applet plot canvas animate fl

 all:
 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
--- a/contrib/src/animate/AnimateVC.dsp
+++ b/contrib/src/animate/AnimateVC.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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 /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
--- a/contrib/src/animate/Makefile.in
+++ b/contrib/src/animate/Makefile.in
@@ -16,10 +16,8 @@ HEADER_SUBDIR=plot
 HEADERS=animate.h

 OBJECTS=animate.o
-DEPFILES=$(OBJECTS:.o=.d)

 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makelib.env

-include $(DEPFILES)
--- a/contrib/src/applet/Makefile.in
+++ b/contrib/src/applet/Makefile.in
@@ -16,10 +16,8 @@ HEADER_SUBDIR=applet
 HEADERS=applet.h appletwindow.h

 OBJECTS=applet.o appletwindow.o
-DEPFILES=$(OBJECTS:.o=.d)

 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makelib.env

-include $(DEPFILES)
--- a/contrib/src/applet/appletwindow.cpp
+++ b/contrib/src/applet/appletwindow.cpp
@@ -5,19 +5,23 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
+*  ======================================================================
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  |                                                                    |
+*  |This copyrighted computer code is a proprietary trade secret of     |
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
+*  |written authorization from SciTech to possess or use this code, you |
+*  |may be subject to civil and/or criminal penalties.                  |
+*  |                                                                    |
+*  |If you received this code in error or you would like to report      |
+*  |improper use, please immediately contact SciTech Software, Inc. at  |
+*  |530-894-8400.                                                       |
+*  |                                                                    |
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  ======================================================================
 *
 * Language:     ANSI C++
 * Environment:  Any
@@ -33,16 +37,10 @@
 #include "wx/spawnbrowser.h"
 #include "wx/html/forcelnk.h"

-// crt
-#ifdef __WXMSW__
-#include <process.h>        // spawnl()
-#endif
-
 // Include private headers
 #include "wx/applet/applet.h"
 #include "wx/applet/window.h"
 #include "wx/applet/loadpage.h"
-#include "wx/applet/plugin.h"

 // Preprocessor Stuff
 #include "wx/applet/prepinclude.h"
@@ -84,36 +82,30 @@ wxHtmlAppletWindow::wxHtmlAppletWindow(
    const wxSize& size,
    long style,
    const wxString& name,
-    const wxPalette& globalPalette)
-    : wxHtmlWindow(parent,id,pos,size,style,name), m_globalPalette(globalPalette)
+    const wxString& docroot )
+    : wxHtmlWindow(parent,id,pos,size,style,name)
 {
    // Init our locks
    UnLock();

    // setup client navbars
    if (navBar) {
-        m_NavBarEnabled = true;
        m_NavBar = navBar;
        m_NavBackId = navBackId;
        m_NavForwardId = navForwardId;
        }
    else {
-        m_NavBarEnabled = false;
        m_NavBar = NULL;
        }

-    m_NavBackId = navBackId;
-    m_NavForwardId = navForwardId;
-
-
-    // Set the key_type for applets
-    m_AppletList = wxAppletList(wxKEY_STRING);
+    // Set up docroot
+    m_DocRoot = docroot;

    // Add HTML preprocessors
    // deleting preprocessors is done by the code within the window

    incPreprocessor = new wxIncludePrep(); // #include preprocessor
-    incPreprocessor->ChangeDirectory(m_FS); // give it access to our filesys object
+    incPreprocessor->ChangeDirectory(m_DocRoot);

    wxEchoPrep * echoPreprocessor = new wxEchoPrep(); // #echo preprocessor
    wxIfElsePrep * ifPreprocessor = new wxIfElsePrep();
@@ -131,27 +123,6 @@ wxHtmlAppletWindow::~wxHtmlAppletWindow()
 {
 }

-#include "scitech.h"
-
-/****************************************************************************
-PARAMETERS:
-dc  - wxDC object to draw on
-
-REMARKS:
-This function handles drawing the HTML applet window. Because the standard
-wxWindows classes don't properly handle palette management, we add code
-in here to properly select the global palette that we use for all drawing
-into the DC before we allow the regular wxWindows code to finish the
-drawing process.
-****************************************************************************/
-void wxHtmlAppletWindow::OnDraw(
-    wxDC& dc)
-{
-    // TODO: Only do this for <= 8bpp modes!
-    dc.SetPalette(m_globalPalette);
-    wxHtmlWindow::OnDraw(dc);
-}
-
 /****************************************************************************
 PARAMETERS:
 className       - Name of the applet class to create an object for
@@ -186,51 +157,10 @@ wxApplet *wxHtmlAppletWindow::CreateApplet(
        delete applet;
        return NULL;
        }
-    else {
-        // do some fixups on the size if its screwed up
-        wxSize nsize = applet->GetBestSize();
-        if (nsize.x < size.x) nsize.x = size.x;
-        if (nsize.y < size.y) nsize.y = size.y;
-        applet->SetSize(nsize);
-        }
-
-    m_AppletList.Append(iName,(wxObject*)applet);
+    m_AppletList.Append(iName,applet);
    return applet;
 }

-/****************************************************************************
-PARAMETERS:
-classId       - Name of the Plugin class to create an object for
-
-RETURNS:
-Pointer to the wxplugIn created, or NULL if unable to create the PlugIn.
-
-REMARKS:
-This function is used to create new wxPlugIn objects dynamically based on the
-class name as a string. This allows instances of wxPlugIn classes to be
-created dynamically based on string values embedded in the custom tags of an
-HTML page.
-****************************************************************************/
-bool wxHtmlAppletWindow::CreatePlugIn(
-    const wxString& classId )
-{
-    // Dynamically create the class instance at runtime
-    wxClassInfo *info = wxClassInfo::FindClass(classId.c_str());
-    if (!info)
-        return false;
-    wxObject *obj = info->CreateObject();
-    if (!obj)
-        return false;
-    wxPlugIn *plugIn = wxDynamicCast(obj,wxPlugIn);
-    if (!plugIn)
-        return false;
-    if (!plugIn->Create(this)) {
-        delete plugIn;
-        return false;
-        }
-    return true;
-}
-
 /****************************************************************************
 PARAMETERS:
 appletName      - Name of the applet class to find
@@ -286,25 +216,25 @@ Remove an applet from the manager. Called during applet destruction
 bool wxHtmlAppletWindow::LoadPage(
    const wxString& link)
 {
-    wxString href(link);
+    wxString    href(link);

+    // Check for abs path. If it is not then tack on the path
+    // supplied at creation.
+    if (!wxIsAbsolutePath(href))
+        href = m_DocRoot + href;
+
+    // TODO: This needs to be made platform inde if possible.
    if (link.GetChar(0) == '?'){
        wxString cmd = link.BeforeFirst('=');
        wxString cmdValue = link.AfterFirst('=');
-
-        // Launches the default Internet browser for the system.
        if(!(cmd.CmpNoCase("?EXTERNAL"))){
            return wxSpawnBrowser(this, cmdValue.c_str());
            }
-
-        // Launches an external program on the system.
        if (!(cmd.CmpNoCase("?EXECUTE"))){
-            int code = spawnl( P_NOWAIT, cmdValue , NULL );
-            return (!code);
+            wxProcess *child = new AppletProcess(this);
+            wxExecute(cmdValue, false, child);
+            return true;
            }
-
-        // Looks for a href in a variable stored as a cookie. The href can be
-        // changed on the fly.
        if (!(cmd.CmpNoCase("?VIRTUAL"))){
            VirtualData& temp = *((VirtualData*)FindCookie(cmdValue));
            if (&temp) {
@@ -317,31 +247,17 @@ bool wxHtmlAppletWindow::LoadPage(
                return true;
                }
            }
-
-        // This launches a qlet - It is like an applet but is more generic in that it
-        // can be of any wxWin type so it then has the freedom to do more stuff.
-        if (!(cmd.CmpNoCase("?WXAPPLET"))){
-            if (!cmdValue.IsNull()){
-                if (!CreatePlugIn(cmdValue)){
-#ifdef CHECKED
-                    wxLogError(_T("Launch Applet ERROR: '%s' does not exist."), cmdValue.c_str());
-#endif
-                    }
-                }
-             return true;
-            }
        }

    // Inform all the applets that the new page is being loaded
    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
        (node->GetData())->OnLinkClicked(wxHtmlLinkInfo(href));
    Show(false);
-
    bool stat = wxHtmlWindow::LoadPage(href);
    Show(true);

    // Enable/Dis the navbar tools
-    if (m_NavBarEnabled) {
+    if (m_NavBar) {
        m_NavBar->EnableTool(m_NavForwardId,HistoryCanForward());
        m_NavBar->EnableTool(m_NavBackId,HistoryCanBack());
        }
@@ -396,37 +312,6 @@ bool wxHtmlAppletWindow::HistoryBack()
    return wxHtmlWindow::HistoryBack();
 }

-/****************************************************************************
-REMARKS:
-This function is used to disable the navigation bars. If you want to
-toggle to the navbars off you must call this function.
-****************************************************************************/
-void wxHtmlAppletWindow::DisableNavBar()
-{
-    m_NavBarEnabled = false;
-}
-
-/****************************************************************************
-REMARKS:
-This function is used to enable the nav bars. If you toggle the nav bars on
-you must call this function.
-****************************************************************************/
-void wxHtmlAppletWindow::EnableNavBar()
-{
-    m_NavBarEnabled = true;
-}
-
-/****************************************************************************
-REMARKS:
-This function is used to set the nav bar to a new nav bar if you deleted the
-one that you were useing. Usally this happens when you toggle a nav bar
-on or off.
-****************************************************************************/
-void wxHtmlAppletWindow::SetNavBar(wxToolBarBase *navBar)
-{
-    m_NavBar = navBar;
-}
-
 /****************************************************************************
 PARAMETERS:
 msg - wxEvent message to be sent to all wxApplets
@@ -609,18 +494,6 @@ VirtualData::VirtualData(
    m_href = href;
 }

-/****************************************************************************
-PARAMETERS:
-REMARKS:
-VirtualData is used to store information on the virtual links.
-****************************************************************************/
-VirtualData::VirtualData()
-{
-    m_name.Empty();
-    m_group.Empty();
-    m_href.Empty();
-}
-
 /****************************************************************************
 PARAMETERS:
 REMARKS:
@@ -655,28 +528,8 @@ TAG_HANDLER_PROC(tag)
 	wnd = m_WParser->GetWindow();

 	if ((appletWindow = wxDynamicCast(wnd,wxHtmlAppletWindow)) != NULL){
-        wxSize size = wxDefaultSize;
-		int al;
-        if (tag.HasParam("WIDTH")) {
-            tag.GetParamAsInt("WIDTH", &width);
-            size.SetWidth(width);
-            }
-		
-        if (tag.HasParam("HEIGHT")) {
-            tag.GetParamAsInt("HEIGHT", &height);
-            size.SetHeight(height);
-            }
-
-        al = wxHTML_ALIGN_BOTTOM;
-        if (tag.HasParam(wxT("ALIGN"))) {
-            wxString alstr = tag.GetParam(wxT("ALIGN"));
-            alstr.MakeUpper();  // for the case alignment was in ".."
-            if (alstr == wxT("TEXTTOP") || alstr == wxT("TOP"))
-                al = wxHTML_ALIGN_TOP;
-            else if ((alstr == wxT("CENTER")) || (alstr == wxT("ABSCENTER")))
-                al = wxHTML_ALIGN_CENTER;
-            }
-
+		tag.ScanParam("WIDTH", "%i", &width);
+		tag.ScanParam("HEIGHT", "%i", &height);	
        if (tag.HasParam("CLASSID")){
            classId = tag.GetParam("CLASSID");
            if ( classId.IsNull() || classId.Len() == 0 ){
@@ -692,9 +545,9 @@ TAG_HANDLER_PROC(tag)
                name = classId;

            // We got all the params and can now create the applet
-			if ((applet = appletWindow->CreateApplet(classId, name, tag , size)) != NULL){
+			if ((applet = appletWindow->CreateApplet(classId, name, tag , wxSize(width, height))) != NULL){
 				applet->Show(true);
-				m_WParser->OpenContainer()->InsertCell(new wxHtmlAppletCell(applet,al));
+				m_WParser->OpenContainer()->InsertCell(new wxHtmlWidgetCell(applet,0));
 				}
            else
                wxMessageBox("wxApplet error: Could not create:" + classId + "," + name);
@@ -717,81 +570,6 @@ TAGS_MODULE_BEGIN(wxApplet)
    TAGS_MODULE_ADD(wxApplet)
 TAGS_MODULE_END(wxApplet)

-/*********************************************************************************
-wxHtmlAppletCell
-*********************************************************************************/
-wxHtmlAppletCell::wxHtmlAppletCell(wxWindow *wnd, int align) : wxHtmlCell()
-{
-    int sx, sy;
-    m_Wnd = wnd;
-    m_Wnd->GetSize(&sx, &sy);
-    m_Width = sx, m_Height = sy;
-
-    switch (align) {
-        case wxHTML_ALIGN_TOP :
-            m_Descent = m_Height;
-            break;
-        case wxHTML_ALIGN_CENTER :
-            m_Descent = m_Height / 2;
-            break;
-        case wxHTML_ALIGN_BOTTOM :
-        default :
-            m_Descent = 0;
-            break;
-        }
-
-    SetCanLiveOnPagebreak(FALSE);
-}
-
-
-void wxHtmlAppletCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
-{
-    int absx = 0, absy = 0, stx, sty;
-    wxHtmlCell *c = this;
-
-    while (c)
-    {
-        absx += c->GetPosX();
-        absy += c->GetPosY();
-        c = c->GetParent();
-    }
-
-    ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
-    m_Wnd->Move(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty);
-}
-
-
-
-void wxHtmlAppletCell::DrawInvisible(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y))
-{
-    int absx = 0, absy = 0, stx, sty;
-    wxHtmlCell *c = this;
-
-    while (c)
-    {
-        absx += c->GetPosX();
-        absy += c->GetPosY();
-        c = c->GetParent();
-    }
-
-    ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
-    m_Wnd->Move(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty);
-}
-
-
-
-void wxHtmlAppletCell::Layout(int w)
-{
-    int sx, sy;
-    m_Wnd->GetSize(&sx, &sy);
-    m_Width = sx, m_Height = sy;
-
-    wxHtmlCell::Layout(w);
-}
-
-
-
-
 // This is our little forcelink hack.
 FORCE_LINK(loadpage)

--- a/contrib/src/applet/plugin.cpp
+++ b/contrib/src/applet/plugin.cpp
@@ -1,60 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxPlugIn class implementation
-*
-****************************************************************************/
-
-// For compilers that support precompilation
-#include "wx/wxprec.h"
-
-// Include private headers
-#include "wx/applet/plugin.h"
-#include "wx/applet/window.h"
-
-/*------------------------- Implementation --------------------------------*/
-
-// Implement the abstract class functions
-IMPLEMENT_ABSTRACT_CLASS(wxPlugIn, wxObject);
-
-/****************************************************************************
-REMARKS:
-Psuedo virtual constructor for the wxPlugIn class.
-****************************************************************************/
-bool wxPlugIn::Create(
-    wxHtmlAppletWindow *parent)
-{
-    m_parent = parent;
-    return true;
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the wxPlugIn class.
-****************************************************************************/
-wxPlugIn::~wxPlugIn()
-{
-}
-
-
--- a/contrib/src/applet/prepecho.cpp
+++ b/contrib/src/applet/prepecho.cpp
@@ -115,13 +115,8 @@ wxString wxEchoPrep::Process(

            // grab the value from the class, put it in tag since the data is no longer needed
            tag = wxEchoVariable::FindValue(cname, parms.c_str());
-
-
            }
-        // remove ampersands and <> chars
-        tag.Replace("&", "&amp;");
-        tag.Replace("<", "&lt;");
-        tag.Replace(">", "&gt;");
+

        output = (output.Mid(0,i) + tag + output.Mid(i));
 		}
--- a/contrib/src/applet/prepifelse.cpp
+++ b/contrib/src/applet/prepifelse.cpp
@@ -49,17 +49,12 @@ do not correctly pass the given return value.
 ****************************************************************************/
 int ReverseFind(
    const wxString &tstr,
-    const wxString &str,
-    int start = -1)
+    const wxString &str)
 {
    wxASSERT( str.GetStringData()->IsValid() );

    // TODO could be made much quicker than that
    int p = tstr.Len()-str.Len()-1;
-    int p2 = start-str.Len();
-
-    // if the user supplied a valid start point, use it
-    if (start != -1 && p > p2) p = p2;
    while ( p >= 0 ) {
        if ( wxStrncmp(tstr.c_str() + p, str.c_str(), str.Len()) == 0 )
            return p;
@@ -69,131 +64,6 @@ int ReverseFind(
    return -1;
 }

-/****************************************************************************
-PARAMETERS:
-str        - text of #if statement
-
-RETURNS:
-true or false depending on how it evaluated
-
-REMARKS:
-
-SEE ALSO:
-wxIfElseVariable
-****************************************************************************/
-bool ParseIfStatementValue(wxString &str) {
-
-    // Find out if the tag has parenthesis
-    // recursive to parse the text within the parenthesis,
-    // replacing the text with 1 or 0, (hardcoded true or false)
-    int b;
-    while ((b = str.Find('(')) != -1) {
-        int e;
-        // Find the matching parenthesis
-        int nextbeg, nextend;
-        int parencount = 1, min = b+1;
-        do {
-
-            nextbeg = str.find('(', min);
-            nextend = str.find(')', min);
-            if (nextbeg < nextend && nextbeg != wxString::npos) {
-                parencount++;
-                min = nextbeg+1;
-                }
-            else {
-                parencount--;
-                min = nextend+1;
-                }
-
-            if (nextend == wxString::npos) {
-                #ifdef CHECKED		
-                wxMessageBox("wxHTML #if\\else error: Unmatched parenthesis in #if expression.","Error",wxICON_ERROR);
-                #endif
-                return true;
-                }
-            // once parencount reaches 0 again we have found our matchin )
-            } while (parencount > 0);
-
-        e = nextend;
-
-        // Extract the expression from the parenthesis block and recurse
-        // to solve it.
-        wxString tag;
-        tag = str.Mid(b+1, e-b-1);
-        bool val = ParseIfStatementValue(tag);
-        // Add extra spaces just in case of NOT(VAL)
-        if (val) str = str.Mid(0, b) + " 1" + str.Mid(e+1);
-        else str = str.Mid(0, b) + " 0" + str.Mid(e+1);
-
-        }
-
-    // Remove spaces from left and right
-    str.Trim(false);
-    str.Trim(true);
-
-    // Convert text method of operators "AND" and "OR" to c style
-    // this makes only one special case necessary for each later on
-    str.Replace(" AND ", "&&");
-    str.Replace(" OR ", "||");
-
-    // We use ReverseFind so that the whole left expression gets evaluated agains
-    // the right single item, creating a left -> right evaluation
-    // Search for || operators, recurse to solve (so we don't have to handle special cases here)
-    int and, or;
-    and = ReverseFind(str, "&&");
-    or = ReverseFind(str, "||");
-    if ( (and != -1) || (or != -1) ) {
-        wxString tag1, tag2;
-        // handle the rightmost first to force left->right evaluation
-        if (and > or) {
-            return (
-                ParseIfStatementValue(tag2 = str.Mid(and+2)) &&
-                ParseIfStatementValue(tag1 = str.Mid(0, and)) );
-            }
-        else {
-            return (
-                ParseIfStatementValue(tag2 = str.Mid(or+2)) ||
-                ParseIfStatementValue(tag1 = str.Mid(0, or)) );
-            }
-
-        }
-
-    // By the time we get to this place in the function we are guarenteed to have a single
-    // variable operation, perhaps with a NOT or ! operator
-    bool notval = false;
-
-    // search for a NOT or ! operator
-    if (str.Mid(0, 1) == "!") {
-        str.Remove(0, 1);
-        str.Trim(false); // trim spaces from left
-        notval = true;
-        }
-    else if (str.Mid(0,4).CmpNoCase("NOT ") == 0) {
-        str.Remove(0, 4);
-        str.Trim(false); // trim any extra spaces from left
-        notval = true;
-        }
-
-    // now all we have left is the name of the class or a hardcoded 0 or 1
-
-    if (str == "") {
-        #ifdef CHECKED		
-        wxMessageBox("wxHTML #if\\else error: Empty expression in #if\\#elif statement.","Error",wxICON_ERROR);
-        #endif
-        return true;
-        }
-
-    // check for hardcoded 0 and 1 cases, (these are used by parenthesis catcher)
-    // this just decomplicates the recursion algorithm
-    if (str == "0") return notval;
-    if (str == "1") return !notval;
-
-    // Grab the value from the variable class identified by cname
-    bool value = wxIfElseVariable::FindValue(str);
-    if (notval) value = !value;
-    return value;
-
-}
 /****************************************************************************
 PARAMETERS:
 text        - HTML to process for if/else blocks
@@ -202,7 +72,7 @@ RETURNS:
 The string containing the processed HTML

 REMARKS:
-This function replaces #if, #else, #elif, and #endif directives with the text
+This function replaces #if, #else, and #endif directives with the text
 contained within the blocks, dependant on the value of the given boolean
 variable. The variable is created by making a sub class of wxIfElseVariable.
 Dynamic class construction is used at run time internally to create an instance
@@ -216,81 +86,14 @@ wxString wxIfElsePrep::Process(
 {
 	int b;
 	char ft[] = "<!--#if ";
-	char ftend[] = "<!--#endif-->";
-    char ftelse[] = "<!--#else-->";
-    char ftnot[] = "<!--#if not ";
-    char ftnot2[] = "<!--#if !";
-
-    char ftelif[] = "<!--#elif ";
 	
-    // make a copy so we can replace text as we go without affecting the original
+	// make a copy so we can replace text as we go without affecting the original
 	wxString output = text;
-
-    // Avoid duplication of our parsing code by turning any #elif blocks into appropriate
-    // else/if blocks
-    while ((b = ReverseFind(output.Lower(), ftelif)) != -1) {
-        int e;
-        // Replace beginning of block
-        e = output.find("-->", b + strlen(ftelif));
-
-        if (e == wxString::npos) {
-            #ifdef CHECKED		
-            wxMessageBox("wxHTML #elif error: Premature end of file while parsing #elif.","Error",wxICON_ERROR);
-            #endif
-            break;
-            }
-
-        // Convert to lower case so find is easy, grab everything after #elif tag
-        wxString remains = (output.Mid(e+strlen("-->"))).Lower();
-
-        // find matching else or endif
-        int nextif, nextendif;
-        int ifcount = 1, min = 0;
-        do {
-            nextif = remains.find(ft, min);
-            nextendif = remains.find(ftend, min);
-            if (nextif < nextendif && nextif != wxString::npos) {
-                ifcount++;
-                min = nextif+1;
-                }
-            else {
-                ifcount--;
-                min = nextendif+1;
-                }
-
-            if (nextendif == wxString::npos) {
-                #ifdef CHECKED		
-                wxMessageBox("wxHTML #elif error: Premature end of file before finding #endif.","Error",wxICON_ERROR);
-                #endif
-                break;
-                }
-            // once ifcount reaches 0 again we have found our matchin #endif
-            } while (ifcount > 0);
-
-        // If it couldn't be found die gracefully
-        if (nextendif == wxString::npos) {
-                // We already displayed a message, just break all the way out
-                break;
-                }
-
-        int elifsize = e - (b + strlen(ftelif)) + strlen("-->");
-        // Create the #if/else block, removing the #elif code
-        output = output.Mid(0, b) +
-            wxString(wxString(ftelse)+wxString(ft)) +
-            output.Mid(b+strlen(ftelif), elifsize+nextendif) +
-            wxString(ftend) +
-            output.Mid(b+strlen(ftelif)+elifsize+nextendif);
-
-        }
-	
-    // Parse out the if else blocks themselves
    while ((b = ReverseFind(output.Lower(), ft)) != -1) {
-		// Loop until every #if directive is found
+		// Loop until every #echo directive is found
 		// We search from the end of the string so that #if statements will properly recurse
 		// and we avoid the hassle of matching statements with the correct <!--#endif-->
-        bool notval = false;
-        int off = 0;
-        int end;
+		int end, c, n;
        wxString usecode, code;
        wxString cname;
        wxString tag;
@@ -308,14 +111,29 @@ wxString wxIfElsePrep::Process(
 			}

        end += 3;
-        // remove the <!--#if and --> sections from the tag before passing it on to be parsed
-        tag = output.Mid(b+strlen(ft), end-strlen(ft)-3);
+        tag = output.Mid(b, end);
        output.Remove(b, end);

-        value = ParseIfStatementValue(tag);
+        c = tag.Find("-->");
+        n = c;
+
+        // find the classname
+        c = (tag.Mid(8, n-8)).Find(" ");
+	    if (c == -1) n -= 8;
+        else n = c;
+        cname = tag.Mid(8, n);
+
+        cname.Trim(false);
+        c = cname.Find("\"");
+        if (c != -1) cname = cname.Mid(c+1);
+    	c = cname.Find("\"");
+	    if (c != -1) cname = cname.Mid(0, c);
+
+        // Grab the value from the variable class identified by cname
+        value = wxIfElseVariable::FindValue(cname);

        // Find the end of the tag (<!--#endif-->) and copy it all into the variable code
-        end = ((output.Mid(b)).Lower()).Find(ftend);
+        end = ((output.Mid(b)).Lower()).Find("<!--#endif-->");
        if (end == -1) {
 #ifdef CHECKED		
            wxMessageBox("wxHTML #if error: Premature end of file while searching for matching #endif.","Error",wxICON_ERROR);
@@ -324,14 +142,14 @@ wxString wxIfElsePrep::Process(
 			}

        code = output.Mid(b, end);
-        output.Remove(b, end+strlen(ftend)); // remove the entire #if block from original document
+        output.Remove(b, end+13); // remove the entire #if block from original document

        // Find out if there is an else statement
-        end = (code.Lower()).Find(ftelse);
+        end = (code.Lower()).Find("<!--#else-->");
        if (end != -1) {
            if (!value) {
                // Use the else statement
-                usecode = code.Mid(end+strlen(ftelse));
+                usecode = code.Mid(end+12);
                }
            else {
                // Use statement before #else
--- a/contrib/src/applet/prepinclude.cpp
+++ b/contrib/src/applet/prepinclude.cpp
@@ -59,6 +59,8 @@ wxString wxIncludePrep::Process(
    int i;
 	char ft[] = "<!--#include virtual=";
 	
+    wxFileSystem *fs = new wxFileSystem;
+    fs->ChangePathTo(DOC_ROOT, true);

    int openedcount = 0;

@@ -90,9 +92,8 @@ wxString wxIncludePrep::Process(
 		// remove the #include tag
        output.Remove(i, n+21+3);

-        wxFSFile * file;
-        file = m_FS->OpenFile(fname);
-	
+        wxFSFile * file = fs->OpenFile(fname);
+    			
        if (!file) {
 #ifdef CHECKED		
 			wxMessageBox(wxString("wxHTML #include error: File not Found ") + fname + wxString("."),"Error",wxICON_ERROR);
@@ -124,6 +125,7 @@ wxString wxIncludePrep::Process(
        delete file;
        }
 	
+	delete fs;
 	return output;
 }

@@ -136,8 +138,9 @@ This function sets the directory to get included HTML files from. The default
 value is the current directory. Directorys may be given as a relative path.
 ****************************************************************************/
 void wxIncludePrep::ChangeDirectory(
-    wxFileSystem *fs)
+    const wxString &dir)
 {
-     m_FS = fs;
+
+    DOC_ROOT = dir;
 }

--- a/contrib/src/canvas/CanvasVC.dsp
+++ b/contrib/src/canvas/CanvasVC.dsp
@@ -9,17 +9,17 @@ CFG=CanvasVC - Win32 Debug
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE NMAKE /f "CanvasVC.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE NMAKE /f "CanvasVC.mak" CFG="CanvasVC - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "CanvasVC - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "CanvasVC - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE

 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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 /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
--- a/contrib/src/canvas/Makefile.in
+++ b/contrib/src/canvas/Makefile.in
@@ -16,10 +16,8 @@ HEADER_SUBDIR=canvas
 HEADERS=canvas.h bbox.h liner.h polygon.h

 OBJECTS=canvas.o bbox.o liner.o polygon.o
-DEPFILES=$(OBJECTS:.o=.d)

 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makelib.env

-include $(DEPFILES)
--- a/contrib/src/fl/Makefile.in
+++ b/contrib/src/fl/Makefile.in
@@ -1,62 +1,29 @@
-# $Id$
+#
+# File:         Makefile
+# Author:       Hans Van Leemputten
+# Created:      2001
+# Updated:
+# Copyright:    (c) wxWorkshop team, 2001
+#
+# Makefile for wxWindows FrameLayout library (Linux/wxGTK).

 top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/fl

 TARGET_LIBNAME = libfl
+OBJ_EXT	= o

+# Version Info.
 LIBVERSION_CURRENT=1
 LIBVERSION_REVISION=0
 LIBVERSION_AGE=0

-HEADER_PATH=$(top_srcdir)/contrib/include/wx
-HEADER_SUBDIR=fl
+include ./files.lst

-HEADERS = \
-            bardragpl.h \
-            cbcustom.h \
-            dynbarhnd.h \
-            dyntbarhnd.h \
-            garbagec.h \
-            hintanimpl.h \
-            panedrawpl.h \
-            rowlayoutpl.h \
-            updatesmgr.h \
-            antiflickpl.h \
-            barhintspl.h \
-            controlbar.h \
-            dyntbar.h \
-            frmview.h \
-            gcupdatesmgr.h \
-            newbmpbtn.h \
-            rowdragpl.h \
-            toolwnd.h
-
-OBJECTS  = \
-            antiflickpl.o \
-            gcupdatesmgr.o \
-            rowlayoutpl.o \
-            bardragpl.o \
-            dyntbar.o \
-            hintanimpl.o \
-            toolwnd.o \
-            barhintspl.o \
-            dyntbarhnd.o \
-            newbmpbtn.o \
-            updatesmgr.o \
-            cbcustom.o \
-            frmview.o \
-            panedrawpl.o \
-            controlbar.o \
-            garbagec.o \
-            rowdragpl.o
-
-DEPFILES= $(OBJECTS:.o=.d)
+OBJECTS = $(FL_OBJECTS)

 APPEXTRADEFS = -I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makelib.env

-include $(DEPFILES)
-
--- a/contrib/src/fl/bardragpl.cpp
+++ b/contrib/src/fl/bardragpl.cpp
@@ -371,7 +371,7 @@ void cbBarDragPlugin::UnstickFromPane( cbDockPane* pPane, wxPoint& mousePos )

 	if ( pPane->IsHorizontal() && fromLowerEdge )
 	{	
-//		bool fromLowerEdge = mousePos.y > bounds.y;
+		bool fromLowerEdge = mousePos.y > bounds.y;

 		mHintRect.y = wxMax( bounds.y + bounds.height + 1, mousePos.y - newHeight );

--- a/contrib/src/fl/barhintspl.cpp
+++ b/contrib/src/fl/barhintspl.cpp
@@ -6,7 +6,7 @@
 // Created:     30/11/98 (my 22th birthday :-)
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
+// Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -49,42 +49,42 @@ IMPLEMENT_DYNAMIC_CLASS( cbBarHintsPlugin, cbPluginBase )

 BEGIN_EVENT_TABLE( cbBarHintsPlugin, cbPluginBase )

-    EVT_PL_SIZE_BAR_WND  ( cbBarHintsPlugin::OnSizeBarWindow )
-    EVT_PL_DRAW_BAR_DECOR( cbBarHintsPlugin::OnDrawBarDecorations )
+	EVT_PL_SIZE_BAR_WND  ( cbBarHintsPlugin::OnSizeBarWindow )
+	EVT_PL_DRAW_BAR_DECOR( cbBarHintsPlugin::OnDrawBarDecorations )

-    EVT_PL_LEFT_DOWN( cbBarHintsPlugin::OnLeftDown )
-    EVT_PL_LEFT_UP  ( cbBarHintsPlugin::OnLeftUp   )
-    EVT_PL_MOTION   ( cbBarHintsPlugin::OnMotion   )
+	EVT_PL_LEFT_DOWN( cbBarHintsPlugin::OnLeftDown )
+	EVT_PL_LEFT_UP  ( cbBarHintsPlugin::OnLeftUp   )
+	EVT_PL_MOTION	( cbBarHintsPlugin::OnMotion   )

 END_EVENT_TABLE()

 cbBarHintsPlugin::cbBarHintsPlugin(void)

-    : mpPane( 0 ),
-      mBtnPressed   ( FALSE ),
-      mCloseBoxOn   ( TRUE ),
-      mCollapseBoxOn( TRUE ),
-      mGrooveCount  ( 2 ),
-      mHintGap      ( 4 ),
-      mXWeight      ( 2 )
+	: mpPane( 0 ),
+	  mBtnPressed   ( FALSE ),
+	  mCloseBoxOn   ( TRUE ),
+	  mCollapseBoxOn( TRUE ),
+	  mGrooveCount  ( 2 ),
+	  mHintGap      ( 4 ),
+	  mXWeight      ( 2 )
 {
-    mBoxes[CLOSE_BOX_IDX]    = NULL;
-    mBoxes[COLLAPSE_BOX_IDX] = NULL;
+	mBoxes[CLOSE_BOX_IDX]    = NULL;
+	mBoxes[COLLAPSE_BOX_IDX] = NULL;
 }

 cbBarHintsPlugin::cbBarHintsPlugin( wxFrameLayout* pLayout, int paneMask )

-    : cbPluginBase( pLayout, paneMask ),
-      mpPane( 0 ),
-      mBtnPressed   ( FALSE ),
-      mCloseBoxOn   ( TRUE ),
-      mCollapseBoxOn( TRUE ),
-      mGrooveCount  ( 2 ),
-      mHintGap      ( 5 ),
-      mXWeight      ( 2 )
+	: cbPluginBase( pLayout, paneMask ),
+	  mpPane( 0 ),
+	  mBtnPressed   ( FALSE ),
+	  mCloseBoxOn   ( TRUE ),
+	  mCollapseBoxOn( TRUE ),
+	  mGrooveCount  ( 2 ),
+	  mHintGap      ( 5 ),
+	  mXWeight      ( 2 )
 {
-    mBoxes[CLOSE_BOX_IDX]    = NULL;
-    mBoxes[COLLAPSE_BOX_IDX] = NULL;
+	mBoxes[CLOSE_BOX_IDX]    = NULL;
+	mBoxes[COLLAPSE_BOX_IDX] = NULL;
 }


@@ -93,31 +93,31 @@ cbBarHintsPlugin::~cbBarHintsPlugin()
    if (mBoxes[CLOSE_BOX_IDX])
        delete mBoxes[CLOSE_BOX_IDX];

-    if (mBoxes[COLLAPSE_BOX_IDX])
+	if (mBoxes[COLLAPSE_BOX_IDX])
        delete mBoxes[COLLAPSE_BOX_IDX];
 }  // cbBarHintsPlugin destructor


 void cbBarHintsPlugin::SetGrooveCount( int nGrooves )
 {
-    mGrooveCount = nGrooves;
+	mGrooveCount = nGrooves;
 }

 void cbBarHintsPlugin::CreateBoxes()
 {
-    cbCloseBox*    box1 = new cbCloseBox();
-    cbCollapseBox* box2 = new cbCollapseBox();
+	cbCloseBox*    box1 = new cbCloseBox();
+	cbCollapseBox* box2 = new cbCollapseBox();

-    mBoxes[CLOSE_BOX_IDX]    = box1;
-    mBoxes[COLLAPSE_BOX_IDX] = box2;
+	mBoxes[CLOSE_BOX_IDX]    = box1;
+	mBoxes[COLLAPSE_BOX_IDX] = box2;

-    int i;
-    for ( i = 0; i != BOXES_IN_HINT; ++i )
-    {
-        mBoxes[i]->mpLayout = mpLayout;
-        mBoxes[i]->mpPlugin = this;
-        mBoxes[i]->mpWnd    = NULL;
-    }
+   int i;
+	for( i = 0; i != BOXES_IN_HINT; ++i )
+	{
+		mBoxes[i]->mpLayout = mpLayout;
+		mBoxes[i]->mpPlugin = this;
+		mBoxes[i]->mpWnd    = NULL;
+	}
 }


@@ -130,434 +130,431 @@ void cbBarHintsPlugin::DrawCloseBox( wxDC& dc, const wxPoint& pos, bool pressed
 }

 void cbBarHintsPlugin::DrawCollapseBox( wxDC& dc, const wxPoint& pos, 
-                                        bool atLeft, bool disabled, bool pressed )
+										bool atLeft, bool disabled, bool pressed )
 {
 }

 void cbBarHintsPlugin::DrawGrooves( wxDC& dc, const wxPoint& pos, int length )
 {
-    int ofs = 0;
+	int ofs = 0;

-    int i;
-    for ( i = 0; i != mGrooveCount; ++i, ofs += ( GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP ) )
-    {
-        if ( mpPane->IsHorizontal() )
-        {
-            dc.SetPen( mpLayout->mLightPen );
-            dc.DrawLine( pos.x + ofs, pos.y, pos.x + ofs, pos.y + length - 1 );
-            dc.DrawPoint( pos.x + ofs + 1, pos.y );
+   int i;
+	for( i = 0; i != mGrooveCount; ++i, ofs += ( GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP ) )
+	
+		if ( mpPane->IsHorizontal() )
+		{
+			dc.SetPen( mpLayout->mLightPen );
+			dc.DrawLine( pos.x + ofs, pos.y, pos.x + ofs, pos.y + length - 1 );
+			dc.DrawPoint( pos.x + ofs + 1, pos.y );

-            dc.SetPen( mpLayout->mDarkPen );
-            dc.DrawLine( pos.x + ofs + 2, pos.y, pos.x + ofs + 2, pos.y + length );
-            dc.DrawPoint( pos.x + ofs + 1, pos.y + length - 1 );
-            dc.DrawPoint( pos.x + ofs,     pos.y + length - 1 );
-        }
-        else
-        {
-            dc.SetPen( mpLayout->mLightPen );
-            dc.DrawLine( pos.x, pos.y + ofs, pos.x + length - 1, pos.y + ofs );
-            dc.DrawPoint( pos.x, pos.y + ofs + 1 );
+			dc.SetPen( mpLayout->mDarkPen );
+			dc.DrawLine( pos.x + ofs + 2, pos.y, pos.x + ofs + 2, pos.y + length );
+			dc.DrawPoint( pos.x + ofs + 1, pos.y + length - 1 );
+			dc.DrawPoint( pos.x + ofs,     pos.y + length - 1 );
+		}
+		else
+		{
+			dc.SetPen( mpLayout->mLightPen );
+			dc.DrawLine( pos.x, pos.y + ofs, pos.x + length - 1, pos.y + ofs );
+			dc.DrawPoint( pos.x, pos.y + ofs + 1 );

-            dc.SetPen( mpLayout->mDarkPen );
-            dc.DrawLine( pos.x, pos.y + ofs + 2, pos.x + length, pos.y + ofs + 2 );
-            dc.DrawPoint( pos.x + length - 1, pos.y + ofs + 1 );
-            dc.DrawPoint( pos.x + length - 1, pos.y + ofs );
-        }
-    }
+			dc.SetPen( mpLayout->mDarkPen );
+			dc.DrawLine( pos.x, pos.y + ofs + 2, pos.x + length, pos.y + ofs + 2 );
+			dc.DrawPoint( pos.x + length - 1, pos.y + ofs + 1 );
+			dc.DrawPoint( pos.x + length - 1, pos.y + ofs );
+		}
 }

 void cbBarHintsPlugin::ExcludeHints( wxRect& rect, cbBarInfo& info )
 {
-    int boxHeight = BTN_BOX_HEIGHT;
+	int boxHeight = BTN_BOX_HEIGHT;

-    // collapse and close box are not placed on fixed bars
+	// collapse and close box are not placed on fixed bars

-    if ( info.IsFixed() || ( !mCloseBoxOn && !mCollapseBoxOn ) )
+	if ( info.IsFixed() || ( !mCloseBoxOn && !mCollapseBoxOn ) )

-        boxHeight = 0;
+		boxHeight = 0;

-    int height = wxMax( mGrooveCount*(GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP) 
-                        - GROOVE_TO_GROOVE_GAP, 
-                        boxHeight 
-                      );
+	int height = wxMax( mGrooveCount*(GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP) 
+		                - GROOVE_TO_GROOVE_GAP, 
+						boxHeight 
+				      );

-    if ( mpPane->IsHorizontal() )
-    {
-        rect.x     += ( mHintGap*2 + height );
-        rect.width -= (height + 2*mHintGap);
+	if ( mpPane->IsHorizontal() )
+	{
+		rect.x     += ( mHintGap*2 + height );
+		rect.width -= (height + 2*mHintGap);

-        rect.x     -= info.mDimInfo.mHorizGap + 2;
-        rect.width += info.mDimInfo.mHorizGap + 2;
-    }
-    else
-    {
-        rect.y      += (mHintGap*2 + height);
-        rect.height -= (height + 2*mHintGap);
+		rect.x     -= info.mDimInfo.mHorizGap + 2;
+		rect.width += info.mDimInfo.mHorizGap + 2;
+	}
+	else
+	{
+		rect.y      += (mHintGap*2 + height);
+		rect.height -= (height + 2*mHintGap);

-        rect.y      -= info.mDimInfo.mVertGap + 2;
-        rect.height += info.mDimInfo.mVertGap + 2;
-    }
+		rect.y      -= info.mDimInfo.mVertGap + 2;
+		rect.height += info.mDimInfo.mVertGap + 2;
+	}
 }

 void cbBarHintsPlugin::DoDrawHint( wxDC& dc, wxRect& rect, 
-                                   int pos, int boxOfs, int grooveOfs,
-                                   bool isFixed )
+								   int pos, int boxOfs, int grooveOfs,
+								   bool isFixed )
 {
-    if ( !isFixed )
-    {
-        if ( mpPane->IsHorizontal() )
-        {
-            if ( mCloseBoxOn )
+	if ( !isFixed )
+	{
+		if ( mpPane->IsHorizontal() )
+		{
+			if ( mCloseBoxOn )
+			
+				mBoxes[CLOSE_BOX_IDX]->Draw( dc );

-                mBoxes[CLOSE_BOX_IDX]->Draw( dc );
+			if ( mCollapseBoxOn )
+			
+				mBoxes[COLLAPSE_BOX_IDX]->Draw( dc );
+		}
+		else
+		{
+			if ( mCloseBoxOn )
+			
+				mBoxes[CLOSE_BOX_IDX]->Draw( dc );

-            if ( mCollapseBoxOn )
-            
-                mBoxes[COLLAPSE_BOX_IDX]->Draw( dc );
-        }
-        else
-        {
-            if ( mCloseBoxOn )
-            
-                mBoxes[CLOSE_BOX_IDX]->Draw( dc );
+			if ( mCollapseBoxOn )
+			
+				mBoxes[COLLAPSE_BOX_IDX]->Draw( dc );
+		}
+	}

-            if ( mCollapseBoxOn )
-            
-                mBoxes[COLLAPSE_BOX_IDX]->Draw( dc );
-        }
-    }
-
-    if ( mpPane->IsHorizontal() )
-    
-        DrawGrooves( dc, wxPoint( rect.x + mHintGap + grooveOfs, pos ), 
-                     rect.height - (pos - rect.y) - mHintGap );
-    else
-        DrawGrooves( dc, wxPoint( rect.x + mHintGap, rect.y + mHintGap + grooveOfs ), 
-                     (pos - rect.x) - mHintGap );
+	if ( mpPane->IsHorizontal() )
+	
+		DrawGrooves( dc, wxPoint( rect.x + mHintGap + grooveOfs, pos ), 
+					 rect.height - (pos - rect.y) - mHintGap );
+	else
+		DrawGrooves( dc, wxPoint( rect.x + mHintGap, rect.y + mHintGap + grooveOfs ), 
+					 (pos - rect.x) - mHintGap );
 }

 void cbBarHintsPlugin::GetHintsLayout( wxRect& rect, cbBarInfo& info, 
-                                       int& boxOfs, int& grooveOfs, int& pos )
+									   int& boxOfs, int& grooveOfs, int& pos )
 {
-    int boxHeight = BTN_BOX_HEIGHT;
-//  int boxWidth  = BTN_BOX_WIDTH + BOX_TO_GROOVE_GAP + BTN_BOX_WIDTH;
+	int boxHeight = BTN_BOX_HEIGHT;
+	int boxWidth  = BTN_BOX_WIDTH + BOX_TO_GROOVE_GAP + BTN_BOX_WIDTH;

-    // collapse and close box are not placed on fixed bars
+	// collapse and close box are not placed on fixed bars

-    if ( info.IsFixed() || ( !mCloseBoxOn && !mCollapseBoxOn ) )
-    {
-        boxHeight = 0;
-//      boxWidth = 0;
-    }
-/*
-    else
-    if ( !mCloseBoxOn || !mCollapseBoxOn )
+	if ( info.IsFixed() || ( !mCloseBoxOn && !mCollapseBoxOn ) )
+	{
+		boxHeight = 0;
+		boxWidth = 0;
+	}
+	else
+	if ( !mCloseBoxOn || !mCollapseBoxOn ) 

-        boxWidth = BTN_BOX_WIDTH;
-*/
-    int grooveHeight = mGrooveCount*(GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP) 
-                       - GROOVE_TO_GROOVE_GAP;
+		boxWidth = BTN_BOX_WIDTH;

-    int height = wxMax( grooveHeight, boxHeight );
+	int grooveHeight = mGrooveCount*(GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP) 
+		               - GROOVE_TO_GROOVE_GAP;

-    // center boxs and groves with respect to each other
+	int height = wxMax( grooveHeight, boxHeight );

-    boxOfs    = ( height - boxHeight    ) / 2;
-    grooveOfs = ( height - grooveHeight ) / 2;
+	// center boxs and groves with respect to each other

-    pos = ( mpPane->IsHorizontal() ) ? rect.y + mHintGap
-                                     : rect.x + rect.width - mHintGap;
+	boxOfs    = ( height - boxHeight    ) / 2;
+	grooveOfs = ( height - grooveHeight ) / 2;

-    // setup positions for boxes
+	pos = ( mpPane->IsHorizontal() ) ? rect.y + mHintGap
+									 : rect.x + rect.width - mHintGap;

-    if ( !info.IsFixed() )
-    {
-        // what direction "collapse-triangle" should look at?
+	// setup positions for boxes

-        bool& isAtLeft = ((cbCollapseBox*)(mBoxes[COLLAPSE_BOX_IDX]))->mIsAtLeft;
-         
-        isAtLeft= info.mBounds.x <= mpPane->mPaneWidth - ( info.mBounds.x + info.mBounds.width );
+	if ( !info.IsFixed() )
+	{
+		// what direction "collapse-triangle" should look at?

-        if ( info.IsExpanded() )
-        {
-            isAtLeft = FALSE;
+		bool& isAtLeft = ((cbCollapseBox*)(mBoxes[COLLAPSE_BOX_IDX]))->mIsAtLeft;
+		 
+		isAtLeft= info.mBounds.x <= mpPane->mPaneWidth - ( info.mBounds.x + info.mBounds.width );

-            cbBarInfo* pCur = info.mpPrev;
+		if ( info.IsExpanded() )
+		{
+			isAtLeft = FALSE;

-            while( pCur )
-            {
-                if ( !pCur->IsFixed() )
-                {
-                    isAtLeft = TRUE; break;
-                }
+			cbBarInfo* pCur = info.mpPrev;

-                pCur = pCur->mpPrev;
-            }
-        }
+			while( pCur )
+			{
+				if ( !pCur->IsFixed() )
+				{
+					isAtLeft = TRUE; break;
+				}

-        // collapse/expand works only when more not-fixed bars are present in the same row
+				pCur = pCur->mpPrev;
+			}
+		}

-        mBoxes[COLLAPSE_BOX_IDX]->Enable( info.mpRow->mNotFixedBarsCnt > 1 );
+		// collapse/expand works only when more not-fixed bars are present in the same row

-        int i;
-        for ( i = 0; i != BOXES_IN_HINT; ++i )
-        {
-            mBoxes[i]->mpPane = mpPane;
-        }
+		mBoxes[COLLAPSE_BOX_IDX]->Enable( info.mpRow->mNotFixedBarsCnt > 1 );

-        if ( mpPane->IsHorizontal() )
-        {
-            if ( mCloseBoxOn )
-            {
-                mBoxes[CLOSE_BOX_IDX]->mPos = wxPoint( rect.x + mHintGap + boxOfs, pos );
+      int i;
+		for( i = 0; i != BOXES_IN_HINT; ++i )

-                pos += BTN_BOX_HEIGHT;
-            }
+			mBoxes[i]->mpPane = mpPane;

-            if ( mCollapseBoxOn )
-            {
-                if ( mCloseBoxOn ) pos += BOX_T_BOX_GAP;

-                mBoxes[COLLAPSE_BOX_IDX]->mPos = wxPoint( rect.x + mHintGap + boxOfs, pos );
+		if ( mpPane->IsHorizontal() )
+		{
+			if ( mCloseBoxOn )
+			{
+				mBoxes[CLOSE_BOX_IDX]->mPos = wxPoint( rect.x + mHintGap + boxOfs, pos );

-                pos += BTN_BOX_HEIGHT;
+				pos += BTN_BOX_HEIGHT;
+			}

-                pos += BOX_TO_GROOVE_GAP;
-            }
-        }
-        else
-        {
-            if ( mCloseBoxOn )
-            {
-                pos -= BTN_BOX_WIDTH;
+			if ( mCollapseBoxOn )
+			{
+				if ( mCloseBoxOn ) pos += BOX_T_BOX_GAP;

-                mBoxes[CLOSE_BOX_IDX]->mPos = wxPoint( pos , rect.y + mHintGap + boxOfs );
-            }
+				mBoxes[COLLAPSE_BOX_IDX]->mPos = wxPoint( rect.x + mHintGap + boxOfs, pos );

-            if ( mCollapseBoxOn )
-            {
-                if ( mCloseBoxOn ) pos -= BOX_T_BOX_GAP;
+				pos += BTN_BOX_HEIGHT;

-                pos -= BTN_BOX_WIDTH;
+				pos += BOX_TO_GROOVE_GAP;
+			}
+		}
+		else
+		{
+			if ( mCloseBoxOn )
+			{
+				pos -= BTN_BOX_WIDTH;

-                mBoxes[COLLAPSE_BOX_IDX]->mPos = wxPoint( pos, rect.y + mHintGap + boxOfs );
+				mBoxes[CLOSE_BOX_IDX]->mPos = wxPoint( pos , rect.y + mHintGap + boxOfs );
+			}

-                pos -= BOX_TO_GROOVE_GAP;
-            }
-        }
-    }
+			if ( mCollapseBoxOn )
+			{
+				if ( mCloseBoxOn ) pos -= BOX_T_BOX_GAP;
+
+				pos -= BTN_BOX_WIDTH;
+
+				mBoxes[COLLAPSE_BOX_IDX]->mPos = wxPoint( pos, rect.y + mHintGap + boxOfs );
+
+				pos -= BOX_TO_GROOVE_GAP;
+			}
+		}
+	}
 }

 static inline bool is_in_box( const wxPoint& rectPos, const wxPoint& mousePos )
 {
-    return ( mousePos.x >= rectPos.x &&
-             mousePos.y >= rectPos.y &&
-             mousePos.x < rectPos.x + BTN_BOX_WIDTH &&
-             mousePos.y < rectPos.y + BTN_BOX_HEIGHT );
+	return ( mousePos.x >= rectPos.x &&
+			 mousePos.y >= rectPos.y &&
+			 mousePos.x < rectPos.x + BTN_BOX_WIDTH &&
+			 mousePos.y < rectPos.y + BTN_BOX_HEIGHT );
 }

 int cbBarHintsPlugin::HitTestHints( cbBarInfo& info, const wxPoint& pos )
 {
-    wxPoint inPane = pos;
-    mpPane->PaneToFrame( &inPane.x, &inPane.y );
+	wxPoint inPane = pos;
+	mpPane->PaneToFrame( &inPane.x, &inPane.y );

-    wxRect& rect = info.mBoundsInParent;
+	wxRect& rect = info.mBoundsInParent;

-    if ( info.IsFixed() ) return FALSE;
+	if ( info.IsFixed() ) return FALSE;

-    int boxOfs, grooveOfs, coord;
+	int boxOfs, grooveOfs, coord;

-    GetHintsLayout( rect, info, boxOfs, grooveOfs, coord );
+	GetHintsLayout( rect, info, boxOfs, grooveOfs, coord );

-    if ( mpPane->IsHorizontal() )
-    {
-        if ( mCloseBoxOn )
-        {
-            if ( is_in_box( wxPoint( rect.x + mHintGap + boxOfs, coord ), inPane ) )
+	if ( mpPane->IsHorizontal() )
+	{
+		if ( mCloseBoxOn )
+		{
+			if ( is_in_box( wxPoint( rect.x + mHintGap + boxOfs, coord ), inPane ) )

-                return CLOSE_BOX_HITTED;
+				return CLOSE_BOX_HITTED;

-            coord += BTN_BOX_HEIGHT;
-        }
+			coord += BTN_BOX_HEIGHT;
+		}

-        if ( mCollapseBoxOn )
-        {
-            if ( mCloseBoxOn ) coord += BOX_T_BOX_GAP;
+		if ( mCollapseBoxOn )
+		{
+			if ( mCloseBoxOn ) coord += BOX_T_BOX_GAP;

-            if ( is_in_box( wxPoint( rect.x + mHintGap + boxOfs, coord ), inPane ) )
+			if ( is_in_box( wxPoint( rect.x + mHintGap + boxOfs, coord ), inPane ) )

-                return COLLAPSE_BOX_HITTED;
+				return COLLAPSE_BOX_HITTED;

-            coord += BTN_BOX_HEIGHT;
-        }
-    }
-    else
-    {
-        if ( mCloseBoxOn )
-        {
-            coord -= BTN_BOX_WIDTH;
+			coord += BTN_BOX_HEIGHT;
+		}
+	}
+	else
+	{
+		if ( mCloseBoxOn )
+		{
+			coord -= BTN_BOX_WIDTH;

-            if ( is_in_box( wxPoint( coord , rect.y + mHintGap + boxOfs ), inPane ) )
+			if ( is_in_box( wxPoint( coord , rect.y + mHintGap + boxOfs ), inPane ) )

-                return CLOSE_BOX_HITTED;
-        }
+				return CLOSE_BOX_HITTED;
+		}

-        if ( mCollapseBoxOn )
-        {
-            if ( mCloseBoxOn ) coord -= BOX_T_BOX_GAP;
-            coord -= BTN_BOX_WIDTH;
+		if ( mCollapseBoxOn )
+		{
+			if ( mCloseBoxOn ) coord -= BOX_T_BOX_GAP;
+			coord -= BTN_BOX_WIDTH;

-            if ( is_in_box( wxPoint( coord, rect.y + mHintGap + boxOfs ), inPane ) )
+			if ( is_in_box( wxPoint( coord, rect.y + mHintGap + boxOfs ), inPane ) )

-                return COLLAPSE_BOX_HITTED;
-        }
-    }
+				return COLLAPSE_BOX_HITTED;
+		}
+	}

-    return FALSE;
+	return FALSE;
 }

 // handlers for plugin-events

 void cbBarHintsPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event )
 {
-    wxRect& rect     = event.mBoundsInParent;
-    mpPane           = event.mpPane;
+	wxRect& rect     = event.mBoundsInParent;
+	mpPane           = event.mpPane;

-    ExcludeHints( rect, *event.mpBar );
+	ExcludeHints( rect, *event.mpBar );

-    event.Skip(); // pass event to the next plugin in the chain
+	event.Skip(); // pass event to the next plugin in the chain
 }

 void cbBarHintsPlugin::OnDrawBarDecorations( cbDrawBarDecorEvent& event )
 {
-    wxRect& rect     = event.mBoundsInParent;
-    mpPane           = event.mpPane;
+	wxRect& rect     = event.mBoundsInParent;
+	mpPane           = event.mpPane;

-    int boxOfs, grooveOfs, pos;
+	int boxOfs, grooveOfs, pos;

-    GetHintsLayout( rect, *event.mpBar, boxOfs, grooveOfs, pos );
+	GetHintsLayout( rect, *event.mpBar, boxOfs, grooveOfs, pos );

-    DoDrawHint( *event.mpDc, rect, pos, boxOfs, grooveOfs, event.mpBar->IsFixed() );
+	DoDrawHint( *event.mpDc, rect, pos, boxOfs, grooveOfs, event.mpBar->IsFixed() );

-    // let other plugins add on their decorations
+	// let other plugins add on their decorations

-    event.Skip();
+	event.Skip();
 }

 void cbBarHintsPlugin::OnLeftDown( cbLeftDownEvent& event )
 {
-    mpPane           = event.mpPane;
-    wxPoint inFrame = event.mPos;
+	mpPane           = event.mpPane;

-    mpPane->PaneToFrame( &inFrame.x, &inFrame.y );
+	wxPoint inFrame = event.mPos;
+	mpPane->PaneToFrame( &inFrame.x, &inFrame.y );

-    wxBarIterator iter( mpPane->GetRowList() );
+	wxBarIterator iter( mpPane->GetRowList() );

-    mpClickedBar = NULL;
+	mpClickedBar = NULL;

-    while ( iter.Next() )
-    {
-        cbBarInfo& bar = iter.BarInfo();
+	while ( iter.Next() )
+	{
+		cbBarInfo& bar = iter.BarInfo();

-        int boxOfs, grooveOfs, pos;
+		int boxOfs, grooveOfs, pos;

-        GetHintsLayout( bar.mBoundsInParent, bar, boxOfs, grooveOfs, pos );
+		GetHintsLayout( bar.mBoundsInParent, bar, boxOfs, grooveOfs, pos );

-        if ( !bar.IsFixed() )
-        {
-            int i;
-            for ( i = 0; i != BOXES_IN_HINT; ++i )
-            {
-                mBoxes[i]->OnLeftDown( inFrame );
+		if ( !bar.IsFixed() )
+      {
+         int i;
+			for( i = 0; i != BOXES_IN_HINT; ++i )
+			{
+				mBoxes[i]->OnLeftDown( inFrame );

-                if ( mBoxes[i]->mPressed )
-                {
-                    mBtnPressed = TRUE;
-                    mpClickedBar = &bar;
+				if ( mBoxes[i]->mPressed )
+				{
+					mBtnPressed = TRUE;
+					mpClickedBar = &bar;

-                    return; // event handled
-                }
-            }
-        }
-    }
+					return; // event handled
+				}
+			}
+      }
+	}

-    event.Skip();
+	event.Skip();
 }

 void cbBarHintsPlugin::OnLeftUp( cbLeftUpEvent&   event )
 {
-    if ( mBtnPressed )
-    {
-        wxPoint inFrame = event.mPos;
-        mpPane->PaneToFrame( &inFrame.x, &inFrame.y );
+	if ( mBtnPressed )
+	{
+		wxPoint inFrame = event.mPos;
+		mpPane->PaneToFrame( &inFrame.x, &inFrame.y );

-        int boxOfs, grooveOfs, pos;
+		int boxOfs, grooveOfs, pos;

-        GetHintsLayout( mpClickedBar->mBoundsInParent, *mpClickedBar, boxOfs, grooveOfs, pos );
+		GetHintsLayout( mpClickedBar->mBoundsInParent, *mpClickedBar, boxOfs, grooveOfs, pos );

-        int result = HitTestHints( *mpClickedBar, event.mPos );
+		int result = HitTestHints( *mpClickedBar, event.mPos );

        int i;
-        for ( i = 0; i != BOXES_IN_HINT; ++i )
-        {
-            mBoxes[i]->OnLeftUp( inFrame );
+		for( i = 0; i != BOXES_IN_HINT; ++i )
+		{
+			mBoxes[i]->OnLeftUp( inFrame );

-            if ( mBoxes[i]->WasClicked() )
-            {
-                if ( i == 0 )
-                {
-                    mpLayout->SetBarState( mpClickedBar, wxCBAR_HIDDEN, TRUE );
-                }
-                else
-                {
-                    if ( mpClickedBar->IsExpanded() )
-                        mpPane->ContractBar( mpClickedBar );
-                    else
-                        mpPane->ExpandBar( mpClickedBar );
-                }
-            }
-        }
+			if ( mBoxes[i]->WasClicked() )
+			{
+				if ( i == 0 )

-        mBtnPressed = FALSE;
-        return;
-    }
-    else
-        event.Skip();
+					mpLayout->SetBarState( mpClickedBar, wxCBAR_HIDDEN, TRUE );
+				else
+				{
+					if ( mpClickedBar->IsExpanded() )
+
+						mpPane->ContractBar( mpClickedBar );
+					else
+						mpPane->ExpandBar( mpClickedBar );
+				}
+			}
+		}
+
+		mBtnPressed = FALSE;
+		return;
+	}
+	else
+		event.Skip();
 }

 void cbBarHintsPlugin::OnMotion( cbMotionEvent&   event )
 {
-    if ( mBtnPressed )
-    {
-        wxPoint inFrame = event.mPos;
-        mpPane->PaneToFrame( &inFrame.x, &inFrame.y );
+	if ( mBtnPressed )
+	{
+		wxPoint inFrame = event.mPos;
+		mpPane->PaneToFrame( &inFrame.x, &inFrame.y );

-        mpPane = event.mpPane;
+		mpPane = event.mpPane;

-        int i;
-        for ( i = 0; i != BOXES_IN_HINT; ++i )
-        {
-            mBoxes[i]->OnMotion( inFrame );
-        }
-    }
-    else
-        event.Skip();
+      int i;
+		for( i = 0; i != BOXES_IN_HINT; ++i )
+		
+			mBoxes[i]->OnMotion( inFrame );
+	}
+	else
+		event.Skip();
 }

 void cbBarHintsPlugin::OnInitPlugin()
 {
-    cbPluginBase::OnInitPlugin();
+	cbPluginBase::OnInitPlugin();

-    cbDockPane** panes = mpLayout->GetPanesArray();
+	cbDockPane** panes = mpLayout->GetPanesArray();

-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-    {    
-        if ( panes[i]->MatchesMask( mPaneMask ) )
-        {
-            panes[i]->mProps.mMinCBarDim.x = 25;
-            panes[i]->mProps.mMinCBarDim.y = 16;
-        }
-    }
-    CreateBoxes();
+   int i;
+	for( i = 0; i != MAX_PANES; ++i )
+   {	
+		if ( panes[i]->MatchesMask( mPaneMask ) )
+		{
+			panes[i]->mProps.mMinCBarDim.x = 25;
+			panes[i]->mProps.mMinCBarDim.y = 16;
+		}
+   }
+	CreateBoxes();
 }
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
--- a/contrib/src/fl/dyntbar.cpp
+++ b/contrib/src/fl/dyntbar.cpp
@@ -125,10 +125,10 @@ void wxDynamicToolBar::AddTool( int toolIndex,
 }

 void wxDynamicToolBar::AddTool( int toolIndex, 
-                                const wxString& imageFileName,
-                                wxBitmapType imageFileType, 
-                                const wxString& labelText, bool alignTextRight,
-                                bool isFlat )
+								const wxString& imageFileName,
+								int imageFileType, 
+								const wxString& labelText, bool alignTextRight,
+								bool isFlat )
 {
 	wxNewBitmapButton* pBtn =

--- a/contrib/src/fl/flVC.dsp
+++ b/contrib/src/fl/flVC.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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 /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" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
--- a/contrib/src/fl/frmview.cpp
+++ b/contrib/src/fl/frmview.cpp
@@ -6,7 +6,7 @@
 // Created:     02/01/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
+// Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -31,86 +31,86 @@

 BEGIN_EVENT_TABLE( wxFrameView, wxEvtHandler )

-    EVT_IDLE( wxFrameView::OnIdle )
+	EVT_IDLE( wxFrameView::OnIdle )

 END_EVENT_TABLE()

 void wxFrameView::OnIdle( wxIdleEvent& event)
 {
-    event.Skip();
+	event.Skip();

-    if ( mDoToolUpdates )
-    {
-        int o = 0;  //glt
-        ++o;
+	if ( mDoToolUpdates )
+	{
+		int o = 0;  //glt
+		++o;

-        // TBD::
-    }
+		// TBD::
+	}
 }

 /*** public methods ***/

 wxFrameView::wxFrameView()

-    : mpLayout( NULL ),
-      mpFrameMgr( NULL )
+	: mpLayout( NULL ),
+	  mpFrameMgr( NULL )
 {}

 wxFrameView::~wxFrameView()
 {
-    if ( mpLayout ) delete mpLayout;
+	if ( mpLayout ) delete mpLayout;
 }

 wxFrame* wxFrameView::GetParentFrame()
 {
-    return mpFrameMgr->GetParentFrame();
+	return mpFrameMgr->GetParentFrame();
 }

 wxWindow* wxFrameView::GetClientWindow()
 {
-    return mpFrameMgr->GetClientWindow();
+	return mpFrameMgr->GetClientWindow();
 }

 void wxFrameView::Activate()
 {
-    mpFrameMgr->ActivateView( this );
+	mpFrameMgr->ActivateView( this );
 }

 void wxFrameView::Deactivate()
 {
-    mpFrameMgr->DeactivateCurrentView();
+	mpFrameMgr->DeactivateCurrentView();
 }

 void wxFrameView::CreateLayout()
 {
-    mpLayout = new wxFrameLayout( GetParentFrame(), mpFrameMgr->GetClientWindow(), FALSE );
+	mpLayout = new wxFrameLayout( GetParentFrame(), mpFrameMgr->GetClientWindow(), FALSE );
 }

 wxFrameLayout* wxFrameView::GetLayout()
 {
-    return mpLayout;
+	return mpLayout;
 }

 void wxFrameView::SetToolUpdates( bool doToolUpdates )
 {
-    mDoToolUpdates = doToolUpdates;
+	mDoToolUpdates = doToolUpdates;
 }

 void wxFrameView::SetLayout( wxFrameLayout* pLayout )
 {
-    if ( mpLayout ) delete mpLayout;
+	if ( mpLayout ) delete mpLayout;

-    mpLayout = pLayout;
+	mpLayout = pLayout;
 }

 wxFrameManager& wxFrameView::GetFrameManager()
 {
-    return *mpFrameMgr;
+	return *mpFrameMgr;
 }

 void wxFrameView::RegisterMenu( const wxString& topMenuName )
 {
-    mTopMenus.Add( topMenuName );
+	mTopMenus.Add( topMenuName );
 }

 #if 0
@@ -121,32 +121,32 @@ void wxFrameView::RegisterMenu( const wxString& topMenuName )

 class wxFrameViewSerializer : public wxEvtHandlerSerializer
 {
-    DECLARE_SERIALIZER_CLASS( wxFrameViewSerializer );
+	DECLARE_SERIALIZER_CLASS( wxFrameViewSerializer );

-    static void Serialize( wxObject* pObj, wxObjectStorage& store );
+	static void Serialize( wxObject* pObj, wxObjectStorage& store );
 };

 IMPLEMENT_SERIALIZER_CLASS( wxFrameView, 
-                            wxFrameViewSerializer,
-                            wxFrameViewSerializer::Serialize,
-                            NO_CLASS_INIT )
+							wxFrameViewSerializer,
+							wxFrameViewSerializer::Serialize,
+							NO_CLASS_INIT )

 void wxFrameViewSerializer::Serialize( wxObject* pObj, wxObjectStorage& store )
 {
-    // wxFrameViewSerializer is a kind of wxEvtHandler - peform serialization of
-    // the base class first
+	// wxFrameViewSerializer is a kind of wxEvtHandler - peform serialization of
+	// the base class first

-    info.SerializeInherited( pObj, store );
+	info.SerializeInherited( pObj, store );

-    wxFrameView* pView = (wxFrameView*)pObj;
+	wxFrameView* pView = (wxFrameView*)pObj;

-    store.XchgObjPtr( (wxObject**) &pView->mpFrameMgr );
-    store.XchgObjPtr( (wxObject**) &pView->mpLayout );
-    store.XchgBool  ( pView->mDoToolUpdates );
+	store.XchgObjPtr( (wxObject**) &pView->mpFrameMgr );
+	store.XchgObjPtr( (wxObject**) &pView->mpLayout );
+	store.XchgBool  ( pView->mDoToolUpdates );

-    // serialize members in derived classes
+	// serialize members in derived classes

-    pView->OnSerialize( store );
+	pView->OnSerialize( store );
 }

 #endif
@@ -156,262 +156,263 @@ void wxFrameViewSerializer::Serialize( wxObject* pObj, wxObjectStorage& store )
 void wxFrameManager::DoSerialize( wxObjectStorage& store )
 {
 #if 0
-    store.AddInitialRef( mpFrameWnd );
-    store.AddInitialRef( this );
-    if ( mpClientWnd ) store.AddInitialRef( mpClientWnd );
+	store.AddInitialRef( mpFrameWnd );
+	store.AddInitialRef( this );
+	if ( mpClientWnd ) store.AddInitialRef( mpClientWnd );

-    store.XchgObj( (wxObject*) &mViews );
-    store.XchgInt( mActiveViewNo );
+	store.XchgObj( (wxObject*) &mViews );
+	store.XchgInt( mActiveViewNo );

-    store.Finalize(); // finish serialization
+	store.Finalize(); // finish serialization
 #endif 
 }

 void wxFrameManager::DestroyViews()
 {
-    DeactivateCurrentView();
+	DeactivateCurrentView();

-    wxNode* pNode = mViews.First();
+	wxNode* pNode = mViews.First();

-    while ( pNode )
-    {
-        delete (wxFrameView*)pNode->Data();
+	while( pNode )
+	{
+		delete (wxFrameView*)pNode->Data();

-        pNode = pNode->Next();
-    }
+		pNode = pNode->Next();
+	}

-    if ( mActiveViewNo != -1 && GetParentFrame() )
+	if ( mActiveViewNo != -1 && GetParentFrame() )

-        GetParentFrame()->SetNextHandler( NULL );
+		GetParentFrame()->SetNextHandler( NULL );
 }

 int wxFrameManager::GetViewNo( wxFrameView* pView )
 {
-    wxNode* pNode = mViews.First();
-    int n = 0;
+	wxNode* pNode = mViews.First();
+	int n = 0;

-    while ( pNode )
-    {
-        if ( (wxFrameView*)pNode->Data() == pView )
+	while( pNode )
+	{
+		if ( (wxFrameView*)pNode->Data() == pView )

-            return n;
+			return n;

-        ++n;
-        pNode = pNode->Next();
-    }
+		++n;
+		pNode = pNode->Next();
+	}

-    return -1;
+	return -1;
 }

 void wxFrameManager::EnableMenusForView( wxFrameView* pView, bool enable )
 {
-    wxMenuBar* pMenuBar = GetParentFrame()->GetMenuBar();
-    int count = pMenuBar->GetMenuCount();
+	wxMenuBar* pMenuBar = GetParentFrame()->GetMenuBar();
+	int count = pMenuBar->GetMenuCount();

-    if ( !pMenuBar )
-        return;
+	if ( !pMenuBar ) return;

-    wxStringListNode* pNode = pView->mTopMenus.GetFirst();
+	wxStringListNode* pNode = pView->mTopMenus.GetFirst();

-    int i;
-    while ( pNode )
-    {
-        for ( i = 0; i != count; ++i )
-        {
-            if ( pMenuBar->GetMenu(i)->GetTitle() == pNode->GetData() )
-                pMenuBar->EnableTop( i, enable );
-        }
+	while( pNode )
+	{
+		for( int i = 0; i != count; ++i )
+		{
+			if ( pMenuBar->GetMenu(i)->GetTitle() == pNode->GetData() )

-        pNode = pNode->GetNext();
-    }
+				pMenuBar->EnableTop( i, enable );
+		}
+
+		pNode = pNode->GetNext();
+	}
 }

 void wxFrameManager::SyncAllMenus()
 {
-    wxNode* pNode = mViews.First();
-    int i = 0;
+	wxNode* pNode = mViews.First();
+	int i = 0;

-    while ( pNode )
-    {
-        if ( i != mActiveViewNo )
+	while( pNode )
+	{
+		if ( i != mActiveViewNo )

-            EnableMenusForView( (wxFrameView*)pNode->GetData(), FALSE );
+			EnableMenusForView( (wxFrameView*)pNode->GetData(), FALSE );

-        pNode = pNode->Next();
-    }
+		pNode = pNode->Next();
+	}

-    EnableMenusForView( GetView( mActiveViewNo ), TRUE );
+	EnableMenusForView( GetView( mActiveViewNo ), TRUE );
 }

 /*** public methods ***/

 wxFrameManager::wxFrameManager()

-    : mpFrameWnd( NULL  ),
-      mActiveViewNo( -1 ),
-      mpClientWnd( NULL )
+	: mpFrameWnd( NULL  ),
+	  mActiveViewNo( -1 ),
+	  mpClientWnd( NULL )
 {
 }

 wxFrameManager::~wxFrameManager()
 {
-    SaveViewsNow();
-    DestroyViews();
+	SaveViewsNow();
+	DestroyViews();
 }

 void wxFrameManager::Init( wxWindow* pMainFrame, const wxString& settingsFile )
 {
-    mSettingsFile = settingsFile;
-    mpFrameWnd    = pMainFrame;
+	mSettingsFile = settingsFile;
+	mpFrameWnd    = pMainFrame;

-    wxNode* pNode = mViews.First();
+	wxNode* pNode = mViews.First();

-    while ( pNode )
-    {
-        wxFrameView* pView = (wxFrameView*)pNode->Data();
+	while( pNode )
+	{
+		wxFrameView* pView = (wxFrameView*)pNode->Data();

-        pView->OnInit();
-        pView->OnInitMenus();
+		pView->OnInit();
+		pView->OnInitMenus();

-        pNode = pNode->Next();
-    }
+		pNode = pNode->Next();
+	}

-    if ( !ReloadViews() )
-    {
-        // if loading of settings file failed (e.g. was not found), 
-        // do recreation of items in each view
+	if ( !ReloadViews() )
+	{
+		// if loading of settings file failed (e.g. was not found), 
+		// do recreation of items in each view

-        pNode = mViews.First();
+		pNode = mViews.First();

-        while ( pNode )
-        {
-            wxFrameView* pView = (wxFrameView*)pNode->Data();
+		while( pNode )
+		{
+			wxFrameView* pView = (wxFrameView*)pNode->Data();

-            pView->OnRecreate();
+			pView->OnRecreate();

-            pNode = pNode->Next();
-        }
-    }
+			pNode = pNode->Next();
+		}
+	}

-    if ( mActiveViewNo >= mViews.Number() )
-        mActiveViewNo = -1;
+	if ( mActiveViewNo >= mViews.Number() )
+	
+		mActiveViewNo = -1;

-    ActivateView( GetView( ( mActiveViewNo == -1 ) ? 0 : mActiveViewNo ) );
+	ActivateView( GetView( ( mActiveViewNo == -1 ) ? 0 : mActiveViewNo ) );

-    SyncAllMenus();
+	SyncAllMenus();
 }

 void wxFrameManager::AddView( wxFrameView* pFrmView )
 {
-    mViews.Append( pFrmView );
+	mViews.Append( pFrmView );

-    pFrmView->mpFrameMgr = this; // back ref.
+	pFrmView->mpFrameMgr = this; // back ref.
 }

 void wxFrameManager::RemoveView( wxFrameView* pFrmView )
 {
-    // TBD::
-    wxFAIL_MSG("wxFrameManager::RemoveView() has not been implemented yet.");
+	// TBD::
+	int avoidCompilerWarning = 0;
+	wxASSERT(avoidCompilerWarning);
 }

 int wxFrameManager::GetActiveViewNo()
 {
-    return mActiveViewNo;
+	return mActiveViewNo;
 }

 wxFrameView* wxFrameManager::GetActiveView()
 {
-    wxNode* pNode = mViews.Nth( mActiveViewNo );
+	wxNode* pNode = mViews.Nth( mActiveViewNo );

-    if ( pNode ) return (wxFrameView*)pNode->Data();
-            else return NULL;
+	if ( pNode ) return (wxFrameView*)pNode->Data();
+			else return NULL;
 }

 wxNode* wxFrameManager::GetActiveViewNode()
 {
-    return mViews.Nth( mActiveViewNo );
+	return mViews.Nth( mActiveViewNo );
 }

 wxFrame* wxFrameManager::GetParentFrame()
 {
-    return ((wxFrame*)mpFrameWnd);
+	return ((wxFrame*)mpFrameWnd);
 }

 wxWindow* wxFrameManager::GetParentWindow()
 {
-    return mpFrameWnd;
+	return mpFrameWnd;
 }

 wxFrameView* wxFrameManager::GetView( int viewNo )
 {
-    wxNode* pNode = mViews.Nth( viewNo );
+	wxNode* pNode = mViews.Nth( viewNo );

-    if ( pNode ) return (wxFrameView*)pNode->Data();
-            else return NULL;
+	if ( pNode ) return (wxFrameView*)pNode->Data();
+			else return NULL;
 }

 void wxFrameManager::ActivateView( int viewNo )
 {
-    ActivateView( GetView( viewNo ) );
+	ActivateView( GetView( viewNo ) );
 }

 void wxFrameManager::ActivateView( wxFrameView* pFrmView )
 {
-    DeactivateCurrentView();
+	DeactivateCurrentView();

-    mActiveViewNo = GetViewNo( pFrmView );
+	mActiveViewNo = GetViewNo( pFrmView );

-    if ( pFrmView->mpLayout )
+	if ( pFrmView->mpLayout )

-        pFrmView->mpLayout->Activate();
+		pFrmView->mpLayout->Activate();

-    // FIXME:: we would have used PushEventHandler(),
-    //         but wxFrame bypasses attached handlers when
-    //         handling wxCommand events!
+	// FIXME:: we would have used PushEventHandler(),
+	//         but wxFrame bypasses attached handlers when
+	//         handling wxCommand events!

-    GetParentFrame()->PushEventHandler( pFrmView );
+	GetParentFrame()->PushEventHandler( pFrmView );

-    EnableMenusForView( pFrmView, TRUE );
+	EnableMenusForView( pFrmView, TRUE );
 }

 void wxFrameManager::SetClinetWindow( wxWindow* pFrameClient )
 {
-    if ( mpClientWnd ) mpClientWnd->Destroy();
+	if ( mpClientWnd ) mpClientWnd->Destroy();

-    mpClientWnd = pFrameClient;
+	mpClientWnd = pFrameClient;
 }

 wxWindow* wxFrameManager::GetClientWindow()
 {
-    if ( !mpClientWnd )
+	if ( !mpClientWnd )

-        mpClientWnd = new wxWindow( GetParentFrame(), -1 );
+		mpClientWnd = new wxWindow( GetParentFrame(), -1 );

-    return mpClientWnd;
+	return mpClientWnd;
 }

 void wxFrameManager::DeactivateCurrentView()
 {
-    if ( mActiveViewNo == -1 )
-        return;
+	if ( mActiveViewNo == -1 ) return;

-    wxFrameView* pView = GetActiveView();
+	wxFrameView* pView = GetActiveView();

-    // FOR NOW::
-    wxASSERT( GetParentFrame()->GetEventHandler() == pView );
+	// FOR NOW::
+	wxASSERT( GetParentFrame()->GetEventHandler() == pView );

-    GetParentFrame()->PopEventHandler();
+	GetParentFrame()->PopEventHandler();

-    if ( pView->mpLayout )
-        pView->mpLayout->Deactivate();
+	if ( pView->mpLayout )

-    EnableMenusForView( pView, FALSE );
+		pView->mpLayout->Deactivate();
+
+	EnableMenusForView( pView, FALSE );
 }

 void wxFrameManager::SaveViewsNow()
 {
 #if 0
-    if ( mSettingsFile == "" ) return;
+	if ( mSettingsFile == "" ) return;

    wxIOStreamWrapper stm;
    stm.CreateForOutput( mSettingsFile );
@@ -423,14 +424,15 @@ void wxFrameManager::SaveViewsNow()

 bool wxFrameManager::ReloadViews()
 {
-    return FALSE;
+	return FALSE;

-    // TBD: ????
+	// TBD: ????
 #if 0
-    if ( mSettingsFile == "" || !wxFileExists( mSettingsFile ) ) 
-        return FALSE;
+	if ( mSettingsFile == "" || !wxFileExists( mSettingsFile ) ) 
+		
+		return FALSE;

-    DestroyViews();
+	DestroyViews();

    wxIOStreamWrapper stm;
    stm.CreateForInput( mSettingsFile );
@@ -438,12 +440,12 @@ bool wxFrameManager::ReloadViews()
    mStore.SetDataStream( stm );
    DoSerialize( mStore );

-    return TRUE;
+	return TRUE;
 #endif
 }

 bool wxFrameManager::ViewsAreLoaded()
 {
-    return ( mViews.Number() != 0 );
+	return ( mViews.Number() != 0 );
 }

--- a/contrib/src/fl/gcupdatesmgr.cpp
+++ b/contrib/src/fl/gcupdatesmgr.cpp
@@ -141,8 +141,7 @@ void cbGCUpdatesMgr::UpdateNow()

 	wxList mBarsToResize;

-	int n;
-	for ( n = 0; n != MAX_PANES; ++n )
+	for( int n = 0; n != MAX_PANES; ++n )
 	{
 		cbDockPane& pane = *(panes[n]);

@@ -165,7 +164,7 @@ void cbGCUpdatesMgr::UpdateNow()
 			cbBarInfo* pBar = pRow->GetFirstBar();

 			bool rowChanged = FALSE;
-//			bool rowBkPainted  = FALSE;
+			bool rowBkPainted  = FALSE;

 			// FIXME:: the below should not be fixed
 			cbBarInfo* barsToRepaint[128];
@@ -208,7 +207,7 @@ void cbGCUpdatesMgr::UpdateNow()

 				cbBarInfo* pCurBar = pRow->GetFirstBar();

-				while ( pCurBar )
+				while( pCurBar )
 				{
 					if ( WasChanged( pCurBar->mUMgrData, 
 									 pCurBar->mBoundsInParent ) )
@@ -227,7 +226,7 @@ void cbGCUpdatesMgr::UpdateNow()
 			else
 			if ( nBars != 0 )
 			{
-				for ( int i = 0; i != nBars; ++i )
+				for( int i = 0; i != nBars; ++i )

 					// postphone the resizement and refreshing the changed
 					// bar windows
--- a/contrib/src/fl/newbmpbtn.cpp
+++ b/contrib/src/fl/newbmpbtn.cpp
--- a/contrib/src/fl/panedrawpl.cpp
+++ b/contrib/src/fl/panedrawpl.cpp
@@ -381,7 +381,14 @@ void cbPaneDrawPlugin::OnLDblClick( cbLeftDClickEvent& event )
 											 &pBarToFloat ) == CB_BAR_CONTENT_HITTED
 		   )
 			{
-			return;
+				// TBD: ????
+				return;
+
+				mpLayout->SetBarState( pBarToFloat, wxCBAR_FLOATING, TRUE );
+
+				mpLayout->RepositionFloatedBar( pBarToFloat );
+
+				return; // event is "eaten" by this plugin
 			}

 		event.Skip();
@@ -432,7 +439,7 @@ void cbPaneDrawPlugin::OnLButtonDown( cbLeftDownEvent& event )
 		{
 			// otehrwise if bar handle dragged

-//			cbRowInfo& rowInfo     = *mpDraggedBar->mpRow;
+			cbRowInfo& rowInfo     = *mpDraggedBar->mpRow;
 			wxRect& bounds         = mpDraggedBar->mBounds;

 			mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? TRUE : FALSE;
@@ -728,27 +735,27 @@ void cbPaneDrawPlugin::OnDrawRowBackground ( cbDrawRowBkGroundEvent& event )
 	wxRect     rowBounds    = pRow->mBoundsInParent;
 	bool       isHorizontal	= event.mpPane->IsHorizontal();
 	
-//	int prevPos;
+	int prevPos;

 	if ( isHorizontal )
 	{
-//		prevPos = rowBounds.x;
-		// include one line above and below the row
+		prevPos = rowBounds.x;
+		// include one line obove and below the row
 		--rowBounds.y;
-		rowBounds.height += 2;
+		rowBounds.height +=2;

 		--rowBounds.x;
-		rowBounds.width  += 2;
+		rowBounds.width += 2;
 	}
 	else
 	{
-//		prevPos = rowBounds.y;
-		// include one line above and below the row
+		prevPos = rowBounds.y;
+		// include one line obove and below the row
 		--rowBounds.x;
-		rowBounds.width  += 2;
+		rowBounds.width += 2;

 		--rowBounds.y;
-		rowBounds.height += 2;
+		rowBounds.height +=2;
 	}

 //#define TEST_BK_ERASING
@@ -1163,7 +1170,7 @@ void cbPaneDrawPlugin::OnDrawPaneDecorations( cbDrawPaneDecorEvent& event )

 void cbPaneDrawPlugin::OnDrawBarDecorations( cbDrawBarDecorEvent& event )
 {
-//	cbBarInfo* pBar = event.mpBar;
+	cbBarInfo* pBar = event.mpBar;
 	wxDC&   dc      = *event.mpDc;

 	// draw brick borders
--- a/contrib/src/fl/rowdragpl.cpp
+++ b/contrib/src/fl/rowdragpl.cpp
@@ -229,7 +229,7 @@ void cbRowDragPlugin::OnMouseMove( cbMotionEvent& event )
 			// DBG::
 			wxPoint p = event.mPos;
 			wxPoint d = mDragOrigin;
-//			int dif = event.mPos.x - mDragOrigin.x;
+			int dif = event.mPos.x - mDragOrigin.x;

 			// row is dragged up or down;
 			ShowDraggedRow( pos.y - mDragOrigin.y );
@@ -239,7 +239,7 @@ void cbRowDragPlugin::OnMouseMove( cbMotionEvent& event )
 			// DBG::
 			wxPoint p = event.mPos;
 			wxPoint d = mDragOrigin;
-//			int dif = event.mPos.x - mDragOrigin.x;
+			int dif = event.mPos.x - mDragOrigin.x;

 			// row is dragged left or right
 			ShowDraggedRow( pos.x - mDragOrigin.x );
--- a/contrib/src/fl/rowlayoutpl.cpp
+++ b/contrib/src/fl/rowlayoutpl.cpp
--- a/contrib/src/fl/toolwnd.cpp
+++ b/contrib/src/fl/toolwnd.cpp
@@ -496,7 +496,8 @@ void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize&
 	}
 	else
 	{
-		wxFAIL( _T("what did the cursor hit?") );
+		int avoidCompilerWarning = 0;
+		wxASSERT(avoidCompilerWarning); // DBG::
 	}

 	rect.x = left;
--- a/contrib/src/fl/updatesmgr.cpp
+++ b/contrib/src/fl/updatesmgr.cpp
@@ -289,4 +289,3 @@ void cbSimpleUpdatesMgr::UpdateNow()
 	}
 }

-
--- a/contrib/src/gizmos/GizmosVC.dsp
+++ b/contrib/src/gizmos/GizmosVC.dsp
@@ -7,19 +7,19 @@
 CFG=GizmosVC - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "GizmosVC.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "GizmosVC.mak" CFG="GizmosVC - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "GizmosVC - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "GizmosVC - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE 

 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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 /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
@@ -76,7 +76,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\gizmosd.lib"

-!ENDIF
+!ENDIF 

 # Begin Target

@@ -87,7 +87,7 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File

-SOURCE=..\..\include\wx\gizmos\dynamicsash.h
+SOURCE=..\..\include\wx\gizmos\multicell.h
 # End Source File
 # Begin Source File

@@ -95,16 +95,16 @@ SOURCE=..\..\include\wx\gizmos\editlbox.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\gizmos\multicell.h
+SOURCE=..\..\include\wx\gizmos\splittree.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\gizmos\splittree.h
+SOURCE=..\..\include\wx\gizmos\dynamicsash.h
 # End Source File
 # End Group
 # Begin Source File

-SOURCE=.\dynamicsash.cpp
+SOURCE=.\multicell.cpp
 # End Source File
 # Begin Source File

@@ -112,15 +112,11 @@ SOURCE=.\editlbox.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\multicell.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\splittree.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\ledctrl.cpp
+SOURCE=.\dynamicsash.cpp
 # End Source File
 # End Target
 # End Project
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -13,13 +13,11 @@ LIBVERSION_AGE=0
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=gizmos

-HEADERS=multicell.h splittree.h editlbox.h dynamicsash.h ledctrl.h
+HEADERS=multicell.h splittree.h editlbox.h dynamicsash.h

-OBJECTS=multicell.o splittree.o editlbox.o dynamicsash.o ledctrl.o
-DEPFILES=$(OBJECTS:.o=.d)
+OBJECTS=multicell.o splittree.o editlbox.o dynamicsash.o

 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 include $(top_builddir)/src/makelib.env

-include $(DEPFILES)
--- a/contrib/src/gizmos/dynamicsash.cpp
+++ b/contrib/src/gizmos/dynamicsash.cpp
@@ -10,23 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__
-    #pragma implementation "splittree.h"
-#endif
-
-// 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
-
 #include "wx/gizmos/dynamicsash.h"

 /*
@@ -100,9 +83,6 @@ class wxDynamicSashReparentEvent : public wxEvent {
 public:
    wxDynamicSashReparentEvent();
    wxDynamicSashReparentEvent(wxObject *object);
-    wxDynamicSashReparentEvent(const wxDynamicSashReparentEvent& evt);
-
-    virtual wxEvent* Clone() const { return new wxDynamicSashReparentEvent(*this); }

    DECLARE_DYNAMIC_CLASS(wxDynamicSashReparentEvent);
 };
@@ -348,8 +328,7 @@ void wxDynamicSashWindowImpl::DrawSash(int x, int y) const {
    dc.SetBrush(brush);
    dc.SetLogicalFunction(wxXOR);

-    if ((m_dragging == DSR_CORNER) &&
-        (m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0) {
+    if (m_dragging == DSR_CORNER) {
        int cx = 0;
        int cy = 0;

@@ -551,6 +530,7 @@ void wxDynamicSashWindowImpl::Unify(int panel) {
 }

 void wxDynamicSashWindowImpl::Split(int px, int py) {
+    m_window->Hide();

    m_add_child_target = NULL;

@@ -597,8 +577,9 @@ void wxDynamicSashWindowImpl::Split(int px, int py) {
    m_leaf = NULL;

    m_container->Layout();
-}

+    m_window->Show();
+}

 /*  This code is called when you finish resizing a view by dragging the
    corner tab, but I think this implementation is lousy and will surprise
@@ -791,8 +772,7 @@ void wxDynamicSashWindowImpl::OnPress(wxMouseEvent &event) {
 }

 void wxDynamicSashWindowImpl::OnRelease(wxMouseEvent &event) {
-    if ((m_dragging == DSR_CORNER) &&
-        (m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0) {
+    if (m_dragging == DSR_CORNER) {
        DrawSash(m_drag_x, m_drag_y);
        m_container->ReleaseMouse();

@@ -894,7 +874,7 @@ bool wxDynamicSashWindowLeaf::Create() {
    m_viewport->SetEventHandler(this);
    Connect(-1, wxEVT_DYNAMIC_SASH_REPARENT, (wxObjectEventFunction)&wxDynamicSashWindowLeaf::OnReparent);

-    if (m_impl->m_window->GetWindowStyle() & wxDS_MANAGE_SCROLLBARS) {
+    if (m_impl->m_window->GetWindowStyle() & wxMANAGE_SCROLLBARS) {
        m_hscroll->SetEventHandler(this);
        m_vscroll->SetEventHandler(this);

@@ -991,7 +971,7 @@ DynamicSashRegion wxDynamicSashWindowLeaf::GetRegion(int x, int y) {

 void wxDynamicSashWindowLeaf::ResizeChild(wxSize size) {
    if (m_child) {
-        if (m_impl->m_window->GetWindowStyle() & wxDS_MANAGE_SCROLLBARS) {
+        if (m_impl->m_window->GetWindowStyle() & wxMANAGE_SCROLLBARS) {
            m_child->SetSize(size);
            wxSize best_size = m_child->GetBestSize();
            if (best_size.GetWidth() < size.GetWidth()) {
@@ -1102,6 +1082,7 @@ void wxDynamicSashWindowLeaf::OnPaint(wxPaintEvent &event) {
    dc.DrawLine(9, h - sh - 3, 9, h - 4);
    dc.DrawLine(9, h - 4, 3, h - 4);

+
    int cy = (h - sh + h - 6) / 2 + 1;
    int cx = (w - sw + w - 6) / 2 + 1;
    int sy = cy;
@@ -1154,8 +1135,7 @@ void wxDynamicSashWindowLeaf::OnMouseMove(wxMouseEvent &event) {
        cursor = wxCursor(wxCURSOR_SIZENS);
    } else if (region == DSR_VERTICAL_TAB) {
        cursor = wxCursor(wxCURSOR_SIZEWE);
-    } else if ((region == DSR_CORNER) &&
-               (m_impl->m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0) {
+    } else if (region == DSR_CORNER) {
        cursor = wxCursor(wxCURSOR_SIZENWSE);
    } else if (region == DSR_LEFT_EDGE || region == DSR_TOP_EDGE
                || region == DSR_RIGHT_EDGE || region == DSR_BOTTOM_EDGE) {
@@ -1180,9 +1160,6 @@ void wxDynamicSashWindowLeaf::OnLeave(wxMouseEvent &event) {
 void wxDynamicSashWindowLeaf::OnPress(wxMouseEvent &event) {
    DynamicSashRegion region = GetRegion(event.m_x, event.m_y);

-    if ((region == DSR_CORNER) && (m_impl->m_window->GetWindowStyle() & wxDS_DRAG_CORNER) == 0)
-        return;
-
    if (region == DSR_HORIZONTAL_TAB || region == DSR_VERTICAL_TAB || region == DSR_CORNER) {
        m_impl->m_dragging = region;
        m_impl->m_drag_x = event.m_x;
@@ -1260,11 +1237,6 @@ wxDynamicSashReparentEvent::wxDynamicSashReparentEvent(wxObject *object) {
    m_eventType = wxEVT_DYNAMIC_SASH_REPARENT;
 }

-wxDynamicSashReparentEvent::wxDynamicSashReparentEvent(const wxDynamicSashReparentEvent& evt)
-    : wxEvent(evt)
-{
-}
-
 IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashReparentEvent, wxEvent)

 /////////////////////////////////////////////////////////////////////////////
--- a/contrib/src/gizmos/editlbox.cpp
+++ b/contrib/src/gizmos/editlbox.cpp
@@ -82,7 +82,7 @@ END_EVENT_TABLE()

 IMPLEMENT_CLASS(wxEditableListBox, wxPanel)

-enum
+enum 
 {
    // ID value doesn't matter, it won't propagate out of wxEditableListBox
    // instance
@@ -111,7 +111,7 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
   : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name), m_edittingNew(FALSE)
 {
    wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-
+    
    wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize,
                                wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
    wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL);
@@ -121,32 +121,25 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
    m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE, wxBitmap(eldel_xpm));
    m_bUp = new wxBitmapButton(subp, wxID_ELB_UP, wxBitmap(elup_xpm));
    m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN, wxBitmap(eldown_xpm));
-
-    m_bEdit->SetToolTip(wxT("Edit item"));
-    m_bNew->SetToolTip(wxT("New item"));
-    m_bDel->SetToolTip(wxT("Delete item"));
-    m_bUp->SetToolTip(wxT("Move up"));
-    m_bDown->SetToolTip(wxT("Move down"));
-
    subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL);
    subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL);
    subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL);
    subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL);
    subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL);
-
+                  
    subp->SetAutoLayout(TRUE);
    subp->SetSizer(subsizer);
    subsizer->Fit(subp);
-
+    
    sizer->Add(subp, 0, wxEXPAND);
-    m_listCtrl = new CleverListCtrl(this, wxID_ELD_LISTCTRL,
+    m_listCtrl = new CleverListCtrl(this, wxID_ELD_LISTCTRL, 
                                    wxDefaultPosition, wxDefaultSize,
-                                    wxLC_REPORT | wxLC_NO_HEADER |
+                                    wxLC_REPORT | wxLC_NO_HEADER | 
                                    wxLC_SINGLE_SEL | wxSUNKEN_BORDER |
 									wxLC_EDIT_LABELS);
    wxArrayString empty_ar;
    SetStrings(empty_ar);
-
+    
    sizer->Add(m_listCtrl, 1, wxEXPAND);

    SetAutoLayout(TRUE);
@@ -158,11 +151,11 @@ void wxEditableListBox::SetStrings(const wxArrayString& strings)
 {
    m_listCtrl->DeleteAllItems();
    size_t i;
-
+    
    for (i = 0; i < strings.GetCount(); i++)
        m_listCtrl->InsertItem(i, strings[i]);
-
-    m_listCtrl->InsertItem(strings.GetCount(), _T(""));
+    
+    m_listCtrl->InsertItem(strings.GetCount(), _T(""));  
    m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }

@@ -185,7 +178,7 @@ void wxEditableListBox::OnItemSelected(wxListEvent& event)

 void wxEditableListBox::OnNewItem(wxCommandEvent& event)
 {
-    m_listCtrl->SetItemState(m_listCtrl->GetItemCount()-1,
+    m_listCtrl->SetItemState(m_listCtrl->GetItemCount()-1,  
                             wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
    m_edittingNew = TRUE;
    m_listCtrl->EditLabel(m_selection);
@@ -204,7 +197,7 @@ void wxEditableListBox::OnEndLabelEdit(wxListEvent& event)
 void wxEditableListBox::OnDelItem(wxCommandEvent& event)
 {
    m_listCtrl->DeleteItem(m_selection);
-    m_listCtrl->SetItemState(m_selection,
+    m_listCtrl->SetItemState(m_selection, 
                             wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }

@@ -216,7 +209,7 @@ void wxEditableListBox::OnEditItem(wxCommandEvent& event)
 void wxEditableListBox::OnUpItem(wxCommandEvent& event)
 {
    wxString t1, t2;
-
+    
    t1 = m_listCtrl->GetItemText(m_selection - 1);
    t2 = m_listCtrl->GetItemText(m_selection);
    m_listCtrl->SetItemText(m_selection - 1, t2);
@@ -228,7 +221,7 @@ void wxEditableListBox::OnUpItem(wxCommandEvent& event)
 void wxEditableListBox::OnDownItem(wxCommandEvent& event)
 {
    wxString t1, t2;
-
+    
    t1 = m_listCtrl->GetItemText(m_selection + 1);
    t2 = m_listCtrl->GetItemText(m_selection);
    m_listCtrl->SetItemText(m_selection + 1, t2);
--- a/contrib/src/gizmos/ledctrl.cpp
+++ b/contrib/src/gizmos/ledctrl.cpp
@@ -1,358 +0,0 @@
-// ============================================================================
-// headers
-// ============================================================================
-
-#ifdef __GNUG__
-    #pragma  implementation "wxLEDNumberCtrl.h"
-#endif
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
-    #include "wx/dcmemory.h"
-    #include "wx/intl.h"
-#endif
-
-#include "wx/gizmos/ledctrl.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// A LED digit is build up like this, with maximum 7 Lines :
-//
-// 111
-// 6 2
-// 777
-// 5 3
-// 444
-//
-// Each number contains combinations of the lines, and they are set up below.
-
-const int LINE1 = 1;
-const int LINE2 = 2;
-const int LINE3 = 4;
-const int LINE4 = 8;
-const int LINE5 = 16;
-const int LINE6 = 32;
-const int LINE7 = 64;
-
-const int DIGIT0 = LINE1 | LINE2 | LINE3 | LINE4 | LINE5 | LINE6;
-const int DIGIT1 = LINE2 | LINE3;
-const int DIGIT2 = LINE1 | LINE2 | LINE4 | LINE5 | LINE7;
-const int DIGIT3 = LINE1 | LINE2 | LINE3 | LINE4 | LINE7;
-const int DIGIT4 = LINE2 | LINE3 | LINE6 | LINE7;
-const int DIGIT5 = LINE1 | LINE3 | LINE4 | LINE6 | LINE7;
-const int DIGIT6 = LINE1 | LINE3 | LINE4 | LINE5 | LINE6 | LINE7;
-const int DIGIT7 = LINE1 | LINE2 | LINE3;
-const int DIGIT8 = LINE1 | LINE2 | LINE3 | LINE4 | LINE5 | LINE6 | LINE7;
-const int DIGIT9 = LINE1 | LINE2 | LINE3 | LINE6 | LINE7;
-const int DASH   = LINE7;
-
-const int DIGITALL = -1;
-
-// ============================================================================
-// wxLEDNumberCtrl class implementation
-// ============================================================================
-
-wxLEDNumberCtrl::wxLEDNumberCtrl()
-:   m_Alignment(wxLED_ALIGN_LEFT),
-    m_LineMargin(-1),
-    m_DigitMargin(-1),
-    m_LineLength(-1),
-    m_LineWidth(-1),
-    m_DrawFaded(FALSE),
-    m_LeftStartPos(-1)
-{
-}
-
-
-wxLEDNumberCtrl::wxLEDNumberCtrl(wxWindow *parent, wxWindowID id,
-                                 const wxPoint& pos, const wxSize& size,
-                                 long style)
-:   m_Alignment(wxLED_ALIGN_LEFT),
-    m_LineMargin(-1),
-    m_DigitMargin(-1),
-    m_LineLength(-1),
-    m_LineWidth(-1),
-    m_DrawFaded(FALSE),
-    m_LeftStartPos(-1)
-{
-    Create(parent, id, pos, size, style);
-}
-
-
-bool wxLEDNumberCtrl::Create(wxWindow *parent, wxWindowID id,
-                                 const wxPoint& pos, const wxSize& size,
-                                 long style)
-{
-    bool RetVal = wxControl::Create(parent, id, pos, size, style);
-
-    if ((style & wxLED_DRAW_FADED) != 0)
-        SetDrawFaded(TRUE);
-    if ((style & wxLED_ALIGN_MASK) != 0)
-        SetAlignment((wxLEDValueAlign)(style & wxLED_ALIGN_MASK));
-
-    SetBackgroundColour(*wxBLACK);
-    SetForegroundColour(*wxGREEN);
-
-    return RetVal;
-}
-
-
-void wxLEDNumberCtrl::SetAlignment(wxLEDValueAlign Alignment, bool Redraw)
-{
-    if (Alignment != m_Alignment)
-    {
-        m_Alignment = Alignment;
-        RecalcInternals(GetClientSize());
-
-        if (Redraw)
-            Refresh(FALSE);
-    }
-}
-
-
-void wxLEDNumberCtrl::SetDrawFaded(bool DrawFaded, bool Redraw)
-{
-    if (DrawFaded != m_DrawFaded)
-    {
-        m_DrawFaded = DrawFaded;
-
-        if (Redraw)
-            Refresh(FALSE);
-    }
-}
-
-
-void wxLEDNumberCtrl::SetValue(wxString const &Value, bool Redraw)
-{
-    if (Value != m_Value)
-    {
-        if (!Value.IsEmpty())
-        {
-            for(size_t i=0; i<Value.Length(); i++) {
-                wxChar ch = Value[i];
-                wxASSERT_MSG((ch>='0' && ch<='9') || ch=='-' || ch==' ',
-                             wxT("wxLEDNumberCtrl can only display numeric string values."));
-            }
-        }
-
-        m_Value = Value;
-        RecalcInternals(GetClientSize());
-
-        if (Redraw)
-            Refresh(FALSE);
-    }
-}
-
-
-BEGIN_EVENT_TABLE(wxLEDNumberCtrl, wxControl)
-    EVT_ERASE_BACKGROUND(wxLEDNumberCtrl::OnEraseBackground)
-    EVT_PAINT(wxLEDNumberCtrl::OnPaint)
-    EVT_SIZE(wxLEDNumberCtrl::OnSize)
-END_EVENT_TABLE()
-
-
-void wxLEDNumberCtrl::OnEraseBackground(wxEraseEvent &Event)
-{
-}
-
-
-void wxLEDNumberCtrl::OnPaint(wxPaintEvent &Event)
-{
-    wxPaintDC Dc(this);
-
-    int Width, Height;
-    GetClientSize(&Width, &Height);
-
-    wxBitmap *pMemoryBitmap = new wxBitmap(Width, Height);
-    wxMemoryDC MemDc;
-
-    MemDc.SelectObject(*pMemoryBitmap);
-    MemDc.BeginDrawing();
-
-    // Draw background.
-    MemDc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
-    MemDc.DrawRectangle(wxRect(0, 0, Width, Height));
-    MemDc.SetBrush(wxNullBrush);
-
-    // Iterate each digit in the value, and draw.
-    const int DigitCount = m_Value.Len();
-    for (int i = 0; i < DigitCount; ++i)
-    {
-        // Draw faded lines if wanted.
-        if (m_DrawFaded)
-            DrawDigit(MemDc, DIGITALL, i);
-
-        // Draw the digits.
-        switch (m_Value[i])
-        {
-            case '0' :
-                DrawDigit(MemDc, DIGIT0, i);
-                break;
-            case '1' :
-                DrawDigit(MemDc, DIGIT1, i);
-                break;
-            case '2' :
-                DrawDigit(MemDc, DIGIT2, i);
-                break;
-            case '3' :
-                DrawDigit(MemDc, DIGIT3, i);
-                break;
-            case '4' :
-                DrawDigit(MemDc, DIGIT4, i);
-                break;
-            case '5' :
-                DrawDigit(MemDc, DIGIT5, i);
-                break;
-            case '6' :
-                DrawDigit(MemDc, DIGIT6, i);
-                break;
-            case '7' :
-                DrawDigit(MemDc, DIGIT7, i);
-                break;
-            case '8' :
-                DrawDigit(MemDc, DIGIT8, i);
-                break;
-            case '9' :
-                DrawDigit(MemDc, DIGIT9, i);
-                break;
-            case '-' :
-                DrawDigit(MemDc, DASH, i);
-                break;
-            case ' ' :
-                // just skip it
-                break;
-            default :
-                wxFAIL_MSG(_("Unknown digit value"));
-                break;
-        }
-    }
-
-    MemDc.EndDrawing();
-
-    // Blit the memory dc to screen.
-    Dc.Blit(0, 0, Width, Height, &MemDc, 0, 0, wxCOPY);
-    delete pMemoryBitmap;
-}
-
-
-void wxLEDNumberCtrl::DrawDigit(wxDC &Dc, int Digit, int Column)
-{
-    wxColour LineColor(GetForegroundColour());
-
-    if (Digit == DIGITALL)
-    {
-        const int R = LineColor.Red() / 3;
-        const int G = LineColor.Green() / 3;
-        const int B = LineColor.Blue() / 3;
-
-        LineColor.Set(R, G, B);
-    }
-
-    int XPos = m_LeftStartPos;
-
-    if (Column > 0)
-        XPos += (Column * m_LineLength) + (m_DigitMargin) * Column;
-
-    // Create a pen and draw the lines.
-    wxPen Pen(LineColor, m_LineWidth, wxSOLID);
-    Dc.SetPen(Pen);
-
-    if ((Digit & LINE1))
-    {
-        Dc.DrawLine(XPos + m_LineMargin*2, m_LineMargin,
-            XPos + m_LineLength, m_LineMargin);
-	}
-
-    if (Digit & LINE2)
-    {
-        Dc.DrawLine(XPos + m_LineLength + m_LineMargin, m_LineMargin*2,
-            XPos + m_LineLength + m_LineMargin, m_LineLength + (m_LineMargin*2));
-    }
-
-    if (Digit & LINE3)
-    {
-        Dc.DrawLine(XPos + m_LineLength + m_LineMargin, m_LineLength + (m_LineMargin*4),
-            XPos + m_LineLength + m_LineMargin, m_LineLength*2 + (m_LineMargin*3));
-    }
-
-    if (Digit & LINE4)
-    {
-        Dc.DrawLine(XPos + m_LineMargin*2, m_LineLength*2 + (m_LineMargin*4),
-            XPos + m_LineLength, m_LineLength*2 + (m_LineMargin*4));
-    }
-
-    if (Digit & LINE5)
-    {
-        Dc.DrawLine(XPos + m_LineMargin, m_LineLength + (m_LineMargin*4),
-            XPos + m_LineMargin, m_LineLength*2 + (m_LineMargin*3));
-    }
-
-    if (Digit & LINE6)
-    {
-        Dc.DrawLine(XPos + m_LineMargin, m_LineMargin*2,
-            XPos + m_LineMargin, m_LineLength + (m_LineMargin*2));
-    }
-
-    if (Digit & LINE7)
-    {
-        Dc.DrawLine(XPos + m_LineMargin*2, m_LineLength + (m_LineMargin*3),
-            XPos + m_LineMargin + m_LineLength - m_LineMargin, m_LineLength + (m_LineMargin*3));
-    }
-
-    Dc.SetPen(wxNullPen);
-}
-
-
-void wxLEDNumberCtrl::RecalcInternals(const wxSize &CurrentSize)
-{
-    const int Height = CurrentSize.GetHeight();
-
-    if ((Height * 0.07) < 1)
-        m_LineMargin = 1;
-    else
-        m_LineMargin = Height * 0.07;
-
-    if ((Height * 0.35) < 1)
-        m_LineLength = 1;
-    else
-        m_LineLength = Height * 0.35;
-
-    m_LineWidth = m_LineMargin;
-
-    m_DigitMargin = m_LineMargin * 4;
-
-    const int ValueWidth = (m_LineLength + m_DigitMargin) * m_Value.Len();
-    const int ClientWidth = CurrentSize.GetWidth();
-
-    switch (m_Alignment)
-    {
-        case wxLED_ALIGN_LEFT :
-            m_LeftStartPos = 0;
-            break;
-        case wxLED_ALIGN_RIGHT :
-            m_LeftStartPos = ClientWidth - ValueWidth;
-            break;
-        case wxLED_ALIGN_CENTER :
-            m_LeftStartPos = (ClientWidth - ValueWidth) / 2;
-            break;
-        default :
-            wxFAIL_MSG(_("Unknown alignent value for wxLEDNumberCtrl."));
-            break;
-    }
-}
-
-
-void wxLEDNumberCtrl::OnSize(wxSizeEvent &Event)
-{
-    RecalcInternals(Event.GetSize());
-
-    Event.Skip();
-}
--- a/contrib/src/gizmos/makefile.b32
+++ b/contrib/src/gizmos/makefile.b32
@@ -2,7 +2,7 @@
 # File:		makefile.b32
 # Author:	Julian Smart
 # Created:	1999
-# Updated:
+# Updated:	
 # Copyright:
 #
 # Makefile : Builds Gizmos library for 32-bit BC++
@@ -11,7 +11,7 @@ WXDIR = $(WXWIN)

 LIBTARGET=$(WXDIR)\lib\gizmos.lib

-OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
+OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj

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

--- a/contrib/src/gizmos/makefile.bcc
+++ b/contrib/src/gizmos/makefile.bcc
@@ -2,7 +2,7 @@
 # File:		makefile.bcc
 # Author:	Julian Smart
 # Created:	1998
-# Updated:
+# Updated:	
 #
 # Builds Gizmos library for BC++, 16-bit

@@ -14,7 +14,7 @@ WXDIR = $(WXWIN)

 LIBTARGET=$(WXDIR)\lib\gizmos.lib

-OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
+OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj

 !include $(WXDIR)\src\makelib.bcc

--- a/contrib/src/gizmos/makefile.g95
+++ b/contrib/src/gizmos/makefile.g95
@@ -10,7 +10,7 @@
 WXDIR = ../../..

 LIBTARGET=$(WXDIR)/lib/libgizmos.a
-OBJECTS = multicell.o splittree.o editlbox.o dynamicsash.o ledctrl.o
+OBJECTS = multicell.o splittree.o editlbox.o dynamicsash.o

 include $(WXDIR)/src/makelib.g95

--- a/contrib/src/gizmos/makefile.vc
+++ b/contrib/src/gizmos/makefile.vc
@@ -23,7 +23,7 @@ LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\gizmos

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

-OBJECTS = $(D)\multicell.obj $(D)\splittree.obj $(D)\editlbox.obj $(D)\dynamicsash.obj $(D)\ledctrl.obj
+OBJECTS = $(D)\multicell.obj $(D)\splittree.obj $(D)\editlbox.obj $(D)\dynamicsash.obj

 LIBTARGET=$(WXDIR)\lib\gizmos$(LIBEXT).lib

--- a/contrib/src/gizmos/makefile.wat
+++ b/contrib/src/gizmos/makefile.wat
@@ -10,7 +10,7 @@ THISDIR = $(WXDIR)\contrib\src\gizmos
 NAME = gizmos
 LNK = $(name).lnk

-OBJECTS =  multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
+OBJECTS =  multicell.obj splittree.obj editlbox.obj dynamicsash.obj

 all: $(GIZMOSLIB)

--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -40,6 +40,8 @@
 #include "wx/msw/winundef.h"
 #endif

+#include "wx/generic/treectlg.h"
+
 #include "wx/gizmos/splittree.h"
 #include <math.h>

@@ -58,25 +60,17 @@ BEGIN_EVENT_TABLE(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
 #else
 BEGIN_EVENT_TABLE(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
 #endif
-    EVT_SIZE(wxRemotelyScrolledTreeCtrl::OnSize)
-    EVT_PAINT(wxRemotelyScrolledTreeCtrl::OnPaint)
-    EVT_TREE_ITEM_EXPANDED(-1, wxRemotelyScrolledTreeCtrl::OnExpand)
-    EVT_TREE_ITEM_COLLAPSED(-1, wxRemotelyScrolledTreeCtrl::OnExpand)
-    EVT_SCROLLWIN(wxRemotelyScrolledTreeCtrl::OnScroll)
+	EVT_SIZE(wxRemotelyScrolledTreeCtrl::OnSize)
+	EVT_TREE_ITEM_EXPANDED(-1, wxRemotelyScrolledTreeCtrl::OnExpand)
+	EVT_TREE_ITEM_COLLAPSED(-1, wxRemotelyScrolledTreeCtrl::OnExpand)
+	EVT_SCROLLWIN(wxRemotelyScrolledTreeCtrl::OnScroll)
 END_EVENT_TABLE()

-wxRemotelyScrolledTreeCtrl::wxRemotelyScrolledTreeCtrl(
-    wxWindow* parent, wxWindowID id, const wxPoint& pt,
-    const wxSize& sz, long style)
-    : wxTreeCtrl(parent, id, pt, sz, style & ~wxTR_ROW_LINES)
+wxRemotelyScrolledTreeCtrl::wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pt,
+        const wxSize& sz, long style):
+        wxTreeCtrl(parent, id, pt, sz, style)
 {
-    m_companionWindow = NULL;
-
-    // We draw the row lines ourself so they match what's done
-    // by the companion window.  That is why the flag is turned
-    // off above, so wxGenericTreeCtrl doesn't draw them in a
-    // different colour.
-    m_drawRowLines = (style & wxTR_ROW_LINES) != 0;
+	m_companionWindow = NULL;
 }

 wxRemotelyScrolledTreeCtrl::~wxRemotelyScrolledTreeCtrl()
@@ -85,20 +79,16 @@ wxRemotelyScrolledTreeCtrl::~wxRemotelyScrolledTreeCtrl()

 void wxRemotelyScrolledTreeCtrl::HideVScrollbar()
 {
-#if defined(__WXMSW__)
-#if USE_GENERIC_TREECTRL
+#ifdef __WXMSW__
    if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-#endif
    {
        ::ShowScrollBar((HWND) GetHWND(), SB_VERT, FALSE);
    }
-#if USE_GENERIC_TREECTRL
    else
+#endif
    {
        // Implicit in overriding SetScrollbars
    }
-#endif
-#endif
 }

 // Number of pixels per user unit (0 or -1 for no scrollbar)
@@ -109,19 +99,17 @@ void wxRemotelyScrolledTreeCtrl::SetScrollbars(int pixelsPerUnitX, int pixelsPer
                             int xPos, int yPos,
                             bool noRefresh)
 {
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
    {
        wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
        win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, 0, noUnitsX, 0, xPos, 0, noRefresh);

-        wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-        if (scrolledWindow)
-        {
+	    wxScrolledWindow* scrolledWindow = GetScrolledWindow();
+	    if (scrolledWindow)
+	    {
            scrolledWindow->SetScrollbars(0, pixelsPerUnitY, 0, noUnitsY, 0, yPos, noRefresh);
        }
    }
-#endif
 }

 // In case we're using the generic tree control.
@@ -129,7 +117,6 @@ int wxRemotelyScrolledTreeCtrl::GetScrollPos(int orient) const
 {
    wxScrolledWindow* scrolledWindow = GetScrolledWindow();

-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
    {
        wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
@@ -141,7 +128,6 @@ int wxRemotelyScrolledTreeCtrl::GetScrollPos(int orient) const
            return scrolledWindow->GetScrollPos(orient);
        }
    }
-#endif
    return 0;
 }

@@ -152,7 +138,6 @@ void wxRemotelyScrolledTreeCtrl::GetViewStart(int *x, int *y) const
 {
    wxScrolledWindow* scrolledWindow = GetScrolledWindow();

-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
    {

@@ -166,22 +151,20 @@ void wxRemotelyScrolledTreeCtrl::GetViewStart(int *x, int *y) const
        scrolledWindow->GetViewStart(& x2, & y2);
        * y = y2;
    }
-    else
-#endif
-    {
-        // x is wrong since the horizontal scrollbar is controlled by the
-        // tree control, but we probably don't need it.
+	else
+	{
+		// x is wrong since the horizontal scrollbar is controlled by the
+		// tree control, but we probably don't need it.
        scrolledWindow->GetViewStart(x, y);
-    }
+	}
 }

 // In case we're using the generic tree control.
 void wxRemotelyScrolledTreeCtrl::PrepareDC(wxDC& dc)
 {
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
    {
-        wxScrolledWindow* scrolledWindow = GetScrolledWindow();
+	    wxScrolledWindow* scrolledWindow = GetScrolledWindow();

        wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;

@@ -195,7 +178,6 @@ void wxRemotelyScrolledTreeCtrl::PrepareDC(wxDC& dc)
        dc.SetDeviceOrigin( -startX * xppu1, -startY * yppu2 );
        // dc.SetUserScale( win->GetScaleX(), win->GetScaleY() );
    }
-#endif
 }

 // Scroll to the given line (in scroll units where each unit is
@@ -203,142 +185,97 @@ void wxRemotelyScrolledTreeCtrl::PrepareDC(wxDC& dc)
 void wxRemotelyScrolledTreeCtrl::ScrollToLine(int posHoriz, int posVert)
 {
 #ifdef __WXMSW__
-#if USE_GENERIC_TREECTRL
    if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-#endif
    {
-        UINT sbCode = SB_THUMBPOSITION;
-        HWND vertScrollBar = 0;
-        MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar);
+	    UINT sbCode = SB_THUMBPOSITION;
+	    HWND vertScrollBar = 0;
+	    MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar);
    }
-#if USE_GENERIC_TREECTRL
    else
 #endif
-#endif
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
    {
        wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-        win->Refresh();
-        /* Doesn't work yet because scrolling is ignored by Scroll
+		win->Refresh();
+		/* Doesn't work yet because scrolling is ignored by Scroll
        int xppu, yppu;
-        wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-        if (scrolledWindow)
-        {
-            scrolledWindow->GetScrollPixelsPerUnit(& xppu, & yppu);
-            win->Scroll(-1, posVert*yppu);
-        }
-        */
+	    wxScrolledWindow* scrolledWindow = GetScrolledWindow();
+	    if (scrolledWindow)
+	    {
+			scrolledWindow->GetScrollPixelsPerUnit(& xppu, & yppu);
+			win->Scroll(-1, posVert*yppu);
+		}
+		*/
    }
-#endif
 }

 void wxRemotelyScrolledTreeCtrl::OnSize(wxSizeEvent& event)
 {
-    HideVScrollbar();
-    AdjustRemoteScrollbars();
-    event.Skip();
+	HideVScrollbar();
+	AdjustRemoteScrollbars();
+	event.Skip();
 }

 void wxRemotelyScrolledTreeCtrl::OnExpand(wxTreeEvent& event)
 {
-    AdjustRemoteScrollbars();
-    event.Skip();
+	AdjustRemoteScrollbars();
+	event.Skip();

    // If we don't have this, we get some bits of lines still remaining
    if (event.GetEventType() == wxEVT_COMMAND_TREE_ITEM_COLLAPSED)
        Refresh();

-    // Pass on the event
-    if (m_companionWindow)
-        m_companionWindow->GetEventHandler()->ProcessEvent(event);
+	// Pass on the event
+	if (m_companionWindow)
+		m_companionWindow->GetEventHandler()->ProcessEvent(event);
 }

-void wxRemotelyScrolledTreeCtrl::OnPaint(wxPaintEvent& event)
-{
-    wxPaintDC dc(this);
-
-    wxTreeCtrl::OnPaint(event);
-
-    if (! m_drawRowLines)
-        return;
-
-    // Reset the device origin since it may have been set
-    dc.SetDeviceOrigin(0, 0);
-
-    wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
-    dc.SetPen(pen);
-    dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
-    wxSize clientSize = GetClientSize();
-    wxRect itemRect;
-    int cy=0;
-    wxTreeItemId h, lastH;
-    for(h=GetFirstVisibleItem();h;h=GetNextVisible(h))
-    {
-        if (GetBoundingRect(h, itemRect))
-        {
-            cy = itemRect.GetTop();
-            dc.DrawLine(0, cy, clientSize.x, cy);
-            lastH = h;
-        }
-    }
-    if (GetBoundingRect(lastH, itemRect))
-    {
-        cy = itemRect.GetBottom();
-        dc.DrawLine(0, cy, clientSize.x, cy);
-    }
-}
-
-
 // Adjust the containing wxScrolledWindow's scrollbars appropriately
 void wxRemotelyScrolledTreeCtrl::AdjustRemoteScrollbars()
 {
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-    {
-        // This is for the generic tree control.
-        // It calls SetScrollbars which has been overridden
-        // to adjust the parent scrolled window vertical
-        // scrollbar.
-        ((wxGenericTreeCtrl*) this)->AdjustMyScrollbars();
+	{
+		// This is for the generic tree control.
+		// It calls SetScrollbars which has been overridden
+		// to adjust the parent scrolled window vertical
+		// scrollbar.
+		((wxGenericTreeCtrl*) this)->AdjustMyScrollbars();
        return;
-    }
-    else
-#endif
-    {
-        // This is for the wxMSW tree control
-        wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-        if (scrolledWindow)
-        {
-            wxRect itemRect;
-            if (GetBoundingRect(GetRootItem(), itemRect))
-            {
+	}
+	else
+	{
+		// This is for the wxMSW tree control
+		wxScrolledWindow* scrolledWindow = GetScrolledWindow();
+		if (scrolledWindow)
+		{
+			wxRect itemRect;
+			if (GetBoundingRect(GetRootItem(), itemRect))
+			{
                // Actually, the real height seems to be 1 less than reported
                // (e.g. 16 instead of 16)
                int itemHeight = itemRect.GetHeight() - 1;
-
-                int w, h;
-                GetClientSize(&w, &h);
-
-                wxRect rect(0, 0, 0, 0);
-                CalcTreeSize(rect);
+				
+				int w, h;
+				GetClientSize(&w, &h);
+				
+				wxRect rect(0, 0, 0, 0);
+				CalcTreeSize(rect);

                double f = ((double) (rect.GetHeight()) / (double) itemHeight)  ;
                int treeViewHeight = (int) ceil(f);
-
-                int scrollPixelsPerLine = itemHeight;
-                int scrollPos = - (itemRect.y / itemHeight);
-
-                scrolledWindow->SetScrollbars(0, scrollPixelsPerLine, 0, treeViewHeight, 0, scrollPos);
-
-                // Ensure that when a scrollbar becomes hidden or visible,
-                // the contained window sizes are right.
-                // Problem: this is called too early (?)
-                wxSizeEvent event(scrolledWindow->GetSize(), scrolledWindow->GetId());
-                scrolledWindow->GetEventHandler()->ProcessEvent(event);
-            }
-        }
-    }
+				
+				int scrollPixelsPerLine = itemHeight;
+				int scrollPos = - (itemRect.y / itemHeight);
+				
+				scrolledWindow->SetScrollbars(0, scrollPixelsPerLine, 0, treeViewHeight, 0, scrollPos);
+				
+				// Ensure that when a scrollbar becomes hidden or visible,
+				// the contained window sizes are right.
+				// Problem: this is called too early (?)
+				wxSizeEvent event(scrolledWindow->GetSize(), scrolledWindow->GetId());
+				scrolledWindow->GetEventHandler()->ProcessEvent(event);
+			}
+		}
+	}
 }


@@ -351,10 +288,10 @@ static wxRect CombineRectangles(const wxRect& rect1, const wxRect& rect2)
    int bottom1 = rect1.GetBottom();
    int right2 = rect2.GetRight();
    int bottom2 = rect2.GetBottom();
-
+    
    wxPoint topLeft = wxPoint(wxMin(rect1.x, rect2.x), wxMin(rect1.y, rect2.y));
    wxPoint bottomRight = wxPoint(wxMax(right1, right2), wxMax(bottom1, bottom2));
-
+    
    rect.x = topLeft.x; rect.y = topLeft.y;
    rect.SetRight(bottomRight.x);
    rect.SetBottom(bottomRight.y);
@@ -367,40 +304,40 @@ static wxRect CombineRectangles(const wxRect& rect1, const wxRect& rect2)
 // correctly
 void wxRemotelyScrolledTreeCtrl::CalcTreeSize(wxRect& rect)
 {
-    CalcTreeSize(GetRootItem(), rect);
+	CalcTreeSize(GetRootItem(), rect);
 }

 void wxRemotelyScrolledTreeCtrl::CalcTreeSize(const wxTreeItemId& id, wxRect& rect)
 {
-    // More efficient implementation would be to find the last item (but how?)
-    // Q: is the bounding rect relative to the top of the virtual tree workspace
-    // or the top of the window? How would we convert?
-    wxRect itemSize;
-    if (GetBoundingRect(id, itemSize))
-    {
-        rect = CombineRectangles(rect, itemSize);
-    }
+	// More efficient implementation would be to find the last item (but how?)
+	// Q: is the bounding rect relative to the top of the virtual tree workspace
+	// or the top of the window? How would we convert?
+	wxRect itemSize;
+	if (GetBoundingRect(id, itemSize))
+	{
+		rect = CombineRectangles(rect, itemSize);
+	}

-    long cookie;
-    wxTreeItemId childId = GetFirstChild(id, cookie);
-    while (childId != 0)
-    {
-        CalcTreeSize(childId, rect);
-        childId = GetNextChild(childId, cookie);
-    }
+	long cookie;
+	wxTreeItemId childId = GetFirstChild(id, cookie);
+	while (childId != 0)
+	{
+		CalcTreeSize(childId, rect);
+		childId = GetNextChild(childId, cookie);
+	}
 }

 // Find the scrolled window that contains this control
 wxScrolledWindow* wxRemotelyScrolledTreeCtrl::GetScrolledWindow() const
 {
-    wxWindow* parent = wxWindow::GetParent();
-    while (parent)
-    {
-        if (parent->IsKindOf(CLASSINFO(wxScrolledWindow)))
-            return (wxScrolledWindow*) parent;
-        parent = parent->GetParent();
-    }
-    return NULL;
+	wxWindow* parent = wxWindow::GetParent();
+	while (parent)
+	{
+		if (parent->IsKindOf(CLASSINFO(wxScrolledWindow)))
+			return (wxScrolledWindow*) parent;
+		parent = parent->GetParent();
+	}
+	return NULL;
 }

 void wxRemotelyScrolledTreeCtrl::OnScroll(wxScrollWinEvent& event)
@@ -430,78 +367,78 @@ void wxRemotelyScrolledTreeCtrl::OnScroll(wxScrollWinEvent& event)
 IMPLEMENT_CLASS(wxTreeCompanionWindow, wxWindow)

 BEGIN_EVENT_TABLE(wxTreeCompanionWindow, wxWindow)
-    EVT_PAINT(wxTreeCompanionWindow::OnPaint)
-    EVT_SCROLLWIN(wxTreeCompanionWindow::OnScroll)
-    EVT_TREE_ITEM_EXPANDED(-1, wxTreeCompanionWindow::OnExpand)
-    EVT_TREE_ITEM_COLLAPSED(-1, wxTreeCompanionWindow::OnExpand)
+	EVT_PAINT(wxTreeCompanionWindow::OnPaint)
+	EVT_SCROLLWIN(wxTreeCompanionWindow::OnScroll)
+	EVT_TREE_ITEM_EXPANDED(-1, wxTreeCompanionWindow::OnExpand)
+	EVT_TREE_ITEM_COLLAPSED(-1, wxTreeCompanionWindow::OnExpand)
 END_EVENT_TABLE()

 wxTreeCompanionWindow::wxTreeCompanionWindow(wxWindow* parent, wxWindowID id,
      const wxPoint& pos,
      const wxSize& sz,
      long style):
-    wxWindow(parent, id, pos, sz, style)
+	wxWindow(parent, id, pos, sz, style)
 {
-    m_treeCtrl = NULL;
+	m_treeCtrl = NULL;
 }

 void wxTreeCompanionWindow::DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect)
 {
-    // TEST CODE
+	// TEST CODE
 #if 1
-    if (m_treeCtrl)
-    {
-        wxString text = m_treeCtrl->GetItemText(id);
-        dc.SetTextForeground(* wxBLACK);
-        dc.SetBackgroundMode(wxTRANSPARENT);
+	if (m_treeCtrl)
+	{
+		wxString text = m_treeCtrl->GetItemText(id);
+		dc.SetTextForeground(* wxBLACK);
+		dc.SetBackgroundMode(wxTRANSPARENT);

-        int textW, textH;
-        dc.GetTextExtent(text, & textW, & textH);
+		int textW, textH;
+		dc.GetTextExtent(text, & textW, & textH);

-        int x = 5;
-        int y = rect.GetY() + wxMax(0, (rect.GetHeight() - textH) / 2);
+		int x = 5;
+		int y = rect.GetY() + wxMax(0, (rect.GetHeight() - textH) / 2);

-        dc.DrawText(text, x, y);
-    }
+		dc.DrawText(text, x, y);
+	}
 #endif
 }

 void wxTreeCompanionWindow::OnPaint(wxPaintEvent& event)
 {
-    wxPaintDC dc(this);
+	wxPaintDC dc(this);

    if (!m_treeCtrl)
        return;

        wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
-    dc.SetPen(pen);
-    dc.SetBrush(* wxTRANSPARENT_BRUSH);
-    wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-    dc.SetFont(font);
+	dc.SetPen(pen);
+	dc.SetBrush(* wxTRANSPARENT_BRUSH);
+	wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+	dc.SetFont(font);

    wxSize clientSize = GetClientSize();
-    wxRect itemRect;
-    int cy=0;
-    wxTreeItemId h, lastH;
-    for(h=m_treeCtrl->GetFirstVisibleItem();h;h=m_treeCtrl->GetNextVisible(h))
-    {
-        if (m_treeCtrl->GetBoundingRect(h, itemRect))
-        {
-            cy = itemRect.GetTop();
-            wxRect drawItemRect(0, cy, clientSize.x, itemRect.GetHeight());
+	wxRect itemRect;
+	int cy=0;
+	wxTreeItemId h, lastH;
+	for(h=m_treeCtrl->GetFirstVisibleItem();h;h=m_treeCtrl->GetNextVisible(h))
+	{
+		if (m_treeCtrl->GetBoundingRect(h, itemRect))
+		{
+			cy = itemRect.GetTop();
+			wxRect drawItemRect(0, cy, clientSize.x, itemRect.GetHeight());

-            lastH = h;
+			lastH = h;

-            // Draw the actual item
-            DrawItem(dc, h, drawItemRect);
-            dc.DrawLine(0, cy, clientSize.x, cy);
-        }
-    }
-    if (lastH.IsOk() && m_treeCtrl->GetBoundingRect(lastH, itemRect))
-    {
-        cy = itemRect.GetBottom();
-        dc.DrawLine(0, cy, clientSize.x, cy);
-    }
+			// Draw the actual item
+			DrawItem(dc, h, drawItemRect);
+			dc.DrawLine(0, cy, clientSize.x, cy);
+		}
+	}
+	if (lastH.IsOk() && m_treeCtrl->GetBoundingRect(lastH, itemRect))
+	{
+		cy = itemRect.GetBottom();
+		dc.DrawLine(0, cy, clientSize.x, cy);
+	}
 }

 void wxTreeCompanionWindow::OnScroll(wxScrollWinEvent& event)
@@ -515,15 +452,15 @@ void wxTreeCompanionWindow::OnScroll(wxScrollWinEvent& event)
    if (!m_treeCtrl)
        return;

-    // TODO: scroll the window physically instead of just refreshing.
-    Refresh(TRUE);
+	// TODO: scroll the window physically instead of just refreshing.
+	Refresh(TRUE);
 }

 void wxTreeCompanionWindow::OnExpand(wxTreeEvent& event)
 {
-    // TODO: something more optimized than simply refresh the whole
-    // window when the tree is expanded/collapsed. Tricky.
-    Refresh();
+	// TODO: something more optimized than simply refresh the whole
+	// window when the tree is expanded/collapsed. Tricky.
+	Refresh();
 }

 /*
@@ -533,7 +470,7 @@ void wxTreeCompanionWindow::OnExpand(wxTreeEvent& event)
 IMPLEMENT_CLASS(wxThinSplitterWindow, wxSplitterWindow)

 BEGIN_EVENT_TABLE(wxThinSplitterWindow, wxSplitterWindow)
-    EVT_SIZE(wxThinSplitterWindow::OnSize)
+	EVT_SIZE(wxThinSplitterWindow::OnSize)
 END_EVENT_TABLE()

 wxThinSplitterWindow::wxThinSplitterWindow(wxWindow* parent, wxWindowID id,
@@ -546,9 +483,9 @@ wxThinSplitterWindow::wxThinSplitterWindow(wxWindow* parent, wxWindowID id,

 void wxThinSplitterWindow::SizeWindows()
 {
-    // The client size may have changed inbetween
-    // the sizing of the first window and the sizing of
-    // the second. So repeat SizeWindows.
+	// The client size may have changed inbetween
+	// the sizing of the first window and the sizing of
+	// the second. So repeat SizeWindows.
    wxSplitterWindow::SizeWindows();
    wxSplitterWindow::SizeWindows();
 }
@@ -556,7 +493,7 @@ void wxThinSplitterWindow::SizeWindows()
 // Tests for x, y over sash
 bool wxThinSplitterWindow::SashHitTest(int x, int y, int tolerance)
 {
-    return wxSplitterWindow::SashHitTest(x, y, 4);
+	return wxSplitterWindow::SashHitTest(x, y, 4);
 }

 void wxThinSplitterWindow::DrawSash(wxDC& dc)
@@ -569,42 +506,42 @@ void wxThinSplitterWindow::DrawSash(wxDC& dc)
    int w, h;
    GetClientSize(&w, &h);

-    if ( m_splitMode == wxSPLIT_VERTICAL )
-    {
-        dc.SetPen(* m_facePen);
-        dc.SetBrush(* m_faceBrush);
-        int h1 = h-1;
-        int y1 = 0;
-        if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
-            h1 += 1; // Not sure why this is necessary...
-        if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
-        {
-            y1 = 2; h1 -= 3;
-        }
-        dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1);
-    }
-    else
-    {
-        dc.SetPen(* m_facePen);
-        dc.SetBrush(* m_faceBrush);
-        int w1 = w-1;
-        int x1 = 0;
-        if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
-            w1 ++;
-        if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
-        {
-            x1 = 2; w1 -= 3;
-        }
-        dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize);
-    }
-
+	if ( m_splitMode == wxSPLIT_VERTICAL )
+	{
+		dc.SetPen(* m_facePen);
+		dc.SetBrush(* m_faceBrush);
+		int h1 = h-1;
+		int y1 = 0;
+		if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
+			h1 += 1; // Not sure why this is necessary...
+		if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
+		{
+			y1 = 2; h1 -= 3;
+		}
+		dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1);
+	}
+	else
+	{
+		dc.SetPen(* m_facePen);
+		dc.SetBrush(* m_faceBrush);
+		int w1 = w-1;
+		int x1 = 0;
+		if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
+			w1 ++;
+		if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
+		{
+			x1 = 2; w1 -= 3;
+		}
+		dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize);
+	}
+	
    dc.SetPen(wxNullPen);
    dc.SetBrush(wxNullBrush);
 }

 void wxThinSplitterWindow::OnSize(wxSizeEvent& event)
 {
-    wxSplitterWindow::OnSize(event);
+	wxSplitterWindow::OnSize(event);
 }

 /*
@@ -614,8 +551,8 @@ void wxThinSplitterWindow::OnSize(wxSizeEvent& event)
 IMPLEMENT_CLASS(wxSplitterScrolledWindow, wxScrolledWindow)

 BEGIN_EVENT_TABLE(wxSplitterScrolledWindow, wxScrolledWindow)
-    EVT_SCROLLWIN(wxSplitterScrolledWindow::OnScroll)
-    EVT_SIZE(wxSplitterScrolledWindow::OnSize)
+	EVT_SCROLLWIN(wxSplitterScrolledWindow::OnScroll)
+	EVT_SIZE(wxSplitterScrolledWindow::OnSize)
 END_EVENT_TABLE()

 wxSplitterScrolledWindow::wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id,
@@ -628,11 +565,11 @@ wxSplitterScrolledWindow::wxSplitterScrolledWindow(wxWindow* parent, wxWindowID

 void wxSplitterScrolledWindow::OnSize(wxSizeEvent& event)
 {
-    wxSize sz = GetClientSize();
-    if (GetChildren().First())
-    {
-        ((wxWindow*) GetChildren().First()->Data())->SetSize(0, 0, sz.x, sz.y);
-    }
+	wxSize sz = GetClientSize();
+	if (GetChildren().First())
+	{
+		((wxWindow*) GetChildren().First()->Data())->SetSize(0, 0, sz.x, sz.y);
+	}
 }

 void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
@@ -646,7 +583,7 @@ void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
        return;
    }
    inOnScroll = TRUE;
-
+    
    int orient = event.GetOrientation();

    int nScrollInc = CalcScrollInc(event);
--- a/Show More
+++ b/Show More