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

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

.cvsignore

@@ -25,6 +25,10 @@ Release
 Debug
 ReleaseDLL
 DebugDLL
+UnivRelease
+UnivDebug
+BaseRelease
+BaseDebug
 robert
 stamp-h.in
 Makefile
@@ -37,6 +41,9 @@ base
 gtk
 motif
 win32
+univ
+univ-debug
+univ-release
 base-debug
 gtk-debug
 motif-debug
@@ -46,3 +53,5 @@ gtk-release
 motif-release
 win32-release
 *tags
+log
+univtags.cmd

BuildCVS.txt

@@ -158,8 +158,10 @@ 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. Otherwise you can
-compile one yourself. Check the relevant FAQs.
+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.
 
 [ A Note about cygwin32 and mingw32: the main difference is that cygwin32
 binaries are always linked against cygwin.dll. This dll encapsulates most
@@ -179,8 +181,7 @@ 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 \
-   --enable-dnd=no --without-odbc
+-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
 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!).
@@ -188,29 +189,22 @@ 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 --enable-dnd=no
+   ../configure --host=i586-mingw32 --with-mingw
 
 (all assuming you're using mingw32)
-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.
+By default this will compile a DLL, if you want a static library,
+specify --disable-shared.
 
 Type
 -> make
 and wait, wait, wait. Don't leave the room, because the minute you do there
 will be a compile error :-)
 
-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
+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
 
     ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
 
@@ -231,8 +225,9 @@ 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 libwx_msw.a in win32/lib.  Now try
-building the minimal sample:
+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:
 
 -> cd samples/minimal
 -> make
@@ -252,6 +247,5 @@ 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.
 

Makefile.in

@@ -1,11 +1,12 @@
 #
 # File:     makefile.unx
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
-# Updated:  1999
+# Updated:  2001
 # 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
 
@@ -15,101 +16,60 @@ include ./src/make.env
 
 ############## override make.env for PIC ##########################
 
-# Clears all default suffixes
-.SUFFIXES:	.o .cpp .c .cxx
+%.o : %.c
+	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 
-.c.o :
-	$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
+%.o : %.cpp
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
-.cpp.o :
-	$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+%.o : %.cxx
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
-.cxx.o :
-	$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+%.r : %.rsrc
+	$(DEREZ) $^ Carbon.r -useDF > $@
 
 ########################### Paths #################################
 
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 
-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@
+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
 
 # 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@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' 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@
@@ -134,6 +94,7 @@ 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
@@ -175,7 +136,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 $(top_srcdir)/@PORT_FILES@
+include @PORT_FILES@
 
 SOURCES = $(ALL_SOURCES)
 HEADERS = $(ALL_HEADERS)
@@ -183,11 +144,16 @@ 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)
-ZLIBOBJS    = \
+REGEXOBJS = \
+		regcomp.o \
+		regexec.o \
+		regerror.o \
+		regfree.o
+
+ZLIBOBJS = \
 		adler32.o \
 		compress.o \
 		crc32.o \
@@ -203,7 +169,7 @@ ZLIBOBJS    = \
 		infutil.o \
 		inffast.o
 
-PNGOBJS     = \
+PNGOBJS = \
 		png.o \
 		pngread.o \
 		pngrtran.o \
@@ -239,7 +205,7 @@ FREETYPEOBJS = \
 		type1z.o \
 		winfnt.o
 
-JPEGOBJS    = \
+JPEGOBJS = \
 		jcomapi.o \
 		jutils.o \
 		jerror.o \
@@ -287,7 +253,7 @@ JPEGOBJS    = \
 		jquant2.o \
 		jdmerge.o
 
-TIFFOBJS	= \
+TIFFOBJS = \
 		tif_aux.o \
 		tif_close.o \
 		tif_codec.o \
@@ -339,85 +305,56 @@ IODBCOBJS = \
 		prepare.o \
 		result.o
 
-OLEOBJS = \
-		automtn.o \
-		dataobj.o \
-		dropsrc.o \
-		droptgt.o \
-		oleutils.o \
-		uuid.o
 
 ############################## Rules ##################################
 
-BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
-BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@
+SONAME_FLAGS = @SONAME_FLAGS@
+SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
 
 all: @WX_ALL@
 
-@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
-	@$(INSTALL) -d ./lib
-	$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
-	$(RANLIB) ./lib/$@
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
+	@$(INSTALL) -d $(build_libdir)
+	@$(RM) $@
+	$(AR) $(AROPTIONS) $@ $(OBJECTS)
+	$(RANLIB) $@
 
