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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_2_9@13364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-04 16:15:08 +00:00
341 changed files with 17874 additions and 19999 deletions
--- a/Makefile.in
+++ b/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,24 +16,22 @@ include ./src/make.env

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

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

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

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

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

 srcdir = @srcdir@
+top_srcdir = @top_srcdir@

-VP1 = @top_srcdir@/src/common
-VP2 = @top_srcdir@/src/@TOOLKIT_DIR@
+VP1 = @TOOLKIT_VPATH@
+VP2 = @top_srcdir@/src/common
 VP3 = @top_srcdir@/src/motif/xmcombo
 VP4 = @top_srcdir@/src/generic
 VP5 = @top_srcdir@/src/unix
@@ -42,7 +41,7 @@ VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
-VP12 = @top_srcdir@/src/ole
+VP12 = @top_srcdir@/src/msw/ole

 FTVP01 = @top_srcdir@/src/freetype/unix
 FTVP02 = @top_srcdir@/src/freetype/autohint
@@ -68,48 +67,25 @@ VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_I
 # 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

-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@
@@ -182,7 +158,6 @@ 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)
@@ -340,64 +315,44 @@ IODBCOBJS = \
        
 ############################## 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)

-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

@@ -422,7 +377,22 @@ 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)
@@ -434,7 +404,7 @@ 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: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -443,20 +413,27 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -d $(libdir)

-	$(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_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) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+	@# this installs the import library for a MSW DLL
+	@# remember: for wxMSW DLL WX_LIBRARY_NAME_STATIC is the
+	@# import livraru name
+	@if test "@TOOLKIT_DIR@" = "msw" -a "@WX_LIBRARY_NAME_STATIC@" != "@WX_TARGET_LIBRARY@"; then $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_NAME_STATIC@ $(libdir)/@WX_LIBRARY_NAME_STATIC@; 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) $(top_builddir)/lib/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 \
@@ -500,16 +477,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.
@@ -528,8 +503,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
@@ -641,8 +616,10 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/protocol
+	mkdir $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/src/common
+	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/unix
 	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
 	cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
