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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_3_1@10870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 20:15:35 +00:00
3332 changed files with 168314 additions and 856531 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -25,10 +25,6 @@ Release
 Debug
 ReleaseDLL
 DebugDLL
-UnivRelease
-UnivDebug
-BaseRelease
-BaseDebug
 robert
 stamp-h.in
 Makefile
@@ -41,9 +37,6 @@ base
 gtk
 motif
 win32
-univ
-univ-debug
-univ-release
 base-debug
 gtk-debug
 motif-debug
@@ -53,5 +46,3 @@ gtk-release
 motif-release
 win32-release
 *tags
-log
-univtags.cmd
--- 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,60 +15,101 @@ 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) -o $@ $<

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

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

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

 srcdir = @srcdir@
-top_srcdir = @top_srcdir@

-VP1 = @TOOLKIT_VPATH@
-VP2 = @top_srcdir@/src/common
-VP3 = @top_srcdir@/src/generic
-VP4 = @top_srcdir@/src/unix
-VP5 = @top_srcdir@/src/html
-VP6 = @top_srcdir@/src/png
-VP7 = @top_srcdir@/src/jpeg
-VP8 = @top_srcdir@/src/tiff
-VP9 = @top_srcdir@/src/zlib
-VPA = @top_srcdir@/src/regex
-VP10 = @top_srcdir@/src/iodbc
-VP11 = @top_srcdir@/src/msw/ole
+VP1 = @top_srcdir@/src/common
+VP2 = @top_srcdir@/src/@TOOLKIT_DIR@
+VP3 = @top_srcdir@/src/motif/xmcombo
+VP4 = @top_srcdir@/src/generic
+VP5 = @top_srcdir@/src/unix
+VP6 = @top_srcdir@/src/html
+VP7 = @top_srcdir@/src/png
+VP8 = @top_srcdir@/src/jpeg
+VP9 = @top_srcdir@/src/tiff
+VP10 = @top_srcdir@/src/zlib
+VP11 = @top_srcdir@/src/iodbc
+VP12 = @top_srcdir@/src/msw/ole
+
+FTVP01 = @top_srcdir@/src/freetype/unix
+FTVP02 = @top_srcdir@/src/freetype/autohint
+FTVP03 = @top_srcdir@/src/freetype/base
+FTVP04 = @top_srcdir@/src/freetype/cff
+FTVP05 = @top_srcdir@/src/freetype/cid
+FTVP06 = @top_srcdir@/src/freetype/macfond
+FTVP07 = @top_srcdir@/src/freetype/otlayout
+FTVP08 = @top_srcdir@/src/freetype/psnames
+FTVP09 = @top_srcdir@/src/freetype/raster1
+FTVP10 = @top_srcdir@/src/freetype/sfnt
+FTVP11 = @top_srcdir@/src/freetype/smooth
+FTVP12 = @top_srcdir@/src/freetype/truetype
+FTVP13 = @top_srcdir@/src/freetype/type1
+FTVP14 = @top_srcdir@/src/freetype/type1z
+FTVP15 = @top_srcdir@/src/freetype/winfonts
+
+VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP14 = $(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@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf

+top_srcdir = @top_srcdir@
 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 +134,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 +153,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
@@ -137,7 +175,7 @@ WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//
 # this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
 # ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
 # .d and .h/.inl files for the current toolkit
-include @PORT_FILES@
+include $(top_srcdir)/@PORT_FILES@

 SOURCES = $(ALL_SOURCES)
 HEADERS = $(ALL_HEADERS)
@@ -145,16 +183,11 @@ 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)
-REGEXOBJS = \
-		regcomp.o \
-		regexec.o \
-		regerror.o \
-		regfree.o
-
-ZLIBOBJS = \
+ZLIBOBJS    = \
 		adler32.o \
 		compress.o \
 		crc32.o \
@@ -170,7 +203,7 @@ ZLIBOBJS = \
 		infutil.o \
 		inffast.o

-PNGOBJS = \
+PNGOBJS     = \
 		png.o \
 		pngread.o \
 		pngrtran.o \
@@ -206,7 +239,7 @@ FREETYPEOBJS = \
 		type1z.o \
 		winfnt.o

-JPEGOBJS = \
+JPEGOBJS    = \
 		jcomapi.o \
 		jutils.o \
 		jerror.o \
@@ -254,7 +287,7 @@ JPEGOBJS = \
 		jquant2.o \
 		jdmerge.o

-TIFFOBJS = \
+TIFFOBJS	= \
 		tif_aux.o \
 		tif_close.o \
 		tif_codec.o \
@@ -306,56 +339,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
+	@$(INSTALL) -d ./lib
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)

-$(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,67 +437,41 @@ 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)
 	$(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 " "

-	@if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi
-	@if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+	$(INSTALL) -d $(prefix)
+	$(INSTALL) -d $(bindir)
+	$(INSTALL) -d $(libdir)

-	$(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
-
 	$(INSTALL) -d $(includedir)/wx/protocol
 	$(INSTALL) -d $(includedir)/wx/unix
 	@list='$(HEADERS)'; for p in $$list; do \
@@ -443,29 +479,22 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
 	done

-	@if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
+	$(INSTALL) -d $(localedir)
 	@for p in $(WX_LINGUAS); do \
-	  if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
-	  if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\
+	  $(INSTALL) -d $(localedir)/$$p; \
+	  $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
 	  $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
 	  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) -d $(libdir)
+	$(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"
@@ -486,14 +515,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.
@@ -512,8 +543,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
@@ -530,8 +561,6 @@ 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)
@@ -546,37 +575,24 @@ ALL_DIST: distclean
 	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
-	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.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)/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)/install.txt $(DISTDIR)/INSTALL.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
@@ -603,6 +619,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/tiff
 	mkdir $(DISTDIR)/src/iodbc
 	mkdir $(DISTDIR)/src/unix
+	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -642,11 +659,10 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/unix
-	mkdir $(DISTDIR)/src/msw
-	cp $(WXDIR)/wxBase.spec $(DISTDIR)
-	cp @PORT_FILES@ $(DISTDIR)
-	cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
-	cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
+	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
+	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)/readme.txt $(DISTDIR)/README.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
@@ -672,10 +688,8 @@ BASE_DIST: ALL_DIST
 	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
@@ -684,11 +698,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
@@ -696,58 +708,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
@@ -756,8 +739,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
@@ -1233,14 +1214,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
@@ -1289,7 +1262,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
@@ -1301,13 +1273,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
@@ -1316,19 +1285,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
@@ -1337,7 +1303,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
@@ -1360,6 +1325,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 \
@@ -1390,6 +1356,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 \
@@ -1402,48 +1369,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
@@ -1451,7 +1401,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/aclocal.m4
+++ b/aclocal.m4
@@ -1,104 +1,11 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
 # Configure paths for GTK+
 # Owen Taylor     97-11-3

-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS. Uses variables
-dnl gtk_config_prefix and/or gtk_config_exec_prefix if defined.
-AC_DEFUN(AM_PATH_GTK,
-[
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  min_gtk_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-  no_gtk=""
-  if test "$GTK_CONFIG" != "no" ; then
-    GTK_CFLAGS=`$GTK_CONFIG --cflags`
-    GTK_LIBS=`$GTK_CONFIG --libs gthread`
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $GTK_CFLAGS"
-    LIBS="$LIBS $GTK_LIBS"
-dnl
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
-dnl checks the results of gtk-config to some extent)
-dnl
-    AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <gtk/gtkfeatures.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-
-  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-   if ((GTK_MAJOR_VERSION != gtk_major_version) ||
-       (GTK_MINOR_VERSION != gtk_minor_version) ||
-       (GTK_MICRO_VERSION != gtk_micro_version)) {
-     printf("Headers vs. library version mismatch!\n");
-     exit(1);
-   }
-
-   if (gtk_minor_version == 1) return FALSE;
-
-   return !((gtk_major_version > major) ||
-    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-     CFLAGS="$ac_save_CFLAGS"
-     LIBS="$ac_save_LIBS"
-  else
-     no_gtk=yes
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-])
-
 dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
 AC_DEFUN(AM_PATH_GTK_2_0,
-[dnl
+[dnl 
 dnl Get the cflags and libraries from the gtk-config-2.0 script
 dnl
 AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
@@ -106,12 +13,12 @@ AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed
 AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
 AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
-                    , enable_gtktest=yes)
+		    , enable_gtktest=yes)

  for module in . $4
  do
      case "$module" in
-         gthread)
+         gthread) 
             gtk_config_args="$gtk_config_args gthread"
         ;;
      esac
@@ -160,7 +67,7 @@ dnl
 #include <stdio.h>
 #include <stdlib.h>

-int
+int 
 main ()
 {
  int major, minor, micro;
@@ -179,7 +86,7 @@ main ()
      (gtk_minor_version != $gtk_config_minor_version) ||
      (gtk_micro_version != $gtk_config_micro_version))
    {
-      printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+      printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
             gtk_major_version, gtk_minor_version, gtk_micro_version);
      printf ("*** was found! If gtk-config-2.0 was correct, then it is best\n");
@@ -190,16 +97,16 @@ main ()
      printf("*** If gtk-config-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
      printf("*** to point to the correct copy of gtk-config-2.0, and remove the file config.cache\n");
      printf("*** before re-running configure\n");
-    }
+    } 
 #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-           (gtk_minor_version != GTK_MINOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
           (gtk_micro_version != GTK_MICRO_VERSION))
    {
      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
      printf("*** library (version %d.%d.%d)\n",
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
    }
 #endif /* defined (GTK_MAJOR_VERSION) ... */
  else
@@ -215,7 +122,7 @@ main ()
        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
               gtk_major_version, gtk_minor_version, gtk_micro_version);
        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-               major, minor, micro);
+	       major, minor, micro);
        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
        printf("***\n");
        printf("*** If you have already installed a sufficiently new version, this error\n");
@@ -236,7 +143,7 @@ main ()
  fi
  if test "x$no_gtk" = x ; then
     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])
+     ifelse([$2], , :, [$2])     
  else
     AC_MSG_RESULT(no)
     if test "$GTK_CONFIG_2_0" = "no" ; then
@@ -261,7 +168,7 @@ main ()
          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
          echo "*** is required on your system"
-          echo "***"
+	  echo "***"
          echo "*** If you have an old version installed, it is best to remove it, although"
          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
          echo "***"
@@ -285,5 +192,3 @@ main ()
  AC_SUBST(GTK_LIBS)
  rm -f conf.gtktest
 ])
-
-
--- 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/8132
+++ b/8132
--- 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/configure
+++ b/contrib/configure
@@ -812,6 +812,7 @@ done
 ac_given_srcdir=$srcdir

 trap 'rm -fr `echo "
+            Makefile
            src/Makefile
            src/ogl/Makefile
            src/mmedia/Makefile
@@ -821,8 +822,6 @@ trap 'rm -fr `echo "
            src/gizmos/Makefile
            src/plot/Makefile
            src/applet/Makefile
-            src/fl/Makefile
-            src/net/Makefile
            samples/Makefile
            samples/mmedia/Makefile
            samples/ogl/Makefile
@@ -836,17 +835,9 @@ trap 'rm -fr `echo "
            samples/gizmos/multicell/Makefile
            samples/gizmos/splittree/Makefile
            samples/gizmos/editlbox/Makefile
-            samples/gizmos/dynsash/Makefile
-            samples/gizmos/dynsash_switch/Makefile
            samples/xrc/Makefile
            samples/plot/Makefile
            samples/applet/Makefile
-            samples/fl/Makefile
-            samples/fl/fl_demo1/Makefile
-            samples/fl/fl_demo2/Makefile
-            samples/fl/fl_sample1/Makefile
-            samples/fl/fl_sample2/Makefile
-            samples/fl/fl_sample3/Makefile
            utils/Makefile
            utils/wxrc/Makefile
            utils/wxrcedit/Makefile
@@ -929,7 +920,8 @@ EOF

 cat >> $CONFIG_STATUS <<EOF

-CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
+CONFIG_FILES=\${CONFIG_FILES-"Makefile
+            src/Makefile
            src/ogl/Makefile
            src/mmedia/Makefile
            src/stc/Makefile
@@ -938,8 +930,6 @@ CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
            src/gizmos/Makefile
            src/plot/Makefile
            src/applet/Makefile
-            src/fl/Makefile
-            src/net/Makefile
            samples/Makefile
            samples/mmedia/Makefile
            samples/ogl/Makefile
@@ -953,17 +943,9 @@ CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
            samples/gizmos/multicell/Makefile
            samples/gizmos/splittree/Makefile
            samples/gizmos/editlbox/Makefile
-            samples/gizmos/dynsash/Makefile
-            samples/gizmos/dynsash_switch/Makefile
            samples/xrc/Makefile
            samples/plot/Makefile
            samples/applet/Makefile
-            samples/fl/Makefile
-            samples/fl/fl_demo1/Makefile
-            samples/fl/fl_demo2/Makefile
-            samples/fl/fl_sample1/Makefile
-            samples/fl/fl_sample2/Makefile
-            samples/fl/fl_sample3/Makefile
            utils/Makefile
            utils/wxrc/Makefile
            utils/wxrcedit/Makefile
--- a/contrib/configure.in
+++ b/contrib/configure.in
@@ -37,6 +37,7 @@ dnl File output


 AC_OUTPUT([
+            Makefile
            src/Makefile
            src/ogl/Makefile
            src/mmedia/Makefile
@@ -46,8 +47,6 @@ AC_OUTPUT([
            src/gizmos/Makefile
            src/plot/Makefile
            src/applet/Makefile
-            src/fl/Makefile
-            src/net/Makefile
            samples/Makefile
            samples/mmedia/Makefile
            samples/ogl/Makefile
@@ -61,17 +60,9 @@ AC_OUTPUT([
            samples/gizmos/multicell/Makefile
            samples/gizmos/splittree/Makefile
            samples/gizmos/editlbox/Makefile
-            samples/gizmos/dynsash/Makefile
-            samples/gizmos/dynsash_switch/Makefile
            samples/xrc/Makefile
            samples/plot/Makefile
            samples/applet/Makefile
-            samples/fl/Makefile
-            samples/fl/fl_demo1/Makefile
-            samples/fl/fl_demo2/Makefile
-            samples/fl/fl_sample1/Makefile
-            samples/fl/fl_sample2/Makefile
-            samples/fl/fl_sample3/Makefile
            utils/Makefile
            utils/wxrc/Makefile
            utils/wxrcedit/Makefile
--- a/contrib/include/wx/animate/animate.h
+++ b/contrib/include/wx/animate/animate.h
@@ -1,335 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        animate.h
-// Purpose:     Animation classes
-// Author:      Julian Smart and Guillermo Rodriguez Garcia
-// Modified by:
-// Created:     13/8/99
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Guillermo Rodriguez Garcia
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ANIMATEH__
-#define _WX_ANIMATEH__
-
-#ifdef __GNUG__
-    #pragma interface "animate.h"
-#endif
-
-#include <wx/defs.h>
-#include <wx/string.h>
-#include <wx/gdicmn.h>
-#include <wx/list.h>
-#include <wx/timer.h>
-
-//#define ANIMDLLEXPORT WXDLLEXPORT
-#define ANIMDLLEXPORT
-
-class ANIMDLLEXPORT wxAnimationBase;
-class ANIMDLLEXPORT wxAnimationPlayer;
-class WXDLLEXPORT wxImage;
-
-enum wxAnimationDisposal
-{
-    wxANIM_UNSPECIFIED = -1,
-    wxANIM_DONOTREMOVE = 0,
-    wxANIM_TOBACKGROUND = 1,
-    wxANIM_TOPREVIOUS = 2
-} ;
-
-class ANIMDLLEXPORT wxAnimationTimer: public wxTimer
-{
-public:
-    wxAnimationTimer() { m_player = (wxAnimationPlayer*) NULL; }
-
-    virtual void Notify();
-    void SetPlayer(wxAnimationPlayer* player) { m_player = player; }
-
-protected:
-    wxAnimationPlayer*  m_player;
-};
-
-/* wxAnimationPlayer
- * Create an object of this class, and either pass an wxXXXAnimation object in the constructor,
- * or call SetAnimation. Then call Play().
- * The wxAnimation object is only destroyed in the destructor if destroyAnimation is TRUE
- * in the constructor.
- */
-
-class ANIMDLLEXPORT wxAnimationPlayer : public wxObject
-{
-    DECLARE_CLASS(wxAnimationPlayer)
-
-public:
-    wxAnimationPlayer(wxAnimationBase *animation = (wxAnimationBase *) NULL, bool destroyAnimation = FALSE);
-    ~wxAnimationPlayer();
-//// Accessors
-
-    void SetAnimation(wxAnimationBase* animation, bool destroyAnimation = FALSE);
-    wxAnimationBase* GetAnimation() const { return m_animation; }
-
-    void SetDestroyAnimation(bool destroyAnimation) { m_destroyAnimation = destroyAnimation; };
-    bool GetDestroyAnimation() const { return m_destroyAnimation; }
-
-    void SetCurrentFrame(int currentFrame) { m_currentFrame = currentFrame; };
-    int GetCurrentFrame() const { return m_currentFrame; }
-
-    void SetWindow(wxWindow* window) { m_window = window; };
-    wxWindow* GetWindow() const { return m_window; }
-
-    void SetPosition(const wxPoint& pos) { m_position = pos; };
-    wxPoint GetPosition() const { return m_position; }
-
-    void SetLooped(bool looped) { m_looped = looped; };
-    bool GetLooped() const { return m_looped; }
-
-    bool HasAnimation() const { return (m_animation != (wxAnimationBase*) NULL); }
-
-    bool IsPlaying() const { return m_isPlaying; }
-
-    // Specify whether the GIF's background colour is to be shown,
-    // or whether the window background should show through (the default)
-    void UseBackgroundColour(bool useBackground) { m_useBackgroundColour = useBackground; }
-    bool UsingBackgroundColour() const { return m_useBackgroundColour; }
-
-    // Set and use a user-specified background colour (valid for transparent
-    // animations only)
-    void SetCustomBackgroundColour(const wxColour& col, bool useCustomBackgroundColour = TRUE)
-    { m_customBackgroundColour = col; m_useCustomBackgroundColour = useCustomBackgroundColour; }
-
-    bool UsingCustomBackgroundColour() const { return m_useCustomBackgroundColour; }
-    const wxColour& GetCustomBackgroundColour() const { return m_customBackgroundColour; }
-
-    // Another refinement - suppose we're drawing the animation in a separate
-    // control or window. We may wish to use the background of the parent
-    // window as the background of our animation. This allows us to specify
-    // whether to grab from the parent or from this window.
-    void UseParentBackground(bool useParent) { m_useParentBackground = useParent; }
-    bool UsingParentBackground() const { return m_useParentBackground; }
-
-//// Operations
-
-    // Play
-    virtual bool Play(wxWindow& window, const wxPoint& pos = wxPoint(0, 0), bool looped = TRUE);
-
-    // Build animation (list of wxImages). If not called before Play
-    // is called, Play will call this automatically.
-    virtual bool Build();
-
-    // Stop the animation
-    virtual void Stop();
-
-    // Draw the current view of the animation into this DC.
-    // Call this from your OnPaint, for example.
-    virtual void Draw(wxDC& dc);
-
-//// Accessing the current animation
-
-    virtual int GetFrameCount() const;
-    virtual wxImage* GetFrame(int i) const; // Creates a new wxImage
-    virtual wxAnimationDisposal GetDisposalMethod(int i) const;
-    virtual wxRect GetFrameRect(int i) const; // Position and size of frame
-    virtual int GetDelay(int i) const; // Delay for this frame
-
-    virtual wxSize GetLogicalScreenSize() const;
-    virtual bool GetBackgroundColour(wxColour& col) const ;
-    virtual bool GetTransparentColour(wxColour& col) const ;
-
-//// Implementation
-
-    // Play the frame
-    virtual bool PlayFrame(int frame, wxWindow& window, wxPoint& pos);
-    virtual bool PlayFrame();
-    virtual void DrawFrame(int frame, wxDC& dc, const wxPoint& pos);
-    virtual void DrawBackground(wxDC& dc, const wxPoint& pos, const wxColour& colour);
-
-    // Clear the wxImage cache
-    virtual void ClearCache();
-
-    // Save the pertinent area of the window so we can restore
-    // it if drawing transparently
-    void SaveBackground(const wxRect& rect);
-
-    wxBitmap& GetBackingStore() { return m_backingStore; }
-
-//// Data members
-protected:
-    wxAnimationBase*    m_animation;
-    bool                m_destroyAnimation; // Destroy m_animation on deletion of this object
-    wxList              m_frames;           // List of cached wxBitmap frames.
-    int                 m_currentFrame;     // Current frame
-    wxWindow*           m_window;           // Window to draw into
-    wxPoint             m_position;         // Position to draw at
-    bool                m_looped;           // Looped, or not
-    wxAnimationTimer    m_timer;            // The timer
-    bool                m_isPlaying;        // Is the animation playing?
-    wxBitmap            m_savedBackground;  // Saved background of window portion
-    wxBitmap            m_backingStore;     // The player draws into this
-    bool                m_useBackgroundColour; // Use colour or background
-    wxColour            m_customBackgroundColour; // Override animation background
-    bool                m_useCustomBackgroundColour;
-    bool                m_useParentBackground; // Grab background from parent?
-};
-
-/* wxAnimationBase
- * Base class for animations.
- * A wxXXXAnimation only stores the animation, providing accessors to wxAnimationPlayer.
- * Currently an animation is read-only, but we could extend the API for adding frames
- * programmatically, and perhaps have a wxMemoryAnimation class that stores its frames
- * in memory, and is able to save all files with suitable filenames. You could then use
- * e.g. Ulead GIF Animator to load the image files into a GIF animation.
- */
-
-class ANIMDLLEXPORT wxAnimationBase : public wxObject
-{
-    DECLARE_ABSTRACT_CLASS(wxAnimationBase)
-
-public:
-    wxAnimationBase() {};
-    ~wxAnimationBase() {};
-
-//// Accessors. Should be overridden by each derived class.
-
-    virtual int GetFrameCount() const = 0;
-    virtual wxImage* GetFrame(int i) const = 0; // Creates a new wxImage
-    virtual wxAnimationDisposal GetDisposalMethod(int i) const = 0;
-    virtual wxRect GetFrameRect(int i) const = 0; // Position and size of frame
-    virtual int GetDelay(int i) const = 0; // Delay for this frame
-
-    virtual wxSize GetLogicalScreenSize() const = 0;
-    virtual bool GetBackgroundColour(wxColour& col) const = 0;
-    virtual bool GetTransparentColour(wxColour& col) const = 0;
-
-    // Is the animation OK?
-    virtual bool IsValid() const = 0;
-
-//// Operations
-
-    virtual bool LoadFile(const wxString& filename) { return FALSE; }
-};
-
-/* wxGIFAnimation
- * This will be moved to a separate file in due course.
- */
-
-class ANIMDLLEXPORT wxGIFDecoder;
-
-class ANIMDLLEXPORT wxGIFAnimation : public wxAnimationBase
-{
-    DECLARE_CLASS(wxGIFAnimation)
-
-public:
-    wxGIFAnimation() ;
-    ~wxGIFAnimation() ;
-
-//// Accessors
-
-    virtual int GetFrameCount() const;
-    virtual wxImage* GetFrame(int i) const;
-    virtual wxAnimationDisposal GetDisposalMethod(int i) const;
-    virtual wxRect GetFrameRect(int i) const; // Position and size of frame
-    virtual int GetDelay(int i) const; // Delay for this frame
-
-    virtual wxSize GetLogicalScreenSize() const ;
-    virtual bool GetBackgroundColour(wxColour& col) const ;
-    virtual bool GetTransparentColour(wxColour& col) const ;
-
-    virtual bool IsValid() const;
-
-//// Operations
-
-    virtual bool LoadFile(const wxString& filename);
-
-protected:
-
-    wxGIFDecoder*   m_decoder;
-};
-
-/*
- * wxAnimationCtrlBase
- * Abstract base class for format-specific animation controls.
- * This class implements most of the functionality; all a derived
- * class has to do is create the appropriate animation class on demand.
- */
-
-// Resize to animation size if this is set
-#define wxAN_FIT_ANIMATION       0x0010
-
-class ANIMDLLEXPORT wxAnimationCtrlBase: public wxControl
-{
-public:
-    wxAnimationCtrlBase() { }
-    wxAnimationCtrlBase(wxWindow *parent, wxWindowID id,
-            const wxString& filename = wxEmptyString,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = wxAN_FIT_ANIMATION|wxNO_BORDER,
-            const wxString& name = wxT("animationControl"))
-    {
-        Create(parent, id, filename, pos, size, style, name);
-    }
-    ~wxAnimationCtrlBase();
-
-    bool Create(wxWindow *parent, wxWindowID id,
-            const wxString& filename = wxEmptyString,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = wxAN_FIT_ANIMATION|wxNO_BORDER,
-            const wxString& name = wxT("animationControl"));
-
-    //// Operations
-    virtual bool LoadFile(const wxString& filename = wxEmptyString);
-    virtual bool Play(bool looped = TRUE) ;
-    virtual void Stop() { m_animationPlayer.Stop(); }
-    virtual void FitToAnimation();
-
-    //// Accessors
-    virtual bool IsPlaying() const { return m_animationPlayer.IsPlaying(); }
-    virtual wxAnimationPlayer& GetPlayer() { return m_animationPlayer; }
-    virtual wxAnimationBase* GetAnimation() { return m_animation; }
-
-    const wxString& GetFilename() const { return m_filename; }
-    void SetFilename(const wxString& filename) { m_filename = filename; }
-
-    //// Event handlers
-    void OnPaint(wxPaintEvent& event);
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-    // Override this in derived classes
-    virtual wxAnimationBase* DoCreateAnimation(const wxString& filename) = 0;
-
-    wxAnimationPlayer   m_animationPlayer;
-    wxAnimationBase*    m_animation;
-    wxString            m_filename;
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase)
-    DECLARE_EVENT_TABLE()
-};
-
-/*
- * wxGIFAnimationCtrl
- * Provides a GIF animation class when required.
- */
-
-class ANIMDLLEXPORT wxGIFAnimationCtrl: public wxAnimationCtrlBase
-{
-public:
-    wxGIFAnimationCtrl() { }
-    wxGIFAnimationCtrl(wxWindow *parent, wxWindowID id,
-            const wxString& filename = wxEmptyString,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = wxAN_FIT_ANIMATION|wxNO_BORDER,
-            const wxString& name = wxT("animationControl"))
-    {
-        Create(parent, id, filename, pos, size, style, name);
-    }
-
-protected:
-    virtual wxAnimationBase* DoCreateAnimation(const wxString& filename) ;
-private:
-    DECLARE_DYNAMIC_CLASS(wxGIFAnimationCtrl)
-};
-
-#endif // _WX_ANIMATEH__
-
--- a/contrib/include/wx/applet/echovar.h
+++ b/contrib/include/wx/applet/echovar.h
@@ -44,7 +44,7 @@ public:
    wxEchoVariable() : wxObject() {}
    ~wxEchoVariable() {}
 	
-    /****************************************************************************
+	/****************************************************************************
    RETURNS:
    The boolean value of the variable

@@ -65,8 +65,8 @@ public:

 public:
    // static function to retrieve any variable avaliable
-    static wxString FindValue(const wxString &cls, const char *parms = NULL);
-    };
+    static wxString GetValue(const wxString &cls, const char *parms = NULL);
+};
 	
 /*--------------------------------- MACROS --------------------------------*/

@@ -83,13 +83,13 @@ public:
    wxString wxEchoVariable##name :: GetValue(const char *parms) const {    \
    wxString _BEV_parm = wxString(parms);

-#define END_ECHO_VARIABLE(returnval)                                        \
+#define END_ECHO_VARIABLE(name, returnval)                                  \
    return returnval;                                                       \
    }

 #define STRING_ECHO_VARIABLE(name, string)                                  \
    BEGIN_ECHO_VARIABLE(##name##);                                          \
-    END_ECHO_VARIABLE(wxString(##string##))
+    END_ECHO_VARIABLE(##name##, wxString(##string##))
 	
 #endif // __WX_ECHOVAR_H

--- a/contrib/include/wx/applet/ifelsevar.h
+++ b/contrib/include/wx/applet/ifelsevar.h
@@ -66,8 +66,8 @@ public:

 public:
    // static function to retrieve any variable avaliable
-    static bool FindValue(const wxString &cls);
-    };
+    static bool GetValue(const wxString &cls);
+};

 /*--------------------------------- MACROS --------------------------------*/

@@ -82,13 +82,14 @@ public:
    IMPLEMENT_DYNAMIC_CLASS(wxIfElseVariable##name##, wxIfElseVariable);    \
    bool wxIfElseVariable##name :: GetValue() const {

-#define END_IFELSE_VARIABLE(returnval)                                      \
+#define END_IFELSE_VARIABLE(name, returnval)                                \
    return returnval;                                                       \
    }

 #define IFELSE_VARIABLE(name, state)                                        \
    BEGIN_IFELSE_VARIABLE(##name##);                                        \
-    END_IFELSE_VARIABLE(bool (state))
+    END_IFELSE_VARIABLE(##name##, bool (state))
+

 #endif // __WX_IFELSEVAR_H

--- 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
@@ -30,15 +30,12 @@
 #define __WX_APPLET_WINDOW_H

 #include "wx/html/htmlwin.h"
-#include "wx/process.h"

 // 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 +59,6 @@ public:
                wxString& group,
                wxString& href );

-            VirtualData();
-
            // Gets
            wxString GetName(){ return m_name;};
            wxString GetGroup(){ return m_group;};
@@ -86,21 +81,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);
-
+		
 public:
            // Constructor
            wxHtmlAppletWindow(
@@ -112,8 +101,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxHW_SCROLLBAR_AUTO,
-                const wxString& name = "htmlAppletWindow",
-                const wxPalette& globalPalette = wxNullPalette);
+                const wxString& name = "htmlAppletWindow");

            // Destructor
            ~wxHtmlAppletWindow();
@@ -125,9 +113,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,25 +131,17 @@ 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);

            // Register a cookie of data in the applet manager
-            static bool RegisterCookie(const wxString& name,wxObject *cookie);
+            bool RegisterCookie(const wxString& name,wxObject *cookie);

            // UnRegister a cookie of data in the applet manager
-            static bool UnRegisterCookie(const wxString& name);
+            bool UnRegisterCookie(const wxString& name);

            // Find a cookie of data given it's public name
-            static wxObject *FindCookie(const wxString& name);
+            wxObject *FindCookie(const wxString& name);
 			
            // Event handlers to load a new page	
 			void OnLoadPage(wxLoadPageEvent &event);
@@ -173,54 +150,16 @@ public:
    		void OnPageLoaded(wxPageLoadedEvent &event);

            // LoadPage mutex locks
-            void Lock(){ m_mutexLock = true;};
-            void UnLock(){ m_mutexLock = false;};
+            void Lock() { m_mutexLock = true;};
+            void UnLock() { m_mutexLock = false;};

            // Returns TRUE if the mutex is locked, FALSE otherwise.
-            bool IsLocked(){ return m_mutexLock;};
+            bool IsLocked() { return m_mutexLock;};

            // Tries to lock the mutex. If it can't, returns immediately with false.
            bool TryLock();

    };

-/****************************************************************************
-REMARKS:
-Defines the class for AppetProcess
-***************************************************************************/
-class AppletProcess : public wxProcess {
-public:
-            AppletProcess(
-                wxWindow *parent)
-                : wxProcess(parent)
-            {
-            }
-
-            // instead of overriding this virtual function we might as well process the
-            // event from it in the frame class - this might be more convenient in some
-            // cases
-    virtual void OnTerminate(int pid, int status);
-
-    };
-
-/****************************************************************************
-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/gizmos/dynamicsash.h
+++ b/contrib/include/wx/gizmos/dynamicsash.h
@@ -1,169 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dynamicsash.h
-// Purpose:     A window which can be dynamically split to an arbitrary depth
-//              and later reunified through the user interface
-// Author:      Matt Kimball
-// Modified by:
-// Created:     7/15/2001
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Matt Kimball
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DYNAMICSASH_H_
-#define _WX_DYNAMICSASH_H_
-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
-
-/*
-
-    wxDynamicSashWindow
-
-    wxDynamicSashWindow widgets manages the way other widgets are viewed.
-    When a wxDynamicSashWindow is first shown, it will contain one child
-    view, a viewport for that child, and a pair of scrollbars to allow the
-    user to navigate the child view area.  Next to each scrollbar is a small
-    tab.  By clicking on either tab and dragging to the appropriate spot, a
-    user can split the view area into two smaller views separated by a
-    draggable sash.  Later, when the user wishes to reunify the two subviews,
-    the user simply drags the sash to the side of the window.
-    wxDynamicSashWindow will automatically reparent the appropriate child
-    view back up the window hierarchy, and the wxDynamicSashWindow will have
-    only one child view once again.
-
-    As an application developer, you will simply create a wxDynamicSashWindow
-    using either the Create() function or the more complex constructor
-    provided below, and then create a view window whose parent is the
-    wxDynamicSashWindow.  The child should respond to
-    wxDynamicSashSplitEvents -- perhaps with an OnSplit() event handler -- by
-    constructing a new view window whose parent is also the
-    wxDynamicSashWindow.  That's it!  Now your users can dynamically split
-    and reunify the view you provided.
-
-    If you wish to handle the scrollbar events for your view, rather than
-    allowing wxDynamicSashWindow to do it for you, things are a bit more
-    complex.  (You might want to handle scrollbar events yourself, if,
-    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
-    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.
-    You will need to set the scrollbars' event handler at three times:
-
-        *  When your view is created
-        *  When your view receives a wxDynamicSashSplitEvent
-        *  When your view receives a wxDynamicSashUnifyEvent
-
-    See the dynsash_switch sample application for an example which does this.
-
-*/
-
-
-#include <wx/event.h>
-#include <wx/window.h>
-class wxScrollBar;
-
-
-#define wxEVT_DYNAMIC_SASH_BASE             (((int)('d' - 'a') << 11) | ((int)('s' - 'a') << 6) | ((int)('h' - 'a') << 1))
-#define wxEVT_DYNAMIC_SASH_SPLIT            (wxEVT_DYNAMIC_SASH_BASE + 1)
-#define wxEVT_DYNAMIC_SASH_UNIFY            (wxEVT_DYNAMIC_SASH_BASE + 2)
-
-#define EVT_DYNAMIC_SASH_SPLIT(id, func)    EVT_CUSTOM(wxEVT_DYNAMIC_SASH_SPLIT, (id), (func))
-#define EVT_DYNAMIC_SASH_UNIFY(id, func)    EVT_CUSTOM(wxEVT_DYNAMIC_SASH_UNIFY, (id), (func))
-
-
-/*
-    wxDS_MANAGE_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
-
-
-/*
-    wxDynamicSashSplitEvents are sent to your view by wxDynamicSashWindow
-    whenever your view is being split by the user.  It is your
-    responsibility to handle this event by creating a new view window as
-    a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
-    automatically reparent it to the proper place in its window hierarchy.
-*/
-class GIZMODLLEXPORT 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)
-};
-
-/*
-    wxDynamicSashUnifyEvents are sent to your view by wxDynamicSashWindow
-    whenever the sash which splits your view and its sibling is being
-    reunified such that your view is expanding to replace its sibling.
-    You needn't do anything with this event if you are allowing
-    wxDynamicSashWindow to manage your view's scrollbars, but it is useful
-    if you are managing the scrollbars yourself so that you can keep
-    the scrollbars' event handlers connected to your view's event handler
-    class.
-*/
-class GIZMODLLEXPORT 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);
-};
-
-/*
-    wxDynamicSashWindow.  See above.
-*/
-class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow {
-public:
-    wxDynamicSashWindow();
-    wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
-                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
-                        const wxString& name = "dynamicSashWindow");
-    virtual ~wxDynamicSashWindow();
-
-    virtual bool Create(wxWindow *parent, wxWindowID id,
-                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
-                        const wxString& name = "dynamicSashWindow");
-    virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
-    virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;
-
-    /*  This is overloaded from wxWindowBase.  It's not here for you to
-        call directly.  */
-    virtual void AddChild(wxWindowBase *child);
-
-private:
-    class wxDynamicSashWindowImpl *m_impl;
-
-    DECLARE_DYNAMIC_CLASS(wxDynamicSashWindow)
-};
-
-
-#endif
--- 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
@@ -1,44 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        email.h
-// Purpose:     wxEmail: portable email client class
-// Author:      Julian Smart
-// Modified by:
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma interface "email.h"
-#endif
-
-#ifndef _WX_EMAIL_H_
-#define _WX_EMAIL_H_
-
-#include "wx/net/msg.h"
-
-/*
- * wxEmail
- * Miscellaneous email functions
- */
-
-class wxEmail
-{
-public:
-//// Ctor/dtor
-    wxEmail() {};
-
-//// Operations
-
-    // 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"));
-    
-protected:
-};
-
-
-#endif //_WX_EMAIL_H_
-
--- a/contrib/include/wx/net/msg.h
+++ b/contrib/include/wx/net/msg.h
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        msg.h
-// Purpose:     wxMailMessage
-// Author:      Julian Smart
-// Modified by:
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma interface "msg.h"
-#endif
-
-#ifndef _WX_MSG_H_
-#define _WX_MSG_H_
-
-/*
- * wxMailMessage
- * Encapsulates an email message
- */
-
-class wxMailMessage
-{
-public:
-
-    // A common usage
-    wxMailMessage(const wxString& subject, const wxString& to,
-        const wxString& body, const wxString& from = wxEmptyString,
-        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);
-            m_attachmentTitles.Add(attachmentTitle);
-        }
-    }
-
-    wxMailMessage() {};
-
-//// Accessors
-
-    void AddTo(const wxString& to) { m_to.Add(to); }
-    void AddCc(const wxString& cc) { m_cc.Add(cc); }
-    void AddBcc(const wxString& bcc) { m_bcc.Add(bcc); }
-    void AddAttachment(const wxString& attach, const wxString& title = wxEmptyString)
-    { m_attachments.Add(attach); m_attachmentTitles.Add(title); }
-
-    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
-    wxString       m_body;            //The Body of the message
-    wxArrayString  m_attachments;      //Files to attach to the email
-    wxArrayString  m_attachmentTitles; //Titles to use for the email file attachments
-};
-
-#endif // _WX_MSG_H_
-
--- a/contrib/include/wx/net/smapi.h
+++ b/contrib/include/wx/net/smapi.h
@@ -1,56 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        smapi.h
-// Purpose:     Simple MAPI classes
-// Author:      PJ Naughter <pjna@naughter.com>
-// Modified by: Julian Smart
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) PJ Naughter
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma interface "smapi.h"
-#endif
-
-#ifndef _WX_SMAPI_H_
-#define _WX_SMAPI_H_
-
-#include "wx/net/msg.h"
-
-class wxMapiData;
-
-//The class which encapsulates the MAPI connection
-class wxMapiSession
-{
-public:
-    //Constructors / Destructors
-    wxMapiSession();
-    ~wxMapiSession();
-    
-    //Logon / Logoff Methods
-    bool Logon(const wxString& sProfileName, const wxString& sPassword = wxEmptyString, wxWindow* pParentWnd = NULL);
-    bool LoggedOn() const;
-    bool Logoff();
-    
-    //Send a message
-    bool Send(wxMailMessage& message);
-    
-    //General MAPI support
-    bool MapiInstalled() const;
-    
-    //Error Handling
-    long GetLastError() const;
-    
-protected:
-    //Methods
-    void Initialise();
-    void Deinitialise(); 
-    bool Resolve(const wxString& sName, void* lppRecip1);
-
-    wxMapiData* m_data;
-    
-};
-
-
-#endif //_WX_SMAPI_H_
--- a/contrib/include/wx/net/web.h
+++ b/contrib/include/wx/net/web.h
@@ -1,37 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        web.h
-// Purpose:     wxWeb: portable web browser-related class
-// Author:      Julian Smart
-// Modified by:
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma interface "web.h"
-#endif
-
-#ifndef _WX_WEB_H_
-#define _WX_WEB_H_
-
-/*
- * wxWeb
- * Miscellaneous web functions
- */
-
-class wxWeb
-{
-public:
-//// Ctor/dtor
-    wxWeb() {};
-
-//// Operations
-
-protected:
-};
-
-
-#endif //_WX_WEB_H_
-
--- 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
@@ -58,43 +57,16 @@
 #define wxSTC_MARK_ARROWDOWN 6
 #define wxSTC_MARK_MINUS 7
 #define wxSTC_MARK_PLUS 8
-
-// Shapes used for outlining column
-#define wxSTC_MARK_VLINE 9
-#define wxSTC_MARK_LCORNER 10
-#define wxSTC_MARK_TCORNER 11
-#define wxSTC_MARK_BOXPLUS 12
-#define wxSTC_MARK_BOXPLUSCONNECTED 13
-#define wxSTC_MARK_BOXMINUS 14
-#define wxSTC_MARK_BOXMINUSCONNECTED 15
-#define wxSTC_MARK_LCORNERCURVE 16
-#define wxSTC_MARK_TCORNERCURVE 17
-#define wxSTC_MARK_CIRCLEPLUS 18
-#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
-#define wxSTC_MARKNUM_FOLDEROPENMID 26
-#define wxSTC_MARKNUM_FOLDERMIDTAIL 27
-#define wxSTC_MARKNUM_FOLDERTAIL 28
-#define wxSTC_MARKNUM_FOLDERSUB 29
 #define wxSTC_MARKNUM_FOLDER 30
 #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.
@@ -118,9 +90,6 @@
 #define wxSTC_CHARSET_ARABIC 178
 #define wxSTC_CHARSET_VIETNAMESE 163
 #define wxSTC_CHARSET_THAI 222
-#define wxSTC_CASE_MIXED 0
-#define wxSTC_CASE_UPPER 1
-#define wxSTC_CASE_LOWER 2
 #define wxSTC_INDIC_MAX 7
 #define wxSTC_INDIC_PLAIN 0
 #define wxSTC_INDIC_SQUIGGLE 1
@@ -140,15 +109,12 @@

 // PrintColourMode - force black text on white background for printing.
 #define wxSTC_PRINT_BLACKONWHITE 2
-
-// PrintColourMode - text stays coloured, but all background is forced to be white for printing.
-#define wxSTC_PRINT_COLOURONWHITE 3
-
-// PrintColourMode - only the default-background is forced to be white for printing.
-#define wxSTC_PRINT_COLOURONWHITEDEFAULTBG 4
+#define wxSTC_FIND_DOWN 1
 #define wxSTC_FIND_WHOLEWORD 2
 #define wxSTC_FIND_MATCHCASE 4
 #define wxSTC_FIND_WORDSTART 0x00100000
+
+// SCFIND_REGEXP is not yet implemented.
 #define wxSTC_FIND_REGEXP 0x00200000
 #define wxSTC_CMD_UNDO 2176
 #define wxSTC_CMD_CUT 2177