-@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
-	@$(INSTALL) -d ./lib
-	$(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
-	$(RANLIB) ./lib/$@
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
+	@$(INSTALL) -d $(build_libdir)
+	@$(RM) $@
+	$(AR) $(AROPTIONS) $@ glcanvas.o
+	$(RANLIB) $@
 
-@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
-	@$(INSTALL) -d ./lib
-	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
+$(build_libdir)/@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
+	@$(INSTALL) -d $(build_libdir)
+	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
-@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
-	@$(INSTALL) -d ./lib
-	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(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)
 
-./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_RESOURCES_MACOSX@: $(MACRESOURCES)
+	@$(INSTALL) -d $(build_libdir)
+	$(RESCOMP) -d __UNIX__ -useDF $^ -o $@
 
-./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 \
+$(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) \
 		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@
 
-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 \
+$(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) \
 		&& $(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_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@
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@
 
 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c
-	$(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
+	$(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c
 
 parser.c:	$(COMMDIR)/parser.y lexer.c
 	$(YACC) $(COMMDIR)/parser.y
@@ -437,10 +374,25 @@ lexer.c:	$(COMMDIR)/lexer.l
 	sed -e "s/unput/PROIO_unput/g"      > lexer.c
 	@$(RM) @LEX_STEM@.c
 
--include $(DEPFILES)
+-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@
 
 afminstall: preinstall
-	$(INSTALL) -d $(datadir)
+	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
 	$(INSTALL) -d $(datadir)/wx
 	$(INSTALL) -d $(datadir)/wx/afm
 	$(INSTALL) -d $(datadir)/wx/gs_afm
@@ -449,29 +401,35 @@ afminstall: preinstall
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config
+preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
 
-	$(INSTALL) -d $(prefix)
-	$(INSTALL) -d $(bindir)
-	$(INSTALL) -d $(libdir)
+	@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_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_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_PROGRAM) $(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) -d $(libdir)/wx
 	$(INSTALL) -d $(libdir)/wx/include
-	$(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 $(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 $(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 \
@@ -479,20 +437,27 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
 	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
 	done
 
-	$(INSTALL) -d $(localedir)
+	@if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
 	@for p in $(WX_LINGUAS); do \
-	  $(INSTALL) -d $(localedir)/$$p; \
-	  $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
+	  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_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_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
+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@
 	@echo " "
 	@echo " Installing wxWindows OpenGl add-on..."
 	@echo " "
-	$(INSTALL) -d $(libdir)
-	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+	$(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
 
 install: @AFMINSTALL@ @WX_ALL_INSTALLED@
 	@echo " "
@@ -515,16 +480,14 @@ 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/wx/@TOOLKIT_NAME@/setup.h
+	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 	@$(RM) $(bindir)/wx-config
-	@$(RM) $(bindir)/wx@TOOLKIT_NAME@-config
+	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
 	@$(RM) $(datadir)/wx/afm/*
 	@$(RM) $(datadir)/wx/gs_afm/*
 # FIXME: wxBase doesnt install these next 3 dirs.
@@ -543,8 +506,8 @@ uninstall:
 	done
 	@echo " Removing directories..."
 	@-rmdir $(localedir)
-	@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/@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; 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
@@ -561,6 +524,7 @@ uninstall:
 ALL_DIST: distclean
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
+	cp $(WXDIR)/aclocal.m4 $(DISTDIR)
 	cp $(WXDIR)/configure.in $(DISTDIR)
 	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
@@ -575,24 +539,38 @@ 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)/*.mcp $(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
-	cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
-	cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
+	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)/todo.txt $(DISTDIR)/TODO.txt
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
@@ -619,7 +597,6 @@ 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
@@ -637,12 +614,15 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
 	cp $(PNGDIR)/*.c $(DISTDIR)/src/png
+	cp $(PNGDIR)/*.mcp $(DISTDIR)/src/png
 	cp $(PNGDIR)/README $(DISTDIR)/src/png
 	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
+	cp $(JPEGDIR)/*.mcp $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
 	cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
 	cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
+	cp $(TIFFDIR)/*.mcp $(DISTDIR)/src/tiff
 	cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
 	cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
 	cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
@@ -659,10 +639,11 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/unix
-	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)
+	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 $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
@@ -688,8 +669,10 @@ 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
@@ -698,9 +681,11 @@ 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
@@ -708,21 +693,61 @@ MOTIF_DIST: ALL_GUI_DIST
 	cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
 MACX_DIST: ALL_GUI_DIST
-	echo "Apple Mac OS X specific distribution not complete"
+	cp $(INCDIR)/*.* $(DISTDIR)/include
+	cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
+	cp $(SRCDIR)/*.mcp $(DISTDIR)/src
+	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/cdef
+	cp $(MACDIR)/cdef/*.h $(DISTDIR)/src/mac/cdef
+	cp $(MACDIR)/cdef/*.c $(DISTDIR)/src/mac/cdef
+	cp $(MACDIR)/cdef/*.mcp $(DISTDIR)/src/mac/cdef
+	mkdir $(DISTDIR)/src/mac/ldef
+	cp $(MACDIR)/ldef/*.h $(DISTDIR)/src/mac/ldef
+	cp $(MACDIR)/ldef/*.c $(DISTDIR)/src/mac/ldef
+	cp $(MACDIR)/ldef/*.mcp $(DISTDIR)/src/mac/cdef
+	mkdir $(DISTDIR)/src/mac/macsock
+	cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
 
 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
@@ -781,6 +806,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/*.mcp $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
 
 	mkdir $(DISTDIR)/samples/caret
@@ -792,6 +818,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
+	cp $(SAMPDIR)/checklst/*.mcp $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst
@@ -799,6 +826,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
+	cp $(SAMPDIR)/config/*.mcp $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
 
 	mkdir $(DISTDIR)/samples/console
@@ -810,6 +838,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/controls/icons
 	cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
+	cp $(SAMPDIR)/controls/*.mcp $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls
@@ -825,6 +854,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
+	cp $(SAMPDIR)/dialogs/*.mcp $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
@@ -1214,6 +1244,14 @@ 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
@@ -1262,6 +1300,7 @@ 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
@@ -1277,6 +1316,8 @@ PYTHON_DIST:
 	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
@@ -1285,7 +1326,7 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/wxPython
 	mkdir $(DISTDIR)/wxPython/wxPython/lib
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
 
 	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
 	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
@@ -1295,6 +1336,8 @@ PYTHON_DIST:
 	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
@@ -1303,6 +1346,7 @@ 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
@@ -1325,7 +1369,6 @@ 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 \
@@ -1356,7 +1399,6 @@ 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 \
@@ -1369,24 +1411,41 @@ bzip-dist: @GUIDIST@
 	mv wxDemos demos; \
 	fi
 
-debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
+debian-dist: debian-native-dist debian-msw-dirs MSW_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) -r ./lib/wx/*
-	$(RM) ./lib/lib*
+	$(RM) $(build_libdir)/lib*
+    # Don't remove this lot, configure will reuse it
+    # if it's still good
+	# $(RM) -r $(build_libdir)/wx/*
 
 cleanall: clean
 
@@ -1404,3 +1463,4 @@ rpm: dist
 	cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
 	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
 	mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .
+

aclocal.m4

@@ -1,11 +1,104 @@
+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)],
@@ -13,12 +106,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
@@ -67,7 +160,7 @@ dnl
 #include <stdio.h>
 #include <stdlib.h>
 
-int 
+int
 main ()
 {
   int major, minor, micro;
@@ -86,7 +179,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");
@@ -97,16 +190,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
@@ -122,7 +215,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");
@@ -143,7 +236,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
@@ -168,7 +261,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 "***"
@@ -192,3 +285,5 @@ main ()
   AC_SUBST(GTK_LIBS)
   rm -f conf.gtktest
 ])
+
+

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
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-version='2000-10-23'
+timestamp='2001-09-04'
 
 # 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,30 +32,41 @@ version='2000-10-23'
 # 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 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).
-#
+# don't specify an explicit build system type.
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
 Usage: $0 [OPTION]
 
-Output the configuration name of this system.
+Output the configuration name of the system \`$me' is run on.
 
 Operation modes:
-  -h, --help               print this help, then exit
-  -V, --version            print version number, then exit"
+  -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."
 
 help="
 Try \`$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
-  case "$1" in
-    --version | --vers* | -V )
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
        echo "$version" ; exit 0 ;;
     --help | --h* | -h )
        echo "$usage"; exit 0 ;;
@@ -64,9 +75,7 @@ while test $# -gt 0 ; do
     - )	# Use stdin as input.
        break ;;
     -* )
-       exec >&2
-       echo "$me: invalid option $1"
-       echo "$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
     * )
        break ;;
@@ -78,34 +87,42 @@ 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 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 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
@@ -129,16 +146,25 @@ 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 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 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 OS release
 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -179,6 +205,7 @@ 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
@@ -200,6 +227,9 @@ EOF
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
@@ -247,7 +277,7 @@ EOF
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    SR2?01:HI-UX/MPP:*:*)
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -303,6 +333,9 @@ 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 ;;
@@ -360,6 +393,7 @@ 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 */
@@ -383,10 +417,13 @@ EOF
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm $dummy.c $dummy && exit 0
+	  && rm -f $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 ;;
@@ -434,11 +471,20 @@ 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>
 
@@ -450,7 +496,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $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
@@ -459,9 +505,9 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
-    *:AIX:*:4)
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -469,7 +515,7 @@ EOF
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=4.${UNAME_RELEASE}
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 	exit 0 ;;
@@ -495,10 +541,29 @@ 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
@@ -532,13 +597,19 @@ EOF
                   exit (0);
               }
 EOF
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	rm -f $dummy.c $dummy
+	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+	    rm -f $dummy.c $dummy
+	fi ;;
 	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
@@ -564,7 +635,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -574,7 +645,7 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -583,7 +654,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
@@ -618,37 +689,39 @@ EOF
 	echo xmp-cray-unicos
         exit 0 ;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	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 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3E:*:*:*)
+    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/'
+	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
         exit 0 ;;
-    F300:UNIX_System_V:*:*)
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "${FUJITSU_PROC}-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:*:*)
@@ -693,205 +766,93 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
-    *:Linux:*:*)
-
+    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:*:*)
 	# 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_emulations=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported emulations:/!d
+	ld_supported_targets=`cd /; ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
+				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
-        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)
+        case "$ld_supported_targets" in
+	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  i?86coff)
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;		
+	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		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
-		;;
+		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 ;;
 	esac
-
-	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
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -902,29 +863,30 @@ EOF
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+    printf ("%s-pc-linux-gnu\n", argv[1]);
 #  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 #  endif
 # else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 # endif
 #else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+  printf ("%s-pc-linux-gnuaout\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
-	  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*:*)
+	$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.
 	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,
@@ -932,7 +894,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}
@@ -940,16 +902,15 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    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
+    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}
 	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
@@ -967,7 +928,7 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i?86:*DOS:*:*)
+    i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 	exit 0 ;;
     pc:*:*:*)
@@ -1006,21 +967,24 @@ 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:2.*:* | m68*:LynxOS:3.0*:*)
 	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:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+    rs6000: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 ;;
@@ -1038,8 +1002,8 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:*: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*)
@@ -1051,6 +1015,10 @@ 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 ;;
@@ -1120,11 +1088,41 @@ 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>
@@ -1211,11 +1209,24 @@ main ()
 #endif
 
 #if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# 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
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -1226,7 +1237,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
@@ -1262,8 +1273,9 @@ fi
 cat >&2 <<EOF
 $0: unable to guess system type
 
-The $version version of this script cannot recognize your system type.
-Please download the most up to date version of the config scripts:
+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
 
     ftp://ftp.gnu.org/pub/gnu/config/
 
@@ -1272,7 +1284,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 version = $version
+config.guess timestamp = $timestamp
 
 uname -m = `(uname -m) 2>/dev/null || echo unknown`
 uname -r = `(uname -r) 2>/dev/null || echo unknown`
@@ -1299,7 +1311,7 @@ exit 1
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "version='"
+# time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:

config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-version='2000-11-04'
+timestamp='2001-09-07'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -60,16 +60,30 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS
 Canonicalize a configuration name.
 
 Operation modes:
-  -h, --help               print this help, then exit
-  -V, --version            print version number, then exit"
+  -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."
 
 help="
 Try \`$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
-  case "$1" in
-    --version | --vers* | -V )
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
        echo "$version" ; exit 0 ;;
     --help | --h* | -h )
        echo "$usage"; exit 0 ;;
@@ -78,9 +92,7 @@ while test $# -gt 0 ; do
     - )	# Use stdin as input.
        break ;;
     -* )
-       exec >&2
-       echo "$me: invalid option $1"
-       echo "$help"
+       echo "$me: invalid option $1$help"
        exit 1 ;;
 
     *local*)
@@ -105,7 +117,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -145,6 +157,14 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -203,22 +223,36 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	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)
+	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)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -226,13 +260,13 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 
 	# 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[234567]86 | x86_64)
+	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -241,28 +275,43 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# 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-*)
+	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-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -353,8 +402,8 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -410,6 +459,10 @@ 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
@@ -485,19 +538,19 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -509,18 +562,6 @@ 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
@@ -546,6 +587,10 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -576,7 +621,7 @@ case $basic_machine in
 		os=-coff
 		;;
 	msdos)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-msdos
 		;;
 	mvs)
@@ -686,7 +731,7 @@ case $basic_machine in
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i786-pc
+		basic_machine=i686-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
@@ -695,12 +740,12 @@ case $basic_machine in
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=rs6000-ibm
+	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
 	        ;;
@@ -712,9 +757,23 @@ 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
@@ -862,6 +921,10 @@ 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
@@ -905,16 +968,20 @@ 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)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv9)
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
         cydra)
@@ -936,6 +1003,9 @@ 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
@@ -992,15 +1062,18 @@ 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*)
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
-		    x86-* | i[34567]86-*)
+		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
@@ -1093,7 +1166,7 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -*MiNT)
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 	        os=-mint
 		;;
 	-none)
@@ -1127,6 +1200,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+	pdp10-*)
+		os=-tops20
+		;;
         pdp11-*)
 		os=-none
 		;;
@@ -1235,7 +1311,7 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f301-fujitsu)
+	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1313,9 +1389,12 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -*MiNT)
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
+			-vos*)
+				vendor=stratus
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
@@ -1326,7 +1405,7 @@ exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "version='"
+# time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:

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)

contrib/configure

@@ -812,7 +812,6 @@ done
 ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "
-            Makefile
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
@@ -822,6 +821,8 @@ 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
@@ -835,9 +836,17 @@ 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
@@ -920,8 +929,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile
-            src/Makefile
+CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
@@ -930,6 +938,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             src/gizmos/Makefile
             src/plot/Makefile
             src/applet/Makefile
+            src/fl/Makefile
+            src/net/Makefile
             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
@@ -943,9 +953,17 @@ CONFIG_FILES=\${CONFIG_FILES-"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

contrib/configure.in

@@ -37,7 +37,6 @@ dnl File output
 
 
 AC_OUTPUT([
-            Makefile
             src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
@@ -47,6 +46,8 @@ 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
@@ -60,9 +61,17 @@ 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

contrib/include/wx/animate/animate.h

@@ -0,0 +1,335 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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__
+

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 GetValue(const wxString &cls, const char *parms = NULL);
-};
+    static wxString FindValue(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(name, returnval)                                  \
+#define END_ECHO_VARIABLE(returnval)                                        \
     return returnval;                                                       \
     }
 
 #define STRING_ECHO_VARIABLE(name, string)                                  \
     BEGIN_ECHO_VARIABLE(##name##);                                          \
-    END_ECHO_VARIABLE(##name##, wxString(##string##))
+    END_ECHO_VARIABLE(wxString(##string##))
 	
 #endif // __WX_ECHOVAR_H
 

contrib/include/wx/applet/ifelsevar.h

@@ -66,8 +66,8 @@ public:
 
 public:
     // static function to retrieve any variable avaliable
-    static bool GetValue(const wxString &cls);
-};
+    static bool FindValue(const wxString &cls);
+    };
 
 /*--------------------------------- MACROS --------------------------------*/
 
@@ -82,14 +82,13 @@ public:
     IMPLEMENT_DYNAMIC_CLASS(wxIfElseVariable##name##, wxIfElseVariable);    \
     bool wxIfElseVariable##name :: GetValue() const {
 
-#define END_IFELSE_VARIABLE(name, returnval)                                \
+#define END_IFELSE_VARIABLE(returnval)                                      \
     return returnval;                                                       \
     }
 
 #define IFELSE_VARIABLE(name, state)                                        \
     BEGIN_IFELSE_VARIABLE(##name##);                                        \
-    END_IFELSE_VARIABLE(##name##, bool (state))
-
+    END_IFELSE_VARIABLE(bool (state))
 
 #endif // __WX_IFELSEVAR_H
 

contrib/include/wx/applet/plugin.h

@@ -0,0 +1,57 @@
+/****************************************************************************
+*
+*                       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
+

contrib/include/wx/applet/prepinclude.h

@@ -41,10 +41,9 @@ wxIncludePrep class Definition
 class wxIncludePrep : public wxHtmlProcessor {
 private:
     //DECLARE_DYNAMIC_CLASS(wxIncludePrep);
-    wxString DOC_ROOT;
-
+    wxFileSystem *m_FS;
 public:
-    wxIncludePrep() : wxHtmlProcessor() {DOC_ROOT = wxString("");}
+    wxIncludePrep() : wxHtmlProcessor() {}
     ~wxIncludePrep() {}
 	
 	// Process input text and return processed result
@@ -54,8 +53,7 @@ public:
     // is the processor applied to the text.
     int GetPriority() const { return wxHTML_PRIORITY_SYSTEM; }
 	
-    void ChangeDirectory(const wxString &dir);
-    wxString GetDirectory() { return DOC_ROOT; }
+    void ChangeDirectory(wxFileSystem *);
     };
 	
 	

contrib/include/wx/applet/window.h

@@ -30,12 +30,15 @@
 #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);
@@ -59,6 +62,8 @@ public:
                 wxString& group,
                 wxString& href );
 
+            VirtualData();
+
             // Gets
             wxString GetName(){ return m_name;};
             wxString GetGroup(){ return m_group;};
@@ -81,15 +86,21 @@ 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(
@@ -101,7 +112,8 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHW_SCROLLBAR_AUTO,
-                const wxString& name = "htmlAppletWindow");
+                const wxString& name = "htmlAppletWindow",
+                const wxPalette& globalPalette = wxNullPalette);
 
             // Destructor
             ~wxHtmlAppletWindow();
@@ -113,6 +125,9 @@ 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);
 
@@ -131,17 +146,25 @@ 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
-            bool RegisterCookie(const wxString& name,wxObject *cookie);
+            static bool RegisterCookie(const wxString& name,wxObject *cookie);
 
             // UnRegister a cookie of data in the applet manager
-            bool UnRegisterCookie(const wxString& name);
+            static bool UnRegisterCookie(const wxString& name);
 
             // Find a cookie of data given it's public name
-            wxObject *FindCookie(const wxString& name);
+            static wxObject *FindCookie(const wxString& name);
 			
             // Event handlers to load a new page	
 			void OnLoadPage(wxLoadPageEvent &event);
@@ -150,16 +173,54 @@ 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
 

contrib/include/wx/fl/antiflickpl.h

@@ -0,0 +1,64 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas (@Lithuania)
+// Modified by:
+// Created:     23/10/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __ANTIFLICKPL_G__
+#define __ANTIFLICKPL_G__
+
+#ifdef __GNUG__
+    #pragma interface "antiflickpl.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+
+class cbAntiflickerPlugin : public cbPluginBase
+{
+	DECLARE_DYNAMIC_CLASS( cbAntiflickerPlugin )
+protected:
+	// double-buffers are shared "resource" among all instances of 
+	// antiflicker plugin within the application 
+	//
+	// TODO:: locking should be implemented, for multithreaded GUIs
+
+	static wxBitmap*   mpVertBuf;
+	static wxBitmap*   mpHorizBuf;
+	static wxMemoryDC* mpVertBufDc;
+	static wxMemoryDC* mpHorizBufDc;
+
+	static int mRefCount;
+
+	wxDC*  mpLRUBufDc; // last-reacently-used buffer
+	wxRect mLRUArea;   // last-reacently-used area
+
+protected:
+	// returns NULL, if sutable buffer is not present
+	wxDC* FindSuitableBuffer( const wxRect& forArea );
+	wxDC* AllocNewBuffer( const wxRect& forArea );
+	wxDC& GetWindowDC();
+
+	wxDC& GetClientDC();
+public:
+
+	cbAntiflickerPlugin(void);
+
+	cbAntiflickerPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
+
+	virtual ~cbAntiflickerPlugin();
+
+	// handlers for plugin events
+
+	void OnStartDrawInArea ( cbStartDrawInAreaEvent& event );
+	void OnFinishDrawInArea( cbFinishDrawInAreaEvent& event );
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif /* __ANTIFLICKPL_G__ */
+

contrib/include/wx/fl/bardragpl.h

@@ -0,0 +1,122 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     23/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __BARDRAGPL_G__
+#define __BARDRAGPL_G__
+
+#ifdef __GNUG__
+    #pragma interface "bardragpl.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+#include "wx/fl/toolwnd.h"
+
+class cbBarDragPlugin : public cbPluginBase
+{
+	DECLARE_DYNAMIC_CLASS( cbBarDragPlugin )
+protected:
+
+	// plugin is active only in bar-dragging state
+	bool           mBarDragStarted;
+	bool           mCanStick;          // flag used to prevent "bouncing" of hint-rectangle
+	wxScreenDC*    mpScrDc;            // created while tracking hint-rect
+	wxCursor*      mpCurCursor;
+
+	// rectnagle shows the position/dimensions of the bar, 
+	// if it would be docked now
+
+	wxRect         mPrevHintRect;
+	wxRect         mHintRect;
+
+
+	int            mMouseInRectX;
+	int            mMouseInRectY;
+
+	cbDockPane*    mpSrcPane;          // pane, from which the bar was originally taken
+	int            mBarWidthInSrcPane;
+
+	cbDockPane*    mpCurPane;
+
+	cbBarInfo*     mpDraggedBar;       // bar, which is being dragged
+	bool           mBarWasFloating;
+	wxRect         mFloatedBarBounds;
+
+public: /*** public properties ***/
+
+	int            mInClientHintBorder; // when hint-rect moves within client window area,
+                                        // the thicker rectangle is drawn using hatched brush,
+										// the default border width for this rectangle is 8 pix.
+
+protected:
+
+
+	void AdjustHintRect( wxPoint& mousePos );
+
+	void ClipRectInFrame( wxRect& rect );
+	void ClipPosInFrame( wxPoint& pos );
+
+	cbDockPane* HitTestPanes( wxRect& rect );
+	cbDockPane* HitTestPanes( wxPoint& pos );
+	bool HitsPane( cbDockPane* pPane, wxRect& rect );
+
+	void CalcOnScreenDims( wxRect& rect );
+
+	int  GetDistanceToPane( cbDockPane* pPane, wxPoint& mousePos );
+
+	bool IsInOtherPane ( wxPoint& mousePos );
+	bool IsInClientArea( wxPoint& mousePos );
+	bool IsInClientArea( wxRect& rect );
+
+	void StickToPane( cbDockPane* pPane, wxPoint& mousePos );
+	void UnstickFromPane( cbDockPane* pPane, wxPoint& mousePos );
+
+	int GetBarWidthInPane( cbDockPane* pPane );
+	int GetBarHeightInPane( cbDockPane* pPane );
+
+	// on-screen hint-tracking related methods
+
+	void StartTracking();
+
+	void DrawHintRect ( wxRect& rect, bool isInClientRect);
+	void EraseHintRect( wxRect& rect, bool isInClientRect);
+
+	void FinishTracking();
+
+	void DoDrawHintRect( wxRect& rect, bool isInClientRect);
+
+	void RectToScr( wxRect& frameRect, wxRect& scrRect );
+
+	void ShowHint( bool prevWasInClient );
+
+public:
+	cbBarDragPlugin(void);
+
+	cbBarDragPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
+
+	virtual ~cbBarDragPlugin();
+
+	// handlers for plugin events
+
+	void OnMouseMove( cbMotionEvent& event );
+	void OnLButtonUp( cbLeftUpEvent& event );
+	void OnLButtonDown( cbLeftDownEvent& event );
+	void OnLDblClick( cbLeftDClickEvent& event );
+
+	// handles event, which oriniates from itself
+	void OnDrawHintRect( cbDrawHintRectEvent& event );        
+
+	void OnStartBarDragging( cbStartBarDraggingEvent& event );
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif /* __BARDRAGPL_G__ */
+

contrib/include/wx/fl/barhintspl.h

@@ -0,0 +1,96 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     30/11/98 (my 22th birthday :-)
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __DRAGHINTSPL_G__
+#define __DRAGHINTSPL_G__
+
+#ifdef __GNUG__
+    #pragma interface "barhintspl.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+#include "wx/fl/toolwnd.h"
+
+/*
+ * Intercepts bar-decoration and sizing events, draws 3d-hints
+ * around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x
+ */
+
+class cbBarHintsPlugin : public cbPluginBase
+{
+	DECLARE_DYNAMIC_CLASS( cbBarHintsPlugin )
+
+protected:
+	cbDockPane* mpPane; // is set up temorarely, while handling event
+
+	cbMiniButton* mBoxes[2];
+
+	bool        mBtnPressed;
+	bool        mClosePressed;
+	cbBarInfo*  mpClickedBar;
+	bool        mDepressed;
+
+protected:
+	// drawing helpers
+
+	void Draw3DBox      ( wxDC& dc, const wxPoint& pos, bool pressed );
+	void DrawCloseBox   ( wxDC& dc, const wxPoint& pos, bool pressed );
+	void DrawCollapseBox( wxDC& dc, const wxPoint& pos, 
+						  bool atLeft, bool disabled, bool pressed );
+
+	void DrawGrooves    ( wxDC& dc, const wxPoint& pos, int length );
+
+	void DoDrawHint( wxDC& dc, wxRect& rect, int pos, int boxOfs, int grooveOfs, bool isFixed );
+	
+	void GetHintsLayout( wxRect& rect, cbBarInfo& info, 
+						 int& boxOfs, int& grooveOfs, int& pos );
+
+	int HitTestHints( cbBarInfo& info, const wxPoint& pos );
+
+	void ExcludeHints( wxRect& rect, cbBarInfo& info );
+
+	void CreateBoxes();
+
+public:
+	/* public properties */
+
+	bool mCloseBoxOn;    // default: ON
+	bool mCollapseBoxOn; // default: ON
+	int  mGrooveCount;   // default: 2 (two shaded bars)
+	int  mHintGap;       // default: 5 (pixels from above, below, right and left)
+	int  mXWeight;       // default: 2 (width in pixels of lines which used for drawing cross)
+
+public:
+
+	cbBarHintsPlugin(void);
+
+	cbBarHintsPlugin( wxFrameLayout* pLayout, int paneMask = wxALL_PANES );
+
+    ~cbBarHintsPlugin();
+
+	void SetGrooveCount( int nGrooves );
+
+	void OnInitPlugin();
+
+	// handlers of plugin-events
+
+	void OnSizeBarWindow( cbSizeBarWndEvent& event );
+	void OnDrawBarDecorations( cbDrawBarDecorEvent& event );
+
+	void OnLeftDown( cbLeftDownEvent& event );
+	void OnLeftUp  ( cbLeftUpEvent&   event );
+	void OnMotion  ( cbMotionEvent&   event );
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif /* __DRAGHINTSPL_G__ */
+

contrib/include/wx/fl/cbcustom.h

@@ -0,0 +1,47 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     28/10/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __CBCUSTOM_G__
+#define __CBCUSTOM_G__
+
+#ifdef __GNUG__
+    #pragma interface "cbcustom.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+
+class cbSimpleCustomizationPlugin : public cbPluginBase
+{
+public:
+	DECLARE_DYNAMIC_CLASS( cbSimpleCustomizationPlugin )
+
+	int mCustMenuItemId;
+public:
+
+	cbSimpleCustomizationPlugin(void);
+
+	cbSimpleCustomizationPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
+
+	// plugin-event handlers
+
+	void OnCustomizeBar( cbCustomizeBarEvent& event );
+
+	void OnCustomizeLayout( cbCustomizeLayoutEvent& event );
+
+	// menu-event handler
+
+	void OnMenuItemSelected( wxCommandEvent& event );
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif /* __CBCUSTOM_G__ */
+

contrib/include/wx/fl/dynbarhnd.h

@@ -0,0 +1,22 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     23/01/99
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __DYNBARHND_G__
+#define __DYNBARHND_G__
+
+#ifdef __GNUG__
+    #pragma interface "dynbarhnd.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+
+#endif /* __DYNBARHND_G__ */
+

contrib/include/wx/fl/dyntbar.h

@@ -0,0 +1,204 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     ??/10/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __DYNTBAR_G__
+#define __DYNTBAR_G__
+
+#ifdef __GNUG__
+    #pragma interface "dyntbar.h"
+#endif
+
+#include "wx/tbarbase.h"
+#include "wx/dynarray.h"
+
+// layout item
+
+class wxToolLayoutItem : public wxObject
+{
+public:
+	wxRect    mRect;
+	bool      mIsSeparator;
+};
+
+class wxDynToolInfo;
+
+typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
+typedef wxDynToolInfo*    wxDynToolInfoPtrT;
+
+
+WX_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
+WX_DEFINE_ARRAY( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );
+
+// base class for layouting algorithm implementations
+
+class LayoutManagerBase
+{
+public:
+	virtual void Layout( const wxSize&       parentDim, 
+						 wxSize&	         resultingDim,
+						 wxLayoutItemArrayT& items,
+						 int		         horizGap,
+ 		                 int		         vertGap   ) = 0;
+
+	virtual ~LayoutManagerBase() {}
+};
+
+// layouts items in left-to-right order from
+// top towards bottom
+
+class BagLayout : public LayoutManagerBase
+{
+public:
+	virtual void Layout( const wxSize&       parentDim, 
+						 wxSize&	         resultingDim,
+						 wxLayoutItemArrayT& items,
+						 int		         horizGap,
+ 		                 int		         vertGap   );
+};
+
+class wxDynToolInfo : public wxToolLayoutItem
+{
+	DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
+
+public:
+	wxWindow* mpToolWnd;
+	int       mIndex;
+	wxSize    mRealSize;
+};
+
+// layouting orientations for tools
+
+#define LO_HORIZONTAL    0
+#define LO_VERTICAL      1
+#define LO_FIT_TO_WINDOW 2
+
+// class manages containment and layouting of tool-windows
+
+class wxDynamicToolBar : public wxToolBarBase
+{
+	DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
+protected:
+
+	friend class wxDynamicToolBarSerializer;
+
+	wxDynToolInfoArrayT mTools;
+	LayoutManagerBase*  mpLayoutMan;
+
+protected:
+	virtual void SizeToolWindows();
+
+public: /* public properties */
+
+	int                mSepartorSize; // default: 8
+	int                mVertGap;      // default: 0
+	int                mHorizGap;	  // default: 0
+	
+public:
+	wxDynamicToolBar();
+
+	wxDynamicToolBar(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+	             const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
+		         const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
+
+	~wxDynamicToolBar(void);
+
+	bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+				const long style = wxNO_BORDER, const int orientation = wxVERTICAL, const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
+
+	// overridables
+
+	virtual void AddTool( int toolIndex, 
+                              wxWindow* pToolWindow, 
+                              const wxSize& size = wxDefaultSize );
+
+        virtual void AddTool( int toolIndex, 
+                              const wxString& imageFileName,
+                              wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
+                              const wxString& labelText = "", bool alignTextRight = FALSE,
+                              bool isFlat = TRUE );
+        virtual void AddTool( int toolIndex, wxBitmap labelBmp,
+                              const wxString& labelText = "", bool alignTextRight = FALSE,
+                              bool isFlat = TRUE );
+
+	// method from wxToolBarBase (for compatibility), only
+	// first two arguments are valid
+
+  virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
+               const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
+               const wxString& helpString1 = "", const wxString& helpString2 = "");
+
+	virtual void AddSeparator( wxWindow* pSepartorWnd = NULL );
+
+	wxDynToolInfo* GetToolInfo( int toolIndex );
+
+	void RemveTool( int toolIndex );
+
+	// the default implementation draws shaded line
+	virtual void DrawSeparator( wxDynToolInfo& info, wxDC& dc );
+
+	// see definitions of orientation types
+	virtual bool Layout();
+
+	virtual void GetPreferredDim( const wxSize& givenDim, wxSize& prefDim );
+
+	virtual LayoutManagerBase* CreateDefaulLayout() { return new BagLayout(); }
+
+	virtual void SetLayout( LayoutManagerBase* pLayout );
+
+	virtual void EnableTool(const int toolIndex, const bool enable = TRUE);
+
+	// event handlers
+
+	void OnSize( wxSizeEvent& event );
+	void OnPaint( wxPaintEvent& event );
+	void OnEraseBackground( wxEraseEvent& event );
+
+	// overriden from wxToolBarBase
+
+	virtual bool Realize(void);
+
+	// stuff from the 2.1.15 
+
+    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x,
+                                                   wxCoord y) const;
+
+
+    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
+
+    // the tool is still in m_tools list when this function is called, it will
+    // only be deleted from it if it succeeds
+    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
+
+    // called when the tools enabled flag changes
+    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
+
+    // called when the tool is toggled
+    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
+
+    // called when the tools "can be toggled" flag changes
+    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
+
+    // the functions to create toolbar tools
+    virtual wxToolBarToolBase *CreateTool(int id,
+                                          const wxBitmap& bitmap1,
+                                          const wxBitmap& bitmap2,
+                                          bool toggle,
+                                          wxObject *clientData,
+                                          const wxString& shortHelpString,
+                                          const wxString& longHelpString);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif /* __DYNTBAR_G__ */
+

contrib/include/wx/fl/dyntbarhnd.h

@@ -0,0 +1,31 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     23/01/99
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __DYNTBARHND_G__
+#define __DYNTBARHND_G__
+
+#ifdef __GNUG__
+    #pragma interface "dyntbarhnd.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+#include "wx/fl/dyntbar.h"
+
+class cbDynToolBarDimHandler : public cbBarDimHandlerBase
+{
+	DECLARE_DYNAMIC_CLASS( cbDynToolBarDimHandler )
+public:
+	void OnChangeBarState(cbBarInfo* pBar, int newState );
+	void OnResizeBar( cbBarInfo* pBar, const wxSize& given, wxSize& preferred );
+};
+
+#endif /* __DYNTBARHND_G__ */
+

contrib/include/wx/fl/frmview.h

@@ -0,0 +1,140 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     02/01/99
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __FRMVIEW_G__
+#define __FRMVIEW_G__
+
+#ifdef __GNUG__
+    #pragma interface "frmview.h"
+#endif
+
+#include "wx/module.h"
+
+#if 0
+#include "wx/fl/objstore.h"
+#endif
+
+class wxObjectStorage;
+
+#include "wx/fl/controlbar.h"
+
+class wxFrameManager;
+
+class wxFrameView : public wxEvtHandler
+{
+protected:
+	wxStringList    mTopMenus;
+	wxFrameLayout*  mpLayout;
+	wxFrameManager* mpFrameMgr;
+	bool            mDoToolUpdates;
+
+	friend class wxFrameManager;
+	friend class wxFrameViewSerializer;	
+
+protected:
+	void OnIdle( wxIdleEvent& event);
+	
+public:
+	wxFrameView();
+	~wxFrameView();
+
+	virtual void Activate();
+	virtual void Deactivate();
+
+	wxFrame* GetParentFrame();
+	wxWindow* GetClientWindow();
+
+	wxFrameManager& GetFrameManager();
+
+	void RegisterMenu( const wxString& topMenuName );
+
+	void CreateLayout();
+	wxFrameLayout* GetLayout();
+	void SetLayout( wxFrameLayout* pLayout );
+	void SetToolUpdates( bool doToolUpdates = TRUE );
+
+
+	// hooks for specific frame-views
+
+	virtual void OnInit() {}
+
+	virtual void OnSerialize( wxObjectStorage& store ) {}
+	virtual void OnActiveate() {}
+	virtual void OnDeactivate() {}
+
+	// imp. is mandatory
+	virtual void OnRecreate() {}
+	virtual void OnInitMenus() {}
+
+	DECLARE_EVENT_TABLE()
+};
+
+class wxFrame;
+
+class wxFrameManager : wxObject
+{
+protected:
+	wxList       mViews;
+	wxWindow*    mpFrameWnd;
+	int          mActiveViewNo;
+	wxWindow*    mpClientWnd;
+
+#if 0
+	wxObjectStorage mStore;
+#endif
+
+	wxString        mSettingsFile;
+
+protected:
+	void DoSerialize( wxObjectStorage& store );
+	void DestroyViews();
+	int GetViewNo( wxFrameView* pView );
+	void EnableMenusForView( wxFrameView* pView, bool enable );
+	void SyncAllMenus();
+
+public:
+	wxFrameManager();
+	~wxFrameManager();
+
+	// if file name is empty, views are are not saved/loaded
+
+	virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = "" );
+
+	// synonyms
+	wxFrame* GetParentFrame();
+	wxWindow* GetParentWindow();
+
+	int GetActiveViewNo();
+	wxFrameView* GetActiveView();
+	wxNode* GetActiveViewNode();
+
+	wxFrameView* GetView( int viewNo );
+
+	void SetClinetWindow( wxWindow* pFrameClient ); 
+	wxWindow* GetClientWindow();
+
+	void AddView( wxFrameView* pFrmView );
+	void RemoveView( wxFrameView* pFrmView );
+
+	void ActivateView( int viewNo );
+	void ActivateView( wxFrameView* pFrmView );
+	void DeactivateCurrentView();
+
+	wxObjectStorage& GetObjectStore();
+
+	void SaveViewsNow();
+	bool ReloadViews();
+
+	bool ViewsAreLoaded();
+};
+
+#endif /* __FRMVIEW_G__ */
+

contrib/include/wx/fl/garbagec.h

@@ -0,0 +1,74 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas (@Lithuania)
+// Modified by:
+// Created:     ??/10/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __GARBAGEC_G__
+#define __GARBAGEC_G__
+
+#ifdef __GNUG__
+    #pragma interface "garbagec.h"
+#endif
+
+#include "wx/list.h"
+
+struct GCItem
+{
+	void*	  mpObj;
+	wxList    mRefs;   // references to other nodes
+};
+
+inline void* gc_node_to_obj( wxNode* pGCNode )
+{
+	return ( (GCItem*) (pGCNode->Data()) )->mpObj;
+}
+
+// class implements extremely slow, but probably one of the most simple GC algorithms
+
+class GarbageCollector
+{
+protected:
+	wxList mAllNodes;
+	wxList mRegularLst;
+	wxList mCycledLst;
+
+	wxNode* FindItemNode( void* pForObj );
+	void    ResolveReferences();
+
+	wxNode* FindReferenceFreeItemNode();
+	void    RemoveReferencesToNode( wxNode* pItemNode );
+	void    DestroyItemList( wxList& lst );
+
+public:
+
+	GarbageCollector() {}
+
+	virtual ~GarbageCollector();
+
+	// prepare data for GC alg.
+
+	virtual void AddObject( void* pObj, int refCnt = 1 );
+	virtual void AddDependency( void* pObj, void* pDependsOnObj );
+
+	// executes GC alg.
+
+	virtual void ArrangeCollection();
+
+	// access results of the alg.
+
+	wxList& GetRegularObjects();
+	wxList& GetCycledObjects();
+
+	// removes all data from GC
+
+	void Reset();
+};
+
+#endif /* __GARBAGEC_G__ */
+

contrib/include/wx/fl/gcupdatesmgr.h

@@ -0,0 +1,123 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     19/10/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __GCUPDATESMGR_G__
+#define __GCUPDATESMGR_G__
+
+#ifdef __GNUG__
+    #pragma interface "gcupdatesmgr.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+#include "wx/fl/updatesmgr.h"
+
+#include "wx/fl/garbagec.h"
+
+/*
+ * class implements optimized logic for refreshing
+ * areas of frame layout - which actually need to be updated. 
+ * Is used as default updates-manager by wxFrameLayout.
+ *
+ * it is called "Garbage Collecting" u.mgr for it's implementation
+ * tries to find out dependencies between bars, and to order
+ * them ito "hierarchy", this hierarchical sorting resembles
+ * implemenation of heap-garbage collectors, which resolve
+ * dependencies between references.
+ *
+ * Example: there are situations where the order of moving
+ *          the windows does matter:
+ *
+ *   case 1)                
+ *      ------		    ---
+ *      | A	 |	 	    |B|  
+ *		------	 --->  	| |
+ *			---		   	--- ------ 
+ *			|B|		   		| A  | 
+ *			| |		   		------
+ *			---		   		
+ *						(future)
+ *	   (past)            
+ *
+ *  past/future positions of A and B windows completely overlapp, i.e.
+ *  depend on each other, and there is not solution for
+ *  moving the windows witout refreshing both of them,
+ *  -- we have cyclic dependency here. The gc. alg will
+ *  find this cyclic dependecy and will force "refresh"
+ *  after movement.
+ *
+ *   case 2)
+ *
+ *      ------		                        
+ *      | A	 |	 	                        
+ * 		------	 --->                       
+ * 			---		                  
+ * 			|B|		   		           ------   
+ * 			| |		   		           | A  |   
+ * 			---		   		           ------         
+ *						 ---
+ *						 |B|
+ *						 | |
+ *					     ---
+ *
+ * 						(future)                
+ * 	   (past)       
+ *
+ *  in this case past/future positions do not overlapp, thus
+ *  it's enough only to move windows, without refreshing them.
+ *  GC will "notice" it.
+ *
+ *  there is also third case, when overlapping is partial
+ *  in this case the refershing can be also avoided by
+ *  moving windows in the order of "most-dependant" towards the
+ *  "least-dependent". GC handles this automatically, by
+ *  sorting windows by their dependency-level (or "hierarchy")
+ *
+ *  See garbagec.h for more details of this method, garbagec.h/cpp
+ *  implement sorting of generic-dependencies (does not deal
+ *  with graphical objects directly)
+ *
+ *  Summary: improves performance when complex/large windows are 
+ *           moved around, by reducing number of repaints. Also helps 
+ *           to avoid dirty non-client areas of moved windows
+ *           in some special cases of "overlapping anomalies"
+ */
+
+class cbGCUpdatesMgr : public cbSimpleUpdatesMgr
+{
+	DECLARE_DYNAMIC_CLASS( cbGCUpdatesMgr )
+protected:
+
+	GarbageCollector mGC;
+
+	void DoRepositionItems( wxList& items );
+
+	void AddItem( wxList&     itemList,
+				  cbBarInfo*  pBar, 
+		          cbDockPane* pPane,
+				  wxRect&     curBounds,
+				  wxRect&     prevBounds );
+
+public:
+
+	cbGCUpdatesMgr(void) {}
+
+	cbGCUpdatesMgr( wxFrameLayout* pPanel );
+
+	// notificiactions received from Frame Layout :
+
+	virtual void OnStartChanges();
+
+	// refreshes parts of the frame layout, which need an update
+	virtual void UpdateNow();
+};
+
+#endif /* __GCUPDATESMGR_G__ */
+

contrib/include/wx/fl/hintanimpl.h

@@ -0,0 +1,120 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     9/11/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __HINTANIMPL_G__
+#define __HINTANIMPL_G__
+
+#ifdef __GNUG__
+    #pragma interface "hintanimpl.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+
+#include "wx/timer.h"
+
+class cbHintAnimTimer;
+
+class cbHintAnimationPlugin : public cbPluginBase
+{
+	DECLARE_DYNAMIC_CLASS( cbHintAnimationPlugin )
+protected:
+	friend class cbHintAnimTimer;
+
+	wxScreenDC*      mpScrDc;     // created while tracking hint-rect
+	cbHintAnimTimer* mpAnimTimer;  
+
+	// FOR NOW:: try it without mutually exculisve locks
+	volatile wxRect  mCurRect;
+
+	// state variables
+
+	bool   mAnimStarted;
+	bool   mStopPending;
+
+	bool   mPrevInClient;
+	bool   mCurInClient;
+
+	wxRect mPrevRect;
+
+public:
+	int    mMorphDelay;         // delay between frames in miliseconds,     default: 20
+	int    mMaxFrames;          // number  of iterations for hint morphing, default: 30
+							    // (morph duration = mMorphDelay * mMaxFrames msec)
+
+	int    mInClientHintBorder; // default: 4 pixels
+
+	bool   mAccelerationOn;     // TRUE, if morph accelerates, otherwise morph
+								// speed is constant. Default: TRUE
+
+	// TBD:: get/set methods for above members
+
+protected:
+	void StartTracking();
+
+	void DrawHintRect ( wxRect& rect, bool isInClientRect);
+	void EraseHintRect( wxRect& rect, bool isInClientRect);
+
+	void FinishTracking();
+
+	void DoDrawHintRect( wxRect& rect, bool isInClientRect);
+
+	void RectToScr( wxRect& frameRect, wxRect& scrRect );
+
+public:
+	cbHintAnimationPlugin(void);
+
+	~cbHintAnimationPlugin();
+
+	cbHintAnimationPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
+
+	void OnDrawHintRect( cbDrawHintRectEvent& event );        
+
+	DECLARE_EVENT_TABLE()
+};
+
+
+// helper classes
+
+struct MorphInfoT
+{
+	wxPoint mFrom;
+	wxPoint mTill;
+};
+
+class cbHintAnimTimer : public wxTimer 
+{
+protected:
+
+	friend class cbHintAnimationPlugin;
+
+	wxRect      mPrevMorphed;
+
+	MorphInfoT  mUpperLeft;
+	MorphInfoT  mLowerRight;
+	int         mCurIter;
+
+	long        mLock;
+
+	cbHintAnimationPlugin* mpPl;
+
+	void MorphPoint( wxPoint& origin, MorphInfoT& info, wxPoint& point );
+
+public: 
+
+	cbHintAnimTimer(void);
+
+	virtual void Notify(void);
+
+	virtual bool Init( cbHintAnimationPlugin* pAnimPl, bool reinit );
+};
+
+#endif /* __HINTANIMPL_G__ */
+

contrib/include/wx/fl/newbmpbtn.h

@@ -0,0 +1,165 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     ??/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __NEWBMPBTN_G__
+#define __NEWBMPBTN_G__
+
+#ifdef __GNUG__
+    #pragma interface "newbmpbtn.h"
+#endif
+
+#include "wx/button.h"
+#include "wx/string.h"
+
+// button lable-text alignment types
+
+#define NB_ALIGN_TEXT_RIGHT  0
+#define NB_ALIGN_TEXT_BOTTOM 1
+#define NB_NO_TEXT           2
+#define NB_NO_IMAGE          3
+
+// classes declared in this header file
+
+class wxNewBitmapButton;
+class wxBorderLessBitmapButton;
+
+// alternative class for wxBmpButton
+
+class wxNewBitmapButton: public wxPanel
+{
+	DECLARE_DYNAMIC_CLASS(wxNewBitmapButton)
+
+protected:
+
+	friend class wxNewBitmapButtonSerializer;
+
+	int      mTextToLabelGap;
+	int      mMarginX;
+	int      mMarginY;
+	int      mTextAlignment;
+	bool     mIsSticky;
+	bool     mIsFlat;
+
+	wxString mLabelText;
+	wxString mImageFileName;
+	wxBitmapType mImageFileType;
+
+	wxBitmap mDepressedBmp; // source image for rendering
+	                        // labels for particular state
+
+	wxBitmap mFocusedBmp;   // may not be always present -
+							// only if mHasFocusedBmp is TRUE
+
+	wxBitmap* mpDepressedImg;
+	wxBitmap* mpPressedImg;
+	wxBitmap* mpDisabledImg;
+	wxBitmap* mpFocusedImg;
+
+	// button state variables;
+	bool      mDragStarted;
+	bool      mIsPressed; 
+	bool      mIsInFocus;
+	bool      mPrevPressedState;
+	bool	  mPrevInFocusState;
+
+	bool      mHasFocusedBmp;
+
+	// type of event which is fired upon depression of this button
+	int       mFiredEventType;
+
+	// pens for drawing decorations (borders)
+	wxPen     mBlackPen;
+	wxPen     mDarkPen;
+	wxPen     mGrayPen;
+	wxPen     mLightPen;
+
+	bool      mIsCreated;
+	int       mSizeIsSet;
+
+protected:
+	void DestroyLabels();
+
+	// returns the label which match the current button state
+	virtual wxBitmap* GetStateLabel();
+
+	virtual void DrawShade( int outerLevel,
+							wxDC&  dc,
+		                    wxPen& upperLeftSidePen,
+						    wxPen& lowerRightSidePen );
+
+	bool IsInWindow( int x,int y );
+
+public:
+
+	wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap, 
+					   const wxString& labelText   = "",
+		               int   alignText             = NB_ALIGN_TEXT_BOTTOM,
+					   bool  isFlat                = TRUE,
+					   // this is the default type of fired events
+					   int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
+					   int marginX        = 2,
+	                   int marginY        = 2,
+					   int textToLabelGap = 2,
+					   bool isSticky      = FALSE
+		             );
+
+	// use this constructor if buttons have to be persistant 
+	 
+	wxNewBitmapButton( const wxString& bitmapFileName,
+                           const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,
+                           const wxString& labelText      = "",
+                           int alignText                  = NB_ALIGN_TEXT_BOTTOM,
+                           bool  isFlat                   = TRUE,
+                           // this is the default type of fired events
+                           int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
+                           int marginX        = 2,
+                           int marginY        = 2,
+                           int textToLabelGap = 2,
+                           bool isSticky      = FALSE
+                             );
+
+	~wxNewBitmapButton();
+
+	// should be called after Create();
+	virtual void Reshape();
+
+	// overridables
+	virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = "" );
+	
+	virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,
+								int marginX        = 2,
+								int marginY        = 2,
+								int textToLabelGap = 2);
+
+	virtual void DrawDecorations( wxDC& dc );
+	virtual void DrawLabel( wxDC& dc );
+
+	virtual void RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, 
+								   bool isEnabled = TRUE,
+								   bool isPressed = FALSE);
+
+	virtual void RenderLabelImages();
+	virtual void RenderAllLabelImages();
+
+	// event handlers
+	void OnLButtonDown( wxMouseEvent& event );
+	void OnLButtonUp( wxMouseEvent& event );
+	void OnMouseMove( wxMouseEvent& event );
+	void OnSize( wxSizeEvent& event );
+	void OnPaint( wxPaintEvent& event );
+	void OnEraseBackground( wxEraseEvent& event );
+	void OnKillFocus( wxFocusEvent& event );
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif /* __NEWBMPBTN_G__ */
+

contrib/include/wx/fl/panedrawpl.h

@@ -0,0 +1,119 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Central header file for control-bar related classes
+//
+// Author:      Aleksandras Gluchovas <mailto:alex@soften.ktu.lt>
+// Modified by:
+// Created:     06/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __PANEDRAWPL_G__
+#define __PANEDRAWPL_G__
+
+#ifdef __GNUG__
+    #pragma interface "panedrawpl.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+
+/*
+ * Simple, but all-in-one plugin implementation. Resembles look & feel of
+ * to MFC control-bars. Handles painting of pane and items in it.
+ * Fires bar/layout customization event, when user right-clicks bar/pane. 
+ * Hooking an instance of this and row-layouting plugins per each pane, 
+ * would be enough for the frame layout to function properly.
+ * (they are plugged in autimatically by wxFrameLayout class)
+ */
+
+class cbPaneDrawPlugin : public cbPluginBase
+{
+public:
+	DECLARE_DYNAMIC_CLASS( cbPaneDrawPlugin )
+protected:
+
+	// resizing bars/rows state variables
+	bool           mResizeStarted;
+	bool           mResizeCursorOn;
+	wxPoint        mDragOrigin;
+
+	cbBarInfo*     mpDraggedBar; // also used when in bar-drag action
+	cbRowInfo*     mpResizedRow;
+
+	bool           mRowHandleHitted;
+	bool           mIsUpperHandle;
+	bool           mBarHandleHitted;
+	bool           mIsLeftHandle;
+	bool           mBarContentHitted;
+
+	// contstraints for dragging the handle
+	wxRect         mHandleDragArea; 
+	bool           mHandleIsVertical;
+	int            mHandleOfs;
+	int            mDraggedDelta;
+	wxPoint        mPrevPos;
+
+	// used for handling, start-draw-in-area events
+	wxClientDC*    mpClntDc;      
+
+	cbDockPane*    mpPane; // is set up temorary short-cut, while handling event
+
+protected:
+	// helpers
+	void DrawDraggedHandle( const wxPoint& pos, cbDockPane& pane );
+
+	virtual void DrawPaneShade( wxDC& dc, int alignment );
+	virtual void DrawPaneShadeForRow( cbRowInfo* pRow, wxDC& dc );
+
+	virtual void DrawUpperRowHandle( cbRowInfo* pRow, wxDC& dc );
+	virtual void DrawLowerRowHandle( cbRowInfo* pRow, wxDC& dc );
+
+	virtual void DrawUpperRowShades( cbRowInfo* pRow, wxDC& dc, int level );
+	virtual void DrawLowerRowShades( cbRowInfo* pRow, wxDC& dc, int level );
+
+	virtual void DrawBarInnerShadeRect( cbBarInfo* pBar, wxDC& dc );
+
+	virtual void DrawShade( int level, wxRect& rect, int alignment, wxDC& dc );
+	virtual void DrawShade1( int level, wxRect& rect, int alignment, wxDC& dc );
+
+	inline void SetLightPixel( int x, int y, wxDC& dc );
+	inline void SetDarkPixel ( int x, int y, wxDC& dc );
+
+public:
+	cbPaneDrawPlugin(void);
+
+	cbPaneDrawPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
+
+	virtual ~cbPaneDrawPlugin();
+
+	virtual cbPluginBase* Clone() { return new cbPaneDrawPlugin(0,0); }
+
+	// handlers for plugin-events
+
+	void OnLButtonDown( cbLeftDownEvent&   event );
+	void OnLDblClick  ( cbLeftDClickEvent& event );
+	void OnLButtonUp  ( cbLeftUpEvent&     event );
+	void OnRButtonUp  ( cbRightUpEvent&    event );
+	void OnMouseMove  ( cbMotionEvent&     event );
+
+	void OnDrawPaneBackground ( cbDrawPaneBkGroundEvent& event );
+	void OnDrawPaneDecorations( cbDrawPaneDecorEvent&    event );
+
+	void OnDrawRowDecorations ( cbDrawRowDecorEvent&     event );
+	void OnDrawRowHandles     ( cbDrawRowHandlesEvent&   event );
+	void OnDrawRowBackground  ( cbDrawRowBkGroundEvent&  event );
+							  
+	void OnSizeBarWindow      ( cbSizeBarWndEvent&       event );
+	void OnDrawBarDecorations ( cbDrawBarDecorEvent&     event );
+	void OnDrawBarHandles     ( cbDrawBarHandlesEvent&   event );
+
+	void OnStartDrawInArea    ( cbStartDrawInAreaEvent&  event );
+	void OnFinishDrawInArea   ( cbFinishDrawInAreaEvent& event );
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif /* __PANEDRAWPL_G__ */
+

contrib/include/wx/fl/rowdragpl.h

@@ -0,0 +1,164 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     06/10/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __ROWDRAGPL_G__
+#define __ROWDRAGPL_G__
+
+#ifdef __GNUG__
+    #pragma interface "rowdragpl.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+
+/*
+ * Plugin adds row-dragging fuctionality to the pane.
+ * Handles mouse/movement and pane-background erasing plugin-events.
+ * Behaviour and appearence resembles drag & drop posotioning 
+ * of the toolbar-rows int Netscape Comunicator 4.xx.
+ */
+
+class cbRowDragPlugin : public cbPluginBase
+{
+	DECLARE_DYNAMIC_CLASS( cbRowDragPlugin )
+public:
+	// background colours for the highlighted/unhighlighted icons
+
+	wxColour mHightColor;      // light-blue for NC-look
+	wxColour mLowColor;        // light-gray -/-
+	wxColour mTrianInnerColor; // blue       -/-
+	wxPen    mTrianInnerPen;   // black      -/-
+
+protected:
+	friend class cbRowDragPluginSerializer;
+
+	// drag & drop state variables
+	bool    mDragStarted;
+	bool    mDecisionMode;
+	wxPoint mDragOrigin;
+	int     mCurDragOfs;
+	bool    mCaptureIsOn;
+
+	// saved margins of the pane
+	int mSvTopMargin;
+	int mSvBottomMargin;
+	int mSvLeftMargin;
+	int mSvRightMargin;
+
+	//on-screen drawing state variables
+	wxBitmap* mpPaneImage;
+	wxBitmap* mpRowImage;
+	wxBitmap* mpCombinedImage;
+
+	wxScreenDC* mpScrDc;
+	wxRect    mCombRect;
+	wxSize    mRowImgDim;
+	int       mInitialRowOfs;
+
+	// NOTE:: if mpRowInFocus is not NULL, then mCollapsedIconInFocus is -1,
+	//        and v.v. (two different items cannot be in focus at the same time)
+
+	cbRowInfo* mpRowInFocus;
+	int        mCollapsedIconInFocus;
+
+	cbDockPane* mpPane; // is set up temorarely, while handling event
+
+	wxList      mHiddenBars;
+
+	wxBitmap* CaptureDCArea( wxDC& dc, wxRect& area );
+
+	// helpers for drag&drop
+
+	int GetHRowsCountForPane( cbDockPane* pPane );
+
+	void SetMouseCapture( bool captureOn );
+	void PrepareForRowDrag();
+	void ShowDraggedRow( int offset );
+	void ShowPaneImage();
+	void FinishOnScreenDraw();
+	void CollapseRow( cbRowInfo* pRow );
+	void ExpandRow( int collapsedIconIdx );
+	void InsertDraggedRowBefore( cbRowInfo* pBeforeRow );
+	bool ItemIsInFocus();
+	void CheckPrevItemInFocus( cbRowInfo* pRow, int iconIdx );
+	void UnhiglightItemInFocus();
+
+	cbRowInfo* GetFirstRow();
+
+	// "hard-coded metafile" for NN-look
+
+	virtual void DrawTrianUp( wxRect& inRect, wxDC& dc );
+	virtual void DrawTrianDown( wxRect& inRect, wxDC& dc );
+	virtual void DrawTrianRight( wxRect& inRect, wxDC& dc );
+	virtual void Draw3DPattern( wxRect& inRect, wxDC& dc );
+	virtual void DrawRombShades( wxPoint& p1, wxPoint& p2, wxPoint& p3, wxPoint& p4, wxDC& dc );
+	virtual void DrawOrtoRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush );
+	virtual void DrawRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush );
+	virtual void Draw3DRect( wxRect& inRect, wxDC& dc, wxBrush& bkBrush );
+	virtual void DrawRectShade( wxRect& inRect, wxDC& dc, 
+								int level, wxPen& upperPen, wxPen& lowerPen );
+
+	virtual void GetRowHintRect( cbRowInfo* pRow, wxRect& rect );
+	virtual void GetCollapsedInconRect( int iconIdx, wxRect& rect );
+
+	virtual int  GetCollapsedIconsPos();
+
+public:
+
+	cbRowDragPlugin(void);
+
+	cbRowDragPlugin( wxFrameLayout* pLayout, int paneMask = wxALL_PANES );
+	virtual ~cbRowDragPlugin();
+
+	virtual cbPluginBase* Clone() { return new cbRowDragPlugin(NULL,0); }
+
+	virtual void OnInitPlugin();
+
+	// handlers for plugin events (appearence-independent logic)
+
+	void OnMouseMove  ( cbMotionEvent& event );
+	void OnLButtonDown( cbLeftDownEvent& event );
+	void OnLButtonUp  ( cbLeftUpEvent& event );
+	void OnDrawPaneBackground( cbDrawPaneDecorEvent& event );
+
+	// overridables (appearence-depedent)
+
+	virtual void DrawCollapsedRowIcon( int index, wxDC& dc, bool isHighlighted );
+	virtual void DrawCollapsedRowsBorder( wxDC& dc );
+	virtual void DrawRowsDragHintsBorder( wxDC& dc );
+	virtual void DrawRowDragHint( cbRowInfo* pRow, wxDC& dc, bool isHighlighted );
+	virtual void DrawEmptyRow( wxDC& dc, wxRect& rowBounds );
+
+	virtual int GetCollapsedRowIconHeight();
+	virtual int GetRowDragHintWidth();
+
+	virtual void SetPaneMargins();
+
+
+	virtual bool HitTestCollapsedRowIcon( int iconIdx, const wxPoint& pos );
+	virtual bool HitTestRowDragHint( cbRowInfo* pRow, const wxPoint& pos );
+
+	DECLARE_EVENT_TABLE()
+};
+
+// internal helper-class
+
+class cbHiddenBarInfo : public wxObject
+{
+	DECLARE_DYNAMIC_CLASS( cbHiddenBarInfo )
+public:
+	cbBarInfo* mpBar;
+	int        mRowNo;
+	int        mIconNo;
+	int        mAlignment;
+};
+
+#endif /* __ROWDRAGPL_G__ */
+

contrib/include/wx/fl/rowlayoutpl.h

@@ -0,0 +1,87 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     02/10/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __ROWLAYOUTPL_G__
+#define __ROWLAYOUTPL_G__
+
+#ifdef __GNUG__
+    #pragma interface "rowlayoutpl.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+
+/*
+ * Simple implementation of plugin, which handles row-layouting
+ * requests sent from Frame Layout
+ */
+
+class cbRowLayoutPlugin : public cbPluginBase
+{
+	DECLARE_DYNAMIC_CLASS( cbRowLayoutPlugin )
+protected:
+	cbDockPane* mpPane; // is set up temorarely, while handling event
+protected:
+
+	// not-fixed-bars layouting related helpers
+
+	void FitBarsToRange( int from, int till, cbBarInfo* pTheBar, cbRowInfo* pRow ); 
+	void RelayoutNotFixedBarsAround( cbBarInfo* pTheBar, cbRowInfo* pRow ); 
+	void MinimzeNotFixedBars( cbRowInfo* pRow, cbBarInfo* pBarToPreserve );
+	int  GetRowFreeSpace( cbRowInfo* pRow );
+	
+	void RecalcLengthRatios( cbRowInfo* pRow );
+	void ApplyLengthRatios( cbRowInfo* pRow );
+	void ExpandNotFixedBars( cbRowInfo* pRow );
+	void AdjustLengthOfInserted( cbRowInfo* pRow, cbBarInfo* pTheBar );
+
+	void DetectBarHandles( cbRowInfo* pRow );
+	void CheckIfAtTheBoundary( cbBarInfo* pTheBar, cbRowInfo& rowInfo );
+
+
+	// row-layouting helpers (simulate "bar-friction")
+
+	int  CalcRowHeight( cbRowInfo& row );
+	void LayoutItemsVertically( cbRowInfo& row );
+
+	void StickRightSideBars( cbBarInfo* pToBar );
+
+	void SlideLeftSideBars ( cbBarInfo* pTheBar );
+	void SlideRightSideBars( cbBarInfo* pTheBar );
+
+	void ShiftLeftTrashold ( cbBarInfo* pTheBar, cbRowInfo& row );
+	void ShiftRightTrashold( cbBarInfo* pTheBar, cbRowInfo& row );
+
+	void InsertBefore( cbBarInfo* pBeforeBar, 
+					   cbBarInfo* pTheBar,
+					   cbRowInfo& row
+					 );
+
+	void DoInsertBar( cbBarInfo* pTheBar, cbRowInfo& row );
+
+public:
+
+	cbRowLayoutPlugin(void);
+
+	cbRowLayoutPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
+
+	// event handlers
+
+	void OnResizeRow ( cbResizeRowEvent&  event );
+	void OnInsertBar ( cbInsertBarEvent&  event );
+	void OnRemoveBar ( cbRemoveBarEvent&  event );
+	void OnLayoutRow ( cbLayoutRowEvent&  event );
+	void OnLayoutRows( cbLayoutRowsEvent& event );
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif /* __ROWLAYOUTPL_G__ */
+

contrib/include/wx/fl/toolwnd.h

@@ -0,0 +1,216 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by:
+// Created:     06/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __TOOLWND_G__
+#define __TOOLWND_G__
+
+#ifdef __GNUG__
+    #pragma interface "toolwnd.h"
+#endif
+
+#include "wx/frame.h"
+#include "wx/dynarray.h"
+
+// fixed settings
+
+#define BTN_BOX_HEIGHT       12
+#define BTN_BOX_WIDTH        12
+#define BTN_X_WIEGHT         2
+
+class cbMiniButton;
+
+typedef cbMiniButton* cbMinitButtonPtrT;
+
+WX_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT );
+
+class wxToolWindow : public wxFrame
+{
+	DECLARE_DYNAMIC_CLASS( wxToolWindow )
+
+public:	/** protected really, accessed only by serializers **/
+
+	cbMiniButtonArrayT mButtons;
+	wxWindow* mpClientWnd;
+
+	wxFont    mTitleFont;
+
+	int       mTitleHeight;
+	int       mClntHorizGap;
+	int       mClntVertGap;
+	int       mWndVertGap;
+	int       mWndHorizGap;
+	int       mButtonGap;
+	int       mInTitleMargin;
+	int       mHintBorder;
+
+	bool      mResizeStarted;
+	bool      mRealTimeUpdatesOn;
+
+	int       mMTolerance;
+
+	int       mCursorType;
+	bool      mMouseCaptured;
+
+	// drag&drop state variables
+
+	wxPoint     mDragOrigin;
+	wxRect      mInitialRect;
+	wxRect      mPrevHintRect;
+	wxScreenDC* mpScrDc;
+
+protected:
+	void GetScrWindowRect( wxRect& r );
+	void GetScrMousePos  ( wxMouseEvent& event, wxPoint& pos );
+	void SetHintCursor   ( int type );
+
+	void CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize& minDim );
+	void AdjustRectPos( const wxRect& original, const wxSize& newDim, wxRect& newRect );
+	wxSize GetMinimalWndDim();
+
+	void DrawHintRect( const wxRect& r );
+
+	int HitTestWindow( wxMouseEvent& event );
+
+	void LayoutMiniButtons();
+
+public:
+	
+	wxToolWindow();
+	~wxToolWindow();
+
+	void SetClient( wxWindow* pWnd );
+	wxWindow* GetClient();
+
+	void SetTitleFont( wxFont& font );
+
+	// buttons are added in right-to-left order
+	void AddMiniButton( cbMiniButton* pBtn );
+
+	void OnPaint( wxPaintEvent& event );
+
+	void OnMotion( wxMouseEvent& event );
+	void OnLeftDown( wxMouseEvent& event );
+	void OnLeftUp( wxMouseEvent& event );
+	void OnSize( wxSizeEvent& event );
+
+	void OnEraseBackground( wxEraseEvent& event );
+
+	// overridables:
+
+	virtual wxSize GetPreferredSize( const wxSize& given );
+	virtual void OnMiniButtonClicked( int btnIdx ) {}
+	virtual bool HandleTitleClick( wxMouseEvent& event ) { return FALSE; }
+
+	DECLARE_EVENT_TABLE()
+};
+
+// FIXME:: the code below should be moved to a separate file
+
+#include "wx/fl/controlbar.h"
+
+class cbMiniButton : public wxObject
+{
+public:
+	wxPoint   mPos;
+	wxSize    mDim;
+	bool      mVisible;
+	bool      mEnabled;
+
+	wxFrameLayout* mpLayout;
+	cbDockPane*    mpPane;
+	cbPluginBase*  mpPlugin;
+
+	wxWindow*      mpWnd;
+
+	bool      mWasClicked;
+	bool      mDragStarted;
+
+	bool      mPressed;
+public:
+	cbMiniButton();
+
+	void SetPos( const wxPoint& pos );
+	bool HitTest( const wxPoint& pos );
+
+	void OnLeftDown( const wxPoint& pos );
+	void OnLeftUp( const wxPoint& pos );
+	void OnMotion( const wxPoint& pos );
+
+	void Refresh();
+	virtual void Draw( wxDC& dc );
+
+	bool WasClicked();
+	void Reset();
+
+	void Enable( bool enable ) { mEnabled = enable; }
+
+	bool IsPressed() { return mPressed; }
+};
+
+// classes specific to wxFrameLayout engine (FOR NOW in here...)
+
+class cbCloseBox : public cbMiniButton
+{
+public:
+	virtual void Draw( wxDC& dc );
+};
+
+class cbCollapseBox  : public cbMiniButton
+{
+public:
+	bool mIsAtLeft;
+
+	virtual void Draw( wxDC& dc );
+};
+
+class cbDockBox : public cbMiniButton
+{
+public:
+	virtual void Draw( wxDC& dc );
+};
+
+class cbFloatedBarWindow : public wxToolWindow
+{
+	DECLARE_DYNAMIC_CLASS( cbFloatedBarWindow )
+protected:
+	cbBarInfo*     mpBar;
+	wxFrameLayout* mpLayout;
+
+	friend class cbFloatedBarWindowSerializer;
+
+public:
+	cbFloatedBarWindow();
+
+	void SetBar( cbBarInfo* pBar );
+	void SetLayout( wxFrameLayout* pLayout );
+	cbBarInfo* GetBar();
+
+	// given coordinates are those of the bar itself
+	// floated container window's position and size
+	// are ajusted accordingly
+
+	void PositionFloatedWnd( int scrX,  int scrY,
+							 int width, int height );
+
+	// overriden methods of wxToolWindow
+
+	virtual wxSize GetPreferredSize( const wxSize& given );
+	virtual void OnMiniButtonClicked( int btnIdx );
+	virtual bool HandleTitleClick( wxMouseEvent& event );
+
+	void OnDblClick( wxMouseEvent& event );
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif /* __TOOLWND_G__ */
+
+

contrib/include/wx/fl/updatesmgr.h

@@ -0,0 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        No names yet.
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas (@Lithuania)
+// Modified by:
+// Created:     19/10/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __UPDATESMGR_G__
+#define __UPDATESMGR_G__
+
+#ifdef __GNUG__
+    #pragma interface "updatesmgr.h"
+#endif
+
+#include "wx/fl/controlbar.h"
+
+/*
+ * class implements slightly optimized logic for refreshing
+ * areas of frame layout - which actually need to be updated. 
+ */
+
+class cbSimpleUpdatesMgr : public cbUpdatesManagerBase
+{
+	DECLARE_DYNAMIC_CLASS( cbSimpleUpdatesMgr )
+protected:
+
+	bool WasChanged( cbUpdateMgrData& data, wxRect& currentBounds );
+
+public:
+
+	cbSimpleUpdatesMgr(void) {}
+
+	cbSimpleUpdatesMgr( wxFrameLayout* pPanel );
+
+	// notificiactions received from Frame Layout (in the order, in which
+	// they usually would be invoked)
+
+	virtual void OnStartChanges();
+
+	virtual void OnRowWillChange( cbRowInfo* pRow, cbDockPane* pInPane );
+	virtual void OnBarWillChange( cbBarInfo* pBar, cbRowInfo* pInRow, cbDockPane* pInPane );
+	virtual void OnPaneMarginsWillChange( cbDockPane* pPane );
+	virtual void OnPaneWillChange( cbDockPane* pPane );
+
+	virtual void OnFinishChanges();
+
+	// refreshes parts of the frame layout, which need an update
+	virtual void UpdateNow();
+};
+
+#endif /* __UPDATESMGR_G__ */
+

contrib/include/wx/gizmos/dynamicsash.h

@@ -0,0 +1,148 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
+
+/*
+
+    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 wxMANAGE_SCROLLBARS style and  you will need to use the
+    GetHScrollBar() and GetVScrollBar() methods to retrieve the scrollbar
+    controls and call SetEventHanler() on them to redirect the scrolling
+    events whenever your window is reparented by wxDyanmicSashWindow.
+    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))
+
+
+/*
+    wxMANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
+    will cause it to respond to scrollbar events for your application by
+    automatically scrolling the child view.
+*/
+#define wxMANAGE_SCROLLBARS     0x00800000
+
+
+/*
+    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 wxDynamicSashSplitEvent : public wxCommandEvent {
+public:
+    wxDynamicSashSplitEvent();
+    wxDynamicSashSplitEvent(wxObject *target);
+
+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 wxDynamicSashUnifyEvent : public wxCommandEvent {
+public:
+    wxDynamicSashUnifyEvent();
+    wxDynamicSashUnifyEvent(wxObject *target);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
+};
+
+/*
+    wxDynamicSashWindow.  See above.
+*/
+class wxDynamicSashWindow : public wxWindow {
+public:
+    wxDynamicSashWindow();
+    wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
+                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+                        long style = wxCLIP_CHILDREN | wxMANAGE_SCROLLBARS,
+                        const wxString& name = "dynamicSashWindow");
+    virtual ~wxDynamicSashWindow();
+
+    virtual bool Create(wxWindow *parent, wxWindowID id,
+                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+                        long style = wxCLIP_CHILDREN | wxMANAGE_SCROLLBARS,
+                        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

contrib/include/wx/net/email.h

@@ -0,0 +1,44 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
+

contrib/include/wx/net/msg.h

@@ -0,0 +1,71 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
+

contrib/include/wx/net/smapi.h

@@ -0,0 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_

contrib/include/wx/net/web.h

@@ -0,0 +1,37 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
+

contrib/include/wx/stc/stc.h

@@ -22,6 +22,7 @@
 
 
 #include <wx/wx.h>
+#include <wx/dnd.h>
 
 //----------------------------------------------------------------------
 // BEGIN generated section.  The following code is automatically generated
@@ -57,16 +58,43 @@
 #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.
@@ -90,6 +118,9 @@
 #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
@@ -109,12 +140,15 @@
 
 // PrintColourMode - force black text on white background for printing.
 #define wxSTC_PRINT_BLACKONWHITE 2
-#define wxSTC_FIND_DOWN 1
+
+// 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_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
@@ -124,6 +158,7 @@
 #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
@@ -173,15 +208,31 @@
 #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
 
-// Center caret on screen when it's scrolled to view
+// Value not used
 #define wxSTC_CARET_CENTER 0x02
 
-// OR this with CARET_CENTER to reposition even when visible, or
-// OR this with CARET_SLOP to reposition whenever outside slop border
+// If CARET_SLOP also set then reposition whenever outside slop border
+// If CARET_SLOP not set then recentre even when visible
 #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.
@@ -241,6 +292,20 @@
 #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
@@ -273,6 +338,11 @@
 #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
@@ -300,6 +370,22 @@
 // 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
@@ -313,6 +399,7 @@
 #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
@@ -327,6 +414,7 @@
 #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
@@ -387,11 +475,12 @@
 #define wxSTC_HPHP_VARIABLE 123
 #define wxSTC_HPHP_COMMENT 124
 #define wxSTC_HPHP_COMMENTLINE 125
-#define wxSTC_HPHP_STRINGEOL 126
+#define wxSTC_HPHP_HSTRING_VARIABLE 126
+#define wxSTC_HPHP_OPERATOR 127
 
 // Lexical states for SCLEX_PERL
 #define wxSTC_PL_DEFAULT 0
-#define wxSTC_PL_HERE 1
+#define wxSTC_PL_ERROR 1
 #define wxSTC_PL_COMMENTLINE 2
 #define wxSTC_PL_POD 3
 #define wxSTC_PL_NUMBER 4
@@ -406,12 +495,20 @@
 #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
@@ -434,6 +531,8 @@
 #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
@@ -441,6 +540,101 @@
 #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
 //----------------------------------------------------------------------
@@ -469,6 +663,8 @@ 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,
@@ -556,6 +752,10 @@ 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);
 
@@ -568,13 +768,17 @@ public:
 
     // Retrieve the text of the line containing the caret.
     // Returns the index of the caret on the line.
-    wxString GetCurLine(int* OUTPUT=NULL);
+    #ifdef SWIG
+    wxString GetCurLine(int* OUTPUT);
+#else
+    wxString GetCurLine(int* linePos=NULL);
+#endif
 
     // Retrieve the position of the last correctly styled character.
     int GetEndStyled();
 
-    // Convert all line endings in the document to use the current mode.
-    void ConvertEOLs();
+    // Convert all line endings in the document to one mode.
+    void ConvertEOLs(int eolMode);
 
     // Retrieve the current end of line mode - one of CRLF, CR, or LF.
     int GetEOLMode();
@@ -693,6 +897,9 @@ 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);
 
@@ -763,6 +970,18 @@ 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.
@@ -816,6 +1035,15 @@ 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);
 
@@ -923,13 +1151,13 @@ public:
     int GetLineCount();
 
     // Sets the size in pixels of the left margin.
-    void SetMarginLeft(int width);
+    void SetMarginLeft(int pixelWidth);
 
     // Returns the size in pixels of the left margin.
     int GetMarginLeft();
 
     // Sets the size in pixels of the right margin.
-    void SetMarginRight(int width);
+    void SetMarginRight(int pixelWidth);
 
     // Returns the size in pixels of the right margin.
     int GetMarginRight();
@@ -1006,6 +1234,50 @@ 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);
 
@@ -1068,6 +1340,31 @@ 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);
 
@@ -1119,9 +1416,11 @@ 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.
@@ -1157,6 +1456,51 @@ 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();
 
@@ -1178,6 +1522,9 @@ 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...
@@ -1243,6 +1590,10 @@ 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);
+
 //----------------------------------------------------------------------
 
 
@@ -1255,7 +1606,7 @@ private:
     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);
@@ -1271,7 +1622,6 @@ private:
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 
-    long SendMsg(int msg, long wp=0, long lp=0);
 
 private:
     DECLARE_EVENT_TABLE()
@@ -1280,6 +1630,7 @@ private:
     ScintillaWX*        m_swx;
     wxStopWatch         m_stopWatch;
 
+    bool                m_lastKeyDownConsumed;
 
     friend class ScintillaWX;
     friend class Platform;
@@ -1293,20 +1644,28 @@ public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
     ~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 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
 
     int  GetPosition() const         { return m_position; }
     int  GetKey()  const             { return m_key; }
@@ -1322,6 +1681,14 @@ 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;
@@ -1350,42 +1717,73 @@ 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_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)
+    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
 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_DOUBLECLICK,
-        wxEVT_STC_MODIFIED,
         wxEVT_STC_KEY,
+        wxEVT_STC_DOUBLECLICK,
+        wxEVT_STC_UPDATEUI,
+        wxEVT_STC_MODIFIED,
         wxEVT_STC_MACRORECORD,
         wxEVT_STC_MARGINCLICK,
         wxEVT_STC_NEEDSHOWN,
-        wxEVT_STC_POSCHANGED
+        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
     };
 #endif
 
@@ -1394,21 +1792,30 @@ 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_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 ),
-
+#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
 #endif
 
 //----------------------------------------------------------------------

contrib/include/wx/xrc/xml.h

@@ -77,7 +77,6 @@ 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; }
@@ -116,7 +115,7 @@ public:
     wxXmlNode(wxXmlNode *parent,wxXmlNodeType type,
               const wxString& name, const wxString& content,
               wxXmlProperty *props, wxXmlNode *next);
-    ~wxXmlNode() { delete m_properties; delete m_next; delete m_children; }
+    ~wxXmlNode();
 
     // copy ctor & operator=. Note that this does NOT copy syblings
     // and parent pointer, i.e. m_parent and m_next will be NULL

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 char *str_id);
+    static int GetXMLID(const wxChar *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,10 +176,6 @@ 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:
@@ -347,7 +343,9 @@ 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)

contrib/samples/Makefile.in

@@ -1,6 +1,6 @@
 # $Id$
 
-CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet
+CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet fl
 
 all:
 	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done

contrib/samples/animate/AniTestVC.dsp

@@ -0,0 +1,225 @@
+# 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

contrib/samples/animate/AniTestVC.dsw

@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 5.00
 
 ###############################################################################
 
-Project: "ConfigVC"=.\ConfigVC.dsp - Package Owner=<4>
+Project: "AniTestVC"=.\AniTestVC.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

contrib/samples/animate/Makefile.in

@@ -0,0 +1,24 @@
+#
+# 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
+

contrib/samples/animate/anitest.cpp

@@ -0,0 +1,197 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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
+}
+

contrib/samples/animate/anitest.h

@@ -0,0 +1,71 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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
+};

contrib/samples/animate/anitest.rc

@@ -0,0 +1,3 @@
+mondrian ICON "mondrian.ico"
+#include "wx/msw/wx.rc"
+

contrib/samples/animate/makefile.b32

@@ -0,0 +1,17 @@
+#
+# 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
+

contrib/samples/animate/makefile.g95

@@ -0,0 +1,19 @@
+#
+# 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
+

contrib/samples/animate/makefile.sc

@@ -0,0 +1,36 @@
+# 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
+

contrib/samples/animate/makefile.unx

@@ -0,0 +1,35 @@
+#
+# 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)

contrib/samples/animate/makefile.va

@@ -0,0 +1,44 @@
+#
+# 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
+

contrib/samples/animate/makefile.vc

@@ -0,0 +1,9 @@
+WXDIR = $(WXWIN)
+PROGRAM = anitest
+
+OBJECTS = $(PROGRAM).obj
+EXTRALIBS = $(WXDIR)\lib\anim$(LIBEXT).lib
+EXTRAINC = -I$(WXDIR)\contrib\include
+
+!include $(WXDIR)\src\makeprog.vc
+

contrib/samples/animate/makefile.wat

@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = anitest
+OBJECTS = $(PROGRAM).obj animate.obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

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

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

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" /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" /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"
+# ADD RSC /l 0x809 /i "../../../include" /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 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"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib 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"
 
 !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" /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" /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"
+# ADD RSC /l 0x809 /i "../../../include" /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 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"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib 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"
 
 !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" /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" /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"
+# ADD RSC /l 0x809 /i "../../../include" /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 wxdlld.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 wxmsw232d.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" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /i "../../../include" /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 wxdll.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 wxmsw232.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"
 
 !ENDIF 
 
@@ -169,7 +169,8 @@ SOURCE=.\simple.cpp
 
 SOURCE=.\simple.rc
 # ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "..\..\include"
+# ADD RSC /l 0x809 /i "../../../../include" /i "..\..\include"
+# SUBTRACT RSC /i "../../../include"
 # End Source File
 # End Target
 # End Project

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" /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" /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
@@ -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 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"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib 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"
 
 !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" /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" /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
@@ -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 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"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib 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"
 
 !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" /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" /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"
@@ -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 wxdlld.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 wxmsw232d.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" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -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 wxdll.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 wxmsw232.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

contrib/samples/fl/Makefile.in

@@ -0,0 +1,10 @@
+# $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
+

contrib/samples/fl/fl_demo1/Makefile.in

@@ -0,0 +1,25 @@
+#
+# 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

contrib/samples/fl/fl_demo1/fl_demo.dsp

@@ -0,0 +1,110 @@
+# 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

contrib/samples/fl/fl_demo1/fl_demo.dsw

@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "BombsVC"=.\BombsVC.dsp - Package Owner=<4>
+Project: "fl_demo1"=.\fl_demo.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

contrib/samples/fl/fl_demo1/fl_demo1.cpp

@@ -0,0 +1,241 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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
+}
+

contrib/samples/fl/fl_demo1/fl_demo1.h

@@ -0,0 +1,55 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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
+

contrib/samples/fl/fl_demo1/fl_demo1.rc

@@ -0,0 +1,3 @@
+/* mondrian ICON "mondrian.ico" */
+#include "wx/msw/wx.rc"
+

contrib/samples/fl/fl_demo1/makefile.b32

@@ -0,0 +1,23 @@
+#
+# 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
+

contrib/samples/fl/fl_demo1/makefile.g95

@@ -0,0 +1,18 @@
+#
+# 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

contrib/samples/fl/fl_demo1/makefile.vc

@@ -0,0 +1,24 @@
+#
+# 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

contrib/samples/fl/fl_demo2/Makefile.in

@@ -0,0 +1,25 @@
+#
+# 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