@@ -697,15 +674,25 @@ MACX_DIST: ALL_GUI_DIST

 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)/*.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

 DEMOS_DIST: ALL_GUI_DIST
@@ -1322,7 +1309,10 @@ dist: @GUIDIST@

 bzip-dist-only:
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
+	@cd _dist_dir; \
+	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
+	tar ch @DISTDIR@-$(VER_SUFFIX) | bzip2 -f9 > ../$(WXARCHIVE_BZIP); \
+	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples-${VER_SUFFIX}; \
@@ -1338,7 +1328,10 @@ bzip-dist-only:
 bzip-dist: @GUIDIST@
 	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
+	@cd _dist_dir; \
+	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
+	tar ch @DISTDIR@-$(VER_SUFFIX) | bzip2 -f9 > ../$(WXARCHIVE_BZIP); \
+	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples-${VER_SUFFIX}; \
@@ -1351,7 +1344,7 @@ bzip-dist: @GUIDIST@
 	mv wxDemos-${VER_SUFFIX} 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/
@@ -1359,9 +1352,26 @@ debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
 	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 "*.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@ MANUAL_DIST PYTHON_DIST
+
+debian-msw-dirs:
+	mkdir $(DISTDIR)/include/wx/msw
+	mkdir $(DISTDIR)/src/msw
+	cp $(WXDIR)/src/msw/files.lst $(DISTDIR)/src/msw
+
+
 clean:
 	$(RM) *.o
 	$(RM) *.d
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,10 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
+
+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
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -25,6 +29,8 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

+# Please send patches to <config-patches@gnu.org>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -45,30 +51,73 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.

-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`

-# First pass through any local machine types.
-case $1 in
-	*local*)
-		echo $1
-		exit 0
-		;;
-	*)
-	;;
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
 esac

 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -94,7 +143,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -105,9 +154,17 @@ case $os in
 	-scout)
 		;;
 	-wrs)
-		os=vxworks
+		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -156,33 +213,60 @@ case $os in
 	-psos*)
 		os=-psos
 		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 esac

 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v)
+	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
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	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[34567]86)
+	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -191,23 +275,43 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | 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-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
-	      | 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-* \
-	      | f301-* | armv*-* | t3e-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+	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.
@@ -244,14 +348,14 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-sysv4
 		;;
 	apollo68)
@@ -298,13 +402,16 @@ 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)
 		basic_machine=m68k-crds
 		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -352,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
@@ -425,22 +536,21 @@ case $basic_machine in
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
-		os=-mvs
 		;;
 # 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
 		;;
@@ -452,14 +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
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -485,10 +587,14 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | *MiNT)
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
@@ -506,14 +612,22 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
 	msdos)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-msdos
 		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -523,7 +637,7 @@ case $basic_machine in
 		os=-netbsd
 		;;
 	netwinder)
-		basic_machine=armv4l-corel
+		basic_machine=armv4l-rebel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -571,9 +685,16 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
 	np1)
 		basic_machine=np1-gould
 		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -603,28 +724,28 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexen)
+	pentium | p5 | k5 | k6 | nexgen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i786-pc
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		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
 	        ;;
@@ -636,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
@@ -718,6 +853,10 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
@@ -726,6 +865,10 @@ case $basic_machine in
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -778,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
@@ -821,13 +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
 		;;
-	sparc | sparcv9)
+	sh3 | sh4 | sh3eb | sh4eb)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
        cydra)
@@ -849,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
@@ -905,14 +1062,30 @@ 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* | -openstep* | -oskit*)
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -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*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto*)
+		os=-nto-qnx
+		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@@ -926,6 +1099,12 @@ case $os in
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -950,6 +1129,9 @@ case $os in
 	-ns2 )
 	        os=-nextstep2
 		;;
+	-nsk*)
+		os=-nsk
+		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -984,7 +1166,7 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -*MiNT)
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 	        os=-mint
 		;;
 	-none)
@@ -1012,12 +1194,15 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-corel)
+	arm*-rebel)
 		os=-linux
 		;;
 	arm*-semi)
 		os=-aout
 		;;
+	pdp10-*)
+		os=-tops20
+		;;
        pdp11-*)
 		os=-none
 		;;
@@ -1126,7 +1311,7 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f301-fujitsu)
+	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1186,7 +1371,7 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
 			-ptx*)
@@ -1204,12 +1389,23 @@ 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/"`
 		;;
 esac

 echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
--- a/4198
+++ b/4198
--- a/configure.in
+++ b/configure.in
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -3,11 +3,11 @@
 #

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

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

 samples:
-	cd samples; make
+	cd samples; $(MAKE)
--- a/contrib/samples/mmedia/MMboardVC.dsp
+++ b/contrib/samples/mmedia/MMboardVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF

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

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ENDIF

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

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ENDIF 

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

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF

--- a/contrib/src/mmedia/sndwav.cpp
+++ b/contrib/src/mmedia/sndwav.cpp
@@ -313,15 +313,10 @@ FAIL_WITH(s->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
        delete frmt;
    }

-#ifdef __ALPHA__
-    // FIXME:
-    // Linux Alpha spits passing size_t to a wxDataOutputStream, since it
-    // appears to be an unsigned long type there.
-    // This is a bandaid for 2.2 to get it to build there until we fix it
-    // more sensibly.
-
-    data << (unsigned int)( fmt_data.GetSize() +
-                            m_sndformat->GetBytesFromTime(time) );
+#ifdef wxSIZE_T_IS_ULONG
+    // FIXME: we still need this horrible cast until wxDataOutputStream
+    // is made 64 bit friendly.
+    data << (unsigned int)(fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
 #else
    data << (fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
 #endif
--- a/contrib/src/mmedia/vidxanm.cpp
+++ b/contrib/src/mmedia/vidxanm.cpp
@@ -18,8 +18,10 @@
 #include <wx/wx.h>
 #endif

+#ifdef __WXGTK__
 // Pizza !
 #include <wx/gtk/win_gtk.h>
+#endif

 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
--- a/contrib/src/stc/gen_iface.py
+++ b/contrib/src/stc/gen_iface.py
@@ -338,7 +338,7 @@ methodOverrideMap = {

                 '''wxString %s() {
                        wxString text;
-                        int   len  = GetTextLength();
+                        int   len  = GetTextLength()+1;
                        char* buff = text.GetWriteBuf(len+1);

                        SendMsg(%s, len, (long)buff);
--- a/contrib/src/stc/scintilla/src/Editor.cxx
+++ b/contrib/src/stc/scintilla/src/Editor.cxx
@@ -196,7 +196,7 @@ int Editor::MaxScrollPos() {
 		return retVal;
 }

-static inline bool IsControlCharacter(char ch) {
+static inline bool IsControlCharacter(signed char ch) {
 	// iscntrl returns true for lots of chars > 127 which are displayable
 	return ch >= 0 && ch < ' ';
 }
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -1055,7 +1055,7 @@ void wxStyledTextCtrl::SetText(const wxString& text) {
 // Retrieve all the text in the document.
 wxString wxStyledTextCtrl::GetText() {
                        wxString text;
-                        int   len  = GetTextLength();
+                        int   len  = GetTextLength()+1;
                        char* buff = text.GetWriteBuf(len+1);

                        SendMsg(2182, len, (long)buff);
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -24,5 +24,24 @@ wxwin-examples		wxWindows and wxPython demos and samples (source)
 wxwin-i18n		message catalogs for native language support


+	The following three can be built from the source package
+	with the mingw32 cross compiler, but are not currently
+	distributed by Debian.  If you feel that should change,
+	please file a bug against the wxwindows2.2 package, or
+	append your views to a report already there if you're not
+	the first to do so.
+
+	[ you can check the current state of affairs at:
+	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.2 ]
+
+	Oh and, please do *not* file bug reports for these three
+	to the Debian bts.  But do feel free to email be personally
+	if you find problems and/or have patches to fix them.
+
+libwxmsw2.2-dev_2.2.8_i386.deb		mingw32-cross wxMSW libs.
+libwxbase-msw2.2-dev_2.2.8_i386.deb	mingw32-cross wxBase libs.
+wxwin2.2-headers-msw_2.2.8_i386.deb	extra headers needed for wxMSW.
+
+
 -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,84 @@
+wxwindows2.2 (2.2.9) unstable; urgency=high
+
+  * fix for arches with unsigned char as default.
+  * high urgency because this fix really should get
+    into woody.
+    Closes: #127014
+
+ -- Ron Lee <ron@debian.org>  Mon, 31 Dec 2001 06:53:27 -0800
+
+wxwindows2.2 (2.2.8.5) unstable; urgency=low
+
+  * Add wxSIZE_T_IS defines to setup.h
+    Add automate that to my TODO list.
+
+ -- Ron Lee <ron@debian.org>  Tue, 27 Nov 2001 05:55:47 -0800
+
+wxwindows2.2 (2.2.8.4) unstable; urgency=low
+
+  * Put the (modified) size_t == ulong kludge back into sndwav.cpp
+    it's still needed until wxDataOutputStream is made 64 bit
+    friendly, which may not happen for 2.2 since it will probably
+    not be binary compatible.
+  * caps a memory leak in the jpeg handler.
+
+ -- Ron Lee <ron@debian.org>  Sun, 25 Nov 2001 11:53:59 -0800
+
+wxwindows2.2 (2.2.8.3) unstable; urgency=low
+
+  * Backported size_t test from 2.3 tree, removes the need for
+    specific tests for various 64 bit platforms including now
+    S/390 (thanks to Gerhard Tonn for the report).
+    Closes: #120768
+
+ -- Ron Lee <ron@debian.org>  Fri, 23 Nov 2001 20:53:49 -0800
+
+wxwindows2.2 (2.2.8.2) unstable; urgency=low
+
+  * python-dev doesn't get me python?  More bytes in Build-Dep then
+    I guess ...  Closes: #119954
+
+ -- Ron Lee <ron@debian.org>  Sun, 18 Nov 2001 04:28:41 -0800
+
+wxwindows2.2 (2.2.8.1) unstable; urgency=low
+
+  * Rebuild for python2.1  Closes: #119226, #118835
+
+ -- Ron Lee <ron@debian.org>  Mon, 12 Nov 2001 21:47:38 -0800
+
+wxwindows2.2 (2.2.8) unstable; urgency=medium
+
+  * Fixed bogus samples makefile. Closes: #110061
+  * Added ability to build wxMSW-cross packages, but they
+    are not built and distributed by default.
+
+      If you think such creatures belong in the archive,
+      see README.Debian
+
+  * Pruned more inapplicable files from the raw cvs source,
+    cleaned configure.in and removed the need for a common setup.h,
+    removed superfluous library links and generally tweaked things
+    so as to make adding new ports easier.
+  * added --gl-libs flag to wx-config.
+  * added wx2.4 forward compatible event macros.
+  * added build fixes for IA64 from Jeff Licquia, and fixed clean
+    rules to pick up unnoticed strays that effected NMU builds.
+    Thanks Jeff.  Closes: #101734, #104679  (fixed in NMU)
+  * Medium urgency since several other packages are waiting
+    for this to get into testing.
+
+ -- Ron Lee <ron@debian.org>  Thu, 30 Aug 2001 15:41:49 -0700
+
+wxwindows2.2 (2.2.7) unstable; urgency=medium
+
+  * The "Testing Tarantella" release.
+  * various small control (mis)behaviours corrected.
+  * added missing build-dep for gettext.
+  * updated wxPython description, Closes: #102689
+  * Never publicly released, oh well.
+
+ -- Ron Lee <ron@debian.org>  Sun, 10 Jun 2001 19:32:46 -0700
+
 wxwindows2.2 (2.2.6.1) unstable; urgency=low

  * fix rules so it really doesn't build -indep for ports
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,9 +1,9 @@
 Source: wxwindows=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=2.0), flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
+Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.1), python (<<2.2), python2.1-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.2.1.2
+Standards-Version: 3.5.6.0

 Package: libwxbase=V
 Architecture: any
@@ -116,11 +116,11 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
-Depends: python-base (>=1.5.2), ${shlibs:Depends}
-Suggests: wxwin=V-doc
+Depends: python (>=2.1), python (<<2.2), ${shlibs:Depends}
+Suggests: wxwin=V-doc, wxwin=V-examples
 Conflicts: libwxgtk=V-python-contrib, python-wxwin
 Replaces: libwxgtk=V-python-contrib, python-wxwin
-Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
+Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
 wxWindows is a class library for C++ providing GUI (Graphical User
 Interface) and other facilities on more than one platform.  Version =V
 currently supports subsets of GTK+, Motif, and MS Windows.
@@ -204,3 +204,33 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples)
 .
 This package contains examples of using the wxWindows toolkit.

+Package: libwxbase-msw=V-dev
+Architecture: i386
+Section: otherosfs
+Depends: wxwin=V-headers-msw (= ${Source-Version})
+Conflicts: libwxbase-msw-dev
+Replaces: libwxbase-msw-dev
+Provides: libwxbase-msw-dev
+Description: wxBase mingw32msvc-cross
+ mingw32msvc-cross wxBase libs.
+
+Package: libwxmsw=V-dev
+Architecture: i386
+Section: otherosfs
+Depends: wxwin=V-headers-msw (= ${Source-Version})
+Conflicts: libwxmsw-dev
+Replaces: libwxmsw-dev
+Provides: libwxmsw-dev
+Description: wxMSW mingw32msvc-cross
+ mingw32msvc-cross wxMSW libs.
+
+Package: wxwin=V-headers-msw
+Architecture: i386
+Section: otherosfs
+Depends: wxwin=V-headers (= ${Source-Version})
+Conflicts: wxwin-headers-msw
+Replaces: wxwin-headers-msw
+Provides: wxwin-headers-msw
+Description: Extra wxWindows headers for mingw32msvc-cross
+ Headers required by the wxWindows mingw32msvc-cross libraries.
+
--- a/debian/libwxbase-dbg.dirs
+++ b/debian/libwxbase-dbg.dirs
@@ -1,5 +1,5 @@
 usr/bin
-usr/lib/wx/include/wx
+usr/lib/wx/include/based-=V/wx
 usr/share/man/man1
 usr/share/lintian/overrides

--- a/debian/libwxbase-dbg.links
+++ b/debian/libwxbase-dbg.links
@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz

--- a/debian/libwxbase-dbg.postinst
+++ b/debian/libwxbase-dbg.postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-config 50
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50

 if [ "$1" = "configure" ]; then
 	ldconfig
--- a/debian/libwxbase-dbg.prerm
+++ b/debian/libwxbase-dbg.prerm
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --remove wx-config /usr/bin/wxbased-config
+update-alternatives --remove wx-config /usr/bin/wxbased-=V-config

 #DEBHELPER#

--- a/debian/libwxbase-dev.dirs
+++ b/debian/libwxbase-dev.dirs
@@ -1,3 +1,3 @@
 usr/bin
-usr/lib/wx/include/wx
+usr/lib/wx/include/base-=V/wx
 usr/share/man/man1
--- a/debian/libwxbase-dev.files
+++ b/debian/libwxbase-dev.files
@@ -1,4 +1,4 @@
-usr/bin/wxbase-config
-usr/lib/wx/include/wx/base/setup.h
+usr/bin/wxbase-=V-config
+usr/lib/wx/include/base-=V/wx/setup.h
 usr/lib/libwx_base*.so

--- a/debian/libwxbase-dev.links
+++ b/debian/libwxbase-dev.links
@@ -1 +1 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz
--- a/debian/libwxbase-dev.postinst
+++ b/debian/libwxbase-dev.postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-config 60
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-config 60

 #DEBHELPER#

--- a/debian/libwxbase-dev.prerm
+++ b/debian/libwxbase-dev.prerm
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --remove wx-config /usr/bin/wxbase-config
+update-alternatives --remove wx-config /usr/bin/wxbase-=V-config

 #DEBHELPER#

--- a/debian/libwxbase-msw-dev.dirs
+++ b/debian/libwxbase-msw-dev.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/=H/lib/wx/include/base-=V-=H/wx
+usr/share/man/man1
+
--- a/debian/libwxbase-msw-dev.links
+++ b/debian/libwxbase-msw-dev.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz
+
--- a/debian/libwxbase-msw-dev.postinst
+++ b/debian/libwxbase-msw-dev.postinst
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-=H-config 40
+
+#DEBHELPER#
+
--- a/debian/libwxbase-msw-dev.prerm
+++ b/debian/libwxbase-msw-dev.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxbase-=V-=H-config
+
+#DEBHELPER#
+
--- a/debian/libwxgtk-dbg.dirs
+++ b/debian/libwxgtk-dbg.dirs
@@ -1,5 +1,5 @@
 usr/bin
-usr/lib/wx/include/wx/gtkd/
+usr/lib/wx/include/gtkd-=V/wx
 usr/share/man/man1
 usr/share/lintian/overrides

--- a/debian/libwxgtk-dbg.links
+++ b/debian/libwxgtk-dbg.links
@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz

--- a/debian/libwxgtk-dbg.postinst
+++ b/debian/libwxgtk-dbg.postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-config 50
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-=V-config 50

 if [ "$1" = "configure" ]; then
 	ldconfig
--- a/debian/libwxgtk-dbg.prerm
+++ b/debian/libwxgtk-dbg.prerm
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --remove wx-config /usr/bin/wxgtkd-config
+update-alternatives --remove wx-config /usr/bin/wxgtkd-=V-config

 #DEBHELPER#

--- a/debian/libwxgtk-dev.dirs
+++ b/debian/libwxgtk-dev.dirs
@@ -1,3 +1,4 @@
 usr/bin
-usr/lib/wx/include/wx/gtk/
+usr/lib/wx/include/gtk-=V/wx
 usr/share/man/man1
+
--- a/debian/libwxgtk-dev.files
+++ b/debian/libwxgtk-dev.files
@@ -1,6 +1,4 @@
-usr/bin/wxgtk-config
-usr/lib/wx/include/wx/gtk/setup.h
-usr/lib/libwx_gtk-*.so
-usr/lib/libwx_gtk.so
-usr/lib/libwx_gtk_gl*.so
+usr/bin/wxgtk-=V-config
+usr/lib/wx/include/gtk-=V/wx/setup.h
+usr/lib/libwx_gtk*.so

--- a/debian/libwxgtk-dev.links
+++ b/debian/libwxgtk-dev.links
@@ -1 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-=V-config.1.gz
+
--- a/debian/libwxgtk-dev.postinst
+++ b/debian/libwxgtk-dev.postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-config 70
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-=V-config 70

 #DEBHELPER#

--- a/debian/libwxgtk-dev.prerm
+++ b/debian/libwxgtk-dev.prerm
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --remove wx-config /usr/bin/wxgtk-config
+update-alternatives --remove wx-config /usr/bin/wxgtk-=V-config

 #DEBHELPER#

--- a/debian/libwxmsw-dev.dirs
+++ b/debian/libwxmsw-dev.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/=H/lib/wx/include/msw-=V-=H/wx
+usr/share/man/man1
+
--- a/debian/libwxmsw-dev.links
+++ b/debian/libwxmsw-dev.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmsw-=V-=H-config.1.gz
+
--- a/debian/libwxmsw-dev.postinst
+++ b/debian/libwxmsw-dev.postinst
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxmsw-=V-=H-config 40
+
+#DEBHELPER#
+
--- a/debian/libwxmsw-dev.prerm
+++ b/debian/libwxmsw-dev.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxmsw-=V-=H-config
+
+#DEBHELPER#
+
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,9 @@ export DH_OPTIONS
 release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
 python_dir:=python$(shell python -c "import sys;print sys.version[:3]")

+cross_host=i586-mingw32msvc
+cross_build=$(shell ./config.guess)
+
 # Packages to build:
 package_wxbase_lib=libwxbase$(release)
 package_wxbase_dev=libwxbase$(release)-dev
@@ -28,6 +31,10 @@ package_i18n=wxwin$(release)-i18n
 package_doc=wxwin$(release)-doc
 package_examples=wxwin$(release)-examples

+package_wxbase_msw_dev=libwxbase-msw$(release)-dev
+package_msw_dev=libwxmsw$(release)-dev
+package_headers_msw=wxwin$(release)-headers-msw
+
 # Build directories:
 objdir_wxbase_shared=objs_wxbase_sh
 objdir_wxbase_static=objs_wxbase_st
@@ -39,9 +46,14 @@ objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
 objdir_i18n=locale
+
+objdir_wxbase_msw_static=objs_wxbase_msw_st
+objdir_msw_static=objs_msw_st
+
 objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
-	$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)
+	$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
+        $(objdir_wxbase_msw_static) $(objdir_msw_static)

 #	note that the i18n package is actually arch indep (once built)
 #	but must be built (and installed) during the arch any phase as
@@ -56,7 +68,11 @@ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \

 build_indep_stamps=build-examples-stamp build-doc-stamp

-build_stamps=$(build_arch_stamps) $(build_indep_stamps)
+build_cross_stamps=build-wxbase-msw-dev-stamp build-msw-dev-stamp
+
+build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
+
+build_stamps=$(build_stamps_native) $(build_cross_stamps)

 # Install targets:
 install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
@@ -66,7 +82,11 @@ install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \

 install_all_indep=install-examples install-doc

-install_all=$(install_all_arch) $(install_all_indep)
+install_all_cross=install-wxbase-msw-dev install-msw-dev install-headers-msw
+
+install_all_native=$(install_all_arch) $(install_all_indep)
+
+install_all=$(install_all_native) $(install_all_cross)


 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
@@ -79,10 +99,7 @@ wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
 debian/control: debian/control.in
 	sed -e 's/=V/$(release)/g' < debian/control.in > debian/control

-debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in
-	sed -e 's/=V/$(release)/g' < debian/wxwin-doc.doc-base.in > debian/wxwin-doc.doc-base
-
-control-files-stamp: debian/control debian/wxwin-doc.doc-base
+control-files-stamp: debian/control
 	dh_testdir
 	@for f in dirs postinst; do \
 		echo "generating control file $(package_wxbase_lib).$$f"; \
@@ -90,11 +107,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 	done;
 	@for f in dirs files links postinst prerm; do \
 		echo "generating control file $(package_wxbase_dev).$$f"; \
-		cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
+			> debian/$(package_wxbase_dev).$$f; \
 	done;
 	@for f in dirs links postinst prerm; do \
 		echo "generating control file $(package_wxbase_dbg).$$f"; \
-		cp debian/libwxbase-dbg.$$f debian/$(package_wxbase_dbg).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
+			> debian/$(package_wxbase_dbg).$$f; \
 	done;
 	@for f in dirs postinst; do \
 		echo "generating control file $(package_gtk_lib).$$f"; \
@@ -102,11 +121,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 	done;
 	@for f in dirs files links postinst prerm; do \
 		echo "generating control file $(package_gtk_dev).$$f"; \
-		cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
+			> debian/$(package_gtk_dev).$$f; \
 	done;
 	@for f in dirs links postinst prerm; do \
 		echo "generating control file $(package_gtk_dbg).$$f"; \
-		cp debian/libwxgtk-dbg.$$f debian/$(package_gtk_dbg).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
+			> debian/$(package_gtk_dbg).$$f; \
 	done;
 	@for f in dirs docs files postinst prerm; do \
 		echo "generating control file $(package_gtk_py).$$f"; \
@@ -131,16 +152,32 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 	done;
 	@for f in dirs docs doc-base; do \
 		echo "generating control file $(package_doc).$$f"; \
-		cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
+			> debian/$(package_doc).$$f; \
 	done;
 	@for f in examples; do \
 		echo "generating control file $(package_examples).$$f"; \
 		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
 	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_msw_dev).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
+			> debian/$(package_wxbase_msw_dev).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_msw_dev).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
+			> debian/$(package_msw_dev).$$f; \
+	done;
+	@for f in dirs; do \
+		echo "generating control file $(package_headers_msw).$$f"; \
+		sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
+			> debian/$(package_headers_msw).$$f; \
+	done;
 	touch $@

 build_arch: control-files-stamp $(build_arch_stamps)
-build_all: control-files-stamp $(build_stamps)
+build_all: control-files-stamp $(build_stamps_native)

 # Really we should probably do nothing here until we know which
 # binary target is being called, but alpha builds were exploding
@@ -158,7 +195,7 @@ build-wxbase-shared-stamp:
 		&& ../configure --prefix=/usr \
 				--cache-file=../config_deb.cache \
 				--disable-gui \
-				--enable-burnt_name \
+				--enable-soname \
 				--with-zlib=sys \
 		&& $(MAKE)
 	touch $@
@@ -183,7 +220,7 @@ build-wxbase-debug-stamp:
 				--cache-file=../config_deb.cache \
 				--disable-gui \
 				--enable-debug \
-				--enable-burnt_name \
+				--enable-soname \
 				--with-zlib=sys \
 		&& $(MAKE)
 	touch $@
@@ -196,7 +233,7 @@ build-gtk-shared-stamp:
 				--cache-file=../config_deb.cache \
 				--with-gtk \
 				--with-opengl \
-				--enable-burnt_name \
+				--enable-soname \
 				--with-zlib=sys \
 				--with-libjpeg=sys \
 				--with-libpng=sys \
@@ -229,7 +266,7 @@ build-gtk-debug-stamp:
 				--with-gtk \
 				--with-opengl \
 				--enable-debug \
-				--enable-burnt_name \
+				--enable-soname \
 				--with-zlib=sys \
 				--with-libjpeg=sys \
 				--with-libpng=sys \
@@ -263,7 +300,7 @@ build-doc-stamp: build-gtk-shared-stamp
 	mkdir $(objdir_doc)
 	mkdir $(objdir_doc_cruft)
 	cd $(objdir_doc_cruft) \
-		&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \
+		&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
 		   ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
 		   ../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html
 	cp docs/latex/wx/*.gif $(objdir_doc)
@@ -272,10 +309,15 @@ build-doc-stamp: build-gtk-shared-stamp
 	      $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
 	touch $@

-build-examples-stamp:
+build-examples-stamp: build-gtk-shared-stamp
 	dh_testdir
 	mkdir $(objdir_examples)
+
+	# copy all samples and the Makefile generated for libwxgtk.
 	cp -a samples $(objdir_examples)
+	rm -f $(objdir_examples)/samples/Makefile
+	cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples
+
 	cp -a demos $(objdir_examples)
 	cp -a wxPython/demo $(objdir_examples)/wxPython
 	@for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
@@ -293,16 +335,59 @@ build-examples-stamp:

 build-i18n-stamp: build-gtk-shared-stamp
 	dh_testdir
+
+	# touch .po files first, since if they are not already up
+	# to date then _now_ is not the time to fix it.
+	# That should have been been done before cvs was tagged.
 	cd $(objdir_i18n) \
+		&& touch *.po \
 		&& $(MAKE) allmo
 	touch $@

+build-wxbase-msw-dev-stamp:
+	dh_testdir
+	mkdir $(objdir_wxbase_msw_static)
+	cd $(objdir_wxbase_msw_static) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=../config_deb.cache \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui \
+				--disable-shared \
+		&& $(MAKE)
+	touch $@
+
+build-msw-dev-stamp:
+	dh_testdir
+	mkdir $(objdir_msw_static)
+	cd $(objdir_msw_static) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=../config_deb.cache \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--with-mingw \
+				--disable-shared \
+		&& $(MAKE)
+	touch $@
+
+
 clean: debian/control
 	dh_testdir
 	dh_testroot
+
 	rm -rf config_deb.cache control-files-stamp $(build_stamps) $(objdirs)
 	rm -f docs/lgpl.txt
-	cd wxPython && ./setup.py clean
+	rm -f docs/latex/wx/manual.bb
+	rm -f $(objdir_i18n)/*.mo
+
+	cd wxPython \
+		&& ./setup.py clean \
+		&& rm -rf licence \
+		&& rm -rf build \
+		&& rm -rf contrib/ogl/contrib \
+		&& rm -rf contrib/stc/contrib \
+		&& rm -rf *.pyc
+
 	dh_clean
 	rm -f debian/$(package_wxbase_lib).*
 	rm -f debian/$(package_wxbase_dev).*
@@ -317,10 +402,13 @@ clean: debian/control
 	rm -f debian/$(package_i18n).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
+	rm -f debian/$(package_wxbase_msw_dev).*
+	rm -f debian/$(package_msw_dev).*
+	rm -f debian/$(package_headers_msw).*

 install_arch: build_arch $(install_all_arch)

-install: build_all $(install_all)
+install: build_all $(install_all_native)

 install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
 install-wxbase-lib: build-wxbase-shared-stamp
@@ -329,7 +417,7 @@ install-wxbase-lib: build-wxbase-shared-stamp
 	dh_clean -k
 	dh_installdirs
 	cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/usr/lib
-	cp $(objdir_wxbase_shared)/wxbase-config debian/$(package_wxbase_lib)/usr/bin/
+	cp $(objdir_wxbase_shared)/wxbase-$(release)-config debian/$(package_wxbase_lib)/usr/bin/

 install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
 install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
@@ -347,7 +435,7 @@ install-wxbase-dbg: build-wxbase-debug-stamp
 	dh_clean -k
 	dh_installdirs
 	cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
-	cp $(objdir_wxbase_debug)/wxbased-config debian/$(package_wxbase_dbg)/usr/bin/
+	cp $(objdir_wxbase_debug)/wxbased-$(release)-config debian/$(package_wxbase_dbg)/usr/bin/
 	cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)

 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
@@ -376,7 +464,7 @@ install-gtk-dbg: build-gtk-debug-stamp
 	dh_clean -k
 	dh_installdirs
 	cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
-	cp $(objdir_gtk_debug)/wxgtkd-config debian/$(package_gtk_dbg)/usr/bin/
+	cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)

 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
@@ -446,6 +534,45 @@ install-examples: build-examples-stamp
 	dh_clean -k
 	dh_installdirs

+install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
+install-wxbase-msw-dev: build-wxbase-msw-dev-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_msw_static)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	cp $(objdir_wxbase_msw_static)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
+	$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a
+
+install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
+install-msw-dev: build-msw-dev-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_msw_static)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
+	cp $(objdir_msw_static)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
+	$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
+
+install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
+install-headers-msw:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	@# Symlink all the headers that will be installed by the main -headers
+	@# package to where the cross compiler will expect them.
+	@for f in `ls -1 include/wx`; do \
+		ln -s /usr/include/wx/$$f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx; \
+		echo "linking header /usr/include/wx/$$f"; \
+	done;
+	@# But install this lot for real.
+	rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/msw
+	cp -a include/wx/msw debian/$(package_headers_msw)/usr/$(cross_host)/include/wx
+	@# and remove this cruft(?)
+	rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/treelay.h
+
+
 binary-common:
 	dh_testdir
 	dh_testroot
@@ -453,7 +580,11 @@ binary-common:
 	dh_installchangelogs
 	dh_installexamples
 	dh_link
-	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg)
+
+	@# Don't strip debug libs at all, and strip cross libs elsewhere
+	@# with the cross host tools until dh_strip gets smarter.
+	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) -N$(package_wxbase_msw_dev) -N$(package_msw_dev)
+
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -N$(package_gtk_py) -V
@@ -467,15 +598,29 @@ binary-common:
 # Note that you currently can't build the indep packages without first
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+	$(MAKE) -f debian/rules \
+	DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
+	binary-common

 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+	$(MAKE) -f debian/rules \
+	DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
+	binary-common

 # Build all packages target.
 binary: binary-arch binary-indep

+# This is a special target for building the wxMSW-cross packages.
+# It's not currently called during the official package build run
+# but may be run separately to build the extra packages.
+# There is an implied build dep on the mingw32 cross compiler 
+# that is not in the control file.
+binary-cross: control-files-stamp $(install_all_cross)
+	$(MAKE) -f debian/rules \
+	DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_msw_dev) -p$(package_headers_msw)" \
+	binary-common
+

 ############################################################################
 #
@@ -516,8 +661,10 @@ binary-doc: control-files-stamp install-doc

 .PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
        binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
-	binary-wxbase-dbg binary-doc install install_arch install-wxbase-lib \
+	binary-wxbase-dbg binary-doc binary-cross \
+	install install_arch install-wxbase-lib \
        install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
        install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
-        install-gtk-py install-headers install-i18n install-doc install-examples
+        install-gtk-py install-headers install-i18n install-doc install-examples \
+	install-wxbase-msw-dev install-msw-dev install-headers-msw

--- a/debian/wx-config.1
+++ b/debian/wx-config.1
@@ -8,7 +8,8 @@ wx-config - generate compile time info for wxWindows
 .B wxgtk-config
 .HP
 .B wx-config
-[\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
+[\-\-version] [\-\-libs] [\-\-gl\-libs] [\-\-cppflags]
+[\-\-cflags] [\-\-cxxflags] [\-\-cc] [\-\-cxx] [\-\-ld]
 [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP]
 .SH DESCRIPTION
 \fIwx-config\fP is a tool to determine the compiler and linker
@@ -35,10 +36,19 @@ include in a bug report.
 ( But of course you already knew that ... )
 .TP 8
 .B  \-\-libs
-Generate linker flags for a \fIwxWindows\fP program.
+Output linker flags for a \fIwxWindows\fP program.
+.TP 8
+.B  \-\-gl\-libs
+Output additional linker flags for apps using GLCanvas.
+.TP 8
+.B  \-\-cppflags
+Output build\-time preprocessor flags.
 .TP 8
 .B  \-\-cflags
-Generate compiler flags for the same.
+Output C compiler flags.
+.TP 8
+.B  \-\-cxxflags
+Output C++ compiler flags.
 .TP 8
 .B  \-\-cc
 Output the name of the C compiler \fB$(CC)\fP.
--- a/debian/wxwin-doc.doc-base.in
+++ b/debian/wxwin-doc.doc-base.in
--- a/debian/wxwin-headers-msw.dirs
+++ b/debian/wxwin-headers-msw.dirs
@@ -0,0 +1,2 @@
+usr/=H/include/wx
+
--- a/demos/bombs/BombsVC.dsp
+++ b/demos/bombs/BombsVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/bombs.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 wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/bombs.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/bombs.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 wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/bombs.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"

 !ENDIF 

--- a/demos/dbbrowse/DbbrowseVC.dsp
+++ b/demos/dbbrowse/DbbrowseVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dbbrowse.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 wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dbbrowse.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dbbrowse.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 wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dbbrowse.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"

 !ENDIF 

--- a/demos/dbbrowse/browsedb.cpp
+++ b/demos/dbbrowse/browsedb.cpp
@@ -33,6 +33,11 @@
 // Global structure for holding ODBC connection information
 // - darf nur einmal im Projekte definiert werden ?? Extra Databasse Klasse ?
 wxDbConnectInf ConnectInf;      // F<>r DBase
+
+#if !wxUSE_ODBC
+  #error Demo cannot be compiled unless setup.h has wxUSE_ODBC set to 1
+#endif
+
 //----------------------------------------------------------------------------------------
 extern WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */
 //----------------------------------------------------------------------------------------