@@ -158,7 +124,6 @@
 #define wxSTC_FOLDLEVELWHITEFLAG 0x1000
 #define wxSTC_FOLDLEVELHEADERFLAG 0x2000
 #define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
-#define wxSTC_TIME_FOREVER 10000000
 #define wxSTC_CMD_LINEDOWN 2300
 #define wxSTC_CMD_LINEDOWNEXTEND 2301
 #define wxSTC_CMD_LINEUP 2302
@@ -208,31 +173,15 @@
 #define wxSTC_EDGE_BACKGROUND 2

 // Show caret within N lines of edge when it's scrolled to view
-// If CARET_SLOP not set then centre caret on screen when it's
-// scrolled to view
 #define wxSTC_CARET_SLOP 0x01

-// Value not used
+// Center caret on screen when it's scrolled to view
 #define wxSTC_CARET_CENTER 0x02

-// If CARET_SLOP also set then reposition whenever outside slop border
-// If CARET_SLOP not set then recentre even when visible
+// OR this with CARET_CENTER to reposition even when visible, or
+// OR this with CARET_SLOP to reposition whenever outside slop border
 #define wxSTC_CARET_STRICT 0x04

-// If CARET_XEVEN set then both left and right margins are given equal weight
-// rather than favouring left following behaviour.
-#define wxSTC_CARET_XEVEN 0x08
-
-// If CARET_XJUMPS set then when caret reaches the margin the display jumps
-// enough to leave the caret solidly within the display.
-#define wxSTC_CARET_XJUMPS 0x10
-#define wxSTC_CURSORNORMAL -1
-#define wxSTC_CURSORWAIT 3
-
-// Constants for use with SetVisiblePolicy, similar to SetCaretPolicy
-#define wxSTC_VISIBLE_SLOP 0x01
-#define wxSTC_VISIBLE_STRICT 0x04
-
 // Notifications
 // Type of modification and the action which caused the modification
 // These are defined as a bit mask to make it easy to specify which notifications are wanted.
@@ -292,20 +241,6 @@
 #define wxSTC_LEX_LATEX 14
 #define wxSTC_LEX_LUA 15
 #define wxSTC_LEX_DIFF 16
-#define wxSTC_LEX_CONF 17
-#define wxSTC_LEX_PASCAL 18
-#define wxSTC_LEX_AVE 19
-#define wxSTC_LEX_ADA 20
-#define wxSTC_LEX_LISP 21
-#define wxSTC_LEX_RUBY 22
-#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.
-#define wxSTC_LEX_AUTOMATIC 1000

 // Lexical states for SCLEX_PYTHON
 #define wxSTC_P_DEFAULT 0
@@ -338,11 +273,6 @@
 #define wxSTC_C_IDENTIFIER 11
 #define wxSTC_C_STRINGEOL 12
 #define wxSTC_C_VERBATIM 13
-#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
@@ -370,22 +300,6 @@
 // More HTML
 #define wxSTC_H_VALUE 19

-// X-Code
-#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
-
 // Embedded Javascript
 #define wxSTC_HJ_START 40
 #define wxSTC_HJ_DEFAULT 41
@@ -399,7 +313,6 @@
 #define wxSTC_HJ_SINGLESTRING 49
 #define wxSTC_HJ_SYMBOLS 50
 #define wxSTC_HJ_STRINGEOL 51
-#define wxSTC_HJ_REGEX 52

 // ASP Javascript
 #define wxSTC_HJA_START 55
@@ -414,7 +327,6 @@
 #define wxSTC_HJA_SINGLESTRING 64
 #define wxSTC_HJA_SYMBOLS 65
 #define wxSTC_HJA_STRINGEOL 66
-#define wxSTC_HJA_REGEX 67

 // Embedded VBScript
 #define wxSTC_HB_START 70
@@ -475,12 +387,11 @@
 #define wxSTC_HPHP_VARIABLE 123
 #define wxSTC_HPHP_COMMENT 124
 #define wxSTC_HPHP_COMMENTLINE 125
-#define wxSTC_HPHP_HSTRING_VARIABLE 126
-#define wxSTC_HPHP_OPERATOR 127
+#define wxSTC_HPHP_STRINGEOL 126

 // Lexical states for SCLEX_PERL
 #define wxSTC_PL_DEFAULT 0
-#define wxSTC_PL_ERROR 1
+#define wxSTC_PL_HERE 1
 #define wxSTC_PL_COMMENTLINE 2
 #define wxSTC_PL_POD 3
 #define wxSTC_PL_NUMBER 4
@@ -495,20 +406,12 @@
 #define wxSTC_PL_ARRAY 13
 #define wxSTC_PL_HASH 14
 #define wxSTC_PL_SYMBOLTABLE 15
+#define wxSTC_PL_REF 16
 #define wxSTC_PL_REGEX 17
 #define wxSTC_PL_REGSUBST 18
 #define wxSTC_PL_LONGQUOTE 19
 #define wxSTC_PL_BACKTICKS 20
 #define wxSTC_PL_DATASECTION 21
-#define wxSTC_PL_HERE_DELIM 22
-#define wxSTC_PL_HERE_Q 23
-#define wxSTC_PL_HERE_QQ 24
-#define wxSTC_PL_HERE_QX 25
-#define wxSTC_PL_STRING_Q 26
-#define wxSTC_PL_STRING_QQ 27
-#define wxSTC_PL_STRING_QX 28
-#define wxSTC_PL_STRING_QR 29
-#define wxSTC_PL_STRING_QW 30

 // Lexical states for SCLEX_LATEX
 #define wxSTC_L_DEFAULT 0
@@ -531,8 +434,6 @@
 #define wxSTC_LUA_OPERATOR 10
 #define wxSTC_LUA_IDENTIFIER 11
 #define wxSTC_LUA_STRINGEOL 12
-
-// Lexical states for SCLEX_ERRORLIST
 #define wxSTC_ERR_DEFAULT 0
 #define wxSTC_ERR_PYTHON 1
 #define wxSTC_ERR_GCC 2
@@ -540,101 +441,6 @@
 #define wxSTC_ERR_CMD 4
 #define wxSTC_ERR_BORLAND 5
 #define wxSTC_ERR_PERL 6
-#define wxSTC_ERR_NET 7
-#define wxSTC_ERR_LUA 8
-#define wxSTC_ERR_DIFF_CHANGED 10
-#define wxSTC_ERR_DIFF_ADDITION 11
-#define wxSTC_ERR_DIFF_DELETION 12
-#define wxSTC_ERR_DIFF_MESSAGE 13
-
-// Lexical states for SCLEX_BATCH
-#define wxSTC_BAT_DEFAULT 0
-#define wxSTC_BAT_COMMENT 1
-#define wxSTC_BAT_WORD 2
-#define wxSTC_BAT_LABEL 3
-#define wxSTC_BAT_HIDE 4
-#define wxSTC_BAT_COMMAND 5
-#define wxSTC_BAT_IDENTIFIER 6
-#define wxSTC_BAT_OPERATOR 7
-
-// Lexical states for SCLEX_MAKEFILE
-#define wxSTC_MAKE_DEFAULT 0
-#define wxSTC_MAKE_COMMENT 1
-#define wxSTC_MAKE_PREPROCESSOR 2
-#define wxSTC_MAKE_IDENTIFIER 3
-#define wxSTC_MAKE_OPERATOR 4
-#define wxSTC_MAKE_TARGET 5
-#define wxSTC_MAKE_IDEOL 9
-
-// Lexical states for the SCLEX_CONF (Apache Configuration Files Lexer)
-#define wxSTC_CONF_DEFAULT 0
-#define wxSTC_CONF_COMMENT 1
-#define wxSTC_CONF_NUMBER 2
-#define wxSTC_CONF_IDENTIFIER 3
-#define wxSTC_CONF_EXTENSION 4
-#define wxSTC_CONF_PARAMETER 5
-#define wxSTC_CONF_STRING 6
-#define wxSTC_CONF_OPERATOR 7
-#define wxSTC_CONF_IP 8
-#define wxSTC_CONF_DIRECTIVE 9
-
-// Avenue
-#define wxSTC_AVE_DEFAULT 0
-#define wxSTC_AVE_COMMENT 1
-#define wxSTC_AVE_NUMBER 2
-#define wxSTC_AVE_WORD 3
-#define wxSTC_AVE_KEYWORD 4
-#define wxSTC_AVE_STATEMENT 5
-#define wxSTC_AVE_STRING 6
-#define wxSTC_AVE_ENUM 7
-#define wxSTC_AVE_STRINGEOL 8
-#define wxSTC_AVE_IDENTIFIER 9
-#define wxSTC_AVE_OPERATOR 10
-
-// Lexical states for SCLEX_ADA
-#define wxSTC_ADA_DEFAULT 0
-#define wxSTC_ADA_COMMENT 1
-#define wxSTC_ADA_NUMBER 2
-#define wxSTC_ADA_WORD 3
-#define wxSTC_ADA_STRING 4
-#define wxSTC_ADA_CHARACTER 5
-#define wxSTC_ADA_OPERATOR 6
-#define wxSTC_ADA_IDENTIFIER 7
-#define wxSTC_ADA_STRINGEOL 8
-
-// Lexical states for SCLEX_LISP
-#define wxSTC_LISP_DEFAULT 0
-#define wxSTC_LISP_COMMENT 1
-#define wxSTC_LISP_NUMBER 2
-#define wxSTC_LISP_KEYWORD 3
-#define wxSTC_LISP_STRING 6
-#define wxSTC_LISP_STRINGEOL 8
-#define wxSTC_LISP_IDENTIFIER 9
-#define wxSTC_LISP_OPERATOR 10
-
-// Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW
-#define wxSTC_EIFFEL_DEFAULT 0
-#define wxSTC_EIFFEL_COMMENTLINE 1
-#define wxSTC_EIFFEL_NUMBER 2
-#define wxSTC_EIFFEL_WORD 3
-#define wxSTC_EIFFEL_STRING 4
-#define wxSTC_EIFFEL_CHARACTER 5
-#define wxSTC_EIFFEL_OPERATOR 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
 //----------------------------------------------------------------------
@@ -663,8 +469,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,
@@ -752,10 +556,6 @@ public:
    // Find the position from a point within the window.
    int PositionFromPoint(wxPoint pt);

-    // Find the position from a point within the window but return
-    // INVALID_POSITION if not close to text.
-    int PositionFromPointClose(int x, int y);
-
    // Set caret to start of a line and ensure it is visible.
    void GotoLine(int line);

@@ -768,17 +568,13 @@ 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();

-    // Convert all line endings in the document to one mode.
-    void ConvertEOLs(int eolMode);
+    // Convert all line endings in the document to use the current mode.
+    void ConvertEOLs();

    // Retrieve the current end of line mode - one of CRLF, CR, or LF.
    int GetEOLMode();
@@ -897,9 +693,6 @@ public:
    // Set a style to be underlined or not.
    void StyleSetUnderline(int style, bool underline);

-    // Set a style to be mixed case, or to force upper or lower case.
-    void StyleSetCase(int style, int caseForce);
-
    // Set the foreground colour of the selection and whether to use this setting.
    void SetSelForeground(bool useSetting, const wxColour& fore);

@@ -970,18 +763,6 @@ public:
    // Retrieve the last line number that has line state.
    int GetMaxLineState();

-    // Is the background of the line containing the caret in a different colour?
-    bool GetCaretLineVisible();
-
-    // Display the background of the line containing the caret in a different colour.
-    void SetCaretLineVisible(bool show);
-
-    // Get the colour of the background of the line containing the caret.
-    wxColour GetCaretLineBack();
-
-    // Set the colour of the background of the line containing the caret.
-    void SetCaretLineBack(const wxColour& back);
-
    // Display a auto-completion list.
    // The lenEntered parameter indicates how many characters before
    // the caret should be used to provide context.
@@ -1035,15 +816,6 @@ public:
    // Retrieve state of ignore case flag.
    bool AutoCompGetIgnoreCase();

-    // Display a list of strings and send notification when user chooses one.
-    void UserListShow(int listType, const wxString& itemList);
-
-    // Set whether or not autocompletion is hidden automatically when nothing matches
-    void AutoCompSetAutoHide(bool autoHide);
-
-    // Retrieve whether or not autocompletion is hidden automatically when nothing matches
-    bool AutoCompGetAutoHide();
-
    // Set the number of spaces used for one level of indentation.
    void SetIndent(int indentSize);

@@ -1151,13 +923,13 @@ public:
    int GetLineCount();

    // Sets the size in pixels of the left margin.
-    void SetMarginLeft(int pixelWidth);
+    void SetMarginLeft(int width);

    // Returns the size in pixels of the left margin.
    int GetMarginLeft();

    // Sets the size in pixels of the right margin.
-    void SetMarginRight(int pixelWidth);
+    void SetMarginRight(int width);

    // Returns the size in pixels of the right margin.
    int GetMarginRight();
@@ -1234,50 +1006,6 @@ public:
    // Returns true if overtype mode is active otherwise false is returned.
    bool GetOvertype();

-    // Set the width of the insert mode caret
-    void SetCaretWidth(int pixelWidth);
-
-    // Returns the width of the insert mode caret
-    int GetCaretWidth();
-
-    // Sets the position that starts the target which is used for updating the
-    // document without affecting the scroll position.
-    void SetTargetStart(int pos);
-
-    // Get the position that starts the target.
-    int GetTargetStart();
-
-    // Sets the position that ends the target which is used for updating the
-    // document without affecting the scroll position.
-    void SetTargetEnd(int pos);
-
-    // Get the position that ends the target.
-    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
-    // caused by processing the \d patterns.
-    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.
-    // Returns length of range or -1 for failure in which case target is not moved.
-    int SearchInTarget(const wxString& text);
-
-    // Set the search flags used by SearchInTarget
-    void SetSearchFlags(int flags);
-
-    // Get the search flags used by SearchInTarget
-    int GetSearchFlags();
-
    // Show a call tip containing a definition near position pos.
    void CallTipShow(int pos, const wxString& definition);

@@ -1340,31 +1068,6 @@ public:
    // Set some debugging options for folding
    void SetFoldFlags(int flags);

-    // Ensure a particular line is visible by expanding any header line hiding it.
-    // Use the currently set visibility policy to determine which range to display.
-    void EnsureVisibleEnforcePolicy(int line);
-
-    // Sets whether a tab pressed when caret is within indentation indents
-    void SetTabIndents(bool tabIndents);
-
-    // Does a tab pressed when caret is within indentation indent?
-    bool GetTabIndents();
-
-    // Sets whether a backspace pressed when caret is within indentation unindents
-    void SetBackSpaceUnIndents(bool bsUnIndents);
-
-    // Does a backspace pressed when caret is within indentation unindent?
-    bool GetBackSpaceUnIndents();
-
-    // Sets the time the mouse must sit still to generate a mouse dwell event
-    void SetMouseDwellTime(int periodMilliseconds);
-
-    // Retrieve the time the mouse must sit still to generate a mouse dwell event
-    int GetMouseDwellTime();
-
-    // Move the caret inside current view if it's not there already
-    void MoveCaretInsideView();
-
    // How many characters are on a line, not including end of line characters.
    int LineLength(int line);

@@ -1416,11 +1119,9 @@ public:
    void SearchAnchor();

    // Find some text starting at the search anchor.
-    // Does not ensure the selection is visible.
    int SearchNext(int flags, const wxString& text);

    // Find some text starting at the search anchor and moving backwards.
-    // Does not ensure the selection is visible.
    int SearchPrev(int flags, const wxString& text);

    // Set the way the line the caret is on is kept visible.
@@ -1456,51 +1157,6 @@ public:
    // Get which document modification events are sent to the container.
    int GetModEventMask();

-    // Change internal focus flag
-    void SetSTCFocus(bool focus);
-
-    // Get internal focus flag
-    bool GetSTCFocus();
-
-    // Change error status - 0 = OK
-    void SetStatus(int statusCode);
-
-    // Get error status
-    int GetStatus();
-
-    // Set whether the mouse is captured when its button is pressed
-    void SetMouseDownCaptures(bool captures);
-
-    // Get whether mouse gets captured
-    bool GetMouseDownCaptures();
-
-    // Sets the cursor to one of the SC_CURSOR* values
-    void SetCursor(int cursorType);
-
-    // Get cursor type
-    int GetCursor();
-
-    // Move to the previous change in capitalistion
-    void WordPartLeft();
-
-    // Move to the previous change in capitalistion extending selection to new caret position.
-    void WordPartLeftExtend();
-
-    // Move to the change next in capitalistion
-    void WordPartRight();
-
-    // Move to the next change in capitalistion extending selection to new caret position.
-    void WordPartRightExtend();
-
-    // Set the way the display area is determined when a particular line is to be moved to.
-    void SetVisiblePolicy(int visiblePolicy, int visibleSlop);
-
-    // Delete back from the current position to the start of the line
-    void DelLineLeft();
-
-    // Delete forwards from the current position to the end of the line
-    void DelLineRight();
-
    // Start notifying the container of all key presses and commands.
    void StartRecord();

@@ -1522,9 +1178,6 @@ public:
    // Set up the key words used by the lexer.
    void SetKeyWords(int keywordSet, const wxString& keyWords);

-    // Set the lexing language of the document based on string name.
-    void SetLexerLanguage(const wxString& language);
-
 // END of generated section
 //----------------------------------------------------------------------
 // Others...
@@ -1590,18 +1243,6 @@ public:
    // Scroll enough to make the given column visible
    void ScrollToColumn(int column);

-
-    // 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,13 +1251,11 @@ 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);
    void OnKeyDown(wxKeyEvent& evt);
@@ -1632,6 +1271,7 @@ private:
    void NotifyChange();
    void NotifyParent(SCNotification* scn);

+    long SendMsg(int msg, long wp=0, long lp=0);

 private:
    DECLARE_EVENT_TABLE()
@@ -1639,10 +1279,7 @@ private:

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

-    bool                m_lastKeyDownConsumed;

    friend class ScintillaWX;
    friend class Platform;
@@ -1654,33 +1291,22 @@ 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; }

    int  GetPosition() const         { return m_position; }
    int  GetKey()  const             { return m_key; }
@@ -1696,20 +1322,12 @@ public:
    int  GetMessage() const          { return m_message; }
    int  GetWParam() const           { return m_wParam; }
    int  GetLParam() const           { return m_lParam; }
-    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:
@@ -1732,73 +1350,42 @@ private:
    int  m_message;             // wxEVT_STC_MACRORECORD
    int  m_wParam;
    int  m_lParam;
-
-    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
 };

 #ifndef SWIG
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHANGE,                  1650)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_STYLENEEDED,             1651)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHARADDED,               1652)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTREACHED,        1653)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTLEFT,           1654)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ROMODIFYATTEMPT,         1655)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_KEY,                     1656)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DOUBLECLICK,             1657)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_UPDATEUI,                1658)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MODIFIED,                1659)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MACRORECORD,             1660)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MARGINCLICK,             1661)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_NEEDSHOWN,               1662)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_POSCHANGED,              1663)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_PAINTED,                 1664)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_USERLISTSELECTION,       1665)
-    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
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHANGE, 1650)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_STYLENEEDED, 1651)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHARADDED, 1652)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_UPDATEUI, 1653)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTREACHED, 1654)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTLEFT, 1655)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ROMODIFYATTEMPT, 1656)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DOUBLECLICK, 1657)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MODIFIED, 1658)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_KEY, 1659)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MACRORECORD, 1660)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MARGINCLICK, 1661)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_NEEDSHOWN, 1662)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_POSCHANGED, 1663)
 END_DECLARE_EVENT_TYPES()
 #else
    enum {
        wxEVT_STC_CHANGE,
        wxEVT_STC_STYLENEEDED,
        wxEVT_STC_CHARADDED,
+        wxEVT_STC_UPDATEUI,
        wxEVT_STC_SAVEPOINTREACHED,
        wxEVT_STC_SAVEPOINTLEFT,
        wxEVT_STC_ROMODIFYATTEMPT,
-        wxEVT_STC_KEY,
        wxEVT_STC_DOUBLECLICK,
-        wxEVT_STC_UPDATEUI,
        wxEVT_STC_MODIFIED,
+        wxEVT_STC_KEY,
        wxEVT_STC_MACRORECORD,
        wxEVT_STC_MARGINCLICK,
        wxEVT_STC_NEEDSHOWN,
-        wxEVT_STC_POSCHANGED,
-        wxEVT_STC_PAINTED,
-        wxEVT_STC_USERLISTSELECTION,
-        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
+        wxEVT_STC_POSCHANGED
    };
 #endif

@@ -1807,30 +1394,21 @@ END_DECLARE_EVENT_TYPES()
 #ifndef SWIG
 typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);

-#define EVT_STC_CHANGE(id, fn)                  DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE,                id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_STYLENEEDED(id, fn)             DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED,           id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_CHARADDED(id, fn)               DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED,             id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTREACHED(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED,      id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTLEFT(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT,         id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_ROMODIFYATTEMPT(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT,       id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_KEY(id, fn)                     DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY,                   id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_DOUBLECLICK(id, fn)             DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK,           id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_UPDATEUI(id, fn)                DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI,              id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_MODIFIED(id, fn)                DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED,              id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_MACRORECORD(id, fn)             DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD,           id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_MARGINCLICK(id, fn)             DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK,           id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_NEEDSHOWN(id, fn)               DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN,             id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_POSCHANGED(id, fn)              DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_POSCHANGED,            id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_PAINTED(id, fn)                 DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_PAINTED,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_USERLISTSELECTION(id, fn)       DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_USERLISTSELECTION,     id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#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
+#define EVT_STC_CHANGE(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_STYLENEEDED(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_CHARADDED(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_UPDATEUI(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_SAVEPOINTREACHED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_SAVEPOINTLEFT(id, fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_ROMODIFYATTEMPT(id, fn)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_DOUBLECLICK(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_MODIFIED(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_KEY(id, fn)              DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_MACRORECORD(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_MARGINCLICK(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_NEEDSHOWN(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_POSCHANGED(id, fn)       DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_POSCHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+
 #endif

 //----------------------------------------------------------------------