--- a/demos/forty/FortyVC.dsp
+++ b/demos/forty/FortyVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/forty.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 wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/forty.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/forty.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 wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/forty.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"

 !ENDIF 

--- a/demos/fractal/FractalVC.dsp
+++ b/demos/fractal/FractalVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/fractal.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 wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/fractal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/fractal.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 wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/fractal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"

 !ENDIF

--- a/demos/life/LifeVC.dsp
+++ b/demos/life/LifeVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/life.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 wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/life.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/life.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 wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/life.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"

 !ENDIF 

--- a/demos/poem/PoemVC.dsp
+++ b/demos/poem/PoemVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxpoem.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 wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxpoem.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"

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

@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_7.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxpoem.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 wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxpoem.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"

 !ENDIF 

--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -4,13 +4,13 @@

 [Setup]
    MinVersion=4.0,4.0
-    AppName=wxWindows 2.2.7
+    AppName=wxWindows 2.2.9
    AppId=wxWindows
    CreateUninstallRegKey=1
-    UsePreviousAppDir=1
-    UsePreviousGroup=1
-    AppVersion=2.2.7
-    AppVerName=wxWindows 2.2.7
+    UsePreviousAppDir=0
+    UsePreviousGroup=0
+    AppVersion=2.2.9
+    AppVerName=wxWindows 2.2.9
    AppCopyright=Copyright <20> The wxWindows Team
    BackColor=$FF0000
    BackColor2=$000000
@@ -19,7 +19,7 @@
    WindowStartMaximized=1
    WindowVisible=1
    WindowResizable=1
-    UninstallDisplayName=wxWindows 2.2.7
+    UninstallDisplayName=wxWindows 2.2.9
    UninstallLogMode=Append
    DirExistsWarning=auto
    UninstallFilesDir={app}
@@ -28,10 +28,9 @@
    CreateAppDir=1
    DisableProgramGroupPage=0
    AlwaysCreateUninstallIcon=1
-    UninstallIconName=Uninstall wxWindows 2.2.7
+    UninstallIconName=Uninstall wxWindows 2.2.9
    Uninstallable=1
-    DefaultDirName=c:\wx2
-    DefaultGroupName=wxWindows 2.2.7
+    DefaultDirName=c:\wx2    DefaultGroupName=wxWindows 2.2.9
    LicenseFile=C:\wx2stable\wxWindows\docs\licence.txt
    InfoBeforeFile=C:\wx2stable\wxWindows\docs\readme.txt
    InfoAfterFile=C:\wx2stable\wxWindows\docs\msw\install.txt
--- a/distrib/msw/tmake/base.t
+++ b/distrib/msw/tmake/base.t
@@ -44,6 +44,17 @@
        $project{"BASE_UNIX_DEPS"} .= $filedep . " ";
    }

+    foreach $file (sort keys %wxMSW) {
+        next unless $wxMSW{$file} =~ /\bB\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"BASE_SOURCES"} .= "msw/" . $file . " ";
+        $project{"BASE_MSW_OBJS"} .= $fileobj . " ";
+        $project{"BASE_MSW_DEPS"} .= $filedep . " ";
+    }
+
    #! find all our headers
    foreach $file (sort keys %wxWXINCLUDE) {
        next unless $wxWXINCLUDE{$file} =~ /\bB\b/;
@@ -57,6 +68,12 @@
        $project{"BASE_HEADERS"} .= "unix/" . $file . " "
    }

+    foreach $file (sort keys %wxMSWINCLUDE) {
+        next unless $wxMSWINCLUDE{$file} =~ /\bB\b/;
+
+        $project{"BASE_HEADERS"} .= "msw/" . $file . " "
+    }
+
    foreach $file (sort keys %wxPROTOCOLINCLUDE) {
        next unless $wxPROTOCOLINCLUDE{$file} =~ /\bB\b/;

@@ -80,5 +97,12 @@ BASE_DEPS = \
 BASE_UNIX_OBJS = \
 		#$ ExpandList("BASE_UNIX_OBJS");

-BASE_DEPS = \
-		#$ ExpandList("BASE_DEPS");
+BASE_UNIX_DEPS = \
+		#$ ExpandList("BASE_UNIX_DEPS");
+
+BASE_MSW_OBJS = \
+		#$ ExpandList("BASE_MSW_OBJS");
+
+BASE_MSW_DEPS = \
+		#$ ExpandList("BASE_MSW_DEPS");
+
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -59,6 +59,8 @@
            $wxHTMLINCLUDE{$fields[0]} = $fields[2];
        } elsif ( $fields[1] eq "F" ) {
            $wxMOTIFINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "9" && $fields[2] eq "O" ) {
+            $wxOLEINCLUDE{$fields[0]} = $fields[2];
        } elsif ( $fields[1] eq "9" ) {
            $wxMSWINCLUDE{$fields[0]} = $fields[2];
        } elsif ( $fields[1] eq "K" ) {
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -409,6 +409,7 @@ gauge.cpp	X
 gdiobj.cpp	X
 glcanvas.cpp	X
 icon.cpp	X
+joystick.cpp	X
 listbox.cpp	X
 main.cpp	X
 mdi.cpp	X
@@ -619,7 +620,6 @@ hash.h	W	B
 help.h	W
 helpbase.h	W
 helphtml.h	W
-helpchm.h	W
 helpwin.h	W
 helpxlp.h	W
 icon.h	W
@@ -687,7 +687,6 @@ scrolbar.h	W
 scrolwin.h	W
 serbase.h	W	B
 settings.h	W
-setup.h	W	B
 sizer.h	W
 slider.h	W
 socket.h	W	B
@@ -821,7 +820,6 @@ control.h	F
 cursor.h	F
 dataform.h	F
 dataobj.h	F
-dataobj2.h	F
 dc.h	F
 dcclient.h	F
 dcmemory.h	F
@@ -939,6 +937,7 @@ slider.h	9
 slider95.h	9
 slidrmsw.h	9
 spinbutt.h	9
+spinctrl.h	9
 statbmp.h	9
 statbox.h	9
 statbr95.h	9
@@ -982,6 +981,15 @@ xpmhand.h	9
 # disable.bmp	9
 # wx.rc	9

+automtn.h	9	O
+dataform.h	9	O
+dataobj.h	9	O
+dataobj2.h	9	O
+dropsrc.h	9	O
+droptgt.h	9	O
+oleutils.h	9	O
+uuid.h	9	O
+
 accel.h	2
 dataobj.h	2
 helpwin.h	2
--- a/distrib/msw/tmake/msw.t
+++ b/distrib/msw/tmake/msw.t
@@ -72,6 +72,10 @@
        $project{"MSW_HEADERS"} .= "msw/" . $file . " "
    }

+    foreach $file (sort keys %wxOLEINCLUDE) {
+        $project{"MSW_HEADERS"} .= "msw/ole/" . $file . " ";
+    }
+
    foreach $file (sort keys %wxGENERICINCLUDE) {
        $project{"MSW_HEADERS"} .= "generic/" . $file . " "
    }
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -454,7 +454,7 @@ clean: $(PERIPH_CLEAN_TARGET)


 # Making documents
-docs:   allhlp allhtml allpdfrtf htb htmlhelp
+docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
@@ -473,12 +473,12 @@ referencps:	$(WXDIR)\docs\ps\referenc.ps
 allhlp: wxhlp
        cd $(WXDIR)\utils\dialoged\src
        nmake -f makefile.vc hlp
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc hlp
        cd $(THISDIR)

 #        cd $(WXDIR)\utils\wxhelp\src
 #        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc hlp
 #        cd $(WXDIR)\utils\wxgraph\src
 #        nmake -f makefile.vc hlp
 #        cd $(WXDIR)\utils\wxchart\src
@@ -493,6 +493,22 @@ allhlp: wxhlp
 allhtml: wxhtml
        cd $(WXDIR)\utils\dialoged\src
        nmake -f makefile.vc html
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc html
+        cd $(THISDIR)
+
+allhtmlhelp: htmlhelp
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc htmlhelp
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc htmlhelp
+        cd $(THISDIR)
+
+allhtb: htb
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc htb
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc htb
        cd $(THISDIR)

 #        nmake -f makefile.vc html
@@ -502,8 +518,6 @@ allhtml: wxhtml
 #        nmake -f makefile.vc html
 #        cd $(WXDIR)\utils\wxhelp\src
 #        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc html
 #        cd $(WXDIR)\utils\wxgraph\src
 #        nmake -f makefile.vc html
 #        cd $(WXDIR)\utils\wxchart\src
@@ -514,11 +528,15 @@ allhtml: wxhtml
 allps: wxps referencps
        cd $(WXDIR)\utils\dialoged\src
        nmake -f makefile.vc ps
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc ps
        cd $(THISDIR)

 allpdfrtf: pdfrtf
        cd $(WXDIR)\utils\dialoged\src
        nmake -f makefile.vc pdfrtf
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc pdfrtf
        cd $(THISDIR)

 #        cd $(WXDIR)\utils\wxhelp\src
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -28,6 +28,13 @@
        $file =~ s/cp?p?$/obj/;
        $project{$tag} .= $file . " "
    }
+    
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXHTMLOBJS"} .= $file . " "
+    }

    foreach $file (sort keys %wxCommon) {
        $isCFile = $file =~ /\.c$/;
@@ -91,6 +98,7 @@ JPEGDIR=$(WXDIR)\src\jpeg
 TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole
+HTMLDIR=$(WXDIR)\src\html

 DOCDIR = $(WXDIR)\docs

@@ -106,10 +114,12 @@ COMMONOBJS = &

 MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")

-# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "", " &\n\t")

-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+
+all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC

 $(LIBTARGET) : $(OBJECTS)
    %create tmp.lbc
@@ -207,6 +217,23 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
    }
 #$}

+
+########################################################
+# HTML objects (always compiled)
+
+#${
+    $_ = $project{"WXHTMLOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_;
+        s/\.obj$//;
+        $text .= ':     $(HTMLDIR)\\';
+        $text .= $_ . ".cpp\n" .
+                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
+    }
+#$}
+
+
 crbuffri.obj: $(XPMDIR)\crbuffri.c
  *$(CC) $(CPPFLAGS) $(IFLAGS) $<

--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -3,10 +3,11 @@ rem Zip up an external, generic + Windows distribution of wxWindows 2
 rem using Inno Setup + ScriptMaker
 set src=%wxwin
 set dest=%src\deliver
+set webfiles=c:\wx2dev\wxWebSite
 set inno=0

 Rem Set this to the required version
-set version=2.2.7
+set version=2.2.9

 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -37,6 +38,13 @@ erase %dest\*-win32-*.zip
 if direxist %dest\wx erase /sxyz %dest\wx\
 if not direxist %dest mkdir %dest

+# Copy FAQ and other files from wxWebSite CVS
+if not direxist %webfiles% echo Error - %webfiles% does not exist
+if not direxist %webfiles% goto end
+echo Copying FAQ from %webfiles
+copy %webfiles%\site\faq*.htm %src\docs\html
+copy %webfiles%\site\platform.htm %src\docs\html
+
 cd %src
 echo Zipping...

@@ -114,7 +122,7 @@ rem Misc. utils not in the main distribution
 zip32 -@ %dest\utils-%version%.zip < %src\distrib\msw\utils.rsp
 zip32 -@ -u %dest\utils-%version%.zip < %src\distrib\msw\utilmake.rsp

-copy %src\docs\changes.txt %dest\changed-%version%.txt
+copy %src\docs\changes.txt %dest\changes-%version%.txt
 copy %src\docs\msw\install.txt %dest\install_msw-%version%.txt
 copy %src\docs\motif\install.txt %dest\install_motif-%version%.txt
 copy %src\docs\gtk\install.txt %dest\install_gtk-%version%.txt
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -32,7 +32,7 @@ was popped up.
 wxWINDOWS VERSION:      2.0.1
 PLATFORM(S):            wxMotif
 DATE IDENTIFIED:        ?/?/1998
-IDENTIFIED BY:          Julian Smart <julian.smart@ukonline.co.uk>
+IDENTIFIED BY:          Julian Smart <julian.smart@btopenworld.com>
 DATE FIXED:
 FIXED BY:

@@ -75,7 +75,7 @@ WORKAROUND:
 wxWINDOWS VERSION:      2.0.1
 PLATFORM(S):            All
 DATE IDENTIFIED:        ?/?/1998
-IDENTIFIED BY:          Julian Smart <julian.smart@ukonline.co.uk>
+IDENTIFIED BY:          Julian Smart <julian.smart@btopenworld.com>
 DATE FIXED:
 FIXED BY:

@@ -244,7 +244,7 @@ WORKAROUND:
 visitor_email_address: haneef@symphonyeda.com
 wxWINDOWS+VERSION: 2.1.12
 DATE+FIXED: 29/11/99
-FIXED+BY: Julian Smart <julian.smart@ukonline.co.uk>
+FIXED+BY: Julian Smart <julian.smart@btopenworld.com>

 DATE+FIXED:
 DATE+IDENTIFIED: 29/11/1999
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -13,6 +13,55 @@ wxMSW:
 OTHER CHANGES
 -------------

+2.2.9
+-----
+
+All:
+
+- several memory leaks fixed, a few speed optimizations were done
+- using wxURL now enforces linking HTTP and FTP protocols in
+
+Unix:
+
+- configure changes: the system libraries are now used if found, fixes for
+  configuring under Solaris and Mac OS X, better support for 64 bit
+  architectures (including IA64)
+
+- call dlopen() with RTLD_GLOBAL flag
+
+- wxBase:
+
+- fixed bugs in wxString::rfind() and resize()
+- fixed wxStrtok()
+- miscellaneous fixes in wxDateTime
+- bug fixes in wxODBC
+
+wxMSW:
+
+- fixed wxChoice size calculations
+- fixed bad resource leak in wxListBox
+- fixed crash in wxSetFocusToChild()
+- fixed toolbar buttons drawing under Windows 2000
+- significant speed optimizations in wxRegConfig
+- better handling of accelerators
+- wxComboBox can now process enter key and sends TEXT_UPDATED more often
+- fixed crashes with big XPM files
+- compilation fixes for Mingw32/JPEG code
+
+wxGTK:
+
+- fix for non-US keyboards
+- improvents for 8bpp displays
+- various wxComboBox fixes
+- corrected radio button event sending
+- fixed slider value rounding, wxGA_VERTICAL style is now supported
+- fixed tree control invalid pointer after drag bug
+
+2.2.8
+-----
+
+There was no official wxWindows 2.2.8 release.
+
 2.2.7
 -----

--- a/docs/html/faq.htm
+++ b/docs/html/faq.htm
@@ -1,3 +1,4 @@
+
 <HTML>

 <HEAD>
--- a/docs/html/faqgen.htm
+++ b/docs/html/faqgen.htm
@@ -1,3 +1,4 @@
+
 <HTML>

 <HEAD>
@@ -22,22 +23,38 @@ wxWindows 2 FAQ: General

 See also <a href="faq.htm">top-level FAQ page</a>.
 <hr>
+<h3>List of questions in this category</h3>
+<ul>
+<li><a href="#whatis">What is wxWindows?</a></li>
+<li><a href="#users">Who uses wxWindows?</a></li>
+<li><a href="#platforms">What platforms are supported by wxWindows 2?</a></li>
+<li><a href="#specific">How does wxWindows 2 support platform-specific features?</a></li>
+<li><a href="#stl">Does wxWindows use STL? or the standard string class?</a></li>
+<li><a href="#richedit">Is there a rich edit/markup widget for wxWindows 2?</a></ li>
+<li><a href="#dev">How is wxWindows 2 being developed?</a></li>
+<li><a href="#distrib">How is wxWindows 2 distributed?</a></li>
+<li><a href="#future">What are the plans for the future?</a></li>
+<li><a href="#univ">What is wxUniversal?</a></li>
+<li><a href="#jave">What about Java?</a></li>
+<li><a href="#help">How can I help the project?</a></li>
+</ul>
+<hr>

 <H3><a name="whatis">What is wxWindows?</a></H3>

 wxWindows is a class library that allows you to compile graphical C++ programs on a range of
 different platforms. wxWindows defines a common API across platforms, but uses the native graphical user interface (GUI) on each platform,
-so your program will take on the native 'look and feel' that users are familiar with.<P>
+so your program will take on the native &#39;look and feel&#39; that users are familiar with.<P>

 Although GUI applications are mostly built programmatically, there is a dialog editor to help
-build attractive dialogs and panels. Robert Roebling's <a href="http://www.roebling.com">wxDesigner</a>
+build attractive dialogs and panels. Robert Roebling&#39;s <a href="http://www.roebling.com">wxDesigner</a>
 makes light work of resizable, portable dialogs.<P>

-You don't have to use C++ to use wxWindows: wxWindows 1 has been interfaced to several interpreted languages,
-such as CLIPS, Python, Scheme, XLisp and Perl, and there is a <a href="http://wxpython.org">Python interface</a> for wxWindows 2.
+You don&#39;t have to use C++ to use wxWindows: there is a <a href="http://wxpython.org">Python interface</a> for wxWindows 2,
+and also a <a href="http://wxperl.sourceforge.net" target=_top>Perl interface</a>.
 <P>

-<h3>Can I use wxWindows 2 for both proprietary (commercial) projects, and GPL'ed projects?</h3>
+<h3>Can I use wxWindows 2 for both proprietary (commercial) projects, and GPL&#39;ed projects?</h3>

 Yes. Please see the <a href="newlicen.htm">licence</a> for details, but basically
 you can distribute proprietary binaries without distributing any source code, and neither will wxWindows
@@ -57,7 +74,7 @@ keen to fix bugs as soon as possible, though obviously there are no guarantees.
 <H3><a name="users">Who uses wxWindows?</a></H3>

 Many organisations - commercial, government, and academic - across the
-world. It's impossible to estimate the true number of users, since
+world. It&#39;s impossible to estimate the true number of users, since
 wxWindows is obtained by many different means, and we cannot monitor
 distribution. The mailing list contains around 300-400 entries which is
 quite large for a list of this type.<P>
@@ -65,62 +82,28 @@ quite large for a list of this type.<P>
 See <a href="users.htm">Users</a> for a list of some users and their applications, and
 also <A href="feedback.htm">Feedback</a> for comments.<P>

-<H3>How much has the API changed since 1.xx?</H3>
-
-It's difficult to summarize, but some aspects haven't changed very much. For example, if you have some
-complex drawing code, you will mostly need to make sure it's parameterised with a device
-context (instead of obtaining one from a window or storing it). You won't have
-to completely rewrite the drawing code.<P>
-
-The way that events are handled has changed, so for example, where you overrode
-OnSize before, you now have a non-virtual OnSize with a single event class argument.
-To make this function known to wxWindows, you add an entry in an 'event table' using macros. Addition of these macros
-will eventually be made easier by a tool which will allow selection from a list
-and copy-and-paste into your editor. This is extended to button presses, listbox selection
-etc. so callbacks have gone (they may be added back for limited backward compatibility).<P>
-
-The class hierarchy has changed to allow greater flexibility but it probably won't affect your
-existing application. One exception to this is MDI applications which now use separate MDI classes instead of style
-flags. As a result, it won't be possible to switch between MDI and SDI operation at run-time
-without further coding, but a benefit is less interdependence between areas of code,
-and therefore smaller executable size.<P>
-
-Panel items (now called controls) no longer have labels associated with most of them,
-and default panel layout has been removed. The idea is that you make greater use
-of dialog resources, for better-looking dialogs.<P>
-
-<H3>What classes have disappeared?</H3>
-
-wxForm, wxTextWindow (subsumed into wxTextCtrl).
-
-<H3>Does wxWindows 2 mean that wxWindows 1.xx is dead?</H3>
-
-While wxWindows 2 is being developed, there will be further patches to wxWindows 1.xx.
-Obviously we are investing most of our energy into the new code, but we're also trying
-to fix bugs in the current version.<P>
-
-<H3>What platforms are supported by wxWindows 2?</H3>
+<H3><a name="platforms">What platforms are supported by wxWindows 2?</a></H3>

 <ul>
-<li>Windows 3.1, Windows 95/98, Windows NT;
-<li>Linux and other Unix platforms with GTK+;
-<li>Unix with Motif or the free Motif clone Lesstif;
-<li>Mac;
-<li>A BeOS port is being investigated.
-<li>A Windows CE port is being investigated.
+<li>Windows 3.1, Windows 95/98, Windows NT, Windows 2000, Windows ME.
+<li>Linux and other Unix platforms with GTK+.
+<li>Unix with Motif or the free Motif clone Lesstif.
+<li>Mac OS.
+<li>Embedded platforms are being investigated. See the <a href="wxuniv.htm">wxUniversal</a> project.
 <li>An OS/2 port is in progress, and you can also compile wxWindows for GTK+ or Motif
 on OS/2.
 </ul>
 <P>

-<H3>How does wxWindows 2 support platform-specific features?</H3>
+<H3><a name="specific">How does wxWindows 2 support platform-specific
+features?</a></H3>

 This is a hotly-debated topic amongst the developers. My own philosophy
 is to make wxWindows as platform-independent as possible, but allow in a
 few classes (functions, window styles) that are platform-specific.
 For example, Windows metafiles and Windows 95 taskbar icons have
 their own classes on Windows, but nowhere else. Because these classes
-are provided and are wxWindows-compatible, it doesn't take much
+are provided and are wxWindows-compatible, it doesn&#39;t take much
 coding effort for an application programmer to add support for
 some functionality that the user on a particular platform might otherwise
 miss. Also, some classes that started off as platform-specific, such
@@ -128,24 +111,24 @@ as the MDI classes, have been emulated on other platforms. I can imagine
 that even wxTaskBarIcon may be implemented for Unix desktops one day.
 <P>

-In other words, wxWindows is not a 'lowest common denominator' approach,
+In other words, wxWindows is not a &#39;lowest common denominator&#39; approach,
 but it will still be possible to write portable programs using the
 core API. Forbidding some platform-specific classes would be a stupid
 approach that would alienate many potential users, and encourage
 the perception that toolkits such as wxWindows are not up to the demands
-of today's sophisticated applications.<P>
+of today&#39;s sophisticated applications.<P>

 Currently resources such as bitmaps and icons are handled in a platform-specific
 way, but it is hoped to reduce this dependence in due course.<P>

-Another reason why wxWindows 2 is not a 'lowest common denominator' toolkit is that
+Another reason why wxWindows 2 is not a &#39;lowest common denominator&#39; toolkit is that
 some functionality missing on some platform has been provided using generic,
 platform-independent code, such as the wxTreeCtrl and wxListCtrl classes.<P>

-<H3>Does wxWindows use STL? or the standard string class?</H3>
+<H3><a name="stl">Does wxWindows use STL? or the standard string class?</a></H3>

 No. This is a much-discussed topic that has (many times) ended with the conclusion that it is in
-wxWindows' best interests to avoid use of templates. Not all compilers can handle
+wxWindows&#39; best interests to avoid use of templates. Not all compilers can handle
 templates adequately so it would dramatically reduce the number of compilers
 and platforms that could be supported. It would also be undersirable to make
 wxWindows dependent on another large library that may have to be downloaded and installed.
@@ -158,9 +141,20 @@ by being able to modify our own string class. Some compatibility with the string
 has been built into wxString.<P>

 There is nothing to stop an application using templates or the string class for its own
-purposes.<P>
+purposes. With wxWindows debugging options on, you may find you get errors when including
+STL headers. You can work around it either by switching off memory checking,
+or by adding this to a header before you include any STL files:<P>

-<H3>Is there a rich edit/markup widget for wxWindows 2?</H3>
+<PRE>
+&#35;ifdef new
+&#35;undef new
+&#35;endif
+</PRE>
+
+<P>
+
+
+<H3><a name="richedit">Is there a rich edit/markup widget for wxWindows 2?</a></H3>

 These are the possibilities so far:<P>

@@ -173,12 +167,12 @@ for this widget.
 then wxHTML will suit your needs. wxHTML is built into wxWindows - please see the reference
 manual for details, and samples/html.
 <li>There are rich edit widgets in both WIN32 and GTK+, but there is currently
-no wxWindows wrapper for these.
+no wxWindows wrapper for these (but text attribute functions are being added in the wxWindows 2.3.x series).
 </ul>

 <P>

-<H3>How is wxWindows 2 being developed?</H3>
+<H3><a name="dev">How is wxWindows 2 being developed?</a></H3>

 We are using the <a href="cvs.htm">CVS</a> system to develop and maintain wxWindows. This allows
 us to make alterations and upload them instantly to the SourceForge server, from
@@ -187,20 +181,24 @@ which others can update their source.<P>
 To build source from CVS, see the file BuildCVS.txt in the top-level wxWindows distribution
 directory.<P>

-<H3>How is wxWindows 2 distributed?</H3>
+<H3><a name="distrib">How is wxWindows 2 distributed?</a></H3>

-By ftp, and via the <a href="cdrom2.htm">wxWindows CD-ROM</a>.<P>
+By ftp, and via the <a href="cdrom2.htm">wxWindows CD-ROM</a>.
+<P>
+If you are feeling adventurous, you may also check out the sources directly
+from the <a href="cvs.htm">cvs</a>
+<p>

-<H3>What are the plans for the future?</H3>
+<H3><a name="future">What are the plans for the future?</a></H3>

-Currently we're working too hard on getting wxWindows 2 finished (are GUI toolkits ever
+Currently we&#39;re working too hard on getting wxWindows 2 finished (are GUI toolkits ever
 finished?) to think very far ahead. However, we know we want to make wxWindows as robust
 and well-publicised as possible. We also want to aim for better platform-independence of
 resources such as icons and bitmaps, standardising on the PNG for all platforms.<P>

 Other possibilities include: DCOM/CORBA compatibility; a wxWindows book;
-<a href="http://wxstudio.linuxbox.com/">wxStudio</a>, an IDE;
-other platforms; other interface abilities such as speech output.<P>
+<a href="http://wxworkshop.sourceforge.net/">wxWorkshop</a>, an IDE;
+other platforms, especially embedded systems; other interface abilities such as speech output.<P>

 We will investigate the possibility of compiler or operating system vendors bundling wxWindows with
 their product.<P>
@@ -208,17 +206,28 @@ their product.<P>
 The high-level goal of wxWindows is to be thought of as the number one C++ framework,
 for virtually any platform. Move over, MFC!<P>

-<H3>What about Java?</H3>
+<H3><a name="univ">What is wxUniversal?</a></H3>
+
+wxUniversal is a new port of wxWindows being currently actively developed. The
+main difference is that wxUniversal implements all controls (or widgets) in
+wxWindows itself thus allowing to have much more flexibility (i.e. support for
+themes even under MS Windows!). It also means that it is now much easier to
+port wxWindows to a new platform as only the low-level classes must be ported
+which make for a small part of the library.
+<p>
+You may find more about wxUniversal <a href=wxuniv.htm>here</a>.
+
+<H3><a name="jave">What about Java?</a></H3>

 The Java honeymoon period is over :-) and people are realising that it cannot
-meet all their cross-platform development needs. We don't anticipate a major threat
+meet all their cross-platform development needs. We don&#39;t anticipate a major threat
 from Java, and the level of interest in wxWindows is as high as ever.<P>

-<H3>How can I help the project?</H3>
+<H3><a name="help">How can I help the project?</a></H3>

-Please check out the <a href="http://www.wxwindows.org/develop.htm" target=main>Backroom</a> pages,
-in particular the <a href="http://www.wxwindows.org/projects.htm">suggested projects</a>, and
-mail <a href="mailto:julian.smart@ukonline.co.uk">Julian Smart</a> or the developers' mailing list with your own suggestions.<P>
+Please check out the <a href="http://www.wxwindows.org/develop2.htm">Community</a> pages,
+in particular the <a href="projects.htm">suggested projects</a>, and
+mail <a href="mailto:julian.smart@btopenworld.com">Julian Smart</a> or the developers&#39; mailing list with your own suggestions.<P>

 </font>

--- a/docs/html/faqgtk.htm
+++ b/docs/html/faqgtk.htm
@@ -22,23 +22,36 @@ wxWindows 2 for GTK FAQ

 See also <a href="faq.htm">top-level FAQ page</a>.
 <hr>
-
-<h3>What is wxWindows 2 for GTK?</h3>
+<h3>List of questions in this category</h3>
+<li><a href="#wxgtk">What is wxWindows 2 for GTK?</a></li>
+<li><a href="#gnome">Does wxGTK have GNOME support?</a></li>
+<li><a href="#redhat">Warning about GTK libraries supplied with RedHat</a></li>
+<li><a href="#wxgtk">What is wxWindows 2 for GTK?</a></li>
+<hr>

 wxWindows 2 for GTK is a port of wxWindows to the <a href="http://www.gimp.org/gtk" target=_top>GTK+ toolkit</a>,
 which is freely available for most flavours of Unix with X. wxWindows 2 for GTK is
 often abbreviated to wxGTK. wxGTK has a separate home page <a href="http://www.freiburg.linux.de/~wxxt" target=_top>here</a>.
 <P>

-<h3>Does wxGTK have GNOME support?</h3>
+<h3><a name="gnome">Does wxGTK have GNOME support?</a></h3>

 Currently wxGTK does not have any features that would involve dependence on any desktop
-environment's libraries, so it can work on GNOME, KDE and with other window managers
+environment&#39;s libraries, so it can work on GNOME, KDE and with other window managers
 without installation hassles. Some GNOME and KDE integration features are file based, and
 so may be added without dependence on libraries. Other features may be supported in the
 future, probably as a separate library.
 <P>

+<h3><a name="redhat">Warning about GTK libraries supplied with RedHat</a></h3>
+
+It seems that some versions of RedHat include a badly patched version of GTK (not wxGTK)
+which causes some trouble with wxWindows&#39; socket code. Common symptoms are that when
+a client tries to establish a connection to an existing server which refuses the request,
+the client will get notified twice, first getting a LOST event and then a CONNECT event.
+This problem can be solved by updating GTK with an official distribution of the library.
+<P>
+

 </font>

--- a/docs/html/faqmac.htm
+++ b/docs/html/faqmac.htm
@@ -22,12 +22,194 @@ wxWindows 2 for Mac FAQ

 See also <a href="faq.htm">top-level FAQ page</a>.
 <hr>
+<h3>List of questions in this category</h3>
+<ul>
+<li><a href="#release">When is wxMac 2.x due to be released?</a></li>
+<li><a href="#macplat">Which Mac platforms are supported?</a></li>
+<li><a href="#macosx">How is the Mac OS X port different from the Classic Mac OS port?</a></li>
+<li><a href="#macclassic">How are improvements to the Classic Mac OS port integra ted into the Mac OS X port?</a></li>
+<li><a href="#compilers">What compilers are supported?</a></li>
+<li><a href="#filetypes">How does CVS handle file types/creators under Mac OS 8.x /9.x?</a></li>
+<li><a href="#filetypesx">How does CVS handle file types/creators under Mac OS X? </a></li>
+<li><a href="#cwpro53">What steps are required to build wxMac using CodeWarrior P ro 5.3?</a></li>
+<li><a href="#buildx">What steps are required to build wxMac under Mac OS X?</a></li>
+<li><a href="#settings">What important settings are required in the CodeWarrior P roject Preferences?</a></li>
+<li><a href="#smarterrors">What are the smart preprocessing errors with the Apple Developer Tools?</a></li>
+<li><a href="#aboutmenu">How does wxMac support the standard Apple About menu item and Help menu?</a></li>
+</ul>
+<hr>
+<h3><a name="release">When is wxMac 2.x due to be released?</a></h3>