--- a/contrib/include/wx/xrc/xml.h
+++ b/contrib/include/wx/xrc/xml.h
@@ -77,6 +77,7 @@ public:
    wxXmlProperty(const wxString& name, const wxString& value,
                  wxXmlProperty *next)
            : m_name(name), m_value(value), m_next(next) {}
+    ~wxXmlProperty() { delete m_next; }

    wxString GetName() const { return m_name; }
    wxString GetValue() const { return m_value; }
@@ -115,7 +116,7 @@ public:
    wxXmlNode(wxXmlNode *parent,wxXmlNodeType type,
              const wxString& name, const wxString& content,
              wxXmlProperty *props, wxXmlNode *next);
-    ~wxXmlNode();
+    ~wxXmlNode() { delete m_properties; delete m_next; delete m_children; }

    // copy ctor & operator=. Note that this does NOT copy syblings
    // and parent pointer, i.e. m_parent and m_next will be NULL
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -154,7 +154,7 @@ public:
    // Returns numeric ID that is equivalent to string id used in XML
    // resource. To be used in event tables
    // Macro XMLID is provided for convenience
-    static int GetXMLID(const wxChar *str_id);
+    static int GetXMLID(const char *str_id);

    // Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
    long GetVersion() const { return m_version; }
@@ -176,6 +176,10 @@ protected:
    // Creates resource from info in given node:
    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);

+    // Remove nodes with property "platform" that does not
+    // match current platform
+    void ProcessPlatformProperty(wxXmlNode *node);
+
    bool GetUseLocale() { return m_useLocale; }

 private:
@@ -343,9 +347,7 @@ protected:
        { return m_resource->CreateResFromNode(node, parent, instance); }

    // helper
-#if wxUSE_FILESYSTEM
    wxFileSystem& GetCurFileSystem() { return m_resource->GetCurFileSystem(); }
-#endif
 };

 #define ADD_STYLE(style) AddStyle(wxT(#style), style)
--- 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

 all:
 	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