-<h3>When is wxMac 2 due to be released?</h3>
+There is a <a href="dl_mac2.htm">preview</a> available.
+The author of this port is <a href="mailto:csomor@advancedconcepts.ch">Stefan Csomor</a>.
+<P>

-There is a <a href="http://www.wxwindows.org/dl_mac2.htm">preview</a> available.
-A beta release can be expected by early Q2 1999. The author of this port
-is Stefan Csomor (csomor@advancedconcepts.ch).
+<table border=0 cellpadding=5>
+<tr>
+<td bgcolor="#C4ECF9">
+<FONT FACE="Arial, Lucida Sans, Helvetica">
+<font size=2>
+Please note that the version of wxMac in CVS is more robust and nearly feature-complete compared with the packaged 2.0 release.
+Until a new release is made, it is recommended that you download the wxMac 2.3.1 <a href="dl_mac2.htm#dev">development snapshot</a> or the sources from the <a href="cvs.htm">CVS trunk</a>.
+</font>
+</font></td>
+</tr>
+</table>
+
+<P>
+
+<h3><a name="macplat">Which Mac platforms are supported?</a></h3>
+
+wxWindows 2 can be used to develop and deliver applications on Classic Mac OS (e.g. Mac OS 8.x/9.x) both as Carbon and non-Carbon applications.
+<P>
+A Mac OS X port is in progress in order to be able to build wxWindows applications using the Apple Developer Tools that are delivered with every copy of Mac OS X.
+The Mac OS X port is based on and, for the most part, merged with the Carbon code for Classic Mac OS.
+<P>
+
+<h3><a name="macosx">How is the Mac OS X port different from the Classic Mac OS port?</a></h3>
+
+wxMac for Mac OS X shares code both with wxMac for Mac OS and common Unix code in wxWindows. The aim is to use the same Mac OS Carbon code both for Classic Mac OS and for Mac OS X while leveraging the fact that Mac OS X is a BSD Unix.
+<P>
+This hybrid approach was suggested by Apple to the <a href="http://www.mozilla.org/ports/fizzilla/">Fizzilla</a> team working on <a href="http://www.mozilla.org/">Mozilla</a> for Mac OS X.
+<P>
+
+<h3><a name="macclassic">How are improvements to the Classic Mac OS port integrated into the Mac OS X port?</a></h3>
+
+Since the source code is shared between the two ports, any Carbon compliant improvements to wxMac for Classic Mac OS are automatically available in the Mac OS X port.
+<P>
+The following points should be considered when improving wxMac:
+<ul>
+<li>Non Carbon compliant changes for Classic Mac OS will most likely break the Mac OS X port. <em>Such changes should be tested using the Carbon targets in the CodeWarrior projects for Classic Mac OS.</em>
+<li>Non Carbon compliant changes for Mac OS X will most likely break the Classic Mac OS port. <em>Such changes should be tested using CodeWarrior under Mac OS 8.x/9.x.</em>
+</ul>
+<P>
+
+<h3><a name="compilers">What compilers are supported?</a></h3>
+
+Under Classic Mac OS, MetroWerks CodeWarrior Pro 5.3 or 6 are required to build wxMac.
+<P>
+Under Mac OS X, the Developer Tools are sufficient to build wxMac. CodeWarrior Pro 6 can also be used to build the Carbon targets.
+<P>
+
+<h3><a name="filetypes">How does CVS handle file types/creators under Mac OS 8.x/9.x?</a></h3>
+
+Before checking out the wxWindows code using a CVS client under Mac OS 8.x/9.x, be sure your computer is set up to treat <code>xpm</code> and <code>xbm</code> images correctly:
+<ul>
+<li>bring up the Internet control panel, select the <i>Advanced Options</i> tab, click on the <i>File Mapping</i> icon from the list at the left and see if there are is an entry for ".xpm" files and another for ".xbm".
+<li>if an entry exists, click <i>Change...</i> and make sure <i>File Type</i> is <code>TEXT</code> (just those four capital letters); correct it if necessary. If there is no entry, make one with type set to <code>TEXT</code> and creator set to anything you like; reasonable choices include <code>GKON</code> (Graphic Converter) or <code>CWIE</code> (CodeWarrior).
+<li>if you want to edit <code>xpm</code> or <code>xbm</code> files in CodeWarrior, set up a file mapping in the CodeWarrior project settings for analogous to ".h" files.
+</ul>
+<P>
+
+<h3><a name="filetypesx">How does CVS handle file types/creators under Mac OS X?</a></h3>
+
+The Mac OS X CVS client does not handle file types and creators at all (just like every Unix command line CVS client). This is an issue only when the checked out files will also be used under Mac OS 8.x/9.x.
+<P>
+All files checked out under Mac OS X will be untyped and CodeWarrior will not recognize them correctly. To correct this, use the autotyper provided in the CVS sources:
+<ul>
+<li>decode and decompress the file <code>wxWindows/docs/mac/TypeAsMetrowerksText.sea.hqx</code>
+<li>drag the wxWindows CVS sandbox directory onto the autotyper and most of the files will be typed according to the file extension
+</ul>
+<P>
+
+<h3><a name="cwpro53">What steps are required to build wxMac using CodeWarrior Pro 5.3?</a></h3>
+
+The latest build for Carbon support lead to a few changes that you will have to follow in order to successfully compile the code.
+This is also necessary even if you don&#39;want to build the Carbon targets.
+
+<ol>
+<li>you need CodeWarrior Pro 5.3, i.e. 5.0 with all the upgrades
+<li>you have to download the Universal Interfaces 3.3.2 or later from the Apple Developer web site, Universal Interfaces 3.4 is required for Carbon Printing support
+<li>put the Universal folder into the MacOS Support folder and replace older versions
+<li>remove from the MacOS Support folder the separate OpenTransport folder
+<li>open the file MacOS Support:MacHeaders:MacHeaders.c and add the line
+        <pre>#include &lt;ControlDefinitions.h&gt;</pre>
+        after the line
+        <pre>#include &lt;Controls.h&gt;</pre>
+<li>rebuild all MacHeaders from the MacHeaders.mcp project in the same folder
+</ol>
+<P>
+Build the projects (<code>makemac6.mcp</code> for CodeWarrior Pro 6; <code>makemac.mpc</code> for CodeWarrior Pro 5) in the following five directories:
+<ul>
+<li>wxWindows:src:
+<li>wxWindows:src:jpeg:
+<li>wxWindows:src:png:
+<li>wxWindows:src:tiff:
+<li>wxWindows:src:zlib:
+</ul>
+<P>
+
+<h3><a name="buildx">What steps are required to build wxMac under Mac OS X?</a></h3>
+
+You need to have the Apple Developer Tools installed. The Developer Tools CD is one of the 3 CDs that are delivered with Mac OS X but must be installed in addition to the default Mac OS X installation.
+<P>
+Building wxMac completely without configure is not supported.
+<P>
+Building wxWindows directly in the CVS sandbox is not recommended. Instead, wxWindows should be built in a directory configured relatively to the CVS sandbox.
+For instance, to build wxMac with configure, start in the base wxWindows directory and type:
+<ul>
+<li><code>mkdir macbuild</code>
+<li><code>cd macbuild</code>
+<li><code>../configure</code> <b>or</b> <code>../configure --enable-debug</code>
+<li><code>make</code>
+</ul>
+<P>
+
+<h3><a name="settings">What important settings are required in the CodeWarrior Project Preferences?</a></h3>
+
+For some reasons the CodeWarrior project settings may get changed and this may lead to the inability to compile a certain target. In order to verify the settings click on the target tab, double click on the respective target and then select the following items on the tree-view on the left. Here are the important checks:
+
+<ol>
+
+<li>under <code>Target/Access Paths</code>, make sure the first user include does not have a folder icon for recursive search.
+
+<li> under <code>Language Settings/C/C++ Language</code>, make sure that the only checked items are:
+<ul>
+<li><code>Enable C++ Exceptions</code>
+<li><code>Enable RTTI</code>
+<li><code>Enable bool Support</code>
+<li><code>Enable wchar_t Support</code>
+<li><code>Relaxed Pointer Type Rules</code>
+<li><code>Use Unsigned Chars</code>
+</ul>
+
+<li>under <code>Language Settings/C/C++ Warnings</code>, make sure that the only checked items are:
+<ul>
+<li><code>Illegal Pragmas</code>
+<li><code>Extended Error Checking</code>
+<li><code>Inconsistent Use of 'class' and 'struct' Keywords</code>
+<li><code>Hidden Virtual Functions</code> but be aware that the framework itself has some of these beauty spots
+</ul>
+
+<li>under <code>Linker/PPC Linker</code>, make sure that the following items are checked:
+<ul>
+<li><code>Dead-strip Static Initialization Code</code> in order to avoid including libraries that are not needed, especially as things like <a href="http://developer.apple.com/opengl/index.html">OpenGL</a> get added to the projects and sources
+</ul>
+
+</ol>
+<P>
+
+<h3><a name="smarterrors">What are the smart preprocessing errors with the Apple Developer Tools?</a></h3>
+
+Smart preprocessing is activated with the <code>-cpp-precomp</code> option and allows much faster preprocessing of the source files by loading precompiled Carbon header files. This option speeds up the compilation of wxMac by a factor of 2 at least.
+When compiling wxMac  using the Apple Developer Tools, the following error is displayed for certain files:
+<ul>
+<li><code>cpp-precomp: warning: errors during smart preprocessing, retrying in basic mode</code>
+</ul>
+
+This error is due to the smart precompiler which does not fully understand C++ syntax and reverts to basic preprocessing when a smart preprocessing error occurs.
+This error can sometimes be corrected or avoided by modifying the source code. However, leaving these errors is not a problem since the preprocessor automatically switches to basic preprocessing if necessary.
+<P>
+
+<h3><a name="aboutmenu">How does wxMac support the standard Apple About menu item and Help menu?</a></h3>
+
+Because wxWindows does not have a specific API for the <i>About</i> menu item or the <i>Help</i> menu, the Mac OS port uses some static variables to help the engine make the right decisions:
+<ul>
+<li>It assumes that the <i>About</i> menu item is part of a <i>Help</i> menu.
+<li>The title of the <i>Help</i> menu is stored in <code>wxApp::s_macHelpMenuTitleName</code>, it defaults to "&Help", but you can change it in your constructor to your specific menu title.
+<li>The item Id of the <i>About</i> menu is stored in <code>wxApp::s_macAboutMenuItemID</code>, it defaults to <code>wxID_ABOUT</code>, but can be changed as well to suit your needs.
+<li>The other items of the wxWindows help menu are appended to the Mac OS <i>Help</i> menu and the translation of Ids is handled transparently for your application.
+</ul>
 <P>

 </font>
--- a/docs/html/faqmot.htm
+++ b/docs/html/faqmot.htm
@@ -8,10 +8,10 @@

 <font face="Arial, Lucida Sans, Helvetica">

-<table width=100% border=4 cellpadding=5 cellspacing=0>
+<table width=100% border=0 cellpadding=5 cellspacing=0>
 <tr>
-<td bgcolor="#660000">
-<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+<td bgcolor="#C4ECF9">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
 wxWindows 2 for Motif FAQ
 </font>
 </td>
@@ -22,8 +22,16 @@ wxWindows 2 for Motif FAQ

 See also <a href="faq.htm">top-level FAQ page</a>.
 <hr>
+<h3>List of questions in this category</a></h3>
+<ul>
+<li><a href="#versiob">What version of Motif do I need?</a></li>
+<li><a href="#missing">What features are missing or partially implemented?</a></li>
+<li><a href="#dialoged">Does Dialog Editor work with wxWindows for Motif?</a></li>
+<li><a href="#refresh">Why are windows are not refreshed properly until I resize them?</a></li>
+</ul>
+<hr>

-<h3>What version of Motif do I need?</h3>
+<h3><a name="versiob">What version of Motif do I need?</a></h3>

 You will need version 1.2 or above. Version 2 should also be fine. Some people
 have had a positive experience with <a href="www.lesstif.org" target=_top>Lesstif</a>,