--- a/contrib/samples/animate/AniTestVC.dsp
+++ b/contrib/samples/animate/AniTestVC.dsp
@@ -1,225 +0,0 @@
-# Microsoft Developer Studio Project File - Name="AniTestVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=AniTestVC - Win32 UnivDebug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "AniTestVC.mak".
-!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 "AniTestVC.mak" CFG="AniTestVC - Win32 UnivDebug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "AniTestVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "AniTestVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "AniTestVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "AniTestVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "AniTestVC - Win32 UnivRelease" (based on "Win32 (x86) Application")
-!MESSAGE "AniTestVC - Win32 UnivDebug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "AniTestVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# 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
-# 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 /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 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"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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
-# 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 /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 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"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugDLL"
-# PROP BASE Intermediate_Dir "DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# 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 BASE RSC /l 0x809 /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 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"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseDLL"
-# PROP BASE Intermediate_Dir "ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# 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
-# 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 /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 anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../lib"
-
-!ELSEIF  "$(CFG)" == "AniTestVC - Win32 UnivRelease"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "UnivRelease"
-# PROP BASE Intermediate_Dir "UnivRelease"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "UnivRelease"
-# PROP Intermediate_Dir "UnivRelease"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE 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 BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /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 /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/minimal.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_univ.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:"UnivRelease/anitest.exe" /libpath:"../../../lib"
-
-!ELSEIF  "$(CFG)" == "AniTestVC - Win32 UnivDebug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "UnivDebug"
-# PROP BASE Intermediate_Dir "UnivDebug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "UnivDebug"
-# PROP Intermediate_Dir "UnivDebug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE 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 CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /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 /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/minimal.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 wx_univd.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:"UnivDebug/anitest.exe" /pdbtype:sept /libpath:"../../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "AniTestVC - Win32 Release"
-# Name "AniTestVC - Win32 Debug"
-# Name "AniTestVC - Win32 Debug DLL"
-# Name "AniTestVC - Win32 Release DLL"
-# Name "AniTestVC - Win32 UnivRelease"
-# Name "AniTestVC - Win32 UnivDebug"
-# Begin Source File
-
-SOURCE=.\anitest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\anitest.h
-# End Source File
-# 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/animate/Makefile.in
+++ b/contrib/samples/animate/Makefile.in
@@ -1,24 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1998
-# Updated:	
-# Copyright:	(c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for anitest example (UNIX).
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../..
-program_dir = contrib/samples/animate
-
-PROGRAM=anitest
-
-OBJECTS=$(PROGRAM).o
-
-APPEXTRALIBS=$(top_builddir)/lib/libwx_anim.@WX_TARGET_LIBRARY_TYPE@
-APPEXTRADEFS=-I$(top_srcdir)/contrib/include
-
-include $(top_builddir)/src/makeprog.env
-
--- a/contrib/samples/animate/anitest.cpp
+++ b/contrib/samples/animate/anitest.cpp
@@ -1,197 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        anitest.cpp
-// Purpose:     Animation sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     02/07/2001
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// declarations
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
-    #include "mondrian.xpm"
-#endif
-
-#include "anitest.h"
-
-IMPLEMENT_APP(MyApp)
-
-// ---------------------------------------------------------------------------
-// global variables
-// ---------------------------------------------------------------------------
-
-// ---------------------------------------------------------------------------
-// event tables
-// ---------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(ANITEST_ABOUT, MyFrame::OnAbout)
-    EVT_MENU(ANITEST_QUIT, MyFrame::OnQuit)
-    EVT_MENU(ANITEST_OPEN, MyFrame::OnOpen)
-
-    EVT_SIZE(MyFrame::OnSize)
-END_EVENT_TABLE()
-
-// ===========================================================================
-// implementation
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// MyApp
-// ---------------------------------------------------------------------------
-
-// Initialise this in OnInit, not statically
-bool MyApp::OnInit()
-{
-    // Create the main frame window
-
-    MyFrame* frame = new MyFrame((wxFrame *)NULL, -1, "Animation Demo",
-                        wxPoint(-1, -1), wxSize(500, 400),
-                        wxDEFAULT_FRAME_STYLE);
-
-    // Give it an icon
-#ifdef __WXMSW__
-    frame->SetIcon(wxIcon("mdi_icn"));
-#else
-    frame->SetIcon(wxIcon( mondrian_xpm ));
-#endif
-
-    // Make a menubar
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append(ANITEST_OPEN, "&Open Animation...\tCtrl+O", "Open a GIF animation");
-    file_menu->Append(ANITEST_QUIT, "&Exit\tAlt+X", "Quit the program");
-
-    wxMenu *help_menu = new wxMenu;
-    help_menu->Append(ANITEST_ABOUT, "&About\tF1");
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-
-    menu_bar->Append(file_menu, "&File");
-    menu_bar->Append(help_menu, "&Help");
-
-    // Associate the menu bar with the frame
-    frame->SetMenuBar(menu_bar);
-
-    frame->CreateStatusBar();
-
-    frame->Show(TRUE);
-
-    SetTopWindow(frame);
-
-    return TRUE;
-}
-
-// ---------------------------------------------------------------------------
-// MyFrame
-// ---------------------------------------------------------------------------
-
-// Define my frame constructor
-MyFrame::MyFrame(wxWindow *parent,
-                 const wxWindowID id,
-                 const wxString& title,
-                 const wxPoint& pos,
-                 const wxSize& size,
-                 const long style)
-       : wxFrame(parent, id, title, pos, size,
-                          style | wxNO_FULL_REPAINT_ON_RESIZE)
-{
-//    m_animation = NULL;
-    m_canvas = new MyCanvas(this, wxPoint(0, 0), wxSize(-1, -1));
-#if 0
-    m_player.SetDestroyAnimation(FALSE);
-    m_player.SetWindow(m_canvas);
-    m_player.SetPosition(wxPoint(0, 0));
-#endif
-    m_animationCtrl = new wxGIFAnimationCtrl(m_canvas, -1, wxEmptyString,
-        wxPoint(0, 0), wxSize(200, 200));
-}
-
-MyFrame::~MyFrame()
-{
-//    m_player.Stop();
-}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close();
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
-{
-    (void)wxMessageBox("wxWindows 2 Animation Demo\n"
-                       "Author: Julian Smart (c) 2001\n",
-                       "About Animation Demo");
-}
-
-void MyFrame::OnOpen(wxCommandEvent& event)
-{
-    wxFileDialog dialog(this, wxT("Please choose an animated GIF"),
-        wxEmptyString, wxEmptyString, wxT("*.gif"), wxOPEN);
-    if (dialog.ShowModal() == wxID_OK)
-    {
-        wxString filename(dialog.GetPath());
-
-        m_animationCtrl->Stop();
-        if (m_animationCtrl->LoadFile(filename))
-        {
-            m_animationCtrl->Play();
-        }
-        else
-        {
-            wxMessageBox("Sorry, this animation was not a valid animated GIF.");
-        }
-    }
-}
-
-
-// ---------------------------------------------------------------------------
-// MyCanvas
-// ---------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-    EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
-
-// Define a constructor for my canvas
-MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
-        : wxScrolledWindow(parent, -1, pos, size,
-                           wxSUNKEN_BORDER |
-                           wxNO_FULL_REPAINT_ON_RESIZE |
-                           wxVSCROLL | wxHSCROLL)
-{
-    SetBackgroundColour(wxColour("YELLOW"));
-}
-
-void MyCanvas::OnPaint(wxPaintEvent& event)
-{
-    wxPaintDC dc(this);
-#if 0
-    MyFrame* frame = (MyFrame*) GetParent();
-    if (frame->GetPlayer().IsPlaying())
-    {
-        frame->GetPlayer().Draw(dc);
-    }
-#endif
-}
-
--- a/contrib/samples/animate/anitest.h
+++ b/contrib/samples/animate/anitest.h
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        anitest.cpp
-// Purpose:     anitest sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     02/07/2001
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/animate/animate.h"
-
-// Define a new application
-class MyApp : public wxApp
-{
-public:
-    bool OnInit();
-};
-
-class MyCanvas : public wxScrolledWindow
-{
-public:
-    MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
-    void OnPaint(wxPaintEvent& event);
-
-private:
-
-    DECLARE_EVENT_TABLE()
-};
-
-// Define a new frame
-class MyFrame : public wxFrame
-{
-public:
-
-    MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
-            const wxPoint& pos, const wxSize& size, const long style);
-    ~MyFrame();
-
-    void OnAbout(wxCommandEvent& event);
-    void OnQuit(wxCommandEvent& event);
-
-    void OnOpen(wxCommandEvent& event);
-
-    MyCanvas* GetCanvas() const { return m_canvas; }
-    wxGIFAnimationCtrl* GetAnimationCtrl() const { return m_animationCtrl; }
-
-#if 0    
-    wxAnimationPlayer& GetPlayer() { return m_player; }
-    wxAnimationBase& GetAnimation() { return m_animation; }
-#endif
-
-    DECLARE_EVENT_TABLE()
-
-protected:
-    MyCanvas*           m_canvas;
-    wxGIFAnimationCtrl* m_animationCtrl;
-#if 0
-    wxAnimationPlayer   m_player;
-    wxGIFAnimation      m_animation;
-#endif
-};
-
-// menu items ids
-enum
-{
-    ANITEST_QUIT = 100,
-    ANITEST_OPEN,
-    ANITEST_ABOUT
-};
--- a/contrib/samples/animate/anitest.rc
+++ b/contrib/samples/animate/anitest.rc
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
--- a/contrib/samples/animate/bttrfly.gif
+++ b/contrib/samples/animate/bttrfly.gif
--- a/contrib/samples/animate/hooked.gif
+++ b/contrib/samples/animate/hooked.gif
--- a/contrib/samples/animate/make_cw.mcp
+++ b/contrib/samples/animate/make_cw.mcp
--- a/contrib/samples/animate/makefile.b32
+++ b/contrib/samples/animate/makefile.b32
@@ -1,17 +0,0 @@
-#
-# File:		makefile.b32
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:
-#
-# Makefile : Builds sample for 32-bit BC++
-
-WXDIR = $(WXWIN)
-
-TARGET=anitest
-EXTRALIBS=$(WXDIR)\lib\anim.lib
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-
--- a/contrib/samples/animate/makefile.g95
+++ b/contrib/samples/animate/makefile.g95
@@ -1,19 +0,0 @@
-#
-# File:         makefile.g95
-# Author:       Julian Smart
-# Created:      1999
-# Updated:
-# Copyright:    (c) Julian Smart, 1999
-#
-# Makefile for wxWindows sample (Cygwin/Mingw32).
-
-WXDIR = ../../..
-
-TARGET=anitest
-OBJECTS = $(TARGET).o
-EXTRAINC = -I$(WXDIR)/contrib/include
-RCEXTRAINC = --include-dir $(WXDIR)/contrib/include
-EXTRALIBS = -lanim
-
-include $(WXDIR)/src/makeprog.g95
-
--- a/contrib/samples/animate/makefile.sc
+++ b/contrib/samples/animate/makefile.sc
@@ -1,36 +0,0 @@
-# Symantec C++ makefile
-
-WXDIR = $(WXWIN)
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-INCLUDE=$(INCDIR)
-TARGET=minimal
-
-include $(WXDIR)\src\makesc.env
-
-minimal.exe: minimal.obj $(DEFFILE) minimal.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-    *$(RC) -k minimal.res
-
-sc32.def:
-     echo EXETYPE NT > sc32.def
-     echo SUBSYSTEM WINDOWS >> sc32.def
-
-sc16.def:
-     echo NAME $(TARGET) > sc16.def
-     echo EXETYPE WINDOWS >> sc16.def
-     echo STUB         'WINSTUB.EXE' >> sc16.def
-     echo CODE         PRELOAD MOVEABLE DISCARDABLE >> sc16.def
-     echo DATA         PRELOAD MOVEABLE MULTIPLE >> sc16.def
-     echo HEAPSIZE     1024 >> sc16.def
-     echo STACKSIZE    8192 >> sc16.def
-
-clean:
-    -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
-    -del sc32.def
-    -del sc16.def
-
--- a/contrib/samples/animate/makefile.unx
+++ b/contrib/samples/animate/makefile.unx
@@ -1,35 +0,0 @@
-#
-# File:		Makefile for samples
-# Author:	Robert Roebling
-# Created:	1999
-# Updated:	
-# Copyright:	(c) 1998 Robert Roebling
-#
-# This makefile requires a Unix version of wxWindows
-# to be installed on your system. This is most often
-# done typing "make install" when using the complete
-# sources of wxWindows or by installing the two
-# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
-# under Linux.
-#
-
-CC = gcc
-
-PROGRAM = anitest
-
-OBJECTS = $(PROGRAM).o animate.o
-
-# implementation
-
-.SUFFIXES:	.o .cpp
-
-.cpp.o :
-	$(CC) -c `wx-config --cflags` -o $@ $<
-
-all:    $(PROGRAM)
-
-$(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
-
-clean: 
-	rm -f *.o $(PROGRAM)
--- a/contrib/samples/animate/makefile.va
+++ b/contrib/samples/animate/makefile.va
@@ -1,44 +0,0 @@
-#
-# File:     makefile.va
-# Author:   David Webster
-# Created:  1999
-# Updated:
-# Copyright:    (c) David Webster
-#
-# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
-
-# Set WXDIR for your system
-WXDIR=$(WXWIN)
-
-!include $(WXDIR)\src\makeva.env
-
-#
-# Define which program this is and what it's path is and where to output to
-#
-PROGRAM=anitest
-THISDIR=$(WXWIN)\samples\$(PROGRAM)
-OPATH=$(THISDIR)\$D
-
-#
-# Make sure output directory is available
-#
-!if [md $(OPATH)]
-!endif
-
-#
-# Standard definitions
-#
-PROGRC=$(THISDIR)\$(PROGRAM).rcO
-OBJECTS=$(OPATH)\$(PROGRAM).obj $(OPATH)\animate.obj
-PROGRES=$(OPATH)\$(PROGRAM).res
-PROGTARGET=$(OPATH)\$(PROGRAM).exe
-
-.cpp{$OPATH}.obj:
-    @echo $<
-    icc @<<
-$(CPPFLAGS) /Fo$@ /Tp $<
-<<
-
-!include $(WXDIR)\src\makeprog.va
-
--- a/contrib/samples/animate/makefile.vc
+++ b/contrib/samples/animate/makefile.vc
@@ -1,9 +0,0 @@
-WXDIR = $(WXWIN)
-PROGRAM = anitest
-
-OBJECTS = $(PROGRAM).obj
-EXTRALIBS = $(WXDIR)\lib\anim$(LIBEXT).lib
-EXTRAINC = -I$(WXDIR)\contrib\include
-
-!include $(WXDIR)\src\makeprog.vc
-
--- a/contrib/samples/animate/makefile.wat
+++ b/contrib/samples/animate/makefile.wat
@@ -1,15 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
-# 
-#
-
-WXDIR = $(%WXWIN)
-
-PROGRAM = anitest
-OBJECTS = $(PROGRAM).obj animate.obj
-
-!include $(WXDIR)\src\makeprog.wat
-
-
--- a/contrib/samples/animate/makemac.mcp
+++ b/contrib/samples/animate/makemac.mcp
--- a/contrib/samples/animate/makemac6.mcp
+++ b/contrib/samples/animate/makemac6.mcp
--- a/contrib/samples/animate/mondrian.ico
+++ b/contrib/samples/animate/mondrian.ico
--- a/contrib/samples/animate/tbttrfly.gif
+++ b/contrib/samples/animate/tbttrfly.gif
--- 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 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 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 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 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/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -1,10 +0,0 @@
-# $Id$
-
-CONTRIB_SAMPLES=fl_demo1 fl_demo2 fl_sample1 fl_sample2 fl_sample3
-
-all:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
-
-clean:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE) clean); done
-
--- a/contrib/samples/fl/fl_demo1/Makefile.in
+++ b/contrib/samples/fl/fl_demo1/Makefile.in
@@ -1,25 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# "%W% %G%"
-#
-# Makefile : Builds sample on UNIX/Linux.
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../../..
-
-TARGET = fl_demo1
-
-program_dir = contrib/samples/fl/$(TARGET)
-
-APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).o
-
-include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/fl/fl_demo1/fl_demo.dsp
+++ b/contrib/samples/fl/fl_demo1/fl_demo.dsp
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_demo1" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_demo1 - 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 NMAKE /f "fl_demo.mak".
-!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 "fl_demo.mak" CFG="fl_demo1 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_demo1 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fl_demo1 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# 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 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
-# 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 fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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 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
-# 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 fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fl_demo1 - Win32 Release"
-# Name "fl_demo1 - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\fl_demo1.cpp
-
-!IF  "$(CFG)" == "fl_demo1 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - Win32 Debug"
-
-# ADD CPP /Yc"wx/wxprec.h"
-
-!ENDIF 
-
-# End Source File
-# 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
@@ -1,241 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        No names yet.
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     04/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifdef __GNUG__
-#pragma implementation "fl_demo1.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/textctrl.h"
-
-// fl headers
-#include "wx/fl/controlbar.h"     // core API
-
-// extra plugins
-#include "wx/fl/barhintspl.h"    // beveal for bars with "X"s and grooves
-#include "wx/fl/rowdragpl.h"     // NC-look with dragable rows
-#include "wx/fl/cbcustom.h"      // customization plugin
-#include "wx/fl/hintanimpl.h"
-
-// beuty-care
-#include "wx/fl/gcupdatesmgr.h"  // smooth d&d
-#include "wx/fl/antiflickpl.h"   // double-buffered repaint of decorations
-#include "wx/fl/dyntbar.h"       // auto-layouting toolbar
-#include "wx/fl/dyntbarhnd.h"    // control-bar dimension handler for it
-
-#include "fl_demo1.h"
-
-// comment it out if it breaks, (this is my workaround for MSDev 4.0 linker)
-
-char  wxDummyChar;
-
-
-IMPLEMENT_APP	(MyApp)
-
-bool MyApp::OnInit(void)
-{
-    MyFrame *frame = new MyFrame(NULL);
-    
-    frame->SetBackgroundColour( wxColour(192,192,192) );
-    
-    wxMenu *file_menu = new wxMenu;
-    
-    file_menu->Append( NEW_TEST_LOAD, "&Load layouts"  );
-    file_menu->Append( NEW_TEST_SAVE, "&Store layouts" );
-    file_menu->Append( NEW_TEST_EXIT, "E&xit" );
-    
-    wxMenuBar *menu_bar = new wxMenuBar;
-    
-    menu_bar->Append(file_menu,   "&File");
-    
-    frame->SetMenuBar(menu_bar);
-    
-    frame->CreateStatusBar(3);
-    
-    frame->Show(TRUE);
-    
-    frame->mpClientWnd->Refresh();
-    
-    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" \
-                 "(cbRowDragPlugin & cbBarHintsPlugin)\n\n" \
-                 "BTW, disabled images and label-text are rendered at run-time" );
-    
-    return TRUE;
-}
-
-/***** Implementation for class MyFrame *****/
-
-BEGIN_EVENT_TABLE( MyFrame, wxFrame )
-    // EVT_CHAR_HOOK(MyFrame::OnKeyDown)
-    // EVT_PAINT( MyFrame::OnPaint )
-    EVT_MENU( NEW_TEST_SAVE, MyFrame::OnSave )
-    EVT_MENU( NEW_TEST_LOAD, MyFrame::OnLoad )
-    EVT_MENU( NEW_TEST_EXIT, MyFrame::OnExit )
-END_EVENT_TABLE()
-
-void MyFrame::OnLoad( wxCommandEvent& event )
-{						
-    wxMessageBox("Hey - you found a BIG question-mark !!");
-}
-
-void MyFrame::OnSave( wxCommandEvent& event )
-{
-    wxMessageBox("Hey - you found another BIG question-mark !!");
-}
-
-void MyFrame::OnExit( wxCommandEvent& event )
-{
-    Destroy();
-}
-
-wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
-{
-    wxTextCtrl* pCtrl = 
-        
-        new wxTextCtrl( this, -1, value, 
-        wxDefaultPosition, wxSize(0,0), wxTE_MULTILINE );
-    
-    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
-    
-    return pCtrl;
-}
-
-MyFrame::MyFrame(wxFrame *frame)
-    : wxFrame( frame, -1, "wxWindows 2.0 wxFrameLayout Test Application", wxDefaultPosition, 
-          wxSize( 700, 500 ), 
-          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | 
-          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION, 
-          "freimas" )
-{
-    mpClientWnd = CreateTextCtrl( "Client window" );
-    
-    mpLayout = new wxFrameLayout( this, mpClientWnd );
-    
-#ifdef __WXGTK__
-    cbCommonPaneProperties props;
-    mpLayout->GetPaneProperties( props );
-    
-    props.mRealTimeUpdatesOn = FALSE; // real-time OFF!!!
-    
-    mpLayout->SetPaneProperties( props, wxALL_PANES );
-#endif
-    
-    mpLayout->SetUpdatesManager( new cbGCUpdatesMgr() );
-    
-    // this is now default...
-    //mpLayout->SetMargins( 1,1,1,1 ); // gaps for vertical/horizontal/right/left panes
-    
-    // setup plugins for testing
-    mpLayout->PushDefaultPlugins();
-    
-    mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for bars
-    mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-    mpLayout->AddPlugin( CLASSINFO( cbRowDragPlugin  ) );
-    mpLayout->AddPlugin( CLASSINFO( cbAntiflickerPlugin ) );
-    mpLayout->AddPlugin( CLASSINFO( cbSimpleCustomizationPlugin ) );
-    
-    // drop in some bars
-    cbDimInfo sizes0( 200,45, // when docked horizontally      
-                      200,85, // when docked vertically        
-                      175,35, // when floated                  
-                      FALSE,  // the bar is not fixed-size
-                      4,      // vertical gap (bar border)
-                      4       // horizontal gap (bar border)
-                    ); 
-    
-    cbDimInfo sizes1( 150,35, // when docked horizontally      
-                      150,85, // when docked vertically        
-                      175,35, // when floated                  
-                      TRUE,   // the bar is not fixed-size
-                      4,      // vertical gap (bar border)
-                      4       // horizontal gap (bar border)
-                    ); 
-    
-    cbDimInfo sizes2( 175,45, // when docked horizontally      
-                      175,37, // when docked vertically        
-                      170,35, // when floated                  
-                      TRUE,   // the bar is not fixed-size
-                      4,      // vertical gap (bar border)
-                      4,      // horizontal gap (bar border)
-                      new cbDynToolBarDimHandler()
-                    ); 
-    
-    mpLayout->AddBar( CreateTextCtrl("Hello"),  // bar window
-                      sizes0, 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)
-                      "InfoViewer1",            // name to refere in customization pop-ups
-                      TRUE
-                    );
-    
-    mpLayout->AddBar( CreateTextCtrl("Bye"),    // bar window
-                      sizes0, FL_ALIGN_TOP,     // alignment ( 0-top,1-bottom, etc)
-                      1,                        // insert into 0th row (vert. position)
-                      0,                        // offset from the start of row (in pixels)
-                      "InfoViewer2",            // name to refere in customization pop-ups
-                      TRUE
-                    );
-    
-    mpLayout->AddBar( CreateTextCtrl("Fixed0"), // bar window
-                      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
-                      TRUE
-                    );
-    
-    wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
-    
-    pToolBar->Create( this, -1 );
-    
-    // 1001-1006 ids of command events fired by added tool-buttons
-    
-    pToolBar->AddTool( 1001, BMP_DIR "new.bmp" );
-    pToolBar->AddTool( 1002, BMP_DIR "open.bmp" );
-    pToolBar->AddTool( 1003, BMP_DIR "save.bmp" );
-    
-    pToolBar->AddTool( 1004, BMP_DIR "cut.bmp" );
-    pToolBar->AddTool( 1005, BMP_DIR "copy.bmp" );
-    pToolBar->AddTool( 1006, BMP_DIR "paste.bmp" );
-    
-    
-    mpLayout->AddBar( pToolBar,             // bar window (can be NULL)
-                      sizes2, 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)
-                      "ToolBar2",           // name to refere in customization pop-ups
-                      FALSE
-                    );
-    
-    mpLayout->EnableFloating( TRUE ); // off, thinking bout wxGtk...
-}
-
-MyFrame::~MyFrame()
-{
-    if ( mpLayout) 
-        delete mpLayout; // should be destroyed manually
-}
-
--- a/contrib/samples/fl/fl_demo1/fl_demo1.h
+++ b/contrib/samples/fl/fl_demo1/fl_demo1.h
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        No names yet.
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     04/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __NEW_TEST_G__
-#define __NEW_TEST_G__
-
-#ifdef __GNUG__
-#pragma interface "fl_demo1.h"
-#endif
-
-#define NEW_TEST_SAVE 1101
-#define NEW_TEST_LOAD 1102
-#define NEW_TEST_EXIT 1103
-
-#include "wx/panel.h"
-
-// Define a new application type
-class MyApp: public wxApp
-{ 
-public:
-    bool OnInit(void);
-};
-
-// Define a new frame type
-class MyFrame: public wxFrame
-{ 
-public:
-    wxFrameLayout*  mpLayout;
-    wxTextCtrl*     mpClientWnd;
-    
-    wxTextCtrl* CreateTextCtrl( const wxString& value );
-    
-public:
-    MyFrame(wxFrame *frame);
-    virtual ~MyFrame();
-    
-    bool OnClose(void) { Show(FALSE); return TRUE; }
-    
-    void OnLoad( wxCommandEvent& event );
-    void OnSave( wxCommandEvent& event );
-    void OnExit( wxCommandEvent& event );
-    
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-
--- a/contrib/samples/fl/fl_demo1/fl_demo1.rc
+++ b/contrib/samples/fl/fl_demo1/fl_demo1.rc
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
--- a/contrib/samples/fl/fl_demo1/makefile.b32
+++ b/contrib/samples/fl/fl_demo1/makefile.b32
@@ -1,23 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds sample for 32-bit BC++
-
-WXDIR = ..\..\..\..
-TARGET = fl_demo1
-
-EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WSLIBDIR)\fl.lib
-!else
-EXTRALIBS = $(WSLIBDIR)\fld.lib
-!endif
-
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-
--- a/contrib/samples/fl/fl_demo1/makefile.g95
+++ b/contrib/samples/fl/fl_demo1/makefile.g95
@@ -1,18 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile for wxWorkshop for mingw & cygwin.
-
-WXDIR = ../../../..
-TARGET = fl_demo1
-
-EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\"
-EXTRALIBS     = $(WXDIR)/lib/libfl.a
-
-OBJECTS = $(TARGET).o
-
-include $(WXDIR)/src/makeprog.g95
--- a/contrib/samples/fl/fl_demo1/makefile.vc
+++ b/contrib/samples/fl/fl_demo1/makefile.vc
@@ -1,24 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds fl sample (VC++, WIN32)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
-
-WXDIR = ..\..\..\..
-TARGET = fl_demo1
-
-EXTRAINC = -DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WXDIR)\lib\fl.lib
-!else
-EXTRALIBS = $(WXDIR)\lib\fld.lib
-!endif
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.vc
--- a/contrib/samples/fl/fl_demo2/Makefile.in
+++ b/contrib/samples/fl/fl_demo2/Makefile.in
@@ -1,25 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# "%W% %G%"
-#
-# Makefile : Builds sample on UNIX/Linux.
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../../..
-
-TARGET = fl_demo2
-
-program_dir = contrib/samples/fl/$(TARGET)
-
-APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).o
-
-include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/fl/fl_demo2/fl_demo.dsp
+++ b/contrib/samples/fl/fl_demo2/fl_demo.dsp
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_demo2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_demo2 - 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 NMAKE /f "fl_demo.mak".
-!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 "fl_demo.mak" CFG="fl_demo2 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_demo2 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fl_demo2 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# 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 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
-# 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 fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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 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
-# 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 fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fl_demo2 - Win32 Release"
-# Name "fl_demo2 - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\fl_demo2.cpp
-
-!IF  "$(CFG)" == "fl_demo2 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - Win32 Debug"
-
-# ADD CPP /Yc"wx/wxprec.h"
-
-!ENDIF 
-
-# End Source File
-# 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_demo2/fl_demo2.cpp
+++ b/contrib/samples/fl/fl_demo2/fl_demo2.cpp
@@ -1,986 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        No names yet.
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     04/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "fl_demo2.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-// wxWindows headers.
-#include "wx/treectrl.h"
-#include "wx/imaglist.h"
-#include "wx/notebook.h" 
-
-// fl headers.
-#include "wx/fl/controlbar.h"
-#include "wx/fl/rowlayoutpl.h"
-#include "wx/fl/antiflickpl.h"
-#include "wx/fl/bardragpl.h"
-#include "wx/fl/cbcustom.h"
-#include "wx/fl/rowdragpl.h"
-
-// some extra fl plugins.
-#include "wx/fl/barhintspl.h"
-#include "wx/fl/hintanimpl.h"
-
-#include "wx/fl/dyntbar.h"
-#include "wx/fl/dyntbarhnd.h"  // fl-dimension-handler for dynamic toolbar
-
-#include "fl_demo2.h"
-
-/***** Implementation for class MyApp *****/
-
-// Create a new application object
-IMPLEMENT_APP    (MyApp)
-
-// `Main program' equivalent, creating windows and returning main app frame
-bool MyApp::OnInit(void)
-{
-    // Create the main frame window
-    MyFrame *frame = new MyFrame(NULL, "wxWindows 2.0 wxFrameLayout demo", 50, 50, 650, 540);
-    
-    // Give it an icon
-#ifdef __WINDOWS__
-    frame->SetIcon(wxIcon("mondrian"));
-#endif
-#ifdef __X__
-    frame->SetIcon(wxIcon("aiai.xbm"));
-#endif
-    
-    // Make a menubar
-    wxMenu *file_menu = new wxMenu;
-    wxMenu *active_menu = new wxMenu;
-    
-    file_menu->Append( ID_LOAD,  "&Load layouts"  );
-    file_menu->Append( ID_STORE, "&Store layouts" );
-    file_menu->AppendSeparator();
-    
-    file_menu->Append( ID_AUTOSAVE, "&Auto Save Layouts", "save layouts on exit", TRUE );
-    file_menu->AppendSeparator();
-    
-    file_menu->Append(MINIMAL_ABOUT, "A&bout !");
-    file_menu->Append(MINIMAL_QUIT, "E&xit\tTab");
-    
-    //active_menu->Append( ID_SETTINGS, "&Settings...\tCtrl" );
-    //active_menu->AppendSeparator();
-    
-    active_menu->Append( ID_REMOVE,    "&Remove Active" );
-    active_menu->Append( ID_REMOVEALL, "Remove &All" );
-    active_menu->Append( ID_RECREATE,  "Re&create" );
-    active_menu->AppendSeparator();
-    
-    active_menu->Append( ID_FIRST,  "Activate f&irst layout \tF1", "activate it", TRUE );
-    active_menu->Append( ID_SECOND, "Activate &second layout\tF2","activate it",  TRUE );
-    active_menu->Append( ID_THIRD,  "Activate &third layout\tF3","activate it",   TRUE );
-    
-    wxMenuBar *menu_bar = new wxMenuBar;
-    
-    menu_bar->Append(file_menu,   "&File");
-    menu_bar->Append(active_menu, "Active &Layout");
-    
-    frame->CreateStatusBar(3);
-    
-    frame->SetMenuBar(menu_bar);
-    
-    frame->SyncMenuBarItems();
-    
-    // Show the frame
-    frame->Show(TRUE);
-    
-    SetTopWindow(frame);
-    
-    return TRUE;
-}
-
-MyFrame::~MyFrame()
-{
-    // frame-layouts is not a windows (objects), thus should
-    // be cleaned up manually
-    
-    for( int i = 0; i != MAX_LAYOUTS; ++i )
-    {
-        if ( mLayouts[i] ) 
-            delete mLayouts[i];
-    }
-    
-    if ( mpNestedLayout   ) 
-        delete mpNestedLayout;
-    if ( mpAboutBoxLayout ) 
-        delete mpAboutBoxLayout;
-}
-
-/***** Implementation for class MyFrame *****/
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU( MINIMAL_QUIT,  MyFrame::OnQuit  )
-    EVT_MENU( MINIMAL_ABOUT, MyFrame::OnAbout )
-
-    EVT_MENU( ID_LOAD,      MyFrame::OnLoad      )
-    EVT_MENU( ID_STORE,     MyFrame::OnStore     )
-    EVT_MENU( ID_AUTOSAVE,  MyFrame::OnAutoSave  )
-    //EVT_MENU( ID_SETTINGS,  MyFrame::OnSettings  )
-    EVT_MENU( ID_REMOVE,    MyFrame::OnRemove    )
-    EVT_MENU( ID_REMOVEALL, MyFrame::OnRemoveAll )
-    EVT_MENU( ID_RECREATE,  MyFrame::OnRecreate  )
-    EVT_MENU( ID_FIRST,     MyFrame::OnFirst     )
-    EVT_MENU( ID_SECOND,    MyFrame::OnSecond    )
-    EVT_MENU( ID_THIRD,     MyFrame::OnThird     )
-
-    EVT_BUTTON( ID_SAY_ITSOK, MyFrame::OnSayItsOk )
-    EVT_BUTTON( ID_BTN_YES,   MyFrame::OnBtnYes )
-    EVT_BUTTON( ID_BTN_NO,    MyFrame::OnBtnNo )
-    EVT_BUTTON( ID_BTN_ESC,   MyFrame::OnBtnEsc )
-
-    EVT_CHAR_HOOK( MyFrame::OnChar )
-END_EVENT_TABLE()
-
-// My frame constructor
-
-MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
-    : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)),
-    mpNestedLayout( NULL ),
-    mpAboutBoxLayout( NULL ),
-
-    mActiveLayoutNo( FIRST_LAYOUT ),
-    mAutoSave( TRUE ),
-    mSavedAlready( FALSE ),
-    mpClntWindow( NULL ),
-
-    mImageList( 16,16, FALSE, 2 )
-{
-    mpInternalFrm = (wxPanel*)this;
-    
-    mAboutBox.Create( this, -1,  "About box in wxWindows style...",
-                      wxDefaultPosition,
-                      wxSize( 385,220),
-                      wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL );
-    
-    int i = 0;
-    for( i = 0; i != MAX_LAYOUTS; ++i ) 
-        mLayouts[i] = NULL;
-    
-    // image-list is one of the few objects which
-    // currently cannot be serialized, create it first 
-    // and use it as initial reference (IR)
-    
-    wxBitmap bmp1,bmp2;
-    
-    if ( wxFileExists( BMP_DIR "folder_icon.bmp" ) )
-        bmp1.LoadFile( BMP_DIR "folder_icon.bmp", wxBITMAP_TYPE_BMP );
-    
-    if ( wxFileExists( BMP_DIR "class_icon1.bmp" ) )
-        bmp2.LoadFile( BMP_DIR "class_icon1.bmp", wxBITMAP_TYPE_BMP );
-    
-    mImageList.Add( bmp1 );
-    mImageList.Add( bmp2 );
-    
-    InitAboutBox();
-    
-    // create multiple layouts
-    
-    mpNestedLayout = 0;
-    
-    mpClntWindow = CreateTxtCtrl("client window");
-    
-    // Create all layouts
-    for( i = 0; i != MAX_LAYOUTS; ++i )
-    {	  
-        CreateLayout( i );
-    }
-    // hide others
-    for( i = SECOND_LAYOUT; i != MAX_LAYOUTS; ++i )
-    {
-        mLayouts[i]->HideBarWindows();
-    }
-    
-    // activate first one 
-    mLayouts[FIRST_LAYOUT]->Activate();
-    mActiveLayoutNo = FIRST_LAYOUT;
-}
-
-/*** event handlers ***/
-
-bool MyFrame::OnClose(void)
-{
-    //  USEFUL TRICK:: avoids flickering of application's frame 
-    //                 when closing NN windows on exit:
-    
-    this->Show(FALSE);
-    
-    if ( (mAutoSave && mSavedAlready) || !mAutoSave )
-    {
-    }
-    else
-    {
-        wxCommandEvent evt;
-        this->OnStore(evt);
-    }
-    
-    mAboutBox.Destroy();
-    this->Destroy();
-    
-    return TRUE;
-}
-
-void MyFrame::OnLoad( wxCommandEvent& event )
-{
-    wxMessageBox("Hey - you found a BIG question-mark !!");
-}
-
-void MyFrame::OnStore( wxCommandEvent& event )
-{
-    wxMessageBox("Hey - you found another BIG question-mark !!");
-}
-
-void MyFrame::OnAutoSave( wxCommandEvent& event )
-{
-    mAutoSave = !mAutoSave;
-    
-    wxCommandEvent evt;
-    this->OnStore(evt);
-    
-    SyncMenuBarItems();
-}
-
-void MyFrame::OnRemove( wxCommandEvent& event )
-{
-    RemoveLayout( mActiveLayoutNo );
-    
-    Refresh();
-}
-
-void MyFrame::OnRemoveAll( wxCommandEvent& event )
-{
-    for( int i = 0; i != MAX_LAYOUTS; ++i )
-    {    
-        RemoveLayout( i );
-    }
-
-    Refresh();
-}
-
-
-void MyFrame::OnRecreate( wxCommandEvent& event )
-{
-    OnRemove( event ); // first destroy active layout
-    
-    CreateLayout( mActiveLayoutNo );
-    
-    mLayouts[mActiveLayoutNo]->Activate();
-}
-
-void MyFrame::OnFirst( wxCommandEvent& event )
-{
-    ActivateLayout( FIRST_LAYOUT );
-}
-
-void MyFrame::OnSecond( wxCommandEvent& event )
-{
-    ActivateLayout( SECOND_LAYOUT );
-}
-
-void MyFrame::OnThird( wxCommandEvent& event )
-{
-    ActivateLayout( THIRD_LAYOUT );
-}
-
-void MyFrame::OnQuit( wxCommandEvent& event )
-{
-    //  USEFUL TRICK:: avoids flickering of application's frame 
-    //                 when closing NN windows on exit:
-    
-    this->Show(FALSE);
-    
-    if ( (mAutoSave && mSavedAlready) || !mAutoSave )
-    {
-    }
-    else
-    {
-        wxCommandEvent evt;
-        this->OnStore(evt);
-    }
-    
-    Destroy();
-}
-
-void MyFrame::OnAbout( wxCommandEvent& event )
-{
-    wxFont font;
-#ifdef __WXMSW__
-    font.SetFaceName("MS Sans Serif");
-#else
-    font.SetFamily( wxSWISS );
-#endif
-    
-    font.SetStyle( wxSLANT );
-    font.SetWeight( wxNORMAL );
-    font.SetPointSize( 8 );
-    
-#ifdef __WXMSW__
-    font.RealizeResource();
-#endif
-    
-    mAboutBox.Center( wxBOTH );
-    mAboutBox.Show(TRUE);
-    
-}
-
-void MyFrame::OnChar( wxKeyEvent& event )
-{
-    wxCommandEvent evt;
-    
-    if ( event.m_keyCode == WXK_F1 )
-    {
-        this->OnFirst( evt );
-    }
-    else
-    {
-        if ( event.m_keyCode == WXK_F2 )
-        {
-            this->OnSecond( evt );
-        }
-        else
-        {
-            if ( event.m_keyCode == WXK_F3 )
-            {   
-                this->OnThird( evt );
-            }
-            if ( event.m_keyCode == WXK_F4 && !event.AltDown() )
-            {   
-                // "AI" :-)
-                wxMessageBox("There are only 3 layouts in this demo :-(");
-            }
-            else
-            {
-                if ( event.m_keyCode == WXK_TAB )
-                {
-                    //  USEFUL TRICK:: avoids flickering of application's frame 
-                    //                 when closing NN windows on exit:
-                    
-                    this->Show(FALSE);
-                    
-                    if ( (mAutoSave && mSavedAlready) || !mAutoSave )
-                    {
-                    }
-                    else
-                    {
-                        wxCommandEvent evt;
-                        this->OnStore(evt);
-                    }
-                    
-                    Destroy();
-                }
-                else
-                {
-                    event.Skip();
-                }
-            }
-        }
-    }
-}
-
-void MyFrame::OnSayItsOk( wxCommandEvent& event )
-{
-    wxMessageBox("It's OK  :-)\n\n now click on the border around the button\n and try dragging it!" );
-}
-
-void MyFrame::OnBtnYes( wxCommandEvent& event )
-{
-    mAboutBox.Show(FALSE);
-}
-
-void MyFrame::OnBtnNo( wxCommandEvent& event )
-{
-    mAboutBox.Show(FALSE);
-}
-
-void MyFrame::OnBtnEsc( wxCommandEvent& event )
-{
-    mAboutBox.Show(FALSE);
-}
-
-/*** helper methods ***/
-
-void MyFrame::InitAboutBox()
-{
-    wxPanel* pArea = new wxPanel();
-    
-    pArea->Create( &mAboutBox, -1 );
-    
-    new wxStaticText(pArea, -1, "This is wxFrameLayout contribution demo.",
-        wxPoint(10, 10) );
-    
-    new wxStaticText(pArea, -1, "Aleksandras Gluchovas (c) 1998",
-        wxPoint(10, 30) );
-    
-    new wxStaticText(pArea, -1, "<mailto:alex@soften.ktu.lt>",
-        wxPoint(10, 50) );
-    
-    mpAboutBoxLayout = new wxFrameLayout( &mAboutBox, pArea, TRUE );
-    
-    wxFrameLayout& layout = *mpAboutBoxLayout;
-    
-    cbDimInfo sizes( 90,40,     // when docked horizontally
-                     45,55,     // when docked vertically
-                     90,40,     // when floated
-                     TRUE, 4, 4 // true - bar is fixed-size
-                   );  
-    
-    
-    wxButton* pYes = CreateButton("&Yes",   &mAboutBox, ID_SAY_ITSOK );
-    wxButton* pNo  = CreateButton("&No",    &mAboutBox, ID_BTN_NO );
-    wxButton* pEsc = CreateButton("Cancel", &mAboutBox, ID_BTN_ESC );
-    
-    layout.AddBar( pEsc, sizes,  FL_ALIGN_BOTTOM, 0, 20, "cancel button");
-    layout.AddBar( pNo,  sizes,  FL_ALIGN_BOTTOM, 0, 20, "no button");
-    layout.AddBar( pYes, sizes,  FL_ALIGN_BOTTOM, 0, 20, "yes button");
-    
-    layout.mBorderPen.SetColour( 192, 192, 192 );
-    layout.SetMargins( 15, 15, 15, 15, wxALL_PANES );
-    
-    cbCommonPaneProperties props;
-    
-    layout.GetPaneProperties( props, FL_ALIGN_TOP );
-    
-    props.mShow3DPaneBorderOn = FALSE;
-    
-    layout.SetPaneProperties( props, wxALL_PANES );
-    
-    layout.Activate();
-    
-    pYes->SetDefault();
-    pYes->SetFocus();
-}
-
-wxTextCtrl* MyFrame::CreateTxtCtrl( const wxString& txt, wxWindow* parent ) 
-{
-    return new wxTextCtrl( (parent != NULL ) ? parent : mpInternalFrm,
-                            -1, txt, wxDefaultPosition, wxDefaultSize,                                   
-                            wxTE_MULTILINE );
-}
-
-wxButton* MyFrame::CreateButton( const wxString& label,
-                                wxWindow* pParent, long id )
-{
-    return new wxButton( (pParent)?pParent : mpInternalFrm, id, 
-                            label, wxPoint( 0,0 ), wxSize( 0,0 ) );
-}
-
-wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
-{
-    wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, -1 );
-    
-    int rootid = pTree->AppendItem( (long)0, label, 0);
-    
-    if ( label[0] != 'X' )
-    {
-        pTree->AppendItem(rootid, "Leaf1", 0);
-        pTree->AppendItem(rootid, "Leaf2", 0);
-    }
-    else
-    {
-        pTree->AppendItem(rootid, "Scully", 0);
-        pTree->AppendItem(rootid, "Mulder", 0);
-    }
-    
-    return pTree;
-}
-
-wxChoice* MyFrame::CreateChoice( const wxString& txt )
-{
-    wxString choice_strings[5];
-    
-    choice_strings[0] = txt;
-    choice_strings[1] = "Julian";
-    choice_strings[2] = "Hattie";
-    choice_strings[3] = "Ken";
-    choice_strings[4] = "Dick";
-    
-    wxChoice *choice = new wxChoice( mpInternalFrm, 301, wxDefaultPosition, 
-                                        wxDefaultSize, 5, choice_strings);
-    
-    choice->SetSelection(0);
-    
-    return choice;
-}
-
-// helper
-
-void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent )
-{
-    cbDimInfo sizes2( 275,38,   // when docked horizontally      
-                      45,275,   // when docked vertically        
-                      80,30,    // when floated                  
-                      TRUE,     // the bar is fixed-size
-                      4,        // vertical gap (bar border)
-                      4,        // horizontal gap (bar border)
-                      new cbDynToolBarDimHandler()
-                    ); 
-    
-    cbDimInfo sizes3( 275,55,   // when docked horizontally      
-                      275,60,   // when docked vertically        
-                      45,130,   // when floated                  
-                      TRUE,     // the bar is fixed-size
-                      4,        // vertical gap (bar border)
-                      4,        // horizontal gap (bar border)
-                      new cbDynToolBarDimHandler()
-                    ); 
-    
-    cbDimInfo sizes4( 430,35,   // when docked horizontally      
-                      44,375,   // when docked vertically        
-                      80,100,   // when floated                  
-                      TRUE,     // the bar is fixed-size
-                      4,        // vertical gap (bar border)
-                      4,        // horizontal gap (bar border)
-                      new cbDynToolBarDimHandler()
-                    ); 
-    
-    wxDynamicToolBar* pTBar2 = new wxDynamicToolBar( mpInternalFrm, -1 );
-    
-    wxChoice* pChoice = new wxChoice( pTBar2, -1, wxDefaultPosition, wxSize( 140,25 ) );
-    
-    pTBar2->AddTool( 1, pChoice );
-    pTBar2->AddTool( 2, BMP_DIR "search.bmp" );
-    //pTBar2->AddSeparator();
-    pTBar2->AddTool( 3, BMP_DIR "bookmarks.bmp" );
-    pTBar2->AddTool( 4, BMP_DIR "nextmark.bmp" );
-    pTBar2->AddTool( 5, BMP_DIR "prevmark.bmp" );
-    
-    wxDynamicToolBar* pTBar3 = new wxDynamicToolBar( mpInternalFrm, -1 );
-    
-    pTBar3->AddTool( 1, BMP_DIR "open.bmp", wxBITMAP_TYPE_BMP, " Open " );
-    pTBar3->AddTool( 2, BMP_DIR "save.bmp", wxBITMAP_TYPE_BMP, " Save " );
-    pTBar3->AddTool( 3, BMP_DIR "saveall.bmp", wxBITMAP_TYPE_BMP, " Save All " );
-    //pTBar3->AddSeparator();
-    pTBar3->AddTool( 4, BMP_DIR "cut.bmp",   wxBITMAP_TYPE_BMP, " Open " );
-    pTBar3->AddTool( 5, BMP_DIR "copy.bmp",  wxBITMAP_TYPE_BMP, " Copy " );
-    pTBar3->AddTool( 6, BMP_DIR "paste.bmp", wxBITMAP_TYPE_BMP, " Paste " );
-    
-#ifdef __WXMSW__
-    pTBar3->EnableTool( 2, FALSE );
-#endif
-    
-    wxDynamicToolBar* pTBar4 = new wxDynamicToolBar( mpInternalFrm, -1 );
-    
-    pTBar4->AddTool( 1, BMP_DIR "bookmarks.bmp", wxBITMAP_TYPE_BMP, "Bookmarks ", TRUE );
-    pTBar4->AddTool( 2, BMP_DIR "nextmark.bmp",  wxBITMAP_TYPE_BMP, "Next bookmark ", TRUE );
-    pTBar4->AddTool( 3, BMP_DIR "prevmark.bmp",  wxBITMAP_TYPE_BMP, "Prev bookmark ", TRUE );
-    //pTBar4->AddSeparator();
-    pTBar4->AddTool( 4, BMP_DIR "search.bmp", wxBITMAP_TYPE_BMP, "Search ", TRUE );
-    
-#ifdef __WXMSW__
-    pTBar4->EnableTool( 4, FALSE );
-#endif
-    
-    layout.AddBar( pTBar2,              
-                   sizes2, FL_ALIGN_TOP,    
-                   0,                
-                   0,                
-                   "Search",       
-                   TRUE
-                 );
-    
-    layout.AddBar( pTBar3,              
-                   sizes3, FL_ALIGN_BOTTOM, 
-                   0,                
-                   0,                
-                   "Titled",       
-                   TRUE
-                 );
-    
-    layout.AddBar( pTBar4,              
-                   sizes4, FL_ALIGN_BOTTOM, 
-                   1,                
-                   0,                
-                   "Bookmarks",       
-                   TRUE
-                 );
-}
-
-wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
-{
-    bool isNested = (pParent != mpInternalFrm);
-    
-    // check if we're craeting nested layout
-    if ( isNested )
-    {
-        layout.mBorderPen.SetColour( 128,255,128 );
-        
-        // if so, than make border smaller
-        for( int i = 0; i != MAX_PANES; ++i  )
-        {
-            cbDockPane& pane = *layout.GetPane( i );
-            
-            pane.mTopMargin    = 5;
-            pane.mBottomMargin = 5;
-            pane.mLeftMargin   = 5;
-            pane.mRightMargin  = 5;
-        }
-    }
-    
-    int cbWidth  = 200;
-    int cbHeight = ( isNested ) ? 50 : 150;
-    
-    cbDimInfo sizes4( cbWidth,cbHeight,
-                      cbWidth,cbHeight,
-                      cbWidth,cbHeight, FALSE );
-    
-    cbWidth  = 75;
-    cbHeight = 31;
-    
-    cbDimInfo sizes5( cbWidth,cbHeight,
-                      42,65,
-                      cbWidth,cbHeight, TRUE,
-                      3,                       // vertical gap (bar border)
-                      3                        // horizontal gap (bar border)
-                    ); 
-    
-    // create "workplace" window in the third layout
-    // SEB: originally here was a wxpp (wxWorkshop) class demotrated
-    //    wxTabbedWindow* pMiniTabArea = new wxTabbedWindow();
-    //    pMiniTabArea->Create( pParent, -1 );
-    
-    
-    wxTreeCtrl* pClassView = new wxTreeCtrl( pParent, -1, 
-                wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS );
-    
-    pClassView->SetImageList( &mImageList );
-    
-    wxTreeItemId rootId = pClassView->AddRoot( "wxWindows 2.0 classes", 0 );
-    
-    pClassView->AppendItem( rootId, "wxWin Dynamic classes (grabbed at run-time)", 0 );
-    pClassView->AppendItem( rootId, "serializer-classes (grabbed at run-time)",    0 );
-    
-    // now create "output" window
-    wxNotebook*	pTabbedArea = new wxNotebook(pParent, -1);   
-    // SEB: originally here was a wxpp (wxWorkshop) class used
-    //    wxPaggedWindow* pTabbedArea = new wxPaggedWindow();
-    //    pTabbedArea->Create( pParent, -1 );
-    
-    wxPanel* pSheet3 = new wxPanel();
-    pSheet3->Create( pTabbedArea, -1 );
-    pSheet3->Show(FALSE);
-    
-    pTabbedArea->AddPage( CreateTxtCtrl("build", pTabbedArea), "Build");
-    pTabbedArea->AddPage( CreateTxtCtrl("debug", pTabbedArea), "Debug");
-    pTabbedArea->AddPage( pSheet3, "is THIS recursive - or what !?");
-    pTabbedArea->AddPage( CreateTxtCtrl("profile", pTabbedArea), "Profile");
-    
-    layout.AddBar( new StartButton95(pParent), sizes5, FL_ALIGN_TOP, 0, 0, "Start..." );
-    layout.AddBar( pClassView, sizes4, FL_ALIGN_LEFT, 0, 0, "Project Workplace" );
-    layout.AddBar( pTabbedArea, sizes4, FL_ALIGN_BOTTOM, 0, 50, "Output" );
-    
-    return pSheet3;
-}
-
-void MyFrame::DropInSomeBars( int layoutNo )
-{
-    /* create once... and forget! */
-    
-    // setup dimension infos for various bar shapes
-    
-    int cbWidth  = 90;
-    int cbHeight = 30;
-    
-    if ( layoutNo == SECOND_LAYOUT ) 
-        cbHeight = 60;
-    
-    wxFrameLayout& layout = *mLayouts[layoutNo];
-    
-    cbDimInfo sizes( cbWidth,cbHeight, // when docked horizontally
-                     cbWidth,cbHeight, // when docked vertically
-                     cbWidth,cbHeight, // when floated
-                     TRUE              // true - bar is fixed-size
-                   );  
-    
-    cbWidth  = 120;
-    
-    cbDimInfo sizes1( cbWidth,cbHeight,
-                      cbWidth,cbHeight,
-                      cbWidth,cbHeight, FALSE ); // false - bar is "flexible"
-
-    cbWidth  = 120;
-    cbHeight = 40;
-    
-    cbDimInfo sizes3( cbWidth,cbHeight,
-                      cbWidth,cbHeight,
-                      cbWidth,cbHeight, TRUE ); // -/-
-    
-    cbWidth  = 200;
-    cbHeight = 150;
-    
-    cbDimInfo sizes4( cbWidth,cbHeight,
-                      cbWidth,cbHeight,
-                      cbWidth,cbHeight, FALSE ); // -/-
-    
-    cbWidth  = 63;
-    cbHeight = 31;
-    
-    cbDimInfo sizes5( cbWidth,cbHeight,
-                      cbHeight,cbWidth,
-                      cbWidth,cbHeight, TRUE,
-                      3,                        // vertical gap (bar border)
-                      3                         // horizontal gap (bar border)
-                    ); // -/-
-    
-    
-    if ( layoutNo == FIRST_LAYOUT )
-    {
-        // add 4 fixed-size bars (`sizes' dim-info) and one "flexible" (with `sizes1' dim-info)
-        
-        wxWindow* pGreenOne    = new MyTestPanel(mpInternalFrm);
-        
-        pGreenOne->SetBackgroundColour( wxColour(128,255,128) );
-        
-        layout.AddBar( pGreenOne,                      sizes,  FL_ALIGN_TOP,         0, 50, "Bar1", TRUE );
-        layout.AddBar( new MyTestPanel(mpInternalFrm), sizes,  FL_ALIGN_TOP,         2, 50, "Bar2", TRUE );
-        layout.AddBar( new MyTestPanel(mpInternalFrm), sizes,  FL_ALIGN_BOTTOM,      2, 50, "Bar3", TRUE );
-        layout.AddBar( new MyTestPanel(mpInternalFrm), sizes,  FL_ALIGN_LEFT,        2, 50, "Bar4", TRUE );
-        layout.AddBar( new MyTestPanel(mpInternalFrm), sizes1, wxCBAR_HIDDEN, 2, 50, "Super-Bar", TRUE );
-    }
-    else
-    {
-        if ( layoutNo == SECOND_LAYOUT )
-        {
-            // show off various wx-controls in the second layout
-            
-            layout.AddBar( CreateTxtCtrl(),           sizes,  FL_ALIGN_TOP,    0, 50,  "Fixed text Area&0"     );
-            layout.AddBar( CreateButton("OK"),        sizes,  FL_ALIGN_TOP,    0, 100, "First Button"    );
-            layout.AddBar( CreateTxtCtrl(),           sizes1, FL_ALIGN_BOTTOM, 0, 50,  "First Tree"  );
-            layout.AddBar( CreateTreeCtrl("Root"),    sizes1, FL_ALIGN_LEFT,   0, 0,   "TreeCtrl Window" );
-            layout.AddBar( CreateChoice("Choice 1"),  sizes3, FL_ALIGN_TOP,    0, 0,   "Choice 1 (buggy)", FALSE, wxCBAR_HIDDEN );
-            layout.AddBar( CreateChoice("Choice 2"),  sizes3, FL_ALIGN_TOP,    0, 0,   "Choice 2 (buggy)", FALSE, wxCBAR_HIDDEN );
-            layout.AddBar( CreateTreeCtrl("X-Files"), sizes1, FL_ALIGN_RIGHT,  0, 100, "X-Files" );
-            layout.AddBar( CreateTxtCtrl("smaller1"), sizes3, FL_ALIGN_TOP,    0, 50,  "smaller Area1"     );
-            layout.AddBar( CreateTxtCtrl("smaller2"), sizes3, FL_ALIGN_TOP,    0, 50,  "sm&ller Area2"     );
-        }
-        else
-        {
-            if ( layoutNo == THIRD_LAYOUT  )
-            {
-#ifdef __WXGTK__
-                cbCommonPaneProperties props;
-                layout.GetPaneProperties( props );
-                props.mRealTimeUpdatesOn = FALSE; // real-time OFF for gtk!!!
-                layout.SetPaneProperties( props, wxALL_PANES );
-#endif
-                
-                layout.AddBar( CreateTxtCtrl("Tool1"), sizes3,  FL_ALIGN_TOP,  0, 50,  "Fixed text Area1" );
-                layout.AddBar( CreateTxtCtrl("Tool2"), sizes3,  FL_ALIGN_TOP,  0, 50,  "Fixed text Area2" );
-                layout.AddBar( CreateTxtCtrl("Tool3"), sizes3,  FL_ALIGN_TOP,  0, 50,  "Fixed text Area3" );
-                layout.AddBar( CreateTxtCtrl("Tool4"), sizes3,  FL_ALIGN_TOP,  1, 50,  "Fixed text Area4" );
-                layout.AddBar( CreateTxtCtrl("Tool5"), sizes3,  FL_ALIGN_TOP,  1, 50,  "Fixed text Area5" );
-                layout.AddBar( CreateTxtCtrl("Tool6"), sizes3,  FL_ALIGN_TOP,  1, 50,  "Fixed text Area6" );
-                layout.AddBar( CreateTxtCtrl("Tool7"), sizes3,  FL_ALIGN_TOP,  2,250,  "Fixed text Area7" );
-                
-                cbDimInfo sizes10( 175,35, // when docked horizontally      
-                                   175,38, // when docked vertically        
-                                   170,35, // when floated                  
-                                   TRUE,   // the bar is not fixed-size
-                                   4,      // vertical gap (bar border)
-                                   4,      // horizontal gap (bar border)
-                                   new cbDynToolBarDimHandler()
-                                 ); 
-                
-                wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
-                
-                pToolBar->Create( mpInternalFrm, -1 );
-                
-                // 1001-1006 ids of command events fired by added tool-buttons
-                
-                pToolBar->AddTool( 1001, BMP_DIR "new.bmp" );
-                pToolBar->AddTool( 1002, BMP_DIR "open.bmp" );
-                pToolBar->AddTool( 1003, BMP_DIR "save.bmp" );
-                
-                pToolBar->AddTool( 1004, BMP_DIR "cut.bmp" );
-                pToolBar->AddTool( 1005, BMP_DIR "copy.bmp" );
-                pToolBar->AddTool( 1006, BMP_DIR "paste.bmp" );
-                
-                layout.AddBar( pToolBar,              // bar window (can be NULL)
-                               sizes10, 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)
-                               "Real-Toolbar",        // name to refere in customization pop-ups
-                               FALSE
-                             );
-                
-                // create first "developement" layout
-                AddSearchToolbars( layout, mpInternalFrm);
-                
-                wxWindow* pSheet3 = CreateDevLayout( layout, mpInternalFrm);
-                
-                // create another ***secreat developement*** layout inside
-                // the third sheet of the outter one's output bar
-                
-                mpNestedLayout = new wxFrameLayout( pSheet3, 
-                    CreateTxtCtrl("\"Mobils in Mobile\" --C.Nemo",pSheet3), FALSE );
-                
-                CreateDevLayout( *mpNestedLayout, pSheet3 );
-                
-                mpNestedLayout->Activate();
-            }
-        }
-    }
-}    
-
-void MyFrame::CreateLayout( int layoutNo )
-{
-    wxFrameLayout* pLayout = new wxFrameLayout( mpInternalFrm, mpClntWindow, FALSE );
-    
-    if ( layoutNo == THIRD_LAYOUT )
-    {
-        pLayout->PushDefaultPlugins();
-        pLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for bars
-#ifdef __WXGTK__
-        pLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-#endif
-        pLayout->AddPlugin( CLASSINFO( cbRowDragPlugin ) ); 
-    }
-    
-    mLayouts[layoutNo] = pLayout;
-    
-    DropInSomeBars( layoutNo );
-}
-
-void MyFrame::RemoveLayout( int layoutNo )
-{
-    wxFrameLayout* pLayout = mLayouts[layoutNo];
-    
-    if ( !pLayout ) 
-        return;
-    
-    pLayout->HideBarWindows();
-    
-    // destroy nested layout first
-    
-    if ( layoutNo == THIRD_LAYOUT )
-    {
-        if ( mpNestedLayout ) 
-            delete mpNestedLayout;
-        mpNestedLayout = NULL;
-    }
-    
-    // NOTE:: bar windows are NOT destroyed automatically by frame-layout 
-    
-    pLayout->DestroyBarWindows();
-    
-    delete pLayout;
-    
-    mLayouts[layoutNo] = NULL;
-    
-    Refresh();
-}
-
-void MyFrame::SyncMenuBarItems()
-{
-    for( int i = 0; i != MAX_LAYOUTS; ++i )
-    {
-        GetMenuBar()->Check( ID_FIRST+i,  mActiveLayoutNo == FIRST_LAYOUT+i );
-    }
-    
-    GetMenuBar()->Check( ID_AUTOSAVE,  mAutoSave  );
-}
-
-void MyFrame::ActivateLayout( int layoutNo )
-{
-    if ( layoutNo == mActiveLayoutNo ) 
-        return;
-    
-    if ( mLayouts[mActiveLayoutNo] )
-        mLayouts[mActiveLayoutNo]->Deactivate();
-    
-    mActiveLayoutNo = layoutNo;
-    
-    if ( mLayouts[mActiveLayoutNo] ) 
-        mLayouts[mActiveLayoutNo]->Activate();
-    else
-        Refresh();
-    
-    SyncMenuBarItems();
-}
-
-/***** Implementation for class StartButton95 (just for fun) *****/
-
-IMPLEMENT_DYNAMIC_CLASS( StartButton95, wxPanel )
-
-BEGIN_EVENT_TABLE( StartButton95, wxPanel )
-    EVT_LEFT_DOWN( StartButton95::OnMouseDown )
-    EVT_LEFT_UP  ( StartButton95::OnMouseUp   )
-    EVT_PAINT    ( StartButton95::OnPaint     )
-END_EVENT_TABLE()
-
-void StartButton95::OnMouseDown( wxMouseEvent& event )
-{
-    m_bPressed = TRUE;
-    Refresh();
-    CaptureMouse();
-}
-
-void StartButton95::OnMouseUp( wxMouseEvent& event )
-{
-    // "this is not a bug"
-    
-    SetCursor( wxCURSOR_WAIT );
-    GetParent()->SetCursor( wxCURSOR_WAIT );
-    ::wxSetCursor( wxCURSOR_WAIT );    
-    wxSleep(1);
-    
-    int i = 0;
-    for( i = 1; i != 6; ++i ) 
-    { 
-        m_bPressed = (i % 2) != 0;
-        Refresh();
-        wxSleep(1);
-    }
-    GetParent()->Close();
-    //*((char*)(i)-3) = 'X'; // Aleks what's the meaning of this???
-}
-
-void StartButton95::OnPaint( wxPaintEvent& event )
-{
-    wxBitmap* pBmp = 0;
-    
-    if ( m_bPressed )
-    {
-        if ( !m_PBmp.Ok() && wxFileExists( BMP_DIR "start95_pr.bmp" ) )
-            
-            m_PBmp.LoadFile( BMP_DIR "start95_pr.bmp", wxBITMAP_TYPE_BMP );
-        
-        pBmp = &m_PBmp;
-    }
-    else
-    {
-        if ( !m_DBmp.Ok() && wxFileExists( BMP_DIR "start95_dp.bmp" ) )
-            
-            m_DBmp.LoadFile( BMP_DIR "start95_dp.bmp", wxBITMAP_TYPE_BMP );
-        
-        pBmp = &m_DBmp;
-    }
-    
-    if (!pBmp) return;
-    wxMemoryDC mdc;
-    wxPaintDC  dc(this);
-    mdc.SelectObject( *pBmp );
-    
-    dc.Blit( 0,0, pBmp->GetWidth(), pBmp->GetHeight(), &mdc, 0,0, wxCOPY );
-    
-    mdc.SelectObject( wxNullBitmap );
-}
--- a/contrib/samples/fl/fl_demo2/fl_demo2.h
+++ b/contrib/samples/fl/fl_demo2/fl_demo2.h
@@ -1,160 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        No names yet.
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     04/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:   	wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __FLDEMO_G__
-#define __FLDEMO_G__
-
-// ID for the menu commands
-
-#define MINIMAL_QUIT 	1
-#define MINIMAL_ABOUT 102
-
-#define ID_LOAD      103
-#define ID_STORE     104
-#define ID_AUTOSAVE  105
-//#define ID_SETTINGS  106
-#define ID_REMOVE    107
-#define ID_REMOVEALL 108
-#define ID_RECREATE  109
-#define ID_ACTIVATE  110
-#define ID_FIRST	 111
-#define ID_SECOND    112
-#define ID_THIRD     113
-
-#define ID_SAY_ITSOK 114
-#define ID_BTN_YES   115
-#define ID_BTN_NO    116
-#define ID_BTN_ESC   117
-
-#define MAX_LAYOUTS   3
-
-#define FIRST_LAYOUT  0
-#define SECOND_LAYOUT 1
-#define THIRD_LAYOUT  2
-
-class wxFrameLayout;
-class wxObjectStorage;
-
-// FOR NOW::
-typedef wxPanel MyTestPanel;
-
-// Define a new application type
-
-class MyApp: public wxApp
-{ 
-public:
-    bool OnInit(void);
-};
-
-// Define a new frame type
-
-class MyFrame: public wxFrame
-{ 
-protected:
-    
-    wxFrameLayout* mLayouts[MAX_LAYOUTS];
-    
-    wxFrameLayout* mpNestedLayout;
-    wxFrameLayout* mpAboutBoxLayout;
-    
-    int            mActiveLayoutNo;   
-    bool           mAutoSave;
-    bool           mSavedAlready;
-    
-    // container windows:
-    
-    wxTextCtrl*    mpClntWindow;
-    wxPanel*       mpInternalFrm;
-    
-    wxImageList    mImageList;
-    
-    wxFrame       mAboutBox;
-    
-    // helpers for control-creation
-    
-    wxTextCtrl* CreateTxtCtrl ( const wxString& txt = "wxTextCtrl", wxWindow* parent = NULL  );
-    wxTreeCtrl* CreateTreeCtrl( const wxString& label = "TreeCtrl" );
-    wxChoice*   CreateChoice  ( const wxString& txt = "Choice1" );
-    wxButton*   CreateButton  ( const wxString& label = "wxButton", wxWindow* pParent = NULL, long id = ID_SAY_ITSOK );
-    
-    // helpers for layout-creation
-    
-    void AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent );
-    wxWindow* CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent );
-    
-    void DropInSomeBars( int layoutNo );
-    void CreateLayout( int layoutNo );
-    void RemoveLayout( int layoutNo );
-    
-    void InitAboutBox();
-    
-    void ActivateLayout( int layoutNo );
-    
-public: /* public */
-    
-    MyFrame( wxFrame *frame, char *title, int x, int y, int w, int h);
-    
-    ~MyFrame();
-    
-    void SyncMenuBarItems();
-    
-    // event handlers
-    
-    bool OnClose(void);
-    
-    void OnLoad( wxCommandEvent& event );
-    void OnStore( wxCommandEvent& event );
-    void OnAutoSave( wxCommandEvent& event );
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    //void OnSettings( wxCommandEvent& event );
-    void OnRemove( wxCommandEvent& event );
-    void OnRemoveAll( wxCommandEvent& event );
-    void OnRecreate( wxCommandEvent& event );
-    void OnFirst( wxCommandEvent& event );
-    void OnSecond( wxCommandEvent& event );
-    void OnThird( wxCommandEvent& event );
-    
-    void OnSayItsOk( wxCommandEvent& event );
-    void OnBtnYes( wxCommandEvent& event );
-    void OnBtnNo( wxCommandEvent& event );
-    void OnBtnEsc( wxCommandEvent& event );
-    
-    void OnChar( wxKeyEvent& event );
-    
-    DECLARE_EVENT_TABLE()   
-};
-
-// Define a new button type, StartButton95 (Just for fun)
-
-class StartButton95 : public wxPanel
-{
-    DECLARE_DYNAMIC_CLASS( StartButton95 )
-        
-    bool m_bPressed;
-    wxBitmap m_PBmp;
-    wxBitmap m_DBmp;
-    
-public:
-    StartButton95(void) : m_bPressed(FALSE) {}
-    
-    StartButton95(wxWindow* parent) 
-        : m_bPressed(FALSE) { wxPanel::Create(parent,-1); }
-    
-    void OnMouseDown( wxMouseEvent& event );
-    void OnMouseUp( wxMouseEvent& event );
-    void OnPaint( wxPaintEvent& event );
-    
-    DECLARE_EVENT_TABLE();
-};
-
-#endif
-
--- a/contrib/samples/fl/fl_demo2/fl_demo2.rc
+++ b/contrib/samples/fl/fl_demo2/fl_demo2.rc
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
--- a/contrib/samples/fl/fl_demo2/makefile.b32
+++ b/contrib/samples/fl/fl_demo2/makefile.b32
@@ -1,23 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds sample for 32-bit BC++
-
-WXDIR = ..\..\..\..
-TARGET = fl_demo2
-
-EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WSLIBDIR)\fl.lib
-!else
-EXTRALIBS = $(WSLIBDIR)\fld.lib
-!endif
-
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-
--- a/contrib/samples/fl/fl_demo2/makefile.g95
+++ b/contrib/samples/fl/fl_demo2/makefile.g95
@@ -1,18 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile for wxWorkshop for mingw & cygwin.
-
-WXDIR = ../../../..
-TARGET = fl_demo2
-
-EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\"
-EXTRALIBS     = $(WXDIR)/lib/libfl.a
-
-OBJECTS = $(TARGET).o
-
-include $(WXDIR)/src/makeprog.g95
--- a/contrib/samples/fl/fl_demo2/makefile.vc
+++ b/contrib/samples/fl/fl_demo2/makefile.vc
@@ -1,24 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds fl sample (VC++, WIN32)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
-
-WXDIR = ..\..\..\..
-TARGET = fl_demo2
-
-EXTRAINC = -DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WXDIR)\lib\fl.lib
-!else
-EXTRALIBS = $(WXDIR)\lib\fld.lib
-!endif
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.vc
--- a/contrib/samples/fl/fl_sample1/Makefile.in
+++ b/contrib/samples/fl/fl_sample1/Makefile.in
@@ -1,25 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# "%W% %G%"
-#
-# Makefile : Builds sample on UNIX/Linux.
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../../..
-
-TARGET = fl_sample1
-
-program_dir = contrib/samples/fl/$(TARGET)
-
-APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).o
-
-include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/fl/fl_sample1/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample1/fl_demo.dsp
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_sample1" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_sample1 - 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 NMAKE /f "fl_demo.mak".
-!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 "fl_demo.mak" CFG="fl_sample1 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_sample1 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fl_sample1 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# 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 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
-# 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 fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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 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
-# 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 fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fl_sample1 - Win32 Release"
-# Name "fl_sample1 - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\fl_sample1.cpp
-
-!IF  "$(CFG)" == "fl_sample1 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - Win32 Debug"
-
-# ADD CPP /Yc"wx/wxprec.h"
-
-!ENDIF 
-
-# End Source File
-# 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_sample1/fl_sample1.rc
+++ b/contrib/samples/fl/fl_sample1/fl_sample1.rc
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
--- a/contrib/samples/fl/fl_sample1/makefile.b32
+++ b/contrib/samples/fl/fl_sample1/makefile.b32
@@ -1,23 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds sample for 32-bit BC++
-
-WXDIR = ..\..\..\..
-TARGET = fl_sample1
-
-EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WSLIBDIR)\fl.lib
-!else
-EXTRALIBS = $(WSLIBDIR)\fld.lib
-!endif
-
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-
--- a/contrib/samples/fl/fl_sample1/makefile.g95
+++ b/contrib/samples/fl/fl_sample1/makefile.g95
@@ -1,18 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile for wxWorkshop for mingw & cygwin.
-
-WXDIR = ../../../..
-TARGET = fl_sample1
-
-EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\"
-EXTRALIBS     = $(WXDIR)/lib/libfl.a
-
-OBJECTS = $(TARGET).o
-
-include $(WXDIR)/src/makeprog.g95
--- a/contrib/samples/fl/fl_sample1/makefile.vc
+++ b/contrib/samples/fl/fl_sample1/makefile.vc
@@ -1,24 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds fl sample (VC++, WIN32)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
-
-WXDIR = ..\..\..\..
-TARGET = fl_sample1
-
-EXTRAINC = -DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WXDIR)\lib\fl.lib
-!else
-EXTRALIBS = $(WXDIR)\lib\fld.lib
-!endif
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.vc
--- a/contrib/samples/fl/fl_sample2/Makefile.in
+++ b/contrib/samples/fl/fl_sample2/Makefile.in
@@ -1,25 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# "%W% %G%"
-#
-# Makefile : Builds sample on UNIX/Linux.
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../../..
-
-TARGET = fl_sample2
-
-program_dir = contrib/samples/fl/$(TARGET)
-
-APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).o
-
-include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/fl/fl_sample2/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample2/fl_demo.dsp
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_sample2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_sample2 - 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 NMAKE /f "fl_demo.mak".
-!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 "fl_demo.mak" CFG="fl_sample2 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_sample2 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fl_sample2 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# 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 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
-# 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 fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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 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
-# 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 fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fl_sample2 - Win32 Release"
-# Name "fl_sample2 - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\fl_sample2.cpp
-
-!IF  "$(CFG)" == "fl_sample2 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - Win32 Debug"
-
-# ADD CPP /Yc"wx/wxprec.h"
-
-!ENDIF 
-
-# End Source File
-# 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_sample2/fl_sample2.cpp
+++ b/contrib/samples/fl/fl_sample2/fl_sample2.cpp
@@ -1,194 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fl_sample2.cpp
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     24/11/98     
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/textctrl.h"
-
-// fl headers
-#include "wx/fl/controlbar.h"
-
-// plugins used
-#include "wx/fl/barhintspl.h"
-#include "wx/fl/hintanimpl.h"
-
-#define ID_LOAD  102
-#define ID_STORE 103
-#define ID_QUIT  104
-
-
-class MyApp: public wxApp
-{ 
-public:
-    bool OnInit(void);
-};
-
-class MyFrame: public wxFrame
-{
-protected:
-    wxFrameLayout* mpLayout;
-    wxWindow*      mpClientWnd;
-    
-    wxTextCtrl* CreateTextCtrl( const wxString& value );
-        
-public:
-    MyFrame( wxWindow* parent, char *title );
-    ~MyFrame();
-    
-    void populateMyFrame();
-    void OnLoad( wxCommandEvent& event );
-    void OnStore( wxCommandEvent& event );
-    void OnQuit( wxCommandEvent& event );
-    
-    bool OnClose(void) { return TRUE; }
-    
-    DECLARE_EVENT_TABLE()
-};
-
-/***** Implementation for class MyApp *****/
-
-IMPLEMENT_APP    (MyApp)
-
-bool MyApp::OnInit(void)
-{
-    // wxWindows boiler-plate:
-    
-    MyFrame *frame = new MyFrame(NULL, "wxFrameLayout sample");
-    
-    wxMenu *file_menu = new wxMenu;
-    
-    file_menu->Append( ID_LOAD,  "&Load layout"  );
-    file_menu->Append( ID_STORE, "&Store layout"  );
-    file_menu->AppendSeparator();
-    
-    file_menu->Append( ID_QUIT, "E&xit" );
-    
-    wxMenuBar *menu_bar = new wxMenuBar;
-    
-    menu_bar->Append(file_menu, "&File");
-    
-    frame->CreateStatusBar(3);
-    frame->SetMenuBar(menu_bar);
-    
-    frame->Show(TRUE);
-    SetTopWindow(frame);
-    frame->populateMyFrame();
-    
-    return TRUE;
-}
-
-/***** Immlementation for class MyFrame *****/
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU( ID_LOAD,  MyFrame::OnLoad  )
-    EVT_MENU( ID_STORE, MyFrame::OnStore )
-    EVT_MENU( ID_QUIT,  MyFrame::OnQuit  )
-END_EVENT_TABLE()
-
-MyFrame::MyFrame( wxWindow* parent, char *title )
-    : wxFrame( parent, -1, "NewTest-II", wxDefaultPosition,
-          wxSize( 700, 500 ),
-          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
-          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
-          "freimas" )
-{
-}
-
-void MyFrame::populateMyFrame()
-{
-    mpClientWnd = CreateTextCtrl( "Client window" );
-    
-    mpLayout = new wxFrameLayout( this, mpClientWnd );
-        
-    ///  mpLayout->PushDefaultPlugins();
-    ///  mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso
-    ///  //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-        
-    cbDimInfo sizes( 80,65,     // when docked horizontally      
-                     80,165,    // when docked vertically        
-                     180,30,    // when floated                  
-                     TRUE,      // the bar is fixed-size
-                     5,         // vertical gap (bar border)
-                     5          // horizontal gap (bar border)
-                   ); 
-        
-    // drop-in 20 bars    
-    for( int i = 1; i <= 10; ++i )
-    {
-        wxSleep(1);
-        wxYield(); // CHECK!
-        
-        char buf[4];
-        sprintf( buf, "%d", i );
-        wxString name = wxString("Bar-");
-        name += buf;
-        
-        //sizes.mIsFixed = i % 2 > 0; // every fifth bar is not fixed-size
-        
-        if ( !sizes.mIsFixed ) name += " (flexible)";
-        //      mpLayout->AddBar( CreateTextCtrl(name),// bar window
-        mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
-                          sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
-                          0,                   // insert into 0th row (vert. position)
-                          0,                   // offset from the start of row (in pixels)
-                          name                 // name to refere in customization pop-ups
-                        );
-
-        mpLayout->RecalcLayout(true);
-        
-        // Layout();
-        // Refresh();
-    }
-}
-
-MyFrame::~MyFrame()
-{
-    // layout is not a window, should be released manually
-    if ( mpLayout ) 
-        delete mpLayout;
-}
-
-wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
-{
-    wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, 
-                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
-    
-    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
-    
-    return pCtrl;
-}
-
-void MyFrame::OnLoad( wxCommandEvent& event )
-{
-    wxMessageBox("Hey - you found a BIG question-mark !!");
-}
-
-void MyFrame::OnStore( wxCommandEvent& event )
-{
-    wxMessageBox("Hey - you found another BIG question-mark !!");
-}
-
-void MyFrame::OnQuit( wxCommandEvent& event )
-{
-    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
-    
-    Close(TRUE);
-}
-
--- a/contrib/samples/fl/fl_sample2/fl_sample2.rc
+++ b/contrib/samples/fl/fl_sample2/fl_sample2.rc
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
--- a/contrib/samples/fl/fl_sample2/makefile.b32
+++ b/contrib/samples/fl/fl_sample2/makefile.b32
@@ -1,23 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds sample for 32-bit BC++
-
-WXDIR = ..\..\..\..
-TARGET = fl_sample2
-
-EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WSLIBDIR)\fl.lib
-!else
-EXTRALIBS = $(WSLIBDIR)\fld.lib
-!endif
-
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-
--- a/contrib/samples/fl/fl_sample2/makefile.g95
+++ b/contrib/samples/fl/fl_sample2/makefile.g95
@@ -1,18 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile for wxWorkshop for mingw & cygwin.
-
-WXDIR = ../../../..
-TARGET = fl_sample2
-
-EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\"
-EXTRALIBS     = $(WXDIR)/lib/libfl.a
-
-OBJECTS = $(TARGET).o
-
-include $(WXDIR)/src/makeprog.g95
--- a/contrib/samples/fl/fl_sample2/makefile.vc
+++ b/contrib/samples/fl/fl_sample2/makefile.vc
@@ -1,24 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds fl sample (VC++, WIN32)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
-
-WXDIR = ..\..\..\..
-TARGET = fl_sample2
-
-EXTRAINC = -DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WXDIR)\lib\fl.lib
-!else
-EXTRALIBS = $(WXDIR)\lib\fld.lib
-!endif
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.vc
--- a/contrib/samples/fl/fl_sample3/Makefile.in
+++ b/contrib/samples/fl/fl_sample3/Makefile.in
@@ -1,25 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# "%W% %G%"
-#
-# Makefile : Builds sample on UNIX/Linux.
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../../..
-
-TARGET = fl_sample3
-
-program_dir = contrib/samples/fl/$(TARGET)
-
-APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
-APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).o
-
-include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/fl/fl_sample3/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample3/fl_demo.dsp
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_sample3" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_sample3 - 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 NMAKE /f "fl_demo.mak".
-!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 "fl_demo.mak" CFG="fl_sample3 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_sample3 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fl_sample3 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# 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 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
-# 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 fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# 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 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
-# 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 fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fl_sample3 - Win32 Release"
-# Name "fl_sample3 - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\fl_sample3.cpp
-
-!IF  "$(CFG)" == "fl_sample3 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - Win32 Debug"
-
-# ADD CPP /Yc"wx/wxprec.h"
-
-!ENDIF 
-
-# End Source File
-# 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/fl/fl_sample3/fl_demo.dsw
+++ b/contrib/samples/fl/fl_sample3/fl_demo.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "fl_sample3"=.\fl_demo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/contrib/samples/fl/fl_sample3/fl_sample3.cpp
+++ b/contrib/samples/fl/fl_sample3/fl_sample3.cpp
@@ -1,337 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fl_sample3.cpp
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     24/11/98     
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/textctrl.h"
-
-// fl headers
-#include "wx/fl/controlbar.h"
-
-// plugins used
-#include "wx/fl/barhintspl.h"
-#include "wx/fl/hintanimpl.h"
-
-#define ID_LOAD  102
-#define ID_STORE 103
-#define ID_QUIT  104
-
-#define ID_BUTT 145
-#define ID_BUTT2 146
-
-class MyApp: public wxApp
-{ 
-public:
-    bool OnInit(void);
-};
-
-class MyFrame: public wxFrame
-{
-protected:
-    wxFrameLayout* mpLayout;
-    wxWindow*      mpClientWnd;
-    
-    wxButton * my_butt;
-    
-    wxTextCtrl* CreateTextCtrl( const wxString& value );
-public:
-    MyFrame( wxWindow* parent, char *title );
-    ~MyFrame();
-    
-    void OnLoad( wxCommandEvent& event );
-    void OnStore( wxCommandEvent& event );
-    void OnQuit( wxCommandEvent& event );
-    
-    void OnButt( wxCommandEvent& event );
-    void OnButt2( wxCommandEvent& event );
-    bool OnClose(void) { return TRUE; }
-    
-    DECLARE_EVENT_TABLE()
-};
-
-/***** Implementation for class MyApp *****/
-
-IMPLEMENT_APP    (MyApp)
-
-bool MyApp::OnInit(void)
-{
-    // wxWindows boiler-plate:
-    
-    MyFrame *frame = new MyFrame(NULL, "wxFrameLayout sample");
-    
-    wxMenu *file_menu = new wxMenu;
-    
-    file_menu->Append( ID_LOAD,  "&Load layout"  );
-    file_menu->Append( ID_STORE, "&Store layout"  );
-    file_menu->AppendSeparator();
-    
-    file_menu->Append( ID_QUIT, "E&xit" );
-    
-    wxMenuBar *menu_bar = new wxMenuBar;
-    
-    menu_bar->Append(file_menu, "&File");
-    
-    frame->CreateStatusBar(3);
-    frame->SetMenuBar(menu_bar);
-    
-    frame->Show(TRUE);
-    SetTopWindow(frame);
-    
-    return TRUE;
-}
-
-/***** Immlementation for class MyFrame *****/
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU( ID_LOAD,  MyFrame::OnLoad  )
-    EVT_MENU( ID_STORE, MyFrame::OnStore )
-    EVT_MENU( ID_QUIT,  MyFrame::OnQuit  )
-    EVT_BUTTON( ID_BUTT, MyFrame::OnButt )
-    EVT_BUTTON( ID_BUTT2, MyFrame::OnButt2 )
-END_EVENT_TABLE()
-
-MyFrame::MyFrame( wxWindow* parent, char *title )
-    : wxFrame( parent, -1, "NewTest-II", wxDefaultPosition,
-          wxSize( 700, 500 ),
-          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
-          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
-          "freimas" )
-{
-    
-    mpClientWnd = new wxWindow(this, -1);    
-    mpLayout = new wxFrameLayout( this, mpClientWnd );
-    
-    ///  mpLayout->PushDefaultPlugins();
-    ///  mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso
-    ///  //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-    
-    cbDimInfo sizes( 80,65,     // when docked horizontally      
-                     80,165,    // when docked vertically        
-                     180,30,    // when floated                  
-                     TRUE,      // the bar is fixed-size
-                     5,         // vertical gap (bar border)
-                     5          // horizontal gap (bar border)
-                   ); 
-    
-    
-    // drop-in some bars
-    
-    for( int i = 1; i <= 11; ++i )
-    {
-        char buf[4];
-        sprintf( buf, "%d", i );
-        wxString name = wxString("Bar-");
-        name += buf;
-        
-        sizes.mIsFixed = (i !=3); // every fifth bar is not fixed-size
-        
-        if ( !sizes.mIsFixed ) name += " (flexible)";
-        //      mpLayout->AddBar( CreateTextCtrl(name),// bar window
-        if(i != 4 && i!= 5 && i!=11) {
-            mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
-                              sizes, 
-                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
-                              0,            // insert into 0th row (vert. position)
-                              0,            // offset from the start of row (in pixels)
-                              name          // name to refere in customization pop-ups
-                            );
-        } else if(i==4){
-            mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
-                              cbDimInfo( 100,100, 100,100, 100,100, TRUE, 5, 5), 
-                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
-                              0,            // insert into 0th row (vert. position)
-                              0,            // offset from the start of row (in pixels)
-                              name          // name to refere in customization pop-ups
-                            );
-        } else if(i==5) {
-            my_butt = new wxButton(this, ID_BUTT, name);
-            mpLayout->AddBar( my_butt,// bar window
-                              cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), 
-                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
-                              0,            // insert into 0th row (vert. position)
-                              0,            // offset from the start of row (in pixels)
-                              name          // name to refere in customization pop-ups
-                            );
-        } else if(i==11) {
-            mpLayout->AddBar( new wxButton(this, ID_BUTT2, name+"_2"),
-                              cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), 
-                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
-                              0,            // insert into 0th row (vert. position)
-                              0,            // offset from the start of row (in pixels)
-                              name          // name to refere in customization pop-ups
-                            );
-        }
-        
-        //      mpLayout->RecalcLayout(true);
-        //        Layout();
-        //        Refresh();
-    }
-}
-
-MyFrame::~MyFrame()
-{
-    // layout is not a window, should be released manually
-    if ( mpLayout ) 
-        delete mpLayout;
-}
-
-wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
-{
-    wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, 
-                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
-    
-    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
-    
-    return pCtrl;
-}
-
-void MyFrame::OnLoad( wxCommandEvent& event )
-{
-    wxMessageBox("Hey - you found a BIG question-mark !!");
-}
-
-void MyFrame::OnStore( wxCommandEvent& event )
-{
-    wxMessageBox("Hey - you found another BIG question-mark !!");
-}
-
-void MyFrame::OnQuit( wxCommandEvent& event )
-{
-    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
-    
-    Close(TRUE);
-}
-
-void MyFrame::OnButt( wxCommandEvent& event )
-{
-    static int i =0;
-    
-    // cbBarInfo* FindBarByName( const wxString& name ); 
-    
-    switch(i % 2) {
-    case 0: 
-        {
-            cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-1"));
-            if(x) 
-                mpLayout->InverseVisibility(x); 
-            else    
-                wxBell();
-            break;
-        }
-    case 1:
-        {
-            cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-6"));
-            if(x) 
-            {
-                if(i % 4 == 1) 
-                {
-                    mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);
-                    //mpLayout->RecalcLayout(true);
-                    mpLayout->RepositionFloatedBar(x);
-                } 
-                else 
-                {
-                    mpLayout->SetBarState(x, 0, TRUE);
-                    //mpLayout->RecalcLayout(true);
-                    //mpLayout->RepositionFloatedBar(x);
-                }
-                //  //  //  		x->mState = wxCBAR_FLOATING;
-                //  //  //  		mpLayout->ApplyBarProperties(x);
-            } 
-            else 
-            {
-                wxBell();
-            }
-            
-            break;
-        }
-    }
-    i++;
-}
-
-void MyFrame::OnButt2( wxCommandEvent& event )
-{
-    static int i =0;
-    
-    // cbBarInfo* FindBarByName( const wxString& name ); 
-    
-    switch(i % 2) {
-    case 0: 
-        {
-            cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-1"));
-            if(x) 
-            {
-                for(int a=0;a<MAX_BAR_STATES;a++)
-                {
-                    x->mDimInfo.mSizes[a].x = 200;
-                    x->mDimInfo.mSizes[a].y = 200;
-                }
-                x->mpBarWnd->SetSize(200,200);
-                mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);  // HACK !!!
-                mpLayout->SetBarState(x, 0, TRUE);	              // HACK !!!
-                wxYield();                                        // HACK !!! needed to resize BEFORE redraw 
-                mpLayout->RefreshNow( TRUE );                     // HACK !!! needed to trigger redraw
-            }
-            else    
-            {
-                wxBell();
-            }
-
-            break;
-        }
-    case 1:
-        {
-            cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-1"));
-            if(x) 
-            {
-                //mpLayout->InverseVisibility(x); 
-                for(int a=0;a<MAX_BAR_STATES;a++)
-                {
-                    // see cbPaneDrawPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event ) 
-                    x->mDimInfo.mSizes[a].x = 10 + 2 + 2*x->mDimInfo.mHorizGap;
-                    x->mDimInfo.mSizes[a].y = 10 + 2 + 2*x->mDimInfo.mVertGap;
-                }
-                x->mpBarWnd->SetSize(10,10);
-                mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);  // HACK !!!
-                mpLayout->SetBarState(x, 0, TRUE);	              // HACK !!!
-                wxYield();                                        // HACK !!! needed to resize BEFORE redraw 
-                mpLayout->RefreshNow( TRUE );                     // HACK !!! needed to trigger redraw
-                
-                //  //  		mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);
-                //  //  		mpLayout->RecalcLayout(true);
-                //  //  		//		mpLayout->RepositionFloatedBar(x);
-                //  //  		mpLayout->RecalcLayout(true);
-                //  //  		mpLayout->RepositionFloatedBar(x);
-                //  //  		  mpLayout->SetBarState(x, 0, TRUE);	
-                //  //  		  wxYield();
-                //  //  		  mpLayout->RefreshNow( TRUE );
-                //  //  		  mpLayout->RecalcLayout(true);
-            }
-            else    
-            {
-                wxBell();
-            }
-
-            break;
-        }
-    }
-    i++;
-}
-
--- a/contrib/samples/fl/fl_sample3/fl_sample3.rc
+++ b/contrib/samples/fl/fl_sample3/fl_sample3.rc
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
--- a/contrib/samples/fl/fl_sample3/makefile.b32
+++ b/contrib/samples/fl/fl_sample3/makefile.b32
@@ -1,23 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds sample for 32-bit BC++
-
-WXDIR = ..\..\..\..
-TARGET = fl_sample3
-
-EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WSLIBDIR)\fl.lib
-!else
-EXTRALIBS = $(WSLIBDIR)\fld.lib
-!endif
-
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-
--- a/contrib/samples/fl/fl_sample3/makefile.g95
+++ b/contrib/samples/fl/fl_sample3/makefile.g95
@@ -1,18 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile for wxWorkshop for mingw & cygwin.
-
-WXDIR = ../../../..
-TARGET = fl_sample3
-
-EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\"
-EXTRALIBS     = $(WXDIR)/lib/libfl.a
-
-OBJECTS = $(TARGET).o
-
-include $(WXDIR)/src/makeprog.g95
--- a/contrib/samples/fl/fl_sample3/makefile.vc
+++ b/contrib/samples/fl/fl_sample3/makefile.vc
@@ -1,24 +0,0 @@
-#
-# File:         Makefile
-# Author:       Hans Van Leemputten
-# Created:      2001
-# Updated:
-# Copyright:    (c) wxWorkshop team, 2001
-#
-# Makefile : Builds fl sample (VC++, WIN32)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
-
-WXDIR = ..\..\..\..
-TARGET = fl_sample3
-
-EXTRAINC = -DBMP_DIR=\"../bitmaps/\"
-!if "$(FINAL)" == "1"
-EXTRALIBS = $(WXDIR)\lib\fl.lib
-!else
-EXTRALIBS = $(WXDIR)\lib\fld.lib
-!endif
-
-PROGRAM = $(TARGET)
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.vc
--- a/contrib/samples/gizmos/Makefile.in
+++ b/contrib/samples/gizmos/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$