@@ -31,7 +39,7 @@ a free Motif clone. (Note from Julian Smart - I use the Linux version of MetroLi

 <P>

-<h3>What features are missing or partially implemented?</h3>
+<h3><a name="missing">What features are missing or partially implemented?</a></h3>

 The following classes are not yet implemented: wxSpinButton, wxCheckListBox, wxJoyStick,
 wxGLCanvas.<P>
@@ -53,32 +61,23 @@ system is in preparation.

 <p>

-<h3>Does Dialog Editor work with wxWindows for Motif?</h3>
+<h3><a name="dialoged">Does Dialog Editor work with wxWindows for Motif?</a></h3>

 Suport for Dialog Editor is almost there, but there are some wrinkles to iron
-out. You may find it's useful though: compile it and see.
+out. You may find it&#39;s useful though: compile it and see.
 <P>

-<h3>How do I switch between debugging and release compilation modes?</h3>
-
-Unfortunately the makefile system doesn't currently allow you to compile
-for both simultaneously: you need
-to recompile wxWindows and your application having adjusted make.env. However,
-you could rename the binary and release library archives, and adjust your makefiles
-to use the appropriate one (or change a symbolic link).
-<P>
-
-<h3>Why are windows are not refreshed properly until I resize them?</h3>
+<h3><a name="refresh">Why are windows are not refreshed properly until I resize them?</a></h3>

 Very occasionally you can experience this glitch, probably because sometimes the
 window tries to resize and repaint itself before the final size is known. The workaround
 is to add code like this after window creation and initialization:<P>

 <PRE>
-#ifdef __WXMOTIF__
+&#35;ifdef __WXMOTIF__
  wxNoOptimize noOptimize;
-  window->SetSize(-1, -1, w, h);
-#endif
+  window-&#62;SetSize(-1, -1, w, h);
+&#35;endif
 </PRE>
 <P>

--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -22,8 +22,26 @@ wxWindows 2 for Windows FAQ

 See also <a href="faq.htm">top-level FAQ page</a>.
 <hr>
+<h3>List of questions in this category</h3>
+<ul>
+<li><a href="#platforms">Which Windows platforms are supported?</a></li>
+<li><a href="#wince">What about Windows CE?</a></li>
+<li><a href="#compilers">What compilers are supported?</a></li>
+<li><a href="#bestcompiler">Which is the best compiler to use with wxWindows 2?</a></li>
+<li><a href="#unicode">Is Unicode supported?</a></li>
+<li><a href="#dll">Can you compile wxWindows 2 as a DLL?</a></li>
+<li><a href="#exesize">How can I reduce executable size?</a></li>
+<li><a href="#mfc">Is wxWindows compatible with MFC?</a></li>
+<li><a href="#newerrors">Why my code fails to compile with strange errors about new operator?</a></li>
+<li><a href="#mfcport">How do I port MFC applications to wxWindows?</a></li>
+<li><a href="#crash">Why do I sometimes get bizarre crash problems using VC++ 5/6?</a></li>
+<li><a href="#makefiles">How are the wxWindows makefiles edited under Windows?</a></li>
+<li><a href="#vcdebug">How do you use VC++&#39;s memory leak checking instead of that in wxWindows?</a></li>
+<li><a href="#shortcutproblem">Why are menu hotkeys or shortcuts not working in my application?</a></li>
+</ul>
+<hr>

-<h3>Which Windows platforms are supported?</h3>
+<h3><a name="platforms">Which Windows platforms are supported?</a></h3>

 wxWindows 2 can be used to develop and deliver applications on Windows 3.1, Win32s,
 Windows 95, Windows 98, and Windows NT. A Windows CE version is being looked into (see below).<P>
@@ -31,8 +49,8 @@ Windows 95, Windows 98, and Windows NT. A Windows CE version is being looked int
 wxWindows 2 is designed to make use of WIN32 features and controls. However, unlike Microsoft,
 we have not forgotten users of 16-bit Windows. Most features
 work under Windows 3.1, including wxTreeCtrl and wxListCtrl using the generic implementation.
-However, don't expect very Windows-95-specific classes to work, such as wxTaskBarIcon. The wxRegConfig
-class doesn't work either because the Windows 3.1 registry is very simplistic. Check out the 16-bit
+However, don&#39;t expect very Windows-95-specific classes to work, such as wxTaskBarIcon. The wxRegConfig
+class doesn&#39;t work either because the Windows 3.1 registry is very simplistic. Check out the 16-bit
 makefiles to see what other files have been left out.
 <P>
 16-bit compilation is supported under Visual C++ 1.5, and Borland BC++ 4 to 5.
@@ -48,17 +66,17 @@ using wxGTK or wxMotif, then check/debug your wxWindows for Windows
 programs with TWIN32, and finally produce an ix86 Windows executable using Cygwin/Mingw32,
 without ever needing a copy of Microsoft Windows. See the Technical Note on the Web site detailing cross-compilation.<P>

-<h3>What about Windows CE?</h3>
+<h3><a name="wince">What about Windows CE?</a></h3>

 This is under consideration, though we need to get wxWindows Unicode-aware first.
 There are other interesting issues, such as how to combine the menubar and toolbar APIs
-as Windows CE requires. But there's no doubt that it will be possible, albeit
+as Windows CE requires. But there&#39;s no doubt that it will be possible, albeit
 by mostly cutting down wxWindows 2 API functionality, and adding a few classes here
 and there. Since wxWindows for 2 produces small binaries (less than 300K for
-the statically-linked 'minimal' sample), shoehorning wxWindows 2 into a Windows CE device's limited
+the statically-linked &#39;minimal&#39; sample), shoehorning wxWindows 2 into a Windows CE device&#39;s limited
 storage should not be a problem.<P>

-<h3>What compilers are supported?</h3>
+<h3><a name="compilers">What compilers are supported?</a></h3>

 Please see the wxWindows 2 for Windows install.txt file for up-to-date information, but
 currently the following are known to work:<P>
@@ -77,43 +95,42 @@ currently the following are known to work:<P>
 There is a linking problem with Symantec C++ which I hope someone can help solve.
 <P>

-<h3>Which is the best compiler to use with wxWindows 2?</h3>
+<h3><a name="bestcompiler">Which is the best compiler to use with wxWindows 2?</a></h3>

-It's partly a matter of taste, but I (JACS) prefer Visual C++ since the debugger is very
-good, it's very stable, the documentation is extensive, and it generates small executables.
-Since project files are plain text, it's easy for me to generate appropriate project files
+It&#39;s partly a matter of taste, but I (JACS) prefer Visual C++ since the debugger is very
+good, it&#39;s very stable, the documentation is extensive, and it generates small executables.
+Since project files are plain text, it&#39;s easy for me to generate appropriate project files
 for wxWindows samples.<P>

-Borland C++ is fine - and very fast - but it's hard (impossible?) to use the debugger without using project files, and
-the debugger is nowhere near up to VC++'s quality. The IDE isn't great.<P>
+Borland C++ is fine - and very fast - but it&#39;s hard (impossible?) to use the debugger without using project files, and
+the debugger is nowhere near up to VC++&#39;s quality. The IDE isn&#39;t great.<P>

-C++Builder's power isn't really used with wxWindows since it needs integration with its
-own class library (VCL). For wxWindows, I've only used it with makefiles, in which case
-it's almost identical to BC++ 5.0 (the same makefiles can be used).<P>
+C++Builder&#39;s power isn&#39;t really used with wxWindows since it needs integration with its
+own class library (VCL). For wxWindows, I&#39;ve only used it with makefiles, in which case
+it&#39;s almost identical to BC++ 5.0 (the same makefiles can be used).<P>

-You can't beat Cygwin's price (free), and you can debug adequately using gdb. However, it's
+You can&#39;t beat Cygwin&#39;s price (free), and you can debug adequately using gdb. However, it&#39;s
 quite slow to compile since it does not use precompiled headers.<P>

 CodeWarrior is cross-platform - you can debug and generate Windows executables from a Mac, but not
 the other way around I think - but the IDE is, to my mind, a bit primitive.<P>

-Watcom C++ is a little slow and the debugger is not really up to today's standards.<P>
+Watcom C++ is a little slow and the debugger is not really up to today&#39;s standards.<P>

-<h3>Is Unicode supported?</h3>
+Among the free compilers the best choice seem to be Borland C++ command line
+tools and mingw32 (port of gcc to Win32). Both of them are supported by
+wxWindows.

-Not yet, although there are other internationalisation features.<P>
+<h3><a name="unicode">Is Unicode supported?</a></h3>

-However, the issues surrounding Unicode support have been looked into so we know
-what we need to do, and have some header files ready to use containing appropriate
-type definitions. Just about every file in wxWindows will need changes, due to the
-pervasive nature of characters and character arrays. Unicode support is needed
-for the port to Windows CE (see above), and will probably be added in time for version 2.1.<P>
+Yes, Unicode is fully supported under Windows NT/2000 (Windows 9x don&#39;t
+have Unicode support anyhow).

-<h3>Can you compile wxWindows 2 as a DLL?</h3>
+<h3><a name="dll">Can you compile wxWindows 2 as a DLL?</a></h3>

 Yes (using the Visual C++ or Borland C++ makefile), but be aware that distributing DLLs is a thorny issue
-and you may be better off compiling statically-linked applications, unless you're
-delivering a suite of separate programs, or you're compiling a lot of wxWindows applications
+and you may be better off compiling statically-linked applications, unless you&#39;re
+delivering a suite of separate programs, or you&#39;re compiling a lot of wxWindows applications
 and have limited hard disk space.<P>

 With a DLL approach, and with different versions and configurations of wxWindows
@@ -122,7 +139,7 @@ negating the point of using DLLs. Of course, this is not a problem just associat
 wxWindows!
 <P>

-<H3>How can I reduce executable size?</H3>
+<h3><a name="exesize">How can I reduce executable size?</a></h3>

 You can compile wxWindows as a DLL (see above, VC++/BC++ only at present). You should also
 compile your programs for release using non-debugging and space-optimisation options, but
@@ -132,7 +149,7 @@ Statically-linked wxWindows 2 programs are smaller than wxWindows 1.xx programs,
 wxWindows 2 has been designed to reduce dependencies between classes, and other
 techniques. The linker will not include code from the library that is not (directly or
 indirectly) referenced
-by your application. So for example, the 'minimal' sample is less than 300KB using VC++ 6.<P>
+by your application. So for example, the &#39;minimal&#39; sample is less than 300KB using VC++ 6.<P>

 If you want to distribute really small executables, you can
 use <a href="http://www.icl.ndirect.co.uk/petite/" target=_top>Petite</a>
@@ -140,60 +157,90 @@ by Ian Luck. This nifty utility compresses Windows executables by around 50%, so
 will shrink to a mere 250KB. With this sort of size, there is reduced incentive to
 use DLLs.<P>

-<H3>Is wxWindows compatible with MFC?</H3>
+<H3><a name="mfc">Is wxWindows compatible with MFC?</a></H3>

 There is a sample which demonstrates MFC and wxWindows code co-existing in the same
-application. However, don't expect to be able to enable wxWindows windows with OLE-2
+application. However, don&#39;t expect to be able to enable wxWindows windows with OLE-2
 functionality using MFC.<P>

-<H3>Why do I sometimes get bizarre crash problems using VC++ 5/6?</H3>
+<H3><a name="newerrors">Why my code fails to compile with strange errors about new operator?</a></H3>
+
+The most common cause of this problem is the memory debugging settings in
+<tt>wx/msw/setup.h</tt>. You have several choices:
+
+<ul>
+    <li> Either disable overloading the global operator new completely by
+         setting <tt>wxUSE_GLOBAL_MEMORY_OPERATORS</tt> and
+         <tt>wxUSE_DEBUG_NEW_ALWAYS</tt> to 0 in this file
+    <li> Or leave them on but do <tt>#undef new</tt> after including any
+         wxWindows headers, like this the memory debugging will be still on
+         for wxWindows sources but off for your own code
+</ul>
+
+Notice that IMHO the first solution is preferable for VC++ users who can use
+the <a href="#vcdebug">VC++ CRT memory debugging features</a> instead.
+
+<H3><a name="mfcport">How do I port MFC applications to wxWindows?</a></H3>
+
+Set up your interface from scratch using wxWindows (especially wxDesigner --
+it&#39;ll save you a <i>lot</i> of time) and when you have a shell prepared, you can start
+&#39;pouring in&#39; code from the MFC app, with appropriate
+modifications. This is the approach I have used, and I found
+it very satisfactory. A two-step process then - reproduce the bare
+interface first, then wire it up afterwards. That way you deal
+with each area of complexity separately. Don&#39;t try to think MFC
+and wxWindows simultaneously from the beginning - it is easier to
+reproduce the initial UI by looking at the behaviour of the MFC
+app, not its code.
+
+<H3><a name="crash">Why do I sometimes get bizarre crash problems using VC++ 5/6?</a></H3>

 Some crash problems can be due to inconsistent compiler
-options (and of course this isn't limited to wxWindows).
+options (and of course this isn&#39;t limited to wxWindows).
 If strange/weird/impossible things start to happen please
 check (dumping IDE project file as makefile and doing text comparison
 if necessary) that the project settings, especially the list of defined
 symbols, struct packing, etc. are exactly the same for all items in
 the project. After this, delete everything (including PCH) and recompile.<P>

-VC++ 5's optimization code seems to be broken and can
+VC++ 5&#39;s optimization code seems to be broken and can
 cause problems: this can be seen when deleting an object Dialog
 Editor, in Release mode with optimizations on. If in doubt,
 switch off optimisations, although this will result in much
 larger executables. It seems possible that the library can be created with
 strong optimization, so long as the application is not strongly
-optimized. For example, in wxWindows project, set to 'Minimum
-Size'. In Dialog Editor project, set to 'Customize: Favor Small
-Code' (and no others). This will then work.<P>
+optimized. For example, in wxWindows project, set to &#39;Minimum
+Size&#39;. In Dialog Editor project, set to &#39;Customize: Favor Small
+Code&#39; (and no others). This will then work.<P>

-<H3>How are the wxWindows makefiles edited under Windows?</H3>
+<H3><a name="makefiles">How are the wxWindows makefiles edited under Windows?</a></H3>

 As of wxWindows 2.1, there is a new system written by Vadim Zeitlin, that
 generates the makefiles from templates using tmake.<P>

-Here are Vadim's notes:<P>
+Here are Vadim&#39;s notes:<P>

 <blockquote>
-To use these new makefiles, you don't need anything (but see below).
+To use these new makefiles, you don&#39;t need anything (but see below).
 However, you should NOT modify them because these files will be
 rewritten when I regenerate them using tmake the next time. So, if
 you find a problem with any of these makefiles (say, makefile.b32)
-you'll need to modify the corresponding template (b32.t in this
+you&#39;ll need to modify the corresponding template (b32.t in this
 example) and regenerate the makefile using tmake.<P>

 tmake can be found at
 <a href="http://www.troll.no/freebies/tmake.html" target=_new>www.troll.no/freebies/tmake.html</a>.
-It's a Perl5 program and so it needs Perl (doh). There is a binary for 
-Windows (available from the same page), but I haven't used it, so
-I don't know if it works as flawlessly as "perl tmake" does (note
-for people knowing Perl: don't try to run tmake with -w, it won't
+It&#39;s a Perl5 program and so it needs Perl (doh). There is a binary for 
+Windows (available from the same page), but I haven&#39;t used it, so
+I don&#39;t know if it works as flawlessly as "perl tmake" does (note
+for people knowing Perl: don&#39;t try to run tmake with -w, it won&#39;t
 do you any good). Using it extremely simple: to regenerate makefile.b32
 just go to distrib/msw/tmake and type<P>

 <pre>tmake -t b32 wxwin.pro -o ../../src/msw/makefile.b32</pre><P>

-The makefiles are untested - I don't have any of Borland, Watcom  or
-Symantec and I don't have enough diskspace to recompile even with
+The makefiles are untested - I don&#39;t have any of Borland, Watcom  or
+Symantec and I don&#39;t have enough diskspace to recompile even with
 VC6 using makefiles. The new makefiles are as close as possible to the
 old ones, but not closer: in fact, there has been many strange things
 (should I say bugs?) in some of makefiles, some files were not compiled
@@ -205,13 +252,13 @@ The templates are described in tmake ref manual (1-2 pages of text)
 and are quite simple. They do contain some Perl code, but my Perl is
 primitive (very C like) so it should be possible for anybody to make
 trivial modifications to it (I hope that only trivial modifications
-will be needed). I've tagged the ol makefiles as MAKEFILES_WITHOUT_TMAKE
+will be needed). I&#39;ve tagged the ol makefiles as MAKEFILES_WITHOUT_TMAKE
 in the cvs, so you can always retrieve them and compare the new ones,
 this will make it easier to solve the problems you might have.<P>

 Another important file is filelist.txt: it contains the list of all
 files to be compiled. Some of them are only compiled in 16/32 bit mode.
-Some other are only compiled with some compilers (others can't compile
+Some other are only compiled with some compilers (others can&#39;t compile
 them) - all this info is contained in this file.<P>

 So now adding a new file to wxWindows is as easy as modifying filelist.txt
@@ -219,10 +266,10 @@ So now adding a new file to wxWindows is as easy as modifying filelist.txt
 need to modify all files manually any more.<P>

 Finally, there is also a file vc6.t which I use myself: this one
-generates a project file for VC++ 6.0 (I didn't create vc5.t because
-I don't need it and can't test it, but it should be trivial to create
+generates a project file for VC++ 6.0 (I didn&#39;t create vc5.t because
+I don&#39;t need it and can&#39;t test it, but it should be trivial to create
 one from vc6.t - probably the only things to change would be the
-version number in the very beginning and the /Z option - VC5 doesn't
+version number in the very beginning and the /Z option - VC5 doesn&#39;t
 support edit-and=continue). This is not an officially supported way
 of building wxWindows (that is, nobody guarantees that it will work),
 but it has been very useful to me and I hope it will be also for
@@ -233,7 +280,7 @@ others. To generate wxWindows.dsp run<P>
 Then just include this project in any workspace or open it from VC IDE
 and it will create a new workspace for you.<P>

-If all goes well, I'm planning to create a template file for Makefile.ams
+If all goes well, I&#39;m planning to create a template file for Makefile.ams
 under src/gtk and src/motif and also replace all makefiles in the samples
 subdirectories with the project files from which all the others will be
 generated. At least it will divide the number of files in samples
@@ -242,21 +289,21 @@ directory by 10 (and the number of files to be maintained too).

 <P>

-<H3>How do you use VC++'s memory leak checking instead of that in wxWindows?</H3>
+<H3><a name="vcdebug">How do you use VC++&#39;s memory leak checking instead of that in wxWindows?</a></H3>

 Vadim Zeitlin:

 <pre>
-On the VC++ level, it's just the matter of calling _CrtSetDbgFlag() in the very
+On the VC++ level, it&#39;s just the matter of calling _CrtSetDbgFlag() in the very
 beginning of the program. In wxWindows, this is done automatically when
 compiling with VC++ in debug mode unless wxUSE_GLOBAL_MEMORY_OPERATORS or
 __NO_VC_CRTDBG__ are defined - this check is done in wx/msw/msvcrt.h which
 is included from app.cpp which then calls wxCrtSetDbgFlag() without any
-#ifdefs.
+ifdefs.

 This works quite well: at the end of the program, all leaked blocks with their
 malloc count are shown. This number (malloc count) can be used to determine
-where exactly the object was allocated: for this it's enough to set the variable
+where exactly the object was allocated: for this it&#39;s enough to set the variable
 _crtBreakAlloc (look in VC98\crt\srs\dbgheap.c line 326) to this number and
 a breakpoint will be triggered when the block with this number is allocated.

@@ -267,6 +314,14 @@ Regards,
 VZ
 </pre>

+<P>
+
+<H3><a name="shortcutproblem">Why are menu hotkeys or shortcuts not working in my application?</a></H3>
+
+This can happen if you have a child window intercepting EVT_CHAR events and swallowing
+all keyboard input. You should ensure that event.Skip() is called for all input that
+isn&#39;used by the event handler.
+

 </font>

--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -1,3 +1,4 @@
+
 <html>
 <head>
   <title>Platforms supported by wxWindows 2.x</title>
@@ -21,7 +22,7 @@ Supported Platforms
 </p>

 You will find below the list of all supported platforms for different ports of wxWindows 2.x (wxMSW/wxGTK/wxMotif ports
-only). The cross icon in the third column doesn't mean that the platform is not supported, but just that wxWindows hasn't
+only). The cross icon in the third column doesn&#39;t mean that the platform is not supported, but just that wxWindows hasn&#39;t
 been tested on it recently (the table is being updated for wxWindows 2.1.14
 beta currently).
 <p>
@@ -31,7 +32,7 @@ If you have tested wxWindows on a platform not mentioned here, please tell us ab
 We would especially like to have information about compiling wxGTK on other Unix variants, such as IRIX, DG-UX,
 other flavours of BSD, ... Please note that you will generally need GNU make
 (also known as <tt>gmake</tt>) to compile wxWindows, native make programs
-often don't work.
+often don&#39;t work.
 <p>

 <table width=100% border=4 cellpadding=5 cellspacing=0>
@@ -49,88 +50,100 @@ often don't work.
 </tr>

 <tr>
-<td bgcolor="#FFFFFF" align=center valign=center rowspan=7>Win32 (Windows 9x/NT)</td>
-     <td>Visual C++ 4.2/5.x/6.0</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ, JS</td><td>Project files are provided for all versions except 4.2</td>
-<tr> <td>Borland C++ 5.0</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td>Also works with free command line Borland C++ 5.5</td>
-<tr> <td>Mingw32</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>GRG, VZ</td><td>Cross compilation from Linux works as well<br>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=7>Win32<br>(Win 9x/NT/2K)</td>
+     <td>Visual C++ 4.2/5.x/6.0</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ, JS</td><td>Project files are provided for all versions except 4.2</td>
+<tr> <td>Borland C++ 5.0</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td>Also works with free command line Borland C++ 5.5</td>
+<tr> <td>Mingw32</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>GRG, VZ</td><td>Cross compilation from Linux works as well<br>
                                                                                               Version 2.95.2 recommended, otherwise some (included) patches must be applied<br>
-                                                                                               Memory debugging code doesn't seem to work well</td>
-<tr> <td>Cygwin</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>Stephane Junique<br>Andrea Venturoli</td><td>tested under NT 4, cross-compiling for mingw also works</td>
-<tr> <td>Watcom C++ 10</td><td align=center><IMG SRC="icons/somewhat.gif" ALT=Almost></td><td>JS</td><td>Tested with 10.6: works, but wxImage seems to be broken<br>no support for JPEG, TIFF or OpenGL</td>
-<tr> <td>Watcom C++ 11</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>Markus Neifer</td><td>Tested with 11.0b under win95</td>
-<tr> <td>Symantec C++</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+                                                                                               Memory debugging code doesn&#39;t seem to work well</td>
+<tr> <td>Cygwin</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Stephane Junique<br>Andrea Venturoli</td><td>tested under NT 4, cross-compiling for mingw also works</td>
+<tr> <td>Watcom C++ 10</td><td align=center><IMG SRC="images/somewhat.gif" ALT=Almost></td><td>JS</td><td>Tested with 10.6: works, but wxImage seems to be broken<br>no support for JPEG, TIFF or OpenGL</td>
+<tr> <td>Watcom C++ 11</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Markus Neifer</td><td>Tested with 11.0b under win95</td>
+<tr> <td>Symantec C++</td><td align=center><IMG SRC="images/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
 </tr>

 <tr>
-<td bgcolor="#F0F0F0" align=center valign=center rowspan=2>Win16 (Windows 3.1)</td>
-     <td>Visual C++ 1.52</td><td align=center><IMG SRC="icons/somewhat.gif" ALT=Ok></td><td><br></td>
+<td bgcolor="#F0F0F0" align=center valign=center rowspan=2>Win16<br>(Windows 3.1)</td>
+     <td>Visual C++ 1.52</td><td align=center><IMG SRC="images/somewhat.gif" ALT=Ok></td><td><br></td>
     <td rowspan=2 valign=center>Some features are missing (OLE related classes, threads, ...)<br>
-                                 Borland C++ can't cope with ODBC, resources and new wxGrid class</td>
-<tr> <td>Borland C++ 4.0/5.0</td><td align=center><IMG SRC="icons/somewhat.gif" ALT=Ok></td><td>JS</td>
+                                 Borland C++ can&#39;t cope with ODBC, resources and new wxGrid class</td>
+<tr> <td>Borland C++ 4.0/5.0</td><td align=center><IMG SRC="images/somewhat.gif" ALT=Ok></td><td>JS</td>
 </tr>

 <tr>
-<td bgcolor="#FFFFFF" align=center valign=center rowspan=4>Linux</td>
-     <td>wxGTK with gcc 2.7.2</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td>Should work, but nobody uses it any more</td>
-<tr> <td>wxGTK with egcs 1.1.1</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ, RR</td><td><br></td>
-<tr> <td>wxGTK with gcc 2.95</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
-<tr> <td>wxMotif with egcs 1.1.1</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td>with <a href=http://www.lesstif.org>LessTif</a> 0.87</td>
-<tr> <td>wxMotif with gcc 2.95</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td>with <a href=http://www.openmotif.org>OpenMotif</a></td>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=5>Linux x86</td>
+     <td>wxGTK with gcc 2.7.2</td><td align=center><IMG SRC="images/no.gif" ALT=Unknown></td><td><br></td><td>Should work, but nobody uses it any more</td>
+<tr> <td>wxGTK with egcs 1.1.1</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ, RR</td><td><br></td>
+<tr> <td>wxGTK with gcc 2.95</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
+<tr> <td>wxMotif with egcs 1.1.1</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td>with <a href="http://www.lesstif.org">LessTif</a> 0.87</td>
+<tr> <td>wxMotif with gcc 2.95</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td>with <a href="http://www.openmotif.org">OpenMotif</a></td>
 </tr>

 <tr>
 <td bgcolor="#F0F0F0" align=center valign=center rowspan=1>FreeBSD</td>
-     <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ</td><td>Limited thread support on older systems</td>
+     <td>wxGTK with gcc</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td>Limited thread support on older systems</td>
 </tr>

 <tr>
-<td bgcolor="#FFFFFF" align=center valign=center rowspan=4>Solaris</td>
-     <td>wxMotif with Sun CC 4.2</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ</td><td>Thread support must be disabled on system with not MT-safe X11</td>
-<tr> <td>wxMotif with gcc</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
-<tr> <td>wxGTK with Sun CC 4.2</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>Shiv Shankar Ramakrishnan</td><td><br></td>
-<tr> <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=5>Solaris</td>
+     <td>wxMotif with Sun CC 4.2</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td>Thread support must be disabled on system with not MT-safe X11</td>
+<tr> <td>wxMotif with gcc</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
+<tr> <td>wxGTK with Sun CC 4.2</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Shiv Shankar Ramakrishnan</td><td><br></td>
+<tr> <td>wxGTK with gcc</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
+<tr> <td>wxGTK with Sun CC 5.0 and 6.1 (Solaris 7 and 8)</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Jiri Mracek</td><td>You have to edit line 2079 in glib.h to fix GTK+ error</td>
 </tr>

 <tr>
 <td bgcolor="#F0F0F0" align=center valign=center rowspan=2>AIX</td>
-     <td>wxGTK with AIX CC</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
-<tr> <td>wxMotif with xlC 3.1.4.0 (AIX 4.2)</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td>
+     <td>wxGTK with AIX CC</td><td align=center><IMG SRC="images/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>wxMotif with xlC 3.1.4.0 (AIX 4.2)</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td>
                                 <td>Bernhard Eck</td>
                                 <td>Some problems with OpenGL and native X server</td>
 </tr>

 <tr>
-<td bgcolor="#FFFFFF" align=center valign=center rowspan=2>HP-UX</td>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=2>HP-UX 10.20</td>
     <td>wxGTK with HP CC A.10.22<br>or HP aCC B3910B A.01.18
-     </td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>Staf Verhaegen</td>
+     </td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Staf Verhaegen</td>
     <td>you need to add <tt>-Aa -D_HPUX_SOURCE</tt> to <tt>CFLAGS</tt></td>
-<tr> <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>wxGTK with gcc</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Julian Albo Garcia</td><td><br></td>
 </tr>

 <tr>
-<td bgcolor="#F0F0F0" align=center valign=center rowspan=2>IRIX</td>
-     <td>wxGTK</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td>You may need to use <tt>--disable-catch_segvs</tt> if you get compiler<br>error in utilsunx.cpp</td>
-<tr> <td>wxMotif with MIPSPro 7.30</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>David Marshall</td><td>On IRIX 6.5.6 (Indigo2, 64bit), with SGI Motif 1.2</td>
+<td bgcolor="#F0F0F0" align=center valign=center rowspan=3>IRIX</td>
+     <td>wxGTK</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td>You may need to use <tt>--disable-catch_segvs</tt> if you get compiler error in utilsunx.cpp</td>
+<tr> <td>wxMotif with MIPSPro 7.30</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>David Marshall</td><td>On IRIX 6.5.6 (Indigo2, 64bit), with SGI Motif 1.2</td>
+<tr> <td>wxMotif with "CC -mips3 -n32"</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Ian</td><td>You need to set LD_LIBRARYN32_PATH</td>
 </tr>

 <tr>
 <td bgcolor="#FFFFFF" align=center valign=center rowspan=1>SCO UnixWare</td>
-    <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>William Suetholz</td><td>UnixWare 2.1.3 with UnixWare 7 compatibility PTF</td>
+    <td>wxGTK with gcc</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>William Suetholz</td><td>UnixWare 2.1.3 with UnixWare 7 compatibility PTF</td>
 </tr>

 <tr>
 <td bgcolor="#F0F0F0" align=center valign=center rowspan=1>DEC OSF/1</td>
-    <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>Fabrice Didierjean</td><td>OSF1 4.0 on Dec Alpha<br>
+    <td>wxGTK with gcc</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Fabrice Didierjean</td><td>OSF1 4.0 on Dec Alpha<br>
                                                                                     you may need to run configure with <tt>--host=alpha-dec-osf switch</tt></td>
 </tr>

 <tr>
 <td bgcolor="#FFFFFF" align=center valign=center rowspan=4>OS/2</td>
-     <td>VisualAge 3.0/4.0</td><td align=center><IMG SRC="icons/no.gif" ALT="Not yet"></td><td>DW</td>
+     <td>VisualAge 3.0/4.0</td><td align=center><IMG SRC="images/no.gif" ALT="Not yet"></td><td>DW</td>
     <td rowspan=2 valign=center>OS/2 port is work in progress...</td>
-<tr> <td>EMX</td><td align=center><IMG SRC="icons/no.gif" ALT="Not yet"></td><td>SN</td>
-<tr> <td>wxGTK with EMX</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>SN</td><td>configure scripts need to be regenerated with OS/2 port of autoconf</td>
-<tr> <td>wxMotif with EMX</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>SN</td><td>with <a href=http://www.lesstif.org>LessTif</a> 0.89; configure scripts need to be regenerated with OS/2 port of autoconf</td>
+<tr> <td>EMX</td><td align=center><IMG SRC="images/no.gif" ALT="Not yet"></td><td>SN</td>
+<tr> <td>wxGTK with EMX</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>SN</td><td>configure scripts need to be regenerated with OS/2 port of autoconf</td>
+<tr> <td>wxMotif with EMX</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>SN</td><td>with <a href="http://www.lesstif.org">LessTif</a> 0.89; configure scripts need to be regenerated with OS/2 port of autoconf</td>
+</tr>
+
+<tr>
+<td bgcolor="#F0F0F0" align=center valign=center rowspan=1>OpenVMS</td>
+<td>wxGTK with Compaq-C++ V6.2 (OpenVMS Alpha 7.3)</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Jouk Jansen</td><td><br></td>
+</tr>
+
+<tr>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=1>Linux S/390</td>
+<td>wxGTK with gcc 2.95.2</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td>2.3.1+ only</td>
 </tr>

 </table>
--- a/docs/latex/wx/body.tex
+++ b/docs/latex/wx/body.tex
@@ -234,7 +234,7 @@ Julian Smart\\
 Uppingham\\
 Rutland\\
 LE15 9SG\\
-julian.smart@ukonline.co.uk
+julian.smart@btopenworld.com

 \section{Acknowledgments}

--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -31,7 +31,7 @@
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
-\date{May 14th 2001}
+\date{December 2001}
 }
 \makeindex
 \begin{document}
--- a/docs/latex/wx/mdi.tex
+++ b/docs/latex/wx/mdi.tex
@@ -493,7 +493,7 @@ on the background.

 Note that it is probably impossible to have a client window that scrolls as well as painting
 a bitmap or pattern, since in {\bf OnScroll}, the scrollbar positions always return zero.
-(Solutions to: \verb$julian.smart@ukonline.co.uk$).
+(Solutions to: \verb$julian.smart@btopenworld.com$).

 \wxheading{See also}

--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -178,7 +178,7 @@ centered relative to the screen anyhow.

 \func{void}{CentreOnParent}{\param{int}{ direction = wxBOTH}}

-Centres the window on its parent. This is a more readable synonym for 
+Centres the window on its parent. This is a more readable synonym for
 \helpref{Centre}{wxwindowcentre}.

 \wxheading{Parameters}
@@ -190,7 +190,7 @@ or {\tt wxBOTH}.}

 This methods provides for a way to center top level windows over their
 parents instead of the entire screen.  If there is no parent or if the