-CONTRIB_SAMPLES=multicell splittree editlbox dynsash dynsash_switch
+CONTRIB_SAMPLES=multicell splittree editlbox

 all:
 	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -1,23 +0,0 @@
-#
-# File:		Makefile.in
-# Author:	Matt Kimball
-# Created:	2001
-# Updated:
-# Copyright:	(c) 2001 Matt Kimball
-#
-# "%W% %G%"
-#
-# Makefile for the dynsash example (UNIX).
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../../..
-program_dir = contrib/samples/gizmos/dynsash
-
-PROGRAM=dynsash
-OBJECTS=dynsash.o
-
-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
-APPEXTRADEFS=-I$(top_srcdir)/contrib/include
-
-include $(top_builddir)/src/makeprog.env
-
--- a/contrib/samples/gizmos/dynsash/dynsash.cpp
+++ b/contrib/samples/gizmos/dynsash/dynsash.cpp
@@ -1,86 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dynsash.cpp
-// Purpose:     Test the wxDynamicSash class by creating a dynamic sash which
-//              contains an HTML view
-// Author:      Matt Kimball
-// Modified by:
-// Created:     7/15/2001
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Matt Kimball
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include <wx/app.h>
-#include <wx/gizmos/dynamicsash.h>
-#include <wx/html/htmlwin.h>
-#include <wx/image.h>
-
-class Demo : public wxApp {
-public:
-    bool OnInit();
-};
-
-class SashHtmlWindow : public wxHtmlWindow {
-public:
-    SashHtmlWindow(wxWindow *parent, wxWindowID id = -1,
-                   const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                   long style = wxHW_SCROLLBAR_NEVER, const wxString& name = "sashHtmlWindow");
-
-    wxSize DoGetBestSize() const;
-
-private:
-    void OnSplit(wxDynamicSashSplitEvent& event);
-
-    wxWindow *m_dyn_sash;
-};
-
-IMPLEMENT_APP(Demo)
-
-char *HTML_content =
-"<P><H1>wxDynamicSashWindow demo</H1>"
-"<P>Here is an example of how you can use <TT>wxDynamicSashWindow</TT> to allow your users to "
-"dynamically split and unify the views of your windows.  Try dragging out a few splits "
-"and then reunifying the window."
-"<P>Also, see the <TT>dynsash_switch</TT> sample for an example of an application which "
-"manages the scrollbars provided by <TT>wxDynamicSashWindow</TT> itself."
-;
-
-bool Demo::OnInit() {
-    wxInitAllImageHandlers();
-
-    wxFrame *frame = new wxFrame(NULL, -1, "Dynamic Sash Demo");
-    frame->SetSize(480, 480);
-
-    wxDynamicSashWindow *sash = new wxDynamicSashWindow(frame, -1);
-    wxHtmlWindow *html = new SashHtmlWindow(sash, -1);
-    html->SetPage(HTML_content);
-
-    frame->Show();
-
-    return TRUE;
-}
-
-
-SashHtmlWindow::SashHtmlWindow(wxWindow *parent, wxWindowID id,
-                               const wxPoint& pos, const wxSize& size, long style, const wxString& name) :
-                                    wxHtmlWindow(parent, id, pos, size, style, name) {
-    Connect(-1, wxEVT_DYNAMIC_SASH_SPLIT, (wxObjectEventFunction)&SashHtmlWindow::OnSplit);
-
-    m_dyn_sash = parent;
-}
-
-wxSize SashHtmlWindow::DoGetBestSize() const {
-    wxHtmlContainerCell *cell = GetInternalRepresentation();
-    wxSize size = GetSize();
-
-    if (cell) {
-        cell->Layout(size.GetWidth());
-        return wxSize(cell->GetWidth(), cell->GetHeight());
-    } else
-        return wxHtmlWindow::GetBestSize();
-}
-
-void SashHtmlWindow::OnSplit(wxDynamicSashSplitEvent& event) {
-    wxHtmlWindow *html = new SashHtmlWindow(m_dyn_sash, -1);
-    html->SetPage(HTML_content);
-}
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -1,23 +0,0 @@
-#
-# File:		Makefile.in
-# Author:	Matt Kimball
-# Created:	2001
-# Updated:
-# Copyright:	(c) 2001 Matt Kimball
-#
-# "%W% %G%"
-#
-# Makefile for the dynsash_switch example (UNIX).
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../../..
-program_dir = contrib/samples/gizmos/dynsash_switch
-
-PROGRAM=dynsash_switch
-OBJECTS=dynsash_switch.o
-
-APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@
-APPEXTRADEFS=-I$(top_srcdir)/contrib/include
-
-include $(top_builddir)/src/makeprog.env
-
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
+++ b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
@@ -1,219 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dynsash_switch.cpp
-// Purpose:     Test custom scrollbar handling of wxDynamicSashWindow by
-//              creating a dynamic sash window where the client scrolls a
-//              a subwindow of the client window by responding to scroll
-//              events itself
-// Author:      Matt Kimball
-// Modified by:
-// Created:     7/15/2001
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Matt Kimball
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include <wx/app.h>
-#include <wx/choice.h>
-#include <wx/dcclient.h>
-#include <wx/gizmos/dynamicsash.h>
-#include <wx/layout.h>
-#include <wx/scrolbar.h>
-
-class SwitchDemo : public wxApp {
-public:
-    bool OnInit();
-};
-
-
-class SwitchView : public wxWindow {
-public:
-    SwitchView(wxDynamicSashWindow *parent);
-
-    wxSize DoGetBestSize() const;
-
-private:
-    void OnSize(wxSizeEvent& event);
-    void OnPaint(wxPaintEvent& event);
-    void OnChoice(wxCommandEvent& event);
-    void OnScroll(wxScrollEvent& event);
-    void OnFocus(wxFocusEvent& event);
-    void OnErase(wxEraseEvent& event);
-    void OnSplit(wxDynamicSashSplitEvent& event);
-    void OnUnify(wxDynamicSashUnifyEvent& event);
-
-    wxDynamicSashWindow *m_dyn_sash;
-    wxWindow *m_bar;
-    wxChoice *m_choice;
-    wxWindow *m_view;
-};
-
-IMPLEMENT_APP(SwitchDemo)
-
-
-SwitchView::SwitchView(wxDynamicSashWindow *win) {
-    Create(win, -1);
-
-    m_dyn_sash = win;
-
-    m_bar = new wxWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER, "bar");
-    m_choice = new wxChoice(m_bar, -1);
-    m_choice->SetEventHandler(this);
-    m_view = new wxWindow(this, -1, wxDefaultPosition, wxDefaultSize, 0, "view");
-    m_view->SetBackgroundColour(*wxWHITE);
-    m_view->SetEventHandler(this);
-
-    m_choice->Append("Triangle");
-    m_choice->Append("Square");
-    m_choice->SetSelection(0);
-
-    wxLayoutConstraints *layout;
-
-    layout = new wxLayoutConstraints();
-    layout->left.Absolute(0);
-    layout->top.Absolute(0);
-    layout->height.Absolute(36);
-    layout->width.SameAs(this, wxWidth);
-    m_bar->SetConstraints(layout);
-
-    layout = new wxLayoutConstraints();
-    layout->left.Absolute(3);
-    layout->width.AsIs();
-    layout->height.AsIs();
-    layout->top.Absolute(3);
-    m_choice->SetConstraints(layout);
-
-    layout = new wxLayoutConstraints();
-    layout->left.Absolute(0);
-    layout->width.SameAs(this, wxWidth);
-    layout->top.Below(m_bar);
-    layout->bottom.SameAs(this, wxBottom);
-    m_view->SetConstraints(layout);
-
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    hscroll->SetEventHandler(this);
-    vscroll->SetEventHandler(this);
-
-    Connect(GetId(), wxEVT_SIZE, (wxObjectEventFunction)&SwitchView::OnSize);
-    Connect(m_choice->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, (wxObjectEventFunction)&SwitchView::OnChoice);
-    Connect(m_view->GetId(), wxEVT_PAINT, (wxObjectEventFunction)&SwitchView::OnPaint);
-
-    Connect(-1, wxEVT_SET_FOCUS, (wxObjectEventFunction)&SwitchView::OnFocus);
-    Connect(-1, wxEVT_SCROLL_TOP, (wxObjectEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_BOTTOM, (wxObjectEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_LINEUP, (wxObjectEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_LINEDOWN, (wxObjectEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_PAGEUP, (wxObjectEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_PAGEDOWN, (wxObjectEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_THUMBRELEASE, (wxObjectEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_ERASE_BACKGROUND, (wxObjectEventFunction)&SwitchView::OnErase);
-
-    Connect(-1, wxEVT_DYNAMIC_SASH_SPLIT, (wxObjectEventFunction)&SwitchView::OnSplit);
-    Connect(-1, wxEVT_DYNAMIC_SASH_UNIFY, (wxObjectEventFunction)&SwitchView::OnUnify);
-}
-
-wxSize SwitchView::DoGetBestSize() const {
-    return wxSize(64, 64);
-}
-
-void SwitchView::OnSize(wxSizeEvent& event) {
-    Layout();
-
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    if (hscroll && vscroll) {
-        int hpos = hscroll->GetThumbPosition();
-        int vpos = vscroll->GetThumbPosition();
-
-        wxSize size = m_view->GetSize();
-        if (hpos + size.GetWidth() > 300)
-            hpos = 300 - size.GetWidth();
-        if (vpos + size.GetHeight() > 300)
-            vpos = 300 - size.GetHeight();
-
-        hscroll->SetScrollbar(hpos, size.GetWidth(), 300, size.GetWidth());
-        vscroll->SetScrollbar(vpos, size.GetHeight(), 300, size.GetHeight());
-    }
-}
-
-void SwitchView::OnPaint(wxPaintEvent& event) {
-    wxPaintDC dc(m_view);
-
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    dc.Clear();
-    dc.SetDeviceOrigin(-hscroll->GetThumbPosition(), -vscroll->GetThumbPosition());
-
-    if (m_choice->GetSelection()) {
-        dc.DrawLine(20, 20, 280, 20);
-        dc.DrawLine(280, 20, 280, 280);
-        dc.DrawLine(280, 280, 20, 280);
-        dc.DrawLine(20, 280, 20, 20);
-    } else {
-        dc.DrawLine(150, 20, 280, 280);
-        dc.DrawLine(280, 280, 20, 280);
-        dc.DrawLine(20, 280, 150, 20);
-    }
-}
-
-void SwitchView::OnErase(wxEraseEvent& event) {
-    // Do nothing
-}
-
-void SwitchView::OnSplit(wxDynamicSashSplitEvent& event) {
-    SwitchView *view = new SwitchView(m_dyn_sash);
-    view->m_choice->SetSelection(m_choice->GetSelection());
-
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    hscroll->SetEventHandler(this);
-    vscroll->SetEventHandler(this);
-}
-
-void SwitchView::OnUnify(wxDynamicSashUnifyEvent& event) {
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    hscroll->SetEventHandler(this);
-    vscroll->SetEventHandler(this);
-}
-
-void SwitchView::OnChoice(wxCommandEvent& event) {
-    m_view->Refresh();
-}
-
-void SwitchView::OnScroll(wxScrollEvent& event) {
-    m_view->Refresh();
-}
-
-void SwitchView::OnFocus(wxFocusEvent& event) {
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    if (event.m_eventObject == hscroll || event.m_eventObject == vscroll) {
-        m_view->SetFocus();
-    } else {
-        event.Skip();
-    }
-}
-
-
-
-bool SwitchDemo::OnInit() {
-    wxFrame *frame;
-    wxDynamicSashWindow *dyn;
-
-    frame = new wxFrame(NULL, -1, "Dynamic Sash Window Switch Demo");
-    dyn = new wxDynamicSashWindow(frame, -1, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN);
-    new SwitchView(dyn);
-
-    frame->SetSize(480, 480);
-    frame->Show();
-
-    return TRUE;
-}
--- 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/Show More
+++ b/Show More