-window is not a top level window, then behaviour is the same as 
+window is not a top level window, then behaviour is the same as
 \helpref{wxWindow::Centre}{wxwindowcentre}.

 \wxheading{See also}
@@ -523,8 +523,8 @@ area which may be drawn on by the programmer, excluding title bar, border etc.
 \pythonnote{In place of a single overloaded method name, wxPython
 implements the following methods:\par
 \indented{2cm}{\begin{twocollist}
-\twocolitem{{\bf wxGetClientSizeTuple()}}{Returns a 2-tuple of (width, height)}
-\twocolitem{{\bf wxGetClientSize()}}{Returns a wxSize object}
+\twocolitem{{\bf GetClientSizeTuple()}}{Returns a 2-tuple of (width, height)}
+\twocolitem{{\bf GetClientSize()}}{Returns a wxSize object}
 \end{twocollist}}
 }

@@ -542,7 +542,7 @@ Returns the associated drop target, which may be NULL.

 \wxheading{See also}

-\helpref{wxWindow::SetDropTarget}{wxwindowsetdroptarget}, 
+\helpref{wxWindow::SetDropTarget}{wxwindowsetdroptarget},
 \helpref{Drag and drop overview}{wxdndoverview}

 \membersection{wxWindow::GetEventHandler}\label{wxwindowgeteventhandler}
@@ -1008,7 +1008,7 @@ Note that the ASCII values do not have explicit key codes: they are passed as AS
 values.

 Note that not all keypresses can be intercepted this way. If you wish to intercept modifier
-keypresses, then you will need to use \helpref{wxWindow::OnKeyDown}{wxwindowonkeydown} or 
+keypresses, then you will need to use \helpref{wxWindow::OnKeyDown}{wxwindowonkeydown} or
 \helpref{wxWindow::OnKeyUp}{wxwindowonkeyup}.

 Most, but not all, windows allow keypresses to be intercepted.
@@ -1045,7 +1045,7 @@ values.

 This function is only relevant to top-level windows (frames and dialogs), and under
 Windows only. Under GTK the normal EVT\_CHAR\_ event has the functionality, i.e.
-you can intercepts it and if you don't call \helpref{wxEvent::Skip}{wxeventskip} 
+you can intercepts it and if you don't call \helpref{wxEvent::Skip}{wxeventskip}
 the window won't get the event.

 \wxheading{See also}
@@ -1208,7 +1208,7 @@ use the EVT\_KEY\_DOWN macro in an event table definition. Your {\bf OnKeyDown}
 default function to achieve default keypress functionality.

 Note that not all keypresses can be intercepted this way. If you wish to intercept special
-keys, such as shift, control, and function keys, then you will need to use \helpref{wxWindow::OnKeyDown}{wxwindowonkeydown} or 
+keys, such as shift, control, and function keys, then you will need to use \helpref{wxWindow::OnKeyDown}{wxwindowonkeydown} or
 \helpref{wxWindow::OnKeyUp}{wxwindowonkeyup}.

 Most, but not all, windows allow keypresses to be intercepted.
@@ -1237,7 +1237,7 @@ use the EVT\_KEY\_UP macro in an event table definition. Your {\bf OnKeyUp} hand
 default function to achieve default keypress functionality.

 Note that not all keypresses can be intercepted this way. If you wish to intercept special
-keys, such as shift, control, and function keys, then you will need to use \helpref{wxWindow::OnKeyDown}{wxwindowonkeydown} or 
+keys, such as shift, control, and function keys, then you will need to use \helpref{wxWindow::OnKeyDown}{wxwindowonkeydown} or
 \helpref{wxWindow::OnKeyUp}{wxwindowonkeyup}.

 Most, but not all, windows allow key up events to be intercepted.
@@ -1769,8 +1769,8 @@ Sets the accelerator table for this window. See \helpref{wxAcceleratorTable}{wxa
 \func{void}{SetAutoLayout}{\param{bool}{ autoLayout}}

 Determines whether the \helpref{wxWindow::Layout}{wxwindowlayout} function will
-be called automatically when the window is resized. Use in connection with 
-\helpref{wxWindow::SetSizer}{wxwindowsetsizer} and 
+be called automatically when the window is resized. Use in connection with
+\helpref{wxWindow::SetSizer}{wxwindowsetsizer} and
 \helpref{wxWindow::SetConstraints}{wxwindowsetconstraints} for laying out subwindows.

 \wxheading{Parameters}
@@ -1899,7 +1899,7 @@ If the window already has a drop target, it is deleted.

 \wxheading{See also}

-\helpref{wxWindow::GetDropTarget}{wxwindowgetdroptarget}, 
+\helpref{wxWindow::GetDropTarget}{wxwindowgetdroptarget},
 \helpref{Drag and drop overview}{wxdndoverview}

 \membersection{wxWindow::SetEventHandler}\label{wxwindowseteventhandler}
@@ -2322,9 +2322,9 @@ create a new validator of this type.

 \func{void}{SetToolTip}{\param{wxToolTip* }{tip}}

-Attach a tooltip to the window. 
+Attach a tooltip to the window.

-See also: \helpref{GetToolTip}{wxwindowgettooltip}, 
+See also: \helpref{GetToolTip}{wxwindowgettooltip},
          \helpref{wxToolTip}{wxtooltip}


--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=c:\wx2sta~1\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
+BMROOT=c:\wx2sta~1\wxwind~1\docs/latex/wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -312,7 +312,7 @@ issues concerning the compiler installation:

 2. Make sure that you downloaded and installed the service pack 1 
   for Borland C++ 5.5.  This SP1 can be downloaded from:
-   http://www.borland.com/devsupport/bcppbuilder/file_supplements.html
+   http://www.borland.com/devsupport/bcppbuilder/patches/#freecompiler55

   IMPORTANT:
   When installing SP1, make sure that you extract (UnZip) the files 
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWindows 2.2.7
+wxWindows 2.2.9
 ---------------

 README
@@ -227,9 +227,9 @@ The main wxWindows ftp site is at:
 A wxWindows CD-ROM with the latest distribution plus an HTML
 front-end and hundreds of MB of compilers, utilities and other
 material may be ordered from the CD-ROM page (see the wxWindows
-web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
+web site) or contact Julian Smart <julian.smart@btopenworld.com>.

 Good luck!

-The wxWindows Team, 18th May, 2001
+The wxWindows Team, September, 2001

--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -227,16 +227,22 @@
 #undef PACKAGE
 #undef VERSION

+// size_t is the same as unsigned int for all Windows compilers we know,
+// so define it if it hadn't been done by configure yet
+#if defined(__WXMSW__) && !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+#define wxSIZE_T_IS_UINT
+#endif
+
 // this has to be done after including setup.h which might
 // define __HPUX__ 1 itself
 #if defined(__hpux) && !defined(__HPUX__)
-    #define __HPUX__
+#define __HPUX__
 #endif // HP-UX

 // if we're on a Unix system but didn't use configure (so that setup.h didn't
 // define __UNIX__), do define __UNIX__ now
 #if !defined(__UNIX__) && defined(__UNIX_LIKE__)
-    #define __UNIX__
+#define __UNIX__
 #endif // Unix

 #include "wx/version.h"
@@ -1767,17 +1773,17 @@ typedef unsigned long   WXHDC;
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
-#ifdef __WXMSW__
-typedef unsigned int    WXWPARAM;
-typedef long            WXLPARAM;
-#else
+#ifdef __WXPM__
 #  define WXWPARAM      MPARAM
 #  define WXLPARAM      MPARAM
 #  define RECT          RECTL
 #  define LOGFONT       FATTRS
 #  define LOWORD        SHORT1FROMMP
 #  define HIWORD        SHORT2FROMMP
-#endif // __WXMSW__
+#else
+typedef unsigned int    WXWPARAM;
+typedef long            WXLPARAM;
+#endif // __WXPM__
 typedef unsigned long   WXCOLORREF;
 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -51,11 +51,18 @@ class WXDLLEXPORT wxList;

 typedef int wxEventType;

-// this macro is for upwards compatibility with 2.4, use it when defining your
-// event table macros
+// these macros are for upwards compatibility with 2.4,
+// use them when defining events and event tables
 #define DECLARE_EVENT_TABLE_ENTRY(type, id, idLast, fn, obj) \
    { type, id, idLast, fn, obj }

+#define BEGIN_DECLARE_EVENT_TYPES() enum {
+#define END_DECLARE_EVENT_TYPES() };
+#define DECLARE_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,
+#define DECLARE_LOCAL_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,
+#define DEFINE_EVENT_TYPE(name)
+#define DEFINE_LOCAL_EVENT_TYPE(name)
+
 // the standard event types
 enum
 {
@@ -989,7 +996,7 @@ class WXDLLEXPORT wxMenuEvent : public wxEvent

 public:
    wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0)
-      { m_eventType = type; m_menuId = id; }
+      { m_eventType = type; m_menuId = id; m_id = id; }

    int GetMenuId() const { return m_menuId; }

--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -35,7 +35,7 @@ class wxFont : public wxFontBase
 public:
    // ctors and such
    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
    wxFont(const wxString& fontname, const wxFontData& fontdata);

    // assignment
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -35,7 +35,7 @@ class wxFont : public wxFontBase
 public:
    // ctors and such
    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
    wxFont(const wxString& fontname, const wxFontData& fontdata);

    // assignment
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -128,7 +128,7 @@ public:
    ~wxHashTable();

    // copy ctor and assignment operator
-    wxHashTable(const wxHashTable& table) { DoCopy(table); }
+    wxHashTable(const wxHashTable& table) : wxObject() { DoCopy(table); }
    wxHashTable& operator=(const wxHashTable& table)
        { Clear(); DoCopy(table); return *this; }

--- a/include/wx/html/forcelnk.h
+++ b/include/wx/html/forcelnk.h
@@ -56,5 +56,16 @@ See mod_*.cpp and htmlwin.cpp for example :-)
                static int _link_dummy_var_##module_name =            \
                               _link_dummy_func_##module_name ();

+#define FORCE_WXHTML_MODULES() \
+    FORCE_LINK(m_layout) \
+    FORCE_LINK(m_fonts) \
+    FORCE_LINK(m_image) \
+    FORCE_LINK(m_list) \
+    FORCE_LINK(m_dflist) \
+    FORCE_LINK(m_pre) \
+    FORCE_LINK(m_hline) \
+    FORCE_LINK(m_links) \
+    FORCE_LINK(m_tables) \
+    FORCE_LINK(m_meta)

 #endif // _WX_FORCELNK_H_
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -314,7 +314,7 @@ class WXDLLEXPORT wxHtmlLinkInfo : public wxObject
                { m_Href = m_Target = wxEmptyString; m_Event = NULL, m_Cell = NULL; }
        wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString) : wxObject()
                { m_Href = href; m_Target = target; m_Event = NULL, m_Cell = NULL; }
-        wxHtmlLinkInfo(const wxHtmlLinkInfo& l)
+        wxHtmlLinkInfo(const wxHtmlLinkInfo& l) : wxObject()
                { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event, m_Cell = l.m_Cell; }
        wxHtmlLinkInfo& operator=(const wxHtmlLinkInfo& l)
                { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event, m_Cell = l.m_Cell; return *this; }
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -325,7 +325,7 @@ private:

 protected:
        // copy ctor. This has to go below Init, or VC++ 1.5 will complain.
-    wxListBase(const wxListBase& list)
+    wxListBase(const wxListBase& list) : wxObject()
        { Init(); DoCopy(list); }
 };

@@ -514,7 +514,8 @@ public:

        // copying the string list: the strings are copied, too (extremely
        // inefficient!)
-    wxStringList(const wxStringList& other) { DeleteContents(TRUE); DoCopy(other); }
+    wxStringList(const wxStringList& other) : wxStringListBase()
+    	{ DeleteContents(TRUE); DoCopy(other); }
    wxStringList& operator=(const wxStringList& other)
        { Clear(); DoCopy(other); return *this; }

--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -489,11 +489,6 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
 // debug only logging functions: use them with API name and error code
 // ----------------------------------------------------------------------------

-#ifndef __TFILE__
-    #define __XFILE__(x) Tx)
-    #define __TFILE__ __XFILE__(__FILE__)
-#endif
-
 #ifdef __WXDEBUG__
    // make life easier for people using VC++ IDE: clicking on the message
    // will take us immediately to the place of the failed API
--- a/include/wx/mac/setup.h
+++ b/include/wx/mac/setup.h
@@ -302,10 +302,6 @@
                                  // Use standard C++ streams if 1. If 0, use wxWin
                                  // streams implementation.

-#define wxUSE_WXCONFIG      1
-                                  // if enabled, compiles built-in OS independent wxConfig
-                                  // class and it's file (any platform) and registry (Win)
-                                  // based implementations
 #define wxUSE_THREADS       0
                                  // support for multithreaded applications: if
                                  // 1, compile in thread classes (thread.h)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -76,8 +76,8 @@ public:
    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array

    // Copy constructors
-    wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
-    wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }
+    wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject() { Ref(accel); }
+    wxAcceleratorTable(const wxAcceleratorTable* accel) : wxObject() { if (accel) Ref(*accel); }

    ~wxAcceleratorTable();

--- a/include/wx/motif/bitmap.h
+++ b/include/wx/motif/bitmap.h
@@ -134,7 +134,7 @@ public:
  wxBitmap(); // Platform-specific

  // Copy constructors
-  wxBitmap(const wxBitmap& bitmap)
+  wxBitmap(const wxBitmap& bitmap) : wxGDIObject()
  { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }

  // Initialize with raw XBM data
--- a/include/wx/motif/brush.h
+++ b/include/wx/motif/brush.h
@@ -47,7 +47,7 @@ public:
  wxBrush();
  wxBrush(const wxColour& col, int style);
  wxBrush(const wxBitmap& stipple);
-  inline wxBrush(const wxBrush& brush) { Ref(brush); }
+  inline wxBrush(const wxBrush& brush) : wxGDIObject() { Ref(brush); }
  ~wxBrush();

  virtual void SetColour(const wxColour& col)  ;
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -54,7 +54,7 @@ public:
  wxCursor();

  // Copy constructors
-  wxCursor(const wxCursor& cursor) { Ref(cursor); }
+  wxCursor(const wxCursor& cursor) : wxBitmap() { Ref(cursor); }

  wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
    const char maskBits[] = NULL);
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -22,7 +22,7 @@ class wxFont : public wxFontBase
 public:
    // ctors and such
    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }

    wxFont(int size,
           int family,
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -42,7 +42,7 @@ public:
  wxIcon();

  // Copy constructors
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
+  inline wxIcon(const wxIcon& icon) : wxBitmap() { Ref(icon); }

  // Initialize with XBM data
  wxIcon(const char bits[], int width, int height);
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -55,7 +55,7 @@ class WXDLLEXPORT wxPalette: public wxGDIObject

 public:
  wxPalette();
-  wxPalette(const wxPalette& palette) { Ref(palette); }
+  wxPalette(const wxPalette& palette) : wxGDIObject() { Ref(palette); }

  wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
  ~wxPalette();
--- a/include/wx/motif/pen.h
+++ b/include/wx/motif/pen.h
@@ -53,7 +53,7 @@ public:
  wxPen();
  wxPen(const wxColour& col, int width, int style);
  wxPen(const wxBitmap& stipple, int width);
-  inline wxPen(const wxPen& pen) { Ref(pen); }
+  inline wxPen(const wxPen& pen) : wxGDIObject() { Ref(pen); }
  ~wxPen();

  inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
--- a/include/wx/motif/region.h
+++ b/include/wx/motif/region.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_REGION_H_
@@ -28,16 +28,18 @@ WX_DECLARE_LIST(wxRect, wxRectList);


 enum wxRegionContain {
-	wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
+    wxOutRegion,
+    wxPartRegion,
+    wxInRegion
 };

 // So far, for internal use only
 enum wxRegionOp {
-wxRGN_AND,          // Creates the intersection of the two combined regions.
-wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
-wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
-wxRGN_OR,           // Creates the union of two combined regions.
-wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
+    wxRGN_AND,          // Creates the intersection of the two combined regions.
+    wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
+    wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
+    wxRGN_OR,           // Creates the union of two combined regions.
+    wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
 };

 class WXDLLEXPORT wxRegion : public wxGDIObject {
@@ -47,64 +49,63 @@ public:
    wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
    wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
    wxRegion(const wxRect& rect);
-	wxRegion();
-	~wxRegion();
+    wxRegion();
+    ~wxRegion();

-	//# Copying
-	inline wxRegion(const wxRegion& r)
-		{ Ref(r); }
-	inline wxRegion& operator = (const wxRegion& r)
-		{ Ref(r); return (*this); }
+    //# Copying
+    inline wxRegion(const wxRegion& r) : wxGDIObject() { Ref(r); }
+    inline wxRegion& operator = (const wxRegion& r)
+        { Ref(r); return (*this); }

-	//# Modify region
-	// Clear current region
-	void Clear();
+    //# Modify region
+    // Clear current region
+    void Clear();

-	// Union rectangle or region with this.
-	inline bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_OR); }
-	inline bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); }
-	inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); }
+    // Union rectangle or region with this.
+    inline bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_OR); }
+    inline bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); }
+    inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); }

-	// Intersect rectangle or region with this.
-	inline bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_AND); }
-	inline bool Intersect(const wxRect& rect)  { return Combine(rect, wxRGN_AND); }
-	inline bool Intersect(const wxRegion& region)  { return Combine(region, wxRGN_AND); }
+    // Intersect rectangle or region with this.
+    inline bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_AND); }
+    inline bool Intersect(const wxRect& rect)  { return Combine(rect, wxRGN_AND); }
+    inline bool Intersect(const wxRegion& region)  { return Combine(region, wxRGN_AND); }

-	// Subtract rectangle or region from this:
+    // Subtract rectangle or region from this:
    // Combines the parts of 'this' that are not part of the second region.
-	inline bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_DIFF); }
-	inline bool Subtract(const wxRect& rect)  { return Combine(rect, wxRGN_DIFF); }
-	inline bool Subtract(const wxRegion& region)  { return Combine(region, wxRGN_DIFF); }
+    inline bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_DIFF); }
+    inline bool Subtract(const wxRect& rect)  { return Combine(rect, wxRGN_DIFF); }
+    inline bool Subtract(const wxRegion& region)  { return Combine(region, wxRGN_DIFF); }

-	// XOR: the union of two combined regions except for any overlapping areas.
-	inline bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_XOR); }
-	inline bool Xor(const wxRect& rect)  { return Combine(rect, wxRGN_XOR); }
-	inline bool Xor(const wxRegion& region)  { return Combine(region, wxRGN_XOR); }
+    // XOR: the union of two combined regions except for any overlapping areas.
+    inline bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_XOR); }
+    inline bool Xor(const wxRect& rect)  { return Combine(rect, wxRGN_XOR); }
+    inline bool Xor(const wxRegion& region)  { return Combine(region, wxRGN_XOR); }

-	//# Information on region
-	// Outer bounds of region
-	void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
-	wxRect GetBox() const ;
+    //# Information on region
+    // Outer bounds of region
+    void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
+    wxRect GetBox() const ;

-	// Is region empty?
-	bool Empty() const;
-        inline bool IsEmpty() const { return Empty(); }
-        bool Ok() const { return (m_refData != NULL) ; }
+    // Is region empty?
+    bool Empty() const;
+    inline bool IsEmpty() const { return Empty(); }
+    bool Ok() const { return (m_refData != NULL) ; }

-	//# Tests
-	// Does the region contain the point (x,y)?
-	wxRegionContain Contains(wxCoord x, wxCoord y) const;
-	// Does the region contain the point pt?
-	wxRegionContain Contains(const wxPoint& pt) const;
-	// Does the region contain the rectangle (x, y, w, h)?
-	wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const;
-	// Does the region contain the rectangle rect?
-	wxRegionContain Contains(const wxRect& rect) const;
+    //# Tests
+    // Does the region contain the point (x,y)?
+    wxRegionContain Contains(wxCoord x, wxCoord y) const;
+    // Does the region contain the point pt?
+    wxRegionContain Contains(const wxPoint& pt) const;
+    // Does the region contain the rectangle (x, y, w, h)?
+    wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const;
+    // Does the region contain the rectangle rect?
+    wxRegionContain Contains(const wxRect& rect) const;

 // Internal
-	bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op);
-	bool Combine(const wxRegion& region, wxRegionOp op);
-	bool Combine(const wxRect& rect, wxRegionOp op);
+    bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op);
+    bool Combine(const wxRegion& region, wxRegionOp op);
+    bool Combine(const wxRect& rect, wxRegionOp op);

    // Get the internal Region handle
    WXRegion GetXRegion() const;
@@ -123,33 +124,34 @@ public:
 class WXDLLEXPORT wxRegionIterator : public wxObject {
 DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 public:
-	wxRegionIterator();
-	wxRegionIterator(const wxRegion& region);
-	~wxRegionIterator();
+    wxRegionIterator();
+    wxRegionIterator(const wxRegion& region);
+    ~wxRegionIterator();

-	void Reset() { m_current = 0; }
-	void Reset(const wxRegion& region);
+    void Reset() { m_current = 0; }
+    void Reset(const wxRegion& region);

-	operator bool () const { return m_current < m_numRects; }
-	bool HaveRects() const { return m_current < m_numRects; }
+    operator bool () const { return m_current < m_numRects; }
+    bool HaveRects() const { return m_current < m_numRects; }

-	void operator ++ ();
-	void operator ++ (int);
+    void operator ++ ();
+    void operator ++ (int);

-	wxCoord GetX() const;
-	wxCoord GetY() const;
-	wxCoord GetW() const;
-	wxCoord GetWidth() const { return GetW(); }
-	wxCoord GetH() const;
-	wxCoord GetHeight() const { return GetH(); }
-        wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
+    wxCoord GetX() const;
+    wxCoord GetY() const;
+    wxCoord GetW() const;
+    wxCoord GetWidth() const { return GetW(); }
+    wxCoord GetH() const;
+    wxCoord GetHeight() const { return GetH(); }
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }

 private:
-	size_t	 m_current;
-	size_t	 m_numRects;
-	wxRegion m_region;
-        wxRect*  m_rects;
+    size_t      m_current;
+    size_t      m_numRects;
+    wxRegion    m_region;
+    wxRect*     m_rects;
 };

-#endif
-	// _WX_REGION_H_
+#endif // _WX_REGION_H_
+
+// vi:sts=4:sw=4:et
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -79,7 +79,10 @@ public:
    static bool RegisterWindowClasses();
    // Convert Windows to argc, argv style
    void ConvertToStandardCommandArgs(char* p);
+    
+    /*virtual*/ void DoMessage(WXMSG *pMsg);
    virtual bool DoMessage();
+    
    virtual bool ProcessMessage(WXMSG* pMsg);
    void DeletePendingObjects();
    bool ProcessIdle();
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -96,6 +96,8 @@ public:

    WXHMENU GetWinMenu() const { return m_hMenu; }

+    virtual void RemoveChild(wxWindowBase *child);
+
    // event handlers
    bool HandlePaint();
    bool HandleSize(int x, int y, WXUINT flag);
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1,2 @@`
				`usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz`