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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_1_11@4580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Fixes to Cygwin/Mingw32 makefile, manual now compiles wxStaticLine, etc.
1999-11-15 19:25:43 +00:00 · 1999-11-08 21:14:50 +00:00 · 1999-11-08 20:55:14 +00:00 · 1999-11-08 18:38:56 +00:00 · 1999-11-08 17:35:17 +00:00 · 1999-11-08 17:07:54 +00:00
4824 changed files with 1022740 additions and 145358 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,35 @@
+system.list
+bin
+.gdb_history
+Test
+config.cache
+configarg.cache
+config.status
+system.list
+linux.system.cache
+wx-config
+config.log
+linux-gnu.system.cache
+*.dsp
+*.dsw
+*.plg
+*.opt
+*.aps
+*.ncb
+*.pro
+*.opt
+*.d
+*.swp
+*.swo
+Release
+Debug
+ReleaseDLL
+DebugDLL
+robert
+stamp-h.in
+Makefile
+configure
+setup.h
+stamp-h
+libtool
+aclocal.m4
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -0,0 +1,242 @@
+------------------------------------------------------------------------
+                How to build the sources from CVS
+------------------------------------------------------------------------
+
+I) Windows using plain makefiles
+----------------------------------------
+
+a) If using Microsoft Visual C++ 5.0 or 6.0
+
+Ensure that the command-line compiler and tools (including
+nmake) are installed and ready to run.  Depending on your
+installation there may be a batch file (named something like
+VCVARS32.BAT) that needs to be run to set correct environment
+varaibles and PATH entries.
+
+Continue with item c) below.
+
+
+b) If using the GNU MinGW32 or GNU CygWin32 compilers
+
+You'll need the compiler itself which is available from
+
+  http://www.cygwin.com
+
+When using MingW32 you'll need GNU make which is a part
+of the CygWin32 toolchain and is also available as a stand
+alone port without the infamous Cygwin.dll from
+
+  http://agnes.dida.physik.uni-essen.de/~janjaap/mingw32
+
+The makefile has small problems with Cygwin<69>s tools
+so it is recommended not to use these (but MingGW32
+and its make.exe).
+
+-> Set your path so that it includes the directory
+   where your compiler and tools reside
+
+b-2) Using Mingw32 with gcc-2.95 and Anders Norlander's
+     Win32 headers
+
+Using the newer gcc-2.95/Noralander header combination
+will allow you to compile more of the MSW code, such
+as OLE and Drag-n-Drop.
+
+Instructions are similar to those for Regular Mingw32 except
+
+->Get the compiler from
+    ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
+
+->patch the gcc headers with info in wxWin\Mingw32-gcc295.patches.
+  PLEASE APPLY THESE PATCHES BY HAND! There are apparently a few
+  different versions of the headers floating around.
+
+->Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
+  the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
+  If using MINGW32, also set the MINGW32VERSION variable
+  appropriately.
+
+
+c) Build instructions
+
+-> Assumming that you installed the wxWindows sources
+   into c:\wxWin
+-> Copy c:\wxWin\include\wx\msw\setup0.h
+   to   c:\wxWin\include\wx\msw\setup.h
+-> Edit c:\wxWin\include\wx\msw\setup.h so that
+   most features are enabled (i.e. defined to 1) with
+   #define wxUSE_ODBC          0
+   #define wxUSE_SOCKETS       0
+   #define wxUSE_HTML          1
+   #define wxUSE_THREADS       1
+   #define wxUSE_FS_INET       0
+   #define wxUSE_FS_ZIP        1
+   #define wxUSE_BUSYINFO      1
+   #define wxUSE_DYNLIB_CLASS  1
+   #define wxUSE_ZIPSTREAM     1
+   #define wxUSE_LIBJPEG       1
+   #define wxUSE_LIBPNG        1
+
+   and iostreams ares disabled with
+   #define wxUSE_STD_IOSTREAM   0
+
+   note: ODBC and SOCKETS can be 1 for gcc-2.95
+
+-> type: cd c:\wxWin\src\msw
+-> type: make -f makefile.g95  (if using GNU tools)
+or type: make -f makefile.vc   (if using MS VC++)
+
+
+II) Unix ports
+--------------
+
+Building wxGTK or wxMotif completely without configure
+won't ever work, but there is now a new makefile system
+that works without libtool and automake, using only
+configure to create what is needed.
+
+In order to create configure, you need to have the
+GNU autoconf package (version 2.13 or 2.14) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf).
+
+Set WXWIN environment variable to the base directory such
+as ~/wxWindows (this is actually not really needed).
+
+-> type: export WXWIN=~/wxWindows
+-> type: md mybuild
+-> type: cd mybuild
+-> type: ../configure --with-motif
+or type: ../configure --with-gtk
+-> type: make
+-> type: su <type root password>
+-> type: make install
+-> type: ldconfig
+-> type: exit
+
+Call configure with --disable-shared to create a static
+library. Calling "make uninstall" will remove the installed
+library and "make dist" will create a distribution (not
+yet complete).
+
+III) Windows using configure
+----------------------------------------
+
+Take a look at Unix->Windows cross compiling. With minor
+modifications, this should work in Windows if you've got the cygnus
+utilities (bash, GNU make, etc) and either mingw32 or cygwin32 installed.
+See http://www.cygnus.com for these programs, or go straight to their
+ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
+
+Of course, you can also build the library using plain makefiles (see
+section I).
+
+V) MacOS
+----------------------------------------
+
+VI) OS/2
+----------------------------------------
+
+VII) Unix->Windows cross-compiling using configure
+--------------------------------------------------
+
+First you'll need a cross-compiler; linux glibc binaries of mingw32 and
+cygwin32 (both based on egcs) can be found at
+ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Otherwise you can
+compile one yourself. Check the relevant FAQs.
+
+[ A Note about cygwin32 and mingw32: the main difference is that cygwin32
+binaries are always linked against cygwin.dll. This dll encapsulates most
+standard Unix C extensions, which is very handy if you're porting unix
+software to windows. However, wxMSW doesn't need this, so mingw32 is
+preferable if you write portable C(++). ]
+
+You might want to build both Unix and Windows binaries in the same source
+tree; to do this make subdirs for each e.g. unix and win32. If you've
+already build wxWindows in the main dir, do a 'make distclean' there,
+otherwise configure will get confused. (In any case, read the section 'Unix
+using configure' and make sure you're able to build a native wxWindows
+library; cross-compiling errors can be pretty obscure and you'll want to be
+sure that your configure setup is basically sound.)
+
+To cross compile the windows library, do
+-> cd win32
+(or whatever you called it)
+Now run configure. There are two ways to do this
+-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw \
+   --enable-dnd=no --without-odbc
+where --build= should read whatever platform you're building on. Configure
+will notice that build and host platforms differ, and automatically prepend
+i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
+The other way to run configure is by specifying the names of the binaries
+yourself:
+-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
+   DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
+   ../configure --host=i586-mingw32 --with-mingw --enable-dnd=no
+
+(all assuming you're using mingw32)
+Drag'n'drop is disabled because mingw32 lacks (AFAIK) OLE headers.
+
+[ Update: some new mingw32 versions now have a new set of windows header
+files, which apparently can handle ole. Untested at the moment ]
+
+ODBC files don't compile as of 13.10.99 - may be this will be fixed by the
+moment you're reading these lines.
+
+Configure will conclude that shared libraries are out of the question and
+opt for a static one. I haven't looked into DLL creation yet.
+
+Type
+-> make
+and wait, wait, wait. Don't leave the room, because the minute you do there
+will be a compile error :-)
+
+NB: you risk to get quite a few warnings about "ANSI C++ forbids implicit
+    conversion from 'void *'" in all places where va_arg macro is used. This
+    is due to a bug in (some versions of) mingw32 headers which may be
+    corrected by editing the file
+
+    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
+
+    (instead of egcs-2.91.57 you may have something different), searching for
+    the lines
+
+/* Define __gnuc_va_list.  */
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
+typedef char *__gnuc_va_list;
+#else
+typedef void *__gnuc_va_list;
+#endif
+#endif
+
+    and adding "|| defined(_WIN32)" to the list of platforms on which
+    __gnuc_va_list is char *.
+
+If this is successful, you end up with a libwx_msw.a in win32/lib.  Now try
+building the minimal sample:
+
+-> cd samples/minimal
+-> make
+
+and run it with wine, for example (or copy to a Windows box)
+-> wine minimal.exe
+
+If all is well, do an install; from win32
+-> make install
+
+Native and cross-compiled installations can co-exist peacefully
+(as long as their widget sets differ), except for wx-config. You might
+want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
+
+Cross-compiling TODO:
+---------------------
+- resource compiling must be done manually for now (should/can we link the
+default wx resources into libwx_msw.a?) [ No we can't; the linker won't
+link it in... you have to supply an object file ]
+- dynamic libraries
+- static executables are HUGE -- there must be room for improvement.
+
--- a/167
+++ b/167
@@ -1,167 +0,0 @@
-# Top-level Makefile for wxGTK by Wolfram Gloger
-# based on the version for wx-Xt by Martin Sperl
-
-SHELL=/bin/sh
-
-#if DIRS are defind make only executes in these diretories
-all::
-	@if test "x$(DIRS)" = x; then \
-	  for i in src samples utils user; do \
-	    echo "entering directory $$i building $@"; \
-	    (cd $$i; ${MAKE} -k $@); \
-	  done; \
-	else \
-	  for i in $(DIRS) xxx; do \
-	    if test "$$i" != xxx; then \
-	      echo "entering directory $$i building $@"; \
-	      (cd $$i; ${MAKE} -k $@); \
-	    fi; \
-	  done; \
-	fi	    
-
-# what to do if a target is not understood:
-# pass it on to all the children...
-
-.DEFAULT::
-	@if test "x$(DIRS)" = x; then \
-	  for i in src samples utils user; do \
-	    echo "entering directory $$i building $@"; \
-	    (cd $$i; ${MAKE} -k $@); \
-	  done; \
-	else \
-	  for i in $(DIRS) xxx; do \
-	    if test "$$i" != xxx; then \
-	      echo "entering directory $$i building $@"; \
-	      (cd $$i; ${MAKE} -k $@); \
-	    fi; \
-	  done; \
-	fi
-
-src::
-	@echo "entering directory src building all"
-	@cd src; ${MAKE} all
-
-samples::
-	@echo "entering directory samples building all"
-	@cd samples; ${MAKE} all
-
-utils::
-	@echo "entering directory utils building all"
-	@cd utils; ${MAKE} all
-
-user::
-	@echo "entering directory user building all"
-	@cd user; ${MAKE} all
-
-# the following ones recreate all Makefiles.
-
-makefiles:: recreate
-Makefiles:: recreate
-recreate::
-	@src/gtk/setup/general/createall
-
-# the following ones define what needs to be done to distribute the 
-# library and its components
-
-distribute:: distrib
-distrib:: distrib_base distrib_user join_utils join_samples
-
-distrib_samples::
-	@echo "entering directory samples creating distribution files"
-	@(cd samples; ${MAKE} -k distrib)
-
-distrib_user::
-	@echo "entering directory user creating distribution files"
-	@(cd user; ${MAKE} -k distrib)
-
-distrib_utils:: 
-	@echo "entering directory utils creating distribution files"
-	@(cd utils; ${MAKE} -k distrib)
-
-join_utils:: distrib_utils
-	@$(MAKE) join \
-	    BASEDIR=utils \
-	    FILES=`echo distrib/utils/*.tgz `
-
-join_samples:: distrib_samples
-	@$(MAKE) join \
-	    BASEDIR=samples \
-	    FILES=`echo distrib/samples/*.tgz `
-
-join_user:: distrib_user
-	@$(MAKE) join \
-	    BASEDIR=user \
-	    FILES=`echo distrib/user/*.tgz `
-
-join::
-	@# needed are BASEDIR and FILES
-	@if test "x$$BASEDIR" = x; then\
-	  echo "BASEDIR not specified.";\
-	  exit -1;\
-	fi
-	@if test "x$$FILES" != x ; then \
-	  echo "putting all seperate distribution files:";\
-	  echo "$$FILES";\
-	  echo "into distrib/$(BASEDIR).tgz";\
-	  src/gtk/setup/general/jointar $(BASEDIR) $$FILES distrib/$(BASEDIR).tgz; \
-	else \
-	  echo "Nothing to join - deleting..."; \
-	  echo "This may be the case, if you have not specified FILES."\
-	  rm -f distrib/$(BASEDIR).tgz; \
-	fi
-
-distrib_base:: 
-	@if test ! -d distrib ; then mkdir distrib; fi;
-	@if test ! -f system.list ; then \
-	  echo "dummy" > system.list;\
-	fi
-	@(curr=`pwd`; direc=`basename $$curr`;\
-	 (cd ..; \
-	  echo creating distrib/$$direc.tar from the current directory;\
-	  tar -cf /tmp/$$direc.tar \
-	    $$direc/COPYING\
-	    $$direc/INSTALL\
-	    $$direc/Makefile\
-	    $$direc/template.mak\
-	    $$direc/configure\
-	    $$direc/configure.in\
-	    $$direc/config.guess\
-	    $$direc/config.sub\
-	    $$direc/install-sh\
-	    $$direc/user/Makefile \
-	    $$direc/utils/Makefile \
-	    $$direc/samples/Makefile \
-	    ;\
-	  sed "s|^\(.*\)$$|/\1/|g" $$direc/system.list \
-	    | uniq > /tmp/$$direc.list; \
-	  echo "/RCS/" >> /tmp/$$direc.list; \
-	  for each in misc docs wx src setup; do \
-	    tar -uf /tmp/$$direc.tar \
-	      `\
-	       find $$direc/$$each \( -type f -o -type l \) -print \
-	       | fgrep -vf /tmp/$$direc.list \
-	       | grep -v "[~#]$$" \
-	      ` ;\
-	  done; \
-	  echo compressing $$direc.tar to $$direc.tgz;\
-	  gzip -9 -c /tmp/$$direc.tar > $$direc/distrib/$$direc.tgz;\
-	  rm /tmp/$$direc.tar /tmp/$$direc.list;\
-	 )\
-	)
-
-# the following ones are only needed if configure.in has changed
-# and needs to be updated...
-
-config:: configure
-
-configure::
-	@autoconf
-	@cat configure \
-	  | sed "s/config.cache/\$$OSTYPE.config.cache/g" \
-	  | sed "s/config.status/\$$OSTYPE.config.status/g" \
-	  | sed "s/\*\*--/  --/g" \
-	  > configure1
-	@chmod a+x configure1
-	@mv configure1 configure
-
-
--- a/Makefile.in
+++ b/Makefile.in
--- a/Mingw32-gcc295.patches
+++ b/Mingw32-gcc295.patches
@@ -0,0 +1,116 @@
+*** \gcc-inc\basetyps.h Sat Jul 31 16:48:36 1999
+--- basetyps.h Fri Aug 06 11:14:36 1999
+***************
+*** 74,91 ****
+--- 74,97 ----
+   STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
+  }
+  #define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
+
+ #ifndef GUID_DEFINED
+ #define GUID_DEFINED
+  typedef struct _GUID
+  {
+      unsigned long Data1;
+      unsigned short Data2;
+      unsigned short Data3;
+      unsigned char Data4[8];
+  } GUID;
+ #endif /* GUID_DEFINED */
+  typedef GUID *REFGUID;
+  typedef GUID *LPGUID;
+ #ifndef UUID_DEFINED
+ #define UUID_DEFINED
+  typedef GUID UUID;
+ #endif /* UUID_DEFINED */
+  typedef GUID IID;
+  typedef GUID CLSID;
+  typedef CLSID *LPCLSID;
+  typedef IID *LPIID;
+
+
+*** \gcc-inc\oaidl.h Sat Jul 31 16:48:42 1999
+--- oaidl.h Fri Aug 06 13:18:48 1999
+***************
+*** 39,44 ****
+--- 39,53 ----
+  #define IMPLTYPEFLAG_FRESTRICTED 4
+  #define IMPLTYPEFLAG_FDEFAULTVTABLE 8
+
+ #define DISPID_UNKNOWN ( -1 )
+ #define DISPID_VALUE ( 0 )
+ #define DISPID_PROPERTYPUT ( -3 )
+ #define DISPID_NEWENUM ( -4 )
+ #define DISPID_EVALUATE ( -5 )
+ #define DISPID_CONSTRUCTOR ( -6 )
+ #define DISPID_DESTRUCTOR ( -7 )
+ #define DISPID_COLLECT ( -8 )
+
+  typedef interface ITypeLib *LPTYPELIB;
+  typedef interface ICreateTypeInfo *LPCREATETYPEINFO;
+  typedef interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
+***************
+*** 49,54 ****
+--- 58,73 ----
+  typedef interface IDispatch *LPDISPATCH;
+  typedef interface ICreateErrorInfo *LPCREATEERRORINFO;
+
+ extern "C" const IID IID_ITypeLib;
+ extern "C" const IID IID_ICreateTypeInfo;
+ extern "C" const IID IID_ICreateTypeInfo2;
+ extern "C" const IID IID_ICreateTypeLib;
+ extern "C" const IID IID_ICreateTypeLib2;
+ extern "C" const IID IID_ITypeInfo;
+ extern "C" const IID IID_IErrorInfo;
+ extern "C" const IID IID_IDispatch;
+ extern "C" const IID IID_ICreateErrorInfo;
+
+  typedef enum tagSYSKIND {
+   SYS_WIN16,SYS_WIN32,SYS_MAC
+  } SYSKIND;
+***************
+*** 375,382 ****
+   STDMETHOD_(ULONG,Release)(THIS) PURE;
+   STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+   STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+!  STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID)
+PURE;
+!  STDMETHOD(Invoked)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+  };
+
+  #ifdef __cplusplus
+--- 394,401 ----
+   STDMETHOD_(ULONG,Release)(THIS) PURE;
+   STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+   STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+!  STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*)
+PURE;
+!  STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+  };
+
+  #ifdef __cplusplus
+
+
+*** \gcc-inc\objidl.h Sat Jul 31 16:48:42 1999
+--- objidl.h Fri Aug 06 11:00:19 1999
+***************
+*** 627,633 ****
+   STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
+   STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
+   STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
+!  STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC*) PURE;
+   STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
+   STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
+   STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
+--- 627,633 ----
+   STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
+   STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
+   STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
+!  STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC**) PURE;
+   STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
+   STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
+   STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
+
+
+
+
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,52 +0,0 @@
-********************* TODO list for wxWindows 2 ******************************
-
-The items are grouped by platform (generic, MSW, GTK...) and inside by
-subject. The first 2 columns containg the following codes:
-
-Priority classification:                Amount of work expected:
-9       next point release                      q       quick fix
-8       next release                            s       small change
-7       as soon as possible                     l       a little work
-6       soon                                    w       some work
-5       should be included                      b       big change
-4       nice to have                            m       major change
-3       consider including                      ?       don't know how to fix
-2       maybe not                               -       unclassified
-1       probably not
-       unclassified
-
-After the subject the name in brackets indicates the person who is going to do
-it.
-
-=============================== common ========================================
-
-4w wxString optimization (VZ)
-   allocate more memory than needed to avoid reallocation each time when
-   operator+ or += is used.
-
-6b stream classes (VZ)
-
-=============================== generic  ======================================
-
-7s wxTreeCtrl root item (RR)
-   root item is not shown currently (unlike in MSW version)
-
-5w wxImageList
-   it's not implemented currently, to do (assuming that all images have the
-   same size - no resizing should be done to simplify the job)
-
-================================ MSW ==========================================
-
-7w consistent keyboard interface and focus behaviour (VZ)
-   currently, the focus is lost all the time (after a MessageBox, for example)
-   and sometimes TABbing through controls doesn't work
-
-================================ GTK  ==========================================
-
-9m keyboard interface (RR)
-   TAB traversal, Alt-letter accelerators for the controls and accelerators
-   for menu items - TODO.
-
-3b wxTreeCtrl native implementation?
-   GTK has a GtkCTree widget which seems to be quite close to the Windows
-   standard control - what about writing a native wxTreeCtrl based on it?
--- a/autogen.sh
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+autoconf
--- a/config.guess
+++ b/config.guess
@@ -0,0 +1,951 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	cat <<EOF >dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} dummy.s -o dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f dummy.s dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >dummy.c
+	int main (argc, argv) int argc; char **argv; {
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy \
+	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	fi
+        else echo i586-dg-dgux${UNAME_RELEASE}
+        fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i?86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		sed 's/^		//' << EOF >dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+		rm -f dummy.c dummy
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:4)
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=4.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[34678]??:HP-UX:*:*)
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
+              sed 's/^              //' << EOF >dummy.c
+              #include <stdlib.h>
+              #include <unistd.h>
+              
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif 
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+              
+                  switch (cpu) 
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0: 
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits) 
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif 
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+	(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
+	rm -f dummy.c dummy
+	esac
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	sed 's/^	//' << EOF >dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin32
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin32
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
+	esac
+
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us.
+	ld_help_string=`ld --help 2>&1`
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} dummy.s -o dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac	
+
+			objdump --private-headers dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f dummy.s dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >dummy.c <<EOF
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  # Determine whether the default compiler is a.out or elf
+	  cat >dummy.c <<EOF
+#include <features.h>
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+    i?86:DYNIX/ptx:4*:*)
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
+	exit 0 ;;
+    i?86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    i?86:UnixWare:*:*)
+	if /bin/uname -X 2>/dev/null >/dev/null ; then
+	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+	    && UNAME_MACHINE=i586
+	fi
+	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i?86:LynxOS:2.*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+cat >dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+  printf ("vax-dec-bsd\n"); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
+rm -f dummy.c dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1
--- a/install/gtk/config.sub
+++ b/install/gtk/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
 # 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.
@@ -149,19 +149,20 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
-		| arme[lb] | pyramid \
-		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-		| alpha | we32k | ns16k | clipper | i370 | sh \
-		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
-		| pdp11 | mips64el | mips64orion | mips64orionel \
-		| sparc | sparclet | sparclite | sparc64)
+	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 \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
 		basic_machine=$basic_machine-unknown
 		;;
 	# 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[3456]86)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -170,14 +171,18 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
+	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-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -204,9 +209,9 @@ case $basic_machine in
 	amiga | amiga-*)
 		basic_machine=m68k-cbm
 		;;
-	amigados)
+	amigaos | amigados)
 		basic_machine=m68k-cbm
-		os=-amigados
+		os=-amigaos
 		;;
 	amigaunix | amix)
 		basic_machine=m68k-cbm
@@ -345,19 +350,19 @@ case $basic_machine in
 		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3456]86v32)
+	i[34567]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[3456]86v4*)
+	i[34567]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[3456]86v)
+	i[34567]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[3456]86sol2)
+	i[34567]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -389,6 +394,14 @@ case $basic_machine in
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -456,25 +469,23 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5)
-		basic_machine=i586-intel
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
 		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-*)
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-*)
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@@ -558,6 +569,12 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -577,7 +594,7 @@ case $basic_machine in
 		basic_machine=vax-dec
 		os=-vms
 		;;
-       vpp*|vx|vx-*)
+	vpp*|vx|vx-*)
               basic_machine=f301-fujitsu
               ;;
 	vxworks960)
@@ -607,7 +624,11 @@ case $basic_machine in
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
 	mips)
-		basic_machine=mips-mips
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
 		;;
 	romp)
 		basic_machine=romp-ibm
@@ -668,9 +689,12 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
-	-unixware* | svr4*)
+	-svr4*)
 		os=-sysv4
 		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
@@ -681,7 +705,8 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
@@ -689,7 +714,7 @@ case $os in
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -linux-gnu* | -uxpv*)
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-linux*)
@@ -802,6 +827,9 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	*-be)
+		os=-beos
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -815,7 +843,7 @@ case $basic_machine in
 		os=-sysv
 		;;
 	*-cbm)
-		os=-amigados
+		os=-amigaos
 		;;
 	*-dg)
 		os=-dgux
--- a/12971
+++ b/12971
--- a/configure.in
+++ b/configure.in
--- a/distrib/gtk/README.txt
+++ b/distrib/gtk/README.txt
@@ -0,0 +1,376 @@
+wxPython README
+---------------
+
+Welcome to the wonderful world of wxPython!
+
+Once you have installed the wxPython extension module, you can try it
+out by going to the [install dir]\wxPython\demo directory and typing:
+
+    python demo.py
+
+There are also some other sample files there for you to play with and
+learn from.
+
+If you selected to install the documentation then point your browser
+to [install dir]\wxPython\docs\index.htm and you will then be looking
+at the docs for wxWindows.  For the most part you can use the C++ docs
+as most classes and methods are used identically.  Where there are
+differences they are documented with a "wxPython Note."
+
+On Win32 systems the binary self-installer creates a program group on
+the Start Menu that contains a link to running the demo and a link to
+the help file.  To help you save disk space I'm now using Microsoft's
+HTML Help format.  If your system doesn't know what to do with the help
+file, you can install the HTML Help Viewer as part of IE 4+, NT
+Service Pack 4+, or the HTML Workshop at
+
+http://msdn.microsoft.com/workshop/author/htmlhelp/download.asp.
+
+
+
+Getting Help
+------------
+
+Since wxPython is a blending of multiple technologies, help comes from
+multiple sources.  See the http://alldunn.com/wxPython for details on
+various sources of help, but probably the best source is the
+wxPython-users mail list.  You can view the archive or subscribe by
+going to
+
+       http://starship.python.net/mailman/listinfo/wxpython-users
+
+Or you can send mail directly to the list using this address:
+
+       wxpython-users@starship.python.net
+
+----------------------------------------------------------------------
+
+What's new in 2.1b2
+--------------------
+
+Added the missing wxWindow.GetUpdateRegion() method.
+
+Made a new change in SWIG (update your patches everybody) that
+provides a fix for global shadow objects that get an exception in
+their __del__ when their extension module has already been deleted.
+It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
+line 496 if you want to do it by hand.
+
+It is now possible to run through MainLoop more than once in any one
+process.  The cleanup that used to happen as MainLoop completed (and
+prevented it from running again) has been delayed until the wxc module
+is being unloaded by Python.
+
+I fixed a bunch of stuff in the C++ version of wxGrid so it wouldn't
+make wxPython look bad.
+
+wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
+wxWindow.PopupMenuXY to be consistent with some other methods.
+
+Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
+
+You can now provide your own app.MainLoop method.  See
+wxPython/demo/demoMainLoop.py for an example and some explaination.
+
+Got the in-place-edit for the wxTreeCtrl fixed and added some demo
+code to show how to use it.
+
+Put the wxIcon constructor back in for GTK as it now has one that
+matches MSW's.
+
+Added wxGrid.GetCells
+
+Added wxSystemSettings static methods as functions with names like
+wxSystemSettings_GetSystemColour.
+
+Removed wxPyMenu since using menu callbacks have been depreciated in
+wxWindows.  Use wxMenu and events instead.
+
+Added alternate wxBitmap constructor (for MSW only) as
+      wxBitmapFromData(data, type, width, height, depth = 1)
+
+Added a helper function named wxPyTypeCast that can convert shadow
+objects of one type into shadow objects of another type.  (Like doing
+a down-cast.)  See the implementation in wx.py for some docs.
+
+
+
+
+
+What's new in 2.1b1
+--------------------
+Fixed wxComboBox.SetSelection so that it actually sets the selected
+item.  (Actually just removed it from wxPython and let it default to
+wxChoice.SetSelection which was already doing the right thing.)
+
+Added the Printing Framework.
+
+Switched back to using the wxWindows DLL for the pre-built Win32
+version.  The problem was needing to reinitialize static class info
+data after loading each extension module.
+
+Lots of little tweaks and additions to reflect changes to various
+wxWindows classes.
+
+Fixed a bug with attaching objects to tree items.  Actually was a
+symptom of a larger problem with not obtaining the interpreter lock
+when doing any Py_DECREFs.
+
+wxSizer and friends.  Sizers are layout tools that manage a colection
+of windows and sizers.  Different types of sizers apply different
+types of layout algorithms.  You saw it here first!  These classes are
+not even in the wxWindows C++ library yet!
+
+
+
+What's new in 2.0b9
+-------------------
+Bug fix for ListCtrl in test4.py (Was a missing file...  DSM!)
+
+Bug fix for occassional GPF on Win32 systems upon termination of a
+wxPython application.
+
+Added wxListBox.GetSelections returning selections as a Tuple.
+
+Added a wxTreeItemData that is able to hold any Python object and be
+associated with items in a wxTreeCtrl.  Added test pytree.py to show
+this feature off.
+
+Added wxSafeYield function.
+
+OpenGL Canvas can be optionally compiled in to wxPython.
+
+Awesome new Demo Framework for showing off wxPython and for learning
+how it all works.
+
+The pre-built Win32 version is no longer distributing the wxWindows
+DLL.  It is statically linked with the wxWindows library instead.
+
+Added a couple missing items from the docs.
+
+Added wxImage, wxImageHandler, wxPNGHandler, wxJPEGHandler,
+wxGIFHandler and wxBMPHandler.
+
+Added new methods to wxTextCtrl.
+
+Fixed some problems with how SWIG was wrapping some wxTreeCtrl
+methods.
+
+
+
+What's new in 2.0b8
+-------------------
+Support for using Python threads in wxPython apps.
+
+Several missing methods from various classes.
+
+Various bug fixes.
+
+
+
+What's new in 2.0b7
+-------------------
+Added DLG_PNT and DLG_SZE convienience methods to wxWindow class.
+
+Added missing constructor and other methods for wxMenuItem.
+
+
+
+What's new in 2.0b6
+-------------------
+Just a quickie update to fix the self-installer to be compatible with
+Python 1.5.2b2's Registry settings.
+
+
+What's new in 2.0b5
+-------------------
+Well obviously the numbering scheme has changed.  I did this to
+reflect the fact that this truly is the second major revision of
+wxPython, (well the third actually if you count the one I did for
+wxWindows 1.68 and then threw away...) and also that it is associated
+with the 2.0 version of wxWindows.
+
+I have finally started documenting wxPython.  There are several pages
+in the wxWindows documentation tree specifically about wxPython, and I
+have added notes within the class references about where and how wxPython
+diverges from wxWindows.
+
+Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+window handle.  If you can get the window handle into the python code,
+it should just work...  More news on this later.
+
+Added wxImageList, wxToolTip.
+
+Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+wxRegConfig class.
+
+As usual, some bug fixes, tweaks, etc.
+
+
+
+What's new in 0.5.3
+-------------------
+Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+
+Various cleanup, tweaks, minor additions, etc. to maintain
+compatibility with the current wxWindows.
+
+
+
+What's new in 0.5.0
+-------------------
+Changed the import semantics from "from wxPython import *" to "from
+wxPython.wx import *"  This is for people who are worried about
+namespace pollution, they can use "from wxPython import wx" and then
+prefix all the wxPython identifiers with "wx."
+
+Added wxTaskbarIcon for wxMSW.
+
+Made the events work for wxGrid.
+
+Added wxConfig.
+
+Added wxMiniFrame for wxGTK.
+
+Changed many of the args and return values that were pointers to gdi
+objects to references to reflect changes in the wxWindows API.
+
+Other assorted fixes and additions.
+
+
+
+
+What's new in 0.4.2
+-------------------
+
+wxPython on wxGTK works!!!  Both dynamic and static on Linux and
+static on Solaris have been tested.  Many thanks go to Harm
+<H.v.d.Heijden@phys.tue.nl> for his astute detective work on tracking
+down a nasty DECREF bug.  Okay so I have to confess that it was just a
+DSM (Dumb Stupid Mistake) on my part but it was nasty none the less
+because the behavior was so different on different platforms.
+
+The dynamicly loaded module on Solaris is still segfaulting, so it
+must have been a different issue all along...
+
+
+
+What's New in 0.4
+-----------------
+
+1. Worked on wxGTK compatibility.  It is partially working.  On a
+Solaris/Sparc box wxPython is working but only when it is statically
+linked with the Python interpreter.  When built as a dyamically loaded
+extension module, things start acting weirdly and it soon seg-faults.
+And on Linux both the statically linked and the dynamically linked
+version segfault shortly after starting up.
+
+2. Added Toolbar, StatusBar and SplitterWindow classes.
+
+3. Varioius bug fixes, enhancements, etc.
+
+----------------------------------------------------------------------
+
+
+
+Build Instructions
+------------------
+I used SWIG (http://www.swig.org) to create the source code for the
+extension module.  This enabled me to only have to deal with a small
+amount of code and only have to bother with the exceptional issues.
+SWIG takes care of the rest and generates all the repetative code for
+me.  You don't need SWIG to build the extension module as all the
+generated C++ code is included under the src directory.
+
+I added a few minor features to SWIG to control some of the code
+generation.  If you want to playaround with this the patches are in
+wxPython/SWIG.patches and they should be applied to the 1.1p5 version
+of SWIG.  These new patches are documented at
+http://starship.skyport.net/crew/robind/#swig, and they should also
+end up in the 1.2 version of SWIG.
+
+wxPython is organized as a Python package.  This means that the
+directory containing the results of the build process should be a
+subdirectory of a directory on the PYTHONPATH.  (And preferably should
+be named wxPython.)  You can control where the build process will dump
+wxPython by setting the TARGETDIR makefile variable.  The default is
+$(WXWIN)/utils/wxPython, where this README.txt is located.  If you
+leave it here then you should add $(WXWIN)/utils to your PYTHONPATH.
+However, you may prefer to use something that is already on your
+PYTHONPATH, such as the site-packages directory on Unix systems.
+
+
+Win32
+-----
+
+1. Build wxWindows with wxUSE_RESOURCE_LOADING_IN_MSW set to 1 in
+include/wx/msw/setup.h so icons can be loaded dynamically.  While
+there, make sure wxUSE_OWNER_DRAWN is also set to 1.
+
+2. Change into the $(WXWIN)/utils/wxPython/src directory.
+
+3. Edit makefile.vc and specify where your python installation is at.
+You may also want to fiddle with the TARGETDIR variable as described
+above.
+
+4. Run nmake -f makefile.vc
+
+5. If it builds successfully, congratulations!  Move on to the next
+step.  If not then you can try mailing me for help.  Also, I will
+always have a pre-built win32 version of this extension module at
+http://alldunn.com/wxPython/.
+
+6. Change to the $(WXWIN)/utils/wxPython/demo directory.
+
+7. Try executing the demo program.  For example:
+
+    python demo.py
+
+To run it without requiring a console, you can use the pythonw.exe
+version of Python either from the command line or from a shortcut.
+
+
+
+Unix
+----
+0. I configure wxWindows like this, YMMV:
+
+./configure  --with-gtk --disable-shared --enable-threads --disable-unicode
+
+1. Change into the $(WXWIN)/utils/wxPython/src directory.
+
+2. Edit Setup.in and ensure that the flags, directories, and toolkit
+options are correct.  See the above commentary about TARGETDIR.  There
+are a few sample Setup.in.[platform] files provided.
+
+[I've written a Setup which should work in almost all Unix systems,
+ so that the steps 1 and 2 don't have to be done. Robert Roebling. ]
+
+3. Run this command to generate a makefile:
+
+    make -f Makefile.pre.in boot
+
+4. Run these commands to build and then install the wxPython extension
+module:
+
+    make
+    
+4b. Log in as root. [Robert Roebling]    
+
+    make install
+    
+4c. Log out from root. [Robert Roebling]    
+
+
+5. Change to the $(WXWIN)/utils/wxPython/tests directory.
+
+6. Try executing the demo program.  For example:
+
+    python demo.py
+
+----------------
+Robin Dunn
+robin@alldunn.com
+
+
+
--- a/distrib/gtk/Setup
+++ b/distrib/gtk/Setup
@@ -0,0 +1,47 @@
+# This file gives the details of what is needed to build this extension
+# module so the Makefile can be created.
+
+###
+### This file should be created by configure.  Currently it is tweaked by hand.
+###
+
+*shared*
+
+CCC=g++
+WXWIN=~/wxWindows
+GENCODEDIR=gtk
+srcdir=$(GENCODEDIR)
+WX_CONFIG_CFLAGS=`wx-config --cflags` `gtk-config --cflags`
+WX_CONFIG_LIBS=`wx-config --libs`
+
+# Depending on how your Python was built, you may have to set this
+# value to use the C++ driver to link with instead of the default
+# C driver.  For example:
+MY_LDSHARED=$(CCC) -shared $(WX_CONFIG_LIBS)
+
+# Same as above, but for statically linking Python and wxPython together,
+# in other words, if you comment out the *shared* above.  If this is the
+# case then you should ensure that the main() function is Python's, not
+# wxWindows'.  You can rebuild $(WXWIN)/src/gtk/app.cpp with NOMAIN defined
+# to force this...
+MY_LINKCC=$(CCC)
+
+
+## Pick one of these, or set your own.  This is where the
+## wxPython module should be installed.  It should be a
+## subdirectory named wxPython.
+#TARGETDIR=..
+#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
+TARGETDIR=$(BINLIBDEST)/wxPython
+
+wxc	wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
+	mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
+	frames.cpp stattool.cpp windows3.cpp image.cpp misc2.cpp \
+	utils.cpp printfw.cpp libpy.c libptr.c \
+	## comment out the next line to disable wxGLCanvas
+	##_glcanvas.cpp glcanvas.cpp -DWITH_GLCANVAS -lGL -lGLU \
+	-I. $(WX_CONFIG_CFLAGS) -I/usr/local/lib/glib/include \
+	-DSWIG_GLOBAL -DWXP_WITH_THREAD $(SEPARATE) -Xlinker $(WX_CONFIG_LIBS)
+
+
+
--- a/distrib/gtk/copy_src
+++ b/distrib/gtk/copy_src
@@ -0,0 +1,804 @@
+#! /bin/sh
+#
+# This script is creates a dir tree in ~/wxgtk_dist which
+# can then be packed into an archive
+
+echo                               --------
+echo    This script will copy the wxGTK release files into ~/wxgtk_dist
+echo                               --------
+echo
+
+mkdir ~/wxgtk_dist
+mkdir ~/wxgtk_dist/wxGTK
+
+echo Base dir..
+
+cd ../..
+cp wxGTK.spec ~/wxgtk_dist/wxGTK
+cp configure ~/wxgtk_dist/wxGTK
+cp config.sub ~/wxgtk_dist/wxGTK
+cp config.guess ~/wxgtk_dist/wxGTK
+cp install-sh ~/wxgtk_dist/wxGTK
+cp mkinstalldirs ~/wxgtk_dist/wxGTK
+cp wx-config.in ~/wxgtk_dist/wxGTK
+cp setup.h.in ~/wxgtk_dist/wxGTK
+cp Makefile.in ~/wxgtk_dist/wxGTK
+
+echo Docs..
+
+cd docs/gtk
+cp COPYING.LIB ~/wxgtk_dist/wxGTK
+cp install.txt ~/wxgtk_dist/wxGTK/INSTALL.txt
+cp changes.txt ~/wxgtk_dist/wxGTK/CHANGES.txt
+cp licence.txt ~/wxgtk_dist/wxGTK/LICENCE.txt
+cp readme.txt ~/wxgtk_dist/wxGTK/README.txt
+cp todo.txt ~/wxgtk_dist/wxGTK/TODO.txt
+cd ..
+cp symbols.txt ~/wxgtk_dist/wxGTK/SYMBOLS.txt
+cd ..
+
+echo Include dir..
+
+mkdir ~/wxgtk_dist/wxGTK/include
+cd include
+cp Makefile.am ~/wxgtk_dist/wxGTK/include
+cp Makefile.in ~/wxgtk_dist/wxGTK/include
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx
+cd wx
+cp *.h ~/wxgtk_dist/wxGTK/include/wx
+cp *.cpp ~/wxgtk_dist/wxGTK/include/wx
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/generic
+cd generic
+cp *.h ~/wxgtk_dist/wxGTK/include/wx/generic
+cp *.xpm ~/wxgtk_dist/wxGTK/include/wx/generic
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/generic
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/generic
+cd ..
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/html
+cd html
+cp *.h ~/wxgtk_dist/wxGTK/include/wx/html
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/html
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/html
+cd ..
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/unix
+cd unix
+cp *.h ~/wxgtk_dist/wxGTK/include/wx/unix
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/unix
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/unix
+cd ..
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/gtk
+cd gtk
+cp *.h ~/wxgtk_dist/wxGTK/include/wx/gtk
+cp *.xpm ~/wxgtk_dist/wxGTK/include/wx/gtk
+rm ~/wxgtk_dist/wxGTK/include/wx/gtk/setup.h
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/gtk
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/gtk
+cd ..
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/motif
+cd motif
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/motif
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/motif
+cd ..
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/msw
+cd msw
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/msw
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/msw
+cd ..
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/protocol
+cd protocol
+cp *.h ~/wxgtk_dist/wxGTK/include/wx/protocol
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/protocol
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/protocol
+cd ..
+
+cd ../..
+
+echo Misc dir..
+
+mkdir ~/wxgtk_dist/wxGTK/misc
+cd misc
+cp Makefile.am ~/wxgtk_dist/wxGTK/misc
+cp Makefile.in ~/wxgtk_dist/wxGTK/misc
+mkdir ~/wxgtk_dist/wxGTK/misc/afm
+cd afm
+cp *.afm ~/wxgtk_dist/wxGTK/misc/afm
+cp Makefile.am ~/wxgtk_dist/wxGTK/misc/afm
+cp Makefile.in ~/wxgtk_dist/wxGTK/misc/afm
+cd ..
+mkdir ~/wxgtk_dist/wxGTK/misc/gs_afm
+cd gs_afm
+cp *.afm ~/wxgtk_dist/wxGTK/misc/gs_afm
+cp Makefile.am ~/wxgtk_dist/wxGTK/misc/gs_afm
+cp Makefile.in ~/wxgtk_dist/wxGTK/misc/gs_afm
+cd ../..
+
+echo Src dir..
+
+cd src
+mkdir ~/wxgtk_dist/wxGTK/src
+cp Makefile.am ~/wxgtk_dist/wxGTK/src
+cp Makefile.in ~/wxgtk_dist/wxGTK/src
+
+cd gtk
+mkdir ~/wxgtk_dist/wxGTK/src/gtk
+cp Makefile.am ~/wxgtk_dist/wxGTK/src/gtk
+cp Makefile.in ~/wxgtk_dist/wxGTK/src/gtk
+cp *.xbm ~/wxgtk_dist/wxGTK/src/gtk
+cp *.c ~/wxgtk_dist/wxGTK/src/gtk
+cp *.cpp ~/wxgtk_dist/wxGTK/src/gtk
+cd ..
+
+cd msw
+mkdir ~/wxgtk_dist/wxGTK/src/msw
+cp Makefile.am ~/wxgtk_dist/wxGTK/src/msw
+cp Makefile.in ~/wxgtk_dist/wxGTK/src/msw
+cd ..
+
+cd motif
+mkdir ~/wxgtk_dist/wxGTK/src/motif
+cp Makefile.am ~/wxgtk_dist/wxGTK/src/motif
+cp Makefile.in ~/wxgtk_dist/wxGTK/src/motif
+cd ..
+
+cd common
+mkdir ~/wxgtk_dist/wxGTK/src/common
+cp glob.inc ~/wxgtk_dist/wxGTK/src/common
+cp lexer.l ~/wxgtk_dist/wxGTK/src/common
+cp parser.y ~/wxgtk_dist/wxGTK/src/common
+cp extended.c ~/wxgtk_dist/wxGTK/src/common
+cp unzip.* ~/wxgtk_dist/wxGTK/src/common
+cp *.cpp ~/wxgtk_dist/wxGTK/src/common
+cd ..
+
+cd unix
+mkdir ~/wxgtk_dist/wxGTK/src/unix
+cp *.cpp ~/wxgtk_dist/wxGTK/src/unix
+cp *.h ~/wxgtk_dist/wxGTK/src/unix
+cp *.c ~/wxgtk_dist/wxGTK/src/unix
+cd ..
+
+cd html
+mkdir ~/wxgtk_dist/wxGTK/src/html
+cp *.cpp ~/wxgtk_dist/wxGTK/src/html
+cp *.h ~/wxgtk_dist/wxGTK/src/html
+cd bitmaps
+mkdir ~/wxgtk_dist/wxGTK/src/html/bitmaps
+cp *.xpm ~/wxgtk_dist/wxGTK/src/html/bitmaps
+cd ../..
+
+cd generic
+mkdir ~/wxgtk_dist/wxGTK/src/generic
+cp *.cpp ~/wxgtk_dist/wxGTK/src/generic
+cd ..
+
+cd iodbc
+mkdir ~/wxgtk_dist/wxGTK/src/iodbc
+cp * ~/wxgtk_dist/wxGTK/src/iodbc
+cd ..
+
+cd zlib
+mkdir ~/wxgtk_dist/wxGTK/src/zlib
+cp * ~/wxgtk_dist/wxGTK/src/zlib
+cd ..
+
+cd png
+mkdir ~/wxgtk_dist/wxGTK/src/png
+cp * ~/wxgtk_dist/wxGTK/src/png
+cd ..
+
+cd jpeg
+mkdir ~/wxgtk_dist/wxGTK/src/jpeg
+cp * ~/wxgtk_dist/wxGTK/src/jpeg
+cd ../..
+
+echo Utils dir..
+
+cd utils
+mkdir ~/wxgtk_dist/wxGTK/utils
+cp Makefile.am ~/wxgtk_dist/wxGTK/utils
+cp Makefile.in ~/wxgtk_dist/wxGTK/utils
+
+echo wxGLCanvas..
+
+cd glcanvas
+mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas
+cp ./docs/notes.txt ~/wxgtk_dist/wxGTK/utils/glcanvas/NOTES.txt
+
+mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas/gtk
+cp ./gtk/glcanvas.cpp ~/wxgtk_dist/wxGTK/utils/glcanvas/gtk
+cp ./gtk/glcanvas.h ~/wxgtk_dist/wxGTK/utils/glcanvas/gtk
+
+mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas/samples
+mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/cube
+mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
+mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
+
+cd samples/cube
+cp Makefile ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/cube
+cp cube.h ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/cube
+cp cube.cpp ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/cube
+cd ..
+
+cd isosurf
+cp Makefile ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
+cp isosurf.h ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
+cp isosurf.cpp ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
+cp isosurf.dat.gz ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/isosurf
+cd ..
+
+cd penguin
+cp Makefile ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
+cp penguin.h ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
+cp penguin.cpp ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
+cp trackball.h ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
+cp trackball.c ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
+cp lw.h ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
+cp lw.cpp ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
+cp penguin.lwo ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
+cd ../../..
+
+echo DialogEd..
+
+cd dialoged/src
+mkdir ~/wxgtk_dist/wxGTK/utils/dialoged
+cp Makefile ~/wxgtk_dist/wxGTK/utils/dialoged
+cp dialoged.cpp ~/wxgtk_dist/wxGTK/utils/dialoged
+cp dlghndlr.cpp ~/wxgtk_dist/wxGTK/utils/dialoged
+cp edlist.cpp ~/wxgtk_dist/wxGTK/utils/dialoged
+cp edtree.cpp ~/wxgtk_dist/wxGTK/utils/dialoged
+cp reseditr.cpp ~/wxgtk_dist/wxGTK/utils/dialoged
+cp reswrite.cpp ~/wxgtk_dist/wxGTK/utils/dialoged
+cp symbtabl.cpp ~/wxgtk_dist/wxGTK/utils/dialoged
+cp winprop.cpp ~/wxgtk_dist/wxGTK/utils/dialoged
+cp winstyle.cpp ~/wxgtk_dist/wxGTK/utils/dialoged
+cp dialoged.h ~/wxgtk_dist/wxGTK/utils/dialoged
+cp dlghndlr.h ~/wxgtk_dist/wxGTK/utils/dialoged
+cp edlist.h ~/wxgtk_dist/wxGTK/utils/dialoged
+cp edtree.h ~/wxgtk_dist/wxGTK/utils/dialoged
+cp reseditr.h ~/wxgtk_dist/wxGTK/utils/dialoged
+cp symbtabl.h ~/wxgtk_dist/wxGTK/utils/dialoged
+cp winprop.h ~/wxgtk_dist/wxGTK/utils/dialoged
+cp winstyle.h ~/wxgtk_dist/wxGTK/utils/dialoged
+
+cd bitmaps
+mkdir ~/wxgtk_dist/wxGTK/utils/dialoged/bitmaps
+cp *.xpm ~/wxgtk_dist/wxGTK/utils/dialoged/bitmaps
+cd ../../..
+
+echo wxPython..
+
+cd wxPython
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython
+cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/src
+cp ./src/* ~/wxgtk_dist/wxGTK/utils/wxPython/src
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/src/gtk
+cp ./src/gtk/* ~/wxgtk_dist/wxGTK/utils/wxPython/src/gtk
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/lib
+cp ./lib/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/lib
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/lib/sizers
+cp ./lib/sizers/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/lib/sizers
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/*.pyc ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps
+cp ./demo/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps
+
+cd ../..
+
+echo Samples dir..
+
+cd samples
+mkdir ~/wxgtk_dist/wxGTK/samples
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples
+
+echo Minimal sample..
+
+cd minimal
+mkdir ~/wxgtk_dist/wxGTK/samples/minimal
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/minimal
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/minimal
+cp minimal.cpp ~/wxgtk_dist/wxGTK/samples/minimal
+cp mondrian.xpm ~/wxgtk_dist/wxGTK/samples/minimal
+cd ..
+
+echo Bombs sample..
+
+cd bombs
+mkdir ~/wxgtk_dist/wxGTK/samples/bombs
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/bombs
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/bombs
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/bombs
+cp *.h ~/wxgtk_dist/wxGTK/samples/bombs
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/bombs
+cd ..
+
+echo Caret sample..
+
+cd caret
+mkdir ~/wxgtk_dist/wxGTK/samples/caret
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/caret
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/caret
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/caret
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/caret
+cd ..
+
+echo Checklst sample..
+
+cd checklst
+mkdir ~/wxgtk_dist/wxGTK/samples/checklst
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/checklst
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/checklst
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/checklst
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/checklst
+cd ..
+
+echo Config sample..
+
+cd config
+mkdir ~/wxgtk_dist/wxGTK/samples/config
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/config
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/config
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/config
+cd ..
+
+echo Controls sample..
+
+cd controls
+mkdir ~/wxgtk_dist/wxGTK/samples/controls
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/controls
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/controls
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/controls
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/controls
+cd icons
+mkdir ~/wxgtk_dist/wxGTK/samples/controls/icons
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/controls/icons
+cd ../..
+
+echo Db sample..
+
+cd db
+mkdir ~/wxgtk_dist/wxGTK/samples/db
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/db
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/db
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/db
+cp *.h ~/wxgtk_dist/wxGTK/samples/db
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/db
+cd ..
+
+#echo DDE sample..
+#
+#cd dde
+#mkdir ~/wxgtk_dist/wxGTK/samples/dde
+#cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dde
+#cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde
+#cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde
+#cp *.h ~/wxgtk_dist/wxGTK/samples/dde
+#cp *.xpm ~/wxgtk_dist/wxGTK/samples/dde
+#cd ..
+#
+
+echo Dialogs sample..
+
+cd dialogs
+mkdir ~/wxgtk_dist/wxGTK/samples/dialogs
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dialogs
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dialogs
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/dialogs
+cp *.h ~/wxgtk_dist/wxGTK/samples/dialogs
+cd ..
+
+echo DnD sample..
+
+cd dnd
+mkdir ~/wxgtk_dist/wxGTK/samples/dnd
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dnd
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dnd
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/dnd
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/dnd
+cd ..
+
+echo Docview sample..
+
+cd docview
+mkdir ~/wxgtk_dist/wxGTK/samples/docview
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/docview
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/docview
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/docview
+cp *.h ~/wxgtk_dist/wxGTK/samples/docview
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/docview
+cd ..
+
+echo DocvwMDI sample..
+
+cd docvwmdi
+mkdir ~/wxgtk_dist/wxGTK/samples/docvwmdi
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/docvwmdi
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/docvwmdi
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/docvwmdi
+cp *.h ~/wxgtk_dist/wxGTK/samples/docvwmdi
+cd ..
+
+echo Dynamic sample..
+
+cd dynamic
+mkdir ~/wxgtk_dist/wxGTK/samples/dynamic
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dynamic
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dynamic
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/dynamic
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/dynamic
+cd ..
+
+echo Drawing sample..
+
+cd drawing
+mkdir ~/wxgtk_dist/wxGTK/samples/drawing
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/drawing
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/drawing
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/drawing
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/drawing
+cd ..
+
+echo Forty sample..
+
+cd forty
+mkdir ~/wxgtk_dist/wxGTK/samples/forty
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/forty
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/forty
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/forty
+cp *.h ~/wxgtk_dist/wxGTK/samples/forty
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/forty
+cp *.xbm ~/wxgtk_dist/wxGTK/samples/forty
+cd ..
+
+echo Fractal sample..
+
+cd fractal
+mkdir ~/wxgtk_dist/wxGTK/samples/fractal
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/fractal
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/fractal
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/fractal
+cd ..
+
+echo Grid sample..
+
+cd grid
+mkdir ~/wxgtk_dist/wxGTK/samples/grid
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/grid
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/grid
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/grid
+cd ..
+
+echo Help sample..
+
+cd help
+mkdir ~/wxgtk_dist/wxGTK/samples/help
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/help
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/help
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/help
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/help
+cd doc
+mkdir ~/wxgtk_dist/wxGTK/samples/help/doc
+cp * ~/wxgtk_dist/wxGTK/samples/help/doc
+cd ../..
+
+echo HTML samples..
+
+cd html
+mkdir ~/wxgtk_dist/wxGTK/samples/html
+cp Makefile.* ~/wxgtk_dist/wxGTK/samples/html
+
+mkdir ~/wxgtk_dist/wxGTK/samples/html/about
+cp about/Makefile.* ~/wxgtk_dist/wxGTK/samples/html/about
+cp about/about.* ~/wxgtk_dist/wxGTK/samples/html/about
+
+mkdir ~/wxgtk_dist/wxGTK/samples/html/about/data
+cp about/data/*.* ~/wxgtk_dist/wxGTK/samples/html/about/data
+
+mkdir ~/wxgtk_dist/wxGTK/samples/html/help
+cp help/Makefile.* ~/wxgtk_dist/wxGTK/samples/html/help
+cp help/help.* ~/wxgtk_dist/wxGTK/samples/html/help
+
+mkdir ~/wxgtk_dist/wxGTK/samples/html/help/helpfiles
+cp help/helpfiles/*.* ~/wxgtk_dist/wxGTK/samples/html/help/helpfiles
+
+mkdir ~/wxgtk_dist/wxGTK/samples/html/printing
+cp printing/*.* ~/wxgtk_dist/wxGTK/samples/html/printing
+
+mkdir ~/wxgtk_dist/wxGTK/samples/html/test
+cp test/*.* ~/wxgtk_dist/wxGTK/samples/html/test
+
+mkdir ~/wxgtk_dist/wxGTK/samples/html/virtual
+cp virtual/*.* ~/wxgtk_dist/wxGTK/samples/html/virtual
+
+mkdir ~/wxgtk_dist/wxGTK/samples/html/widget
+cp widget/*.* ~/wxgtk_dist/wxGTK/samples/html/widget
+
+mkdir ~/wxgtk_dist/wxGTK/samples/html/zip
+cp zip/*.* ~/wxgtk_dist/wxGTK/samples/html/zip
+cd ..
+
+echo Image sample..
+
+cd image
+mkdir ~/wxgtk_dist/wxGTK/samples/image
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/image
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/image
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/image
+cp horse.png ~/wxgtk_dist/wxGTK/samples/image
+cp horse.gif ~/wxgtk_dist/wxGTK/samples/image
+cp horse.jpg ~/wxgtk_dist/wxGTK/samples/image
+cd ..
+
+echo Internat sample..
+
+cd internat
+mkdir ~/wxgtk_dist/wxGTK/samples/internat
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/internat
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/internat
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/internat
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/internat
+cp readme.txt ~/wxgtk_dist/wxGTK/samples/internat
+cp wxstd.po ~/wxgtk_dist/wxGTK/samples/internat
+cd fr
+mkdir ~/wxgtk_dist/wxGTK/samples/internat/fr
+cp *.?o ~/wxgtk_dist/wxGTK/samples/internat/fr
+cd ../..
+
+echo Layout sample..
+
+cd layout
+mkdir ~/wxgtk_dist/wxGTK/samples/layout
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/layout
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/layout
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/layout
+cp *.h ~/wxgtk_dist/wxGTK/samples/layout
+cd ..
+
+echo Listctrl sample..
+
+cd listctrl
+mkdir ~/wxgtk_dist/wxGTK/samples/listctrl
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/listctrl
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/listctrl
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/listctrl
+cp *.h ~/wxgtk_dist/wxGTK/samples/listctrl
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/listctrl
+cd bitmaps
+mkdir ~/wxgtk_dist/wxGTK/samples/listctrl/bitmaps
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/listctrl/bitmaps
+cd ../..
+
+echo MDI sample..
+
+cd mdi
+mkdir ~/wxgtk_dist/wxGTK/samples/mdi
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/mdi
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/mdi
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/mdi
+cp *.h ~/wxgtk_dist/wxGTK/samples/mdi
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/mdi
+cd bitmaps
+mkdir ~/wxgtk_dist/wxGTK/samples/mdi/bitmaps
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/mdi/bitmaps
+cd ../..
+
+echo Memcheck sample..
+
+cd memcheck
+mkdir ~/wxgtk_dist/wxGTK/samples/memcheck
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/memcheck
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/memcheck
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/memcheck
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/memcheck
+cd ..
+
+echo Minifram sample..
+
+cd minifram
+mkdir ~/wxgtk_dist/wxGTK/samples/minifram
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/minifram
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/minifram
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/minifram
+cp *.h ~/wxgtk_dist/wxGTK/samples/minifram
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/minifram
+cd bitmaps
+mkdir ~/wxgtk_dist/wxGTK/samples/minifram/bitmaps
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/minifram/bitmaps
+cd ../..
+
+echo Notebook sample..
+
+cd notebook
+mkdir ~/wxgtk_dist/wxGTK/samples/notebook
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/notebook
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/notebook
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/notebook
+cp *.h ~/wxgtk_dist/wxGTK/samples/notebook
+cd ..
+
+echo PNG sample..
+
+cd png
+mkdir ~/wxgtk_dist/wxGTK/samples/png
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/png
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/png
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/png
+cp *.h ~/wxgtk_dist/wxGTK/samples/png
+cp *.png ~/wxgtk_dist/wxGTK/samples/png
+cd ..
+
+echo Printing sample..
+
+cd printing
+mkdir ~/wxgtk_dist/wxGTK/samples/printing
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/printing
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/printing
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/printing
+cp *.h ~/wxgtk_dist/wxGTK/samples/printing
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/printing
+cd ..
+
+echo Proplist sample..
+
+cd proplist
+mkdir ~/wxgtk_dist/wxGTK/samples/proplist
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/proplist
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/proplist
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/proplist
+cp *.h ~/wxgtk_dist/wxGTK/samples/proplist
+cd ..
+
+echo Resource sample..
+
+cd resource
+mkdir ~/wxgtk_dist/wxGTK/samples/resource
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/resource
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/resource
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/resource
+cp *.h ~/wxgtk_dist/wxGTK/samples/resource
+cp *.wxr ~/wxgtk_dist/wxGTK/samples/resource
+cd ..
+
+echo Sashtest sample..
+
+cd sashtest
+mkdir ~/wxgtk_dist/wxGTK/samples/sashtest
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/sashtest
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/sashtest
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/sashtest
+cp *.h ~/wxgtk_dist/wxGTK/samples/sashtest
+cd ..
+
+echo Scroll sample..
+
+cd sashtest
+mkdir ~/wxgtk_dist/wxGTK/samples/scroll
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/scroll
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/scroll
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/scroll
+cp *.h ~/wxgtk_dist/wxGTK/samples/scroll
+cd ..
+
+echo Splitter sample..
+
+cd splitter
+mkdir ~/wxgtk_dist/wxGTK/samples/splitter
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/splitter
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/splitter
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/splitter
+cd ..
+
+echo Text sample..
+
+cd text
+mkdir ~/wxgtk_dist/wxGTK/samples/text
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/text
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/text
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/text
+cd ..
+
+echo Thread sample..
+
+cd thread
+mkdir ~/wxgtk_dist/wxGTK/samples/thread
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/thread
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/thread
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/thread
+cd ..
+
+echo Toolbar sample..
+
+cd toolbar
+mkdir ~/wxgtk_dist/wxGTK/samples/toolbar
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/toolbar
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/toolbar
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/toolbar
+cp *.h ~/wxgtk_dist/wxGTK/samples/toolbar
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/toolbar
+cd bitmaps
+mkdir ~/wxgtk_dist/wxGTK/samples/toolbar/bitmaps
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/toolbar/bitmaps
+cd ../..
+
+echo TreeCtrl sample..
+
+cd treectrl
+mkdir ~/wxgtk_dist/wxGTK/samples/treectrl
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/treectrl
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/treectrl
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/treectrl
+cp *.h ~/wxgtk_dist/wxGTK/samples/treectrl
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/treectrl
+cd ..
+
+echo typetest sample..
+
+cd typetest
+mkdir ~/wxgtk_dist/wxGTK/samples/typetest
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/typetest
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/typetest
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/typetest
+cp *.h ~/wxgtk_dist/wxGTK/samples/typetest
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/typetest
+cd ..
+
+echo Validate sample..
+
+cd validate
+mkdir ~/wxgtk_dist/wxGTK/samples/validate
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/validate
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/validate
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/validate
+cp *.h ~/wxgtk_dist/wxGTK/samples/validate
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/validate
+cd ..
+
+echo wxPoem sample..
+
+cd wxpoem
+mkdir ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp *.h ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp wxpoem.dat ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp wxpoem.txt ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp wxpoem.idx ~/wxgtk_dist/wxGTK/samples/wxpoem
+cd ..
+
+echo wxSocket sample..
+
+cd wxsocket
+mkdir ~/wxgtk_dist/wxGTK/samples/wxsocket
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/wxsocket
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/wxsocket
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/wxsocket
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/wxsocket
+cd ../..
+
+echo LOCAL CORRECTCIONS
+
+cd distrib/gtk
+cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython
+cp Setup ~/wxgtk_dist/wxGTK/utils/wxPython/src
+
+cd ~/wxgtk_dist
+tar ch wxGTK | gzip -f9 > wxGTK-2.1.0-b8.tgz
--- a/distrib/motif/copy_src
+++ b/distrib/motif/copy_src
@@ -0,0 +1,690 @@
+#! /bin/sh
+#
+# This script is creates a dir tree in ~/wxmotif_dist which
+# can then be packed into an archive
+
+echo                               --------
+echo    This script will copy the wxMotif release files into ~/wxmotif_dist
+echo                               --------
+echo
+
+mkdir ~/wxmotif_dist
+mkdir ~/wxmotif_dist/wxMotif
+
+echo Base dir..
+
+cd ../..
+cp wxMotif.spec ~/wxmotif_dist/wxMotif
+cp configure ~/wxmotif_dist/wxMotif
+cp config.sub ~/wxmotif_dist/wxMotif
+cp config.guess ~/wxmotif_dist/wxMotif
+cp install-sh ~/wxmotif_dist/wxMotif
+cp mkinstalldirs ~/wxmotif_dist/wxMotif
+cp wx-config.in ~/wxmotif_dist/wxMotif
+cp Makefile.in ~/wxmotif_dist/wxMotif
+
+echo Docs..
+
+cd docs/motif2
+cp COPYING.LIB ~/wxmotif_dist/wxMotif
+cp install.txt ~/wxmotif_dist/wxMotif/INSTALL.txt
+cp changes.txt ~/wxmotif_dist/wxMotif/CHANGES.txt
+cp licence.txt ~/wxmotif_dist/wxMotif/LICENCE.txt
+cp readme.txt ~/wxmotif_dist/wxMotif/README.txt
+cp todo.txt ~/wxmotif_dist/wxMotif/TODO.txt
+cd ..
+cp symbols.txt ~/wxmotif_dist/wxMotif/SYMBOLS.txt
+cd ..
+
+echo Include dir..
+
+mkdir ~/wxmotif_dist/wxMotif/include
+cd include
+cp Makefile.am ~/wxmotif_dist/wxMotif/include
+cp Makefile.in ~/wxmotif_dist/wxMotif/include
+
+mkdir ~/wxmotif_dist/wxMotif/include/wx
+cd wx
+cp *.h ~/wxmotif_dist/wxMotif/include/wx
+cp *.cpp ~/wxmotif_dist/wxMotif/include/wx
+cp Makefile.am ~/wxmotif_dist/wxMotif/include/wx
+cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx
+
+mkdir ~/wxmotif_dist/wxMotif/include/wx/generic
+cd generic
+cp *.h ~/wxmotif_dist/wxMotif/include/wx/generic
+cp *.xpm ~/wxmotif_dist/wxMotif/include/wx/generic
+cp Makefile.am ~/wxmotif_dist/wxMotif/include/wx/generic
+cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx/generic
+cd ..
+
+mkdir ~/wxmotif_dist/wxMotif/include/wx/html
+cd html
+cp *.h ~/wxmotif_dist/wxMotif/include/wx/html
+cp Makefile.am ~/wxmotif_dist/wxMotif/include/wx/html
+cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx/html
+cd ..
+
+mkdir ~/wxmotif_dist/wxMotif/include/wx/unix
+cd unix
+cp *.h ~/wxmotif_dist/wxMotif/include/wx/unix
+cp Makefile.am ~/wxmotif_dist/wxMotif/include/wx/unix
+cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx/unix
+cd ..
+
+mkdir ~/wxmotif_dist/wxMotif/include/wx/msw
+cd msw
+cp Makefile.am ~/wxmotif_dist/wxMotif/include/wx/msw
+cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx/msw
+cd ..
+
+mkdir ~/wxmotif_dist/wxMotif/include/wx/motif
+cd motif
+cp *.h ~/wxmotif_dist/wxMotif/include/wx/motif
+rm ~/wxmotif_dist/wxMotif/include/wx/motif/setup.h
+cp Makefile.am ~/wxmotif_dist/wxMotif/include/wx/motif
+cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx/motif
+cd ..
+
+mkdir ~/wxmotif_dist/wxMotif/include/wx/gtk
+cd gtk
+cp Makefile.am ~/wxmotif_dist/wxMotif/include/wx/gtk
+cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx/gtk
+cd ..
+
+mkdir ~/wxmotif_dist/wxMotif/include/wx/protocol
+cd protocol
+cp *.h ~/wxmotif_dist/wxMotif/include/wx/protocol
+cp Makefile.am ~/wxmotif_dist/wxMotif/include/wx/protocol
+cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx/protocol
+cd ..
+
+cd ../..
+
+echo Misc dir..
+
+mkdir ~/wxmotif_dist/wxMotif/misc
+cd misc
+cp Makefile.am ~/wxmotif_dist/wxMotif/misc
+cp Makefile.in ~/wxmotif_dist/wxMotif/misc
+mkdir ~/wxmotif_dist/wxMotif/misc/afm
+cd afm
+cp *.afm ~/wxmotif_dist/wxMotif/misc/afm
+cp Makefile.am ~/wxmotif_dist/wxMotif/misc/afm
+cp Makefile.in ~/wxmotif_dist/wxMotif/misc/afm
+cd ..
+mkdir ~/wxmotif_dist/wxMotif/misc/gs_afm
+cd gs_afm
+cp *.afm ~/wxmotif_dist/wxMotif/misc/gs_afm
+cp Makefile.am ~/wxmotif_dist/wxMotif/misc/gs_afm
+cp Makefile.in ~/wxmotif_dist/wxMotif/misc/gs_afm
+cd ../..
+
+echo Src dir..
+
+cd src
+mkdir ~/wxmotif_dist/wxMotif/src
+cp Makefile.am ~/wxmotif_dist/wxMotif/src
+cp Makefile.in ~/wxmotif_dist/wxMotif/src
+
+cd motif
+mkdir ~/wxmotif_dist/wxMotif/src/motif
+cp Makefile.am ~/wxmotif_dist/wxMotif/src/motif
+cp Makefile.in ~/wxmotif_dist/wxMotif/src/motif
+cp *.xbm ~/wxmotif_dist/wxMotif/src/motif
+cp *.c ~/wxmotif_dist/wxMotif/src/motif
+cp *.cpp ~/wxmotif_dist/wxMotif/src/motif
+cd ..
+
+cd common
+mkdir ~/wxmotif_dist/wxMotif/src/common
+cp glob.inc ~/wxmotif_dist/wxMotif/src/common
+cp lexer.l ~/wxmotif_dist/wxMotif/src/common
+cp parser.y ~/wxmotif_dist/wxMotif/src/common
+cp extended.c ~/wxmotif_dist/wxMotif/src/common
+cp unzip.* ~/wxmotif_dist/wxMotif/src/common
+cp *.cpp ~/wxmotif_dist/wxMotif/src/common
+cd ..
+
+cd html
+mkdir ~/wxmotif_dist/wxMotif/src/html
+cp *.cpp ~/wxmotif_dist/wxMotif/src/html
+cp *.h ~/wxmotif_dist/wxMotif/src/html
+cd bitmaps
+mkdir ~/wxmotif_dist/wxMotif/src/html/bitmaps
+cp *.xpm ~/wxmotif_dist/wxMotif/src/html/bitmaps
+cd ../..
+
+cd unix
+mkdir ~/wxmotif_dist/wxMotif/src/unix
+cp *.cpp ~/wxmotif_dist/wxMotif/src/unix
+cp *.h ~/wxmotif_dist/wxMotif/src/unix
+cp *.c ~/wxmotif_dist/wxMotif/src/unix
+cd ..
+
+cd generic
+mkdir ~/wxmotif_dist/wxMotif/src/generic
+cp *.cpp ~/wxmotif_dist/wxMotif/src/generic
+cd ..
+
+cd iodbc
+mkdir ~/wxmotif_dist/wxMotif/src/iodbc
+cp * ~/wxmotif_dist/wxMotif/src/iodbc
+cd ..
+
+cd zlib
+mkdir ~/wxmotif_dist/wxMotif/src/zlib
+cp * ~/wxmotif_dist/wxMotif/src/zlib
+cd ..
+
+cd png
+mkdir ~/wxmotif_dist/wxMotif/src/png
+cp * ~/wxmotif_dist/wxMotif/src/png
+cd ..
+
+cd jpeg
+mkdir ~/wxmotif_dist/wxMotif/src/jpeg
+cp * ~/wxmotif_dist/wxMotif/src/jpeg
+cd ..
+
+cd ..
+
+echo Utils dir..
+
+cd utils
+mkdir ~/wxmotif_dist/wxMotif/utils
+cp Makefile.am ~/wxmotif_dist/wxMotif/utils
+cp Makefile.in ~/wxmotif_dist/wxMotif/utils
+cd ..
+
+echo Samples dir..
+
+cd samples
+mkdir ~/wxmotif_dist/wxMotif/samples
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples
+
+echo Minimal sample..
+
+cd minimal
+mkdir ~/wxmotif_dist/wxMotif/samples/minimal
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/minimal
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/minimal
+cp minimal.cpp ~/wxmotif_dist/wxMotif/samples/minimal
+cp mondrian.xpm ~/wxmotif_dist/wxMotif/samples/minimal
+cd ..
+
+echo Bombs sample..
+
+cd bombs
+mkdir ~/wxmotif_dist/wxMotif/samples/bombs
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/bombs
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/bombs
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/bombs
+cp *.h ~/wxmotif_dist/wxMotif/samples/bombs
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/bombs
+cd ..
+
+echo Caret sample..
+
+cd caret
+mkdir ~/wxmotif_dist/wxMotif/samples/caret
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/caret
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/caret
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/caret
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/caret
+cd ..
+
+echo Checklst sample..
+
+cd checklst
+mkdir ~/wxmotif_dist/wxMotif/samples/checklst
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/checklst
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/checklst
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/checklst
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/checklst
+cd ..
+
+echo Config sample..
+
+cd config
+mkdir ~/wxmotif_dist/wxMotif/samples/config
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/config
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/config
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/config
+cd ..
+
+echo Controls sample..
+
+cd controls
+mkdir ~/wxmotif_dist/wxMotif/samples/controls
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/controls
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/controls
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/controls
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/controls
+cd icons
+mkdir ~/wxmotif_dist/wxMotif/samples/controls/icons
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/controls/icons
+cd ../..
+
+echo Db sample..
+
+cd db
+mkdir ~/wxmotif_dist/wxMotif/samples/db
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/db
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/db
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/db
+cp *.h ~/wxmotif_dist/wxMotif/samples/db
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/db
+cd ..
+
+echo Dialogs sample..
+
+cd dialogs
+mkdir ~/wxmotif_dist/wxMotif/samples/dialogs
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/dialogs
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/dialogs
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/dialogs
+cp *.h ~/wxmotif_dist/wxMotif/samples/dialogs
+cd ..
+
+echo DnD sample..
+
+cd dnd
+mkdir ~/wxmotif_dist/wxMotif/samples/dnd
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/dnd
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/dnd
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/dnd
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/dnd
+cd ..
+
+echo Docview sample..
+
+cd docview
+mkdir ~/wxmotif_dist/wxMotif/samples/docview
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/docview
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/docview
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/docview
+cp *.h ~/wxmotif_dist/wxMotif/samples/docview
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/docview
+cd ..
+
+echo DocvwMDI sample..
+
+cd docvwmdi
+mkdir ~/wxmotif_dist/wxMotif/samples/docvwmdi
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/docvwmdi
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/docvwmdi
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/docvwmdi
+cp *.h ~/wxmotif_dist/wxMotif/samples/docvwmdi
+cd ..
+
+echo Dynamic sample..
+
+cd dynamic
+mkdir ~/wxmotif_dist/wxMotif/samples/dynamic
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/dynamic
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/dynamic
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/dynamic
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/dynamic
+cd ..
+
+echo Drawing sample..
+
+cd drawing
+mkdir ~/wxmotif_dist/wxMotif/samples/drawing
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/drawing
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/drawing
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/drawing
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/drawing
+cd ..
+
+echo Forty sample..
+
+cd forty
+mkdir ~/wxmotif_dist/wxMotif/samples/forty
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/forty
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/forty
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/forty
+cp *.h ~/wxmotif_dist/wxMotif/samples/forty
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/forty
+cp *.xbm ~/wxmotif_dist/wxMotif/samples/forty
+cd ..
+
+echo Fractal sample..
+
+cd fractal
+mkdir ~/wxmotif_dist/wxMotif/samples/fractal
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/fractal
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/fractal
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/fractal
+cd ..
+
+echo Grid sample..
+
+cd grid
+mkdir ~/wxmotif_dist/wxMotif/samples/grid
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/grid
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/grid
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/grid
+cd ..
+
+echo Help sample..
+
+cd help
+mkdir ~/wxmotif_dist/wxMotif/samples/help
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/help
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/help
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/help
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/help
+cd doc
+mkdir ~/wxmotif_dist/wxMotif/samples/help/doc
+cp * ~/wxmotif_dist/wxMotif/samples/help/doc
+cd ../..
+
+echo HTML samples..
+
+cd html
+mkdir ~/wxmotif_dist/wxMotif/samples/html
+cp Makefile.* ~/wxmotif_dist/wxMotif/samples/html
+
+mkdir ~/wxmotif_dist/wxMotif/samples/html/about
+cp about/Makefile.* ~/wxmotif_dist/wxMotif/samples/html/about
+cp about/about.* ~/wxmotif_dist/wxMotif/samples/html/about
+
+mkdir ~/wxmotif_dist/wxMotif/samples/html/about/data
+cp about/data/*.* ~/wxmotif_dist/wxMotif/samples/html/about/data
+
+mkdir ~/wxmotif_dist/wxMotif/samples/html/help
+cp help/Makefile.* ~/wxmotif_dist/wxMotif/samples/html/help
+cp help/help.* ~/wxmotif_dist/wxMotif/samples/html/help
+
+mkdir ~/wxmotif_dist/wxMotif/samples/html/help/helpfiles
+cp help/helpfiles/*.* ~/wxmotif_dist/wxMotif/samples/html/help/helpfiles
+
+mkdir ~/wxmotif_dist/wxMotif/samples/html/printing
+cp printing/*.* ~/wxmotif_dist/wxMotif/samples/html/printing
+
+mkdir ~/wxmotif_dist/wxMotif/samples/html/test
+cp test/*.* ~/wxmotif_dist/wxMotif/samples/html/test
+
+mkdir ~/wxmotif_dist/wxMotif/samples/html/virtual
+cp virtual/*.* ~/wxgtk_dist/wxGTK/samples/html/virtual
+
+mkdir ~/wxmotif_dist/wxMotif/samples/html/widget
+cp widget/*.* ~/wxmotif_dist/wxMotif/samples/html/widget
+
+mkdir ~/wxmotif_dist/wxMotif/samples/html/zip
+cp zip/*.* ~/wxmotif_dist/wxMotif/samples/html/zip
+cd ..
+
+echo Image sample..
+
+cd image
+mkdir ~/wxmotif_dist/wxMotif/samples/image
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/image
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/image
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/image
+cp horse.png ~/wxmotif_dist/wxMotif/samples/image
+cp horse.gif ~/wxmotif_dist/wxMotif/samples/image
+cp horse.jpg ~/wxmotif_dist/wxMotif/samples/image
+cd ..
+
+echo Internat sample..
+
+cd internat
+mkdir ~/wxmotif_dist/wxMotif/samples/internat
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/internat
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/internat
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/internat
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/internat
+cp readme.txt ~/wxmotif_dist/wxMotif/samples/internat
+cp wxstd.po ~/wxmotif_dist/wxMotif/samples/internat
+cd fr
+mkdir ~/wxmotif_dist/wxMotif/samples/internat/fr
+cp *.?o ~/wxmotif_dist/wxMotif/samples/internat/fr
+cd ../..
+
+echo Layout sample..
+
+cd layout
+mkdir ~/wxmotif_dist/wxMotif/samples/layout
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/layout
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/layout
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/layout
+cp *.h ~/wxmotif_dist/wxMotif/samples/layout
+cd ..
+
+echo Listctrl sample..
+
+cd listctrl
+mkdir ~/wxmotif_dist/wxMotif/samples/listctrl
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/listctrl
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/listctrl
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/listctrl
+cp *.h ~/wxmotif_dist/wxMotif/samples/listctrl
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/listctrl
+cd bitmaps
+mkdir ~/wxmotif_dist/wxMotif/samples/listctrl/bitmaps
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/listctrl/bitmaps
+cd ../..
+
+echo MDI sample..
+
+cd mdi
+mkdir ~/wxmotif_dist/wxMotif/samples/mdi
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/mdi
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/mdi
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/mdi
+cp *.h ~/wxmotif_dist/wxMotif/samples/mdi
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/mdi
+cd bitmaps
+mkdir ~/wxmotif_dist/wxMotif/samples/mdi/bitmaps
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/mdi/bitmaps
+cd ../..
+
+echo Memcheck sample..
+
+cd memcheck
+mkdir ~/wxmotif_dist/wxMotif/samples/memcheck
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/memcheck
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/memcheck
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/memcheck
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/memcheck
+cd ..
+
+echo Minifram sample..
+
+cd minifram
+mkdir ~/wxmotif_dist/wxMotif/samples/minifram
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/minifram
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/minifram
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/minifram
+cp *.h ~/wxmotif_dist/wxMotif/samples/minifram
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/minifram
+cd bitmaps
+mkdir ~/wxmotif_dist/wxMotif/samples/minifram/bitmaps
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/minifram/bitmaps
+cd ../..
+
+echo Notebook sample..
+
+cd notebook
+mkdir ~/wxmotif_dist/wxMotif/samples/notebook
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/notebook
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/notebook
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/notebook
+cp *.h ~/wxmotif_dist/wxMotif/samples/notebook
+cd ..
+
+echo PNG sample..
+
+cd png
+mkdir ~/wxmotif_dist/wxMotif/samples/png
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/png
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/png
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/png
+cp *.h ~/wxmotif_dist/wxMotif/samples/png
+cp *.png ~/wxmotif_dist/wxMotif/samples/png
+cd ..
+
+echo Printing sample..
+
+cd printing
+mkdir ~/wxmotif_dist/wxMotif/samples/printing
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/printing
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/printing
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/printing
+cp *.h ~/wxmotif_dist/wxMotif/samples/printing
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/printing
+cd ..
+
+echo Proplist sample..
+
+cd proplist
+mkdir ~/wxmotif_dist/wxMotif/samples/proplist
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/proplist
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/proplist
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/proplist
+cp *.h ~/wxmotif_dist/wxMotif/samples/proplist
+cd ..
+
+echo Resource sample..
+
+cd resource
+mkdir ~/wxmotif_dist/wxMotif/samples/resource
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/resource
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/resource
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/resource
+cp *.h ~/wxmotif_dist/wxMotif/samples/resource
+cp *.wxr ~/wxmotif_dist/wxMotif/samples/resource
+cd ..
+
+echo Sashtest sample..
+
+cd sashtest
+mkdir ~/wxmotif_dist/wxMotif/samples/sashtest
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/sashtest
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/sashtest
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/sashtest
+cp *.h ~/wxmotif_dist/wxMotif/samples/sashtest
+cd ..
+
+echo Scroll sample..
+
+cd sashtest
+mkdir ~/wxmotif_dist/wxMotif/samples/scroll
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/scroll
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/scroll
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/scroll
+cp *.h ~/wxmotif_dist/wxMotif/samples/scroll
+cd ..
+
+echo Splitter sample..
+
+cd splitter
+mkdir ~/wxmotif_dist/wxMotif/samples/splitter
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/splitter
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/splitter
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/splitter
+cd ..
+
+cd tab
+mkdir ~/wxmotif_dist/wxMotif/samples/tab
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/tab
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/tab
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/tab
+cp *.h ~/wxmotif_dist/wxMotif/samples/tab
+cd ..
+
+echo Text sample..
+
+cd text
+mkdir ~/wxmotif_dist/wxMotif/samples/text
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/text
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/text
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/text
+cd ..
+
+echo Thread sample..
+
+cd thread
+mkdir ~/wxmotif_dist/wxMotif/samples/thread
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/thread
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/thread
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/thread
+cd ..
+
+echo Toolbar sample..
+
+cd toolbar
+mkdir ~/wxmotif_dist/wxMotif/samples/toolbar
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/toolbar
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/toolbar
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/toolbar
+cp *.h ~/wxmotif_dist/wxMotif/samples/toolbar
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/toolbar
+cd bitmaps
+mkdir ~/wxmotif_dist/wxMotif/samples/toolbar/bitmaps
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/toolbar/bitmaps
+cd ../..
+
+echo TreeCtrl sample..
+
+cd treectrl
+mkdir ~/wxmotif_dist/wxMotif/samples/treectrl
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/treectrl
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/treectrl
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/treectrl
+cp *.h ~/wxmotif_dist/wxMotif/samples/treectrl
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/treectrl
+cd ..
+
+echo typetest sample..
+
+cd typetest
+mkdir ~/wxmotif_dist/wxMotif/samples/typetest
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/typetest
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/typetest
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/typetest
+cp *.h ~/wxmotif_dist/wxMotif/samples/typetest
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/typetest
+cd ..
+
+echo Validate sample..
+
+cd validate
+mkdir ~/wxmotif_dist/wxMotif/samples/validate
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/validate
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/validate
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/validate
+cp *.h ~/wxmotif_dist/wxMotif/samples/validate
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/validate
+cd ..
+
+echo wxPoem sample..
+
+cd wxpoem
+mkdir ~/wxmotif_dist/wxMotif/samples/wxpoem
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/wxpoem
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/wxpoem
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/wxpoem
+cp *.h ~/wxmotif_dist/wxMotif/samples/wxpoem
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/wxpoem
+cp wxpoem.dat ~/wxmotif_dist/wxMotif/samples/wxpoem
+cp wxpoem.txt ~/wxmotif_dist/wxMotif/samples/wxpoem
+cp wxpoem.idx ~/wxmotif_dist/wxMotif/samples/wxpoem
+cd ..
+
+echo wxSocket sample..
+
+cd wxsocket
+mkdir ~/wxmotif_dist/wxMotif/samples/wxsocket
+cp Makefile.am ~/wxmotif_dist/wxMotif/samples/wxsocket
+cp Makefile.in ~/wxmotif_dist/wxMotif/samples/wxsocket
+cp *.cpp ~/wxmotif_dist/wxMotif/samples/wxsocket
+cp *.xpm ~/wxmotif_dist/wxMotif/samples/wxsocket
+cd ../..
+
+cd ~/wxmotif_dist
+tar ch wxMotif | gzip -f9 > wxMotif-2.1.0-b8.tgz
--- a/distrib/msw/bc.rsp
+++ b/distrib/msw/bc.rsp
@@ -0,0 +1,2 @@
+src/bc32.ide
+samples/bc32.ide
--- a/distrib/msw/copy_src.bat
+++ b/distrib/msw/copy_src.bat
@@ -0,0 +1,736 @@
+echo                               --------
+echo    This script will copy the wxMSW release files into \wxmsw_dist
+echo                               --------
+echo                    
+
+md \wxmsw_dist
+md \wxmsw_dist\wxMSW
+
+echo Base dir..
+
+cd ..\..
+
+echo Lib..
+
+cd lib
+md \wxmsw_dist\wxMSW\lib
+copy dummy \wxmsw_dist\wxMSW\lib
+cd ..
+
+echo Locale..
+
+cd locale
+md \wxmsw_dist\wxMSW\locale
+copy *.?? \wxmsw_dist\wxMSW\locale
+cd ..
+
+echo Docs..
+
+cd docs\wine
+copy COPYING.LIB \wxmsw_dist\wxMSW
+copy licence.txt \wxmsw_dist\wxMSW\LICENCE.txt
+cd ..\msw
+copy install.txt \wxmsw_dist\wxMSW\INSTALL.txt
+copy readme.txt \wxmsw_dist\wxMSW\README.txt
+copy todo.txt \wxmsw_dist\wxMSW\TODO.txt
+cd ..
+copy symbols.txt \wxmsw_dist\wxMSW\SYMBOLS.txt
+cd ..
+echo Include dir..
+
+md \wxmsw_dist\wxMSW\include
+cd include
+copy wx_*.* \wxmsw_dist\wxMSW\include
+
+md \wxmsw_dist\wxMSW\include\wx
+cd wx
+copy *.h \wxmsw_dist\wxMSW\include\wx
+copy *.cpp \wxmsw_dist\wxMSW\include\wx
+
+md \wxmsw_dist\wxMSW\include\wx\generic
+cd generic
+copy *.h \wxmsw_dist\wxMSW\include\wx\generic
+cd ..
+
+md \wxmsw_dist\wxMSW\include\wx\html
+cd html
+copy *.h \wxmsw_dist\wxMSW\include\wx\html
+md \wxmsw_dist\wxMSW\include\wx\html\msw
+cd msw
+copy *.* \wxmsw_dist\wxMSW\include\wx\html\msw
+cd ..\..
+
+
+md \wxmsw_dist\wxMSW\include\wx\msw
+cd msw
+copy *.* \wxmsw_dist\wxMSW\include\wx\msw
+rem del \wxmsw_dist\wxMSW\include\wx\msw\setup.h
+del \wxmsw_dist\wxMSW\include\wx\msw\Makefile.am
+del \wxmsw_dist\wxMSW\include\wx\msw\Makefile.in
+md \wxmsw_dist\wxMSW\include\wx\msw\gnuwin32
+cd gnuwin32
+copy *.h \wxmsw_dist\wxMSW\include\wx\msw\gnuwin32
+cd ..
+md \wxmsw_dist\wxMSW\include\wx\msw\ole
+cd ole
+copy *.h \wxmsw_dist\wxMSW\include\wx\msw\ole
+cd ..
+cd ctl3d
+copy *.h \wxmsw_dist\wxMSW\include\wx\msw\ctl3d
+cd ..
+cd ..
+
+md \wxmsw_dist\wxMSW\include\wx\protocol
+cd protocol
+copy *.h \wxmsw_dist\wxMSW\include\wx\protocol
+cd ..
+
+cd ..\..
+
+echo Src dir..
+
+cd src
+md \wxmsw_dist\wxMSW\src
+copy *.* \wxmsw_dist\wxMSW\src
+del Makefile.am \wxmsw_dist\wxMSW\src\Makefile.am
+del Makefile.in \wxmsw_dist\wxMSW\src\Makefile.in
+
+cd msw
+md \wxmsw_dist\wxMSW\src\msw
+md \wxmsw_dist\wxMSW\src\msw\ole
+copy ole\*.cpp \wxmsw_dist\wxMSW\src\msw\ole
+copy *.cpp \wxmsw_dist\wxMSW\src\msw
+copy *.c \wxmsw_dist\wxMSW\src\msw
+copy *.def \wxmsw_dist\wxMSW\src\msw
+copy makefile.* \wxmsw_dist\wxMSW\src\msw
+del Makefile.am \wxmsw_dist\wxMSW\src\msw\Makefile.am
+del Makefile.in \wxmsw_dist\wxMSW\src\msw\Makefile.in
+cd ..
+
+cd common
+md \wxmsw_dist\wxMSW\src\common
+copy glob.inc \wxmsw_dist\wxMSW\src\common
+copy lexer.l \wxmsw_dist\wxMSW\src\common
+copy parser.y \wxmsw_dist\wxMSW\src\common
+copy *.c \wxmsw_dist\wxMSW\src\common
+copy *.h \wxmsw_dist\wxMSW\src\common
+copy *.cpp \wxmsw_dist\wxMSW\src\common
+cd ..
+
+cd html
+md \wxmsw_dist\wxMSW\src\html
+copy *.cpp \wxmsw_dist\wxMSW\src\html
+copy *.h \wxmsw_dist\wxMSW\src\html
+cd ..
+
+cd generic
+md \wxmsw_dist\wxMSW\src\generic
+copy *.cpp \wxmsw_dist\wxMSW\src\generic
+cd ..
+
+cd zlib
+md \wxmsw_dist\wxMSW\src\zlib
+copy *.* \wxmsw_dist\wxMSW\src\zlib
+cd ..
+
+cd png
+md \wxmsw_dist\wxMSW\src\png
+copy *.* \wxmsw_dist\wxMSW\src\png
+cd ..
+
+cd jpeg
+md \wxmsw_dist\wxMSW\src\jpeg
+copy *.* \wxmsw_dist\wxMSW\src\jpeg
+cd ..
+
+cd xpm
+md \wxmsw_dist\wxMSW\src\xpm
+copy *.* \wxmsw_dist\wxMSW\src\xpm
+cd ..
+
+cd ..
+
+echo Utils dir..
+
+cd utils
+md \wxmsw_dist\wxMSW\utils
+
+echo wxGLCanvas..
+
+cd glcanvas
+md \wxmsw_dist\wxMSW\utils\glcanvas
+copy .\docs\notes.txt \wxmsw_dist\wxMSW\utils\glcanvas\NOTES.txt
+
+md \wxmsw_dist\wxMSW\utils\glcanvas\win
+copy .\win\glcanvas.cpp \wxmsw_dist\wxMSW\utils\glcanvas\win
+copy .\win\glcanvas.h \wxmsw_dist\wxMSW\utils\glcanvas\win
+copy .\win\makefile.* \wxmsw_dist\wxMSW\utils\glcanvas\win
+
+md \wxmsw_dist\wxMSW\utils\glcanvas\samples
+md \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube
+md \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf
+md \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+
+cd samples\cube
+copy Makefile.* \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube
+copy cube.rc \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube
+copy cube.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube
+copy cube.cpp \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube
+copy mondrian.ico \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube
+cd ..
+
+cd isosurf
+copy Makefile.* \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf
+copy isosurf.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf
+copy isosurf.rc \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf
+copy isosurf.cpp \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf
+copy isosurf.dat.gz \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf
+copy mondrian.ico \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf
+cd ..
+
+cd penguin
+copy Makefile.* \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+copy penguin.rc \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+copy penguin.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+copy penguin.cpp \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+copy trackball.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+copy trackball.c \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+copy lw.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+copy lw.cpp \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+copy penguin.lwo \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+copy mondrian.ico \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin
+cd ..\..\..
+
+echo DialogEd..
+
+cd dialoged\src
+md \wxmsw_dist\wxMSW\utils\dialoged
+md \wxmsw_dist\wxMSW\utils\dialoged\src
+copy Makefile.* \wxmsw_dist\wxMSW\utils\dialoged\src
+copy dialoged.def \wxmsw_dist\wxMSW\utils\dialoged\src
+copy dialoged.rc \wxmsw_dist\wxMSW\utils\dialoged\src
+copy dialoged.ico \wxmsw_dist\wxMSW\utils\dialoged\src
+copy dialoged.cpp \wxmsw_dist\wxMSW\utils\dialoged\src
+copy dlghndlr.cpp \wxmsw_dist\wxMSW\utils\dialoged\src
+copy edlist.cpp \wxmsw_dist\wxMSW\utils\dialoged\src
+copy edtree.cpp \wxmsw_dist\wxMSW\utils\dialoged\src
+copy reseditr.cpp \wxmsw_dist\wxMSW\utils\dialoged\src
+copy reswrite.cpp \wxmsw_dist\wxMSW\utils\dialoged\src
+copy symbtabl.cpp \wxmsw_dist\wxMSW\utils\dialoged\src
+copy winprop.cpp \wxmsw_dist\wxMSW\utils\dialoged\src
+copy winstyle.cpp \wxmsw_dist\wxMSW\utils\dialoged\src
+copy dialoged.h \wxmsw_dist\wxMSW\utils\dialoged\src
+copy dlghndlr.h \wxmsw_dist\wxMSW\utils\dialoged\src
+copy edlist.h \wxmsw_dist\wxMSW\utils\dialoged\src
+copy edtree.h \wxmsw_dist\wxMSW\utils\dialoged\src
+copy reseditr.h \wxmsw_dist\wxMSW\utils\dialoged\src
+copy symbtabl.h \wxmsw_dist\wxMSW\utils\dialoged\src
+copy winprop.h \wxmsw_dist\wxMSW\utils\dialoged\src
+copy winstyle.h \wxmsw_dist\wxMSW\utils\dialoged\src
+
+cd bitmaps
+md \wxmsw_dist\wxMSW\utils\dialoged\src\bitmaps
+copy *.bmp \wxmsw_dist\wxMSW\utils\dialoged\src\bitmaps
+copy *.ico \wxmsw_dist\wxMSW\utils\dialoged\src\bitmaps
+cd ..\..\..
+
+
+cd ..
+
+echo Samples dir..
+
+cd samples
+md \wxmsw_dist\wxMSW\samples
+copy makefile.* \wxmsw_dist\wxMSW\samples
+
+echo Minimal sample..
+
+cd minimal
+md \wxmsw_dist\wxMSW\samples\minimal
+copy Makefile.* \wxmsw_dist\wxMSW\samples\minimal
+copy *.def \wxmsw_dist\wxMSW\samples\minimal
+copy *.rc \wxmsw_dist\wxMSW\samples\minimal
+copy minimal.cpp \wxmsw_dist\wxMSW\samples\minimal
+copy mondrian.ico \wxmsw_dist\wxMSW\samples\minimal
+cd ..
+
+
+echo Bombs sample..
+
+cd bombs
+md \wxmsw_dist\wxMSW\samples\bombs
+copy Makefile.* \wxmsw_dist\wxMSW\samples\bombs
+copy *.cpp \wxmsw_dist\wxMSW\samples\bombs
+copy *.h \wxmsw_dist\wxMSW\samples\bombs
+copy *.ico \wxmsw_dist\wxMSW\samples\bombs
+copy *.def \wxmsw_dist\wxMSW\samples\bombs
+copy *.rc \wxmsw_dist\wxMSW\samples\bombs
+cd ..
+
+echo Caret sample..
+
+cd caret
+md \wxmsw_dist\wxMSW\samples\caret
+copy Makefile.* \wxmsw_dist\wxMSW\samples\caret
+copy *.cpp \wxmsw_dist\wxMSW\samples\caret
+copy *.h \wxmsw_dist\wxMSW\samples\caret
+copy *.ico \wxmsw_dist\wxMSW\samples\caret
+copy *.def \wxmsw_dist\wxMSW\samples\caret
+copy *.rc \wxmsw_dist\wxMSW\samples\caret
+cd ..
+
+echo Checklst sample..
+
+cd checklst
+md \wxmsw_dist\wxMSW\samples\checklst
+copy Makefile.* \wxmsw_dist\wxMSW\samples\checklst
+copy *.h \wxmsw_dist\wxMSW\samples\checklst
+copy *.cpp \wxmsw_dist\wxMSW\samples\checklst
+copy *.ico \wxmsw_dist\wxMSW\samples\checklst
+copy *.def \wxmsw_dist\wxMSW\samples\checklst
+copy *.rc \wxmsw_dist\wxMSW\samples\checklst
+cd ..
+
+echo Config sample..
+
+cd config
+md \wxmsw_dist\wxMSW\samples\config
+copy Makefile.* \wxmsw_dist\wxMSW\samples\config
+copy *.h \wxmsw_dist\wxMSW\samples\config
+copy *.cpp \wxmsw_dist\wxMSW\samples\config
+copy *.ico \wxmsw_dist\wxMSW\samples\config
+copy *.def \wxmsw_dist\wxMSW\samples\config
+copy *.rc \wxmsw_dist\wxMSW\samples\config
+cd ..
+
+echo Controls sample..
+
+cd controls
+md \wxmsw_dist\wxMSW\samples\controls
+copy Makefile.* \wxmsw_dist\wxMSW\samples\controls
+copy *.cpp \wxmsw_dist\wxMSW\samples\controls
+copy *.h \wxmsw_dist\wxMSW\samples\controls
+copy *.rc \wxmsw_dist\wxMSW\samples\controls
+copy *.def \wxmsw_dist\wxMSW\samples\controls
+copy *.ico \wxmsw_dist\wxMSW\samples\controls
+cd icons
+md \wxmsw_dist\wxMSW\samples\controls\icons
+copy *.* \wxmsw_dist\wxMSW\samples\controls\icons
+cd ..\..
+
+echo Dialogs sample..
+
+cd dialogs
+md \wxmsw_dist\wxMSW\samples\dialogs
+copy Makefile.* \wxmsw_dist\wxMSW\samples\dialogs
+copy *.cpp \wxmsw_dist\wxMSW\samples\dialogs
+copy *.h \wxmsw_dist\wxMSW\samples\dialogs
+copy *.def \wxmsw_dist\wxMSW\samples\dialogs
+copy *.rc \wxmsw_dist\wxMSW\samples\dialogs
+copy *.ico \wxmsw_dist\wxMSW\samples\dialogs
+cd ..
+
+echo DnD sample..
+
+cd dnd
+md \wxmsw_dist\wxMSW\samples\dnd
+copy Makefile.* \wxmsw_dist\wxMSW\samples\dnd
+copy *.cpp \wxmsw_dist\wxMSW\samples\dnd
+copy *.h \wxmsw_dist\wxMSW\samples\dnd
+copy *.def \wxmsw_dist\wxMSW\samples\dnd
+copy *.rc \wxmsw_dist\wxMSW\samples\dnd
+copy *.ico \wxmsw_dist\wxMSW\samples\dnd
+cd ..
+
+echo Docview sample..
+
+cd docview
+md \wxmsw_dist\wxMSW\samples\docview
+copy Makefile.* \wxmsw_dist\wxMSW\samples\docview
+copy *.cpp \wxmsw_dist\wxMSW\samples\docview
+copy *.h \wxmsw_dist\wxMSW\samples\docview
+copy *.def \wxmsw_dist\wxMSW\samples\docview
+copy *.rc \wxmsw_dist\wxMSW\samples\docview
+copy *.ico \wxmsw_dist\wxMSW\samples\docview
+cd ..
+
+echo DocvwMDI sample..
+
+cd docvwmdi
+md \wxmsw_dist\wxMSW\samples\docvwmdi
+copy Makefile.* \wxmsw_dist\wxMSW\samples\docvwmdi
+copy *.cpp \wxmsw_dist\wxMSW\samples\docvwmdi
+copy *.h \wxmsw_dist\wxMSW\samples\docvwmdi
+copy *.def \wxmsw_dist\wxMSW\samples\docvwmdi
+copy *.rc \wxmsw_dist\wxMSW\samples\docvwmdi
+copy *.ico \wxmsw_dist\wxMSW\samples\docvwmdi
+cd ..
+
+echo Dynamic sample..
+
+cd dynamic
+md \wxmsw_dist\wxMSW\samples\dynamic
+copy Makefile.* \wxmsw_dist\wxMSW\samples\dynamic
+copy *.cpp \wxmsw_dist\wxMSW\samples\dynamic
+copy *.h \wxmsw_dist\wxMSW\samples\dynamic
+copy *.def \wxmsw_dist\wxMSW\samples\dynamic
+copy *.rc \wxmsw_dist\wxMSW\samples\dynamic
+copy *.ico \wxmsw_dist\wxMSW\samples\dynamic
+cd ..
+
+echo Drawing sample..
+
+cd drawing
+md \wxmsw_dist\wxMSW\samples\drawing
+copy Makefile.* \wxmsw_dist\wxMSW\samples\drawing
+copy *.cpp \wxmsw_dist\wxMSW\samples\drawing
+copy *.ico \wxmsw_dist\wxMSW\samples\drawing
+copy *.h \wxmsw_dist\wxMSW\samples\drawing
+copy *.rc \wxmsw_dist\wxMSW\samples\drawing
+copy *.def \wxmsw_dist\wxMSW\samples\drawing
+cd ..
+
+echo Forty sample..
+
+cd forty
+md \wxmsw_dist\wxMSW\samples\forty
+copy Makefile.* \wxmsw_dist\wxMSW\samples\forty
+copy *.cpp \wxmsw_dist\wxMSW\samples\forty
+copy *.h \wxmsw_dist\wxMSW\samples\forty
+copy *.def \wxmsw_dist\wxMSW\samples\forty
+copy *.rc \wxmsw_dist\wxMSW\samples\forty
+copy *.ico \wxmsw_dist\wxMSW\samples\forty
+copy *.bmp \wxmsw_dist\wxMSW\samples\forty
+copy *.xpm \wxmsw_dist\wxMSW\samples\forty
+copy *.xbm \wxmsw_dist\wxMSW\samples\forty
+cd ..
+
+echo Fractal sample..
+
+cd fractal
+md \wxmsw_dist\wxMSW\samples\fractal
+copy Makefile.* \wxmsw_dist\wxMSW\samples\fractal
+copy *.cpp \wxmsw_dist\wxMSW\samples\fractal
+copy *.h \wxmsw_dist\wxMSW\samples\fractal
+copy *.def \wxmsw_dist\wxMSW\samples\fractal
+copy *.rc \wxmsw_dist\wxMSW\samples\fractal
+copy *.ico \wxmsw_dist\wxMSW\samples\fractal
+cd ..
+
+echo Grid sample..
+
+cd grid
+md \wxmsw_dist\wxMSW\samples\grid
+copy Makefile.* \wxmsw_dist\wxMSW\samples\grid
+copy *.cpp \wxmsw_dist\wxMSW\samples\grid
+copy *.h \wxmsw_dist\wxMSW\samples\grid
+copy *.def \wxmsw_dist\wxMSW\samples\grid
+copy *.rc \wxmsw_dist\wxMSW\samples\grid
+copy *.ico \wxmsw_dist\wxMSW\samples\grid
+cd ..
+
+echo Help sample..
+
+cd help
+md \wxmsw_dist\wxMSW\samples\help
+copy Makefile.* \wxmsw_dist\wxMSW\samples\help
+copy *.cpp \wxmsw_dist\wxMSW\samples\help
+copy *.def \wxmsw_dist\wxMSW\samples\help
+copy *.rc \wxmsw_dist\wxMSW\samples\help
+copy *.ico \wxmsw_dist\wxMSW\samples\help
+copy *.xpm \wxmsw_dist\wxMSW\samples\help
+cd doc
+md \wxmsw_dist\wxMSW\samples\help\doc
+copy *.* \wxmsw_dist\wxMSW\samples\help\doc
+cd ..\..
+
+echo Image sample..
+
+cd image
+md \wxmsw_dist\wxMSW\samples\image
+copy Makefile.* \wxmsw_dist\wxMSW\samples\image
+copy *.cpp \wxmsw_dist\wxMSW\samples\image
+copy *.def \wxmsw_dist\wxMSW\samples\image
+copy *.rc \wxmsw_dist\wxMSW\samples\image
+copy *.ico \wxmsw_dist\wxMSW\samples\image
+copy horse.png \wxmsw_dist\wxMSW\samples\image
+copy horse.gif \wxmsw_dist\wxMSW\samples\image
+copy horse.jpg \wxmsw_dist\wxMSW\samples\image
+cd ..
+
+echo Internat sample..
+
+cd internat
+md \wxmsw_dist\wxMSW\samples\internat
+copy Makefile.* \wxmsw_dist\wxMSW\samples\internat
+copy *.cpp \wxmsw_dist\wxMSW\samples\internat
+copy *.def \wxmsw_dist\wxMSW\samples\internat
+copy *.rc \wxmsw_dist\wxMSW\samples\internat
+copy *.ico \wxmsw_dist\wxMSW\samples\internat
+copy readme.txt \wxmsw_dist\wxMSW\samples\internat
+copy wxstd.po \wxmsw_dist\wxMSW\samples\internat
+cd fr
+md \wxmsw_dist\wxMSW\samples\internat\fr
+copy *.?o \wxmsw_dist\wxMSW\samples\internat\fr
+cd ..\..
+
+echo Layout sample..
+
+cd layout
+md \wxmsw_dist\wxMSW\samples\layout
+copy Makefile.* \wxmsw_dist\wxMSW\samples\layout
+copy *.cpp \wxmsw_dist\wxMSW\samples\layout
+copy *.ico \wxmsw_dist\wxMSW\samples\layout
+copy *.def \wxmsw_dist\wxMSW\samples\layout
+copy *.rc \wxmsw_dist\wxMSW\samples\layout
+copy *.h \wxmsw_dist\wxMSW\samples\layout
+cd ..
+
+echo Listctrl sample..
+
+cd listctrl
+md \wxmsw_dist\wxMSW\samples\listctrl
+copy Makefile.* \wxmsw_dist\wxMSW\samples\listctrl
+copy *.cpp \wxmsw_dist\wxMSW\samples\listctrl
+copy *.h \wxmsw_dist\wxMSW\samples\listctrl
+copy *.def \wxmsw_dist\wxMSW\samples\listctrl
+copy *.rc \wxmsw_dist\wxMSW\samples\listctrl
+copy *.ico \wxmsw_dist\wxMSW\samples\listctrl
+cd bitmaps
+md \wxmsw_dist\wxMSW\samples\listctrl\bitmaps
+copy *.* \wxmsw_dist\wxMSW\samples\listctrl\bitmaps
+cd ..\..
+
+echo MDI sample..
+
+cd mdi
+md \wxmsw_dist\wxMSW\samples\mdi
+copy Makefile.* \wxmsw_dist\wxMSW\samples\mdi
+copy *.cpp \wxmsw_dist\wxMSW\samples\mdi
+copy *.rc \wxmsw_dist\wxMSW\samples\mdi
+copy *.def \wxmsw_dist\wxMSW\samples\mdi
+copy *.h \wxmsw_dist\wxMSW\samples\mdi
+copy *.ico \wxmsw_dist\wxMSW\samples\mdi
+cd bitmaps
+md \wxmsw_dist\wxMSW\samples\mdi\bitmaps
+copy *.* \wxmsw_dist\wxMSW\samples\mdi\bitmaps
+cd ..\..
+
+echo Memcheck sample..
+
+cd memcheck
+md \wxmsw_dist\wxMSW\samples\memcheck
+copy Makefile.* \wxmsw_dist\wxMSW\samples\memcheck
+copy *.cpp \wxmsw_dist\wxMSW\samples\memcheck
+copy *.ico \wxmsw_dist\wxMSW\samples\memcheck
+copy *.rc \wxmsw_dist\wxMSW\samples\memcheck
+copy *.def \wxmsw_dist\wxMSW\samples\memcheck
+copy *.xpm \wxmsw_dist\wxMSW\samples\memcheck
+cd ..
+
+echo Minifram sample..
+
+cd minifram
+md \wxmsw_dist\wxMSW\samples\minifram
+copy Makefile.* \wxmsw_dist\wxMSW\samples\minifram
+copy *.cpp \wxmsw_dist\wxMSW\samples\minifram
+copy *.h \wxmsw_dist\wxMSW\samples\minifram
+copy *.xpm \wxmsw_dist\wxMSW\samples\minifram
+copy *.ico \wxmsw_dist\wxMSW\samples\minifram
+copy *.def \wxmsw_dist\wxMSW\samples\minifram
+copy *.rc \wxmsw_dist\wxMSW\samples\minifram
+cd bitmaps
+md \wxmsw_dist\wxMSW\samples\minifram\bitmaps
+copy *.* \wxmsw_dist\wxMSW\samples\minifram\bitmaps
+cd ..\..
+
+echo Notebook sample..
+
+cd notebook
+md \wxmsw_dist\wxMSW\samples\notebook
+copy Makefile.* \wxmsw_dist\wxMSW\samples\notebook
+copy *.cpp \wxmsw_dist\wxMSW\samples\notebook
+copy *.ico \wxmsw_dist\wxMSW\samples\notebook
+copy *.def \wxmsw_dist\wxMSW\samples\notebook
+copy *.rc \wxmsw_dist\wxMSW\samples\notebook
+copy *.h \wxmsw_dist\wxMSW\samples\notebook
+cd ..
+
+echo Printing sample..
+
+cd printing
+md \wxmsw_dist\wxMSW\samples\printing
+copy Makefile.* \wxmsw_dist\wxMSW\samples\printing
+copy *.cpp \wxmsw_dist\wxMSW\samples\printing
+copy *.h \wxmsw_dist\wxMSW\samples\printing
+copy *.rc \wxmsw_dist\wxMSW\samples\printing
+copy *.ico \wxmsw_dist\wxMSW\samples\printing
+copy *.def \wxmsw_dist\wxMSW\samples\printing
+copy *.xpm \wxmsw_dist\wxMSW\samples\printing
+cd ..
+
+echo Proplist sample..
+
+cd proplist
+md \wxmsw_dist\wxMSW\samples\proplist
+copy Makefile.* \wxmsw_dist\wxMSW\samples\proplist
+copy *.rc \wxmsw_dist\wxMSW\samples\printing
+copy *.def \wxmsw_dist\wxMSW\samples\printing
+copy *.cpp \wxmsw_dist\wxMSW\samples\proplist
+copy *.ico \wxmsw_dist\wxMSW\samples\printing
+copy *.h \wxmsw_dist\wxMSW\samples\proplist
+cd ..
+
+echo Resource sample..
+
+cd resource
+md \wxmsw_dist\wxMSW\samples\resource
+copy Makefile.* \wxmsw_dist\wxMSW\samples\resource
+copy *.ico \wxmsw_dist\wxMSW\samples\resource
+copy *.rc \wxmsw_dist\wxMSW\samples\resource
+copy *.def \wxmsw_dist\wxMSW\samples\resource
+copy *.cpp \wxmsw_dist\wxMSW\samples\resource
+copy *.h \wxmsw_dist\wxMSW\samples\resource
+copy *.wxr \wxmsw_dist\wxMSW\samples\resource
+cd ..
+
+echo Sashtest sample..
+
+cd sashtest
+md \wxmsw_dist\wxMSW\samples\sashtest
+copy Makefile.* \wxmsw_dist\wxMSW\samples\sashtest
+copy *.cpp \wxmsw_dist\wxMSW\samples\sashtest
+copy *.rc \wxmsw_dist\wxMSW\samples\sashtest
+copy *.h \wxmsw_dist\wxMSW\samples\sashtest
+copy *.def \wxmsw_dist\wxMSW\samples\sashtest
+copy *.ico \wxmsw_dist\wxMSW\samples\sashtest
+cd ..
+
+echo Scroll sample..
+
+cd scroll
+md \wxmsw_dist\wxMSW\samples\scroll
+copy Makefile.* \wxmsw_dist\wxMSW\samples\scroll
+copy *.cpp \wxmsw_dist\wxMSW\samples\scroll
+copy *.def \wxmsw_dist\wxMSW\samples\scroll
+copy *.rc \wxmsw_dist\wxMSW\samples\scroll
+copy *.ico \wxmsw_dist\wxMSW\samples\scroll
+copy *.h \wxmsw_dist\wxMSW\samples\scroll
+cd ..
+
+echo Splitter sample..
+
+cd splitter
+md \wxmsw_dist\wxMSW\samples\splitter
+copy Makefile.* \wxmsw_dist\wxMSW\samples\splitter
+copy *.cpp \wxmsw_dist\wxMSW\samples\splitter
+copy *.def \wxmsw_dist\wxMSW\samples\splitter
+copy *.rc \wxmsw_dist\wxMSW\samples\splitter
+copy *.ico \wxmsw_dist\wxMSW\samples\splitter
+cd ..
+
+echo Text sample..
+
+cd text
+md \wxmsw_dist\wxMSW\samples\text
+copy Makefile.* \wxmsw_dist\wxMSW\samples\text
+copy *.cpp \wxmsw_dist\wxMSW\samples\text
+copy *.def \wxmsw_dist\wxMSW\samples\text
+copy *.rc \wxmsw_dist\wxMSW\samples\text
+copy *.ico \wxmsw_dist\wxMSW\samples\text
+cd ..
+
+echo Thread sample..
+
+cd thread
+md \wxmsw_dist\wxMSW\samples\thread
+copy Makefile.* \wxmsw_dist\wxMSW\samples\thread
+copy *.cpp \wxmsw_dist\wxMSW\samples\thread
+copy *.def \wxmsw_dist\wxMSW\samples\thread
+copy *.rc \wxmsw_dist\wxMSW\samples\thread
+copy *.ico \wxmsw_dist\wxMSW\samples\thread
+cd ..
+
+echo Toolbar sample..
+
+cd toolbar
+md \wxmsw_dist\wxMSW\samples\toolbar
+copy Makefile.* \wxmsw_dist\wxMSW\samples\toolbar
+copy *.cpp \wxmsw_dist\wxMSW\samples\toolbar
+copy *.h \wxmsw_dist\wxMSW\samples\toolbar
+copy *.rc \wxmsw_dist\wxMSW\samples\toolbar
+copy *.def \wxmsw_dist\wxMSW\samples\toolbar
+copy *.xpm \wxmsw_dist\wxMSW\samples\toolbar
+copy *.ico \wxmsw_dist\wxMSW\samples\toolbar
+cd bitmaps
+md \wxmsw_dist\wxMSW\samples\toolbar\bitmaps
+copy *.* \wxmsw_dist\wxMSW\samples\toolbar\bitmaps
+cd ..\..
+
+echo TreeCtrl sample..
+
+cd treectrl
+md \wxmsw_dist\wxMSW\samples\treectrl
+copy Makefile.* \wxmsw_dist\wxMSW\samples\treectrl
+copy *.rc \wxmsw_dist\wxMSW\samples\treectrl
+copy *.def \wxmsw_dist\wxMSW\samples\treectrl
+copy *.cpp \wxmsw_dist\wxMSW\samples\treectrl
+copy *.h \wxmsw_dist\wxMSW\samples\treectrl
+copy *.xpm \wxmsw_dist\wxMSW\samples\treectrl
+copy *.ico \wxmsw_dist\wxMSW\samples\treectrl
+cd bitmaps
+md \wxmsw_dist\wxMSW\samples\treectrl\bitmaps
+copy *.* \wxmsw_dist\wxMSW\samples\treectrl\bitmaps
+cd ..\..
+
+echo typetest sample..
+
+cd typetest
+md \wxmsw_dist\wxMSW\samples\typetest
+copy Makefile.* \wxmsw_dist\wxMSW\samples\typetest
+copy *.cpp \wxmsw_dist\wxMSW\samples\typetest
+copy *.h \wxmsw_dist\wxMSW\samples\typetest
+copy *.ico \wxmsw_dist\wxMSW\samples\typetest
+copy *.def \wxmsw_dist\wxMSW\samples\typetest
+copy *.rc \wxmsw_dist\wxMSW\samples\typetest
+cd ..
+
+echo Validate sample..
+
+cd validate
+md \wxmsw_dist\wxMSW\samples\validate
+copy Makefile.* \wxmsw_dist\wxMSW\samples\validate
+copy *.cpp \wxmsw_dist\wxMSW\samples\validate
+copy *.h \wxmsw_dist\wxMSW\samples\validate
+copy *.xpm \wxmsw_dist\wxMSW\samples\validate
+copy *.rc \wxmsw_dist\wxMSW\samples\validate
+copy *.def \wxmsw_dist\wxMSW\samples\validate
+cd ..
+
+echo wxPoem sample..
+
+cd wxpoem
+md \wxmsw_dist\wxMSW\samples\wxpoem
+copy Makefile.* \wxmsw_dist\wxMSW\samples\wxpoem
+copy *.cpp \wxmsw_dist\wxMSW\samples\wxpoem
+copy *.h \wxmsw_dist\wxMSW\samples\wxpoem
+copy *.xpm \wxmsw_dist\wxMSW\samples\wxpoem
+copy *.def \wxmsw_dist\wxMSW\samples\wxpoem
+copy *.rc \wxmsw_dist\wxMSW\samples\wxpoem
+copy wxpoem.dat \wxmsw_dist\wxMSW\samples\wxpoem
+copy wxpoem.txt \wxmsw_dist\wxMSW\samples\wxpoem
+copy wxpoem.idx \wxmsw_dist\wxMSW\samples\wxpoem
+cd ..
+
+echo wxSocket sample..
+
+cd wxsocket
+md \wxmsw_dist\wxMSW\samples\wxsocket
+copy Makefile.* \wxmsw_dist\wxMSW\samples\wxsocket
+copy *.cpp \wxmsw_dist\wxMSW\samples\wxsocket
+copy *.h \wxmsw_dist\wxMSW\samples\wxsocket
+copy *.rc \wxmsw_dist\wxMSW\samples\wxsocket
+copy *.def \wxmsw_dist\wxMSW\samples\wxsocket
+copy *.xpm \wxmsw_dist\wxMSW\samples\wxsocket
+cd ..\..
+
--- a/distrib/msw/cw.rsp
+++ b/distrib/msw/cw.rsp
@@ -0,0 +1,109 @@
+src/make_cw.mcp
+src/common/cwy_tab.c
+src/common/cwlex_yy.c
+include/wx_cw.pch
+include/wx_cw.pch++
+include/wx_cw_d.pch
+include/wx_cw_d.pch++
+
+samples/bombs/make_cw.mcp
+
+samples/checklst/make_cw.mcp
+
+samples/config/make_cw.mcp
+
+samples/controls/make_cw.mcp
+
+samples/db/make_cw.mcp
+
+samples/dialogs/make_cw.mcp
+
+samples/dnd/make_cw.mcp
+
+samples/docview/make_cw.mcp
+
+samples/docvwmdi/make_cw.mcp
+
+samples/dynamic/make_cw.mcp
+
+samples/forty/make_cw.mcp
+
+samples/fractal/make_cw.mcp
+
+samples/grid/make_cw.mcp
+
+samples/help/make_cw.mcp
+
+samples/image/make_cw.mcp
+
+samples/internat/make_cw.mcp
+
+samples/joytest/make_cw.mcp
+
+samples/layout/make_cw.mcp
+
+samples/listctrl/make_cw.mcp
+
+samples/mdi/make_cw.mcp
+
+samples/memcheck/make_cw.mcp
+
+samples/mfc/make_cw.mcp
+
+samples/minimal/make_cw.mcp
+
+samples/minifram/make_cw.mcp
+
+samples/nativdlg/make_cw.mcp
+
+samples/notebook/make_cw.mcp
+
+samples/ownerdrw/make_cw.mcp
+
+samples/png/make_cw.mcp
+
+samples/printing/make_cw.mcp
+
+samples/proplist/make_cw.mcp
+
+samples/Regtest/make_cw.mcp
+
+samples/resource/make_cw.mcp
+
+samples/sashtest/make_cw.mcp
+
+samples/splitter/make_cw.mcp
+
+samples/tab/make_cw.mcp
+
+samples/taskbar/make_cw.mcp
+
+samples/thread/make_cw.mcp
+
+samples/toolbar/make_cw.mcp
+
+samples/treectrl/make_cw.mcp
+
+samples/typetest/make_cw.mcp
+
+samples/validate/make_cw.mcp
+
+samples/wxsocket/make_cw.mcp
+
+samples/wxpoem/make_cw.mcp
+
+utils/wxprop/src/make_cw.mcp
+utils/wxprop/src/make_sample.mcp
+
+utils/dialoged/src/make_cw.mcp
+
+utils/glcanvas/win/make_cw.mcp
+utils/glcanvas/samples/cube/make_cw.mcp
+utils/glcanvas/samples/isosurf/make_cw.mcp
+
+utils/ogl/src/make_cw.mcp
+utils/ogl/samples/ogledit/make_cw.mcp
+
+utils/wxtree/src/make_cw.mcp
+utils/wxtree/src/make_cw.mcp
+
--- a/distrib/msw/docsrc.rsp
+++ b/distrib/msw/docsrc.rsp
@@ -10,6 +10,18 @@ docs/latex/wx/*.bmp
 docs/latex/wx/*.gif
 docs/latex/wx/*.wmf

+docs/latex/proplist/*.tex
+docs/latex/proplist/*.sty
+docs/latex/proplist/*.bib
+docs/latex/proplist/*.hpj
+docs/latex/proplist/*.ini
+docs/latex/proplist/*.txt
+docs/latex/proplist/*.cnt
+docs/latex/proplist/*.eps
+docs/latex/proplist/*.bmp
+docs/latex/proplist/*.gif
+docs/latex/proplist/*.wmf
+
 docs/latex/porting/*.tex
 docs/latex/porting/*.sty
 docs/latex/porting/*.bib
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
--- a/distrib/msw/glcanvas.rsp
+++ b/distrib/msw/glcanvas.rsp
@@ -0,0 +1,44 @@
+utils/glcanvas/Makefile.in
+utils/glcanvas/docs/*.*
+utils/glcanvas/win/*.cpp
+utils/glcanvas/win/*.h
+utils/glcanvas/win/make*.*
+utils/glcanvas/gtk/*.cpp
+utils/glcanvas/gtk/*.h
+utils/glcanvas/gtk/make*.*
+utils/glcanvas/gtk/Makefile
+utils/glcanvas/motif/*.cpp
+utils/glcanvas/motif/*.h
+utils/glcanvas/motif/make*.*
+utils/glcanvas/motif/*.txt
+utils/glcanvas/motif/Makefile
+utils/glcanvas/samples/cube/*.cpp
+utils/glcanvas/samples/cube/*.h
+utils/glcanvas/samples/cube/*.rc
+utils/glcanvas/samples/cube/*.ico
+utils/glcanvas/samples/cube/*.xbm
+utils/glcanvas/samples/cube/make*.*
+utils/glcanvas/samples/cube/Makefile
+
+utils/glcanvas/samples/isosurf/*.cpp
+utils/glcanvas/samples/isosurf/*.h
+utils/glcanvas/samples/isosurf/*.rc
+utils/glcanvas/samples/isosurf/*.ico
+utils/glcanvas/samples/isosurf/*.xbm
+utils/glcanvas/samples/isosurf/*.dat.gz
+utils/glcanvas/samples/isosurf/make*.*
+utils/glcanvas/samples/isosurf/Makefile
+
+utils/glcanvas/samples/penguin/*.cpp
+utils/glcanvas/samples/penguin/*.c
+utils/glcanvas/samples/penguin/*.h
+utils/glcanvas/samples/penguin/*.rc
+utils/glcanvas/samples/penguin/*.ico
+utils/glcanvas/samples/penguin/*.xbm
+utils/glcanvas/samples/penguin/*.xpm
+utils/glcanvas/samples/penguin/make*.*
+utils/glcanvas/samples/penguin/Makefile
+utils/glcanvas/samples/penguin/penguin.lwo
+
+
+
--- a/distrib/msw/gtk.rsp
+++ b/distrib/msw/gtk.rsp
@@ -0,0 +1,84 @@
+configure
+
+distrib/gtk/copy_src
+distrib/gtk/README.txt
+distrib/gtk/Setup
+
+docs/gtk/*.html
+docs/gtk/*.txt
+docs/gtk/COPYING.LIB
+docs/gtk/makewxgtk
+
+include/wx/gtk/*.h
+include/wx/gtk/*.xpm
+include/install-sh
+include/wx/install-sh
+
+src/gtk/Makefile
+src/gtk/*.cpp
+src/gtk/*.c
+src/gtk/*.inc
+src/gtk/*.xbm
+
+src/iodbc/*.c
+src/iodbc/*.ci
+src/iodbc/*.h
+src/iodbc/IAFA-PACKAGE
+src/iodbc/README
+src/iodbc/*.exp
+src/iodbc/*.mk
+src/iodbc/autoconfig
+src/iodbc/build
+src/iodbc/Changes.log
+src/iodbc/postgres/*.h
+
+setup/*.in
+setup/*.hin
+
+setup/general/createall
+setup/general/jointar
+setup/general/makeapp
+setup/general/makedirs
+setup/general/makedoc
+setup/general/mygrep
+setup/general/needed
+
+setup/rules/bin
+setup/rules/bin2
+setup/rules/doc
+setup/rules/gbin
+setup/rules/gbin2
+setup/rules/glib
+setup/rules/glibbin
+setup/rules/glibgbin
+setup/rules/gslib
+setup/rules/lib
+setup/rules/libbin
+setup/rules/libgbin
+
+setup/rules/generic/bin1
+setup/rules/generic/bin1gen
+setup/rules/generic/bin2
+setup/rules/generic/bin2gen
+setup/rules/generic/depend
+setup/rules/generic/globals
+setup/rules/generic/lib
+setup/rules/generic/needed
+setup/rules/generic/obj
+setup/rules/generic/slib
+setup/rules/generic/sobj
+
+setup/shared/sharedAIX
+setup/shared/sharedBsd
+setup/shared/sharedDgux
+setup/shared/sharedHpux
+setup/shared/sharedIrix
+setup/shared/sharedLinux
+setup/shared/sharedOSF
+setup/shared/sharedSolaris2
+setup/shared/sharedSunos4
+setup/shared/sharedSysV
+
+misc/afm/*.afm
+misc/gs_afm/*.afm
+
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -0,0 +1,57 @@
+Makefile.in
+src/Makefile
+locale/Makefile
+samples/Makefile.in
+samples/bombs/Makefile.in
+samples/caret/Makefile.in
+samples/checklst/Makefile.in
+samples/config/Makefile.in
+samples/controls/Makefile.in
+samples/db/Makefile.in
+samples/dialogs/Makefile.in
+samples/dnd/Makefile.in
+samples/docview/Makefile.in
+samples/docvwmdi/Makefile.in
+samples/drawing/Makefile.in
+samples/dynamic/Makefile.in
+samples/genvalid/Makefile.in
+samples/html/Makefile.in
+samples/html/about/Makefile.in
+samples/html/help/Makefile.in
+samples/html/printing/Makefile.in
+samples/html/test/Makefile.in
+samples/html/virtual/Makefile.in
+samples/html/widget/Makefile.in
+samples/html/zip/Makefile.in
+samples/image/Makefile.in
+samples/layout/Makefile.in
+samples/listctrl/Makefile.in
+samples/mdi/Makefile.in
+samples/minifram/Makefile.in
+samples/minimal/Makefile.in
+samples/notebook/Makefile.in
+samples/printing/Makefile.in
+samples/proplist/Makefile.in
+samples/sashtest/Makefile.in
+samples/scroll/Makefile.in
+samples/scrollsub/Makefile.in
+samples/splitter/Makefile.in
+samples/text/Makefile.in
+samples/thread/Makefile.in
+samples/toolbar/Makefile.in
+samples/treectrl/Makefile.in
+samples/typetest/Makefile.in
+samples/validate/Makefile.in
+samples/wizard/Makefile.in
+samples/wxpoem/Makefile.in
+samples/wxsocket/Makefile.in
+samples/nettest/Makefile.in
+samples/scrollsub/Makefile.in
+samples/font/Makefile.in
+samples/menu/Makefile.in
+samples/console/Makefile.in
+utils/glcanvas/motif/Makefile.in
+utils/Makefile.in
+utils/wxMMedia2/Makefile.in
+utils/wxMMedia2/lib/Makefile.in
+utils/wxMMedia2/sample/Makefile.in
--- a/distrib/msw/makewise.bat
+++ b/distrib/msw/makewise.bat
@@ -0,0 +1,51 @@
+@echo off
+Rem Make a WISE Installer distribution list, where each file is represented by
+Rem a section like this:
+Rem 
+Rem item: Install File
+Rem   Source=d:\wx2\thefile.txt
+Rem   Destination=%MAINDIR%\thefile.txt
+Rem   Flags=0000000000000010
+Rem end
+
+Rem Generate a list of all files in the distribution.
+dir /BS >& %TEMP\files1.tmp
+
+Rem Now we iterate through the list of files, writing out the middle section of
+Rem the file.
+Rem We have to remove the first part of the path,
+Rem by truncating the start by the size of the current directory.
+
+set sz=%@EVAL[%@LEN[%_CWD]+1]
+set len=%@LINES[%TEMP\files1.tmp]
+
+erase /Y %TEMP\files2.tmp
+
+Rem, first add system files
+cat %WXWIN\distrib\msw\wisesys.txt > %temp\files2.tmp
+
+do i = 0 to %len by 1
+    set line=%@LINE[%TEMP\files1.tmp,%i]
+    Rem Skip directories.
+    if isdir %line enddo
+    set sz2=%@LEN[%line]
+    set n=%@EVAL[%sz2-%sz]
+    set line2=%@SUBSTR[%line,%sz,%n]
+
+    Rem Echo the file section
+    echo item: Install File >> %TEMP\files2.tmp
+    echo   Source=%line >> %TEMP\files2.tmp
+    echo   Destination=%%MAINDIR%%\%line2 >> %TEMP\files2.tmp
+    echo   Flags=0000000000000010 >> %TEMP\files2.tmp
+    echo end >> %TEMP\files2.tmp
+enddo
+
+Rem Concatenate the 3 sections
+cat %WXWIN\distrib\msw\wisetop.txt %TEMP\files2.tmp %WXWIN\distrib\msw\wisebott.txt > %WXWIN\distrib\msw\wxwin2.wse
+
+erase /Y %TEMP\files1.tmp
+rem erase /Y %TEMP\files2.tmp
+
+goto end
+
+:end
--- a/distrib/msw/motif.rsp
+++ b/distrib/msw/motif.rsp
@@ -0,0 +1,88 @@
+src/motif.inc
+
+src/motif/*.cpp
+src/motif/*.c
+src/motif/*.h
+src/motif/makefile*
+src/motif/*.inc
+src/motif/*.xbm
+src/motif/xmcombo/*.c
+src/motif/xmcombo/*.h
+src/motif/xmcombo/*.doc
+src/motif/xmcombo/*.man
+src/motif/xmcombo/*.txt
+
+src/iodbc/*.c
+src/iodbc/*.ci
+src/iodbc/*.h
+src/iodbc/IAFA-PACKAGE
+src/iodbc/README
+src/iodbc/*.exp
+src/iodbc/*.mk
+src/iodbc/autoconfig
+src/iodbc/build
+src/iodbc/Changes.log
+src/iodbc/postgres/*.h
+
+include/wx/motif/*.h
+include/install-sh
+include/wx/install-sh
+
+docs/motif/*.txt
+docs/motif/makewxmotif
+docs/motif2/*.txt
+docs/motif2/COPYING.LIB
+
+lib/dummy
+
+misc/afm/*.afm
+misc/gs_afm/*.afm
+
+setup/*.in
+setup/*.hin
+
+setup/general/createall
+setup/general/jointar
+setup/general/makeapp
+setup/general/makedirs
+setup/general/makedoc
+setup/general/mygrep
+setup/general/needed
+
+setup/rules/bin
+setup/rules/bin2
+setup/rules/doc
+setup/rules/gbin
+setup/rules/gbin2
+setup/rules/glib
+setup/rules/glibbin
+setup/rules/glibgbin
+setup/rules/gslib
+setup/rules/lib
+setup/rules/libbin
+setup/rules/libgbin
+
+setup/rules/generic/bin1
+setup/rules/generic/bin1gen
+setup/rules/generic/bin2
+setup/rules/generic/bin2gen
+setup/rules/generic/depend
+setup/rules/generic/globals
+setup/rules/generic/lib
+setup/rules/generic/needed
+setup/rules/generic/obj
+setup/rules/generic/slib
+setup/rules/generic/sobj
+
+setup/shared/sharedAIX
+setup/shared/sharedBsd
+setup/shared/sharedDgux
+setup/shared/sharedHpux
+setup/shared/sharedIrix
+setup/shared/sharedLinux
+setup/shared/sharedOSF
+setup/shared/sharedSolaris2
+setup/shared/sharedSunos4
+setup/shared/sharedSysV
+
+
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -1,20 +1,57 @@
+Mingw32-gcc295.patches
+
+lib/watcom/*.txt
+lib/watcom/*.lib
+lib/watcom/*.bat
+lib/bcc16/*.lib
+
+docs/licence.txt
 docs/msw/*.txt
+docs/wine/*.txt
+docs/wine/COPYING.LIB
+
+distrib/msw/*.rsp
+distrib/msw/*.bat
+
+tools/gettext/xgettext.exe
+tools/gettext/msgfmt.exe
+tools/gettext/msgunfmt.exe

 src/makeb32.env
+src/makeprog.b32
+src/makelib.b32
 src/makebcc.env
-src/makemsw.env
+src/makeprog.bcc
+src/makelib.bcc
+src/makemsc.env
+src/makeprog.msc
+src/makelib.msc
 src/makewat.env
+src/makeprog.wat
+src/makelib.wat
 src/makesc.env
+src/makevc.env
+src/makeprog.vc
+src/makelib.vc
 src/makeg95.env
-src/makem95.env
-src/ntwxwin.mak
+src/makeprog.g95
+src/makelib.g95
+src/makesl.env
+src/makeprog.sl
+src/makelib.sl
+src/salford.lnk
+src/maketwin.env
+src/makeprog.twn
+src/makelib.twn
 src/makefile.bcc
 src/makefile.dos
-src/makefile.nt
+src/makefile.vc
 src/*.bat

 src/common/dosyacc.c
 src/common/doslex.c
+src/common/y_tab.c
+src/common/lex_yy.c

 src/msw/*.cpp
 src/msw/*.h
@@ -22,15 +59,21 @@ src/msw/makefile.*
 src/msw/*.lst
 src/msw/*.def
 src/msw/*.inc
+src/msw/winestub.c
+src/msw/gsocket.c

-src/msw/ctl3d/*.*
-src/msw/ctl3d/msvc/*.*
-src/msw/ctl3d/wat32/*.*
-src/msw/ctl3d/wat386/*.*
-src/msw/ctl3d/borland/*.*
 src/msw/ole/*.cpp
 src/msw/*.prj

+src/xpm/*.c
+src/xpm/*.h
+src/xpm/makefile*
+src/xpm/changes
+src/xpm/readme
+src/xpm/readme.msw
+src/xpm/copyrigh.t
+src/xpm/files
+
 include/wx/msw/*.h
 include/wx/msw/*.rc
 include/wx/msw/ctl3d/*.h
@@ -98,6 +141,15 @@ samples/joytest/*.bmp
 samples/joytest/*.wav
 samples/joytest/*.ico

+samples/oleauto/*.h
+samples/oleauto/*.cpp
+samples/oleauto/*.def
+samples/oleauto/*.rc
+samples/oleauto/makefile.*
+samples/oleauto/*.txt
+samples/oleauto/*.bmp
+samples/oleauto/*.ico
+
 utils/nplugin/make*.*
 utils/nplugin/src/*.cpp
 utils/nplugin/src/*.h
--- a/distrib/msw/ogl.rsp
+++ b/distrib/msw/ogl.rsp
@@ -0,0 +1,73 @@
+utils/ogl/Makefile.in
+utils/ogl/Makefile
+
+utils/ogl/src/*.cpp
+utils/ogl/src/*.h
+utils/ogl/src/*.rc
+utils/ogl/src/*.def
+utils/ogl/src/*.xbm
+utils/ogl/src/*.xpm
+utils/ogl/src/make*.*
+utils/ogl/src/Makefile
+utils/ogl/src/*.txt
+utils/ogl/src/*.ico
+utils/ogl/src/*.bmp
+
+utils/ogl/samples/ogledit/*.cpp
+utils/ogl/samples/ogledit/*.h
+utils/ogl/samples/ogledit/*.rc
+utils/ogl/samples/ogledit/*.def
+utils/ogl/samples/ogledit/*.xbm
+utils/ogl/samples/ogledit/make*.*
+utils/ogl/samples/ogledit/Makefile
+utils/ogl/samples/ogledit/*.txt
+utils/ogl/samples/ogledit/*.ico
+utils/ogl/samples/ogledit/*.bmp
+utils/ogl/samples/ogledit/*.xpm
+utils/ogl/samples/ogledit/bitmaps/*.bmp
+utils/ogl/samples/ogledit/bitmaps/*.gif
+utils/ogl/samples/ogledit/bitmaps/*.xbm
+utils/ogl/samples/ogledit/bitmaps/*.xpm
+
+utils/ogl/samples/studio/*.cpp
+utils/ogl/samples/studio/*.h
+utils/ogl/samples/studio/*.rc
+utils/ogl/samples/studio/*.def
+utils/ogl/samples/studio/*.xbm
+utils/ogl/samples/studio/make*.*
+utils/ogl/samples/studio/Makefile
+utils/ogl/samples/studio/*.txt
+utils/ogl/samples/studio/*.ico
+utils/ogl/samples/studio/*.bmp
+utils/ogl/samples/studio/*.xpm
+utils/ogl/samples/studio/*.wxr
+utils/ogl/samples/studio/bitmaps/*.bmp
+utils/ogl/samples/studio/bitmaps/*.gif
+utils/ogl/samples/studio/bitmaps/*.xbm
+utils/ogl/samples/studio/bitmaps/*.xpm
+utils/ogl/samples/studio/manual/*.tex
+utils/ogl/samples/studio/manual/*.ini
+utils/ogl/samples/studio/manual/*.gif
+utils/ogl/samples/studio/manual/*.bmp
+utils/ogl/samples/studio/manual/*.htm
+utils/ogl/samples/studio/manual/*.hlp
+utils/ogl/samples/studio/manual/*.cnt
+utils/ogl/samples/studio/manual/Makefile
+
+utils/ogl/distrib/*.rsp
+utils/ogl/distrib/*.bat
+
+utils/ogl/docs/*.txt
+utils/ogl/docs/*.tex
+utils/ogl/docs/*.ini
+utils/ogl/docs/*.hpj
+utils/ogl/docs/*.ps
+utils/ogl/docs/*.eps
+utils/ogl/docs/*.bmp
+utils/ogl/docs/*.gif
+
+docs/html/ogl/*.*
+docs/winhelp/ogl.hlp
+docs/winhelp/ogl.cnt
+docs/pdf/ogl.pdf
+
--- a/distrib/msw/readme.txt
+++ b/distrib/msw/readme.txt
@@ -0,0 +1,36 @@
+Distribution scripts and lists
+-----------------------------------------------------------------
+
+This directory (distrib\msw) contains some 4DOS batch files
+(.bat) and 'response' files (.rsp) to simplify the job of
+producing distributions. The .rsp files specify which files are
+associated with a particular module, e.g. wx200vc.rsp refers to
+the VC++ project files, wx200gen.rsp represents the generic files,
+wx200msw.rsp specifies the Windows specific files, etc.
+
+When making a distribution on Windows, I call zipdist.bat to prepare
+zip files with everything needed for Windows,
+GTK and Motif. zipdist then unzips some of them into
+deliver\wx, removes and adds a few files to perfect the
+distribution.
+
+zipdist then calls 'makewise.bat' to generate a new wxwin2.wse
+script, for WISE Installer. It takes wisetop.txt, wisebott.txt
+and adds the section for file installation. (If you've modified
+wxwin2.wse using WISE Installer, simply compile and run splitwise.exe
+to put back up-to-date wisetop.txt, wisebott.txt files before
+running zipdist.)
+
+Finally, zipdist runs WISE Installer using a command line
+argument to produce the setup.* files automatically.
+
+Note that although zipdist.bat produces archives for 3 platforms,
+I only use a subset of these to produce the Windows-specific
+setup.exe. I then have the option of distributing the zip files
+as well.
+
+You may need to install 4DOS to run these scripts. If anyone
+wishes to remove 4DOS dependency, that's fine with me.
+
+Julian Smart, 11th October 1999
+
--- a/distrib/msw/splitwise.cpp
+++ b/distrib/msw/splitwise.cpp
@@ -0,0 +1,106 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        splitwise.cpp
+// Purpose:     Use this to split wxwin2.wse in the distrib/msw directory
+//              into wisetop.txt, wisebott.txt. This allows you to do the
+//              following:
+//
+//              1) Edit the existing wxwin2.wse in WISE Install.
+//              2) Call splitwise.exe to split off the non-file bits (i.e.
+//                 preserve everything except the "item: Install File" lines).
+//              3) Call makewise.bat to generate a new wxwin2.wse from
+//                 wisetop.txt, wisebott.txt and the file list generated
+//                 from the files in deliver\wx (which themselves have been
+//                 put there by zipdist.bat).
+//
+//              If you don't wish to change the WISE settings, then there's no
+//              need to use splitwise, but it's very likely that settings will
+//              be altered, e.g. to change the version number, what's installed,
+//              etc.
+//
+// Author:      Julian Smart
+// Modified by:
+// Created:     13/10/99
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+char g_Line[1024];
+
+int ReadLine(FILE* fd, char* buf)
+{
+    int ch;
+    int i = 0;
+    while (((ch = getc(fd)) != EOF) && (ch != '\n'))
+    {
+        buf[i] = ch;
+        i ++;
+    }
+    buf[i] = 0;
+
+    if (ch == EOF && (i == 0))
+        return 0;
+    else
+        return 1;
+}
+
+void WriteLine(FILE* fd, char* buf)
+{
+    int len = strlen(buf);
+    int i;
+    for (i = 0; i < len; i++)
+        putc(buf[i], fd);
+    putc('\n', fd);
+}
+
+int main(int argc, char* argv[])
+{
+    FILE* wiseTop = fopen("wisetop.txt", "w");
+    if (!wiseTop)
+        return 1;
+
+    FILE* wiseBottom = fopen("wisebott.txt", "w");
+    if (!wiseBottom)
+        return 1;
+
+    FILE* wiseWhole = fopen("wxwin2.wse", "r");
+    if (!wiseWhole)
+        return 1;
+
+    // Write out the top of the file
+    g_Line[0] = 0;
+    while (ReadLine(wiseWhole, g_Line))
+    {
+        if (strcmp(g_Line, "item: Install File") == 0)
+            break;
+        else
+            WriteLine(wiseTop, g_Line);
+    }
+    // Skip to the end of the file items
+    while (ReadLine(wiseWhole, g_Line))
+    {
+        if ((strncmp(g_Line, "item:", 5) == 0) && (strcmp(g_Line, "item: Install File") != 0))
+        {
+            WriteLine(wiseBottom, g_Line);
+            break;
+        }
+    }
+    // Write the rest of the bottom
+    while (ReadLine(wiseWhole, g_Line))
+    {
+        WriteLine(wiseBottom, g_Line);
+    }
+
+    fclose(wiseTop);
+    fclose(wiseBottom);
+    fclose(wiseWhole);
+
+    return 0;
+}
+
+
--- a/distrib/msw/stubs.rsp
+++ b/distrib/msw/stubs.rsp
@@ -0,0 +1,15 @@
+src/stubs/*.cpp
+src/stubs/*.h
+src/stubs/makefile*
+src/stubs/*.inc
+
+src/make.env
+src/makeprog.env
+src/makelib.env
+
+include/wx/stubs/*.h
+include/wx/stubs/*.rc
+
+lib/dummy
+
+
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -0,0 +1,108 @@
+#!/bin/sh
+# tardist: make up a tar.gz distribution of wxWindows 2
+# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
+
+init=""
+if [ $1 = "" ]
+then
+  exit
+fi
+
+if [ $2 = "" ]
+then
+  exit
+fi
+
+echo About to archive wxWindows:
+echo   From   $1
+echo   To     $2
+echo CTRL-C if this is not correct.
+read dummy
+
+cd $1
+
+echo Removing backup files...
+rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
+
+rm -f $2/wx200*.tgz
+rm -f $2/tex2rtf2.tgz
+rm -f $2/ogl3.tgz
+rm -f $2/treedraw.tar.gz
+rm -f $2/glcanvas.tar.gz
+rm -f $2/jpeg.tgz
+
+echo Tarring...
+
+### Generic
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgen.txt
+tar cvf $2/wx200gen.tar -T /tmp/wxgen.txt
+gzip $2/wx200gen.tar
+mv $2/wx200gen.tar.gz $2/wx200gen.tgz
+
+### wxGTK
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgtk.txt
+tar cvf $2/wx200gtk.tar -T /tmp/wxgtk.txt
+gzip $2/wx200gtk.tar
+mv $2/wx200gtk.tar.gz $2/wx200gtk.tgz
+
+### wxMotif
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxmotif.txt
+tar cvf $2/wx200mot.tar -T /tmp/wxmotif.txt
+gzip $2/wx200mot.tar
+mv $2/wx200mot.tar.gz $2/wx200mot.tgz
+
+### Doc sources
+ls `cat $1/distrib/msw/docsrc.rsp` > /tmp/docsrc.txt
+tar cvf $2/wx200doc.tar -T /tmp/docsrc.txt
+gzip $2/wx200doc.tar
+mv $2/wx200doc.tar.gz $2/wx200doc.tgz
+
+### HTML docs
+ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt
+tar cvf $2/wx200htm.tar -T /tmp/html.txt
+gzip $2/wx200htm.tar
+mv $2/wx200htm.tar.gz $2/wx200htm.tgz
+
+### PDF docs
+ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt
+tar cvf $2/wx200pdf.tar -T /tmp/pdf.txt
+gzip $2/wx200pdf.tar
+mv $2/wx200pdf.tar.gz $2/wx200pdf.tgz
+
+### Stubs files
+ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
+tar cvf $2/wx200stubs.tar -T /tmp/stubs.txt
+gzip $2/wx200stubs.tar
+mv $2/wx200stubs.tar.gz $2/wx200stubs.tgz
+
+### Tex2RTF
+ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt
+tar cvf $2/tex2rtf2.tar -T /tmp/tex2rtf.txt
+gzip $2/tex2rtf2.tar
+mv $2/tex2rtf2.tar.gz $2/tex2rtf2.tgz
+
+### OGL
+ls `cat $1/distrib/msw/ogl.rsp` > /tmp/ogl.txt
+tar cvf $2/ogl3.tar -T /tmp/ogl.txt
+gzip $2/ogl3.tar
+mv $2/ogl3.tar.gz $2/ogl3.tgz
+
+### wxGLCanvas
+ls `cat $1/distrib/msw/glcanvas.rsp` > /tmp/glcanvas.txt
+tar cvf $2/glcanvas.tar -T /tmp/glcanvas.txt
+gzip $2/glcanvas.tar
+mv $2/glcanvas.tar.gz $2/glcanvas.tgz
+
+### wxTreeLayout
+ls `cat $1/distrib/msw/wxtree.rsp` > /tmp/wxtree.txt
+tar cvf $2/treedraw.tar -T /tmp/wxtree.txt
+gzip $2/treedraw.tar
+mv $2/treedraw.tar.gz $2/treedraw.tgz
+
+### JPEG
+ls `cat $1/distrib/msw/jpeg.rsp` > /tmp/jpeg.txt
+tar cvf $2/jpeg.tar -T /tmp/jpeg.txt
+gzip $2/jpeg.tar
+mv $2/jpeg.tar.gz $2/jpeg.tgz
+
+echo Done!
--- a/distrib/msw/tex2rtf.rsp
+++ b/distrib/msw/tex2rtf.rsp
@@ -0,0 +1,27 @@
+utils/tex2rtf/src/*.cpp
+utils/tex2rtf/src/*.h
+utils/tex2rtf/src/make*.*
+utils/tex2rtf/src/Makefile
+utils/tex2rtf/src/*.xbm
+utils/tex2rtf/src/*.xpm
+utils/tex2rtf/src/*.sty
+utils/tex2rtf/src/*.ini
+utils/tex2rtf/lib/dummy
+utils/tex2rtf/src/*.bmp
+utils/tex2rtf/src/*.ico
+utils/tex2rtf/src/*.def
+utils/tex2rtf/src/*.rc
+
+utils/tex2rtf/docs/*.tex
+utils/tex2rtf/docs/*.sty
+utils/tex2rtf/docs/*.bib
+utils/tex2rtf/docs/*.hpj
+utils/tex2rtf/docs/*.ini
+utils/tex2rtf/docs/*.txt
+utils/tex2rtf/docs/*.cnt
+utils/tex2rtf/docs/*.eps
+utils/tex2rtf/docs/*.bmp
+utils/tex2rtf/docs/*.gif
+utils/tex2rtf/docs/*.wmf
+utils/tex2rtf/docs/*.shg
+
--- a/distrib/msw/tmake/Makefile
+++ b/distrib/msw/tmake/Makefile
@@ -0,0 +1,44 @@
+# FIXME we'll generate this makefile with configure later, but for now please
+#       change it manually
+TMAKEDIR=/home/zeitlin/build/tmake
+TMAKE=$(TMAKEDIR)/bin/tmake
+
+WXDIR=../../..
+MSW_MAKEFILES_DIR=$(WXDIR)/src/msw
+
+all: $(MSW_MAKEFILES_DIR)/makefile.vc \
+     $(MSW_MAKEFILES_DIR)/makefile.b32 \
+     $(MSW_MAKEFILES_DIR)/makefile.dos \
+     $(MSW_MAKEFILES_DIR)/makefile.bcc \
+     $(MSW_MAKEFILES_DIR)/makefile.sc \
+     $(MSW_MAKEFILES_DIR)/makefile.wat \
+     $(MSW_MAKEFILES_DIR)/makefile.g95 \
+     $(MSW_MAKEFILES_DIR)/makefile.g295 \
+     $(WXDIR)/Makefile.in
+
+$(MSW_MAKEFILES_DIR)/makefile.vc: filelist.txt wxwin.pro
+	$(TMAKE) -t vc wxwin.pro -o $@
+
+$(MSW_MAKEFILES_DIR)/makefile.b32: filelist.txt wxwin.pro
+	$(TMAKE) -t b32 wxwin.pro -o $@
+
+$(MSW_MAKEFILES_DIR)/makefile.dos: filelist.txt wxwin.pro
+	$(TMAKE) -t dos wxwin.pro -o $@
+
+$(MSW_MAKEFILES_DIR)/makefile.bcc: filelist.txt wxwin.pro
+	$(TMAKE) -t bcc wxwin.pro -o $@
+
+$(MSW_MAKEFILES_DIR)/makefile.sc: filelist.txt wxwin.pro
+	$(TMAKE) -t sc wxwin.pro -o $@
+
+$(MSW_MAKEFILES_DIR)/makefile.wat: filelist.txt wxwin.pro
+	$(TMAKE) -t wat wxwin.pro -o $@
+
+$(MSW_MAKEFILES_DIR)/makefile.g95: filelist.txt wxwin.pro
+	$(TMAKE) -t g95 wxwin.pro -o $@
+
+$(MSW_MAKEFILES_DIR)/makefile.g295: filelist.txt wxwin.pro g295.t
+	$(TMAKE) -t g295 wxwin.pro -o $@
+
+$(WXDIR)/Makefile.in: filelist.txt wxwin.pro
+	$(TMAKE) -t unx wxwin.pro -o $@
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -0,0 +1,347 @@
+#!#############################################################################
+#! File:    b32.t
+#! Purpose: tmake template file from which makefile.b32 is generated by running
+#!          tmake -t b32 wxwin.pro
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        my $tag = "";
+        next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $project{"WXCOMMONOBJS"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        next if $wxMSW{$file} =~ /\b16\b/;
+
+        if ( $file =~ /^automtn/ ) {
+            #! comment in old makefile.b32 seems to imply that this file can't
+            #! be compiled with Borland (leads to crash in oleauto sample)
+            next;
+        }
+
+        $isCFile = $file =~ /\.c$/;
+
+        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
+        $file =~ s/cp?p?$/obj/;
+        my $obj = "\$(MSWDIR)\\" . $file . " ";
+
+        $project{"WXMSWOBJS"} .= $obj;
+        if ( $isOleObj ) {
+            #! remember that this file is in ole subdir
+            $project{"WXOLEOBJS"} .= $obj;
+        }
+        $project{"WXCOBJS"} .= $obj if $isCFile;
+    }
+#$}
+
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
+
+#
+# File:     makefile.b32
+# Author:   Julian Smart
+# Created:  1998
+# Updated:
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxWindows library wx.lib for MS Windows,
+# and Borland C++ (32-bit).
+
+!if "$(BCCDIR)" == ""
+!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
+!endif
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+# Set all these to 1 if you want to build a dynamic library
+!if "$(DLL)" == "1"
+WXMAKINGDLL=1
+WXBUILDDLL=1
+!endif
+
+!include $(WXDIR)\src\makeb32.env
+
+# Please set these according to the settings in wx_setup.h, so we can include
+# the appropriate libraries in wx.lib
+USE_CTL3D=0
+USE_XPM_IN_MSW=0
+
+PERIPH_LIBS=
+PERIPH_TARGET=
+PERIPH_CLEAN_TARGET=
+
+!if "$(USE_CTL3D)" == "1"
+#Use WIN32S/WIN95 32 bit version ctl3d32.dll under win95 (Andre Beltman)
+PERIPH_LIBS=$(WXDIR)\lib\ctl3d32.lib $(PERIPH_LIBS)
+PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
+!endif
+
+!if "$(USE_XPM_IN_MSW)" == "1"
+PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS)
+PERIPH_TARGET=xpm $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
+!endif
+
+#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS)
+PERIPH_LIBS=
+PERIPH_TARGET=zlib png jpeg $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg $(PERIPH_CLEAN_TARGET)
+
+!if "$(DLL)" == "0"
+DUMMY=dummy
+!else
+DUMMY=dummydll
+LIBS= cw32 import32 ole2w32
+!endif
+
+LIBTARGET=$(WXLIB)
+
+GENDIR=..\generic
+COMMDIR=..\common
+OLEDIR=.\ole
+MSWDIR=.
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
+
+# Not needed:
+#  $(MSWDIR)\colrdlgg.obj \
+#  $(MSWDIR)\fontdlgg.obj \
+#  $(MSWDIR)\helpxlp.obj \
+#  $(MSWDIR)\msgdlgg.obj \
+#  $(MSWDIR)\printps.obj \
+#  $(MSWDIR)\prntdlgg.obj \
+#  $(MSWDIR)\listctrl.obj \
+#  $(MSWDIR)\notebook.obj \
+#  $(MSWDIR)\treectrl.obj
+
+COMMONOBJS = \
+		$(MSWDIR)\y_tab.obj \
+		#$ ExpandList("WXCOMMONOBJS");
+
+MSWOBJS = #$ ExpandList("WXMSWOBJS");
+
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+
+default:	wx
+
+wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+all:	all_libs all_execs
+
+!if "$(DLL)" == "0"
+
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
+        -erase $(LIBTARGET)
+	tlib $(LIBTARGET) /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+!
+
+!else
+
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
+	-erase $(LIBTARGET)
+	-erase $(WXLIBDIR)\wx.dll
+        tlink32 $(LINK_FLAGS) /v @&&!
+c0d32.obj $(OBJECTS)
+$(WXLIBDIR)\wx
+nul
+$(PERIPH_LIBS) $(LIBS)
+wxb32
+!
+        implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
+
+!endif
+
+dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+
+$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+
+#        cl @<<
+# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+# <<
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+# $(OBJECTS):	$(WXDIR)\include\wx\setup.h
+
+#${
+    $_ = $project{"WXMSWOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_ . ": ";
+        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+        s/obj$/$suffix/;
+        $text .= $_ . "\n\n";
+    }
+#$}
+
+########################################################
+# Common objects (always compiled)
+
+#${
+    $_ = $project{"WXCOMMONOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_ . ": ";
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+        s/MSWDIR/COMMDIR/;
+        s/obj$/$suffix/;
+        $text .= $_ . "\n\n";
+    }
+#$}
+
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+
+#${
+    $_ = $project{"WXGENERICOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_ . ": ";
+        s/MSWDIR/GENDIR/;
+        s/obj$/\$(SRCSUFF)/;
+        $text .= $_ . "\n\n";
+    }
+#$}
+
+
+all_utils:
+    cd $(WXDIR)\utils
+    make -f makefile.b32
+    cd $(WXDIR)\src\msw
+
+all_samples:
+    cd $(WXDIR)\samples
+    make -f makefile.b32
+    cd $(WXDIR)\src\msw
+
+all_execs:
+    cd $(WXDIR)\utils
+    make -f makefile.b32 all_execs
+    cd $(WXDIR)\src\msw
+
+wxxpm:	$(CFG)
+	cd $(WXDIR)\src\xpm
+	make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
+	cd $(WXDIR)\src\msw
+
+clean_wxxpm:	$(CFG)
+	cd $(WXDIR)\src\xpm
+	make -f makefile.b32 clean
+	cd $(WXDIR)\src\msw
+
+png:    $(CFG)
+        cd $(WXDIR)\src\png
+        make -f makefile.b32
+        cd $(WXDIR)\src\msw
+
+clean_png:
+        cd $(WXDIR)\src\png
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
+zlib:   $(CFG)
+        cd $(WXDIR)\src\zlib
+        make -f makefile.b32 lib
+        cd $(WXDIR)\src\msw
+
+clean_zlib:
+        cd $(WXDIR)\src\zlib
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
+jpeg:    $(CFG)
+        cd $(WXDIR)\src\jpeg
+        make -f makefile.b32
+        cd $(WXDIR)\src\msw
+
+clean_jpeg:
+        cd $(WXDIR)\src\jpeg
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
+$(CFG): makefile.b32
+	copy &&!
+-H=$(WXDIR)\src\msw\wx32.csm
+-3
+-d
+-R-
+-X
+-w-par
+-w-aus
+-w-hid # virtual function A hides virtual function B
+-WE
+-tWM
+
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXDIR)\include\wx\msw\gnuwin32
+
+-L$(BCCDIR)\lib
+-D__WXWIN__
+-D__WXMSW__
+-D__WINDOWS__
+-DWIN32
+$(OPT)
+$(DEBUG_FLAGS)
+$(WIN95FLAG)
+! $(CFG)
+
+#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
+# -Oxt
+
+clean: $(PERIPH_CLEAN_TARGET)
+    -erase $(LIBTARGET)
+    -erase *.obj
+    -erase *.pch
+    -erase *.csm
+    -erase *.cfg
+    -erase ..\common\y_tab.c
+    -erase ..\common\lex_yy.c
+
+cleanall: clean
+
+
+MFTYPE=b32
+# Can't use this or we'll have to distribute all tmake files with wxWindows
+# makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+
+self:
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+
--- a/distrib/msw/tmake/bcc.t
+++ b/distrib/msw/tmake/bcc.t
@@ -0,0 +1,318 @@
+#!#############################################################################
+#! File:    bcc.t
+#! Purpose: tmake template file from which makefile.bcc is generated by running
+#!          tmake -t bcc wxwin.pro -o makefile.bcc
+#!
+#!          TODO:
+#!          - resourc2.obj is not correctly generated (see list and target).
+#!          - cpp is incorrectly substituted into filenames containing 'obj'
+#!
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        my $tag = "";
+        next if $wxGeneric{$file} =~ /\b(PS|G|U)\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        #! socket files don't compile under Win16 currently
+        next if $wxCommon{$file} =~ /\b(32|S)\b/;
+
+        #! needs extra files (sql*.h) so not compiled by default.
+        next if $file =~ /^odbc\./;
+
+        $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $project{"WXCOMMONOBJS"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
+    }
+
+    #! special hack for Borland in 16 bits needs this file
+    $project{"WXCOMMONOBJS"} .= '${MSWDIR}\resourc2.obj';
+
+    foreach $file (sort keys %wxMSW) {
+        #! don't take files not appropriate for 16-bit Windows
+        next if $wxMSW{$file} =~ /\b(32|O)\b/;
+
+        $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $project{"WXMSWOBJS"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
+    }
+#$}
+
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
+
+#
+# File:     makefile.bcc
+# Author:   Julian Smart
+# Created:  1993
+# Updated:
+# Copyright:(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxWindows library wx.lib for Windows 3.1
+# and Borland C++ 3.1
+
+!if "$(BCCDIR)" == ""
+!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
+!endif
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+!if "$(CFG)" == ""
+# !error You must start compiling from wx\src, not wx\src\msw.
+!endif
+
+!ifndef DEBUG
+DEBUG=0
+!endif
+
+WXDIR = $(WXWIN)
+
+!include $(WXDIR)\src\makebcc.env
+
+THISDIR = $(WXDIR)\src\msw
+
+# Please set these according to the settings in wx_setup.h, so we can include
+# the appropriate libraries in wx.lib
+USE_CTL3D=1
+USE_XPM_IN_MSW=0
+
+PERIPH_LIBS=
+PERIPH_TARGET=
+PERIPH_CLEAN_TARGET=
+
+!if "$(USE_CTL3D)" == "1"
+PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
+!endif
+
+!if "$(USE_XPM_IN_MSW)" == "1"
+PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS)
+PERIPH_TARGET=xpm $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
+!endif
+
+# TODO: add these libraries
+# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
+PERIPH_TARGET=zlib png $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png $(PERIPH_CLEAN_TARGET)
+
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+LIBTARGET= $(WXLIBDIR)\wx.lib
+DUMMY=dummy
+
+GENDIR=..\generic
+COMMDIR=..\common
+OLEDIR=.\ole
+MSWDIR=.
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
+
+COMMONOBJS = \
+		$(MSWDIR)\y_tab.obj \
+		#$ ExpandList("WXCOMMONOBJS");
+
+MSWOBJS = #$ ExpandList("WXMSWOBJS");
+
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+
+default:	wx
+
+wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
+	erase $(LIBTARGET)
+	tlib $(LIBTARGET) /P1024 @&&!
+$(COMMONOBJS:.obj =.obj +)\
+$(GENERICOBJS:.obj =.obj +)\
+$(MSWOBJS:.obj =.obj +)\
+$(PERIPH_LIBS:.lib =.lib +)
+!
+
+dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+
+$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+
+#        cl @<<
+# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+# <<
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+# $(OBJECTS):	$(WXDIR)\include\wx\setup.h
+
+#${
+    $_ = $project{"WXMSWOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_ . ": ";
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+        s/obj$/$suffix/;
+        $text .= $_ . "\n\n";
+    }
+#$}
+
+########################################################
+# Common objects (always compiled)
+
+#${
+    $_ = $project{"WXCOMMONOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_ . ": ";
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+        s/MSWDIR/COMMDIR/;
+        s/obj$/$suffix/;
+        $text .= $_ . "\n\n";
+    }
+#$}
+
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+
+#${
+    $_ = $project{"WXGENERICOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_ . ": ";
+        s/MSWDIR/GENDIR/;
+        s/obj$/\$(SRCSUFF)/;
+        $text .= $_ . "\n\n";
+    }
+#$}
+
+all_utils:
+    cd $(WXDIR)\utils
+    make -f makefile.bcc
+    cd $(WXDIR)\src\msw
+
+all_samples:
+    cd $(WXDIR)\samples
+    make -f makefile.bcc
+    cd $(WXDIR)\src\msw
+
+all_execs:
+    cd $(WXDIR)\utils
+    make -f makefile.bcc all_execs
+    cd $(WXDIR)\src\msw
+
+all_libs:
+    cd $(WXDIR)\src\msw
+    make -f makefile.bcc dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
+          wxstring wxtree mfutils # wxxpm
+
+all_contribs:
+    cd $(WXDIR)\src\msw
+    make -f makefile.bcc fafa wxstring itsy gauge # wxxpm
+
+# CONTRIB
+wxxpm:	$(CFG)
+	cd $(WXDIR)\src\xpm
+	make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
+	cd $(WXDIR)\src\msw
+
+png:    $(CFG)
+        cd $(WXDIR)\src\png
+        make -f makefile.bcc
+        cd $(WXDIR)\src\msw
+
+clean_png:
+        cd $(WXDIR)\src\png
+        make -f makefile.bcc clean
+        cd $(WXDIR)\src\msw
+
+zlib:   $(CFG)
+        cd $(WXDIR)\src\zlib
+        make -f makefile.bcc
+        cd $(WXDIR)\src\msw
+
+clean_zlib:
+        cd $(WXDIR)\src\zlib
+        make -f makefile.bcc clean
+        cd $(WXDIR)\src\msw
+
+$(CFG): makefile.bcc
+	copy &&!
+-H=$(WXDIR)\src\msw\borland.pch
+-2
+-P
+-d
+-w-hid
+-w-par
+-w-pia
+-w-aus
+-w-rch
+-ml
+-Od
+-WE
+-Fs-
+-Vf
+-Ff=4
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXDIR)\include\wx\msw\gnuwin32
+-L$(BCCDIR)\lib
+-D__WXWIN__
+-D__WXMSW__
+-D__WINDOWS__
+-D__WIN16__
+! $(CFG)
+!if "$(BOR_VER)" == "3.1"
+	echo -Ff=4 >>$(CFG)
+!elif "$(BOR_VER)" == "4"
+	echo -Ff=512 >>$(CFG)
+	echo -dc >>$(CFG)
+!else
+	echo -Ff=512 >>$(CFG)
+	echo -dc >>$(CFG)
+!endif
+
+# -O was: -Oxt
+
+clean: $(PERIPH_CLEAN_TARGET)
+    erase $(LIBTARGET)
+    erase *.obj
+    erase *.pch
+    erase *.csm
+    erase *.cfg
+	erase ..\common\y_tab.c
+    erase ..\common\lex_yy.c
+
+cleanall: clean
+
+
+MFTYPE=bcc
+# Can't use this or we'll have to distribute all tmake files with wxWindows
+#makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+
+self:
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
--- a/distrib/msw/tmake/dos.t
+++ b/distrib/msw/tmake/dos.t
@@ -0,0 +1,295 @@
+#!#############################################################################
+#! File:    dos.t
+#! Purpose: tmake template file from which makefile.dos is generated by running
+#!          tmake -t dos wxwin.pro -o makefile.dos
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
+            #! this file for some reason wasn't compiled for VC++ 1.52
+            next unless $file =~ /^prntdlgg\./;
+        }
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXGENERICOBJS"} .= "\$(GENDIR)\\" . $file . " "
+    }
+
+    #! because we later search for " <filename> " in this string
+    $project{"WXCOBJS"} = " ";
+
+    foreach $file (sort keys %wxCommon) {
+        #! socket files don't compile under Win16 currently
+        next if $wxCommon{$file} =~ /\b(32|S)\b/;
+
+        $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $obj = "\$(COMMDIR)\\" . $file . " ";
+        #! $project{"WXCOMMONOBJS"} .= $obj;
+        #! have to split lib in 2 halves because otherwise it's too big
+        $project{$file =~ "^[a-o]" ? "WXCOMMONOBJS1" : "WXCOMMONOBJS2"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        #! don't take files not appropriate for 16-bit Windows
+        next if $wxMSW{$file} =~ /\b(32|O)\b/;
+
+        $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        #! have to split lib in 2 halves because otherwise it's too big
+        $project{$file =~ "^[a-o]" ? "WXMSWOBJS1" : "WXMSWOBJS2"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
+    }
+#$}
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
+
+#
+# File:     makefile.dos
+# Author:   Julian Smart
+# Created:  1997
+# Updated:
+# Copyright:(c) 1997, Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxWindows library wx.lib for VC++ (16-bit)
+# Arguments:
+#
+# FINAL=1 argument to nmake to build version with no debugging info.
+#
+!include <..\makemsc.env>
+
+LIBTARGET=$(WXLIB)
+DUMMYOBJ=dummy.obj
+
+# Please set these according to the settings in wx_setup.h, so we can include
+# the appropriate libraries in wx.lib
+
+# This one overrides the others, to be consistent with the settings in wx_setup.h
+MINIMAL_WXWINDOWS_SETUP=0
+
+USE_XPM_IN_MSW=0
+USE_CTL3D=1
+
+!if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
+USE_CTL3D=0
+USE_XPM_IN_MSW=0
+!endif
+
+PERIPH_LIBS=
+PERIPH_TARGET=
+PERIPH_CLEAN_TARGET=
+
+# !if "$(USE_CTL3D)" == "1"
+# PERIPH_LIBS=d:\msdev\lib\ctl3d32.lib $(PERIPH_LIBS)
+# !endif
+
+!if "$(USE_XPM_IN_MSW)" == "1"
+PERIPH_LIBS=$(WXDIR)\contrib\wxxpm\xpm.lib $(PERIPH_LIBS)
+PERIPH_TARGET=xpm $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
+!endif
+
+# PNG and Zlib
+PERIPH_TARGET=png zlib $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)
+
+GENDIR=..\generic
+COMMDIR=..\common
+OLEDIR=.\ole
+MSWDIR=.
+
+GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
+
+# we can't have all objects in one list because the library becomes too big
+COMMONOBJS1 = \
+		$(COMMDIR)\y_tab.obj \
+		#$ ExpandList("WXCOMMONOBJS1");
+
+COMMONOBJS2 = \
+		#$ ExpandList("WXCOMMONOBJS2");
+
+# we can't have all objects in one list because the library becomes too big
+MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
+
+MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");
+
+# TODO: Implement XPM and PNG targets in this makefile!
+#  $(OLEDIR)\xpmhand \
+#  $(OLEDIR)\pnghand \
+
+OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
+
+# Normal, static library
+all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib $(WXDIR)\lib\wx5.lib
+
+$(WXDIR)\lib\wx1.lib:      $(COMMONOBJS1) $(PERIPH_LIBS)
+	-erase $(WXDIR)\lib\wx1.lib
+	lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx1.lib
+y
+$(COMMONOBJS1) $(PERIPH_LIBS)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx2.lib:      $(COMMONOBJS2)
+	-erase $(WXDIR)\lib\wx2.lib
+	lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx2.lib
+y
+$(COMMONOBJS2)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx3.lib:      $(GENERICOBJS)
+	-erase $(WXDIR)\lib\wx3.lib
+	lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx3.lib
+y
+$(GENERICOBJS)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx4.lib:      $(MSWOBJS1)
+	-erase $(WXDIR)\lib\wx4.lib
+	lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx4.lib
+y
+$(MSWOBJS1)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx5.lib:      $(MSWOBJS2)
+	-erase $(WXDIR)\lib\wx5.lib
+	lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx5.lib
+y
+$(MSWOBJS2)
+nul
+;
+<<
+
+########################################################
+# Windows-specific objects
+
+dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h
+        cl @<<
+        cl $(CPPFLAGS) /YcWX/WXPREC.H $(DEBUG_FLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+#dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h
+#        cl $(CPPFLAGS) /YcWX/WXPREC.H $(DEBUG_FLAGS) /c /Tp $*.$(SRCSUFF)
+
+dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h
+        cl @<<
+$(CPPFLAGS) /YcWX/WXPREC.H /c /Tp $*.$(SRCSUFF)
+<<
+
+#${
+    $_ = $project{"WXMSWOBJS1"} . $project{"WXMSWOBJS2"} . $project{"WXCOMMONOBJS1"} . $project{"WXCOMMONOBJS2"} . $project{"WXGENERICOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        if ( $project{"WXCOBJS"} =~ / \Q$_\E / ) {
+            s:\\:/:;
+            $text .= $_ . ':     $*.c' . "\n" .
+                 '        cl @<<' . "\n" .
+                 '$(CPPFLAGS2) /Fo$@ /c /Tc $*.c' . "\n" .
+                 "<<\n\n";
+        }
+        else {
+            s:\\:/:;
+            $text .= $_ . ':     $*.$(SRCSUFF)' . "\n" .
+                 '        cl @<<' . "\n" .
+                 '$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)' . "\n" .
+                 "<<\n\n";
+        }
+    }
+#$}
+
+$(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
+        cl @<<
+$(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c
+<<
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+$(OBJECTS):	$(WXDIR)/include/wx/setup.h
+
+# Peripheral components
+
+xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.dos FINAL=$(FINAL)
+    cd $(WXDIR)\src\msw
+
+clean_xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.dos clean
+    cd $(WXDIR)\src\msw
+
+zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.dos FINAL=$(FINAL)
+    cd $(WXDIR)\src\msw
+
+clean_zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.dos clean
+    cd $(WXDIR)\src\msw
+
+png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.dos FINAL=$(FINAL)
+    cd $(WXDIR)\src\msw
+
+clean_png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.dos clean
+    cd $(WXDIR)\src\msw
+
+clean: $(PERIPH_CLEAN_TARGET)
+        -erase *.obj
+        -erase ..\lib\*.lib
+        -erase *.pdb
+        -erase *.sbr
+        -erase *.pch
+        cd $(WXDIR)\src\generic
+        -erase *.pdb
+        -erase *.sbr
+        -erase *.obj
+        cd $(WXDIR)\src\common
+        -erase *.pdb
+        -erase *.sbr
+        -erase *.obj
+        cd $(WXDIR)\src\msw\ole
+        -erase *.pdb
+        -erase *.sbr
+        -erase *.obj
+        cd $(WXDIR)\src\msw
+
+cleanall: clean
+
+
+MFTYPE=dos
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -0,0 +1,76 @@
+#!#############################################################################
+#! File:    filelist.t
+#! Purpose: tmake template file containig Perl code to parse the filelist.txt
+#!          file - this is used by all other templates.
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+#${
+    open(FILELIST, "filelist.txt") or die "Can't open filelist file: $!\n";
+
+    line: while ( defined($_ = <FILELIST>) ) {
+        chomp;
+
+        #! comment or blank line, skip
+        next line if ( $_ eq "" or /^#/ );
+
+        #! if ( $verbose ) {
+        #!     print STDERR "Processing line: '$_'\n";
+        #! }
+
+        my @fields = split "\t";
+        if ( $#fields > 2 ) {
+            warn "Ignoring malformed line $_ in the filelist file.\n";
+            next line;
+        } elsif ( $#fields == 1 ) {
+            #! add an empty flags string
+            $fields[2] = "";
+        }
+
+        if ( $verbose ) {
+            print STDERR "File $fields[0]: type '$fields[1]', flags '$fields[2]'\n";
+        }
+
+        #! first column is filename, second is type, third is flags
+        if ( $fields[1] eq "C" ) {
+            $wxCommon{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "G" ) {
+            $wxGeneric{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "M" ) {
+            $wxMSW{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "X" ) {
+            $wxMOTIF{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "R" ) {
+            $wxGTK{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "H" ) {
+            $wxHTML{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "U" ) {
+            $wxUNIX{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "B" ) {
+            $wxBase{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "W" ) {
+            $wxWXINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "P" ) {
+            $wxPROTOCOLINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "L" ) {
+            $wxHTMLINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "F" ) {
+            $wxMOTIFINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "9" ) {
+            $wxMSWINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "K" ) {
+            $wxGTKINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "S" ) {
+            $wxUNIXINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "N" ) {
+            $wxGENERICINCLUDE{$fields[0]} = $fields[2];
+        } else {
+            warn "Unknown file type $fields[1] for $fields[0], ignoring.\n";
+            next line;
+        }
+    }
+
+    close(FILELIST);
+#$}
+#! vim:sw=4:ts=4:list:et
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -0,0 +1,903 @@
+###############################################################################
+# File:    src/msw/filelist.cpp
+# Purpose: The list of source files for MSW version of wxWindows.
+# Author:  Vadim Zeitlin
+# Created: 14.07.99
+# Version: $Id$
+#
+# Format of this file: TAB separated columns. The first column contains the
+# filename, the second a letter corresonding a directory:
+#  B	/src/common but only needed for the wxBase compilation
+#  G	/src/generic
+#  C	/src/common
+#  M	/src/msw
+#  X	/src/motif   X for Xt
+#  U	/src/unix
+#  R	/src/gtk     R for Robert
+#  H	/src/html
+#  W	/include/wx
+#  K	/include/wx/gtk        K for gtK
+#  F	/include/wx/motif      F for motiF
+#  9	/include/wx/msw        9 for Windows 9x
+#  N	/include/wx/generic    N for geNeric
+#  L	/include/wx/html       L for htmL
+#  P	/include/wx/protocol
+#  S	/include/wx/unix       S for poSix
+#
+# The third column may be empty or contain some additional info about this
+# file (only compile it in 16bit mode, don't compile it with this or that
+# compiler, &c)
+#
+# Known flags:
+#  B	makes part of the base library too
+#  16	a generic file implementing Win32 control for Win16
+#  32	only can be compiled under Win32
+#  PS	PostScript related file, normally not compiled under Windows
+#  G	generic code which might be used instead of native one
+#  U	Unix-ish file, normally not compiled under Windows
+#  O	OLE file (needs Win32 and a decent compiler)
+#  S	Socket file (currently doesn't compile under Win16 nor with GNU)
+#  R	Not required for the GTK port
+#  X	Not required for the Motif port
+#
+#  WX	Base header
+#  GTK	GTK header
+#  MSW	MSW header
+#  MAC	Mac header
+#  MOT	Motif header
+#  PM	OS/2 header
+#  GEN	Generic header
+#  PRO	Protocol header
+#  HTM	wxHtml header
+#  UNX	Unix header
+###############################################################################
+
+# File name 	Type	Flags
+
+busyinfo.cpp	G
+caret.cpp	G	U
+choicdgg.cpp	G
+colrdlgg.cpp	G	G
+dcpsg.cpp	G	U
+dirdlgg.cpp	G	16
+fontdlgg.cpp	G	G,R
+filedlgg.cpp	G	U,X
+grid.cpp	G
+helpext.cpp	G	G
+helphtml.cpp	G	G
+helpwxht.cpp	G	G
+helpxlp.cpp	G	G,R
+imaglist.cpp	G	16
+laywin.cpp	G
+listctrl.cpp	G	16
+logg.cpp	G
+msgdlgg.cpp	G	G
+notebook.cpp	G	16,R
+panelg.cpp	G
+printps.cpp	G	PS
+prntdlgg.cpp	G	PS,U
+progdlgg.cpp	G
+prop.cpp	G
+propform.cpp	G
+proplist.cpp	G
+sashwin.cpp	G
+scrolwin.cpp	G
+splitter.cpp	G
+statline.cpp	G	U,R
+statusbr.cpp	G
+tabg.cpp	G
+numdlgg.cpp	G
+textdlgg.cpp	G
+tipdlg.cpp	G
+treectrl.cpp	G	16
+wizard.cpp	G
+
+appcmn.cpp	C	B
+choiccmn.cpp	C
+cmndata.cpp	C
+clipcmn.cpp	C
+config.cpp	C	B
+ctrlcmn.cpp	C
+ctrlsub.cpp	C
+date.cpp	C	B
+datstrm.cpp	C
+db.cpp	C
+dbtable.cpp	C
+dcbase.cpp	C
+dlgcmn.cpp	C
+dobjcmn.cpp	C
+docmdi.cpp	C
+docview.cpp	C
+dynarray.cpp	C	B
+dynlib.cpp	C	B
+event.cpp	C	B
+extended.c	C	B
+ffile.cpp	C	B
+file.cpp	C	B
+fileconf.cpp	C	B
+filefn.cpp	C	B
+filesys.cpp	C	B
+fontcmn.cpp	C
+fontmap.cpp	C
+framecmn.cpp	C
+fs_inet.cpp	C
+fs_zip.cpp	C
+ftp.cpp	C	S
+gdicmn.cpp	C
+gifdecod.cpp	C
+hash.cpp	C	B
+helpbase.cpp	C
+http.cpp	C	S
+imagbmp.cpp	C
+image.cpp	C
+imagall.cpp	C
+imaggif.cpp	C
+imagjpeg.cpp	C	32
+imagpcx.cpp	C	32
+imagpng.cpp	C	32
+imagpnm.cpp	C	32
+init.cpp	B
+intl.cpp	C	B
+ipcbase.cpp	C
+layout.cpp	C
+lboxcmn.cpp	C
+list.cpp	C	B
+log.cpp	C	B
+memory.cpp	C
+menucmn.cpp	C
+mimetype.cpp	C	32,B
+module.cpp	C	B
+mstream.cpp	C
+object.cpp	C	B
+objstrm.cpp	C
+odbc.cpp	C	R,X
+paper.cpp	C
+prntbase.cpp	C
+process.cpp	C	32,B
+protocol.cpp	C	S
+resource.cpp	C
+sckaddr.cpp	C	S
+sckfile.cpp	C	S
+sckipc.cpp	C	S
+sckstrm.cpp	C	S
+serbase.cpp	C
+sizer.cpp	C
+socket.cpp	C	S
+stream.cpp	C	B
+strconv.cpp	C	B
+string.cpp	C	B
+tbarbase.cpp	C
+tbarsmpl.cpp	C
+textcmn.cpp	C
+textfile.cpp	C	B
+time.cpp	C	B
+timercmn.cpp	C	B
+tokenzr.cpp	C	B
+txtstrm.cpp	C	B
+unzip.c	C
+url.cpp	C	S
+utilscmn.cpp	C	B
+valgen.cpp	C
+validate.cpp	C
+valtext.cpp	C
+variant.cpp	C	B
+wfstream.cpp	C
+wincmn.cpp	C
+wxchar.cpp	C	B
+wxexpr.cpp	C
+zipstrm.cpp	C
+zstream.cpp	C
+
+accel.cpp	M
+app.cpp	M
+automtn.cpp	M	O
+bitmap.cpp	M
+bmpbuttn.cpp	M
+brush.cpp	M
+button.cpp	M
+caret.cpp	M
+checkbox.cpp	M
+checklst.cpp	M
+choice.cpp	M
+clipbrd.cpp	M
+colordlg.cpp	M
+colour.cpp	M
+combobox.cpp	M
+control.cpp	M
+curico.cpp	M
+cursor.cpp	M
+data.cpp	M
+dataobj.cpp	M	O
+dc.cpp	M
+dcclient.cpp	M
+dcmemory.cpp	M
+dcprint.cpp	M
+dcscreen.cpp	M
+dde.cpp	M
+dialog.cpp	M
+dib.cpp	M
+dibutils.cpp	M
+dirdlg.cpp	M	32
+dragimag.cpp	M
+dropsrc.cpp	M	O
+droptgt.cpp	M	O
+filedlg.cpp	M
+font.cpp	M
+fontdlg.cpp	M
+fontenum.cpp	M
+fontutil.cpp	M
+frame.cpp	M
+gauge95.cpp	M	32
+gaugemsw.cpp	M	16
+gdiobj.cpp	M
+helpwin.cpp	M
+icon.cpp	M
+imaglist.cpp	M	32
+iniconf.cpp	M	16
+joystick.cpp	M
+listbox.cpp	M
+listctrl.cpp	M	32
+main.cpp	M
+mdi.cpp	M
+menu.cpp	M
+menuitem.cpp	M
+metafile.cpp	M
+minifram.cpp	M
+msgdlg.cpp	M
+nativdlg.cpp	M
+notebook.cpp	M	32
+oleutils.cpp	M	O
+ownerdrw.cpp	M
+palette.cpp	M
+pen.cpp	M
+penwin.cpp	M
+pnghand.cpp	M	32
+printdlg.cpp	M
+printwin.cpp	M
+radiobox.cpp	M
+radiobut.cpp	M
+regconf.cpp	M	32
+region.cpp	M
+registry.cpp	M	32
+scrolbar.cpp	M
+settings.cpp	M
+slider95.cpp	M	32
+slidrmsw.cpp	M	16
+spinbutt.cpp	M
+spinctrl.cpp	M
+statbmp.cpp	M
+statbox.cpp	M
+statbr95.cpp	M	32
+statline.cpp	M
+stattext.cpp	M
+tabctrl.cpp	M
+taskbar.cpp	M	32
+tbar95.cpp	M	32
+tbarmsw.cpp	M	16
+textctrl.cpp	M
+thread.cpp	M	32
+timer.cpp	M
+tooltip.cpp	M	32
+treectrl.cpp	M	32
+utils.cpp	M
+utilsexc.cpp	M
+uuid.cpp	M	O
+wave.cpp	M
+window.cpp	M
+xpmhand.cpp	M
+gsocket.c	M	S
+
+dialup.cpp	U
+fontenum.cpp	U
+fontutil.cpp	U
+threadpsx.cpp	U
+utilsunx.cpp	U	B
+gsocket.c	U
+
+gsockgtk.c	R
+win_gtk.c	R
+accel.cpp	R
+app.cpp	R
+bitmap.cpp	R
+bmpbuttn.cpp	R
+brush.cpp	R
+button.cpp	R
+checkbox.cpp	R
+checklst.cpp	R
+choice.cpp	R
+clipbrd.cpp	R
+colour.cpp	R
+combobox.cpp	R
+control.cpp	R
+cursor.cpp	R
+data.cpp	R
+dataobj.cpp	R
+dc.cpp	R
+dcclient.cpp	R
+dcmemory.cpp	R
+dcscreen.cpp	R
+dialog.cpp	R
+dnd.cpp	R
+font.cpp	R
+fontdlg.cpp	R
+frame.cpp	R
+gauge.cpp	R
+gdiobj.cpp	R
+icon.cpp	R
+listbox.cpp	R
+main.cpp	R
+mdi.cpp	R
+menu.cpp	R
+minifram.cpp	R
+notebook.cpp	R
+palette.cpp	R
+pen.cpp	R
+radiobox.cpp	R
+radiobut.cpp	R
+region.cpp	R
+scrolbar.cpp	R
+settings.cpp	R
+slider.cpp	R
+spinbutt.cpp	R
+spinctrl.cpp	R
+statbmp.cpp	R
+statbox.cpp	R
+statline.cpp	R
+stattext.cpp	R
+tbargtk.cpp	R
+textctrl.cpp	R
+timer.cpp	R
+tooltip.cpp	R
+utilsgtk.cpp	R
+utilsres.cpp	R
+wave.cpp	R
+window.cpp	R
+
+gsockmot.c	X	S
+accel.cpp	X
+app.cpp	X
+bitmap.cpp	X
+bmpbuttn.cpp	X
+brush.cpp	X
+button.cpp	X
+checkbox.cpp	X
+checklst.cpp	X
+choice.cpp	X
+clipbrd.cpp	X
+colour.cpp	X
+combobox.cpp	X
+control.cpp	X
+cursor.cpp	X
+data.cpp	X
+dataobj.cpp	X
+dc.cpp	X
+dcclient.cpp	X
+dcmemory.cpp	X
+dcscreen.cpp	X
+dialog.cpp	X
+filedlg.cpp	X
+font.cpp	X
+frame.cpp	X
+gauge.cpp	X
+gdiobj.cpp	X
+icon.cpp	X
+listbox.cpp	X
+main.cpp	X
+mdi.cpp	X
+menu.cpp	X
+menuitem.cpp	X
+minifram.cpp	X
+msgdlg.cpp	X
+palette.cpp	X
+pen.cpp	X
+radiobox.cpp	X
+radiobut.cpp	X
+region.cpp	X
+scrolbar.cpp	X
+settings.cpp	X
+slider.cpp	X
+spinbutt.cpp	X
+statbmp.cpp	X
+statbox.cpp	X
+stattext.cpp	X
+toolbar.cpp	X
+textctrl.cpp	X
+timer.cpp	X
+utils.cpp	X
+window.cpp	X
+
+helpdata.cpp	H
+helpfrm.cpp	H
+helpctrl.cpp	H
+htmlcell.cpp	H
+htmlfilt.cpp	H
+htmlpars.cpp	H
+htmltag.cpp	H
+htmlwin.cpp	H
+winpars.cpp	H
+m_fonts.cpp	H
+m_hline.cpp	H
+m_image.cpp	H
+m_layout.cpp	H
+m_links.cpp	H
+m_list.cpp	H
+m_pre.cpp	H
+m_tables.cpp	H
+htmprint.cpp	H
+
+arrimpl.cpp	W
+listimpl.cpp	W
+accel.h	W
+app.h	W	B
+bitmap.h	W
+bmpbuttn.h	W
+brush.h	W
+buffer.h	W
+busyinfo.h	W
+button.h	W
+caret.h	W
+checkbox.h	W
+checklst.h	W
+choicdlg.h	W
+choice.h	W
+clipbrd.h	W
+cmndata.h	W
+colordlg.h	W
+colour.h	W
+combobox.h	W
+confbase.h	W
+config.h	W
+control.h	W
+ctrlsub.h	W
+cursor.h	W
+dataobj.h	W
+date.h	W	B
+datstrm.h	W
+db.h	W
+dbtable.h	W
+dc.h	W
+dcclient.h	W
+dcmemory.h	W
+dcprint.h	W
+dcps.h	W
+dcscreen.h	W
+dde.h	W
+debug.h	W	B
+defs.h	W	B
+dialog.h	W
+dialup.h	W
+dirdlg.h	W
+dnd.h	W
+docmdi.h	W
+docview.h	W
+dragimag.h	W
+dynarray.h	W	B
+dynlib.h	W	B
+event.h	W	B
+expr.h	W
+ffile.h	W	B
+file.h	W	B
+fileconf.h	W	B
+filedlg.h	W
+filefn.h	W
+filesys.h	W
+font.h	W
+fontdlg.h	W
+fontenum.h	W
+fontmap.h	W
+fontdlg.h	W
+fontutil.h	W
+frame.h	W
+fs_inet.h	W
+fs_zip.h	W
+gauge.h	W
+gdicmn.h	W
+gdiobj.h	W
+gifdecod.h	W
+grid.h	W
+gsocket.h	W
+hash.h	W	B
+help.h	W
+helpbase.h	W
+helphtml.h	W
+helpwin.h	W
+helpxlp.h	W
+icon.h	W
+image.h	W
+imaglist.h	W
+intl.h	W	B
+ioswrap.h	W
+ipcbase.h	W
+joystick.h	W
+layout.h	W
+laywin.h	W
+list.h	W	B
+listbox.h	W
+listctrl.h	W
+log.h	W	B
+longlong.h	W	B
+matrix.h	W
+mdi.h	W
+memory.h	W
+menu.h	W
+menuitem.h	W
+metafile.h	W
+mimetype.h	W	B
+minifram.h	W
+module.h	W	B
+msgdlg.h	W
+mstream.h	W
+notebook.h	W
+object.h	W	B
+objstrm.h	W
+odbc.h	W
+ownerdrw.h	W
+palette.h	W
+panel.h	W
+paper.h	W
+pen.h	W
+pnghand.h	W
+print.h	W
+printdlg.h	W
+prntbase.h	W
+process.h	W	B
+progdlg.h	W
+prop.h	W
+propform.h	W
+proplist.h	W
+radiobox.h	W
+radiobut.h	W
+region.h	W
+resource.h	W
+sashwin.h	W
+sckaddr.h	W
+sckipc.h	W
+sckstrm.h	W
+scrolbar.h	W
+scrolwin.h	W
+serbase.h	W
+settings.h	W
+setup.h	W	B
+sizer.h	W
+slider.h	W
+socket.h	W
+spinbutt.h	W
+spinctrl.h	W
+splitter.h	W
+statbmp.h	W
+statbox.h	W
+statline.h	W
+stattext.h	W
+statusbr.h	W
+strconv.h	W	B
+stream.h	W	B
+string.h	W	B
+tab.h	W
+tabctrl.h	W
+taskbar.h	W
+tbar95.h	W
+tbarbase.h	W
+tbarmsw.h	W
+tbarsmpl.h	W
+textctrl.h	W
+textdlg.h	W
+textfile.h	W	B
+txtstrm.h	W	B
+thread.h	W	B
+time.h	W	B
+timer.h	W	B
+tipdlg.h	W
+tokenzr.h	W	B
+toolbar.h	W
+tooltip.h	W
+treectrl.h	W
+types.h	W
+url.h	W
+utils.h	W	B
+valgen.h	W
+validate.h	W
+valtext.h	W
+variant.h	W	B
+version.h	W	B
+wave.h	W
+wfstream.h	W
+window.h	W
+wx.h	W	B
+wx_cw.h	W
+wx_cw_cm.h	W
+wx_cw_d.h	W
+wxchar.h	W	B
+wxexpr.h	W
+wxhtml.h	W
+wxprec.h	W	B
+xpmhand.h	W
+zipstrm.h	W
+zstream.h	W
+
+accel.h	K
+app.h	K
+bitmap.h	K
+bmpbuttn.h	K
+brush.h	K
+button.h	K
+checkbox.h	K
+checklst.h	K
+choice.h	K
+clipbrd.h	K
+colour.h	K
+combobox.h	K
+control.h	K
+cursor.h	K
+dataform.h	K
+dataobj.h	K
+dataobj2.h	K
+dc.h	K
+dcclient.h	K
+dcmemory.h	K
+dcscreen.h	K
+dialog.h	K
+dnd.h	K
+filedlg.h	K
+font.h	K
+fontdlg.h	K
+frame.h	K
+gauge.h	K
+gdiobj.h	K
+icon.h	K
+joystick.h	K
+listbox.h	K
+mdi.h	K
+menu.h	K
+menuitem.h	K
+minifram.h	K
+notebook.h	K
+palette.h	K
+pen.h	K
+radiobox.h	K
+radiobut.h	K
+region.h	K
+scrolbar.h	K
+settings.h	K
+slider.h	K
+spinbutt.h	K
+spinctrl.h	K
+statbmp.h	K
+statbox.h	K
+statline.h	K
+stattext.h	K
+tbargtk.h	K
+textctrl.h	K
+timer.h	K
+tooltip.h	K
+treectrl.h	K
+wave.h	K
+win_gtk.h	K
+window.h	K
+
+accel.h	F
+app.h	F
+bitmap.h	F
+bmpbuttn.h	F
+brush.h	F
+button.h	F
+checkbox.h	F
+checklst.h	F
+choice.h	F
+clipbrd.h	F
+colordlg.h	F
+colour.h	F
+combobox.h	F
+control.h	F
+cursor.h	F
+dataform.h	F
+dataobj.h	F
+dataobj2.h	F
+dc.h	F
+dcclient.h	F
+dcmemory.h	F
+dcprint.h	F
+dcscreen.h	F
+dialog.h	F
+dnd.h	F
+filedlg.h	F
+font.h	F
+fontdlg.h	F
+frame.h	F
+gauge.h	F
+gdiobj.h	F
+icon.h	F
+joystick.h	F
+listbox.h	F
+mdi.h	F
+menu.h	F
+menuitem.h	F
+metafile.h	F
+minifram.h	F
+msgdlg.h	F
+palette.h	F
+pen.h	F
+print.h	F
+printdlg.h	F
+private.h	F
+radiobox.h	F
+radiobut.h	F
+region.h	F
+scrolbar.h	F
+settings.h	F
+slider.h	F
+spinbutt.h	F
+statbmp.h	F
+statbox.h	F
+stattext.h	F
+textctrl.h	F
+timer.h	F
+toolbar.h	F
+window.h	F
+
+accel.h	9
+app.h	9
+bitmap.h	9
+bmpbuttn.h	9
+brush.h	9
+button.h	9
+caret.h	9
+checkbox.h	9
+checklst.h	9
+choice.h	9
+clipbrd.h	9
+colordlg.h	9
+colour.h	9
+combobox.h	9
+control.h	9
+curico.h	9
+curicop.h	9
+cursor.h	9
+dc.h	9
+dcclient.h	9
+dcmemory.h	9
+dcprint.h	9
+dcscreen.h	9
+dde.h	9
+dialog.h	9
+dib.h	9
+dibutils.h	9
+dirdlg.h	9
+dragimag.h	9
+filedlg.h	9
+font.h	9
+fontdlg.h	9
+frame.h	9
+gauge.h	9
+gauge95.h	9
+gaugemsw.h	9
+gdiobj.h	9
+helpwin.h	9
+icon.h	9
+imaglist.h	9
+iniconf.h	9
+joystick.h	9
+listbox.h	9
+listctrl.h	9
+mdi.h	9
+menu.h	9
+menuitem.h	9
+metafile.h	9
+minifram.h	9
+msgdlg.h	9
+msvcrt.h	9
+notebook.h	9
+palette.h	9
+pen.h	9
+pnghand.h	9
+pngread.h	9
+printdlg.h	9
+printwin.h	9
+private.h	9
+radiobox.h	9
+radiobut.h	9
+regconf.h	9
+region.h	9
+registry.h	9
+scrolbar.h	9
+settings.h	9
+setup0.h	9
+slider.h	9
+slider95.h	9
+slidrmsw.h	9
+spinbutt.h	9
+statbmp.h	9
+statbox.h	9
+statbr95.h	9
+statline.h	9
+stattext.h	9
+tabctrl.h	9
+taskbar.h	9
+tbar95.h	9
+tbarmsw.h	9
+textctrl.h	9
+timer.h	9
+tooltip.h	9
+treectrl.h	9
+wave.h	9
+window.h	9
+winundef.h	9
+xpmhand.h	9
+# blank.cur	9
+# bullseye.cur	9
+# child.ico	9
+# clock.cur	9
+# error.ico	9
+# hand.cur	9
+# heart.cur	9
+# info.ico	9
+# magnif1.cur	9
+# mdi.ico	9
+# noentry.cur	9
+# pbrush.cur	9
+# pencil.cur	9
+# pntleft.cur	9
+# pntright.cur	9
+# query.cur	9
+# question.ico	9
+# roller.cur	9
+# size.cur	9
+# std.ico	9
+# tip.ico	9
+# warning.ico	9
+# watch1.cur	9
+# disable.bmp	9
+# wx.rc	9
+
+fontutil.h	S
+execute.h	S
+
+file.h	P
+ftp.h	P
+http.h	P
+protocol.h	P
+
+forcelnk.h	L
+helpdata.h	L
+helpfrm.h	L
+helpctrl.h	L
+htmlcell.h	L
+htmldefs.h	L
+htmlfilt.h	L
+htmlpars.h	L
+htmltag.h	L
+htmlwin.h	L
+winpars.h	L
+m_templ.h	L
+htmprint.h	L
+
+caret.h	N
+choicdgg.h	N
+colrdlgg.h	N
+dcpsg.h	N
+dirdlgg.h	N
+fontdlgg.h	N
+filedlgg.h	N
+grid.h	N
+gridg.h	N
+helpext.h	N
+helpwxht.h	N
+helphtml.h	N
+helpxlp.h	N
+imaglist.h	N
+laywin.h	N
+listctrl.h	N
+msgdlgg.h	N
+notebook.h	N
+panelg.h	N
+printps.h	N
+prntdlgg.h	N
+progdlgg.h	N
+sashwin.h	N
+scrolwin.h	N
+splitter.h	N
+statusbr.h	N
+tabg.h	N
+textdlgg.h	N
+treectrl.h	N
+
+# vi: set noet ts=16 nolist:
--- a/distrib/msw/tmake/g295.t
+++ b/distrib/msw/tmake/g295.t
@@ -0,0 +1,263 @@
+#!#############################################################################
+#! File:    g295.t
+#! Purpose: tmake template file from which makefile.g295 is generated by running
+#!          tmake -t g295 wxwin.pro -o makefile.g295
+#! Author:  Vadim Zeitlin, Robert Roebling, Julian Smart
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
+        #! so take the generic version
+        if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
+            next;
+        }
+
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b(16)\b/;
+
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        #! Mingw32 doesn't have the OLE headers and has some troubles with
+        #! socket code
+        next if $wxMSW{$file} =~ /\b(16)\b/;
+
+	$project{"WXMSWOBJS"} .= '$(MSWDIR)/';
+        $project{"WXMSWOBJS"} .= 'ole/' if $wxMSW{$file} =~ /\bO\b/;
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXMSWOBJS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)/' . $file . " "
+    }
+
+#$}
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G295.T!
+
+#
+# File:     makefile.g295
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Created:  1993
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
+#
+# Makefile for libwx.a
+
+# Replace this with your own path if necessary
+WXDIR = ../..
+
+# All common compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/makeg95.env
+
+# Subordinate library possibilities
+
+EXTRAOBJS=
+
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+XPMDIR  = $(WXDIR)/src/xpm
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+ZLIBDIR = $(WXDIR)/src/zlib
+OLEDIR  = $(WXDIR)/src/msw/ole
+MSWDIR  = $(WXDIR)/src/msw
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS = \
+                #$ ExpandList("WXGENERICOBJS");
+
+COMMONOBJS  = \
+		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		#$ ExpandList("WXCOMMONOBJS");
+
+HTMLOBJS = \
+                #$ ExpandList("WXHTMLOBJS");
+
+MSWOBJS     = \
+		#$ ExpandList("WXMSWOBJS");
+
+ZLIBOBJS    = \
+		$(ZLIBDIR)/adler32.$(OBJSUFF) \
+		$(ZLIBDIR)/compress.$(OBJSUFF) \
+		$(ZLIBDIR)/crc32.$(OBJSUFF) \
+		$(ZLIBDIR)/gzio.$(OBJSUFF) \
+		$(ZLIBDIR)/uncompr.$(OBJSUFF) \
+		$(ZLIBDIR)/deflate.$(OBJSUFF) \
+		$(ZLIBDIR)/trees.$(OBJSUFF) \
+		$(ZLIBDIR)/zutil.$(OBJSUFF) \
+		$(ZLIBDIR)/inflate.$(OBJSUFF) \
+		$(ZLIBDIR)/infblock.$(OBJSUFF) \
+		$(ZLIBDIR)/inftrees.$(OBJSUFF) \
+		$(ZLIBDIR)/infcodes.$(OBJSUFF) \
+		$(ZLIBDIR)/infutil.$(OBJSUFF) \
+		$(ZLIBDIR)/inffast.$(OBJSUFF)
+
+PNGOBJS     = \
+		$(PNGDIR)/png.$(OBJSUFF) \
+		$(PNGDIR)/pngread.$(OBJSUFF) \
+		$(PNGDIR)/pngrtran.$(OBJSUFF) \
+		$(PNGDIR)/pngrutil.$(OBJSUFF) \
+		$(PNGDIR)/pngpread.$(OBJSUFF) \
+		$(PNGDIR)/pngtrans.$(OBJSUFF) \
+		$(PNGDIR)/pngwrite.$(OBJSUFF) \
+		$(PNGDIR)/pngwtran.$(OBJSUFF) \
+		$(PNGDIR)/pngwutil.$(OBJSUFF) \
+		$(PNGDIR)/pngerror.$(OBJSUFF) \
+		$(PNGDIR)/pngmem.$(OBJSUFF) \
+		$(PNGDIR)/pngwio.$(OBJSUFF) \
+		$(PNGDIR)/pngrio.$(OBJSUFF) \
+		$(PNGDIR)/pngget.$(OBJSUFF) \
+		$(PNGDIR)/pngset.$(OBJSUFF)
+
+
+JPEGOBJS    = \
+		$(JPEGDIR)/jcomapi.$(OBJSUFF) \
+		$(JPEGDIR)/jutils.$(OBJSUFF) \
+		$(JPEGDIR)/jerror.$(OBJSUFF) \
+		$(JPEGDIR)/jmemmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jmemnobs.$(OBJSUFF) \
+		$(JPEGDIR)/jcapimin.$(OBJSUFF) \
+		$(JPEGDIR)/jcapistd.$(OBJSUFF) \
+		$(JPEGDIR)/jctrans.$(OBJSUFF) \
+		$(JPEGDIR)/jcparam.$(OBJSUFF) \
+		$(JPEGDIR)/jdatadst.$(OBJSUFF) \
+		$(JPEGDIR)/jcinit.$(OBJSUFF) \
+		$(JPEGDIR)/jcmaster.$(OBJSUFF) \
+		$(JPEGDIR)/jcmarker.$(OBJSUFF) \
+		$(JPEGDIR)/jcmainct.$(OBJSUFF) \
+		$(JPEGDIR)/jcprepct.$(OBJSUFF) \
+		$(JPEGDIR)/jccoefct.$(OBJSUFF) \
+		$(JPEGDIR)/jccolor.$(OBJSUFF) \
+		$(JPEGDIR)/jcsample.$(OBJSUFF) \
+		$(JPEGDIR)/jchuff.$(OBJSUFF) \
+		$(JPEGDIR)/jcphuff.$(OBJSUFF) \
+		$(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctfst.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctflt.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctint.$(OBJSUFF) \
+		$(JPEGDIR)/jdapimin.$(OBJSUFF) \
+		$(JPEGDIR)/jdapistd.$(OBJSUFF) \
+		$(JPEGDIR)/jdtrans.$(OBJSUFF) \
+		$(JPEGDIR)/jdatasrc.$(OBJSUFF) \
+		$(JPEGDIR)/jdmaster.$(OBJSUFF) \
+		$(JPEGDIR)/jdinput.$(OBJSUFF) \
+		$(JPEGDIR)/jdmarker.$(OBJSUFF) \
+		$(JPEGDIR)/jdhuff.$(OBJSUFF) \
+		$(JPEGDIR)/jdphuff.$(OBJSUFF) \
+		$(JPEGDIR)/jdmainct.$(OBJSUFF) \
+		$(JPEGDIR)/jdcoefct.$(OBJSUFF) \
+		$(JPEGDIR)/jdpostct.$(OBJSUFF) \
+		$(JPEGDIR)/jddctmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jidctfst.$(OBJSUFF) \
+		$(JPEGDIR)/jidctflt.$(OBJSUFF) \
+		$(JPEGDIR)/jidctint.$(OBJSUFF) \
+		$(JPEGDIR)/jidctred.$(OBJSUFF) \
+		$(JPEGDIR)/jdsample.$(OBJSUFF) \
+		$(JPEGDIR)/jdcolor.$(OBJSUFF) \
+		$(JPEGDIR)/jquant1.$(OBJSUFF) \
+		$(JPEGDIR)/jquant2.$(OBJSUFF) \
+		$(JPEGDIR)/jdmerge.$(OBJSUFF)
+
+XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
+		$(XPMDIR)/crdatfri.o\
+		$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+		$(XPMDIR)/crifrdat.o\
+		$(XPMDIR)/data.o\
+		$(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
+		$(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+		$(XPMDIR)/rdftoi.o\
+		$(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
+		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
+		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+
+all:    $(OBJECTS) $(WXLIB)
+
+$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
+	ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+	$(RANLIB) $@
+
+$(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+
+$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
+	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+	copy ..\common\dosyacc.c ..\common\y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+	copy ..\common\doslex.c ..\common\lex_yy.c
+
+# Replace lex with flex if you run into compilation
+# problems with lex_yy.c. See also note about LEX_SCANNER
+# above.
+# $(COMMDIR)/lex_yy.c:	$(COMMDIR)/lexer.l
+#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
+# Try one of these if the above line doesn't work.
+# Alternative syntax (1)
+#	$(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+# Alternative syntax (2)
+#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
+#	sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
+#	sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
+#       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
+#	rm -f lex.yy.c
+#
+# Replace yacc with bison if you run into compilation
+# problems with y_tab.c.
+#
+# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
+#	$(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
+#
+# If you use e.g. gcc on Unix, uncomment these lines
+# and comment out the above.
+#
+# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
+#	$(YACC) $(COMMDIR)/parser.y
+#	mv y.tab.c $(COMMDIR)/y_tab.c
+
+clean:
+	-erase *.o
+	-erase *.bak
+	-erase core
+	-erase ..\common\y_tab.c
+	-erase ..\common\lex_yy.c
+	-erase ..\common\*.o
+	-erase ..\common\*.bak
+	-erase ..\generic\*.o
+	-erase ..\generic\*.bak
+	-erase ..\html\*.o
+	-erase ..\png\*.o
+	-erase ..\png\*.bak
+	-erase ..\zlib\*.o
+	-erase ..\zlib\*.bak
+	-erase ..\jpeg\*.o
+	-erase ..\..\lib\libwx.a
+
+cleanall: clean
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -0,0 +1,322 @@
+#!#############################################################################
+#! File:    g95.t
+#! Purpose: tmake template file from which makefile.g95 is generated by running
+#!          tmake -t g95 wxwin.pro -o makefile.g95
+#! Author:  Vadim Zeitlin, Robert Roebling, Julian Smart
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
+        #! so take the generic version
+        if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
+            next #! unless $file =~ /^dirdlgg\./;
+        }
+
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b(16)\b/;
+
+        #! needs extra files (sql*.h) so not compiled by default.
+        #! next if $file =~ /^odbc\./;
+
+        if ( $file =~ /^odbc\./ )
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"ADVANCEDOBJS"} .= '$(COMMDIR)/' . $file . " "
+        }
+        else
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
+        }
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
+        next if $file =~ /^dirdlg\./;
+
+        next if $wxMSW{$file} =~ /\b(16)\b/;
+
+        #! Mingw32 doesn't have the OLE headers and has some troubles with
+        #! socket code, so put in  ADVANCEDOBJS
+        if ( $wxMSW{$file} =~ /\b(O)\b/ )
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"ADVANCEDOBJS"} .= '$(MSWDIR)/ole/' . $file . " "
+        }
+        else
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"WXMSWOBJS"} .= '$(MSWDIR)/' . $file . " "
+        }
+
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)/' . $file . " "
+    }
+
+#$}
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
+
+#
+# File:     makefile.g95
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Created:  1993
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
+#
+# Makefile for libwx.a
+
+# Replace this with your own path if necessary
+WXDIR = ../..
+
+# All common compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/makeg95.env
+
+# Subordinate library possibilities
+
+EXTRAOBJS=
+
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+XPMDIR  = $(WXDIR)/src/xpm
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+ZLIBDIR = $(WXDIR)/src/zlib
+OLEDIR  = $(WXDIR)/src/msw/ole
+MSWDIR  = $(WXDIR)/src/msw
+
+PNGLIB = $(WXDIR)/lib/libpng.a
+ZLIBLIB = $(WXDIR)/lib/libzlib.a
+JPEGLIB = $(WXDIR)/lib/libjpeg.a
+
+DOCDIR = $(WXDIR)\docs
+
+# Only use the WIN32 wxDirDialog if we have a recent
+# version of Mingw32
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32VERSION),2.95)
+		DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
+  else
+		DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+  endif
+else
+		DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+endif
+
+GENERICOBJS = \
+                #$ ExpandList("WXGENERICOBJS");
+
+COMMONOBJS  = \
+		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		#$ ExpandList("WXCOMMONOBJS");
+
+HTMLOBJS = \
+                #$ ExpandList("WXHTMLOBJS");
+
+MSWOBJS     = \
+		#$ ExpandList("WXMSWOBJS");
+
+ADVANCEDOBJS     = \
+		#$ ExpandList("ADVANCEDOBJS");
+
+ZLIBOBJS    = \
+		$(ZLIBDIR)/adler32.$(OBJSUFF) \
+		$(ZLIBDIR)/compress.$(OBJSUFF) \
+		$(ZLIBDIR)/crc32.$(OBJSUFF) \
+		$(ZLIBDIR)/gzio.$(OBJSUFF) \
+		$(ZLIBDIR)/uncompr.$(OBJSUFF) \
+		$(ZLIBDIR)/deflate.$(OBJSUFF) \
+		$(ZLIBDIR)/trees.$(OBJSUFF) \
+		$(ZLIBDIR)/zutil.$(OBJSUFF) \
+		$(ZLIBDIR)/inflate.$(OBJSUFF) \
+		$(ZLIBDIR)/infblock.$(OBJSUFF) \
+		$(ZLIBDIR)/inftrees.$(OBJSUFF) \
+		$(ZLIBDIR)/infcodes.$(OBJSUFF) \
+		$(ZLIBDIR)/infutil.$(OBJSUFF) \
+		$(ZLIBDIR)/inffast.$(OBJSUFF)
+
+PNGOBJS     = \
+		$(PNGDIR)/png.$(OBJSUFF) \
+		$(PNGDIR)/pngread.$(OBJSUFF) \
+		$(PNGDIR)/pngrtran.$(OBJSUFF) \
+		$(PNGDIR)/pngrutil.$(OBJSUFF) \
+		$(PNGDIR)/pngpread.$(OBJSUFF) \
+		$(PNGDIR)/pngtrans.$(OBJSUFF) \
+		$(PNGDIR)/pngwrite.$(OBJSUFF) \
+		$(PNGDIR)/pngwtran.$(OBJSUFF) \
+		$(PNGDIR)/pngwutil.$(OBJSUFF) \
+		$(PNGDIR)/pngerror.$(OBJSUFF) \
+		$(PNGDIR)/pngmem.$(OBJSUFF) \
+		$(PNGDIR)/pngwio.$(OBJSUFF) \
+		$(PNGDIR)/pngrio.$(OBJSUFF) \
+		$(PNGDIR)/pngget.$(OBJSUFF) \
+		$(PNGDIR)/pngset.$(OBJSUFF)
+
+
+JPEGOBJS    = \
+		$(JPEGDIR)/jcomapi.$(OBJSUFF) \
+		$(JPEGDIR)/jutils.$(OBJSUFF) \
+		$(JPEGDIR)/jerror.$(OBJSUFF) \
+		$(JPEGDIR)/jmemmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jmemnobs.$(OBJSUFF) \
+		$(JPEGDIR)/jcapimin.$(OBJSUFF) \
+		$(JPEGDIR)/jcapistd.$(OBJSUFF) \
+		$(JPEGDIR)/jctrans.$(OBJSUFF) \
+		$(JPEGDIR)/jcparam.$(OBJSUFF) \
+		$(JPEGDIR)/jdatadst.$(OBJSUFF) \
+		$(JPEGDIR)/jcinit.$(OBJSUFF) \
+		$(JPEGDIR)/jcmaster.$(OBJSUFF) \
+		$(JPEGDIR)/jcmarker.$(OBJSUFF) \
+		$(JPEGDIR)/jcmainct.$(OBJSUFF) \
+		$(JPEGDIR)/jcprepct.$(OBJSUFF) \
+		$(JPEGDIR)/jccoefct.$(OBJSUFF) \
+		$(JPEGDIR)/jccolor.$(OBJSUFF) \
+		$(JPEGDIR)/jcsample.$(OBJSUFF) \
+		$(JPEGDIR)/jchuff.$(OBJSUFF) \
+		$(JPEGDIR)/jcphuff.$(OBJSUFF) \
+		$(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctfst.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctflt.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctint.$(OBJSUFF) \
+		$(JPEGDIR)/jdapimin.$(OBJSUFF) \
+		$(JPEGDIR)/jdapistd.$(OBJSUFF) \
+		$(JPEGDIR)/jdtrans.$(OBJSUFF) \
+		$(JPEGDIR)/jdatasrc.$(OBJSUFF) \
+		$(JPEGDIR)/jdmaster.$(OBJSUFF) \
+		$(JPEGDIR)/jdinput.$(OBJSUFF) \
+		$(JPEGDIR)/jdmarker.$(OBJSUFF) \
+		$(JPEGDIR)/jdhuff.$(OBJSUFF) \
+		$(JPEGDIR)/jdphuff.$(OBJSUFF) \
+		$(JPEGDIR)/jdmainct.$(OBJSUFF) \
+		$(JPEGDIR)/jdcoefct.$(OBJSUFF) \
+		$(JPEGDIR)/jdpostct.$(OBJSUFF) \
+		$(JPEGDIR)/jddctmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jidctfst.$(OBJSUFF) \
+		$(JPEGDIR)/jidctflt.$(OBJSUFF) \
+		$(JPEGDIR)/jidctint.$(OBJSUFF) \
+		$(JPEGDIR)/jidctred.$(OBJSUFF) \
+		$(JPEGDIR)/jdsample.$(OBJSUFF) \
+		$(JPEGDIR)/jdcolor.$(OBJSUFF) \
+		$(JPEGDIR)/jquant1.$(OBJSUFF) \
+		$(JPEGDIR)/jquant2.$(OBJSUFF) \
+		$(JPEGDIR)/jdmerge.$(OBJSUFF)
+
+XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
+		$(XPMDIR)/crdatfri.o\
+		$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+		$(XPMDIR)/crifrdat.o\
+		$(XPMDIR)/data.o\
+		$(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
+		$(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+		$(XPMDIR)/rdftoi.o\
+		$(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
+		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
+		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32VERSION),2.95)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+  else
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
+  endif
+else
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
+endif
+
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB)
+
+$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
+	ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+	$(RANLIB) $@
+
+$(ZLIBLIB): $(ZLIBOBJS)
+	ar $(AROPTIONS) $@ $(ZLIBOBJS)
+	$(RANLIB) $@
+
+$(PNGLIB): $(PNGOBJS)
+	ar $(AROPTIONS) $@ $(PNGOBJS)
+	$(RANLIB) $@
+
+$(JPEGLIB): $(JPEGOBJS)
+	ar $(AROPTIONS) $@ $(JPEGOBJS)
+	$(RANLIB) $@
+
+$(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+
+$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
+	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+	$(COPY) ..\\common\\dosyacc.c ..\\common\\y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+	$(COPY) ..\\common\\doslex.c ..\\common\\lex_yy.c
+
+# Replace lex with flex if you run into compilation
+# problems with lex_yy.c. See also note about LEX_SCANNER
+# above.
+# $(COMMDIR)/lex_yy.c:	$(COMMDIR)/lexer.l
+#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
+# Try one of these if the above line doesn't work.
+# Alternative syntax (1)
+#	$(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+# Alternative syntax (2)
+#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
+#	sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
+#	sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
+#       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
+#	rm -f lex.yy.c
+#
+# Replace yacc with bison if you run into compilation
+# problems with y_tab.c.
+#
+# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
+#	$(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
+#
+# If you use e.g. gcc on Unix, uncomment these lines
+# and comment out the above.
+#
+# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
+#	$(YACC) $(COMMDIR)/parser.y
+#	mv y.tab.c $(COMMDIR)/y_tab.c
+
+clean:
+	-$(RM) *.o
+	-$(RM) ole/*.o
+	-$(RM) *.bak
+	-$(RM) core
+	-$(RM) ../common/y_tab.c
+	-$(RM) ../common/lex_yy.c
+	-$(RM) ../common/*.o
+	-$(RM) ../common/*.bak
+	-$(RM) ../generic/*.o
+	-$(RM) ../generic/*.bak
+	-$(RM) ../html/*.o
+	-$(RM) ../png/*.o
+	-$(RM) ../png/*.bak
+	-$(RM) ../zlib/*.o
+	-$(RM) ../zlib/*.bak
+	-$(RM) ../jpeg/*.o
+	-$(RM) ../../lib/libwx.a
+
+cleanall: clean
--- a/distrib/msw/tmake/makeall.bat
+++ b/distrib/msw/tmake/makeall.bat
@@ -0,0 +1,55 @@
+@echo off
+rem File:      makeall.bat
+rem Purpose:   create wxWindows makefiles for all compilers
+rem Author:    Vadim Zeitlin
+rem Created:   14.07.99
+rem Copyright: (c) 1999 Vadim Zeitlin
+rem Version:   $Id$
+rem
+rem Makefile to create the makefiles for all compilers from the templates using
+rem tmake. The environment variable WX or WXWIN should be defined and contain
+rem the root directory of wxWindows installation. TMAKE program should be in
+rem path or, alternatively, TMAKE environment variable should be set.
+
+if "x%WX%" == "x" goto skip
+set WXDIR=%WX%
+goto ok
+
+:skip
+if "x%WXWIN%" == "x" goto no_wx
+set WXDIR=%WXWIN%
+goto ok
+
+:no_wx
+echo "Please set WX environment variable!"
+goto end
+
+:ok
+set TM=tmake
+if "x%TMAKE%" == "x" goto skip2
+set TM=%TMAKE%
+
+:skip2
+
+rem this loop just doesn't want to work under command.com and cmd.exe and
+rem 4nt.exe, so I preferred to unroll it.
+rem for %%c in (b32 bcc dos g95 sc vc wat) %TM% -t %c% wxwin.pro -o %WXDIR%\src\msw\makefile.%c%
+
+echo Generating for Visual C++ 4.0...
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t vc wxwin.pro -o %WXDIR%\src\msw\makefile.vc
+echo Generating for Borland C++ (32 bits)...
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t b32 wxwin.pro -o %WXDIR%\src\msw\makefile.b32
+echo Generating for Visual C++ 1.52...
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t dos wxwin.pro -o %WXDIR%\src\msw\makefile.dos
+echo Generating for Borland C++ (16 bits)...
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t bcc wxwin.pro -o %WXDIR%\src\msw\makefile.bcc
+echo Generating for Cygwin/Mingw32
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t g95 wxwin.pro -o %WXDIR%\src\msw\makefile.g95
+echo Generating for Symantec C++...
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t sc wxwin.pro -o %WXDIR%\src\msw\makefile.sc
+echo Generating for Watcom C++...
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t wat wxwin.pro -o %WXDIR%\src\msw\makefile.wat
+echo Generating for Unix and Configure...
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t unx wxwin.pro -o %WXDIR%\Makefile.in
+
+:end
--- a/distrib/msw/tmake/makeall.sh
+++ b/distrib/msw/tmake/makeall.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# File:      makeall.sh
+# Purpose:   create wxWindows makefiles for all compilers
+# Author:    Michael Bedward
+# Created:   29 Aug 1999
+# Copyright: (c) 1999 Michael Bedward
+# Version:   $Id$
+#
+# This creates the makefiles for all compilers from the templates using
+# tmake. The tmake executable should be in the path.  
+
+# Assume we are in distrib/msw/tmake
+#
+topdir="../../.."
+mswdir="$topdir/src/msw"
+
+for tname in `ls *.t` 
+do
+    case $tname in
+	b32.t)
+	    echo "Generating $mswdir/makefile.b32 for Borland C++ (32 bits)..."
+	    tmake -t b32 wxwin.pro -o $mswdir/makefile.b32 ;;
+
+	bcc.t)
+	    echo "Generating $mswdir/makefile.bcc for Borland C++ (16 bits)..."
+	    tmake -t bcc wxwin.pro -o $mswdir/makefile.bcc;;
+
+	dos.t)
+	    echo "Generating $mswdir/makefile.dos for Visual C++ 1.52..."
+	    tmake -t dos wxwin.pro -o $mswdir/makefile.dos;;
+
+	g95.t)
+	    echo "Generating $mswdir/makefile.g95 for Cygwin/Mingw32..."
+	    tmake -t g95 wxwin.pro -o $mswdir/makefile.g95;;
+
+	sc.t)
+	    echo "Generating $mswdir/makefile.sc for Symantec C++..."
+	    tmake -t sc wxwin.pro -o $mswdir/makefile.sc;;
+
+	vc.t) 
+	    echo "Generating $mswdir/makefile.vc for Visual C++ 4.0..."
+	    tmake -t vc wxwin.pro -o $mswdir/makefile.vc;;
+
+	wat.t)
+	    echo "Generating $mswdir/makefile.wat for Watcom C++..."
+	    tmake -t wat wxwin.pro -o $mswdir/makefile.wat;;
+
+	unx.t)
+	    echo "Generating $topdir/Makefile.in for Unix and Configure..."
+	    tmake -t unx wxwin.pro -o $topdir/Makefile.in;;
+    esac
+done
+
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -0,0 +1,122 @@
+#!#############################################################################
+#! File:    sc.t
+#! Purpose: tmake template file from which makefile.sc is generated by running
+#!          tmake -t sc wxwin.pro -o makefile.sc
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        my $tag = "";
+        if ( $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/ ) {
+            $tag = "WXNONESSENTIALOBJS";
+        }
+        else {
+            $tag = "WXGENERICOBJS";
+        }
+
+        $file =~ s/cp?p?$/obj/;
+        $project{$tag} .= '$(GENDIR)\\' . $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        #! these files don't compile with SC++ 6
+        next if $file =~ /^(joystick|pnghand)\./;
+
+        next if $wxGeneric{$file} =~ /\b16\b/;
+
+        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXMSWOBJS"} .= '$(MSWDIR)\\';
+        $project{"WXMSWOBJS"} .= 'ole\\' if $isOleObj;
+        $project{"WXMSWOBJS"} .= $file . " "
+    }
+#$}
+
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
+
+# Symantec C++ makefile for the msw objects
+# called from src\makefile.sc
+
+# configuration section (see src\makefile.sc) ###########################
+
+WXDIR = $(WXWIN)
+
+include ..\makesc.env
+
+DEBUG=0
+
+LIBTARGET = $(LIBDIR)\wx.lib
+
+OPTIONS=
+
+# end of configuration section ##########################################
+
+GENDIR=$(WXDIR)\src\generic
+COMMDIR=$(WXDIR)\src\common
+XPMDIR=$(WXDIR)\src\xpm
+OLEDIR=ole
+MSWDIR=$(WXDIR)\src\msw
+
+GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
+
+COMMONOBJS = \
+		$(COMMDIR)\y_tab.obj \
+		#$ ExpandList("WXCOMMONOBJS");
+
+MSWOBJS = #$ ExpandList("WXMSWOBJS");
+
+XPMOBJECTS = 	$(XPMDIR)\crbuffri.obj\
+		$(XPMDIR)\crdatfri.obj\
+		$(XPMDIR)\create.obj $(XPMDIR)\crifrbuf.obj\
+		$(XPMDIR)\crifrdat.obj\
+		$(XPMDIR)\data.obj\
+		$(XPMDIR)\hashtab.obj $(XPMDIR)\misc.obj\
+		$(XPMDIR)\parse.obj $(XPMDIR)\rdftodat.obj\
+		$(XPMDIR)\rdftoi.obj\
+		$(XPMDIR)\rgb.obj $(XPMDIR)\scan.obj\
+		$(XPMDIR)\simx.obj $(XPMDIR)\wrffrdat.obj\
+		$(XPMDIR)\wrffrp.obj $(XPMDIR)\wrffri.obj
+
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS)
+
+all: $(LIBTARGET)
+
+$(LIBTARGET): $(OBJECTS)
+	-del $(LIBTARGET)
+	*lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
+
+clean:
+	-del *.obj
+    -del $(LIBTARGET)
+
+$(COMMDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+# $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
+#	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
+
+MFTYPE=sc
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
--- a/distrib/msw/tmake/tmake.conf
+++ b/distrib/msw/tmake/tmake.conf
@@ -0,0 +1,57 @@
+#
+# $Id$
+#
+# tmake configuration for linux-g++
+#
+
+TEMPLATE		= app
+CONFIG			= qt warn_on release
+
+TMAKE_CC		= gcc
+TMAKE_CFLAGS		=
+TMAKE_CFLAGS_WARN_ON	= -Wall -W
+TMAKE_CFLAGS_WARN_OFF	=
+TMAKE_CFLAGS_RELEASE	= -O2 -fno-strength-reduce
+TMAKE_CFLAGS_DEBUG	= -g
+TMAKE_CFLAGS_SHLIB	= -fPIC
+TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+
+TMAKE_CXX		= g++
+TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
+TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
+TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
+TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
+TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
+TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
+TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
+
+TMAKE_INCDIR		=
+TMAKE_LIBDIR		=
+TMAKE_INCDIR_X11	= /usr/X11R6/include
+TMAKE_LIBDIR_X11	= /usr/X11R6/lib
+TMAKE_INCDIR_QT		= $(QTDIR)/include
+TMAKE_LIBDIR_QT		= $(QTDIR)/lib
+TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+
+TMAKE_LINK		= g++
+TMAKE_LINK_SHLIB	= g++
+TMAKE_LFLAGS		= -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib
+TMAKE_LFLAGS_RELEASE	=
+TMAKE_LFLAGS_DEBUG	=
+TMAKE_LFLAGS_SHLIB	= -shared
+TMAKE_LFLAGS_SONAME	= -Wl,-soname,
+
+TMAKE_LIBS		=
+TMAKE_LIBS_X11		= -lX11 -lXext
+TMAKE_LIBS_QT		= -lqt
+TMAKE_LIBS_QT_OPENGL	= -lqgl
+TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu -lXext -lm
+
+TMAKE_MOC		= moc
+
+TMAKE_AR		= ar cqs
+TMAKE_RANLIB		=
+
+TMAKE_TAR		= tar -cf
+TMAKE_GZIP		= gzip -9f
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -0,0 +1,643 @@
+#!#############################################################################
+#! File:    vc.t
+#! Purpose: tmake template file from which makefile.vc is generated by running
+#!          tmake -t vc wxwin.pro -o makefile.vc
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        my $tag = "";
+        if ( $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/ ) {
+            $tag = "WXNONESSENTIALOBJS";
+        }
+        else {
+            $tag = "WXGENERICOBJS";
+        }
+
+        $file =~ s/cp?p?$/obj/;
+        $project{$tag} .= "..\\generic\\\$D\\" . $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b16\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXCOMMONOBJS"} .= "..\\common\\\$D\\" . $file . " "
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        next if $wxMSW{$file} =~ /\b16\b/;
+
+        #! OLE files live in a subdir
+        $project{"WXMSWOBJS"} .= '..\msw\\';
+        $project{"WXMSWOBJS"} .= 'ole\\' if $wxMSW{$file} =~ /\bO\b/;
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXMSWOBJS"} .= '$D\\' . $file . " ";
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXHTMLOBJS"} .= "..\\html\\\$D\\" . $file . " "
+    }
+
+#$}
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
+
+# File:     makefile.vc
+# Author:   Julian Smart
+# Created:  1997
+# Updated:
+# Copyright: (c) 1997, Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxWindows library wx.lib for VC++ (32-bit)
+# Arguments:
+#
+# FINAL=1 argument to nmake to build version with no debugging info.
+# dll builds a library (wxdll.lib) suitable for creating DLLs
+#
+!include <..\makevc.env>
+
+THISDIR=$(WXWIN)\src\msw
+
+!if "$(WXMAKINGDLL)" == "1"
+LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
+DUMMYOBJ=$D\dummydll.obj
+!else
+LIBTARGET=$(WXLIB)
+DUMMYOBJ=$D\dummy.obj
+!endif
+
+# Please set these according to the settings in setup.h, so we can include
+# the appropriate libraries in wx.lib
+
+# This one overrides the others, to be consistent with the settings in setup.h
+MINIMAL_WXWINDOWS_SETUP=0
+
+PERIPH_LIBS=
+PERIPH_TARGET=
+PERIPH_CLEAN_TARGET=
+
+# These are absolute paths, so that the compiler
+# generates correct __FILE__ symbols for debugging.
+# Otherwise you don't be able to double-click on a memory
+# error to load that file.
+GENDIR=$(WXDIR)\src\generic
+COMMDIR=$(WXDIR)\src\common
+OLEDIR=ole
+MSWDIR=$(WXDIR)\src\msw
+DOCDIR = $(WXDIR)\docs
+HTMLDIR = $(WXDIR)\src\html
+
+{..\generic}.cpp{..\generic\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+{..\common}.cpp{..\common\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+{..\common}.c{..\common\$D}.obj:
+	cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
+{..\msw}.cpp{..\msw\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+{..\msw}.c{..\msw\$D}.obj:
+	cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
+{..\msw\ole}.cpp{..\msw\ole\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+{..\html}.cpp{..\html\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
+
+# These are generic things that don't need to be compiled on MSW,
+# but sometimes it's useful to do so for testing purposes.
+NONESSENTIALOBJS= #$ ExpandList("WXNONESSENTIALOBJS");
+
+COMMONOBJS = \
+		..\common\$D\y_tab.obj \
+		#$ ExpandList("WXCOMMONOBJS");
+
+MSWOBJS = #$ ExpandList("WXMSWOBJS");
+
+HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
+
+
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
+# Add $(HTMLOBJS) if wanting wxHTML classes
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+
+# Normal, static library
+all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
+
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
+
+
+test:   $(MSWDIR)\$D\wave.obj
+test2:  ..\common\Debug\config.obj
+
+$D:
+    mkdir $D
+
+$(COMMDIR)\$D:
+    mkdir $(COMMDIR)\$D
+
+$(MSWDIR)\$D:
+    mkdir $(MSWDIR)\$D
+
+$(GENDIR)\$D:
+    mkdir $(GENDIR)\$D
+
+$(OLEDIR)\$D:
+    mkdir $(OLEDIR)\$D
+
+$(HTMLDIR)\$D:
+    mkdir $(HTMLDIR)\$D
+
+# wxWindows library as DLL
+dll:
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+
+cleandll:
+        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+
+# wxWindows + app as DLL. Only affects main.cpp.
+dllapp:
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1
+
+# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
+dllnp:
+        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1
+
+# Use this to make dummy.obj and generate a PCH.
+# You might use the dll target, then the pch target, in order to
+# generate a DLL, then a PCH/dummy.obj for compiling your applications with.
+#
+# Explanation: Normally, when compiling a static version of wx.lib, your dummy.obj/PCH
+# are associated with wx.lib. When using a DLL version of wxWindows, however,
+# the DLL is compiled without a PCH, so you only need it for compiling the app.
+# In fact headers are compiled differently depending on whether a DLL is being made
+# or an app is calling the DLL exported functionality (WXDLLEXPORT is different
+# in each case) so you couldn't use the same PCH.
+pch:
+        nmake -f makefile.vc pch1 WXUSINGDLL=1 FINAL=$(FINAL) NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+
+pch1:   dirs $(DUMMYOBJ)
+    echo $(DUMMYOBJ)
+
+!if "$(WXMAKINGDLL)" != "1"
+
+### Static library
+
+$(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
+	-erase $(LIBTARGET)
+	$(implib) @<<
+-out:$@
+-machine:$(CPU)
+$(OBJECTS) $(PERIPH_LIBS)
+<<
+
+!else
+
+### Update the import library
+
+$(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
+    $(implib) @<<
+    -machine:$(CPU)
+    -def:wx.def
+    $(DUMMYOBJ) $(OBJECTS)
+    -out:$(WXDIR)\lib\$(WXLIBNAME).lib
+<<
+
+# Update the dynamic link library
+$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
+    $(link) @<<
+    $(LINKFLAGS)
+    -out:$(WXDIR)\lib\$(WXLIBNAME).dll
+    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib
+<<
+
+!endif
+
+
+########################################################
+# Windows-specific objects
+
+$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
+        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
+
+$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
+        cl @<<
+$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
+<<
+
+# If taking wxWindows from CVS, setup.h doesn't exist yet.
+# Actually the 'if not exist setup.h' test doesn't work
+# (copies the file anyway)
+# we'll have to comment this rule out.
+
+# $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
+#    cd "$(WXDIR)"\include\wx\msw
+#    if not exist setup.h copy setup0.h setup.h
+#    cd "$(WXDIR)"\src\msw
+
+..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
+        cl @<<
+$(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+<<
+
+..\common\y_tab.c:     ..\common\dosyacc.c
+        copy "..\common"\dosyacc.c "..\common"\y_tab.c
+
+..\common\lex_yy.c:    ..\common\doslex.c
+    copy "..\common"\doslex.c "..\common"\lex_yy.c
+
+$(OBJECTS):	$(WXDIR)/include/wx/setup.h
+
+..\common\$D\unzip.obj:     ..\common\unzip.c
+        cl @<<
+$(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
+<<
+
+# Peripheral components
+
+png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    cd $(WXDIR)\src\msw
+
+clean_png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
+zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    cd $(WXDIR)\src\msw
+
+clean_zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
+jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
+    cd $(WXDIR)\src\msw
+
+clean_jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
+xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    cd $(WXDIR)\src\msw
+
+clean_xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
+rcparser:
+    cd $(WXDIR)\utils\rcparser\src
+    nmake -f makefile.vc FINAL=$(FINAL)
+    cd $(WXDIR)\src\msw
+
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg 
+        -erase $(LIBTARGET)
+        -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
+        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
+        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
+        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
+        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
+        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
+        -erase *.pdb
+        -erase *.sbr
+        -erase $(WXLIBNAME).pch
+        -erase $(GENDIR)\$D\*.obj
+        -erase $(GENDIR)\$D\*.pdb
+        -erase $(GENDIR)\$D\*.sbr
+        -erase $(COMMDIR)\$D\*.obj
+        -erase $(COMMDIR)\$D\*.pdb
+        -erase $(COMMDIR)\$D\*.sbr
+        -erase $(COMMDIR)\\y_tab.c
+        -erase $(COMMDIR)\lex_yy.c
+        -erase $(MSWDIR)\$D\*.obj
+        -erase $(MSWDIR)\$D\*.sbr
+        -erase $(MSWDIR)\$D\*.pdb
+        -erase $(OLEDIR)\$D\*.obj
+        -erase $(OLEDIR)\$D\*.sbr
+        -erase $(OLEDIR)\$D\*.pdb
+        -erase $(HTMLDIR)\$D\*.obj
+        -erase $(HTMLDIR)\$D\*.sbr
+        -erase $(HTMLDIR)\$D\*.pdb
+        -rmdir $(D)
+        -rmdir ole\$(D)
+        -rmdir ..\generic\$(D)
+        -rmdir ..\common\$(D)
+        -rmdir ..\html\$(D)
+
+cleanall: clean
+
+# Making documents
+docs:   allhlp allhtml allpdfrtf
+alldocs: docs
+hlp:    wxhlp portinghlp
+wxhlp:  $(DOCDIR)/winhelp/wx.hlp
+prophlp: $(DOCDIR)/winhelp/prop.hlp
+refhlp: $(DOCDIR)/winhelp/techref.hlp
+rtf:    $(DOCDIR)/winhelp/wx.rtf
+proprtf: $(DOCDIR)/winhelp/prop.rtf
+pdfrtf:    $(DOCDIR)/pdf/wx.rtf
+proppdfrtf: $(DOCDIR)/pdf/prop.rtf
+refpdfrtf: $(DOCDIR)/pdf/techref.rtf
+html:	wxhtml portinghtml
+wxhtml:	$(DOCDIR)\html\wx\wx.htm
+htmlhelp: $(DOCDIR)\html\wx\wx.chm
+prophtml: $(DOCDIR)\html\proplist\prop.htm
+ps:     wxps referencps
+wxps:	$(WXDIR)\docs\ps\wx.ps
+propps:	$(WXDIR)\docs\ps\prop.ps
+referencps:	$(WXDIR)\docs\ps\referenc.ps
+
+portinghtml: $(DOCDIR)\html\porting\port.htm
+portingrtf: $(DOCDIR)/winhelp/porting.rtf
+portinghlp: $(DOCDIR)/winhelp/porting.hlp
+portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
+portingps:	$(WXDIR)\docs\ps\porting.ps
+
+allhlp: wxhlp portinghlp prophlp
+        cd $(WXDIR)\utils\dialoged\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
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\wxtree\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\wxbuild\src
+#        nmake -f makefile.vc hlp
+#        cd $(WXDIR)\utils\wxgrid\src
+#        nmake -f makefile.vc hlp
+
+allhtml: wxhtml portinghtml prophtml
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc html
+        cd $(THISDIR)
+
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\hytext\src
+#        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
+#        nmake -f makefile.vc html
+#        cd $(WXDIR)\utils\wxtree\src
+#        nmake -f makefile.vc html
+
+allps: wxps referencps portingps propps
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc ps
+        cd $(THISDIR)
+
+allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc pdfrtf
+        cd $(THISDIR)
+
+#        cd $(WXDIR)\utils\wxhelp\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\utils\tex2rtf\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\utils\wxgraph\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\utils\wxchart\src
+#        nmake -f makefile.vc ps
+#        cd $(WXDIR)\utils\wxtree\src
+#        nmake -f makefile.vc ps
+#        cd $(THISDIR)
+
+$(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
+        cd $(DOCDIR)/latex/wx
+        -erase wx.ph
+        hc wx
+        move wx.hlp $(DOCDIR)\winhelp\wx.hlp
+        move wx.cnt $(DOCDIR)\winhelp\wx.cnt
+        cd $(THISDIR)
+
+$(DOCDIR)/winhelp/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj
+        cd $(DOCDIR)/latex/porting
+        -erase porting.ph
+        hc porting
+        move porting.hlp $(DOCDIR)\winhelp\porting.hlp
+        move porting.cnt $(DOCDIR)\winhelp\porting.cnt
+        cd $(THISDIR)
+
+$(DOCDIR)/winhelp/prop.hlp:         $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj
+        cd $(DOCDIR)/latex/proplist
+        -erase prop.ph
+        hc prop
+        move prop.hlp $(DOCDIR)\winhelp\prop.hlp
+        move prop.cnt $(DOCDIR)\winhelp\prop.cnt
+        cd $(THISDIR)
+
+$(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
+        cd $(DOCDIR)/latex/techref
+        -erase techref.ph
+        hc techref
+        move techref.hlp $(DOCDIR)\winhelp\techref.hlp
+        move techref.cnt $(DOCDIR)\winhelp\techref.cnt
+        cd $(THISDIR)
+
+$(DOCDIR)/latex/wx/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
+        cd $(DOCDIR)\latex\wx
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)/latex/porting/porting.rtf:         $(DOCDIR)/latex/porting/porting.tex
+        cd $(DOCDIR)\latex\porting
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)/latex/proplist/prop.rtf:         $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
+        cd $(DOCDIR)\latex\proplist
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)/latex/techref/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
+        cd $(DOCDIR)\latex\techref
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
+        cd $(DOCDIR)\latex\wx
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)/pdf/porting.rtf:         $(DOCDIR)/latex/porting/porting.tex
+        cd $(DOCDIR)\latex\porting
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)/pdf/prop.rtf:         $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
+        cd $(DOCDIR)\latex\proplist
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
+        cd $(DOCDIR)\latex\techref
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
+        cd $(DOCDIR)\latex\wx
+        -mkdir $(DOCDIR)\html\wx
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
+        -erase $(DOCDIR)\html\wx\*.con
+        -erase $(DOCDIR)\html\wx\*.ref
+        -erase $(DOCDIR)\latex\wx\*.con
+        -erase $(DOCDIR)\latex\wx\*.ref
+         cd $(THISDIR)
+
+$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
+	cd $(DOCDIR)\html\wx
+	-hhc wx.hhp
+	cd $(THISDIR)
+
+
+$(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
+        cd $(DOCDIR)\latex\porting
+        -mkdir $(DOCDIR)\html\porting
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
+        -erase $(DOCDIR)\html\porting\*.con
+        -erase $(DOCDIR)\html\porting\*.ref
+        -erase $(DOCDIR)\latex\porting\*.con
+        -erase $(DOCDIR)\latex\porting\*.ref
+        cd $(THISDIR)
+
+$(DOCDIR)\html\proplist\prop.htm:         $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex
+        cd $(DOCDIR)\latex\proplist
+        -mkdir $(DOCDIR)\html\proplist
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html
+        -erase $(DOCDIR)\html\proplist\*.con
+        -erase $(DOCDIR)\html\proplist\*.ref
+        -erase $(DOCDIR)\latex\proplist\*.con
+        -erase $(DOCDIR)\latex\proplist\*.ref
+        cd $(THISDIR)
+
+$(WXDIR)\docs\latex\wx\manual.dvi:	$(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
+	cd $(WXDIR)\docs\latex\wx
+        -latex manual
+        -latex manual
+        -makeindx manual
+        -bibtex manual
+        -latex manual
+        -latex manual
+        cd $(THISDIR)
+
+$(WXDIR)\docs\latex\porting\porting.dvi:	$(DOCDIR)/latex/porting/porting.tex
+	cd $(WXDIR)\docs\latex\porting
+        -latex porting
+        -latex porting
+        -makeindx porting
+        -bibtex porting
+        -latex porting
+        -latex porting
+        cd $(THISDIR)
+
+$(WXDIR)\docs\ps\wx.ps:	$(WXDIR)\docs\latex\wx\manual.dvi
+	cd $(WXDIR)\docs\latex\wx
+        -dvips32 -o wx.ps manual
+        move wx.ps $(WXDIR)\docs\ps\wx.ps
+        cd $(THISDIR)
+
+$(WXDIR)\docs\ps\porting.ps:	$(WXDIR)\docs\latex\porting\porting.dvi
+	cd $(WXDIR)\docs\latex\porting
+        -dvips32 -o porting.ps porting
+        move porting.ps $(WXDIR)\docs\ps\porting.ps
+        cd $(THISDIR)
+
+$(WXDIR)\docs\latex\wx\referenc.dvi:	$(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
+	cd $(WXDIR)\docs\latex\wx
+        -latex referenc
+        -latex referenc
+        -makeindx referenc
+        -bibtex referenc
+        -latex referenc
+        -latex referenc
+        cd $(THISDIR)
+
+$(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
+	cd $(WXDIR)\docs\latex\wx
+        -dvips32 -o referenc.ps referenc
+        move referenc.ps $(WXDIR)\docs\ps\referenc.ps
+        cd $(THISDIR)
+
+# In order to force document reprocessing
+touchmanual:
+    -touch $(WXDIR)\docs\latex\wx\manual.tex
+
+updatedocs: touchmanual alldocs
+
+# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
+# Office StartUp folder, and PDFMaker should be installed.
+updatepdf:  # touchmanual pdfrtf
+    start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
+
+
+MFTYPE=vc
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+
--- a/distrib/msw/tmake/vc6.t
+++ b/distrib/msw/tmake/vc6.t
@@ -0,0 +1,155 @@
+#!#############################################################################
+#! File:    vc6.t
+#! Purpose: tmake template file from which wxWindows.dsp is generated by running
+#!          tmake -t vc6 wxwin.pro -o wxWindows.dsp
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
+        $project{"WXGENERICSRCS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b16\b/;
+
+        my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
+        $project{$tag} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        next if $wxMSW{$file} =~ /\b16\b/;
+
+        my $tag;
+        if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" }
+        else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" }
+        $project{$tag} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+        $project{"WXHTMLSRCS"} .= $file . " "
+    }
+#$}
+# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=wxWindows - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /Fr /Yu"wx/wxprec.h" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /o"lib/wxWindows.bsc"
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "wxWindows - Win32 Release"
+# Name "wxWindows - Win32 Debug"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\msw\dummy.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n");
+#$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n");
+#$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n");
+#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n");
+#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n");
+
+# Begin Source File
+
+SOURCE=.\src\common\y_tab.c
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# ADD CPP /W1
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
--- a/distrib/msw/tmake/vc6dll.t
+++ b/distrib/msw/tmake/vc6dll.t
@@ -0,0 +1,162 @@
+#!#############################################################################
+#! File:    vc6dll.t
+#! Purpose: tmake template file from which wxWinDll.dsp is generated by running
+#!          tmake -t vc6dll wxwin.pro -o wxWinDll.dsp
+#! Author:  Vadim Zeitlin
+#! Created: 13.10.99
+#! Version: $Id$
+#!#############################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
+        $project{"WXGENERICSRCS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b16\b/;
+
+        my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
+        $project{$tag} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        next if $wxMSW{$file} =~ /\b16\b/;
+
+        my $tag;
+        if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" }
+        else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" }
+        $project{$tag} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+        $project{"WXHTMLSRCS"} .= $file . " "
+    }
+#$}
+# Microsoft Developer Studio Project File - Name="wxWinDll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=wxWinDll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWinDll.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWinDll.mak" CFG="wxWinDll - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxWinDll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWinDll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "wxWinDll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDLL"
+# PROP Intermediate_Dir "ReleaseDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W4 /GX /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\png\png.lib src\xpm\xpm.lib src\zlib\zlib.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib winmm.lib src\png\png.lib src\xpm\xpm.lib src\zlib\zlib.lib /nologo /dll /machine:I386
+
+!ELSEIF  "$(CFG)" == "wxWinDll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugDLL"
+# PROP Intermediate_Dir "DebugDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /ZI /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib lib\png.lib src\png\png.lib src\xpm\xpm.lib src\zlib\zlib.lib /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\png\png.lib src\xpm\xpm.lib src\zlib\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "wxWinDll - Win32 Release"
+# Name "wxWinDll - Win32 Debug"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\msw\dummydll.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n");
+#$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n");
+#$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n");
+#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n");
+#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n");
+
+# Begin Source File
+
+SOURCE=.\src\common\y_tab.c
+
+!IF  "$(CFG)" == "wxWinDll - Win32 Release"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "wxWinDll - Win32 Debug"
+
+# ADD CPP /W1
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -0,0 +1,361 @@
+#!#############################################################################
+#! File:    wat.t
+#! Purpose: tmake template file from which makefile.wat is generated by running
+#!          tmake -t wat wxwin.pro -o makefile.wat
+#!          TODO:
+#!            - extended.c, unzip.c must be compiled with $(CC), not $(CCC).
+#!            - extended.c, unzip.c targets must be as per b32.t etc.
+#!            - OLE files not generated correctly (need 'ole/' directory)
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        my $tag = "";
+        if ( $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/ ) {
+            $tag = "WXNONESSENTIALOBJS";
+        }
+        else {
+            $tag = "WXGENERICOBJS";
+        }
+
+        $file =~ s/cp?p?$/obj/;
+        $project{$tag} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        #! doesn't compile, apparently
+        next if $file =~ /^imagjpeg\./;
+
+        $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXCOMMONOBJS"} .= $file . " ";
+        $project{"WXCOBJS"} .= $file . " " if $isCFile;
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        #! these files don't compile
+        next if $file =~ /^pnghand\./;
+
+        next if $wxGeneric{$file} =~ /\b16\b/;
+
+        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
+        my $isCFile = $file =~ /\.c$/;
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXMSWOBJS"} .= $file . " ";
+        $project{"WXCOBJS"} .= $file . " " if $isCFile;
+        $project{"WXOLEOBJS"} .= $file . " " if $isOleObj
+    }
+#$}
+#! an attempt to embed '#' directly in the string somehow didn't work...
+#$ $text = chr(35) . '!/binb/wmake.exe';
+
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
+
+#
+# File:     makefile.wat
+# Author:   Julian Smart
+# Created:  1998
+#
+# Makefile : Builds wxWindows library for Watcom C++, WIN32
+#
+# NOTE: This file is generated from wat.t by tmake, but not all bugs have
+# been removed from this process. If wxWindows doesn't compile,
+# check the following and edit this makefile accordingly:
+#
+# - OLE-related files such as oleutils.cpp should have 'ole\' prepended
+#   to the path.
+# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC).
+#   They may also be wrongly specified as extended.cpp, etc.
+
+WXDIR = ..\..
+
+!include $(WXDIR)\src\makewat.env
+
+WXLIB = $(WXDIR)\lib
+
+LIBTARGET   = $(WXLIB)\wx.lib
+DUMMY=dummydll
+# ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
+
+EXTRATARGETS = xpm png zlib
+EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
+GENDIR=$(WXDIR)\src\generic
+COMMDIR=$(WXDIR)\src\common
+XPMDIR=$(WXDIR)\src\xpm
+MSWDIR=$(WXDIR)\src\msw
+OLEDIR=$(MSWDIR)\ole
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "", " &\n\t")
+
+# These are generic things that don't need to be compiled on MSW,
+# but sometimes it's useful to do so for testing purposes.
+NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "", " &\n\t")
+
+COMMONOBJS = &
+	y_tab.obj &
+	#$ ExpandGlue("WXCOMMONOBJS", "", " &\n\t")
+
+MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")
+
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+
+all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
+
+$(LIBTARGET) : $(OBJECTS)
+    %create tmp.lbc
+    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+    wlib /b /c /n /p=512 $^@ @tmp.lbc
+
+#test : $(OBJECTS)
+#    %create tmp.lbc
+#    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+#    wlib /b /c /n /p=512 $^@ @tmp.lbc
+
+
+clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
+    -erase *.obj
+    -erase $(LIBTARGET)
+    -erase *.pch
+    -erase *.err
+    -erase *.lbc
+
+cleanall:   clean
+
+#${
+    $_ = $project{"WXMSWOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_ . ':     $(';
+        s/\.obj$//;
+        if ( $project{"WXOLEOBJS"} =~ /\b\Q$_\E\b/ ) {
+            $text .= 'OLEDIR)\\';
+        } else {
+            $text .= 'MSWDIR)\\';
+        }
+        my $suffix, $cc;
+        if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
+            $suffix = "c";
+            $cc="CC";
+        }
+        else {
+            $suffix = "cpp";
+            $cc="CCC";
+        }
+        $text .= $_ . ".$suffix\n" .
+                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
+    }
+#$}
+
+########################################################
+# Common objects (always compiled)
+
+#${
+    $_ = $project{"WXCOMMONOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_;
+        s/\.obj$//;
+        $text .= ':     $(COMMDIR)\\';
+        my $suffix, $cc;
+        if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
+            $suffix = "c";
+            $cc="CC";
+        }
+        else {
+            $suffix = "cpp";
+            $cc="CCC";
+        }
+        $text .= $_ . ".$suffix\n" .
+                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
+    }
+#$}
+
+y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
+
+#  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+
+#${
+    $_ = $project{"WXGENERICOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_;
+        s/\.obj$//;
+        $text .= ':     $(GENDIR)\\';
+        $text .= $_ . ".cpp\n" .
+                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
+    }
+#$}
+
+crbuffri.obj: $(XPMDIR)\crbuffri.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+crbuffrp.obj: $(XPMDIR)\crbuffrp.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+crdatfri.obj: $(XPMDIR)\crdatfri.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+crdatfrp.obj: $(XPMDIR)\crdatfrp.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+create.obj: $(XPMDIR)\create.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+crifrbuf.obj: $(XPMDIR)\crifrbuf.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+crifrdat.obj: $(XPMDIR)\crifrdat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+crpfrdat.obj: $(XPMDIR)\crpfrdat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+# TODO: what to do about this clash of filename????
+#data.obj: $(XPMDIR)\data.c
+#  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+hashtab.obj: $(XPMDIR)\hashtab.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+misc.obj: $(XPMDIR)\misc.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+parse.obj: $(XPMDIR)\parse.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+rdftodat.obj: $(XPMDIR)\rdftodat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+rdftoi.obj: $(XPMDIR)\rdftoi.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+rdftop.obj: $(XPMDIR)\rdftop.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+rgb.obj: $(XPMDIR)\rgb.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+scan.obj: $(XPMDIR)\scan.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+simx.obj: $(XPMDIR)\simx.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+wrffrdat.obj: $(XPMDIR)\wrffrdat.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+wrffri.obj: $(XPMDIR)\wrffri.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+wrffrp.obj: $(XPMDIR)\wrffrp.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
+  trees$(O)
+OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
+  infutil$(O) inffast$(O)
+
+adler32.obj: adler32.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+compress.obj: compress.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+crc32.obj: crc32.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+gzio.obj: gzio.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
+   infcodes.h infutil.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
+   infcodes.h inffast.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+	$(CC) -c $(CFLAGS) $*.c
+
+infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+	$(CC) -c $(CFLAGS) $*.c
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+	$(CC) -c $(CFLAGS) $*.c
+
+trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+xpm:   .SYMBOLIC
+    cd $(WXDIR)\src\xpm
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_xpm:   .SYMBOLIC
+    cd $(WXDIR)\src\xpm
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+png:   .SYMBOLIC
+    cd $(WXDIR)\src\png
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_png:   .SYMBOLIC
+    cd $(WXDIR)\src\png
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+MFTYPE=wat
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
--- a/distrib/msw/tmake/wxwin.pro
+++ b/distrib/msw/tmake/wxwin.pro
@@ -0,0 +1,10 @@
+###############################################################################
+# File:    wxwin.pro
+# Purpose: tmake project file from which makefiles for wxWindows are generated
+#          tmake -t vc wxwin.pro
+# Author:  Vadim Zeitlin
+# Created: 14.07.99
+# Version: $Id$
+###############################################################################
+
+# this file is empty
--- a/distrib/msw/user.rsp
+++ b/distrib/msw/user.rsp
@@ -0,0 +1,17 @@
+user/Makefile
+
+user/wxConvert/*.cpp
+user/wxConvert/*.h
+user/wxConvert/Makefile
+
+user/wxFile/*.cpp
+user/wxFile/*.h
+user/wxFile/Makefile
+user/wxFile/*.xpm
+
+user/wxTest/*.cpp
+user/wxTest/*.h
+user/wxTest/Makefile
+user/wxTest/*.xpm
+user/wxTest/*.png
+
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -0,0 +1,160 @@
+src/wxvc.dsp
+src/wxvc.dsw
+src/wxvc_dll.dsp
+src/wxvc_dll.dsw
+
+src/jpeg/jpeg.dsp
+src/jpeg/jpeg.dsw
+
+samples/checklst/ChecklstVC.dsp
+samples/checklst/ChecklstVC.dsw
+
+samples/config/ConfigVC.dsp
+samples/config/ConfigVC.dsw
+
+samples/controls/ControlsVC.dsp
+samples/controls/ControlsVC.dsw
+
+samples/db/DbVC.dsp
+samples/db/DbVC.dsw
+
+samples/dialogs/DialogsVC.dsp
+samples/dialogs/DialogsVC.dsw
+
+samples/dnd/DndVC.dsp
+samples/dnd/DndVC.dsw
+
+samples/docview/DocviewVC.dsp
+samples/docview/DocviewVC.dsw
+
+samples/docvwmdi/DocViewVC.dsp
+samples/docvwmdi/DocViewVC.dsw
+
+samples/dynamic/DynamicVC.dsp
+samples/dynamic/DynamicVC.dsw
+
+samples/forty/FortyVC.dsp
+samples/forty/FortyVC.dsw
+
+samples/grid/GridVC.dsp
+samples/grid/GridVC.dsw
+
+samples/help/HelpVC.dsp
+samples/help/HelpVC.dsw
+
+samples/image/ImageVC.dsp
+samples/image/ImageVC.dsw
+
+samples/internat/InternatVC.dsp
+samples/internat/InternatVC.dsw
+
+samples/joytest/JoytestVC.dsp
+samples/joytest/JoytestVC.dsw
+
+samples/layout/LayoutVC.dsp
+samples/layout/LayoutVC.dsw
+
+samples/listctrl/ListCtrlVC.dsp
+samples/listctrl/ListCtrlVC.dsw
+
+samples/mdi/MdiVC.dsp
+samples/mdi/MdiVC.dsw
+
+samples/memcheck/MemcheckVC.dsp
+samples/memcheck/MemcheckVC.dsw
+
+samples/mfc/MfcVC.dsp
+samples/mfc/MfcVC.dsw
+
+samples/minimal/MinimalVC.dsp
+samples/minimal/MinimalVC.dsw
+
+samples/minifram/MiniframVC.dsp
+samples/minifram/MiniframVC.dsw
+
+samples/nativdlg/NativdlgVC.dsp
+samples/nativdlg/NativdlgVC.dsw
+
+samples/notebook/NotebookVC.dsp
+samples/notebook/NotebookVC.dsw
+
+samples/ownerdrw/OwnerDrwVC.dsp
+samples/ownerdrw/OwnerDrwVC.dsw
+
+samples/png/PngVC.dsp
+samples/png/PngVC.dsw
+
+samples/printing/PrintingVC.dsp
+samples/printing/PrintingVC.dsw
+
+samples/Regtest/RegtestVC.dsp
+samples/Regtest/RegtestVC.dsw
+
+samples/resource/ResourceVC.dsp
+samples/resource/ResourceVC.dsw
+
+samples/sashtest/SashtestVC.dsp
+samples/sashtest/SashtestVC.dsw
+
+samples/splitter/SplitterVC.dsp
+samples/splitter/SplitterVC.dsw
+
+samples/tab/TabVC.dsp
+samples/tab/TabVC.dsw
+
+samples/taskbar/TaskbarVC.dsp
+samples/taskbar/TaskbarVC.dsw
+
+samples/thread/ThreadVC.dsp
+samples/thread/ThreadVC.dsw
+
+samples/toolbar/ToolbarVC.dsp
+samples/toolbar/ToolbarVC.dsw
+
+samples/treectrl/TreectrlVC.dsp
+samples/treectrl/TreeCtrlVC.dsw
+
+samples/typetest/TypetestVC.dsp
+samples/typetest/TypetestVC.dsw
+
+samples/validate/ValidateVC.dsp
+samples/validate/ValidateVC.dsw
+
+samples/wxsocket/ClientVC.dsp
+samples/wxsocket/ServerVC.dsw
+
+samples/wxpoem/PoemVC.dsp
+samples/wxpoem/PoemVC.dsw
+
+utils/wxprop/src/PropVC.dsp
+utils/wxprop/src/PropVC.dsw
+utils/wxprop/src/PropSampleVC.dsp
+utils/wxprop/src/PropSampleVC.dsw
+
+utils/dialoged/src/DialogEdVC.dsp
+utils/dialoged/src/DialogEdVC.dsw
+
+utils/tex2rtf/src/Tex2RTFVC.dsp
+utils/tex2rtf/src/Tex2RTFVC.dsw
+
+utils/glcanvas/win/Glcanvas*.dsp
+utils/glcanvas/win/Glcanvas*.dsw
+utils/glcanvas/samples/cube/CubeVC.dsp
+utils/glcanvas/samples/cube/CubeVC.dsw
+utils/glcanvas/samples/isosurf/IsosurfVC.dsp
+utils/glcanvas/samples/isosurf/IsosurfVC.dsw
+utils/glcanvas/samples/penguin/PenguinVC.dsp
+utils/glcanvas/samples/penguin/PenguinVC.dsw
+
+utils/ogl/src/OglVC.dsp
+utils/ogl/src/OglVC.dsw
+utils/ogl/samples/ogledit/OgleditVC.dsp
+utils/ogl/samples/ogledit/OgleditVC.dsw
+utils/ogl/samples/studio/StudioVC.dsp
+utils/ogl/samples/studio/StudioVC.dsw
+
+utils/wxtree/src/TreeVC.dsp
+utils/wxtree/src/TreeVC.dsw
+utils/wxtree/src/TreeSampleVC.dsp
+utils/wxtree/src/TreeSampleVC.dsw
+
--- a/distrib/msw/wisebott.txt
+++ b/distrib/msw/wisebott.txt
@@ -0,0 +1,247 @@
+item: Set Variable
+  Variable=MAINDIR
+  Value=%MAINDIR%
+  Flags=00010100
+end
+item: Include Script
+  Pathname=c:\Program Files\WISE\INCLUDE\uninstal.wse
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Get Registry Key Value
+  Variable=GROUPDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%WIN%\Start Menu\Programs
+  Value Name=Programs
+  Flags=00000010
+end
+item: Set Variable
+  Variable=GROUP
+  Value=%GROUPDIR%\%GROUP%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\Docs\Winhelp\Wx.hlp
+  Destination=%GROUP%\wxWindows Manual.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\Docs\Readme.txt
+  Destination=%GROUP%\ReadMe.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\dialoged.hlp
+  Destination=%GROUP%\Dialog Editor Help.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\ogl.hlp
+  Destination=%GROUP%\Object Graphics Library Help.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\prop.hlp
+  Destination=%GROUP%\wxProperty Classes Help.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\tex2rtf.hlp
+  Destination=%GROUP%\Tex2RTF Help.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\wxtree.hlp
+  Destination=%GROUP%\wxTree Help.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\html\index.htm
+  Destination=%GROUP%\HTML Docs Index.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\msw\install.txt
+  Destination=%GROUP%\Compiling wxWindows.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\bin\dialoged.exe
+  Destination=%GROUP%\Dialog Editor.lnk
+  Working Directory=%MAINDIR%
+end
+item: Else Statement
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Dialog Editor
+  Command Line=%MAINDIR%\bin\dialoged.exe
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=wxWindows Manual
+  Command Line=%MAINDIR%\Docs\Winhelp\Wx.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Compiling wxWindows
+  Command Line=%MAINDIR%\docs\msw\install.txt
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=ReadMe
+  Command Line=%MAINDIR%\Docs\Readme.txt
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=HTML Docs Index
+  Command Line=%MAINDIR%\docs\html\index.htm
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Dialog Editor Help
+  Command Line=%MAINDIR%\docs\winhelp\dialoged.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Object Graphics Library Help
+  Command Line=%MAINDIR%\docs\winhelp\ogl.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=wxProperty Classes Help
+  Command Line=%MAINDIR%\docs\winhelp\prop.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Tex2RTF Help
+  Command Line=%MAINDIR%\docs\winhelp\tex2rtf.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=wxTree Help
+  Command Line=%MAINDIR%\docs\winhelp\wxtree.hlp
+  Default Directory=%MAINDIR%
+end
+item: End Block
+end
+item: Self-Register OCXs/DLLs
+  Description=Updating System Configuration, Please Wait...
+end
+item: Execute Program
+  Pathname=explorer.exe
+  Command Line=%GROUP%
+end
+item: Add to AUTOEXEC.BAT
+  New Text=SET WXWIN=%MAINDIR%
+  Search Text=SET WXWIN
+  Line Number=0
+  Flags=00010110
+end
+item: Wizard Block
+  Direction Variable=DIRECTION
+  Display Variable=DISPLAY
+  Bitmap Pathname=c:\Program Files\WISE\DIALOGS\TEMPLATE\WIZARD.BMP
+  X Position=9
+  Y Position=10
+  Filler Color=8421440
+  Flags=00000011
+end
+item: Custom Dialog Set
+  Name=Finished
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Finish
+      Text French=&Fin
+      Text German=&Weiter
+      Text Spanish=&Terminar
+      Text Italian=&Fine
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DISABLED
+      Value=!
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Variable=DISABLED
+      Value=!
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Installation Completed!
+      Text French=Installation termin<69>e !
+      Text German=Die Installation ist abgeschlossen!
+      Text Spanish=<3D>Instalaci<63>n terminada!
+      Text Italian=Installazione completata!
+    end
+    item: Static
+      Rectangle=86 42 256 124
+      Create Flags=01010000000000000000000000000000
+      Text=The %APPTITLE% source files have been successfully installed, with some convenient shortcuts in the "wxWindows 2" program group.
+      Text=
+      Text=You will need to compile the library and any demo files you wish to run: please see docs\msw\install.txt for details.
+      Text=
+      Text=Press the Finish button to exit this installation.
+      Text French=%APPTITLE% est maintenant install<6C>.
+      Text French=
+      Text French=Cliquez sur le bouton Fin pour quitter l'installation.
+      Text German=%APPTITLE% wurde erfolgreich installiert.
+      Text German=
+      Text German=Klicken Sie auf "Weiter", um die Installation zu beenden.
+      Text Spanish=%APPTITLE% se ha instalado con <20>xito.
+      Text Spanish=
+      Text Spanish=Presione el bot<6F>n Terminar para salir de esta instalaci<63>n.
+      Text Italian=L'installazione %APPTITLE% <20> stata portata a termine con successo.
+      Text Italian=
+      Text Italian=Premere il pulsante Fine per uscire dall'installazione.
+    end
+  end
+end
+item: End Block
+end
--- a/distrib/msw/wisesys.txt
+++ b/distrib/msw/wisesys.txt
@@ -0,0 +1,21 @@
+item: Install File
+  Source=c:\Windows\System\Msvcirt.dll
+  Destination=%SYS32%\Msvcirt.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=c:\Windows\System\Msvcrt.dll
+  Destination=%SYS32%\Msvcrt.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=c:\Windows\System\Msvcrt.dll
+  Destination=%SYS%\Msvcrt.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=c:\Windows\System\Msvcirt.dll
+  Destination=%SYS%\Msvcirt.dll
+  Flags=0000000000000010
+end
+
--- a/distrib/msw/wisetop.txt
+++ b/distrib/msw/wisetop.txt
@@ -0,0 +1,592 @@
+Document Type: WSE
+item: Global
+  Version=5.0
+  Title=wxWindows 2.1.10 Installation
+  Flags=00000100
+  Split=1420
+  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+  Japanese Font Name=MS Gothic
+  Japanese Font Size=10
+  Start Gradient=0 0 255
+  End Gradient=0 0 0
+  Windows Flags=00000000000000010010110000001000
+  Log Pathname=%MAINDIR%\INSTALL.LOG
+  Message Font=MS Sans Serif
+  Font Size=8
+  Disk Filename=SETUP
+  Patch Flags=0000000000000001
+  Patch Threshold=85
+  Patch Memory=4000
+  EXE Filename=D:\wx2\wxWindows\deliver\setup.exe
+  FTP Cluster Size=20
+  Variable Name1=_SYS_
+  Variable Default1=C:\WINDOWS\SYSTEM
+  Variable Flags1=00001000
+  Variable Name2=_ODBC16_
+  Variable Default2=C:\WINDOWS\SYSTEM
+  Variable Flags2=00001000
+  Variable Name3=_ODBC32_
+  Variable Default3=C:\WINDOWS\SYSTEM
+  Variable Flags3=00001000
+  Variable Name4=_WISE_
+  Variable Default4=C:\PROGRAM FILES\WISE
+  Variable Flags4=00001000
+end
+item: Open/Close INSTALL.LOG
+  Flags=00000001
+end
+item: Check if File/Dir Exists
+  Pathname=%SYS%
+  Flags=10000100
+end
+item: Set Variable
+  Variable=SYS
+  Value=%WIN%
+end
+item: End Block
+end
+item: Set Variable
+  Variable=APPTITLE
+  Value=wxWindows 2.1.10
+end
+item: Set Variable
+  Variable=GROUP
+  Value=wxWindows 2
+end
+item: Set Variable
+  Variable=DISABLED
+  Value=!
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=wx2
+end
+item: Display Graphic
+  Pathname=D:\wx2\wxWindows\distrib\msw\wxwin01.bmp
+  X Position=16
+  Y Position=16
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Get Registry Key Value
+  Variable=COMMON
+  Key=SOFTWARE\Microsoft\Windows\CurrentVersion
+  Default=C:\Program Files\Common Files
+  Value Name=CommonFilesDir
+  Flags=00000100
+end
+item: Get Registry Key Value
+  Variable=PROGRAM_FILES
+  Key=SOFTWARE\Microsoft\Windows\CurrentVersion
+  Default=C:\Program Files
+  Value Name=ProgramFilesDir
+  Flags=00000100
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=%PROGRAM_FILES%\%MAINDIR%
+end
+item: Set Variable
+  Variable=EXPLORER
+  Value=1
+end
+item: Else Statement
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=C:\%MAINDIR%
+end
+item: End Block
+end
+item: Set Variable
+  Variable=BACKUP
+  Value=%MAINDIR%\BACKUP
+end
+item: Set Variable
+  Variable=DOBACKUP
+  Value=B
+end
+item: Set Variable
+  Variable=BRANDING
+  Value=0
+end
+item: If/While Statement
+  Variable=BRANDING
+  Value=1
+end
+item: Read INI Value
+  Variable=NAME
+  Pathname=%INST%\CUSTDATA.INI
+  Section=Registration
+  Item=Name
+end
+item: Read INI Value
+  Variable=COMPANY
+  Pathname=%INST%\CUSTDATA.INI
+  Section=Registration
+  Item=Company
+end
+item: If/While Statement
+  Variable=NAME
+end
+item: Set Variable
+  Variable=DOBRAND
+  Value=1
+end
+item: End Block
+end
+item: End Block
+end
+item: Wizard Block
+  Direction Variable=DIRECTION
+  Display Variable=DISPLAY
+  Bitmap Pathname=c:\Program Files\WISE\DIALOGS\TEMPLATE\WIZARD.BMP
+  X Position=9
+  Y Position=10
+  Filler Color=8421440
+  Flags=00000011
+end
+item: Custom Dialog Set
+  Name=Welcome
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Welcome!
+      Text French=Bienvenue !
+      Text German=Willkommen!
+      Text Spanish=<3D>Bienvenido!
+      Text Italian=Benvenuti!
+    end
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DISABLED
+      Value=!
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=86 41 256 130
+      Create Flags=01010000000000000000000000000000
+      Text=This installation program will install %APPTITLE%. It will need about 18 MB of hard disk space.
+      Text=
+      Text=Press the Next button to start the installation. You can press the Cancel button now if you do not want to install %APPTITLE% at this time.
+      Text French=Ce programme d'installation va installer %APPTITLE%.
+      Text French=
+      Text French=Cliquez sur le bouton Suite pour d<>marrer l'installation. Vous pouvez cliquer sur le bouton Quitter l'installation si vous ne voulez pas installer %APPTITLE% tout de suite.
+      Text German=Mit diesem Installationsprogramm wird %APPTITLE% installiert.
+      Text German=
+      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Abbrechen", um die Installation von %APPTITLE% abzubrechen.
+      Text Spanish=Este programa de instalaci<63>n instalar<61> %APPTITLE%.
+      Text Spanish=
+      Text Spanish=Presione el bot<6F>n Siguiente para iniciar la instalaci<63>n. Puede presionar el bot<6F>n Salir de instalaci<63>n si no desea instalar %APPTITLE% en este momento.
+      Text Italian=Questo programma installer<65> %APPTITLE%.
+      Text Italian=
+      Text Italian=Per avvviare l'installazione premere il pulsante Avanti. Se non si desidera installare %APPTITLE% ora, premere il pulsante Esci dall'installazione.
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Select Destination Directory
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Select Destination Directory
+      Text French=S<>lectionner le r<>pertoire de destination
+      Text German=Zielverzeichnis w<>hlen
+      Text Spanish=Seleccione el directorio de destino
+      Text Italian=Selezionare Directory di destinazione
+    end
+    item: Static
+      Rectangle=86 42 256 82
+      Create Flags=01010000000000000000000000000000
+      Text=Please select the directory where %APPTITLE% files are to be installed.
+      Text=
+      Text=Important: do not install into a directory with a space in the name, such as Program Files.
+      Text French=Veuillez s<>lectionner le r<>pertoire dans lequel les fichiers %APPTITLE% doivent <20>tre install<6C>s.
+      Text German=Geben Sie an, in welchem Verzeichnis die %APPTITLE%-Dateien installiert werden sollen.
+      Text Spanish=Por favor seleccione el directorio donde desee instalar los archivos de %APPTITLE%.
+      Text Italian=Selezionare la directory dove verranno installati i file %APPTITLE%.
+    end
+    item: Static
+      Rectangle=86 98 256 125
+      Action=1
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Push Button
+      Rectangle=208 106 253 121
+      Variable=MAINDIR_SAVE
+      Value=%MAINDIR%
+      Destination Dialog=1
+      Action=2
+      Create Flags=01010000000000010000000000000000
+      Text=B&rowse
+      Text French=Parcourir
+      Text German=Durchsuchen
+      Text Spanish=Buscar
+      Text Italian=Sfoglie
+    end
+    item: Static
+      Rectangle=90 109 206 120
+      Create Flags=01010000000000000000000000000000
+      Text=%MAINDIR%
+      Text French=%MAINDIR%
+      Text German=%MAINDIR%
+      Text Spanish=%MAINDIR%
+      Text Italian=%MAINDIR%
+    end
+  end
+  item: Dialog
+    Title=Select Destination Directory
+    Title French=S<>lectionner le r<>pertoire de destination
+    Title German=Zielverzeichnis w<>hlen
+    Title Spanish=Seleccione el directorio de destino
+    Title Italian=Selezionare Directory di destinazione
+    Width=221
+    Height=173
+    Font Name=Helv
+    Font Size=8
+    item: Listbox
+      Rectangle=5 5 163 149
+      Variable=MAINDIR
+      Create Flags=01010000100000010000000101000000
+      Flags=0000110000100010
+      Text=%MAINDIR%
+      Text French=%MAINDIR%
+      Text German=%MAINDIR%
+      Text Spanish=%MAINDIR%
+      Text Italian=%MAINDIR%
+    end
+    item: Push Button
+      Rectangle=167 6 212 21
+      Create Flags=01010000000000010000000000000001
+      Text=OK
+      Text French=OK
+      Text German=OK
+      Text Spanish=Aceptar
+      Text Italian=OK
+    end
+    item: Push Button
+      Rectangle=167 25 212 40
+      Variable=MAINDIR
+      Value=%MAINDIR_SAVE%
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=Cancel
+      Text French=Annuler
+      Text German=Abbrechen
+      Text Spanish=Cancelar
+      Text Italian=Annulla
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Select Program Manager Group
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Select ProgMan Group
+      Text French=S<>lectionner le groupe du Gestionnaire de programme 
+      Text German=Bestimmung der Programm-Managergruppe
+      Text Spanish=Seleccione grupo del Administrador de programas
+      Text Italian=Selezionare il gruppo ProgMan 
+    end
+    item: Static
+      Rectangle=86 44 256 68
+      Create Flags=01010000000000000000000000000000
+      Text=Enter the name of the Program Manager group to add the %APPTITLE% icons to:
+      Text French=Entrez le nom du groupe du Gestionnaire de programme dans lequel vous souhaitez ajouter les ic<69>nes de %APPTITLE% :
+      Text German=Geben Sie den Namen der Programmgruppe ein, der das Symbol %APPTITLE% hinzugef<65>gt werden soll:
+      Text Spanish=Escriba el nombre del grupo del Administrador de programas en el que desea agregar los iconos de %APPTITLE%:
+      Text Italian=Inserire il nome del gruppo Program Manager per aggiungere le icone %APPTITLE% a:
+    end
+    item: Combobox
+      Rectangle=86 69 256 175
+      Variable=GROUP
+      Create Flags=01010000001000010000001100000001
+      Flags=0000000000000001
+      Text=%GROUP%
+      Text French=%GROUP%
+      Text German=%GROUP%
+      Text Spanish=%GROUP%
+      Text Italian=%GROUP%
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Start Installation
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Ready to Install!
+      Text French=Pr<50>t <20> installer !
+      Text German=Installationsbereit!
+      Text Spanish=<3D>Preparado para la instalaci<63>n!
+      Text Italian=Pronto per l'installazione!
+    end
+    item: Static
+      Rectangle=86 42 256 102
+      Create Flags=01010000000000000000000000000000
+      Text=You are now ready to install %APPTITLE%.
+      Text=
+      Text=Press the Next button to begin the installation or the Back button to reenter the installation information.
+      Text French=Vous <20>tes maintenant pr<70>t <20> installer les fichiers %APPTITLE%.
+      Text French=
+      Text French=Cliquez sur le bouton Suite pour commencer l'installation ou sur le bouton Retour pour entrer les informations d'installation <20> nouveau.
+      Text German=Sie k<>nnen %APPTITLE% nun installieren.
+      Text German=
+      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Zur<75>ck", um die Installationsinformationen neu einzugeben.
+      Text Spanish=Ya est<73> listo para instalar %APPTITLE%.
+      Text Spanish=
+      Text Spanish=Presione el bot<6F>n Siguiente para comenzar la instalaci<63>n o presione Atr<74>s para volver a ingresar la informaci<63>n para la instalaci<63>n.
+      Text Italian=Ora <20> possibile installare %APPTITLE%.
+      Text Italian=
+      Text Italian=Premere il pulsante Avanti per avviare l'installazione o il pulsante Indietro per reinserire le informazioni di installazione.
+    end
+  end
+end
+item: If/While Statement
+  Variable=DISPLAY
+  Value=Select Destination Directory
+end
+item: Set Variable
+  Variable=BACKUP
+  Value=%MAINDIR%\BACKUP
+end
+item: End Block
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=DOBACKUP
+  Value=A
+end
+item: Set Variable
+  Variable=BACKUPDIR
+  Value=%BACKUP%
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=BRANDING
+  Value=1
+end
+item: If/While Statement
+  Variable=DOBRAND
+  Value=1
+end
+item: Edit INI File
+  Pathname=%INST%\CUSTDATA.INI
+  Settings=[Registration]
+  Settings=NAME=%NAME%
+  Settings=COMPANY=%COMPANY%
+  Settings=
+end
+item: End Block
+end
+item: End Block
+end
+item: Open/Close INSTALL.LOG
+end
+item: Check Disk Space
+  Component=COMPONENTS
+end
--- a/distrib/msw/wx_html.rsp
+++ b/distrib/msw/wx_html.rsp
@@ -9,30 +9,29 @@ docs/html/faq/*.htm
 docs/html/faq/*.gif
 docs/html/techref/*.htm
 docs/html/techref/*.gif
-docs/html/prologio/*.htm
-docs/html/prologio/*.gif
+
 docs/html/dialoged/*.htm
 docs/html/dialoged/*.gif
-docs/html/wxbuild/*.htm
-docs/html/wxbuild/*.gif
-docs/html/wxtab/*.htm
-docs/html/wxtab/*.gif
-docs/html/wxchart/*.htm
-docs/html/wxchart/*.gif
+
 docs/html/wxtree/*.htm
 docs/html/wxtree/*.gif
+
 docs/html/wxgraph/*.htm
 docs/html/wxgraph/*.gif
-docs/html/wxgrid/*.htm
-docs/html/wxgrid/*.gif
+
 docs/html/wxhelp/*.htm
 docs/html/wxhelp/*.gif
-docs/html/wxhelp2/*.htm
-docs/html/wxhelp2/*.gif
-docs/html/wxprop/*.htm
-docs/html/wxprop/*.gif
+
+docs/html/proplist/*.htm
+docs/html/proplist/*.gif
+
 docs/html/winstall/*.htm
 docs/html/winstall/*.gif
+
 docs/html/tex2rtf/*.htm
 docs/html/tex2rtf/*.gif

+docs/html/odbc/*.htm
+
+docs/html/gettext/*.htm
+
--- a/distrib/msw/wx_word.rsp
+++ b/distrib/msw/wx_word.rsp
@@ -0,0 +1,2 @@
+docs/word/odbc.doc
+
--- a/distrib/msw/wxtree.rsp
+++ b/distrib/msw/wxtree.rsp
@@ -0,0 +1,10 @@
+utils/wxtree/src/*.cpp
+utils/wxtree/src/*.h
+utils/wxtree/src/makefile*
+utils/wxtree/src/*.xbm
+utils/wxtree/src/*.xpm
+utils/wxtree/lib/dummy
+utils/wxtree/src/*.ico
+utils/wxtree/src/*.def
+utils/wxtree/src/*.rc
+
--- a/distrib/msw/wxwin01.bmp
+++ b/distrib/msw/wxwin01.bmp
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -1,34 +1,147 @@
@echo off
 rem Zip up an external, generic + Windows distribution of wxWindows 2.0
-if "%1" == "" goto usage
-if "%2" == "" goto usage
+set src=%wxwin
+set dest=%src\deliver
+set wise=0
+
+Rem Set this to the required version
+set version=2_1_11
+
+if "%src" == "" goto usage
+if "%dest" == "" goto usage
+if "%1" == "-help" goto usage
+if "%1" == "--help" goto usage
+if "%1" == "/?" goto usage
+if "%1" == "wise" set wise=1
 echo About to archive an external wxWindows distribution:
-echo   From   %1
-echo   To     %2\wx200gen.zip, %2\wx200doc.zip, %2\wx200msw.zip, %2\wx200ps.zip, %2\wx200hlp.zip, %2\wx200htm.zip, %2\wx200pdf.zip
+echo   From   %src
+echo   To     %dest
+if "%wise" == "1" echo with WISE setup creation.
 echo CTRL-C if this is not correct.
 pause

-erase %2\wx200*.zip
+rem goto dounzip

-cd %1
+erase %dest\wx*.zip
+erase %dest\glcanvas.zip
+erase %dest\ogl3.zip
+erase %dest\tex2rtf2.zip
+erase %dest\jpeg.zip
+
+if direxist %dest\wx deltree /Y %dest\wx
+
+cd %src
 echo Zipping...
-zip32 -@ %2\wx200gen.zip < %1\distrib\msw\generic.rsp
-zip32 -@ %2\wx200msw.zip < %1\distrib\msw\msw.rsp
-zip32 -@ %2\wx200doc.zip < %1\distrib\msw\docsrc.rsp

-rem zip32 -@ %2\wx200ps.zip < %1\distrib\msw\wx_ps.rsp
-zip32 -@ %2\wx200hlp.zip < %1\distrib\msw\wx_hlp.rsp
-zip32 -@ %2\wx200htm.zip < %1\distrib\msw\wx_html.rsp
-zip32 -@ %2\wx200pdf.zip < %1\distrib\msw\wx_pdf.rsp
+zip32 -@ %dest\wx%version%_gen.zip < %src\distrib\msw\generic.rsp
+zip32 -@ -u %dest\wx%version%_gen.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_msw.zip < %src\distrib\msw\msw.rsp
+zip32 -@ -u %dest\wx%version%_msw.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_gtk.zip < %src\distrib\msw\gtk.rsp
+zip32 -@ -u %dest\wx%version%_gtk.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_stubs.zip < %src\distrib\msw\stubs.rsp
+zip32 -@ %dest\wx%version%_mot.zip < %src\distrib\msw\motif.rsp
+zip32 -@ -u %dest\wx%version%_mot.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_user.zip < %src\distrib\msw\user.rsp

-cd %2
+zip32 -@ %dest\wx%version%_doc.zip < %src\distrib\msw\docsrc.rsp
+zip32 -@ %dest\wx%version%_hlp.zip < %src\distrib\msw\wx_hlp.rsp
+zip32 -@ %dest\wx%version%_htm.zip < %src\distrib\msw\wx_html.rsp
+zip32 -@ %dest\wx%version%_pdf.zip < %src\distrib\msw\wx_pdf.rsp
+zip32 -@ %dest\wx%version%_wrd.zip < %src\distrib\msw\wx_word.rsp
+
+rem VC++ project files
+zip32 -@ %dest\wx%version%_vc.zip < %src\distrib\msw\vc.rsp
+
+rem BC++ project files
+zip32 -@ %dest\wx%version%_bc.zip < %src\distrib\msw\bc.rsp
+
+rem CodeWarrior project files
+zip32 -@ %dest\wx%version%_cw.zip < %src\distrib\msw\cw.rsp
+
+rem OGL 3
+zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
+
+rem GLCanvas
+zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp
+
+rem Tex2RTF
+zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
+
+rem wxTreeLayout
+zip32 -@ %dest\treedraw.zip < %src\distrib\msw\wxtree.rsp
+
+rem JPEG source
+zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
+
+copy %src\docs\changes.txt %dest
+copy %src\docs\msw\install.txt %dest\install_msw.txt
+copy %src\docs\motif\install.txt %dest\install_motif.txt
+copy %src\docs\gtk\install.txt %dest\install_gtk.txt
+copy %src\docs\readme.txt %dest
+copy %src\docs\motif\makewxmotif %dest
+copy %src\docs\gtk\makewxgtk %dest
+
+:dounzip
+
+cd %dest
+
+Rem Skip WISE setup if wise is 0.
+if "%wise" == "0" goto end
+
+rem Unzip the Windows files into 'wx'
+mkdir %dest\wx
+
+Rem After this change of directory, we're in the
+Rem temporary 'wx' directory and not acting on
+Rem the source wxWindows directory.
+cd %dest\wx
+unzip32 -o ..\wx%version%_msw.zip
+unzip32 -o ..\wx%version%_gen.zip
+unzip32 -o ..\wx%version%_vc.zip
+unzip32 -o ..\wx%version%_bc.zip
+unzip32 -o ..\wx%version%_hlp.zip
+Rem Need Word file, for Remstar DB classes
+unzip32 -o ..\wx%version%_wrd.zip
+unzip32 -o ..\glcanvas.zip
+unzip32 -o ..\treedraw.zip
+unzip32 -o ..\ogl3.zip
+unzip32 -o ..\jpeg.zip
+unzip32 -o ..\tex2rtf3.zip
+
+rem Now delete a few files that are unnecessary
+erase /Y *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh
+erase /SY Makefile.in
+rem erase /Y docs\pdf\ogl.pdf
+rem deltree /Y docs\html\ogl
+
+rem Now copy some binary files to 'bin'
+if not isdir bin mkdir bin
+copy %src\bin\dialoged.exe bin
+copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
+
+rem Time to regenerate the WISE install script, wxwin2.wse.
+rem NB: if you've changed wxwin2.wse using WISE, call splitwise.exe
+rem from within distrib\msw, to split off wisetop.txt and wisebott.txt.
+echo Calling 'makewise' to generate wxwin2.wse...
+call %WXWIN\distrib\msw\makewise.bat
+
+rem Now invoke WISE install on the new wxwin2.wse
+set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
+echo Invoking %wisecmd...
+start /w %wisecmd
+Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\setup_%version%.exe
+
+cd %dest

 echo wxWindows archived.
 goto end

 :usage
-echo DOS wxWindows distribution.
-echo Usage: zipdist source destination
-echo e.g. zipdist d:\wx2\wxWindows d:\wx2\wxWindows\deliver
+echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files,
+echo and optionally makes a deliver\wx directory and a setup.exe
+echo if you specify 'wise'.
+echo.
+echo Usage: zipdist [wise]

 :end
--- a/distrib/wine/copy_src
+++ b/distrib/wine/copy_src
@@ -0,0 +1,675 @@
+#! /bin/sh
+#
+# This script is creates a dir tree in ~/wxwine_dist which
+# can then be packed into an archive
+
+echo                               --------
+echo    This script will copy the wxWINE release files into ~/wxwine_dist
+echo                               --------
+echo
+
+mkdir ~/wxwine_dist
+mkdir ~/wxwine_dist/wxWINE
+
+echo Base dir..
+
+cd ../..
+cp wxWINE.spec ~/wxwine_dist/wxWINE
+cp Makefile.am ~/wxwine_dist/wxWINE
+cp acconfig.h ~/wxwine_dist/wxWINE
+cp acinclude.m4 ~/wxwine_dist/wxWINE
+cp aclocal.m4 ~/wxwine_dist/wxWINE
+cp configure.in ~/wxwine_dist/wxWINE
+cp configure ~/wxwine_dist/wxWINE
+cp config.sub ~/wxwine_dist/wxWINE
+cp config.guess ~/wxwine_dist/wxWINE
+cp install-sh ~/wxwine_dist/wxWINE
+cp ltconfig ~/wxwine_dist/wxWINE
+cp ltmain.sh ~/wxwine_dist/wxWINE
+cp missing ~/wxwine_dist/wxWINE
+cp mkinstalldirs ~/wxwine_dist/wxWINE
+cp wx-config.in ~/wxwine_dist/wxWINE
+cp setup.h.in ~/wxwine_dist/wxWINE
+cp stamp-h.in ~/wxwine_dist/wxWINE
+cp Makefile.in ~/wxwine_dist/wxWINE
+
+echo Docs..
+
+cd docs/wine
+cp COPYING.LIB ~/wxwine_dist/wxWINE
+cp install.txt ~/wxwine_dist/wxWINE/INSTALL.txt
+cp changes.txt ~/wxwine_dist/wxWINE/CHANGES.txt
+cp licence.txt ~/wxwine_dist/wxWINE/LICENCE.txt
+cp readme.txt ~/wxwine_dist/wxWINE/README.txt
+cp todo.txt ~/wxwine_dist/wxWINE/TODO.txt
+cd ..
+cp symbols.txt ~/wxwine_dist/wxWINE/SYMBOLS.txt
+cd ..
+
+echo Include dir..
+
+mkdir ~/wxwine_dist/wxWINE/include
+cd include
+cp Makefile.am ~/wxwine_dist/wxWINE/include
+cp Makefile.in ~/wxwine_dist/wxWINE/include
+
+mkdir ~/wxwine_dist/wxWINE/include/wx
+cd wx
+cp *.h ~/wxwine_dist/wxWINE/include/wx
+cp *.cpp ~/wxwine_dist/wxWINE/include/wx
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/generic
+cd generic
+cp *.h ~/wxwine_dist/wxWINE/include/wx/generic
+cp *.xpm ~/wxwine_dist/wxWINE/include/wx/generic
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/generic
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/generic
+cd ..
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/html
+cd html
+cp *.h ~/wxgtk_dist/wxGTK/include/wx/html
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/html
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/html
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/unix
+cd unix
+cp *.h ~/wxwine_dist/wxWINE/include/wx/unix
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/unix
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/unix
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/msw
+cd msw
+cp *.h ~/wxwine_dist/wxWINE/include/wx/msw
+rm ~/wxwine_dist/wxWINE/include/wx/msw/setup.h
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/msw
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/msw
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/motif
+cd motif
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/motif
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/motif
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/gtk
+cd gtk
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/gtk
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/gtk
+cd ..
+
+mkdir ~/wxwine_dist/wxWINE/include/wx/protocol
+cd protocol
+cp *.h ~/wxwine_dist/wxWINE/include/wx/protocol
+cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/protocol
+cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/protocol
+cd ..
+
+cd ../..
+
+echo Misc dir..
+
+mkdir ~/wxwine_dist/wxWINE/misc
+cd misc
+cp Makefile.am ~/wxwine_dist/wxWINE/misc
+cp Makefile.in ~/wxwine_dist/wxWINE/misc
+mkdir ~/wxwine_dist/wxWINE/misc/afm
+cd afm
+cp *.afm ~/wxwine_dist/wxWINE/misc/afm
+cp Makefile.am ~/wxwine_dist/wxWINE/misc/afm
+cp Makefile.in ~/wxwine_dist/wxWINE/misc/afm
+cd ..
+mkdir ~/wxwine_dist/wxWINE/misc/gs_afm
+cd gs_afm
+cp *.afm ~/wxwine_dist/wxWINE/misc/gs_afm
+cp Makefile.am ~/wxwine_dist/wxWINE/misc/gs_afm
+cp Makefile.in ~/wxwine_dist/wxWINE/misc/gs_afm
+cd ../..
+
+echo Src dir..
+
+cd src
+mkdir ~/wxwine_dist/wxWINE/src
+cp Makefile.am ~/wxwine_dist/wxWINE/src
+cp Makefile.in ~/wxwine_dist/wxWINE/src
+
+cd msw
+mkdir ~/wxwine_dist/wxWINE/src/msw
+cp Makefile.am ~/wxwine_dist/wxWINE/src/msw
+cp Makefile.in ~/wxwine_dist/wxWINE/src/msw
+cp *.xbm ~/wxwine_dist/wxWINE/src/msw
+cp *.c ~/wxwine_dist/wxWINE/src/msw
+cp *.inc ~/wxwine_dist/wxWINE/src/msw
+cp *.cpp ~/wxwine_dist/wxWINE/src/msw
+cd ..
+
+cd common
+mkdir ~/wxwine_dist/wxWINE/src/common
+cp glob.inc ~/wxwine_dist/wxWINE/src/common
+cp lexer.l ~/wxwine_dist/wxWINE/src/common
+cp parser.y ~/wxwine_dist/wxWINE/src/common
+cp extended.c ~/wxwine_dist/wxWINE/src/common
+cp *.cpp ~/wxwine_dist/wxWINE/src/common
+cd ..
+
+cd html
+mkdir ~/wxgtk_dist/wxGTK/src/html
+cp *.cpp ~/wxgtk_dist/wxGTK/src/html
+cp *.h ~/wxgtk_dist/wxGTK/src/html
+cd bitmaps
+mkdir ~/wxgtk_dist/wxGTK/src/html/bitmaps
+cp *.xpm ~/wxgtk_dist/wxGTK/src/html/bitmaps
+cd ../..
+
+cd unix
+mkdir ~/wxwine_dist/wxWINE/src/unix
+cp *.cpp ~/wxwine_dist/wxWINE/src/unix
+cd ..
+
+cd generic
+mkdir ~/wxwine_dist/wxWINE/src/generic
+cp *.cpp ~/wxwine_dist/wxWINE/src/generic
+cd ..
+
+cd iodbc
+mkdir ~/wxwine_dist/wxWINE/src/iodbc
+cp * ~/wxwine_dist/wxWINE/src/iodbc
+cd ..
+
+cd zlib
+mkdir ~/wxwine_dist/wxWINE/src/zlib
+cp * ~/wxwine_dist/wxWINE/src/zlib
+cd ..
+
+cd png
+mkdir ~/wxwine_dist/wxWINE/src/png
+cp * ~/wxwine_dist/wxWINE/src/png
+cd ..
+
+cd jpeg
+mkdir ~/wxwine_dist/wxWINE/src/jpeg
+cp * ~/wxwine_dist/wxWINE/src/jpeg
+cd ..
+
+cd ..
+
+echo Utils dir..
+
+cd utils
+mkdir ~/wxwine_dist/wxWINE/utils
+cp Makefile.am ~/wxwine_dist/wxWINE/utils
+cp Makefile.in ~/wxwine_dist/wxWINE/utils
+cd ..
+
+echo Samples dir..
+
+cd samples
+mkdir ~/wxwine_dist/wxWINE/samples
+cp Makefile.am ~/wxwine_dist/wxWINE/samples
+cp Makefile.in ~/wxwine_dist/wxWINE/samples
+
+echo Minimal sample..
+
+cd minimal
+mkdir ~/wxwine_dist/wxWINE/samples/minimal
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/minimal
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/minimal
+cp minimal.cpp ~/wxwine_dist/wxWINE/samples/minimal
+cp mondrian.xpm ~/wxwine_dist/wxWINE/samples/minimal
+cd ..
+
+echo Bombs sample..
+
+cd bombs
+mkdir ~/wxwine_dist/wxWINE/samples/bombs
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/bombs
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/bombs
+cp *.cpp ~/wxwine_dist/wxWINE/samples/bombs
+cp *.h ~/wxwine_dist/wxWINE/samples/bombs
+cp *.xpm ~/wxwine_dist/wxWINE/samples/bombs
+cd ..
+
+echo Caret sample..
+
+cd caret
+mkdir ~/wxwine_dist/wxWINE/samples/caret
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/caret
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/caret
+cp *.cpp ~/wxwine_dist/wxWINE/samples/caret
+cp *.xpm ~/wxwine_dist/wxWINE/samples/caret
+cd ..
+
+echo Checklst sample..
+
+cd checklst
+mkdir ~/wxwine_dist/wxWINE/samples/checklst
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/checklst
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/checklst
+cp *.cpp ~/wxwine_dist/wxWINE/samples/checklst
+cp *.xpm ~/wxwine_dist/wxWINE/samples/checklst
+cd ..
+
+echo Config sample..
+
+cd config
+mkdir ~/wxwine_dist/wxWINE/samples/config
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/config
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/config
+cp *.cpp ~/wxwine_dist/wxWINE/samples/config
+cd ..
+
+echo Controls sample..
+
+cd controls
+mkdir ~/wxwine_dist/wxWINE/samples/controls
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/controls
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/controls
+cp *.cpp ~/wxwine_dist/wxWINE/samples/controls
+cp *.xpm ~/wxwine_dist/wxWINE/samples/controls
+cd icons
+mkdir ~/wxwine_dist/wxWINE/samples/controls/icons
+cp *.xpm ~/wxwine_dist/wxWINE/samples/controls/icons
+cd ../..
+
+echo Db sample..
+
+cd db
+mkdir ~/wxwine_dist/wxWINE/samples/db
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/db
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/db
+cp *.cpp ~/wxwine_dist/wxWINE/samples/db
+cp *.h ~/wxwine_dist/wxWINE/samples/db
+cp *.xpm ~/wxwine_dist/wxWINE/samples/db
+cd ..
+
+echo DDE sample..
+
+cd dde
+mkdir ~/wxwine_dist/wxWINE/samples/dde
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/dde
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/dde
+cp *.cpp ~/wxwine_dist/wxWINE/samples/dde
+cp *.h ~/wxwine_dist/wxWINE/samples/dde
+cp *.xpm ~/wxwine_dist/wxWINE/samples/dde
+cd ..
+
+echo Dialogs sample..
+
+cd dialogs
+mkdir ~/wxwine_dist/wxWINE/samples/dialogs
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/dialogs
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/dialogs
+cp *.cpp ~/wxwine_dist/wxWINE/samples/dialogs
+cp *.h ~/wxwine_dist/wxWINE/samples/dialogs
+cd ..
+
+echo DnD sample..
+
+cd dnd
+mkdir ~/wxwine_dist/wxWINE/samples/dnd
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/dnd
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/dnd
+cp *.cpp ~/wxwine_dist/wxWINE/samples/dnd
+cp *.xpm ~/wxwine_dist/wxWINE/samples/dnd
+cd ..
+
+echo Docview sample..
+
+cd docview
+mkdir ~/wxwine_dist/wxWINE/samples/docview
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/docview
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/docview
+cp *.cpp ~/wxwine_dist/wxWINE/samples/docview
+cp *.h ~/wxwine_dist/wxWINE/samples/docview
+cp *.xpm ~/wxwine_dist/wxWINE/samples/docview
+cd ..
+
+echo DocvwMDI sample..
+
+cd docvwmdi
+mkdir ~/wxwine_dist/wxWINE/samples/docvwmdi
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/docvwmdi
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/docvwmdi
+cp *.cpp ~/wxwine_dist/wxWINE/samples/docvwmdi
+cp *.h ~/wxwine_dist/wxWINE/samples/docvwmdi
+cd ..
+
+echo Dynamic sample..
+
+cd dynamic
+mkdir ~/wxwine_dist/wxWINE/samples/dynamic
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/dynamic
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/dynamic
+cp *.cpp ~/wxwine_dist/wxWINE/samples/dynamic
+cp *.xpm ~/wxwine_dist/wxWINE/samples/dynamic
+cd ..
+
+echo Drawing sample..
+
+cd drawing
+mkdir ~/wxwine_dist/wxWINE/samples/drawing
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/drawing
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/drawing
+cp *.cpp ~/wxwine_dist/wxWINE/samples/drawing
+cp *.xpm ~/wxwine_dist/wxWINE/samples/drawing
+cd ..
+
+echo Forty sample..
+
+cd forty
+mkdir ~/wxwine_dist/wxWINE/samples/forty
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/forty
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/forty
+cp *.cpp ~/wxwine_dist/wxWINE/samples/forty
+cp *.h ~/wxwine_dist/wxWINE/samples/forty
+cp *.xpm ~/wxwine_dist/wxWINE/samples/forty
+cp *.xbm ~/wxwine_dist/wxWINE/samples/forty
+cd ..
+
+echo Fractal sample..
+
+cd fractal
+mkdir ~/wxwine_dist/wxWINE/samples/fractal
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/fractal
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/fractal
+cp *.cpp ~/wxwine_dist/wxWINE/samples/fractal
+cd ..
+
+echo Grid sample..
+
+cd grid
+mkdir ~/wxwine_dist/wxWINE/samples/grid
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/grid
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/grid
+cp *.cpp ~/wxwine_dist/wxWINE/samples/grid
+cd ..
+
+echo Help sample..
+
+cd help
+mkdir ~/wxwine_dist/wxWINE/samples/help
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/help
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/help
+cp *.cpp ~/wxwine_dist/wxWINE/samples/help
+cp *.xpm ~/wxwine_dist/wxWINE/samples/help
+cd doc
+mkdir ~/wxwine_dist/wxWINE/samples/help/doc
+cp * ~/wxwine_dist/wxWINE/samples/help/doc
+cd ../..
+
+echo Image sample..
+
+cd image
+mkdir ~/wxwine_dist/wxWINE/samples/image
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/image
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/image
+cp *.cpp ~/wxwine_dist/wxWINE/samples/image
+cp horse.png ~/wxwine_dist/wxWINE/samples/image
+cp horse.gif ~/wxwine_dist/wxWINE/samples/image
+cp horse.jpg ~/wxwine_dist/wxWINE/samples/image
+cd ..
+
+echo Internat sample..
+
+cd internat
+mkdir ~/wxwine_dist/wxWINE/samples/internat
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/internat
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/internat
+cp *.cpp ~/wxwine_dist/wxWINE/samples/internat
+cp *.xpm ~/wxwine_dist/wxWINE/samples/internat
+cp readme.txt ~/wxwine_dist/wxWINE/samples/internat
+cp wxstd.po ~/wxwine_dist/wxWINE/samples/internat
+cd fr
+mkdir ~/wxwine_dist/wxWINE/samples/internat/fr
+cp *.?o ~/wxwine_dist/wxWINE/samples/internat/fr
+cd ../..
+
+echo Layout sample..
+
+cd layout
+mkdir ~/wxwine_dist/wxWINE/samples/layout
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/layout
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/layout
+cp *.cpp ~/wxwine_dist/wxWINE/samples/layout
+cp *.h ~/wxwine_dist/wxWINE/samples/layout
+cd ..
+
+echo Listctrl sample..
+
+cd listctrl
+mkdir ~/wxwine_dist/wxWINE/samples/listctrl
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/listctrl
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/listctrl
+cp *.cpp ~/wxwine_dist/wxWINE/samples/listctrl
+cp *.h ~/wxwine_dist/wxWINE/samples/listctrl
+cp *.xpm ~/wxwine_dist/wxWINE/samples/listctrl
+cd bitmaps
+mkdir ~/wxwine_dist/wxWINE/samples/listctrl/bitmaps
+cp *.xpm ~/wxwine_dist/wxWINE/samples/listctrl/bitmaps
+cd ../..
+
+echo MDI sample..
+
+cd mdi
+mkdir ~/wxwine_dist/wxWINE/samples/mdi
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/mdi
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/mdi
+cp *.cpp ~/wxwine_dist/wxWINE/samples/mdi
+cp *.h ~/wxwine_dist/wxWINE/samples/mdi
+cp *.xpm ~/wxwine_dist/wxWINE/samples/mdi
+cd bitmaps
+mkdir ~/wxwine_dist/wxWINE/samples/mdi/bitmaps
+cp *.xpm ~/wxwine_dist/wxWINE/samples/mdi/bitmaps
+cd ../..
+
+echo Memcheck sample..
+
+cd memcheck
+mkdir ~/wxwine_dist/wxWINE/samples/memcheck
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/memcheck
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/memcheck
+cp *.cpp ~/wxwine_dist/wxWINE/samples/memcheck
+cp *.xpm ~/wxwine_dist/wxWINE/samples/memcheck
+cd ..
+
+echo Minifram sample..
+
+cd minifram
+mkdir ~/wxwine_dist/wxWINE/samples/minifram
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/minifram
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/minifram
+cp *.cpp ~/wxwine_dist/wxWINE/samples/minifram
+cp *.h ~/wxwine_dist/wxWINE/samples/minifram
+cp *.xpm ~/wxwine_dist/wxWINE/samples/minifram
+cd bitmaps
+mkdir ~/wxwine_dist/wxWINE/samples/minifram/bitmaps
+cp *.xpm ~/wxwine_dist/wxWINE/samples/minifram/bitmaps
+cd ../..
+
+echo Notebook sample..
+
+cd notebook
+mkdir ~/wxwine_dist/wxWINE/samples/notebook
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/notebook
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/notebook
+cp *.cpp ~/wxwine_dist/wxWINE/samples/notebook
+cp *.h ~/wxwine_dist/wxWINE/samples/notebook
+cd ..
+
+echo PNG sample..
+
+cd png
+mkdir ~/wxwine_dist/wxWINE/samples/png
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/png
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/png
+cp *.cpp ~/wxwine_dist/wxWINE/samples/png
+cp *.h ~/wxwine_dist/wxWINE/samples/png
+cp *.png ~/wxwine_dist/wxWINE/samples/png
+cd ..
+
+echo Printing sample..
+
+cd printing
+mkdir ~/wxwine_dist/wxWINE/samples/printing
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/printing
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/printing
+cp *.cpp ~/wxwine_dist/wxWINE/samples/printing
+cp *.h ~/wxwine_dist/wxWINE/samples/printing
+cp *.xpm ~/wxwine_dist/wxWINE/samples/printing
+cd ..
+
+echo Proplist sample..
+
+cd proplist
+mkdir ~/wxwine_dist/wxWINE/samples/proplist
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/proplist
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/proplist
+cp *.cpp ~/wxwine_dist/wxWINE/samples/proplist
+cp *.h ~/wxwine_dist/wxWINE/samples/proplist
+cd ..
+
+echo Resource sample..
+
+cd resource
+mkdir ~/wxwine_dist/wxWINE/samples/resource
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/resource
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/resource
+cp *.cpp ~/wxwine_dist/wxWINE/samples/resource
+cp *.h ~/wxwine_dist/wxWINE/samples/resource
+cp *.wxr ~/wxwine_dist/wxWINE/samples/resource
+cd ..
+
+echo Sashtest sample..
+
+cd sashtest
+mkdir ~/wxwine_dist/wxWINE/samples/sashtest
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/sashtest
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/sashtest
+cp *.cpp ~/wxwine_dist/wxWINE/samples/sashtest
+cp *.h ~/wxwine_dist/wxWINE/samples/sashtest
+cd ..
+
+echo Scroll sample..
+
+cd sashtest
+mkdir ~/wxwine_dist/wxWINE/samples/scroll
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/scroll
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/scroll
+cp *.cpp ~/wxwine_dist/wxWINE/samples/scroll
+cp *.h ~/wxwine_dist/wxWINE/samples/scroll
+cd ..
+
+echo Splitter sample..
+
+cd splitter
+mkdir ~/wxwine_dist/wxWINE/samples/splitter
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/splitter
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/splitter
+cp *.cpp ~/wxwine_dist/wxWINE/samples/splitter
+cd ..
+
+echo Tab sample..
+
+cd tab
+mkdir ~/wxwine_dist/wxWINE/samples/tab
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/tab
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/tab
+cp *.cpp ~/wxwine_dist/wxWINE/samples/tab
+cp *.h ~/wxwine_dist/wxWINE/samples/tab
+cd ..
+
+echo Text sample..
+
+cd text
+mkdir ~/wxwine_dist/wxWINE/samples/text
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/text
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/text
+cp *.cpp ~/wxwine_dist/wxWINE/samples/text
+cd ..
+
+echo Thread sample..
+
+cd thread
+mkdir ~/wxwine_dist/wxWINE/samples/thread
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/thread
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/thread
+cp *.cpp ~/wxwine_dist/wxWINE/samples/thread
+cd ..
+
+echo Toolbar sample..
+
+cd toolbar
+mkdir ~/wxwine_dist/wxWINE/samples/toolbar
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/toolbar
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/toolbar
+cp *.cpp ~/wxwine_dist/wxWINE/samples/toolbar
+cp *.h ~/wxwine_dist/wxWINE/samples/toolbar
+cp *.xpm ~/wxwine_dist/wxWINE/samples/toolbar
+cd bitmaps
+mkdir ~/wxwine_dist/wxWINE/samples/toolbar/bitmaps
+cp *.xpm ~/wxwine_dist/wxWINE/samples/toolbar/bitmaps
+cd ../..
+
+echo TreeCtrl sample..
+
+cd treectrl
+mkdir ~/wxwine_dist/wxWINE/samples/treectrl
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/treectrl
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/treectrl
+cp *.cpp ~/wxwine_dist/wxWINE/samples/treectrl
+cp *.h ~/wxwine_dist/wxWINE/samples/treectrl
+cp *.xpm ~/wxwine_dist/wxWINE/samples/treectrl
+cd ..
+
+echo typetest sample..
+
+cd typetest
+mkdir ~/wxwine_dist/wxWINE/samples/typetest
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/typetest
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/typetest
+cp *.cpp ~/wxwine_dist/wxWINE/samples/typetest
+cp *.h ~/wxwine_dist/wxWINE/samples/typetest
+cp *.xpm ~/wxwine_dist/wxWINE/samples/typetest
+cd ..
+
+echo Validate sample..
+
+cd validate
+mkdir ~/wxwine_dist/wxWINE/samples/validate
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/validate
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/validate
+cp *.cpp ~/wxwine_dist/wxWINE/samples/validate
+cp *.h ~/wxwine_dist/wxWINE/samples/validate
+cp *.xpm ~/wxwine_dist/wxWINE/samples/validate
+cd ..
+
+echo wxPoem sample..
+
+cd wxpoem
+mkdir ~/wxwine_dist/wxWINE/samples/wxpoem
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/wxpoem
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/wxpoem
+cp *.cpp ~/wxwine_dist/wxWINE/samples/wxpoem
+cp *.h ~/wxwine_dist/wxWINE/samples/wxpoem
+cp *.xpm ~/wxwine_dist/wxWINE/samples/wxpoem
+cp wxpoem.dat ~/wxwine_dist/wxWINE/samples/wxpoem
+cp wxpoem.txt ~/wxwine_dist/wxWINE/samples/wxpoem
+cp wxpoem.idx ~/wxwine_dist/wxWINE/samples/wxpoem
+cd ..
+
+echo wxSocket sample..
+
+cd wxsocket
+mkdir ~/wxwine_dist/wxWINE/samples/wxsocket
+cp Makefile.am ~/wxwine_dist/wxWINE/samples/wxsocket
+cp Makefile.in ~/wxwine_dist/wxWINE/samples/wxsocket
+cp *.cpp ~/wxwine_dist/wxWINE/samples/wxsocket
+cp *.xpm ~/wxwine_dist/wxWINE/samples/wxsocket
+cd ../..
+
+cd ~/wxwine_dist
+tar ch wxWINE | gzip -f9 > wxWINE-2.1.0-b7.tgz
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -0,0 +1,85 @@
+wxWindows Buglist
+-----------------
+
+Until the wxWindows bug database is up and running, please add
+entries in this style:
+
+BUG NUMBER:
+SHORT DESCRIPTION:
+DETAILS:
+WORKAROUND:
+wxWINDOWS VERSION:
+PLATFORM(S):
+DATE IDENTIFIED:
+IDENTIFIED BY:
+DATE FIXED:
+FIXED BY:
+
+-------------------------START OF BUGLIST-------------------------
+
+BUG NUMBER:             1
+SHORT DESCRIPTION:      Popup menu bug
+DETAILS:
+If a popup wxMenu is destroyed after its parent window has been
+destroyed, we get the message "Object XXX does not have windowed
+ancestor".
+Possible fix: call menu->DestroyMenu() before deleting the window,
+if the window knows about the menu that was last popped up (hard
+to know this with confidence).
+WORKAROUND:
+Delete the menu before deleting the window on which it
+was popped up.
+wxWINDOWS VERSION:      2.0.1
+PLATFORM(S):            wxMotif
+DATE IDENTIFIED:        ?/?/1998
+IDENTIFIED BY:          Julian Smart <julian.smart@ukonline.co.uk>
+DATE FIXED:
+FIXED BY:
+
+BUG NUMBER:             2
+SHORT DESCRIPTION:      Misc. Motif bugs
+DETAILS:
+- In wxGrid, cell highlight is not drawn/erased properly.
+
+- Setting the size of a hidden window may show that window.
+
+- wxRadioBox sometimes doesn't show (e.g. in controls sample).
+
+- Can't set the colours for the buttons in the file selector, for
+  some reason.
+
+- On SGI IRIX 6.4, XtDestroyWidget in ~wxWindow causes a crash in
+  some cicumstances. This is being looked into. Meanwhile, a
+  possible workaround is to remove the final XtDestroyWidget line in ~wxWindow
+  (window.cpp). This will mean that child windows will only get
+  destroyed when frames and dialogs are destroyed, so dynamic subwindow
+  deletion may not work properly.
+
+- There are reports that scrolling can cause crashes under Lesstif.
+  This is probably a Lesstif bug.
+WORKAROUND:
+wxWINDOWS VERSION:      2.0.1
+PLATFORM(S):            wxMotif
+DATE IDENTIFIED:        ?/?/1999
+IDENTIFIED BY:          Julian Smart
+DATE FIXED:
+FIXED BY:
+
+BUG NUMBER:             3
+SHORT DESCRIPTION:      Dialog Editor issues
+DETAILS:
+Dialog Editor could be more user-friendly. Controls are hard to
+size and position accurately. No way of changing tab order
+except by editing .wxr file.
+WORKAROUND:
+wxWINDOWS VERSION:      2.0.1
+PLATFORM(S):            All
+DATE IDENTIFIED:        ?/?/1998
+IDENTIFIED BY:          Julian Smart <julian.smart@ukonline.co.uk>
+DATE FIXED:
+FIXED BY:
+
+
+---------------------------END OF BUGLIST-------------------------
+
+
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,18 +1,418 @@
-Generic wxWindows 2.0 Change Log
--------------------------------
+wxWindows 2 Change Log
+----------------------

-Note: for platform-specific changes, see wx/docs/XXX/changes.txt
-where XXX is one of msw, motif, xt, gtk, mac.
+NOTE: for changes after wxWindows 2.1.0 b4, please see the CVS
+change log.
+
+Major improvements are listed in readme.txt.
+
+2.1.0, b4, May 9th 1999
+-----------------------
+
+wxGTK:
+
+- JPEG support added.
+- Many fixes and changes not thought worth mentioning in this file :-)
+
+wxMSW:
+
+- wxNotebook changes: can add image only; wxNB_FIXEDWIDTH added;
+  SetTabSize added.
+- JPEG support added.
+- Fixes for Cygwin compilation.
+- Added wxGA_SMOOTH and wxFRAME_FLOAT_ON_PARENT styles.
+- Many fixes people didn't tell this file about.
+
+wxMotif:
+
+
+General:
+
+- Some changes for Unicode support, including wxchar.h/cpp.
+
+
+2.0.1 (release), March 1st 1999
+-------------------------------
+
+wxGTK:
+
+- wxGLCanvas fixes.
+- Slider/spinbutton fixes.
+
+wxMSW:
+
+- Fixed problems with <return> in dialogs/panels.
+- Fixed window cursor setting.
+- Fixed toolbar sizing and edge-clipping problems.
+- Some makefile fixes.
+
+wxMotif:
+
+- None.
+
+General:
+
+- Added wxUSE_SOCKETS.
+- More topic overviews.
+- Put wxPrintPaperType, wxPrintPaperDatabase into
+  prntbase.h/cpp for use in non-PostScript situations
+  (e.g. Win16 wxPageSetupDialog).
+
+
+Beta 5, February 18th 1999
+--------------------------
+
+wxGTK:
+
+- wxExecute improved.
+
+wxMSW:
+
+- Fixed wxWindow::IsShown (::IsWindowVisible doesn't behave as
+  expected).
+- Changed VC++ makefiles (.vc) so that it's possible to have
+  debug/release/DLL versions of the library available simultaneously,
+  with names wx.lib, wx_d.lib, wx200.lib(dll), wx200_d.lib(dll).
+- Added BC++ 5 IDE files and instructions.
+- Fixed wxChoice, wxComboBox constructor bugs (m_noStrings initialisation).
+- Fixed focus-related crash.
+
+wxMotif:
+
+- Cured asynchronous wxExecute crash.
+- Added repaint event handlers to wxFrame, wxMDIChildFrame.
+
+General:
+
+- wxLocale documented.
+- Added include filenames to class reference.
+- wxHelpController API changed: SetBrowser becomes SetViewer,
+  DisplaySection works for WinHelp, help sample compiles under Windows
+  (though doesn't display help yet).
+
+Beta 4, February 12th 1999
+--------------------------
+
+wxGTK:
+
+- Miscellaneous fixes.
+
+wxMSW:
+
+- Makefiles for more compilers and samples; Cygwin makefiles
+  rationalised.
+- Added VC++ project file for compiling wxWindows as DLL.
+
+wxMotif:
+
+- Added OnEraseBackground invocation.
+- Added wxRETAINED implementation for wxScrolledWindow.
+- Cured scrolling display problem by adding XmUpdateDisplay.
+- Tried to make lex-ing in the makefile more generic (command line
+  syntax should apply to both lex and flex).
+- Changed file selector colours for consistency (except for buttons:
+  crashes for some reason).
+- Fixed wxMotif version of wxImage::ConvertToBitmap (used new instead
+  of malloc, which causes memory problems).
+
+General:
+
+- Further doc improvements.
+- wxGenericValidator added.
+- Added wxImageModule to image.cpp, so adds/cleans up standard handlers
+  automatically.
+
+Beta 3, January 31st 1999
+-------------------------
+
+wxGTK:
+
+- wxClipboard/DnD API changes (still in progress).
+- wxToolTip class added.
+- Miscellaneous fixes.
+
+wxMSW:
+
+- wxRegConfig DeleteAll bug fixed.
+- Makefiles for more compilers.
+- TWIN32 support added.
+- Renamed VC++ makefiles from .nt to .vc, and
+  factored out program/library settings.
+- Fixed wxIniConfig bug.
+
+wxMotif:
+
+- A few more colour fixes.
+- wxGLCanvas and OpenGL samples working.
+- Some compiler warnings fixed.
+- wxChoice crash fix.
+- Dialog Editor starting to work on Motif.
+
+General:
+
+- wxBusyCursor class added.
+- Added samples/dde.
+- More doc improvements, incl. expanding docs/html/index.htm.
+
+Beta 2, January 1999
+--------------------
+
+wxGTK:
+
+wxMSW:
+
+- 16-bit BC++ compilation/linking works albeit without the resource system.
+
+wxMotif:
+
+- Cured wxScreenDC origin problem so e.g. sash window sash is drawn at
+  the right place.
+- Cured some widget table clashes.
+- Added thread support (Robert).
+- wxPoem sample now works.
+
+General:
+
+- Rearranged documentation a bit.
+- Sash window uses area of first frame/dialog to paint over when drawing
+  the dragged sash, not just the sash window itself (it clipped to the right
+  or below).
+- Made resource sample use the correct Cancel button id.
+- Moved wxProp to main library (generic directory), created proplist
+  sample.
+- Added bombs and fractal samples.
+
+Beta 1, December 24th 1998
+--------------------------
+
+wxGTK:
+
+- Various
+
+wxMSW, wxMotif: not in sync with this release.
+
+
+Alpha 18, December 29th 1998
+----------------------------
+
+wxMSW:
+
+- Win16 support working again (VC++ 1.5)
+- Win16 now uses generic wxNotebook, wxListCtrl,
+  wxTreeCtrl -- more or less working now, although
+  a little work on wxNotebook is still needed.
+  Under 16-bit Windows, get assertion when you click
+  on a tab.
+- Wrote 16-bit BC++ makefiles: samples don't yet link.
+- Added CodeWarrior support to distribution courtesy
+  of Stefan Csomor.
+
+wxMotif:
+
+- Cured scrolling problem: scrollbars now show/hide themselves
+  without (permanently) resizing the window.
+- Removed some commented-out lines in wxScrolledWindow::AdjustScrollbars
+  that disabled scrollbar paging.
+- Set background colour of drawing area in wxWindow, so e.g. wxListCtrl
+  colours correctly.
+- Removed major bug whereby dialogs were unmanaged automatically
+  when any button was pressed.
+- Fixed colours of wxWindow scrollbars, made list and text controls
+  have a white background.
+- Fixed dialog colour setting.
+- Added settable fonts and colours for wxMenu/wxMenuBar. Now
+  they have sensible colours by default.
+- Fixed a bug in wxStaticBox.
+- Cured wxTreeCtrl bug: now works pretty well!
+- Debugged DrawEllipticArc (a ! in the wrong place).
+- Added SetClippingRegion( const wxRegion& region ).
+- Added wxPoint, wxSize, wxRect versions of SetSize etc.
+
+Alpha 17, November 22nd 1998
+----------------------------
+
+wxMSW:
+
+- More documentation updates, especially for
+  wxLayoutWindow classes and debugging facilities.
+- Changed wxDebugContext to use wxDebugLog instead
+  of wxTrace.
+- Now supports VC++ 6.0, and hopefully BC++ 5.0.
+  However, DLL support may be broken for BC++ since
+  VC++ 6 required changing of WXDLLEXPORT keyword
+  position.
+- Numerous miscellaneous changes.
+
+wxMotif:
+
+- Reimplemented MDI using wxNotebook instead of the MDI widgets, which
+  were too buggy (probably not design for dynamic addition/removal of
+  child frames).
+- Some improvements to the wxNotebook implementation.
+- wxToolBar now uses a bulletin board instead of a form, in an attempt
+  to make it possible to add ordinary wxControls to a toolbar.
+- Cured problem with not being able to use global memory operators,
+  by defining two more global operators, so that the delete will match
+  the debugging implementation.
+- Added wxUSE_DEBUG_NEW_ALWAYS so we can distinguish between using
+  global memory operators (usually OK) and #defining new to be
+  WXDEBUG_NEW (sometimes it might not be OK).
+- Added time.cpp to makefile; set wxUSE_DATETIME to 1.
+- Added a parent-existance check to popup menu code to make it not crash.
+- Added some optimization in wxWindow::SetSize to produce less flicker.
+  It remains to be seen whether this produces any resize bugs.
+
+It's a long time since I updated this file. Previously done:
+
+- wxFrame, wxDialog done.
+- wxScrolledWindow done (but backing pixmap not used at present).
+- wxBitmap done though could be tidied it up at some point.
+- Most basic controls are there, if not rigorously tested.
+- Some MDI support (menus appear on child frames at present).
+- wxNotebook almost done.
+- wxToolBar done (horizontal only, which would be easy to extend
+  to vertical toolbars).
+
+More recently:
+
+- Colour and font changing done (question mark over what happens
+  to scrollbars).
+- Accelerators done (for menu items and buttons). Also event loop
+  tidied up in wxApp so that events are filtered through ProcessXEvent.
+- wxWindow::GetUpdateRegion should now work.
+
+Alpha 16, September 8th 1998
+----------------------------
+
+wxMSW:
+
+- Added wxSashWindow, wxSashLayoutWindow classes, and sashtest
+  sample.
+- Guilhem's socket classes added, plus wxsocket sample.
+- A few more makefiles added.
+- GnuWin32/BC++ compatibility mods.
+- Further doc updates.
+- wxProp updates for correct working with wxGTK.
+
+wxMotif:
+
+- First start at Motif port.
+- Made makefiles for wxMotif source directory and minimal sample.
+- First go at wxApp, wxWindow, wxDialog, wxPen, wxBrush, wxFont,
+  wxColour, wxButton, wxCheckBox, wxTextCtrl, wxStaticText,
+  wxMenu, wxMenuItem, wxMenuBar
+
+Alpha 15, August 31st 1998
+--------------------------
+
+wxMSW:
+
+- wxBitmap debugged.
+- wxDC::GetDepth added.
+- Contribution added whereby wxBitmap will be
+  converted to DC depth if they don't match.
+- wxConfig API improved, documentation updated.
+- Printing classes name conventions cleaned up.
+- wxUpdateUIEvent now derives from wxCommandEvent
+  so event can travel up the window hierachy.
+
+Alpha 14, July 31st 1998
+------------------------
+
+wxMSW:
+
+- Toolbar API has been simplified, and now
+  wxFrame::GetClientArea returns the available client
+  area when toolbar, status bar etc. have been accounted for.
+  wxFrame::CreateToolBar added in line with CreateStatusBar.
+- Documentation updates, incl. for wxToolBar.
+- New wxAcceleratorTable class plus wxFrame::SetAcceleratorTable.
+- Various additions from other folk, e.g. streams, wxConfig
+  changes, wxNotebook.
+- Added wxDocMDIParentFrame, wxDocMDIChildFrame for doc/view.
+
+Alpha 13, July 8th 1998
+-----------------------
+
+wxMSW:
+
+- Implemented wxPoint as identical to POINT on Windows, and
+  altered wxDC wxPoint functions to use wxPoint directly in
+  Windows functions, for efficiency.
+- Cured wxASSERT bug in wxStatusBar95.
+- #ifdefed out some bits in oleutils.cpp for compilers that
+  don't support it.
+- Added some operators to wxPoint, wxSize.
+- Added inline wxDC functions using wxPoint, wxSize, wxRect.
+
+Alpha 12, July 7th 1998
+-----------------------
+
+wxMSW:
+
+- Added wxApp::GetComCtl32Version, and wxTB_FLAT style, so can
+  have flat toolbars on Win98 or Win95 with IE >= 3 installed.

 Alpha 11, July 3rd 1998
 -----------------------

+wxMSW:
+
+- Added thread.h, thread.cpp.
+- Changed Enabled, Checked to IsEnabled, IsChecked in wxMenu,
+  wxMenuBar.
+- Changed wxMenuItem::SetBackColor to SetBackgroundColour,
+  SetTextColor to SetTextColour, and added or made public several
+  wxMenuItem accessors.
+- Added two overloads to wxRegion::Contains. Added
+  wxRegion::IsEmpty for a more consistent naming convention.
+- Added Vadim's wxDataObject and wxDropSource.
+- ENTER/LEAVE events now work.
+- Cured wxMemoryDC bug where the DC wasn't being deleted.
+- Cured wxGauge SetSize major bugginess.
+- Cured problem where if a GDI object was created on the stack,
+  then went out of scope, then another object was selected into
+  the DC, GDI objects would leak. This is because the assignment
+  to e.g. wxDC::m_pen would delete the GDI object without it first
+  being selected out of the DC. Cured by selecting the old DC object
+  first, then doing the assignment.
+- Split up wxGaugeMSW, wxGauge95, wxSliderMSW, wxSlider95
+- Various other bug fixes and additions.
+
+Generic:
+
 - Major work on Dialog Editor (still plenty to go).
 - Expanded documentation a bit more.

+Alpha 10, May 7th 1998
+----------------------
+
+wxMSW:
+
+- Added desiredWidth, desiredHeight parameters to wxBitmapHandler
+  and wxIcon functions so that you can specify what size of
+  icon should be loaded. Probably will remain a Windows-specific thing.
+- wxStatusBar95 now works for MDI frames.
+- Toolbars in MDI frames now behave normally. They still
+  require application-supplied positioning code though.
+- Changed installation instructions, makefiles and batch files
+  for compiling with Gnu-Win32/Mingw32/EGCS. Also timercmn.cpp
+  change to support Mingw32/EGCS. Bison now used by default.
+
 Alpha 9, April 27th 1998
 ------------------------

+wxMSW:
+
+- Cured bug in wxStatusBar95 that caused a crash if multiple
+  fields were used.
+- Added Gnu-Win32 b19/Mingw32 support by changing resource
+  compilation and pragmas.
+- Cured wxMenu bug introduced in alpha 8 - didn't respond to
+  commands because VZ changed the id setting in wxMenu::MSWCommand.
+
+Generic:
+
 - Corrected some bugs, such as the wxModule compilation problem.
 - Added Gnu-Win32 b19/Mingw32 support by changing resource
  compilation and pragmas.
@@ -21,6 +421,32 @@ Alpha 9, April 27th 1998
 Alpha 8, April 17th 1998
 ------------------------

+wxMSW:
+
+- Added IsNull to wxGDIObject to check if the ref data is present or not.
+- Added PNG handler and sample - doesn't work for 16-bit PNGs for
+  some reason :-(
+- Added wxJoystick class and event handling, and simple demo.
+- Added simple wxWave class. Needs Stop() function.
+- Added wxModule (module.h/module.cpp) to allow definition
+  of modules to be initialized and cleaned up on wxWindows
+  startup/exit.
+- Start of Mingw32 compatibility (see minimal and dialogs samples
+  makefile.m95 files, and install.txt).
+- Note: Windows printing has stopped working... will investigate.
+VADIM'S CHANGES:
+- Updated wxString: bug fixes, added wxArrayString, some
+  compatibility functions.
+- Updated log.h/cpp, added wxApp::CreateLogTarget.
+- file.h: new wxTempFile class.
+- defs.h: added wxSB_SIZE_GRIP for wxStatusBar95
+- statbr95: wxStatusBar95 control.
+- registry.h/cpp: wxRegKey class for Win95 registry.
+- listbox.cpp: corrected some bugs with owner-drawn listboxes.
+- wxConfig and wxFileConfig classes.
+
+Generic:
+
 - Added src/other/png, src/other/zlib directories.
 - Added samples/png.
 - IMPORTANT: Changed 'no id' number from 0 to -1, in wxEVT_ macros.
@@ -31,6 +457,27 @@ Alpha 8, April 17th 1998
 Alpha 7, March 30th 1998
 ------------------------

+wxMSW:
+
+- Added tab classes, tab sample.
+- Now can return FALSE from OnInit and windows will be
+  cleaned up properly before exit.
+- Improved border handling so panels don't get borders
+  automatically.
+- Debugged MDI activation from Window menu.
+- Changes to memory debug handling, including checking for
+  memory leaks on application exit - but see issues.txt for
+  unresolved issues.
+- Added wxTaskBarIcon (taskbar.cpp/h, plus samples/taskbar)
+  to allow maintenance of an icon in the Windows 95 taskbar
+  tray area.
+- Got MFC sample working (MFC and wxWindows in the same
+  application), partly by tweaking ntwxwin.mak settings.
+- Got DLL compilation working again (VC++).
+- Changed wxProp/Dialog Editor filenames.
+
+Generic:
+
 - Added tab classes, tab sample.
 - Revised memory.cpp, memory.h slightly; memory.h now #defines
  new to WXDEBUG_NEW in DEBUG mode. Windows implementation app.cpp
@@ -48,6 +495,36 @@ Alpha 7, March 30th 1998
 Alpha 6, March 10th 1998
 ------------------------

+wxMSW:
+
+- Found stack error bug - stopped unwanted OnIdle recursion.
+- Removed bug in wxTreeCtrl::InsertItem I added in alpha 5.
+- Changed exit behaviour in wxApp/wxFrame/wxDialog. Now will
+  check if the number of top-level windows is zero before
+  exiting. Also, wxApp::GetTopWindow will return either
+  m_topWindow or the first member of wxTopLevelWindows, so you
+  don't have to call wxApp::SetTopWindow.
+- Added dynarray.h/dynarray.cpp (from Vadim).
+- Added first cut at OLE drag and drop (from Vadim). dnd sample
+  added. Drop target only at this stage. See src/msw/ole/*.cpp,
+  wx/include/msw/ole/*.h. WIN32 only because of UUID usage.
+  Doesn't work with GnuWin32 - no appropriate headers e.g. for
+  IUnknown.
+  Doesn't work with BC++ either - crashes on program startup.
+- Added Vadim's owner-draw modifications - will probably remain
+  Windows-only. This enhances wxMenu, wxListBox. See ownerdrw sample.
+- Added wxLB_OWNERDRAW for owner-draw listboxes.
+- Vadim's wxCheckListBox derives from wxListBox. See checklst sample.
+  Doesn't entirely work for WIN16.
+- Vadim has added wxMenuItem as a separate file menuitem.cpp. It
+  can also be used as an argument to wxMenu::Append, not just for
+  internal implementation.
+- Some #ifdefs done for MINGW32 compilation (just alter OPTIONS
+  in makeg95.env, together with mingw32.bat). However, resource
+  binding is not working yet so most apps with dialogs crash.
+
+Generic:
+
 - Added Vadim's dynarray.h, dynarray.cpp.
 - Added Vadim's menuitem.cpp.
 - Added Windows-specific wxCheckListBox,
@@ -57,6 +534,23 @@ Alpha 6, March 10th 1998
 Alpha 5, 14th February 1998
 --------------------------

+wxMSW:
+
+- GENERIC AND MSW-SPECIFIC CODE NOW TREATED AS TWO SEPARATE
+  DISTRIBUTIONS. This change log will therefore now refer to
+  the Windows-specific code only. See docs/changes.txt for generic
+  changes.
+- Removed Windows-specific reference counting system (GDI
+  resources were cleaned up in idle time) - minimal
+  advantages now we have a wxWin reference counting system.
+- Added missing WXDLLEXPORT keywords so DLL compilation works
+  again.
+- Removed most warnings for GnuWin32 compilation.
+- Added wxRegion/wxRegionIterator, but haven't yet used it in
+  e.g. wxDC.
+
+Generic:
+
 - GENERIC AND MSW-SPECIFIC CODE NOW TREATED AS TWO SEPARATE
  DISTRIBUTIONS. This change log will therefore now refer to
  the generic code only. See docs/msw/changes.txt for Windows-specific
@@ -89,6 +583,8 @@ Alpha 5, 14th February 1998
 Alpha 4, 31st January 1998
 --------------------------

+All:
+
 - Changed wxDC functions to take longs instead of floats. GetSize now takes
  integer pointers, plus a version that returns a wxSize.
 - const keyword added to various wxDC functions.
@@ -142,6 +638,8 @@ Alpha 4, 31st January 1998
 Alpha 3, September 1997
 -----------------------

+All:
+
 - wxListCtrl, wxTreeCtrl, wxImageList classes done.
 - Instigated new file hierarchy, split files and classes up more logically.
 - PrologIO and some other utils now put into core library.
@@ -151,6 +649,8 @@ Alpha 3, September 1997
 Alpha 2, 30th April 1997
 ------------------------

+All:
+
 - EVT_... macros now have at least one argument, for conformance
  with MetroWerks compiler.
 - Added ids to .wxr file format.
@@ -170,6 +670,8 @@ Alpha 2, 30th April 1997
 Alpha 1, 5th April 1997
 -----------------------

+Generic:
+
 At this point, the following has been achieved:

 - A lot, but not all, of the code has been revamped for better
--- a/docs/gpl.txt
+++ b/docs/gpl.txt
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
--- a/src/gdk_imlib/COPYING.LIB
+++ b/src/gdk_imlib/COPYING.LIB
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -0,0 +1,710 @@
+
+7st November '99: wxWindows 2.1.11 released
+
+There is still an unresolved problem with bitmap to image
+conversion on big-endian architectures (such as Solaris),
+where color values get exchanged. I'd need help on this
+one as I have no BE computer.
+
+Enlightment has struck the majority of the developers and
+they have chosen to use the Linux kernel numbering scheme
+for wxWindows from now on. This means that the next stable
+release will be called wxWindows 2.2.X, development snapshots
+will be called 2.1.X.
+
+A lot of discussion has been wasted on how to maintain a
+once released stable version. It was almost universally 
+agreed that only a commercial entity will have the motivation 
+($$$) to do that - so far there is no wxWindows Inc.
+
+Support for GTK 1.0 has been dropped. This version has
+been tested with GTK 1.2.3 and GTK 1.2.6 - it might
+not work with some other versions.
+
+Rewritten the support for multiple-format Drag'n'Drop and
+clipboard under both GTK and MSW. There are probably some
+problems here and there left.
+
+wxListBox and wxChoice can now handle only either void 
+client data (which it will not delete on destruction) or 
+client data of the wxClientData type (which it will delete),
+instead of both at the same time. The same will happen
+to wxComboBox some time. Also, wxListBox can now sort its
+items.
+
+Many build fixes for various platforms have been applied,
+try again, poor AIX, HP-UX and *BSD users, but don't reckon
+with immediate success. Actually, when using GNU compilers,
+your chances are quite good.
+
+My rewrite of the wxWindows underlying GTK widget
+has turned scrolling including subwindows from barely
+functional to pretty and fast. I also added scrolling
+of foreign windows to wxScrolledWindow.
+
+Setting size hints for the window manager might work now.
+
+wxSocket and Co. have been improved up to the point of
+calling it a rewrite. It works on wxMSW now too and
+seems pretty stable, but testing is still welcome.
+
+The ODBC classes contributed by Remstar Inc. have been
+overhauled (incl the sample) and have been tested with
+all relevant SQL databases (even DBase). For that reason
+I have reawakened the iODBC code from wxGTK 2.0 so you
+can now use wxODBC from wxMSW and wxGTK.
+
+Several printing things fixed. More work needs to be done
+here..
+
+HTML widget and the wxWindows' help system based upon
+it have been reorganized and improved for easier use
+from Python and C++. Also HTML printing has been added.
+
+wxSpinCtrl added. Like a wxSpinButton and a wxTextCtrl.
+
+Changed the beaviour of the popular new wxFileDialog to
+not forget the once typed file name when changing the
+directory.
+
+Implemented the wxSIMPLE_BORDER flag (simple black line
+without shadow affect).
+
+Michael is writing a complete rewrite of the antiquated
+wxGrid. This is still work-in-progress and might not make
+it into wxWindows 2.2, we'll see. Help would be welcome
+to make that happen.
+
+Made wxMenu code lose less memory, also added wxMenu::Delete().
+
+Added code to send wxActivateEvent to MDI windows.
+
+Vadim added configure things to compile wxWindows without any
+GUI library. This is probably work in progress. He'll also add
+a wxFontEnumerator class and has enhanced wxFont to make use
+of char-encodings.
+
+wxSlider, wxWindow, wxScrollBar now emit the correct events
+for scrolling (like page up, line up etc) instead of just
+"thumb-track" as before.
+
+Corrected Reparent() code, including the special case for
+wxToolBar (as the toolbar sits in a different window than
+normal windows).
+
+Corrected key accelerator code for toplevel child windows
+and added support for more key combinations - pretty much
+all, actually.
+
+Corrected cursor handling in a number of special cases.
+
+wxGLCanvas now waits until all expose events have been sent
+and then emits its own redraw event. Also removed flicker
+for wxGLCanvas and in some other places.
+
+A handler to read PCX file (in most variants) has been added.
+
+A number of problems with compressed and socket streams have
+been solved.
+
+Changed behavour of wxTextStream to make use of deliminators
+and default to space as the standard C++ stream do.
+
+Changes to tab traversal code to better reflect MSW code.
+
+Corrected problems with wxGenericValidator and certain controls.
+
+Made default button action work in more cases.
+
+28th August '99: Ninth wxGTK 2.1 snapshot released
+
+As the old makefile system didn't work, I trashed it and wrote
+a new one - mo more GNU. This, of course, caused a lot of people
+to start sing their song of complaints - any change is a good 
+opportunity to complain, but the effect of the change is that
+we now have shared library support on Linux and Solaris (and
+probably others as well) and that the Linux shared library no
+longer depends on libstdc++, so that we can finally create an
+RPM that works on different Linux distributions. Also, the
+Unix make system is now much simpler and directly mirrors its
+Windows counterparts, making it easier to understand and maintain.
+As it is independent of the various GNU tools, the requirements
+for using CVS versions are also much less (any make, any compiler,
+no other tools).
+
+Split RPMs into two, one for run-time requirements and one
+for developement (mostly headers).
+
+Addition of new layout classes that work like Java's, GTK's
+or Qt`s - basically, you pack item in a box and let it tell
+you how much space it needs. These class are called wxSizer
+and I consider them a great addition as they make true cross-
+platform dialogs a child's play and are very quick to write
+and easy to read. Do consider using them.
+
+Rewritten all dialogs to make use of the new sizers. Also
+added a new wxFileDialog like Win95 and replaced the generic
+wxFontDialog with GTK's native font selection dialog - this
+probably isn't perfect though.
+
+A few more fixes to wxListCtrl and wxTreeCtrl, implemented
+more options and modes like the wxMSW version.
+
+New handler for PNM files. Added CanRead() function to image
+handlers, updates to GIF handler for preparing the new wxAnimation
+class. We'll also get a PCX and hopefully a TIFF handler so
+that we support all common general-purpose file formats I know
+about. PhotoShop and PhotoPaint images are not general purpose.
+I also tried to correct a wxImage bug in connection with big-endian
+vs. little-endian problems, but I have no Sparc to actually test
+this.
+
+Inclusion of wxMultiMedia. Can play most sound formats on GTK
+and MSW and (using xanim on Unix and Win95's MM functions)
+display a video in a wxWindow. This will probably be moved to
+the core library.
+
+Small updates to socket code. The MSW version is still missing.
+
+Implemented wxBitmapDataObject class.
+
+Added wxFFileStream using FILE* instead if file desrcriptor.
+Useful for creating a "cerr" like class as in normal C++.
+Also added "endl" for use with wxTextStream and fixed a few
+minor problems with buffered streams etc.
+
+Corrected Tabbing code in wxPanel and made it work with wxNotebook.
+
+Small cursor fixes in connection with text control.
+
+Added experimental wxWizard class. Work in progress.
+
+A few more minor fixes.
+
+6th August '99: Eight wxGTK 2.1 snapshot released
+
+The new makefile system is not able to produce shared libraries 
+on Unix with the exception of Linux - libtool is really great.
+Therefore, the build system defaults to static libraries on
+anything but Linux for now.
+
+Work in wxPen, wxBrush and wxDC to match wxMSW more exactly and
+to implement missing feature etc.
+
+Reimplemented radio buttons. The first of a group of such buttons
+is now marked by having the wxRB_GROUP style.
+
+Complete redesign of all stream classes, including tests for them
+in the samples.
+
+Controls now send the same messages (or more importantly none if
+changed programmatically) as per wxMSW.
+
+New implementation of wxSocket using an intermediate library called
+GSocket. This willl hopefully change in the future.
+
+Reworked in-place editing of wxListCtrl and wxTreeCtrl.
+
+Fixed bug reporting two refreshes when scrolling.
+
+Corrected bug in wxComboBox client data code.
+
+Corrected reported but unverified bug in BMP loading code.
+
+Added a few more methods to wxStaticBitmap.
+
+Integration of wxHTML code in the main library, including wxZIPStream,
+wxFilesystem, wxHTMLHelpController and others.
+
+Added a wrapper for ffile() etc functions.
+
+Updates to wxDynamicLibrary.
+
+New documentation.
+
+New version of wxPython, of course.
+
+Fixed in unenclosed number of other bugs...
+
+25th June '99: Seventh wxGTK 2.1 snapshot released
+
+Many fixes to th new makefile system. The last version gave
+immediate crashes on all Unices except Linux when linked
+dynamically against an application. I reordered the object
+files in the library as I guess that this was the cause.
+
+Added icons to message box. This also slightly killed the
+layout so this needs to be changed again.
+
+wxGTK now chooses the best visual available on the display instead
+of the default one.
+
+Fixed wxProgressDialog again.
+
+Some more corrections I forgot.
+
+New wxPython (includes new layout system and printing).
+
+15th June '99: Sixth wxGTK 2.1 snapshot released
+  
+ 
+The biggest change is the completely rewritten configure/makefile
+system using automake. The main argument for switching to automake
+is that the resulting makefiles should be more portable so that
+people can use the native make utilities instead of GNU make. The
+new makefile sytem also handles dependencies correctly, allows for
+shared-only compilation, can be invoked from any directory for
+concurrent builds wihtin one source tree, uses libtool for greater
+shared-library platform support, has a functinonal "make uninstall",
+works with GTK, Motif and WINE, conforms better to GNU standards
+as far as configure option names are concerned and is easier to 
+maintain.
+ 
+Applied patches to compile wxGTK on OS/2.
+ 
+Configure checks for byte-order and new defines for byte swapping
+with respect to the byte-order. Added test for this to typetest sample.
+Also made BMP handler bigendian safe so that it should work on 
+Solaris and such. 
+ 
+Small changes to basic drawing stuff: made wxColour actually compare 
+RGB values in the == operator, added new constructor to wxMask,
+corrected initial background colour for DCs, it is now possible
+to use a wxWindowDC etc before there is any window (this doesn't
+make any sense, but it is what wxMSW does.)
+ 
+Added support for the PRIMARY SELECTION to the wxClipboard
+class.
+ 
+Fixed redraw bug when scrolling window-less widgets out
+of the visible area (actually a work-around for a GTK bug).
+ 
+Regrouped some samples, created new one for various versions
+of the wxTextCtrl.
+ 
+Added wxWindow::Reparent() and wxFrame::MakeModal().
+ 
+Improved handling of column width in wxListCtrl and made
+this more compatible with the wxMSW version. Also removed
+a bug from the wxImageList returning an off-by-one id for
+added images.
+ 
+Fixed keyboard hotkeys and resizing for wxMDIChildFrame
+menu bars.
+ 
+Added flag to wxSplitterWindow to update its children's
+sizes "live" instead of moving a XOR'ed bar around - this
+is a resource-draining option. Also corrected cursors
+in splitter window.
+ 
+New way to show "disabled" or greyed toolbar items.
+ 
+Rewrote parts of the tree ctrl to allow multiple selections
+and variable size items (Sylvain). These new function do not
+exist in the native Win32 tree control.
+ 
+Implemented global cursors and wxBusyCursor etc. Also removed
+another cursor misbehaviour.
+ 
+Updated many parts of the documentation to reflect changes
+in wxWindows 2.1, wxPython and more exact description of
+cross-platform issues as well as platform differences.
+ 
+Many other fixes, mainly by others...
+ 
+Further compile fixes for different architectures.
+ 
+
+  
+25th May '99: Fifth wxGTK 2.1 snapshot released
+  
+
+ 
+This is mostly a bug-fix release. We are having funny
+times to make wxGTK work well with different micro
+versions of GTK 1.2 - which is very close to impossible.
+All versions give warnings, although their number might
+vary a lot. I use GTK 1.2.3 and only get wanrnings in
+one sample (notebook) and that one is due to a bug in
+GTK - some people using GTK 1.2.2 reported hundreds of warnings
+getting spitted out for what seems like no reason.
+ 
+This snapshot contains the beginnings of our merging of
+headers, meaning that in the future all ports will
+use the same headers and will share a lot more code.
+We have taken this moment to reorganize some code and
+hope to have eliminated much bad C++ code, as reported
+primarily by SGI's compilers (Vadim Zeitlin).
+ 
+Rewritten char and key event propagation routines
+to reflect documentation and do the same on wxGTK
+as on wxMSW. If you are interested in ascii chars
+and cursor key etc, intercept EVT_CHAR, if you 
+are interested in which key actually got pressed,
+intercept EVT_KEYDOWN (Norbert Irmer).
+ 
+Control that are given -1 as their ID no longer
+get arbitrary positive IDs assigned but arbitrary
+negative IDs. This had caused some trouble with ID clashes.
+ 
+wxWindow and wxScrolledWindow no longer use the
+wxScrollEvent, but the newly invented wxScrollWinEvent
+so that no mixing up of events sent from wxSliders
+or wxScrollbars placed in a wxWindow can occur.
+ 
+Added wxProgressDialog for use with long background
+work such as printing.
+ 
+Added drawing sample and scrolling sample, both of
+which show some misbehaviours...
+ 
+When drawing with the wxXOR logical mode, wxGTK now uses
+GdkXOR (instead of GdkInvert) and when drawing in wxINVERT logical
+mode, wxGTK now uses GdkInvert (as before). When you did some
+rubberband dragging and you used wxXOR and a black pen, then
+you should change wxINVERT.
+ 
+Applied more patches for SGI and HP-UX compilation.
+ 
+More updates for wxSockets (Guilhem Lavaux). Seems to be nearly
+finished.
+ 
+You can now use threads within your GUI again. Well, 
+at least if you know what you are doing and you had a look 
+at the threads sample.
+ 
+wxGLCanvas updated so that it can share display lists
+over several windows and to not exhibit any flicker. 
+(Norber Irmer).
+ 
+wxNotebook revamped so that its process of creation matches
+wxMSW's more closely, also avoiding problems with wrong page
+number. Added InsertPage() and the possibility to prevent
+switching pages by intercepting the PAGE_CHANGING event. Also,
+wxNotebooks now get shown even if all pages are empty.
+ 
+Added Activate() to wxMDIChildFrame (Russel).
+ 
+Improved wxSplitterWindow behaviour and visual feed-back when
+given a minimal size etc (Bruce DeVisser).
+ 
+Minor updates to wxTreeCtrl, wxListBox, printing, wxClipboard,
+wxString, wxThreads and many others.
+ 
+Also wxMSW got a big face-lift, not to mention the new wxMac release...
+ 
+			
+  
+11th May '99: Fourth wxGTK 2.1 snapshot released
+  
+ 
+This is mostly a bug-fix release. This affects wxSocket, wxThread,
+and a few GUI classes. Also more work has been done and window
+placement and decorations etc. which we hope to have finished now.
+ 
+Applied patches for FreeBSD and SGI compilation (not yet finshed).
+ 
+Updated wxPython to beta 9.
+ 
+Made wxGLCanvas work again - strangely it flickers now...
+ 
+wxStaticText is currently broken with GTK 1.2.2 (which I don't
+yet have and thus could not fix). Also, scrolling subwindows
+(although much improved including a sample) doesn't work perfectly
+due to a bug in GTK 1.2.1 (probably 1.2.2 as well).
+ 
+Added wxStaticLine.
+  
+Note that the next release might bring about changes to keyboard
+handling and scroll event intercepting from wxScrolledWindow. 
+ 
+By and large much of the code has stabilized and won't be much
+different in the final wxWindows 2.1 release. Please test as
+much as you can.
+ 
+The next release will have a new build system.
+ 
+
+  
+3rd May '99: Third wxGTK 2.1 snapshot released
+  
+ 
+Updated INSTALL.txt and SYMBOLS.txt.
+ 
+Support for Unicode is now almost complete. Most samples work in
+both Unicode and non-Unicode mode. Thanks to Ove Kaaven and Vadim.
+ 
+Internal changes required for wxOLE and addition of a very experimental
+wxOLE code section using GNOME's Bonobo library (from GNOME's CVS).
+ 
+New version of wxPython that works with the wxGTK 2.1.
+This now includes a very comprensive test/demo suite. Thanks to
+Robin Dunn, Harm v.d. Heijden and others. Beware of the hang-man...
+ 
+More fine tuning of focus handling and GUI widgets.
+ 
+Complete rewrite of wxSocket classes (still experimental).
+Thanks to Guilhem Lavaux.
+  
+wxMenuBar supports underlined shortcuts like Windows does,
+indicated by a leading & character. wxMenus now have hotkeys
+such as in wxXt and wxMSW.
+  
+Rewritten MDI subsystem.
+  
+Correcetions and additions to the printing framework including
+a paper type database (Julian).
+ 
+Several controls now support more style flags for modifying
+look (and feel) of the controls and windows.
+ 
+New implementation of idle handlers, which now send an idle
+event only once after the event queue has been emptied (which
+is what happens in the wxMSW port as well), not regularly.
+This no longer forces wxGTK applications to sleep (by having
+to call usleep()) in idle time - giving more CPU slices to
+the application if desired.
+ 
+wxGLCanvas (the OpenGl for wxWindows) now accepts keyboard input.
+ 
+The usual number of compile and bug fixes from all involved.
+ 
+
+  
+21st April '99: Second wxGTK 2.1 snapshot released
+  
+ 
+Added much code for Unicode support. Still experimental, but looks very
+cool - thanks to Ove Kaaven and Vadim Zeitlin. If you are very brave, then
+you can compile wxGTK with "configure --with-unicode".
+ 
+More updates on the dreaded issue of making frames and dialogs impossible
+to resize etc.
+ 
+Drag and Drop works now under GTK 1.2 - at least basically when dragging
+and dropping text. The API is not entirely fixed yet but seems quite
+good now. Support for different actions (copy/move/link/..) still missing.
+I also removed support for GTK 1.0 Drag and Drop - this is just broken
+and unusable in GTK 1.0 and I don't want to fix it.
+ 
+I now embed the JPEG library and handlers for JPEG and GIF have been
+added to the existing PNG and BMP (and XPM for GTK version only). In
+the future, the RPMs will not contain these libraries but depend on
+the image libraries to be preinstalled whereas the source *.tgz will
+ship with everything that is needed for wxGTK so that no downloading
+of ten image libs will be required - also avoiding problems with ten
+different kinds of libJPEG-6.0.1.7.IV beta 7. We also updated the
+PNG code to the newest PNG version.
+ 
+wxImage now makes use of the fast rendering code as provided by
+GTK 1.2 whenever possible. This should mean a speed-up for graphics
+heavy apps.
+ 
+Many fixes all over. Also should compile with GTK 1.2.0 as opposed
+to only with GTK 1.2.1 now.
+ 
+wxPython still doesn't compile, I think.
+ 
+
+  
+12th April '99: First wxGTK 2.1 snapshot released
+  
+ 
+This is the first developers' version of wxWindows 2.1 for GTK. It's main
+new feature is that it supports GTK 1.2 (as opposed to GTK 1.0) which
+will make development within the GNOME evironment a lot easier.
+ 
+Apart from the move to GTK 1.2 and the changes (some major) that were
+required as part of that work, enhancement or corrections have been
+made to many of the non-GUI classes and functions (such as wxClipboard, 
+wxThread, wxSocket, wxConfig)
+and a few GUI classes (accelerators in menus, listbox always with
+scrollbar, wxFrame honours Motif Window Manager hints, corrected tab
+traversal for broken GTK 1.0 widgets).
+ 
+There have been slight changes to the priting dialogs and their
+setup data (which might break apps using this code in previous
+versions). Also, a bug concerning printing white has been fixed
+(actually not tested).
+ 
+Although this is only the first 2.1 snapshot, there is little reason not
+to use it as many bugs from version 2.0 have been corrected. There are,
+pf course, still a few problem left with GTK 1.2 (some of which relate
+to bugs in GTK).
+ 
+I think I preserved backward compatility with GTK 1.0 and if not it
+should be easy to fix - but mostly I don't care.
+ 
+Drag'N'Drop is currently completely broken. Also, wxPython currently
+doesn't compile with this release. The OpenGL canvas still seems to
+work.
+ 
+Major targets for the final release (still a long way): a new configure
+system, support JPEG and GIF formats, wxHTML, super-duppah frame layout
+stuff, syntax-highlighting editor, possibly Unicode, possibly some GNOME 
+gooddies, possibly world domination.
+ 
+
+  
+5th March '99: wxWindows 2.0 released
+  
+ 
+This is the final version of wxWindows 2.0 for GTK. The versions for
+Windows and Motif (and also this version) are available form Julian Smart's
+site. The Mac version is still under development.
+ 
+
+  
+19th February '99: wxWindows 2.0 beta 5
+  
+ 
+This is the fifth beta release and it contains mostly bug fixes and
+updates for documentation.
+ 
+Applied compile fixes for Solaris (different flavours and compilers).
+ 
+
+  
+12th February '99: wxWindows 2.0 beta 4
+  
+ 
+This is the fourth beta release and it contains mostly bug fixes and
+updates for documentation.
+ 
+Tracked a few more cases, where the bahaviour between wxMSW and wxGTK
+differed. This was the case for closing a dialog or frame as well as
+for clearing a device context or setting its background colour and some
+other minor details.
+ 
+Most standard dialogs have been face-liftet a little.
+ 
+Implememted default buttons for GTK.
+ 
+Fixed many bugs. You guessed it.
+ 
+
+  
+29th January '99: wxWindows 2.0 beta 3
+  
+ 
+This is the third beta release and it contains mostly bug fixes. 
+ 
+There is one field where we haven't been able to fix the API yet, and that
+it Drag'n'Drop. This is mostly due to the fact that DnD in
+GTK 1.0 is hardly usable and much different from GTK 1.2 which means that
+we have to design a common API for Windows, GTK 1.0 and GTK 1.2. Although
+we are trying to prevent that, it is possible that wxWindows 2.0 (being
+based on GTK 1.0) will not have proper DnD support.
+ 
+The major changes are that tool tips have been added, threads have been completely 
+rewritten, the ODBC code has been updated and improved, the socket code works 
+better now.
+ 
+Classes for managing MIME-types under Windows and Unix have been added.
+ 
+There is now a wxGLCanvas class for OpenGl/Mesa for the Windows, GTK and
+Motif ports. Come see the penguins flying...
+ 
+Documentation has received a big face lift - it now covers nearly all the
+classes, at least.
+ 
+The usual amount of bug fixes. Countless.
+ 
+A few member functions of wxString have been renamed.
+ 
+For those who are using the ever-so-popular wxImage class (which
+now available on Motif and Windows as well) in 8-bit mode: wxGTK
+now creates a color cube upon start-up in 8-bit mode and thus the
+generation of bitmaps from images has been speeded up 20 times.
+ 
+It is now possible to develop with wxGTK without having the GTK 1.0 header
+files installed so that having the GTK 1.2 header files installed no longer
+is any problem. We also provide RPMs for RedHat glibc 2 based systems, compiled
+with egcs 1.1.1 on SuSE 6.0. Note that the RPM will   not   work in
+SuSE 6.0 as SuSE decided to ship 6.0 with a broken GTK+ package.
+ 
+
+  
+6th January '99: wxWindows 2.0 beta 2
+  
+ 
+This is the second beta release and contains it mostly build and
+bug fixes. Threads work well now on (up-to-date) glibc 2 systems,
+commercial Unices and Windows.
+ 
+			
+  
+20th December '98: wxWindows 2.0 beta 1
+  
+ 
+This is the first beta release and we have used the time before
+this release to tidy up some parts of the API. All releases from
+now on will be source code compatible but we reserve binary compatibility
+for the final release. Because of this, the actual library name of
+the beta version will not be 2.0 but 1.99, so that we prevent 
+conflicts with the final library later on. After the final release
+we'll only fix bugs so that there will be no reason to link any
+program statically with wxGTK.
+ 
+We changed the name of the shared library to include the version of
+the GTK used so that no conflicts emerge with simultaneous
+versions of wxWindows for GTK 1.0 and for GTK 1.2 and so on.
+ 
+As you can see, we have not moved to GTK 1.1.X as the different
+development versions are too different and buggy to be useful. We'll
+wait for a stable GTK 1.2 release (hardly 1.2.0) and start porting
+then.
+ 
+wxGTK now compiles without problems on anything between gcc 2.7.2 on
+Linux-x86 and egcs 1.1 on Linux-Alpha and egcs 1.0 on Sparc. This isn't
+as easy as it sounds...
+ 
+Available form this site are the Python bindings of wxWindows.
+Thanks to Robin Dunn for this tremendous contribution.
+Tkinter is dead, Java is dead, wxPython rules! That's all there is to say.
+ 
+Although only a few new classes have been added, many have been polished
+up substantially, the most visible are wxListCtrl, wxTreeCtrl and
+all classes related to printing. Also the DialogEd now functions
+much better than before. Drag'n'Drop is fucntional but probably won't 
+be perfect until we use GTK 1.2 and its much improved DnD features.
+ 
+wxClipboard has arrived and works for text. Other formats have not been
+tested carefully yet.
+ 
+wxMiniFrame has been added which might be useful for docking toolbars
+etc. Someone has already done that for the MSW port and we hope to
+include his very nice work later.
+ 
+wxDirDialog has been added (thanks to Harm von der Heijden).
+ 
+The entite "tab traveral" system for moving from item to item in
+a dialog has been rewritten. It now completely overrides the
+not-so-well-done GTK native tab system.
+ 
+Quite much has been done to improve the wxImage class, which is now
+available in the Windows port as well. Very useful for anything related
+to image processing. wxGTK also uses this class internally e.g. to scale
+bitmaps when the scale factor (e.g. zooming) of a drawing context
+has changed.
+  
+Some of the small and handy classes (wxDate, wxTime, wxVariant) have
+received a face-lift. wxList has been rewritten to make it possible
+to write type-safe lists. The collection of utility functions (wxFileFind etc)
+has been revamped and cleaned-up (thanks to Vadim Zeitlin, who has also
+greatly enhanced many basic classes, ranging wxString to the debug and
+log system).
+ 
+We removed some constructors of GDI classes (such as wxPen, wxColour)
+which took a pointer as a parameter. This lead to many errors among users
+resulting in unexpected behaviour so it was decided to remove these
+constructors.
+ 
+As the number of users and the number of test programs and samples
+is steadialy rising the core classes of wxWindows for MSW and GTK 1.0
+can be considered to be very stable if not outright bug-free. I haven't
+seen a crash for weeks now and wxWindows' internal debug features also
+have improved every week, making stepping-through with a debugger almost
+completely unnecessary as the library reports possible errors itself
+(when in debug mode).
+
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -0,0 +1,425 @@
+
+  !!! When sending bug reports tell us what version of wxWindows you are 
+      using (including the beta) and what compiler on what system. One 
+      example: wxGTK 2.1 beta 6, egcs 1.1.1, Redhat 5.0 !!!
+
+* The most simple case
+-----------------------
+
+If you compile wxWindows on Linux for the first time and don't like to read 
+install instructions just do (in the base dir):
+
+> ./configure --with-gtk
+> make
+> su <type root password>
+> make install
+> ldconfig
+> exit
+
+Afterwards you can continue with
+
+> make
+> su <type root password>
+> make install
+> ldconfig
+> exit
+
+If you want to remove wxWindows on Unix you can do this:
+
+> su <type root password>
+> make uninstall
+> ldconfig
+> exit
+
+* The expert case
+-----------------
+
+If you want to do some more serious cross-platform programming with wxWindows, 
+such as for GTK and Motif, you can now build two complete libraries and use 
+them concurretly. For this end, you have to create a directory for each build 
+of wxWindows - you may also want to create different versions of wxWindows
+and test them concurrently. Most typically, this would be a version configured 
+with --enable-debug_flag and one without. Note, that only one build can currently 
+be installed, so you'd have to use local version of the library for that purpose.
+For building three versions (one GTK, one Motif and a debug version of the GTK 
+source) you'd do this:
+
+md buildmotif
+cd buildmotif
+../configure --with-motif
+make
+cd ..
+
+md buildgtk
+cd buildgtk
+../configure --with-gtk
+make
+cd ..
+
+md buildgtkd
+cd buildgtkd
+../configure --with-gtk --enable-debug_flag
+make
+cd ..
+
+* The most simple errors
+------------------------
+
+configure reports, that you don't have GTK 1.2 installed although you are 
+very sure you have. Well, you have installed it, but you also have another 
+version of the GTK installed, which you may need to remove including other 
+versions of glib (and its headers). Also, look for the PATH variable and check 
+if it includes the path to the correct gtk-config! The check your LDPATH if it 
+points to the correct library. There is no way to compile wxGTK if configure 
+doesn't pass this test as all this test does is compile and link a GTK program.
+
+You get errors during compilation: The reason is that you probably have a broken 
+compiler, which includes almost everything that is called gcc. If you use gcc 2.8 
+you have to disable optimsation as the compiler will give up with an internal 
+compiler error.
+
+If there is just any way for you to use egcs, use egcs. We cannot fix gcc.
+
+You get immediate segfault when starting any sample or application: This is either 
+due to having compiled the library with different flags or options than your program - 
+typically you might have the __WXDEBUG__ option set for the library but not for your 
+program - or due to using a broken compiler (and its optimisation) such as GCC 2.8.
+
+* The most simple program
+-------------------------
+
+Now create your super-application myfoo.app and compile anywhere with
+
+gcc myfoo.cpp `wx-config --libs --cflags` -o myfoo
+
+* General
+-----------------------
+
+The Unix variants of wxWindows use GNU configure. If you have problems with your 
+make use GNU make instead.
+
+If you have general problems with installation, read my homepage at 
+
+  http://wesley.informatik.uni-freiburg.de/~wxxt
+  
+for newest information. If you still don't have any success, please send a bug 
+report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF 
+YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT DISTRIBUTION 
+YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried...
+
+* GUI libraries
+-----------------------
+
+wxWindows/GTK requires the GTK+ library to be installed on your system. It has to 
+be a stable version, preferebly version 1.2.3.
+
+You can get the newest version of the GTK+ from the GTK homepage at:
+
+  http://www.gtk.org
+  
+We also mirror GTK+ 1.2.3 at my ftp site. You'll find information about downloading 
+at my homepage.
+  
+* Additional libraries
+-----------------------
+
+wxWindows/Gtk requires a thread library and X libraries known to work with threads. 
+This is the case on all commercial Unix-Variants and all Linux-Versions that are 
+based on glibc 2 except RedHat 5.0 which is broken in many aspects. As of writing 
+this, these Linux distributions have correct glibc 2 support:
+
+ - RedHat 5.1
+ - Debian 2.0
+ - Stampede
+ - DLD 6.0
+ - SuSE 6.0
+ 
+You can disable thread support by running 
+
+./configure "--disable-threads"
+make
+su <type root password>
+make install
+ldconfig
+exit
+  
+NB: DO NOT COMPILE WXGTK WITH GCC 2.7 AND THREADS, SINCE ALL PROGRAMS WILL CRASH UPON 
+START-UP! Just always use egcs and be happy.
+
+* Building wxGTK on OS/2
+--------------------------
+
+Please send comments and question about the OS/2 installation
+to Andrea Venturoli <a.ventu@flashnet.it> and patches to
+make to me (Robert Roebling) or the wxWindows mailing list.
+
+You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), 
+GTK+ (1.2.1 or newer), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), 
+korn shell (5.2.13), Autoconf (2.13),  GNU file utilities (3.6), 
+GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), 
+sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1).
+
+Open an OS/2 prompt and switch to the directory above.
+First set some global environment variables we need:
+
+SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__
+SET CFLAGS=-Zmtd -D__ST_MT_ERRNO__
+SET OSTYPE=OS2X              
+SET COMSPEC=sh
+
+Notice you can choose whatever you want, if you don't like OS2X.
+
+After running configure, you'll have to apply to modifications manually
+to the created Makefile:
+- Replace all ":" with ";" in the VPATH variable
+- Replace "ley.yy.c" with "lexyy.c"
+
+* Building wxGTK on SGI
+--------------------------
+
+Using the SGI native compilers, it is recommended that you
+also set CFLAGS and CXXFLAGS before running configure. These 
+should be set to :
+
+CFLAGS="-mips3 -n32" 
+CXXFLAGS="-mips3 -n32"
+
+This is essential if you want to use the resultant binaries 
+on any other machine than the one it was compiled on. If you 
+have a 64bit machine (Octane) you should also do this to ensure 
+you don't accidently build the libraries as 64bit (which is 
+untested).
+
+The SGI native compiler support has only been tested on Irix 6.5.
+
+* Create your configuration
+-----------------------------
+
+Usage:
+	./configure options
+
+If you want to use system's C and C++ compiler,
+set environment variables CC and CCC as
+
+	% setenv CC cc
+	% setenv CCC CC
+	% ./configure options
+
+to see all the options please use:
+
+	./configure --help
+
+The basic philosophy is that if you want to use different
+configurations, like a debug and a release version, 
+or use the same source tree on different systems,
+you have only to change the environment variable OSTYPE.
+(Sadly this variable is not set by default on some systems
+in some shells - on SGI's for example). So you will have to 
+set it there. This variable HAS to be set before starting 
+configure, so that it knows which system it tries to 
+configure for.
+
+Configure will complain if the system variable OSTYPE has 
+not been defined. And Make in some circumstances as well...
+
+
+* General options
+-------------------
+
+Given below are the commands to change the default behaviour,
+i.e. if it says "--disable-threads" it means that threads
+are enabled by default.
+
+Many of the confiugre options have been thoroughly tested
+in wxWindows snapshot 6, but not yet all (ODBC not).
+
+Normally, you won't have to choose a toolkit, because when
+you download wxGTK, it will default to --with-gtk etc. But
+if you use all of our CVS repository you have to choose a 
+toolkit. You must do this by running configure with either of:
+
+        --without-gtk            Don't use the GIMP ToolKit (GTK)
+	
+	--with-motif             Use either Motif or Lesstif
+	                         Configure will look for both. 
+
+The following options handle the kind of library you want to build.
+
+	--disable-threads       Compile without thread support.
+
+	--disable-shared        Do not create shared libraries.
+
+	--enable-static         Create static libraries.
+
+	--disable-optimise	Do not optimise the code. Can
+	                        sometimes be useful for debugging
+				and is required on some architectures
+				such as Sun with gcc 2.8.X which
+				would otherwise produce segvs.
+
+	--enable-profile        Add profiling info to the object 
+				files. Currently broken, I think.
+				
+	--enable-no_rtti        Enable compilation without creation of
+	                        C++ RTTI information in object files. 
+				This will speed-up compilation and reduce 
+				binary size.
+				
+	--enable-no_exceptions  Enable compilation without creation of
+	                        C++ exception information in object files. 
+				This will speed-up compilation and reduce 
+				binary size. Also fewer crashes during the
+				actual compilation...
+				
+	--enable-no_deps        Enable compilation without creation of
+	                        dependency information.
+				
+	--enable-permissive     Enable compilation without creation of
+	                        giving erros as soon as you compile with
+				Solaris' ANSI-defying headers...
+				
+	--enable-mem_tracing    Add built-in memory tracing.
+				
+	--enable-dmalloc        Use the dmalloc memory debugger.
+	                        Read more at www.letters.com/dmalloc/
+				
+	--enable-debug_info	Add debug info to object files and
+	                        executables for use with debuggers
+				such as gdb (or its many frontends).
+
+	--enable-debug_flag	Define __DEBUG__ and __WXDEBUG__ when
+	                        compiling. This enable wxWindows' very
+				useful internal debugging tricks (such
+				as automatically reporting illegal calls)
+				to work. Note that program and library
+				must be compiled with the same debug 
+				options.
+
+* Feature Options
+-------------------
+
+Many of the confiugre options have been thoroughly tested
+in wxWindows snapshot 6, but not yet all (ODBC not).
+
+When producing an executable that is linked statically with wxGTK
+you'll be surprised at its immense size. This can sometimes be
+drastically reduced by removing features from wxWindows that 
+are not used in your program. The most relevant such features
+are
+
+	--without-libpng	Disables PNG image format code.
+	
+	--without-libjpeg	Disables JPEG image format code.
+	
+	--disable-pnm		Disables PNM image format code.
+	
+	--disable-gif		Disables GIF image format code.
+	
+	--disable-pcx		Disables PCX image format code.
+	
+	--without-odbc          Disables ODBC code.
+	
+        --disable-resources     Disables the use of *.wxr type
+	                        resources.
+		
+	--disable-threads       Disables threads. Will also
+	                        disable sockets.
+
+	--disable-sockets       Disables sockets.
+
+	--disable-dnd           Disables Drag'n'Drop.
+	
+	--disable-clipboard     Disables Clipboard.
+	
+	--disable-serial        Disables object instance serialiasation.
+	
+	--disable-streams       Disables the wxStream classes.
+	
+	--disable-file          Disables the wxFile class.
+	
+	--disable-textfile      Disables the wxTextFile class.
+	
+	--disable-intl          Disables the internationalisation.
+	
+	--disable-validators    Disables validators.
+	
+	--disable-accel         Disables accel.
+	
+Apart from disabling certain features you can very often "strip"
+the program of its debugging information resulting in a significant
+reduction in size.
+
+* Compiling
+-------------
+
+The following must be done in the base directory (e.g. ~/wxGTK
+or ~/wxWin or whatever)
+
+Now the makefiles are created (by configure) and you can compile 
+the library by typing:
+
+	make
+
+make yourself some coffee, as it will take some time. On an old
+386SX possibly two weeks. During compilation, you'll get a few 
+warning messages depending in your compiler.
+
+If you want to be more selective, you can change into a specific
+directiry and type "make" there.
+
+Then you may install the library and it's header files under
+/usr/local/include/wx and /usr/local/lib respectively. You
+have to log in as root (i.e. run "su" and enter the root
+password) and type
+
+        make install	
+
+You can remove any traces of wxWindows by typing
+
+        make uninstall
+	
+If you want to save disk space by removing unnecessary
+object-files:
+
+	 make clean
+
+in the various directories will do the work for you.
+
+* Creating a new Project
+--------------------------
+
+1) The first way uses the installed libraries and header files
+automatically using wx-config
+
+g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
+
+Using this way, a make file for the minimal sample would look
+like this
+
+CC = g++
+
+minimal: minimal.o
+    $(CC) -o minimal minimal.o `wx-config --libs` 
+
+minimal.o: minimal.cpp mondrian.xpm
+    $(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o
+
+clean: 
+	rm -f *.o minimal
+
+This is certain to become the standard way unless we decide
+to sitch to tmake.
+
+2) The other way creates a project within the source code 
+directories of wxWindows. For this endeavour, you'll need
+GNU autoconf version 2.14 and add an entry to your Makefile.in
+to the bottom of the configure.in script and run autoconf
+and configure before you can type make.
+
+----------------------
+
+In the hope that it will be useful,
+
+        Robert Roebling <roebling@sun2.ruf.uni-freiburg.de>
+	
+	
--- a/docs/gtk/licence.txt
+++ b/docs/gtk/licence.txt
@@ -0,0 +1,56 @@
+
+
+wxWindows Library License, Version 3
+====================================
+     
+  Copyright (C) 1998 Julian Smart, Robert Roebling et al. 
+
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed. 
+ 
+                          WXWINDOWS LIBRARY LICENSE 
+     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+ 
+  This library is free software; you can redistribute it and/or modify it 
+  under the terms of the GNU Library General Public License as published by 
+  the Free Software Foundation; either version 2 of the License, or (at 
+  your option) any later version. 
+   
+  This library is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- 
+  TABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library 
+  General Public License for more details. 
+ 
+  You should have received a copy of the GNU Library General Public License 
+  along with this software, usually in a file named COPYING.LIB.  If not,   
+  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,  
+  Boston, MA 02111-1307 USA. 
+ 
+  EXCEPTION NOTICE 
+ 
+  1. As a special exception, the copyright holders of this library give 
+  permission for additional uses of the text contained in this release of 
+  the library as licensed under the wxWindows Library License, applying 
+  either version 3 of the License, or (at your option) any later version of 
+  the License as published by the copyright holders of version 3 of the 
+  License document. 
+ 
+  2. The exception is that you may create binary object code versions of any 
+  works using this library or based on this library, and use, copy, modify, 
+  link and distribute such binary object code files unrestricted under terms 
+  of your choice. 
+ 
+  3. If you copy code from files distributed under the terms of the GNU 
+  General Public License or the GNU Library General Public License into a 
+  copy of this library, as this license permits, the exception does not   
+  apply to the code that you add in this way.  To avoid misleading anyone as 
+  to the status of such modified files, you must delete this exception 
+  notice from such code and/or adjust the licensing conditions notice  
+  accordingly. 
+ 
+  4. If you write modifications of your own for this library, it is your 
+  choice whether to permit this exception to apply to your modifications. 
+  If you do not wish that, you must delete the exception notice from such 
+  code and/or adjust the licensing conditions notice accordingly. 
+
+  
--- a/docs/gtk/makewxgtk
+++ b/docs/gtk/makewxgtk
@@ -0,0 +1,11 @@
+# makewxgtk
+# Sets permissions (in case we extracted wxGTK from zip files)
+# and makes wxGTK.
+# Call from top-level wxWindows directory.
+# Note that this uses standard (but commonly-used) configure options;
+# if you're feeling brave, you may wish to compile with threads.
+# -- Julian Smart
+chmod a+x configure config.sub config.guess setup/general/* setup/shared/*
+./configure --with-shared --with-gtk --with-debug_flag --with-debug_info --without-threads
+make makefiles
+make
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -0,0 +1,68 @@
+
+   Welcome to wxWindows/Gtk 2.1.11
+
+you have downloaded version 2.1 of the GTK+ 1.2 port of 
+the wxWindows GUI library. Although this is not yet the
+final stable release wxGTK 2.2, the current version has
+been tested carefully on many systems and has been found
+to work better than any other previous version.
+
+Nonetheless, beware that major changes can happen before 
+a final release.
+
+wxWindows no longer supports GTK 1.0 (as did some early
+snapshots) so that you will need GTK 1.2 when using it.
+
+Beginning with snapshot 9, wxWindows uses a completely
+new make file system on Unix which no longer uses the
+various GNU tools and I hope that I'll never again have
+to write any more makefiles.
+
+More information is available from my homepage at:
+
+  http://wesley.informatik.uni-freiburg.de/~wxxt
+  
+and about the wxWindows project as a whole (and the MSW
+and Motif ports in particular) can be found at Julian's 
+homepage at:
+
+  http://web.ukonline.co.uk/julian.smart/wxwin
+  
+Information on how to install can be found in the file 
+INSTALL.txt, but if you cannot wait, this should work on
+many systems:
+
+./configure --with-gtk
+make
+su <type root password>
+make install
+ldconfig
+exit
+
+When you run into problems, please read the INSTALL.txt and 
+follow those instructions. If you still don't have any success,
+please send a bug report to one of our mailing list, INCLUDING 
+A DESCRIPTION OF YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR 
+VERSION OF GTK, WXGTK, WHAT DISTRIBUTION YOU USE AND WHAT ERROR 
+WAS REPORTED. I know this has no effect, but I tried...
+
+The library produced by the install process will be called 
+libwx_gtk.a (static) and libwx_gtk-2.1.so.11.0.0 (shared) so 
+that once a binary incompatible version of wxWindows/Gtk comes 
+out we'll augment the library version number to avoid linking 
+problems.
+
+Please send problems concerning installation, feature requests, 
+bug reports or comments to the wxWindows users list. Information 
+on how to subscribe is available from my homepage.
+
+wxWindows/Gtk doesn't come with any guarantee whatsoever. It 
+might crash your harddisk or destroy your monitor. It doesn't 
+claim to be suitable for any special or general purpose.
+
+  Regards,
+
+    Robert Roebling
+
+
+
--- a/docs/gtk/todo.txt
+++ b/docs/gtk/todo.txt
@@ -0,0 +1,36 @@
+
+-------------------- High priority ---------------------
+
+Fix bug that thread sample reports about non-finished threads.
+
+More testing of Unicode support.
+
+Add ID based i18n system as a replacement for the
+  unelegant gettext system.
+  
+Add controls to wxToolbar.
+
+Add TIFF handler. Someone? (Hint, hint).
+
+Improve, update translations. Install *.mo files somewehere.
+
+-------------------- Medium priority ---------------------
+
+Show accelerator control labels and actually implement them
+  -> Changed in GTK 1.2 (so let's do it for 1.2). Difficult.
+  
+-------------------- Low priority ---------------------
+    
+Right aligned checkboxes: focus highlighting is wrong, tooltips can't be set can't be set
+
+OwnerDraw for wxListCtrl and others
+  -> Postponed.
+
+Implement wxPalette
+  -> I never understood that. Postponed.
+ 
+Implement different visuals and displays
+  -> I never understood that. Postponed.
+
+Cooperation with Qt
+  -> Would be nice.
--- a/docs/gtk/welcome.html
+++ b/docs/gtk/welcome.html
@@ -1,292 +0,0 @@
-<html>
-<head><title>wxGTK Homepage</title>
-</head>
-<body bgcolor=#FFFFFF text=#000000 link=#0020FF vlink=#800000 alink=#007777>
-<h1>"wxWindows for the GTK" Homepage</h1>
-
-<hr>
-<h3>Current version</h3>
-15th May '98: wxGTK v0.12 (alpha-)
-<p> 
-This release is hardly more stable than the one before, but it
-has many new features. It's main purpose is actually to prepare
-the final merge of the Windows port and the GTK port source
-trees into a common tree, developed using CVS. The growing
-number of demos which compile and run with wxGTK "although"
-being written for wxMSW shows that we seem to be on the right
-track. One nice new feature for many potential users is that
-wxGTK no longer needs any extra libraries to be installed,
-other than the GTK.
-<p>
-If you have a compiler
-better than gcc 2.7.2.2 then you can uncomment a line in src/common/prntbase.cpp
-which defines __GOOD_COMPILER__. This should make the printing demo work.
-I haven't got such a compiler, so I actually don't know. Somebody reported
-problems with version 2.7.2.3 as well.
-<p>
-<hr>
-<h3>Acknowledgements</h3>
-I'd like to thank the 
-<a href="http://www.freiburg.linux.de">Freiburg Linux User Group</a>
- for kindly providing
-this site and Christian Wetzel in particular for helping me with
-this site's administration.
-<p>
-
-<hr>
-<h3>What is wxWindows?</h3>
-wxWindows is a C++ cross-platform GUI toolkit written mainly by Julian Smart. 
-More information about wxWindows can be found at the
-<a href="http://web.ukonline.co.uk/julian.smart/wxwin">wxWindows Homepage</a>.
-
-<p>
-The current version of wxWindows (v1.68) supports Windows ('95 and NT), Motif and
-XView (aka OpenLook). There is another port (wxXt) available, which uses the 
-free-ware widget set from the Free Widget Foundation (FSF). Ports have been
-started for the Mac, OS/2 and NextStep.
-<p>
-For different reasons, it was decided to start a complete rewrite of wxWindows,
-which will then be called wxWindows 2.0. For a list of new features and changes
-from the current version, you may read the wxWindows Homepage (see above).
-<p>
-Currently, work is being done on four ports of wxWindows 2.0:
-<dl>
-  <li> Windows (wxMSW, main author Julian Smart)
-  <li> Unix, Motif (wxMotif, main author Markus Holzhem)
-  <li> Unix, GIMP Toolkit (wxGTK, main author Robert Roebling)
-  <li> Macintosh (wxMac, main author Greg Whitehead)
-</dl>
-<p>
-wxWindows provides a rich set of classes which help to make cross-platform
-GUI programming easy. In many aspect, it is modelled after MFC, making transition
-from MFC to wxWindows relatively painless. The main technical
-difference between most other free or commercial cross platform libraries is
-that wxWindows is a wrapper around existing widget sets, whereas the other
-toolkits (Qt, Tk, Java, Amulet, OPaC, JX, Fresko) draw their widgets themselves, 
-which results in applications having a different look than native applications 
-for that specific platform.
-<p>
-There are classes for the following categories
-<dl>
-  <li> Window classes: wxWindow, wxFrame, wxDialogBox, wxPanel, wxCanvas etc.
-  <li> Widget classes: wxButton, wxCheckbox, wxChoice, wxListBox, wxListCtrl, wxText, wxGauge etc.
-  <li> Data structures: wxList, wxString, wxHashTable, wxDate etc.
-  <li> Layout/constraint system
-  <li> GDI classes: wxPen, wxBrush, wxFont, wxBitmap etc.
-  <li> Events: wxCommandEvent, wxMouseEvent, wxKeyEvent etc.
-  <li> Devices contexts: wxCanvasDC, wxPostScriptDC, wxMemoryDC, wxPrinterDC
-  <li> Base classes for runtime-type information: wxObject
-  <li> Interprocess communication: wxClient, wxConnection, wxSocket, wxServer etc.
-  <li> Document-view architecture: wxDocument, wxView, wxDocManager etc.
-  <li> Printing framework: wxPreviewFrame, wxPrintDialog, wxPrinter etc.
-  <li> Many helper classes, wxApplication, wxTypeTree, wxPathList etc.
-  <li> Classes for internationalization
-  <li> Built-in memory leak checking, log-files
-  <li> A multitude of functions and macros
-</dl>
-
-<hr>
-<h3>Copyright</h3>
-The choice of a suitable copyright has been subject to endless discussions. It
-has always been the aim, to put wxWindows under a copyright, which protects
-the work of its authors while at the same time encouraging the use of wxWindows
-in as many projects as possible. 
-<p>
-The (so far) last decision has been to put the whole of wxWindows
-under a modified (less restrictive) version of the GNU library general 
-public license.
-<p>
-The only exception is that wxGTK now contains code (gdk_imlib) which is 
-under the GNU library general public license. When you make changes to 
-this part of wxGTK, you'll have to make these changes public (in contrast 
-to changes to the rest).
-<p>
-It is obviously encouraged that anybody who uses wxWindows and who
-makes any improvements to it will make these changes available to
-wxWindows' authors.
-<p>
-<hr>
-<h3>What can I do with wxWindows 2.0?</h3>
-wxWindows is still in alpha stage, which means that there are still bugs
-waiting for you and several features are not yet (fully) implemented, but
-you can expect the interface to be more or less stable, so no major 
-modifications will have to be made to your source code. wxGTK is already
-used in a number of medium sized projects and is it being developped
-in close cooperation with the authors of these applications.
-<p>
-<hr>
-<h3>Can I write a GNOME application with wxGTK 2.0?</h3>
-Good question. The idea to use wxGTK for the GNOME desktop environment is
-quite obvious. When this topic came up on the GNOME mailing list, the GNOME
-people have shown an amazingly negative opinion about wxWindows. One reason
-might be that several of the main authors of the GNOME-project consider
-C++ a "broken language". I don't share that view and I am sure many people
-find C++ easier to handle and better suited for GUI programming than C.
-<p>
-Just recently, the topic of C++ in general and wxGTK in particular appeared
-again on the GNOME list. It has shown that - at least - the opinion on C++
-on the GNOME list is split. 
-<p>
-There is already a C++ wrapper for the GTK called GTK-- written by Tero Pulkkinen. 
-It is very small and adds very little overhead to the GTK. If platform
-independence is no issue for you and you want to write a small tool
-for Linux, you should probably use GTK--. Of course you can use wxGTK
-for that, too :-)
-<p>
-<hr>
-<h3>Screenshots</h3>
-What would a home page of a GUI be without a screenshot? Well, as wxWindows
-is a wrapper around existing widget/item sets, a wxWindows application will
-look like any other native Windows, Motif, GTK or Mac application.
-<p>
-But for those of you, who wouldn't download wxGTK only because there
-is no screenshot, 
-<a href="ftp://ftp.freiburg.linux.de/pub/linux/wxxt/sshot.jpg">here it comes</a>.
-<p>
-<hr>
-<h3>Download 1.68</h3>
-Go to the 
-<a href="ftp://ftp.freiburg.linux.de/pub/linux/wxxt">FTP</a>
-section directly.
-<p>
-There is documentation for version 1.68 in html available. 
-<a href="ftp://ftp.freiburg.linux.de/pub/linux/wxxt">here</a>. Not yet.
-<p>
-You can download current wxWindows version 1.68 for Windows, Motif and
-XView from
-<a href="ftp://ftp.freiburg.linux.de/pub/linux/wxxt">here</a>. Not yet.
-<p>
-You can download wxXt 1.66d from
-<a href="ftp://ftp.freiburg.linux.de/pub/linux/wxxt/wxxt166d.tgz">here</a>.
-<p>
-<hr>
-<h3>Download 2.0 alpha</h3>
-There is documentation for version 2.0 in html available. 
-<a href="ftp://ftp.freiburg.linux.de/pub/linux/wxxt/wxGTK_doc.tgz">here</a>.
-<p>
-You can download the first alpha for wxWindows 2.0 for Windows from
-<a href="ftp://ftp.freiburg.linux.de/pub/linux/wxxt/">here</a>. Not yet.
-<p>
-You can download the current alpha for wxWindows 2.0 for GTK from
-<a href="ftp://ftp.freiburg.linux.de/pub/linux/wxxt/wxGTK-0.12.tgz">here</a>. 
-<p>
-
-<hr>
-<h3>News from wxGTK 0.12</h3>
-<p>
-PNG, zlib and gdk_imlib code included.
-<p>
-MDI implementation. More a basis for further testing
-than of real value.
-<p>
-Split "--with-debug" option into two options: "--with-debug_info"
-and "--with-debug_flag". The first one sets the "-g" flag when
-compiling, the second defines "DEBUG" in setup.h (which is included
-from defs.h).
-<p>
-Merged DocView framework. The sample doesn't compile yet, because
-it uses features from wxTextCtrl, which I haven't implemented yet.
-<p>
-Merged TabCtrl. Doesn't look perfect, but it seems to work.
-<p>
-Merged remaining classes from the newest wxMSW alpha. (wxDynArray,
-wxModule etc.).
-<p>
-Further updates, bug fixes or additions:
-<p>
-<dl>
-  <li> wxYield() (again)
-  <li> postscript support for bitmaps
-  <li> spline code merged
-  <li> several bug fixes
-  <li> new samples
-</dl>
-
-<p>
-<hr>
-<h3>Known problems</h3>
-
-Missing implementation of:
-<dl>
-  <li>Impossible to set new font in GTK's widgets
-  <li>Items containing bitmaps
-  <li>Masks, bitmap handlers (partially done)
-  <li>Gauge
-  <li>Combobox
-  <li>Palettes (colormaps)
-  <li>Keyboard accelerators for menus
-  <li>Validation
-  <li>Clipboard functions
-  <li>Resources (for use with wxIDE-to-be)
-  <li>Drag and Drop
-  <li>Threads, Interprocess communication
-  <li>Sockets
-  <li>Database classes
-</dl>
-
-<p>
-<hr>
-<h3>Installation of wxGTK under Linux</h3>
-
-GTK requires an up-to-date version of the 
-<dl>
-  <li> GTK (GIMP ToolKit)
-</dl>
-to be installed as a shared lib on your system. wxGTK is being developped with
-version 1.0.1 and it is known not to work with earlier versions.
-The GTK library is available from 
-<a href="ftp://ftp.gtk.org/pub/">somewhere here (gtk.org).</a>
-After having typed "make install" the GTK header files should be
-in "/usr/local/include". Correct me, if I am wrong.
-<p>
-Compilation itself works as usual with autoconf:
-<dl>
-  <li> Unpack it to a suitable subdirectory, let's say ~/wxGTK
-  <li> Type "cd wxGTK"
-  <li> Type "configure"
-  <li> Type "make"
-</dl>
-Some demos use files stored in the source directory of those demos
-(e.g. internat uses files in samples/internat) whereas the binaries
-will end up in samples/internat/linux. You'll have to copy the binaries
-down or call them like "linux/test" from samples/internat. This is
-also the case for wxTest (which should display a horse).
-<p>
-You can create a shared library by adding the option "--with-shared" to
-the "configure" command. Afterwards, you'll have to copy the library
-~/wxGTK/lib/linux (if you have Linux) to a directory in your LDPATH (e.g. /usr/X11R6/lib)
-and run "ldconfig".
-<p>
-
-<hr>
-<h3>Mailing list for wxGTK</h3>
-The mailing list (as well as this page) is called wxxt for more
-or less historical reasons.
-<p>
-You can subsribe to the mailing list by sending a mail to
-<a href="mailto:majordomo@wesley.informatik.uni-freiburg.de">majordomo@wesley.informatik.uni-freiburg.de</a>.
-This mail must contain the text "subscribe wxxt" in the body (not the subject) of the
-mail. You will then get a confirmation that somebody asked majordomo to put you
-on the list and you will have to confirm this once again by sending back
-the authentisation, which comes in the confirmation mail. The last step
-is also described in the actual confirmation mail (I think).
-<p>
-You can send a mail to the mailing list to the address
-<a href="mailto:wxxt@www.freiburg.linux.de">wxxt@www.freiburg.linux.de</a>.
-
-<p>
-Unsubscribe by sending "unsubscribe wxxt" to majordomo (see above). Not to
-the actual mailing list.
-<p>
-<hr>
-<address>
-<br>This page is maintained by <a href="mailto:roebling@sun2.ruf.uni-freiburg.de">Robert Roebling</a>.
-Comments, in contrast to junk and flames, welcome.
-<p>
-Last changed 15th Mai '98. 
-</address>
-</body>
-</html>
-
-
-
--- a/docs/html/faq.htm
+++ b/docs/html/faq.htm
@@ -0,0 +1,43 @@
+<HTML>
+
+<HEAD>
+<TITLE>wxWindows 2 FAQ</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows 2 FAQ
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+Welcome to the wxWindows FAQ. Please select a category:<P>
+
+<ul>
+<li><a href="faqgen.htm">General questions</a>
+<li><a href="faqgtk.htm">wxWindows 2 for GTK</a>
+<li><a href="faqmsw.htm">wxWindows 2 for Windows</a>
+<li><a href="faqmot.htm">wxWindows 2 for Motif</a>
+<li><a href="faqmac.htm">wxWindows 2 for Mac</a>
+</ul>
+
+<P>
+
+For further information, please see the <a href="http://www.wxwindows.org" target=_top>wxWindows Web site</a>,
+plus install.txt (per port), todo.txt (per port), and bugs.txt (all ports).
+<P>
+
+</font>
+
+</BODY>
+
+</HTML>
--- a/docs/html/faqgen.htm
+++ b/docs/html/faqgen.htm
@@ -0,0 +1,235 @@
+<HTML>
+
+<HEAD>
+<TITLE>wxWindows 2 FAQ: General</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows 2 FAQ: General
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+See also <a href="faq.htm">top-level FAQ page</a>.
+<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>
+
+Although GUI applications are mostly built programmatically, there is a dialog editor to help
+build attractive dialogs and panels.<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 Python interface for wxWindows 2.
+<P>
+
+<h3>Can I use wxWindows 2 for both proprietary (commercial) projects, and GPL'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
+conflict with GPL code you may be using or developing with it.
+<P>
+The conditions for using wxWindows 2 are the same whether you are a personal, academic
+or commercial developer.
+<P>
+
+<h3>Is there support?</h3>
+
+No official support, but the mailing list is very helpful and some people say that
+wxWindows support is better than for much commercial software. The developers are
+keen to fix bugs as soon as possible, though obviously there are no guarantees.
+<P>
+
+<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
+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>
+
+<H3>I am about to start a wxWindows 1.xx project. Should I use 2 instead?</H3>
+
+wxWindows 2 is still in beta but it's actually pretty useable (Windows, GTK, Motif).<P>
+
+Porting to wxWindows 2 from 1.xx will not be too painful; see the next question
+for ways in which you can make it easier.<P>
+
+<H3>Why would I want to use wxWindows 2 in preference to wxWindows 1.xx?</H3>
+
+Some reasons:
+
+<ul>
+<li>In 2 there is far more flexibility, for example in the way windows can be
+nested, and the way events are intercepted.
+<li>There is more functionality for producing sophisticated applications,
+for example using the wxTreeCtrl and wxListCtrl classes.
+<li>There is better C++-conformance (such as usage of wxString and const) which
+will make your applications more reliable and easier to maintain.
+<li>wxWindows 2 will be better supported than 1.xx.
+<li>The GTK version is attractive for people interested in writing Linux and GNOME
+applications.
+<li>The Mac version will be one of the best frameworks available on that platform.
+</ul>
+
+<H3>How can I prepare for wxWindows 2?</H3>
+
+To make porting to wxWindows 2 easier in the future, take a look at some
+<a href="http://web.ukonline.co.uk/julian.smart/wxwin/prepare.htm">tips</a> for writing existing code in a 2-compatible way.<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 will be supported by wxWindows 2?</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 (coming later in 1999);
+<li>A BeOS port is being investigated.
+<li>A Windows CE port is being investigated.
+<li>There are no plans to support OS/2 or XView. However,
+you may be able to compile the GTK and Motif versions under OS/2 with X and GTK
+installed, or the Windows version with IBM's Open32 extensions.
+</ul>
+<P>
+
+<H3>How does wxWindows 2 support platform-specific features?</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
+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
+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,
+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>
+
+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
+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>
+
+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
+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.
+In addition, use of templates can lead to executable bloat, which is something
+wxWindows 2 is strenously trying to avoid.<P>
+
+The standard C++ string class is not used, again because it is not available to all compilers,
+and it is not necessarily a very efficient implementation. Also, we retain more flexibility
+by being able to modify our own string class. Some compatibility with the string class
+has been built into wxString.<P>
+
+There is nothing to stop an application using templates or the string class for its own
+purposes.<P>
+
+<H3>How is wxWindows 2 being developed?</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 server in Edinburgh, from
+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>
+
+By ftp, and via the <a href="cdrom2.htm">wxWindows CD-ROM</a>.<P>
+
+<H3>What are the plans for the future?</H3>
+
+Currently we'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>
+
+We will investigate the possibility of compiler or operating system vendors bundling wxWindows with
+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>
+
+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
+from Java, and the level of interest in wxWindows is as high as ever.<P>
+
+<H3>How can I help the project?</H3>
+
+Please check out the <a href="http://web.ukonline.co.uk/julian.smart/wxwin/develop.htm" target=main>Backroom</a> pages,
+in particular the <a href="http://web.ukonline.co.uk/julian.smart/wxwin/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>
+
+</font>
+
+</BODY>
+
+</HTML>
--- a/docs/html/faqgtk.htm
+++ b/docs/html/faqgtk.htm
@@ -0,0 +1,47 @@
+<HTML>
+
+<HEAD>
+<TITLE>wxWindows 2 for GTK FAQ</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows 2 for GTK FAQ
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+See also <a href="faq.htm">top-level FAQ page</a>.
+<hr>
+
+<h3>What is wxWindows 2 for GTK?</h3>
+
+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>
+
+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
+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>
+
+
+</font>
+
+</BODY>
+
+</HTML>
--- a/docs/html/faqmac.htm
+++ b/docs/html/faqmac.htm
@@ -0,0 +1,37 @@
+<HTML>
+
+<HEAD>
+<TITLE>wxWindows 2 for Mac FAQ</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows 2 for Mac FAQ
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+See also <a href="faq.htm">top-level FAQ page</a>.
+<hr>
+
+<h3>When is wxMac 2 due to be released?</h3>
+
+There is a <a href="http://web.ukonline.co.uk/julian.smart/wxwin/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).
+<P>
+
+</font>
+
+</BODY>
+
+</HTML>
--- a/docs/html/faqmot.htm
+++ b/docs/html/faqmot.htm
@@ -0,0 +1,90 @@
+<HTML>
+
+<HEAD>
+<TITLE>wxWindows 2 for Motif FAQ</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows 2 for Motif FAQ
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+See also <a href="faq.htm">top-level FAQ page</a>.
+<hr>
+
+<h3>What version of Motif do I need?</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>,
+a free Motif clone. (Note from Julian Smart - I use the Linux version of MetroLink Motif 1.2.4).
+
+<P>
+
+<h3>What features are missing or partially implemented?</h3>
+
+The following classes are not yet implemented: wxSpinButton, wxCheckListBox, wxJoyStick,
+wxGLCanvas.<P>
+
+The following classes are not likely to be implemented because there is no sensible
+equivalent on Motif: wxMiniFrame, wxTaskBar.<P>
+
+These features are not yet implemented:<P>
+
+<ul>
+<li>Clipboard and drag and drop support are currently under development.
+<li>Support for selection of specific visuals.
+<li>Wide character support (but when Unicode is supported under Windows, this support will
+be relatively easy to add).
+<li>Configurable colour/font settings (they are currently hard-wired in wxSystemSettings).
+<li>A help system (please use wxHelpController and Netscape instead). An HTML widget and help
+system is in preparation.
+</ul>
+
+<p>
+
+<h3>Does Dialog Editor work with wxWindows for Motif?</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.
+<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>
+
+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__
+  wxNoOptimize noOptimize;
+  window->SetSize(-1, -1, w, h);
+#endif
+</PRE>
+<P>
+
+
+</font>
+
+</BODY>
+
+</HTML>
--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -0,0 +1,247 @@
+<HTML>
+
+<HEAD>
+<TITLE>wxWindows 2 for Windows FAQ</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows 2 for Windows FAQ
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+See also <a href="faq.htm">top-level FAQ page</a>.
+<hr>
+
+<h3>Which Windows platforms are supported?</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>
+
+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
+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.
+<P>
+
+wxWindows 2 for Windows will also compile on Unix with gcc using TWIN32 from <a href="http://www.willows.com" target=_top>Willows</a>,
+although TWIN32 is still in a preliminary state. The resulting executables are
+Unix binaries that work with the TWIN32 Windows API emulator.<P>
+
+You can also compile wxWindows 2 for Windows on Unix with Cygwin or Mingw32, resulting
+in executables that will run on Windows. So in theory you could write your applications
+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>
+
+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
+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
+storage should not be a problem.<P>
+
+<h3>What compilers are supported?</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>
+
+<ul>
+<li>Visual C++ 1.5, 4.0, 5.0, 6.0
+<li>Borland C++ 4.5, 5.0
+<li>Borland C++Builder 1.0, 3.0
+<li>Watcom C++ 10.6 (WIN32)
+<li>Cygwin b20
+<li>Mingw32
+<li>MetroWerks CodeWarrior 4
+</ul>
+<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>
+
+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
+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>
+
+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>
+
+You can't beat Cygwin's price (free), and you can debug adequately using gdb. However, it'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>
+
+<h3>Is Unicode supported?</h3>
+
+Not yet, although there are other internationalisation features.<P>
+
+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>
+
+<h3>Can you compile wxWindows 2 as a DLL?</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 have limited hard disk space.<P>
+
+With a DLL approach, and with different versions and configurations of wxWindows
+needing to be catered for, the end user may end up with a host of large DLLs in his or her Windows system directory,
+negating the point of using DLLs. Of course, this is not a problem just associated with
+wxWindows!
+<P>
+
+<H3>How can I reduce executable size?</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
+take with VC++ 5/6 space optimisation: it can sometimes cause problems.<P>
+
+Statically-linked wxWindows 2 programs are smaller than wxWindows 1.xx programs, because of the way
+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>
+
+If you want to distribute really small executables, you can
+use <a href="http://www.icl.ndirect.co.uk/petite/" target=_top>Petite</a>
+by Ian Luck. This nifty utility compresses Windows executables by around 50%, so your 500KB executable
+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>
+
+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
+functionality using MFC.<P>
+
+<H3>Why do I sometimes get bizarre crash problems using VC++ 5/6?</H3>
+
+Some crash problems can be due to inconsistent compiler
+options (and of course this isn'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
+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>
+
+<H3>How are the wxWindows makefiles edited under Windows?</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>
+
+<blockquote>
+To use these new makefiles, you don'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
+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
+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
+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
+without any reason etc. Please test them and notify me about any problems.
+Better yet, modify the template files to generate the correct makefiles
+and check them in.<P>
+
+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
+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
+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
+(and Makefile.ams for Unix ports) and regenerating the makefiles - no
+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
+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
+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
+others. To generate wxWindows.dsp run<P>
+
+<pre>tmake -t vc6 wxwin.pro -o ../../wxWindows.dsp</pre><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
+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
+directory by 10 (and the number of files to be maintained too).
+</blockquote>
+
+</font>
+
+</BODY>
+
+</HTML>
--- a/docs/html/gettext/gettext.htm
+++ b/docs/html/gettext/gettext.htm
--- a/docs/html/gettext/msgfmt.htm
+++ b/docs/html/gettext/msgfmt.htm
@@ -0,0 +1,222 @@
+<!-- manual page source format generated by PolyglotMan v3.0.3a12, -->
+<!-- available via anonymous ftp from ftp.cs.berkeley.edu:/ucb/people/phelps/tcltk/rman.tar.Z -->
+
+<HTML>
+<HEAD>
+<TITLE>msgfmt(1) manual page</TITLE>
+</HEAD>
+<BODY>
+<A HREF="#toc">Table of Contents</A><P>
+     
+<H2><A NAME="sect0" HREF="#toc0">NAME </A></H2>
+msgfmt - create a message object from a message file  
+<H2><A NAME="sect1" HREF="#toc1">SYNOPSIS 
+</A></H2>
+<B>msgfmt</B> [ <B>-v</B> ] [ <B>-o</B><I> output-file</I> ]  ...    
+<H2><A NAME="sect2" HREF="#toc2">DESCRIPTION </A></H2>
+<P>
+<B>msgfmt</B> creates message 
+object files from portable object files (<I>filename<B>.po </B></I>), without changing 
+the portable object files. <P>
+The  <B>.po </B> file contains messages displayed to 
+users by system commands or by application programs. <B>.po</B> files can be edited, 
+and the messages in them can be rewritten in any language supported by 
+the system. <P>
+The <B><A HREF="http://hoth.stsci.edu/man/man1/xgettext.html">xgettext</B>(1)</A>
+ command can be used to create  <B>.po</B> files from 
+script or programs. <P>
+<B>msgfmt</B> interprets data as characters according to the 
+current setting of the <FONT SIZE=-1><B>LC_CTYPE </B></FONT>
+  locale category.  
+<H3><A NAME="sect3" HREF="#toc3">Portable Object Files 
+</A></H3>
+    <P>
+Formats for all <B>.po</B> files are the same. Each <B>.po</B> file contains one or 
+more lines, with each line containing either a comment or a statement. 
+Comments start the line with a hash mark (#) and end with the newline 
+character. All comments are ignored. The format of a statement is: 
+<DL>
+
+<DT><I>directive</I> 
+value  </DT>
+<DD></DD>
+</DL>
+<P>
+Each directive starts at the beginning of the line and is separated 
+from <I>value</I> by white space (such as one or more space or tab characters). 
+<I>value</I> consists of one or more quoted strings separated by white space. 
+Use any of the following types of directives:    <P>
+ <blockquote><B>domain</B> <I>domainname</I>  <BR>
+<B>msgid</B> 
+<I>message_identifier</I>  <BR>
+<B>msgstr</B> <I>message_string</I>  </blockquote>
+<P>
+The behavior of the  <B>domain</B> 
+directive is affected by the options used. See <FONT SIZE=-1>OPTIONS</FONT>
+ for the behavior 
+when the  <B>-o</B> option is specified. If the <B>-o</B> option is not specified, the 
+behavior of the <B>domain</B> directive is as follows:  <blockquote>
+<UL>
+&#183;<LI>All <I>msgids</I> from the beginning 
+of each <B>.po</B> file to the first  domain directive are put into a default 
+message object file, <B>messages.mo</B>. </LI>&#183;<LI>When <B>msgfmt</B> encounters a <B>domain</B><I> domainname</I> 
+directive in the <B>.po</B> file, all following <I>msgids</I> until the next <B>domain</B> directive 
+are put into the message object file  </LI>&#183;<LI>Duplicate  <I>msgids</I> are defined in 
+the scope of each domain. That is, a <I>msgid</I> is considered a duplicate only 
+if the identical <I>msgid</I> exists in the same domain. </LI>&#183;<LI>All duplicate <I>msgids</I> 
+are ignored. </LI>
+</UL>
+ </blockquote>
+<P>
+The <B>msgid</B> directive specifies the value of a message identifier 
+associated with the directive that follows it. The <I>message_identifier</I> string 
+identifies a target string to be used at retrieval time. Each statement 
+containing a <B>msgid</B> directive must be followed by a statement containing 
+a <B>msgstr</B> directive. <P>
+The <B>msgstr</B> directive specifies the target string associated 
+with the <I>message_identifier</I> string declared in the immediately preceding 
+<B>msgid</B> directive. <P>
+Message strings can contain the escape sequences <B>\n</B> for 
+newline, <B>\t</B> for tab, <B>\v</B> for vertical tab, <B>\b</B> for backspace, <B>\r</B> for carriage 
+return, <B>\f</B> for formfeed, <B>\\</B> for backslash, \" for double quote, <B>\ddd</B> for octal 
+bit pattern, and  <B>\xDD</B> for hexadecimal bit pattern.  
+<H2><A NAME="sect4" HREF="#toc4">OPTIONS </A></H2>
+
+<DL>
+
+<DT><B>-v</B>  </DT>
+<DD>Verbose. 
+ List duplicate message identifiers. Message strings are not redefined. 
+</DD>
+
+<DT><B>-o</B><I> output-file</I>  </DT>
+<DD>Specify output file name as <I>output-file</I>. All <B>domain</B> directives 
+and duplicate <I>msgids</I> in the <B>.po</B> file are ignored. </DD>
+</DL>
+ 
+<H2><A NAME="sect5" HREF="#toc5">EXAMPLES </A></H2>
+In this example 
+<B>module1.po</B> and <B>module2.po</B> are portable message objects files. <P>
+ <blockquote> example% 
+cat module1.po <BR>
+ # default domain "messages.mo" <BR>
+ msgid  "msg 1" <BR>
+ msgstr "msg 
+1 translation" <BR>
+ # <BR>
+ domain "help_domain" <BR>
+ msgid  "help 2" <BR>
+ msgstr "help 
+2 translation" <BR>
+ # <BR>
+ domain "error_domain" <BR>
+ msgid  "error 3" <BR>
+ msgstr "error 
+3 translation" <BR>
+ <P>
+ example% cat module2.po <BR>
+ # default domain "messages.mo" 
+<BR>
+ msgid  "mesg 4" <BR>
+ msgstr "mesg 4 translation" <BR>
+ # <BR>
+ domain "error_domain" 
+<BR>
+ msgid  "error 5" <BR>
+ msgstr "error 5 translation" <BR>
+ # <BR>
+ domain "window_domain" 
+<BR>
+ msgid  "window 6" <BR>
+ msgstr "window 6 translation" <BR>
+   </blockquote>
+<P>
+The following command 
+will produce the output files, <B>messages.mo</B>, <B>help_domain.mo</B>, and <B>error_domain.mo</B>. 
+
+<DL>
+
+<DT><B>example% msgfmt module1.po</B>  </DT>
+<DD></DD>
+</DL>
+<P>
+The following command will produce the output 
+files, <B>messages.mo</B>, <B>help_domain.mo</B>, <B>error_domain.mo</B>, and <B>window_domain.mo</B>. 
+
+<DL>
+
+<DT><B>example% msgfmt module1.po module2.po</B>  </DT>
+<DD></DD>
+</DL>
+<P>
+The following example will produce 
+the output file <B>hello.mo</B>. 
+<DL>
+
+<DT><B>example% msgfmt -o hello.mo module1.po module2.po</B> 
+ </DT>
+<DD></DD>
+</DL>
+<P>
+Install message object files in <B>/usr/lib/locale/</B><I>locale</I><B><FONT SIZE=-1>/LC_MESSAGES/</FONT>
+</B><I>domain</I><B>.mo</B> 
+where <I>locale</I> is the message locale as set by <B><A HREF="http://hoth.stsci.edu/man/man3C/setlocale.html">setlocale</B>(3C)</A>
+, and <I>domain</I> 
+is text domain as set by <B>textdomain()</B>. The <B>/usr/lib/locale</B> portion can 
+optionally be changed by calling <B>bindtextdomain()</B>. See <B><A HREF="http://hoth.stsci.edu/man/man3C/gettext.html">gettext</B>(3C)</A>
+.  
+<H2><A NAME="sect6" HREF="#toc6">ENVIRONMENT 
+</A></H2>
+See <B><A HREF="http://hoth.stsci.edu/man/man5/environ.html">environ</B>(5)</A>
+ for descriptions of the following environmental variables 
+that affect the execution of <B>msgfmt</B>: <FONT SIZE=-1><B>LC_CTYPE</FONT>
+ </B>,   <FONT SIZE=-1><B>LC_MESSAGES</FONT>
+ </B>,   <FONT SIZE=-1><B>NLSPATH</FONT>
+ 
+</B>.    
+<H2><A NAME="sect7" HREF="#toc7">ATTRIBUTES </A></H2>
+See <B><A HREF="http://hoth.stsci.edu/man/man5/attributes.html">attributes</B>(5)</A>
+ for descriptions of the following attributes: 
+ <P>
+ <TABLE BORDER=0>
+ <TR> <TD ALIGN=CENTER><B>ATTRIBUTE TYPE</B> </TD> <TD ALIGN=CENTER><B>ATTRIBUTE VALUE</B> </TD> </TR>
+ <TR>  <TR> <TD ALIGN=LEFT>Availability </TD> <TD ALIGN=LEFT>SUNWloc </TD> </TR>
+ <TR> <TD ALIGN=LEFT>CSI 
+</TD> <TD ALIGN=LEFT>Enabled </TD> </TR>
+ </TABLE>
+ 
+<H2><A NAME="sect8" HREF="#toc8">SEE ALSO </A></H2>
+<B><A HREF="http://hoth.stsci.edu/man/man1/xgettext.html">xgettext</B>(1)</A>
+, <B><A HREF="http://hoth.stsci.edu/man/man3C/gettext.html">gettext</B>(3C)</A>
+, <B><A HREF="http://hoth.stsci.edu/man/man3C/setlocale.html">setlocale</B>(3C)</A>
+, <B><A HREF="http://hoth.stsci.edu/man/man5/attributes.html">attributes</B>(5)</A>
+, 
+<B><A HREF="http://hoth.stsci.edu/man/man5/environ.html">environ</B>(5)</A>
+  
+<H2><A NAME="sect9" HREF="#toc9">NOTES </A></H2>
+<P>
+Neither <B>msgfmt</B> nor any <B>gettext()</B> routine imposes a limit 
+on the total length of a message. However, each line in the <B>*.po</B> file is 
+limited to <FONT SIZE=-1><B>MAX_INPUT </B></FONT>
+  (512) bytes. <P>
+Installing message catalogs under the 
+C locale is pointless, since they are ignored for the sake of efficiency. 
+    <P>
+
+<HR><P>
+<A NAME="toc"><B>Table of Contents</B></A><P>
+<UL>
+<LI><A NAME="toc0" HREF="#sect0">NAME</A></LI>
+<LI><A NAME="toc1" HREF="#sect1">SYNOPSIS</A></LI>
+<LI><A NAME="toc2" HREF="#sect2">DESCRIPTION</A></LI>
+<UL>
+<LI><A NAME="toc3" HREF="#sect3">Portable Object Files</A></LI>
+</UL>
+<LI><A NAME="toc4" HREF="#sect4">OPTIONS</A></LI>
+<LI><A NAME="toc5" HREF="#sect5">EXAMPLES</A></LI>
+<LI><A NAME="toc6" HREF="#sect6">ENVIRONMENT</A></LI>
+<LI><A NAME="toc7" HREF="#sect7">ATTRIBUTES</A></LI>
+<LI><A NAME="toc8" HREF="#sect8">SEE ALSO</A></LI>
+<LI><A NAME="toc9" HREF="#sect9">NOTES</A></LI>
+</UL>
+</BODY></HTML>
--- a/docs/html/gettext/xgettext.htm
+++ b/docs/html/gettext/xgettext.htm
@@ -0,0 +1,144 @@
+<!-- manual page source format generated by PolyglotMan v3.0.3a12, -->
+<!-- available via anonymous ftp from ftp.cs.berkeley.edu:/ucb/people/phelps/tcltk/rman.tar.Z -->
+
+<HTML>
+<HEAD>
+<TITLE>xgettext(1) manual page</TITLE>
+</HEAD>
+<BODY>
+<A HREF="#toc">Table of Contents</A><P>
+ 
+<H2><A NAME="sect0" HREF="#toc0">NAME </A></H2>
+xgettext - extract gettext call strings from C programs  
+<H2><A NAME="sect1" HREF="#toc1">SYNOPSIS 
+</A></H2>
+<B>xgettext</B> [ <B>-ns</B> ] [ <B>-a</B> [ <B>-x</B><I> exclude-file</I> ] ] [ <B>-c</B><I> comment-tag</I> ]   [ <B>-d</B><I> default-domain</I> 
+] [ <B>-j</B> ] [ <B>-m</B><I> prefix</I> ] [ <B>-M</B><I> suffix</I> ]   [ <B>-p</B><I> pathname</I> ] <B>-</B>| <I>filename</I> ...  <BR>
+<B>xgettext</B> 
+<B>-h</B>  
+<H2><A NAME="sect2" HREF="#toc2">DESCRIPTION </A></H2>
+  <P>
+<B>xgettext</B> is used to automate the creation of portable 
+message files (<B>.po</B>). A <B>.po</B> file contains copies of `C' strings that are found 
+in  ANSI C source code in <I>filename</I> or the standard input if  `<B>-</B>' is specified 
+on the command line. The  <B>.po</B> file can be used as input to the  <B><A HREF="http://hoth.stsci.edu/man/man1/msgfmt.html">msgfmt</B>(1)</A>
+ 
+utility, which produces a binary form of the message file that can be 
+ used by application during run-time.   <P>
+<B>xgettext</B> writes <I>msgid</I>  strings from 
+<B><A HREF="http://hoth.stsci.edu/man/man3C/gettext.html">gettext</B>(3C)</A>
+ calls in  <I>filename</I> to the default output file <B>messages.po</B>. The 
+default output file name can be changed by  <B>-d</B> option. <I>msgid</I> strings in 
+<B>dgettext()</B> calls are written to the output file  where <I>domainname</I> is the 
+first parameter to the <B>dgettext()</B> call. <P>
+By default, <B>xgettext</B> creates a 
+ <B>.po</B> file in the current working directory, and each entry is in the same 
+order the strings are extracted from <I>filenames</I>. When the <B>-p</B> option is specified, 
+the  <B>.po</B> file is created in the  <I>pathname</I> directory. An existing <B>.po</B> file 
+is overwritten.    <P>
+Duplicate  <I>msgid</I>s are written to the  <B>.po</B> file as comment 
+lines. When the  <B>-s </B> option is specified, the  <B>.po</B> is sorted by the <I>msgid</I> 
+string, and all duplicated <I>msgid</I>s are removed. All  <I>msgstr</I> directives in 
+the <B>.po</B> file are empty unless the <B>-m </B> option is used.   
+<H2><A NAME="sect3" HREF="#toc3">OPTIONS </A></H2>
+
+<DL>
+
+<DT><B>-n</B>  </DT>
+<DD>Add comment 
+lines to the output file indicating file name and line number in the source 
+file where each extracted string is encountered. These lines appear before 
+each <I>msgid</I> in the following format:  <blockquote><B>#</B> <B># File: </B><I>filename</I><B>, line: </DD>
+</DL>
+</B><I>line-number</I> 
+ </blockquote>
+
+<DL>
+
+<DT><B>-s</B>  </DT>
+<DD>Generate output sorted by  <I>msgid</I>s with all duplicate  <I>msgid</I>s removed. 
+ </DD>
+
+<DT><B>-a</B>  </DT>
+<DD>Extract all strings, not just those found in <B><A HREF="http://hoth.stsci.edu/man/man3C/gettext.html">gettext</B>(3C)</A>
+, and <B>dgettext 
+()</B> calls. Only one  <B>.po</B> file is created. </DD>
+
+<DT><B>-c</B><I> comment-tag</I>  </DT>
+<DD>The comment block 
+beginning with <I>comment-tag</I>  as the first token of the comment block is 
+added to the output <B>.po</B> file as  <I>#</I> delimited comments. For multiple domains, 
+<B>xgettext</B> directs comments and messages to the prevailing text domain. </DD>
+
+<DT><B>-d</B><I> 
+default-domain</I>  </DT>
+<DD>Rename default output file from <B>messages.po</B> to <I>default-domain</I> 
+<B>.po</B>. </DD>
+
+<DT><B>-j</B>  </DT>
+<DD>Join messages with existing message files.  If a <B>.po</B> file does not 
+exist, it is created.  If a <B>.po</B> file does exist, new messages are appended. 
+ Any duplicate <B>msgid</B>s are commented out in the resulting <B>.po</B> file.  Domain 
+directives in the existing <B>.po</B> file are ignored. Results not guaranteed 
+if the existing message file has been edited. </DD>
+
+<DT><B>-m</B><I> prefix</I>  </DT>
+<DD>Fill in the <I>msgstr</I> 
+with  <I>prefix</I>. This is useful for debugging purposes. To make <I>msgstr</I> identical 
+to <I>msgid</I>, use an empty string  (<B>"" </B>) for <I>prefix</I>. </DD>
+
+<DT><B>-M</B><I> suffix</I>  </DT>
+<DD>Fill in the 
+<I>msgstr</I> with  <I>suffix</I>. This is useful for debugging purposes. </DD>
+
+<DT><B>-p</B><I> pathname</I>  
+</DT>
+<DD>Specify the directory where the output files will be placed. This option 
+overrides the current working directory.   <BR>
+ </DD>
+
+<DT><B>-x</B><I> exclude-file</I>  </DT>
+<DD>Specify a  <B>.po</B> 
+file that contains a list of <I>msgid</I>s that are not to be extracted from 
+the input files. The format of <I>exclude-file</I> is identical to the <B>.po</B> file. 
+However, only the <I>msgid</I> directive line in <I>exclude-file</I> is used. All other 
+lines are simply ignored.  The <B>-x</B> option can only be used with the <B>-a</B> option. 
+</DD>
+
+<DT><B>-h</B>  </DT>
+<DD>Print a help message on the standard output. </DD>
+</DL>
+ 
+<H2><A NAME="sect4" HREF="#toc4">ATTRIBUTES </A></H2>
+See <B><A HREF="http://hoth.stsci.edu/man/man5/attributes.html">attributes</B>(5)</A>
+ 
+for descriptions of the following attributes:  <P>
+ <TABLE BORDER=0>
+ <TR> <TD ALIGN=CENTER><B>ATTRIBUTE TYPE</B> </TD> <TD ALIGN=CENTER><B>ATTRIBUTE 
+VALUE</B> </TD> </TR>
+ <TR>  <TR> <TD ALIGN=LEFT>Availability </TD> <TD ALIGN=LEFT>SUNWloc </TD> </TR>
+ </TABLE>
+ 
+<H2><A NAME="sect5" HREF="#toc5">SEE ALSO </A></H2>
+<B><A HREF="http://hoth.stsci.edu/man/man1/msgfmt.html">msgfmt</B>(1)</A>
+, <B><A HREF="http://hoth.stsci.edu/man/man3C/gettext.html">gettext</B>(3C)</A>
+, <B><A HREF="http://hoth.stsci.edu/man/man5/attributes.html">attributes</B>(5)</A>
+ 
+ 
+<H2><A NAME="sect6" HREF="#toc6">NOTES </A></H2>
+<B>xgettext</B> is not able to extract cast strings, for example ANSI 
+C casts of literal strings to <B>(const char *)</B>. This is unnecessary anyway, 
+since the prototypes in <B>&lt;libintl.h&gt;</B> already specify this type. <P>
+
+<HR><P>
+<A NAME="toc"><B>Table of Contents</B></A><P>
+<UL>
+<LI><A NAME="toc0" HREF="#sect0">NAME</A></LI>
+<LI><A NAME="toc1" HREF="#sect1">SYNOPSIS</A></LI>
+<LI><A NAME="toc2" HREF="#sect2">DESCRIPTION</A></LI>
+<LI><A NAME="toc3" HREF="#sect3">OPTIONS</A></LI>
+<LI><A NAME="toc4" HREF="#sect4">ATTRIBUTES</A></LI>
+<LI><A NAME="toc5" HREF="#sect5">SEE ALSO</A></LI>
+<LI><A NAME="toc6" HREF="#sect6">NOTES</A></LI>
+</UL>
+</BODY></HTML>
--- a/docs/html/icons/no.gif
+++ b/docs/html/icons/no.gif
--- a/docs/html/icons/somewhat.gif
+++ b/docs/html/icons/somewhat.gif
--- a/docs/html/icons/yes.gif
+++ b/docs/html/icons/yes.gif
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -0,0 +1,295 @@
+<HTML>
+
+<HEAD>
+<TITLE>wxWindows Documentation</TITLE>
+
+</HEAD>
+
+<!BODY BGCOLOR="#FFFFFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+<BODY BGCOLOR="#CCDDDFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<a name="top"></a>
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+<IMG src="logo.gif" align=right>
+<!-- wxWindows Documentation -->
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+Welcome to wxWindows 2, the premi&egrave;re cross-platform GUI C++ framework. This is an index of
+the plain text, HTML, Windows Help and Acrobat documentation: availability depends on what you've
+downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P>
+
+<CENTER>
+<FONT size=-1>
+[<a href="#install">Install</a>]
+[<a href="#manuals">Manuals</a>]
+[<a href="#thirdparty">3rd party tools</a>] 
+[<a href="#samples">Samples</a>]
+</FONT>
+</CENTER>
+
+<h3 align=center><a name="install"><hr>Installation and release notes<hr></a></h3>
+
+<ul>
+<li>ReadMe: <a href="../readme.txt"><b>General ReadMe</b></a>,
+<a href="../gtk/readme.txt">wxGTK</a>,
+<a href="../motif/readme.txt">wxMotif</a>,
+<a href="../msw/readme.txt">wxMSW</a>
+<li>Installation: <a href="../gtk/install.txt">wxGTK</a>,
+<a href="../motif/install.txt">wxMotif</a>,
+<a href="../msw/install.txt">wxMSW</a>
+<li><a href="../changes.txt"><b>Change log</b></a>
+<li><a href="../bugs.txt"><b>Buglist</b></a>
+<li>Licence: <a href="../preamble.txt">Preamble</a>,
+<a href="../licence.txt">Licence</a>,
+<a href="../licendoc.txt">Documentation Licence</a>,
+<a href="../lgpl.txt">L-GPL</a>,
+<a href="../gpl.txt">GPL</a>
+<li><a href="faq.htm"><B>FAQ</B></a>:
+  <ul>
+  <li><a href="faqgen.htm">General questions</a>
+  <li><a href="faqgtk.htm">wxWindows 2 for GTK</a>
+  <li><a href="faqmsw.htm">wxWindows 2 for Windows</a>
+  <li><a href="faqmot.htm">wxWindows 2 for Motif</a>
+  <li><a href="faqmac.htm">wxWindows 2 for Mac</a>
+  </ul>
+<li>ToDo: <a href="../todo.txt"><b>General ToDo</b></a>,
+<a href="../gtk/todo.txt">wxGTK</a>,
+<a href="../motif/todo.txt">wxMotif</a>,
+<a href="../msw/todo.txt">wxMSW</a>
+<li>List of <a href="../symbols.txt">preprocessor symbols</a> used in wxWindows
+</ul>
+
+<h3 align=center><a name="manuals"><hr>wxWindows manuals<hr></a></h3>
+
+<table border=1 align=center>
+
+<tr>
+<td align=center bgcolor="#FFFF00">
+<B>HTML</B>
+</td>
+<td align=center bgcolor="#FFFF00">
+<B>WinHelp</B>
+</td>
+<td align=center bgcolor="#FFFF00">
+<B>PDF</B>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="wx/wx.htm">Reference Manual</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/wx.hlp">Reference Manual</a>
+</td>
+
+<td align=center>
+<a href="../pdf/wx.pdf">Reference Manual</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="porting/port.htm">Porting Guide</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/porting.hlp">Porting Guide</a>
+</td>
+
+<td align=center>
+<a href="../pdf/porting.pdf">Porting Guide</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="dialoged/dlged.htm">Dialog Editor Manual</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/dialoged.hlp">Dialog Editor Manual</a>
+</td>
+
+<td align=center>
+<a href="../pdf/dialoged.pdf">Dialog Editor Manual</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="proplist/prop.htm">Property List Classes</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/proplist.hlp">Property List Classes</a>
+</td>
+
+<td align=center>
+<a href="../pdf/proplist.pdf">Property List Classes</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="wxtree/tree.htm">wxTreeLayout Class</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/wxtree.hlp">wxTreeLayout Class</a>
+</td>
+
+<td align=center>
+<a href="../pdf/wxtree.pdf">wxTreeLayout Class</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="odbc/odbc.htm">Remstar ODBC Classes</a>
+</td>
+
+<td align=center>
+<BR><BR>
+</td>
+
+<td align=center>
+<a href="../pdf/odbc.pdf">Remstar ODBC Classes</a>
+</td>
+</tr>
+
+</table>
+
+
+<h3 align=center><a name="thirdparty"><hr>Third-party tools<hr></a></h3>
+
+<ul>
+<li><a href="gettext/gettext.htm">gettext Manual</a>
+<li><a href="gettext/xgettext.htm">xgettext Manual</a>
+<li><a href="gettext/msgfmt.htm">msgfmt Manual</a>
+</ul>
+
+<h3 align=center><a name="samples"><hr>Samples<hr></a></h3>
+
+<ul>
+<li><a href="../../samples/bombs">bombs</a>: minesweeper-like game.
+<li><a href="../../samples/caret">caret</a>: a sample to test the wxCaret class.
+<li><a href="../../samples/checklst">checklst</a>: demonstrates wxCheckListBox on
+supported platforms (currently Windows and GTK only).
+<li><a href="../../samples/config">config</a>: demonstrates use of wxConfig, which
+defaults to wxRegConfig on WIN32, wxIniConfig on WIN16, and wxFileConfig on other platforms.
+<li><a href="../../samples/console">console</a>: demonstrates a console application using
+console-mode (no-GUI) compilation of wxWindows.
+<li><a href="../../samples/controls">controls</a>: sample showing a variety of controls, including
+wxNotebook.
+<li><a href="../../samples/db">db</a>: wxDB ODBC sample.
+<li><a href="../../samples/dde">dde</a>: shows the DDE protocol in action, both using real
+DDE on Windows, and TCP/IP on all platforms. Edit <a href="../../samples/dde/ddesetup.h">ddesetup.h</a>
+to switch between compilation modes. Currently the TCP/IP mode needs a bit of work.
+<li><a href="../../samples/dialogs">dialogs</a>: shows some of the common dialogs available -- wxFontDialog,
+wxColourDialog, wxFileDialog, wxDirDialog, wxMessageBox, wxTextEntryDialog, wxSingleChoiceDialog.
+For printing-related dialogs, see the printing sample.
+<li><a href="../../samples/dnd">dnd</a>: demonstrates drag and drop on supported platforms.
+<li><a href="../../samples/docview">docview</a>: demonstrates use of the document view classes,
+using wxFrame.
+<li><a href="../../samples/docvwmdi">docvwmdi</a>: : demonstrates use of the document view classes,
+using wxMDIParentFrame, wxMDIChildFrame.
+<li><a href="../../samples/drawing">drawing</a>: tests device context drawing.
+<li><a href="../../samples/dynamic">dynamic</a>: shows how to connect events to member functions
+dynamically.
+<li><a href="../../samples/forty">forty</a>: a great little card game by Chris Breeze. A
+fully-fledged application!
+<li><a href="../../samples/font">font</a>: tests fonts, font enumerator, font encodings.
+<li><a href="../../samples/fractal">fractal</a>: fractal mountains by Andrew Davison.
+<li><a href="../../samples/grid">grid</a>: demonstrates the wxGrid class.
+<li><a href="../../samples/help">help</a>: shows how to use wxHelpController.
+<li><a href="../../samples/html">html</a>: a number of demos for the wxHTML class library, used inside
+applications and also as a help facility.
+  <ul>
+  <li><a href="../../samples/html/about">about</a>: shows use of a wxHTML widget inside an About box.
+  <li><a href="../../samples/html/help">help</a>: shows use of wxHtmlHelpController to display wxHTML help.
+  <li><a href="../../samples/html/helpview">helpview</a>: a stand-alone wxHTML help viewer.
+  <li><a href="../../samples/html/printing">printing</a>: shows how easy it is to preview and print HTML files.
+  <li><a href="../../samples/html/test">test</a>: general wxHTML test application.
+  <li><a href="../../samples/html/virtual">virtual</a>: demonstrates the virtual file system feature.
+  <li><a href="../../samples/html/widget">widget</a>: demonstrates the use of controls in HTML pages.
+  <li><a href="../../samples/html/zip">zip</a>: shows how help files can be packaged in zip archives.
+  </ul>
+<li><a href="../../samples/image">image</a>: shows off the cross-platform wxImage class.
+<li><a href="../../samples/internat">internat</a>: use of wxWindows' internationalization support.
+<li><a href="../../samples/joytest">joytest</a>: tests the wxJoystick class (currently Windows and GTK only).
+<li><a href="../../samples/layout">layout</a>: shows the constraint layout system in action.
+<li><a href="../../samples/listctrl">listctrl</a>: demonstrates the wxListCtrl (implemented natively on
+WIN32, and using a generic version on other platforms).
+<li><a href="../../samples/menu">menu</a>: tests menus.
+<li><a href="../../samples/mdi">mdi</a>: shows off the MDI (Multiple Document Interface) classes. On Windows, the regular MDI
+scheme is used whereby child windows have full sizing and moving rights within the main
+window. On other platforms, tabbed windows are used, where the children are always maximized.
+<li><a href="../../samples/memcheck">memcheck</a>: demonstrates the memory checking/debugging facilities.
+<li><a href="../../samples/mfc">mfc</a>: shows how to use MFC and wxWindows code in the same application (Windows only).
+To compile this, you must edit include/wx/wxprec.h, comment out the windows.h inclusion, and recompile wxWindows.
+<li><a href="../../samples/minifram">minifram</a>: demonstrates a frame with a small title bar. On
+platforms that don't support it, a normal-sized title bar is displayed.
+<li><a href="../../samples/minimal">minimal</a>: just shows a frame, a menubar, and a statusbar. About as
+small a wxWindows application as you can get.
+<li><a href="../../samples/nativdlg">nativdlg</a>: shows how wxWindows can load a standard Windows
+dialog resource, translating the controls into wxWindows controls (Windows only).
+<li><a href="../../samples/nettest">nettest</a>: wxDialUpManager demo.
+<li><a href="../../samples/newgrid">newgrid</a>: demonstrates the new wxGrid implementation, by Michael Bedward.
+<li><a href="../../samples/notebook">notebook</a>: shows the wxNotebook (tabbed window) control.
+<li><a href="../../samples/oleauto">oleauto</a>: a little OLE automation controller (Windows only; requires
+Excel to be present).
+<li><a href="../../samples/ownerdrw">ownerdrw</a>: demonstrates owner-draw menus and controls (Windows only).
+<li><a href="../../samples/png">png</a>: demonstrates PNG loading.
+<li><a href="../../samples/printing">printing</a>: shows printing and previewing.
+<li><a href="../../samples/proplist">proplist</a>: demonstrates the property list classes (a VB-style property editor).
+<li><a href="../../samples/regtest">regtest</a>: tests the low-level Windows registry functions (Windows only).
+<li><a href="../../samples/resource">resource</a>: shows how to use wxWindows resources (.wxr files).
+<li><a href="../../samples/richedit">richedit</a>: a work-in-progress rich text editor with plain text and HTML export
+facilities.
+<li><a href="../../samples/sashtest">sashtest</a>: demonstrates use of the wxSashWindow class to allow
+the user to resize subwindows.
+<li><a href="../../samples/scroll">scroll</a>: demonstrates wxScrolledWindow.
+<li><a href="../../samples/scrollsub">scrollsub</a>: demonstrates the use of wxScrolledWindow to scroll
+an embedded window.
+<li><a href="../../samples/splitter">splitter</a>: demonstrates the wxSplitterWindow class.
+<li><a href="../../samples/tab">tab</a>: demonstrates the generic tab window class. You should
+normally use wxNotebook instead, but the generic code is sometimes useful, for example for
+implementing wxNotebook on platforms with no native support.
+<li><a href="../../samples/taskbar">taskbar</a>: demonstrates the wxTaskBarIcon class, for
+adding icons to the system tray. Windows only, but may eventually be implemented for other desktop
+environments that use this metaphor.
+<li><a href="../../samples/text">text</a>: demonstrates single and multiline text controls,
+and clipboard operations.
+<li><a href="../../samples/thread">thread</a>: tests the family of classes for doing thread
+programming.
+<li><a href="../../samples/toolbar">toolbar</a>: demonstrates wxToolBar.
+<li><a href="../../samples/treectrl">treectrl</a>: demonstrates wxTreeCtrl.
+<li><a href="../../samples/typetest">typetest</a>: tests various data type classes, including
+wxTime, wxDate and wxVariant.
+<li><a href="../../samples/validate">validate</a>: shows simple use of validation.
+<li><a href="../../samples/wizard">wizard</a>: demonstrates the wxWizard class.
+<li><a href="../../samples/wxpoem">wxpoem</a>: a little poetry display program.
+<li><a href="../../samples/wxsocket">wxsocket</a>: demonstrates the TCP/IP family of classes.
+</ul>
+
+<hr>
+
+</font>
+
+</BODY>
+
+</HTML>
+
--- a/docs/html/logo.gif
+++ b/docs/html/logo.gif
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -0,0 +1,292 @@
+<HTML>
+
+<HEAD>
+<TITLE>News</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+News
+</font>
+</td>
+</tr>
+</table>
+
+<H3>August 6th, 1999</H3><P>
+
+Today, a snapshot release of the MSW and the GTK ports has been
+made. The two snapshots are synchronized and have been tested
+for several weeks and should thus be considered to be quite stable.
+
+Among the many new features that have appeared since version 2.0
+was release are:
+
+<ul>
+<li> A great number of incompatiblities between the GTK and the MSW port have been removed. This
+holds escecially true for the way, time and order, controls send notifications to the user program.
+<li> Practically all widgets have been updated, removing bugs or adding missing features to
+specific ports (mostly the GTK port).
+<li> The GTK port now supports GTK version 1.2 as well as 1.0, giving access to the many new
+features, such as e.g. menu accelerators.
+<li> Many of the non-GUI classes have been reworked and new ones added, the stream classes
+having undergone a complete rewrite.
+<li> The addition of code to handle Unicode has begun and is in an advanced state.
+<li> The Python bindings (wxPython) have been largely improved and upadted to the newest
+API and features.
+</ul>
+
+
+
+<H3>July 31st, 1999</H3><P>
+
+We are glad to announce the start of the work on the new wxWindows port - wxBeOS
+which will implement wxWindows 2 API for <A HREF="http://www.be.com">BeOS</A>.
+Thanks to Be for donating licenses to wxWindows project to make it possible.
+<P>
+If you're interested in helping with this new port, please write to wxWindows
+developers mailing list!
+
+<H3>May 27th, 1999</H3><P>
+
+<ul>
+<li>Beta 1 of <a href="dl_mac2.htm">wxWindows 2 for Mac</a> has been released, thanks to Stefan Csomor's amazing efforts.
+<li>Work continues on the development branch of wxWindows 2 for MSW, GTK and Motif. Vadim has been reworking the
+MSW implementation to solve some internal design problems, as well as factoring out base classes to make
+development easier.
+<li>Work on consistent drag and drop support in GTK and MSW continues.
+</ul>
+
+<H3>March 1st, 1999</H3><P>
+
+wxWindows 2 launch day!<P>
+
+<ul>
+<li>wxWindows 2 officially launched, after more than two years' development of
+the API and ports to Windows, GTK and Motif (Mac to follow).
+<a href="download.htm">Download</a> wxWindows 2.
+</ul>
+
+<H3>November 26th 1998</H3><P>
+
+<ul>
+<li><a href="ftp://www.remstar.com/pub/wxwin/1.68E">wxWindows 1.68E</a> contains minor bug fixes and now compiles with MS VC++ 6.0, and
+(hopefully) BC++ 5.0, as well as Cygwin b20.
+<li>The latest <a href="ftp://www.remstar.com/pub/wxwin/2.0.1">wxWindows 2.0 alpha</a> shows good progress
+on the Motif port, with a tabbed MDI implementation, a nice wxToolBar class and most
+major classes working. wxWindows 2.0 for Windows now works with VC++ 6.0, BC++ 5.0 and
+Cygwin b20. There's a problem linking with Mingw32, I don't know why this is, perhaps
+something to do with differences in the way pragmas are handled.
+<li>There is also good progress with Stefan Csomor's wxMac 2.0: watch this space. A preview
+is available <a href="http://www.advanced.ch/wxwin/wxmac_d1.zip">here</a>.
+<li>Work is finally underway on a <a href="wxide.htm">wxWindows IDE</a>!
+<li>Aleksandras Gluchovas is working on a docking window implementation and the results
+are pretty impressive so far. Here's a <a href="http://www.soften.ktu.lt/~alex/fl_screenshot.gif">screenshot</a>;
+source code is <a href="http://www.soften.ktu.lt/~alex/fl_src_0_1.zip">here</a> and a WIN32 executable
+is <a href="http://www.soften.ktu.lt/~alex/fl_demo_exe_0_1.zip">here</a>. The source also includes
+work on persistent storage classes.
+</ul>
+
+<H3>September 13th 1998</H3><P>
+
+<ul>
+<li>The main ftp site is now <a href="ftp://www.remstar.com/pub/wxwin">www.remstar.com/pub/wxwin</a>,
+since the AIAI site is no longer available for uploads.
+</ul>
+
+<H3>August 23rd 1998</H3><P>
+
+<ul>
+<li>wxGTK and wxMSW 2.0 progress continues apace. The API is being unified quite successfully,
+and most of the samples now compile under both ports.
+<li>We are looking for <a href="sponsor.htm">sponsorship</a> of wxMotif 2.0.
+</ul>
+
+<H3>April 28th 1998</H3><P>
+
+<ul>
+<li>wxWindows 1.68C has been released. This mainly provides compatibility with Gnu-Win32 b19
+and Mingw32.
+<li>wxWindows 2.0 beta 9 has been released. Again, this provides Gnu-Win32 b19/Mingw32 compatibility
+plus a few small bug fixes.
+</ul>
+
+<H3>March 22nd 1998</H3><P>
+
+<ul>
+<li>The mailing list addresses have changed: please see the <a href="maillist2.htm">mailing list page</a>
+for details. You may need to re-subscribe if you subscribed since February 1998.
+</ul>
+
+<H3>January 5th 1998</H3><P>
+
+<ul>
+<li>Happy New Year!
+<li>wxWindows 1.68B is available.
+<li>wxWindows 2.0 has another port in progress - <a href="http://www.freiburg.linux.de/~wxxt" target=_top>wxGTK</a>,
+by Robert Roebling (see also the information on the same page about Robert's FADE desktop
+environment project).
+<li>The Windows and Xt/Motif ports to 2.0 are progressing well. A large proportion of the documentation
+has been done. One of the main things to resolve is how transformations (such as scaling
+and translation) will be done in 2.0, but we're heading towards agreement.
+<li>There is a new <a href="http://wxwin.projects.ml.org" target=_top>wxWindows Developers Site</a> in preparation, for people developing ports of
+wxWindows. There are newsgroups and a wxwin-developers mailing list.
+<li>40 wxWindows CD-ROMs have been sold, mostly outside the U.K.
+<li>Antonia Charlotte Smart was born on November 1st 1997. Naturally, she's as cute as her parents.
+</ul>
+
+<H3>August 13th 1997</H3><P>
+
+<ul>
+<li>Added <a href="getstart.htm">Getting Started</a> page for new users.
+<li>There's a good review of wxWindows by Oliver Niedung and Stefan Gunther in
+<I>iX</I>, a German computer magazine.
+</ul>
+
+<H3>July 24th 1997</H3><P>
+
+<ul>
+<li>wxWindows 1.67 <a href="download.htm" target=wxmain>released</a>.
+</ul>
+
+<H3>July 22nd 1997</H3><P>
+
+<ul>
+<li>wxWindows 1.67 is nearly there...
+<li>Check out <a href="apps/forty/forty.htm">Forty Thieves</a>, a great card game
+by Chris Breeze of Hitachi Europe Limited.
+</ul>
+
+<H3>July 16th 1997</H3><P>
+
+<ul>
+<li>Jobst Schmalenbach has set up Australian mirrors of the wxWindows ftp and Web sites:
+please see the <a href="mirrors.htm">Mirrors</a> page.
+<li>Arthur Tetzlaff-Deas is starting to look afresh at a port of wxWindows 2.0 to
+NeXTStep. This is more relevant now that the NeXT OS will be essential to the Apple Mac's future.
+<li>The next release of wxWindows for Motif/XView/Windows should be within the next two weeks or so. I have abandoned
+documentation in wxHelp form in favour of the much better quality HTML format, which I
+will be including with the distribution from now on.
+</ul>
+
+<H3>July 7th 1997</H3><P>
+
+<ul>
+<li>For news on wxWindows 2.0 development, please see <a href="coming.htm">What's coming next?</a>
+- developments include DLL and experimental Netscape Plugin support. The estimate for a release
+date has been put back to October 1997 - to be out of the way before Smart Jr. arrives in November...
+<li>Negotiations with a U.S. company about development of wxWindows into a commercial product
+fell through, since it was not possible to agree about the continuation of a version
+of wxWindows that maintains the free, collaborative spirit that currently exists.
+</ul>
+
+<H3>May 18th 1997</H3><P>
+
+<ul>
+<li>wxWindows 2.0 development (mostly for the Windows platform) is on track thanks to funding for wxWin-related consultancy
+- thank you to those concerned! This work is still on the free version of 2.0, although an additional
+commercial version may be developed sometime in the future. Markus Holzem continues to generously donate
+his spare time for Motif/Xt developments, and Greg Whitehead is looking into the Mac version of 2.0.
+<li>Guilhem Lavaux has contributed a first version of
+<a href="ftp://www.remstar.com/pub/wxwin/contrib/wxsocket">wxSocket</a>, a set of classes for
+network programming based on work by Andrew Davison. Currently this works on Motif/Xt and is coded but not yet tested
+for Windows. The wxIPC classes on the UNIX side have been rewritten to take advantage of the new
+classes. wxSocket is a great contribution that will be a part of wxWindows 2.0. Meanwhile, do check
+it out and help Guilhem debug and develop it further.
+<li>Other noteworthy contributions in recent weeks include a patch for using bitmap
+<a href="ftp://www.remstar.com/pub/wxwin/contrib/unixmask">masks</a> on X for transparency
+effects - another Lavaux effort! - plus <a href="ftp://www.remstar.com/pub/wxwin/contrib/wxthread">thread</a> classes
+by Wolfram Gloger, updates to <a href="ftp://www.remstar.com/pub/wxwin/ports/xt">wxXt</a> by Markus Holzem,
+a start at <A HREF="ftp://www.remstar.com/pub/wxwin/contrib/wxole">OLE control</a> support by Norbert Grotz,
+an improved <A HREF="ftp://www.remstar.com/pub/wxwin/contrib/winstmod">Winstall</a> by Stefan Hammes,
+and <A HREF="ftp://www.remstar.com/pub/wxwin/contrib/wxpref">wxPreferences</a> by Bart Jourquin
+to simulate .ini files on UNIX.<P>
+Check out the <A href="contrib2.htm">Contributions</a> page for more.
+</ul>
+
+<P>
+
+<H3>May 8th 1997</H3><P>
+
+<ul>
+<li>Hitachi Europe Limited have used wxWindows both to implement and to illustrate
+their WebReuser tool - a link to <a href="http://www.stablesoft.com">their pages</a> has been
+added to the <a href="apps.htm">Applications</a> page.
+<li>Another interesting link in the Applications page is 
+<a href="http://www.softwarebuero.de/wipeout-eng.html">WipeOut</a>, a C++ integrated development
+environment for Linux.
+<li>Fixes to make wxWindows 1.66F work with VC++ 5.0 are in the
+<A href="ftp://www.remstar.com/pub/wxwin/ports/msvc50">ports/msvc50</a>
+directory.
+</ul>
+
+<P>
+
+<H3>April 20th 1997</H3><P>
+
+<ul>
+<li>wxWindows is listed in the <a href="http://SAL.KachinaTech.COM/">Scientific Applications on Linux</a> index</a>,
+<a href="http://SAL.KachinaTech.COM/F/5/WXWINDOWS.html">here</a>.
+<li>There is a new page for <a href="issues.htm">issues with the current release</a> which I would
+encourage you to read.
+<li>The wxWindows Web pages can be switched to non-frames mode, for those who find frames irritating
+(and who use browsers that don't implement Back properly :-)).
+<li>The <A href="contrib.htm">Contrib</a> page has some new entries.
+<li>wxWindows 2.0 progress is steady.
+<li><a href="mailto:grw@market.net">Greg Whitehead</a> is taking a look at what's involved for a Mac port of 2.0, possibly using MetroWerks' PowerPlant
+classes to speed up development.
+</ul>
+
+<P>
+<H3>March 13th 1997</H3><P>
+
+<ul>
+<li>Check out C-LAB's <a href="http://www.c-lab.de/~lipuser/lip" TARGET=_top>Lean Integration Platform</a> written in wxWindows/wxLisp: it's
+a multi-platform workflow tool. Nice Web pages!
+<li>I've written some <a href="prepare.htm">tips</a> to help you code for easy porting to wxWindows 2.0.
+<li>wxWin 2.0 progress: I've eliminated the need for the dreaded CTL3D library for Windows 95 applications.
+New MDI classes are working, plus wxStatusBar, wxScrolledWindow. Markus is starting work on the Motif
+port, with wxXt 2.0 as a second priority. But <a href="sponsors.htm">financial help</a> to keep
+the momentum going is needed!
+</ul>
+
+<P>
+
+<H3>February 25th 1997</H3><P>
+
+<ul>
+<li>Yura Bidus (yari_b@automedi.com) has successfully adapted wxWindows 1.66B to compile as a DLL under
+Borland C++. He will be patching 1.66F and investigating using VC++ for building the DLL.
+<li>Early experiments indicate that application files using wxWindows 2.0
+and GNU-WIN32 will be at least twice as fast to compile as 1.66, due to elimination of base classes
+and restructuring to avoid including windows.h.
+</ul>
+
+<P>
+
+<H3>January 29th 1997</H3><P>
+
+<ul>
+<li><a href="ftp://www.remstar.com/pub/wxwin/1.66F_internal">wxWindows 1.66F</a> has been semi-released
+for people to test before the official release. It works with GNU-WIN32, and contains miscellaneous bug fixes.
+<li>ITA, Inc. have sent a debugged and
+enhanced <a href="ftp://www.remstar.com/pub/wxwin/ports/mac/ita">Mac port</a> (building on 1.61).
+<li>Markus Holzem and Julian Smart are designing wxWindows 2.0, which should make wxWindows into a force
+to be reckoned with against other free and commercial libraries. The <a href="coming.htm">What's coming next?</a>
+page will shortly contain more details.
+<li>The <a href="maillist.htm">mailing lists</a> are up and running again, with new subscription and discussion
+list addresses.
+</ul>
+
+<P>
+
+</font>
+
+</BODY>
+
+</HTML>
--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -0,0 +1,90 @@
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="Author" content="Vadim Zeitlin">
+</head>
+<body>
+
+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
+been tested on it recently.
+<p>
+If you have tested wxWindows on a platform not mentioned here, please tell us about your experience on our mailing list!
+We would especially like to have information about compiling wxGTK on other Unix variants, such as IRIX, DG-UX,
+other flavours of BSD, ...
+<p>
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+
+<tr>
+<td bgcolor="#660000" colspan=5> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> wxWindows 2 Platforms </font> </td>
+</tr>
+
+<tr>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Platform </font> </td>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Compiler </font> </td>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Status </font> </td>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Tested by </font> </td>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Remarks </font> </td>
+</tr>
+
+<tr>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=6>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/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>Myngw32</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td>Cross compilation from Linux works as well</td>
+<tr> <td>Cygwin</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>Watcom C++ 10</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>Symantec C++</td><td align=center><IMG SRC="icons/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/no.gif" ALT=Unknown></td><td><br></td>
+     <td rowspan=2 valign=center>Some features are missing (OLE related classes, threads, ...)</td>
+<tr> <td>Borland C++ 4.0</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></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><br></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/no.gif" ALT=Unknown></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>
+
+<tr>
+<td bgcolor="#F0F0F0" align=center valign=center rowspan=1>FreeBSD</td>
+     <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+</tr>
+
+<tr>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=3>Solaris</td>
+     <td>wxMotif with Sun CC 4.2</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>wxMotif 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="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></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 AIX CC</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+</tr>
+
+<tr>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=2>HP-UX</td>
+     <td>wxGTK with HP CC A.10.22</td><td align=center><IMG SRC="icons/somewhat.gif" ALT=Unknown></td><td><br></td>
+     <td>special extra compiler options must be manually added, see the docs for details</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>
+
+</table>
+
+<br>
+
+<hr>
+Contact <A HREF="mailto:zeitlin@dptmaths.ens-cachan.fr">me</A> with
+any comments/suggestions.
+
+</body>
+</html>
--- a/docs/html/roadmap.htm
+++ b/docs/html/roadmap.htm
@@ -0,0 +1,205 @@
+<HTML>
+<HEAD>
+  <TITLE>wxWindows Roadmap</TITLE>
+</HEAD>
+
+<BODY>
+
+<a name="top"></a>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows Roadmap
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+<CENTER>
+<a href="#schedule">Schedule</a> | <a href="#todo">To-Do List</a>
+</CENTER>
+
+<P>
+
+This page represents current thinking about where wxWindows is going in the near, 
+medium and long-term. It also serves as a schedule for new releases so
+that both developers and users can know what to expect when, at least approximately.<P>
+
+We are adopting the Linux kernel style of numbering system where odd minor version numbers are development
+versions, and even numbers are stable versions. For example, 2.1.x are development releases,
+and the next 'stable' or final release of it would be 2.2.<P>
+
+Bug-fix patches to the stable release (if made) then become point
+releases of 2.2 (2.2.x) while development continues with wild abandon
+on 2.3.x until the end of the next development cycle when it is
+released as 2.4.<P>
+
+Development versions that end up on the FTP site or CD-ROM, as opposed to remaining
+in the CVS archive, are semi-stable -- i.e. they are checked for compilation and
+run-time problems, but not as thoroughly as the stable versions.<P>
+
+Note that since the wxWindows effort is voluntary, these are not hard-and-fast deadlines:
+but we will endeavour to follow them as closely as possible.<P>
+
+Note also that the releases described are for wxGTK, wxMSW and wxMotif ports. wxMac currently follows
+its own development path but is due to merge with the main code base in November/December.
+Also, minor snapshot releases for specific platforms may be
+available at dates convenient to the developers.<P>
+
+<CENTER>
+<HR> <FONT SIZE=+2><I><B><a name="schedule">Schedule</a></B></I></FONT> <HR>
+</CENTER>
+<P>
+
+<H4>Release 2.1.11</H4>
+
+Release date: November 7th, 1999<P>
+
+<ul>
+<li>Split wxWindows into base and GUI libraries. Most, but not all makefiles
+are expected to support this: for the rest, the makefiles will build a valid
+combined base/GUI library for GUI applications only.
+<li>wxWizard (beta).
+<li>wxDialUpManager and wxPhoneDialer.
+<li>wxFontEnumerator.
+<li>Preliminary support for different font encodings
+<li>wxPostEvent function
+<li>New wxGrid.
+<li>wxSocket working.
+<li>Full support for fonts in different encodings.
+<li>Tested multithreading support (wxThread).
+<li>wxHTML printing.
+<li>Better i18n support (i.e. more translations).
+</ul>
+
+<P>
+
+<H4>Release 2.2 (stable)</H4>
+
+Release date: December 19th, 1999.<P>
+
+<ul>
+<li>Miscellaneous fixes and small enhancements.
+</ul>
+
+<P>
+
+<H4>Release 2.3</H4>
+
+Release date: March 5th, 2000
+
+<ul>
+<li>Miscellaneous fixes and small enhancements.
+<li>wxDateTime class in beta.
+<li>Context sensitive help.
+<li>More i18n issues: dates, times, ...
+<li>Regular expressions support.
+</ul>
+
+<P>
+
+<H4>Release 2.4 (stable)</H4>
+
+Release date: May 7th, 2000.
+
+<ul>
+<li>Unicode compilation starting to work in wxGTK and wxMSW.
+<li>wxDateTime class.
+</ul>
+
+<P>
+
+<CENTER>
+<HR> <FONT SIZE=+2><I><B><a name="todo">To-Do List</a></B></I></FONT> <HR>
+</CENTER>
+
+<P>
+
+Developers: please feel free to add to these, and delete them when they are done.
+
+<P>
+
+<B><I>General</I></B><P>
+
+<ul>
+<li>wxHTML printing. When finished, this will allow an application to generate
+printed reports with very little effort.
+<li>wxSocket.
+<li>Split library into several, for base (classes and functions usable by console and GUI
+applications), console (classes and functions usable by console application only)
+and GUI (classes and functions usable by GUI application only).
+<li>Extend and unify drag and drop handling (e.g. we need to specify multiple drop targets
+that can handle multiple formats).
+<li>Expand the number of controls that can be specified in a WXR file;
+add constraint specification to WXR syntax and Dialog Editor; add multilanguage support to WXR.
+May be we'd better change the format completely and replace WXR with XML
+(providing conversion utility for old files)?
+<li>Context sensitive help: we need to have wxHelpEvent which would be
+generated when the help for a given control is requested and a standard
+handler for it in wxWindow which would invoke the default help system with the
+correct help id.
+<li>Rewrite Dialog Editor.
+<li>Modem-oriented classes: wxDialUpManager for dialing up the ISP and
+determining if there is a connection to Internet on the machine and
+wxPhoneDialer for dialing arbitrary phone numbers and otherwise communicating
+with the modem.
+<li>wxImage handlers in separate .h and .cpp files.
+<li>PCX writing code.
+<li>GIF animation code.
+<li>Tidying of timer code, addition of wxChrono class.
+<li>Debug wxPostScriptDC further.
+<li>wxDateTime class.
+<li>Regular expressions support.
+<li>Expansion of wxHTML to support further tags, and frames.
+<li>MGL port (see Backroom/Future Ports page).
+<li>Rotated text support.
+<li>FreeType support.
+<li>Support for 'skins', perhaps using a set of alternative control and window classes
+written generically in wxWindows.
+<li>Serial and parallel port support.
+<li>Modem and telephony support.
+<li>Book, tutorial.
+<li>More examples.
+<li>Bug tracking system.
+</ul>
+
+<P>
+
+<B><I>wxMSW</I></B><P>
+
+<ul>
+<li>Windows CE port.
+<li>Cure bug whereby in a panel within another panel, all buttons become
+default buttons (heavy black border).
+<li>Write a RC->WXR converter.
+</ul>
+
+<P>
+
+<B><I>wxGTK</I></B><P>
+
+<ul>
+<li>GNOME/KDE integration libraries.
+</ul>
+
+<P>
+
+<B><I>wxMotif</I></B><P>
+
+<ul>
+<li>Fix menu accelerators
+<li>Fix refresh problems
+<li>Allow wxSystemSettings to be configurable, perhaps via a control
+panel application.
+</ul>
+
+
+</BODY>
+</HTML>
+
--- a/docs/html/standard.htm
+++ b/docs/html/standard.htm
@@ -0,0 +1,882 @@
+<HTML>
+<HEAD>
+  <TITLE>wxWindows Programmer Style Guide</TITLE>
+</HEAD>
+
+<BODY>
+
+<a name="top"></a>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows Programmer Style Guide
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+by <A HREF=mailto:zeitlin@dptmaths.ens-cachan.fr>Vadim Zeitlin</A><P>
+
+This guide is intended for people who are (or intending to start) writing code
+for <A HREF="http://www.wxwindows.org" target=_top>wxWindows</A> class library.
+
+<P>
+The guide is separated into two parts: the first one addresses the general
+compatibility issues and is not wxWindows-specific. The advises in this part
+will hopefully help you to write programs which compile and run on greater
+variety of platforms. The second part details the wxWindows code organization and
+its goal it to make wxWindows as uniform as possible without imposing too
+many restrictions on the programmer.
+<P>
+Acknowledgements: This guide is partly based on <A
+HREF="http://www.mozilla.org/hacking/portable-cpp.html" target=_top>
+C++ portability guide</A> by David Williams.
+
+<P>
+<H3>General C++ Rules</H3>
+<UL>
+  <LI>New or not widely supported C++ features</LI>
+  <OL>
+    <LI><A HREF="#no_templates">Don't use C++ templates</A></LI>
+    <LI><A HREF="#no_exceptions">Don't use C++ exceptions</A></LI>
+    <LI><A HREF="#no_rtti">Don't use RTTI</A></LI>
+    <LI><A HREF="#no_namespaces">Don't use namespaces</A></LI>
+    <LI><A HREF="#no_stl">Don't use STL</A></LI>
+    <LI><A HREF="#no_fordecl">Don't declare variables inside <TT>for()</TT></A></LI>
+    <LI><A HREF="#no_nestedclasses">Don't use nested classes</A></LI>
+    <LI><A HREF="#no_ternarywithobjects">Use ternary operator ?: carefully</A></LI>
+  </OL>
+  <BR>
+  <LI>General recommendations</LI>
+  <OL>
+    <LI><A HREF="#no_globals">No global variables with constructor</A></LI>
+    <LI><A HREF="#no_warnings">Turn on all warnings and eradicate them</A></LI>
+    <LI><A HREF="#no_assume_sizeof">Don't rely on <TT>sizeof(int) == 2</TT>...</A></LI>
+    <LI><A HREF="#no_assignment_in_if">No assignments in conditional expressions</A></LI>
+    <LI><A HREF="#no_comment_code">Use <TT>#if 0</TT> rather than comments to temporarily disable blocks of code</A></LI>
+    <LI><A HREF="#no_overloaded_virtuals">Avoid overloaded virtual functions</A></LI>
+    <LI><A HREF="#no_extra_semicolon">Don't use extra semi-colons on top level</A></LI>
+  </OL>
+  <BR>
+  <LI>Unix/DOS differences</LI>
+  <OL>
+    <LI><A HREF="#use_cpp_ext">Use .cpp for C++ source file extension</A></LI>
+    <LI><A HREF="#no_backslash">Don't use backslash ('\\') in &#35;includes</A></LI>
+    <LI><A HREF="#no_carriagereturn">Avoid carriage returns in cross-platform code</A></LI>
+    <LI><A HREF="#no_caps_in_filenames">Use only lower letter filenames</A></LI>
+    <LI><A HREF="#no_incomplete_files">Terminate the files with a new-line</A></LI>
+  </OL>
+  <BR>
+  <LI>Style choices</LI>
+  <OL>
+    <LI><A HREF="#naming_conv">Naming conventions: use <TT>m_</TT> for members</A></LI>
+    <LI><A HREF="#no_void_param">Don't use <TT>void</TT> for functions without arguments</A></LI>
+    <LI><A HREF="#no_const_int">Don't use <TT>const</TT> for non pointer/reference arguments</A></LI>
+  </OL>
+</UL>
+
+<P>
+
+<H3>wxWindows Rules</H3>
+<UL>
+  <LI>Files location and naming conventions</LI>
+  <OL>
+    <LI><A HREF="#file_locations">File locations</A></LI>
+    <LI><A HREF="#include_guards">Include guards</A></LI>
+    <LI><A HREF="#pch">Precompiled headers</A></LI>
+  </OL>
+
+  <BR>
+  <LI>File layout and indentation</LI>
+  <OL>
+    <LI><A HREF="#wxwin_header">wxWindows standard header</A></LI>
+    <LI><A HREF="#indentation">Indent your code with 4 spaces (no tabs!)</A></LI>
+    <LI><A HREF="#class_decl">Order of parts in a class declarations</A></LI>
+  </OL>
+
+  <BR>
+  <LI>More about naming conventions</LI>
+  <OL>
+    <LI><A HREF="#wx_prefix">Use wx or WX prefix for all public symbols</A></LI>
+    <LI><A HREF="#wxdllexport">Use WXDLLEXPORT with all classes/functions in
+                               wxMSW/common code</A></LI>
+    <LI><A HREF="#set_get">Use Set/Get prefixes for accessors</A></LI>
+    <LI><A HREF="#constants">wxNAMING_CONSTANTS</A></LI>
+  </OL>
+
+  <BR>
+  <LI>Miscellaneous</LI>
+  <OL>
+    <LI><A HREF="#forward_decl">Use forward declarations whenever possible</A></LI>
+    <LI><A HREF="#debug_macros">Use debugging macros</A></LI>
+  </OL>
+</UL>
+
+<HR>
+
+<H3>General C++ Rules</H3>
+<UL>
+  <LI>New or not widely supported C++ features</LI>
+
+  <P>The usage of all features in this section is not recommended for one reason: they appeared in C++ relatively recently and are not yet
+supported by all compilers. Moreover, when they're supported, there are
+differences between different vendor's implementations. It's understandable that
+you might love one (or all) of these features, but you surely can write C++
+programs without them. Where possible, workarounds to compensate for absence
+of your favourite C++ abilities are indicated.
+  <P>Just to suppress any doubts that there are compilers which don't support
+these new features, you can think about Win16 (a.k.a. Win 3.1) compilers,
+<I>none</I> of which supports <I>any</I> feature from the list below.
+
+  <OL>
+    <P><LI><A NAME="no_templates"></A><B>Don't use C++ templates</B></LI><P>
+Besides the reasons mentioned above, template usage also makes the
+program compile much slower (200%-300% is not uncommon) and their support
+even in the compilers which have had it for a long time is far from perfect
+(the best example is probably gcc).
+<P><U>Workaround</U>: The things you would like to use templates for are,
+most commonly, polymorphic containers (in the sense that they can contain objects of
+any type without compromising C++ type system, i.e. using <TT>void *</TT>
+is out of question). wxWindows provides <A HREF="TODO">dynamic
+arrays and lists</A> which are sufficient in 99% of cases - please don't hesitate
+to use them. Lack of template is not a reason to use static arrays or
+type-less (passing by <TT>void *</TT>) containers.
+
+    <P><LI><A NAME="no_exceptions"></A><B>Don't use C++ exceptions</B></LI><P>
+The C++ exception system is an error-reporting mechanism. Another reasons not to use it,
+besides portability, are the performance penalty it imposes (small, but, at least for
+current compilers, non-zero), and subtle problems with
+memory/resource deallocation it may create (the place where you'd like to use
+C++ exceptions most of all are the constructors, but you need to be very
+careful in order to be able to do it).
+<P><U>Workaround</U>: there is no real workaround, of course, or the exceptions
+wouldn't have been added to the language. However, there are several rules which
+might help here:<P>
+
+<OL>
+  <LI>Every function returns an integer (or at least boolean) error code.
+      <P>There is no such thing as a function that never fails - even if it can't
+      fail now, it might do it later, when modified to be more powerful/general.
+      Put the <TT>int</TT> or <TT>bool</TT> return type from the very beginning!<P>
+  </LI><LI>Every function you call may fail - check the return code!
+      <P>Never rely on the function's success, always test for a possible error.<P>
+  </LI><LI>Tell the user about the error, don't silently ignore them.
+      <P>Exceptions are always caught and, normally, processed when they're
+      caught. In the same manner, the error return code must always be processed
+      somehow. You may choose to ignore it, but at least tell the user that
+      something wrong happened using <A HREF="TODO"><TT>wxLogError</TT></A> or
+      <A HREF="TODO"><TT>wxLogWarning</TT></A> functions. All wxWindows
+      functions (must) log the error messages on failure - this can be disabled
+      by using <A HREF="TODO">wxLogNull</A> object before calling it.
+      <P>Examples:<UL>
+        <LI><I>Wrong</I>:
+        <PRE>
+void ReadAddressBookFile(const wxString& strName)
+{
+  wxFile file;
+
+  if ( !file.Open(strFile) )
+    return;
+
+  ...process it...
+}
+        </PRE>
+        </LI><LI><I>Correct</I>:
+        <PRE>
+// returns false if the address book couldn't be read
+bool ReadAddressBookFile(const wxString& strName)
+{
+  wxFile file;
+
+  if ( !file.Open(strFile) ) {
+    // wxFile logged an error because file couldn't be opened which
+    // contains the system error code, however it doesn't know what
+    // this file is for and an error message "can't open $GLCW.ADB"
+    // can be quite confusing for the user. Here we say what we mean.
+    wxLogError("Can't read address book from '%s'!",
+	       strName.c_str());
+    return false;
+  }
+
+  ...process it...
+
+  return true;
+}
+	</PRE>
+        or, if it's not an error if file doesn't exist (here we could just check
+        its existence, but let's suppose that there is no <TT>wxFile::Exists()</TT>)
+        we can also write:
+        <PRE>
+// returns false if address book file doesn't exist
+bool ReadAddressBookFile(const wxString& strName)
+{
+  wxFile file;
+
+  // start a block inside which all log messages are suppressed
+  {
+    wxLogNull noLog;
+    if ( !file.Open(strFile) )
+      return false;
+  }
+
+  ...process it...
+
+  return true;
+}
+        </PRE></LI>
+    </UL>
+  </OL>
+
+    <P><LI><A NAME="no_rtti"></A><B>Don't use RTTI</B></LI><P>
+RTTI stands for Run-Time Type Information and there is probably no other
+reason not to use it except the portability issue and the fact that it adds
+<TT>sizeof(void *)</TT> bytes to any class having virtual functions (at least,
+in the implementations I'm aware of).
+<P><U>Workaround</U>: use wxWindows RTTI system which allows you to do almost
+everything which the new C++ RTTI, except that, of course, you have to use
+macros instead of the (horrible looking, BTW) <TT>dynamic_cast</TT>.
+
+    <P><LI><A NAME="no_namespaces"></A><B>Don't use namespaces</B></LI><P>
+This topic is subject to change with time, however for the moment all wxWindows
+classes/functions live in the global namespace.
+<P><U>Workaround</U>: None.
+
+    <P><LI><A NAME="no_stl"></A><B>Don't use STL</B></LI><P>
+STL is the new C++ standard library, proposing all kinds of template containers
+and generic algorithm implementations. Templates are the heart (and almost
+everything else) of the library, so its usage is out of question. Besides, even
+with the compilers which do support templates, STL has many of its own problems,
+there are many "not 100% standard compatible" vendor implementations, none of existing debuggers understands its
+complicated data structures, ... the list can go on (almost) forever.
+<P><U>Workaround</U>: Use wxString, dynamic arrays and lists and other wxWindows
+classes. wxString has many of the most often used functions of std::string STL
+class (typedef to be precise).
+    <P><LI><A NAME="no_fordecl"></A><B>Don't declare variables inside <TT>for()
+                                       </TT></B></LI><P>
+The scope of a variable declared inside <TT>for()</TT> statement changed several
+years ago, however many compilers still will complain about second declaration
+of <TT>i</TT> in the following code:
+<PRE>
+  for ( int i = 0; i < 10; i++ ) {
+    ...
+  }
+
+  ...
+
+  for ( int i = 0; i < 10; i++ ) {
+    ...
+  }
+</PRE>
+Even if it's perfectly legal now.
+<P><U>Workaround</U>: write this instead:
+<PRE>
+  int i;
+  for ( i = 0; i < 10; i++ ) {
+    ...
+  }
+
+  ...
+
+  for ( i = 0; i < 10; i++ ) {
+    ...
+  }
+</PRE>
+
+  <P><LI><A NAME="no_nestedclasses"></A><B>Don't use nested classes</B></LI><P>
+Nested classes are, without doubt, a very good thing because they allow to hide
+"private" (in the sense that they're used only inside the library) classes and,
+generally, put the related things together.
+<P>Unfortunately, some compilers have trouble understanding them, so we must
+sacrifice the ideals of software design to get a working program in this case.
+<P><U>Workaround</U>: instead of
+<PRE>
+  // in the header
+  class PublicLibClass {
+  ...
+  private:
+    class PrivateLibClass { ... } m_object;
+  };
+</PRE>
+you can try the following:
+<PRE>
+  // in the header
+  class PrivateLibClass; // fwd decl
+  class PublicLibClass {
+  ...
+  private:
+   class PrivateLibClass *m_pObject;
+  };
+
+  // in the .cpp file
+  class PrivateLibClass { ... };
+
+  PublicLibClass::PublicLibClass()
+  {
+    m_pObject = new PrivateLibClass;
+
+    ...
+  }
+
+  PublicLibClass::~PublicLibClass()
+  {
+    delete m_pObject;
+  }
+</PRE>
+<P>A nice side effect is that you don't need to recompile all the files
+including the header if you change the PrivateLibClass declaration (it's
+an example of a more general interface/implementation separation idea).
+
+  <P><LI><A NAME="no_ternarywithobjects"></A><B>Use ternary operator ?: carefully</B></LI><P>
+  The ternary operator <TT>?:</TT> shouldn't be used with objects (i.e. if any
+of its operands are objects) because some compilers (notable Borland C++) fail
+to compile such code.
+<P><U>Workaround</U>: use <TT>if/else</TT> instead.
+<PRE>
+    wxString s1, s2;
+
+    // Borland C++ won't compile the line below
+    wxString s = s1.Len() < s2.Len() ? s1 : s2;
+
+    // but any C++ compiler will compile this
+    wxString s;
+    if ( s1.Len() < s2.Len() )
+        s = s1;
+    else
+        s = s2;
+</PRE>
+</OL>
+
+  <BR>
+  <LI>General recommendations</B></LI><P>
+While the recommendations in the previous section may not apply to you if you're
+only working with perfect compilers which implement the very newest directives of
+C++ standard, this section contains compiler- (and language-) independent advice
+which <B>must</B> be followed if you wish to write correct, i.e. working, programs. It
+also contains some C/C++ specific remarks in the end which are less
+important.
+  <OL>
+    <P><LI><A NAME="no_globals"></A><B>No global variables with constructors</B></LI><P>
+In C++, the constructors of global variables are called before the
+<TT>main()</TT> function (or <TT>WinMain()</TT> or any other program entry point)
+starts executing. Thus, there is no possibility to initialize <I>anything</I>
+before the constructor call. The order of construction is largely
+implementation-defined, meaning that there is no guarantee that one global
+object will be initialized before another one (except if they are both defined
+in the same translation unit, i.e. .cpp file). Most importantly, no custom
+memory allocation operators are installed at the moment of execution of global
+variables constructors, so a (less restrictive) rule is that you should have
+no global variables which allocate memory (or do anything else non-trivial) in
+the constructor. Of course, if an object doesn't allocate memory in its constructor
+right now, it may start making it later, so you can only be sure about this if
+you don't use <I>any</I> variables of object (as opposed to simple:
+<TT>int</TT>, ...) types. Example: currently, wxString doesn't allocate memory
+in its default constructor, so you might think that having a global (initially)
+empty wxString is safe. However, if wxString starts allocating some minimal
+amount of memory in its default constructor (which doesn't look unreasonable),
+you would have all kinds of problems with <TT>new</TT>
+and <TT>delete</TT> operators (overloaded in wxWindows), especially because the first <TT>new</TT> called
+is the standard one (before wxWindows overloads them) and <TT>delete</TT> will
+be the overloaded operator.
+
+    <P><LI><A NAME="no_warnings"></A><B>Turn on all warnings and eradicate them</B></LI><P>
+Give the compiler a chance to help you - turn on all warnings! You should always
+use the maximum available warning level of your compiler and understand and
+correct each of them. If, for whatever reasons, a compiler gives a warning on
+some perfectly legal line of code and you can't change it, please insert a
+comment indicating it in the code. Most oftenly, however, all compiler warnings
+may be avoided (not suppressed!) with minimal changes to your code.
+
+    <P><LI><A NAME="no_assume_sizeof"></A><B>Don't rely on <TT>sizeof(int) == 2</TT>...</B></LI><P>
+You should never assume any absolute constraints on data type sizes. Currently,
+we have 16-bit, 32-bit and 64-bit machines and even inside each class data type
+sizes are different. A small table illustrates it quite well:
+<TABLE BORDER COLS=5 WIDTH="100%" NOSAVE >
+<TR>
+  <TD>Architecture/OS</TD>
+  <TD>sizeof(short)</TD>
+  <TD>sizeof(int)</TD>
+  <TD>sizeof(long)</TD>
+  <TD>sizeof(void *)</TD>
+</TR>
+
+<TR>
+  <TD>i386/Windows 3.1</TD>
+  <TD>2</TD>
+  <TD>2</TD>
+  <TD>4</TD>
+  <TD>2 or 4</TD>
+</TR>
+
+<TR>
+  <TD>i386/Windows 95</TD>
+  <TD>2</TD>
+  <TD>4</TD>
+  <TD>4</TD>
+  <TD>4</TD>
+</TR>
+
+<TR>
+  <TD>Merced/Win64</TD>
+  <TD>2</TD>
+  <TD>4</TD>
+  <TD>4</TD>
+  <TD>8</TD>
+</TR>
+
+<TR>
+  <TD>Alpha/Linux</TD>
+  <TD>???</TD>
+  <TD>???</TD>
+  <TD>???</TD>
+  <TD>???</TD>
+</TR>
+</TABLE>
+
+    <P><LI><A NAME="no_assignment_in_if"></A><B>No assignments in conditional expressions</B></LI><P>
+Although close to the heart of many C programmers (I plead guilty), code like
+classical <TT>if ( (c = getchar()) != EOF )</TT> is bad because it prevents you
+from enabling "assignment in conditional expression" warning (see also
+<A HREF="#no_warnings">above</A>) which is helpful to detect common
+mistypes like <TT>if ( x = 2 )</TT> instead of <TT>if ( x == 2 )</TT>.
+
+    <P><LI><A NAME="no_comment_code"></A><B>Use <TT>#if 0</TT> rather than comments to temporarily
+                    disable blocks of code</B></LI><P>
+If you have to temporarily disable some code, use
+<PRE>
+  #if 0 // VZ: I think this code is unneeded, it probably must be removed
+    ...
+  #endif // 0
+</PRE>
+instead of
+<PRE>
+  /*
+    ...
+  */
+</PRE>
+The reason is simple: if there are any <TT>/* ... */</TT> comments inside
+<TT>...</TT> the second version will, of course, miserably fail.
+
+    <P><LI><A NAME="no_overloaded_virtuals"></A><B>Avoid overloaded virtual functions</B></LI><P>
+
+You should avoid having overloaded virtual methods in a base class because if
+any of them is overriden in a derived class, then all others must be overriden
+as well or it would be impossible to call them on an object of derived class.
+
+For example, the following code:
+
+<PRE>
+    class Base
+    {
+    public:
+        virtual void Read(wxFile& file);
+        virtual void Read(const wxString& filename);
+    };
+
+    class Derived : public Base
+    {
+    public:
+        virtual void Read(wxFile& file) { ... }
+    };
+
+    ...
+
+    Derived d;
+    d.Read("some_filename");    // compile error here!
+</PRE>
+
+will fail to compile because the base class function taking <TT>filename</TT>
+is hidden by the virtual function overriden in the derived class (this is
+known as [virtual] function name hiding problem in C++).
+
+<P>
+The standard solution to this problem in wxWindows (where we have such
+situations quite often) is to make both <TT>Read()</TT> functions not virtual
+and introduce a single virtual function <TT>DoRead()</TT>. Usually, it makes
+sense because the function taking a filename is (again, usually) implemented
+in terms of the function reading from a file anyhow (but making only this
+functions not virtual won't solve the above problem!).
+<P>
+So, the above declarations should be written as:
+<PRE>
+    class Base
+    {
+    public:
+        void Read(wxFile& file);
+        void Read(const wxString& filename);
+
+    protected:
+        virtual void DoRead(wxFile& file);
+    };
+
+    class Derived : public Base
+    {
+    protected:
+        virtual void DoRead(wxFile& file) { ... }
+    };
+</PRE>
+
+This technique is widely used in many of wxWindows classes - for example,
+<TT>wxWindow</TT> has more than a dozen of <TT>DoXXX()</TT> functions which
+allows to have many overloaded versions of commonly used methods such as
+<TT>SetSize()</TT>
+
+    <P><LI><A NAME="no_extra_semicolon"></A><B>Don't use extra semi-colons on top level</B></LI><P>
+Some compilers don't pay any attention to extra semicolons on top level, as in
+<PRE>
+  class Foo { };;
+</PRE>
+while others complain loudly about it. Of course, you would rarely put 2
+semicolons yourself, but it may happen if you're using a macro
+(<TT>IMPLEMENT_something</TT>, for example) which already has a ';' inside and
+put another one after it.
+  </OL>
+
+  <BR>
+  <LI>Unix/DOS differences</B></LI><P>
+  Two operating systems supported by wxWindows right now are (different flavours
+of) Unix and Windows 3.1/95/NT (although Mac, OS/2 and other ports exist/are
+being developed as well). The main differences between them are summarized
+here.
+
+  <OL>
+    <P><LI><A NAME="use_cpp_ext"></A><B>Use .cpp for C++ source file extension</B></LI><P>
+There is, unfortunately, no standard exceptions for C++ source files. Different
+people use .C, .cc, .cpp, .cxx, .c++ and probably several others I forgot. Some
+compilers don't care about extension, but there are also other ones which can't
+be made to compile any file with "wrong" extension. Such compilers are very
+common in DOS/Windows land, that's why the .cpp extension is the least likely to
+cause any problems - it's the standard one under DOS and will probably be
+accepted by any Unix compiler as well (any counter examples?). The extension
+for the header files is .h.
+
+    <P><LI><A NAME="no_backslash"></A><B>Don't use backslash ('\\') in &#35;includes</B></LI><P>
+Although it's too silly to mention, please don't use backslashes in
+<TT>&#35;include</TT> preprocessor statement. Even not all Windows compilers accept
+it, without speaking about all other ones.
+
+    <P><LI><A NAME="no_carriagereturn"></A><B>Avoid carriage returns in cross-platform code</B></LI><P>
+This problem will hopefully not arise at all, with CVS taking care of this
+stuff, however it's perhaps not useless to remember that many Unix compilers
+(including, but not limited to, gcc) don't accept carriage returns
+(= <Ctrl-M> = '\r') in C/C++ code.
+
+    <P><LI><A NAME="no_caps_in_filenames"></A><B>Use only lower case filenames</B></LI><P>
+DOS/Windows 3.1 isn't case sensitive, Windows 95/NT are case preserving, but not
+case sensitive. To avoid all kinds of problems with compiling under Unix (or
+any other fully case-sensitive OS), please use only lower case letters in the
+filenames.
+
+    <P><LI><A NAME="no_incomplete_files"></A><B>Terminate the files with a new-line</B></LI><P>
+While DOS/Windows compilers don't seem to mind, their Unix counterparts don't
+like files without terminating new-line. Such files also give a warning message
+when loaded to vim (the Unix programmer's editor of choice :-)), so please think
+about terminating the last line.
+  </OL>
+
+  <BR>
+  <LI>Style choices</B></LI><P>
+  All wxWindows specific style guidelines are specified in the next
+section, here are the choices which are not completely arbitrary,
+but have some deeper and not wxWindows-specific meaning.
+
+  <OL>
+    <P><LI><A NAME="naming_conv"></A><B>Naming conventions: use <TT>m_</TT> for members</B></LI><P>
+It's extremely important to write readable code. One of the first steps in this
+direction is the choice of naming convention. It may be quite vague or strictly
+define the names of all the variables and function in the program, however it
+surely must somehow allow the reader to distinguish between variable and
+functions and local variables and member variables from the first glance.
+<P>The first requirement is commonly respected, but for some strange reasons, the
+second isn't, even if it's much more important because, after all, the immediate
+context usually allows you to distinguish a variable from a function in
+C/C++ code. On the other hand, you <I>cannot</I> say what <TT>x</TT> in the
+following code fragment is:
+<PRE>
+  void Foo::Bar(int x_)
+  {
+    ...
+
+    x = x_;
+
+    ...
+  }
+</PRE>
+It might be either a local variable (unluckily the function is too long so you
+don't see the variable declarations when you look at <TT>x = x_</TT> line), a
+member variable or a global variable - you have no way of knowing.
+<P>The wxWindows naming convention gives you, the reader of the code, much more
+information about <TT>x</TT>. In the code above you know that it's a local
+variable because:<P>
+<OL>
+  <LI>global variables are always prefixed with <TT>g_</TT></LI>
+  <LI>member variables are always prefixed with <TT>m_</TT></LI>
+  <LI>static variables are always prefixed with <TT>s_</TT></LI>
+</OL>
+<P>Examples:
+<PRE>
+  extern int g_x; // of course, 'x' is not the best name for a global...
+
+  void Bar()
+  {
+    int x;
+  }
+
+  class Foo {
+    public:
+      void SetX(int x) { m_x = x; }
+    private:
+      int m_x;
+  };
+</PRE>
+As you see, it also solves once and for all the old C++ programmer's question:
+how to call <TT>SetX()</TT> parameter? The answer is simple: just call it
+<TT>x</TT> because there is no ambiguity with <TT>Foo::m_x</TT>.
+<P>The prefixes can be combined to give <TT>ms_</TT> and <TT>gs_</TT> for static
+member (a.k.a. class) variables and static global variables.
+<P>The convention is, of course, completely worthless if it is not followed:
+nothing like being sure that <TT>x</TT> is a local variable in the code fragment
+above and discovering later the following lines in the header:
+<PRE>
+  class Foo {
+    ...
+    int x;  // I don't like wxWindows naming convention
+  };
+</PRE>
+Please do use these prefixes, they make your code much easier to read. Also
+please notice that it has nothing to do with the so-called <I>Hungarian notation</I>
+which is used in wxMSW part of wxWindows code and which encodes the <I>type</I>
+of the variable in its name - it is actually quite useful in C, but has little
+or no sense in C++.
+
+    <P><LI><A NAME="no_void_param"></A><B>Don't use <TT>void</TT> for functions without
+                    arguments</B></LI><P>
+In ANSI C, <TT>void Foo()</TT> takes an arbitrary number of arbitrarily typed
+arguments (although the form <TT>void Foo(...)</TT> is preferred) and <TT>void
+Foo(void)</TT> doesn't take any arguments. In C++, however, the situation is
+different and both declarations are completely equivalent. As there is no need
+to write <TT>void</TT> in this situation, let's not write it - it can only be
+confusing and create an impression that it really means something when it's not
+at all the case.
+
+    <P><LI><A NAME="no_const_int"></A><B>Don't use <TT>const</TT> for non pointer/reference
+                    arguments</B></LI><P>
+In both C and C++ an argument passed by value cannot be modified - or, more
+precisely, if it is modified in the called function, only the local copy is
+really changed, not the caller's variable. So, semantically speaking, there is
+no difference between <TT>void Foo(int)</TT> and <TT>void Foo(const int)</TT>.
+However, the <TT>const</TT> keyword is confusing here, adds nothing to the code
+and even cannot be removed if <TT>Foo()</TT> is virtual and overridden (because
+the names are mangled differently). So, <I>for arguments passed by value</I>
+you shouldn't use <TT>const</TT>.
+<P>Of course, it doesn't apply to functions such as
+<TT>void PrintMessage(const char *text)</TT> where <TT>const</TT> is mandatory.
+  </OL>
+</UL>
+
+<P>
+
+<H3>wxWindows rules</H3>
+<UL>
+  <P><LI>File location and naming conventions</LI><P>
+  <OL>
+    <P><LI><A NAME="file_locations"></LI><B>File locations</B><P>
+The wxWindows files for each supported platform have their own subdirectories
+in "include" and "src". So, for example, there is "src/msw", "include/gtk"
+etc. There are also two special subdirectories called "common" and
+"generic". The common subdirectory contains the files which are platform
+independent (wxObject, wxString, ...) and the generic one the generic
+implementations of GUI widgets, i.e. those which use only other wxWindows
+classes to implement them. For the platforms where the given functionality
+cannot be implemented natively, the generic implementation is used and the native
+one is used for the others. As I feel that it becomes a bit too confusing,
+here is an example: wxMessageBox function is implemented natively under
+Windows (where it just calls MessageBox API), but there is also a generic
+implementation which is used under, for example, GTK. A generic class should
+normally have a name that distinguishes it from any platform-specific implementation.
+A #define will allow wxGenericMessageDialog to be wxMessageDialog on some
+platforms, for example.
+
+<P>This scheme applies not only for the .cpp files, but also for the headers.
+However, as the program using wxWindows should (ideally) not use any
+"<TT>&#35;ifdef &lt;platform&gt;</TT>" at all, the headers are always included with
+"<TT>&#35;include &lt;wx/msgdlg.h&gt;</TT>" (for example). This file, in turn, includes
+the right header for given platform. Any new headers should conform to this
+setup as well to allow including <TT>&lt;wx/foo.h&gt;</TT> on any platform.<P>
+
+Note that wxWindows implementation files should use quotes when including wxWindows
+headers, not angled brackets. Applications should use angled brackets. There
+is a reason for it (can anyone remember what this is?).
+
+    <P><LI><A NAME="include_guards"></LI><B>Include guards</B><P>
+To minimize the compile time C++ programmers often use so called include
+guards: for example, in the header file foo.h you might have
+
+<PRE>
+&#35;ifndef _FOO_H_
+&#35;define _FOO_H_
+
+... all header contents ...
+
+&#35;endif
+ //_FOO_H_
+</PRE>
+
+In this way, the header will only be included once for the compilation
+of any .cpp (of course, it still will be included many times for the
+compilation of the whole project, so it has nothing to do with precompiled
+headers). wxWindows is no exception and also uses include guards which should use
+the above form, except for top-level headers which include files with identical
+names, in which case you should use _FOO_H_BASE_.
+
+    <P><LI><A NAME="pch"></LI><B>Precompiled headers</B><P>
+The precompiled headers greatly (we're speaking about orders of hundreds of
+percent here) reduce the compilation time. wxWindows uses them if the target
+compiler supports them (it knows about MS Visual C++, Borland C++ and g++).
+You should include all the headers included from <TT><wx/wx_prec.h></TT> only
+inside "<TT>&#35;if !USE_PRECOMP</TT>" to avoid unnecessary overhead in the case
+when the precompiled headers are used.<P>
+
+The start of a cpp implementation file after the heading might look like this:<P>
+
+<PRE>
+&#35;ifdef __GNUG__
+&#35;pragma implementation "bitmap.h"
+&#35;endif
+
+// For compilers that support precompilation, includes "wx.h".
+&#35;include "wx/wxprec.h"
+
+&#35;ifdef __BORLANDC__
+&#35;pragma hdrstop
+&#35;endif
+
+&#35;ifndef WX_PRECOMP
+&#35;include &lt;stdio.h&gt;
+&#35;include "wx/setup.h"
+&#35;include "wx/list.h"
+&#35;include "wx/utils.h"
+&#35;include "wx/app.h"
+&#35;include "wx/palette.h"
+&#35;include "wx/bitmap.h"
+&#35;include "wx/icon.h"
+&#35;endif
+
+&#35;include "wx/msw/private.h"
+&#35;include "assert.h"
+</PRE>
+
+
+<P>Any header file should containg the following lines:
+<PRE>
+&#35;ifdef __GNUG__
+  &#35;pragma interface "foo.h"
+&#35;endif
+</PRE>
+and the corresponding .cpp file:
+<PRE>
+&#35;ifdef __GNUG__
+  &#35;pragma  implementation "foo.h"
+&#35;endif
+</PRE> for g++ compilation.
+  </OL>
+
+  <P><LI>File layout and indentation</LI><P>
+  <OL>
+    <P><LI><A NAME="wxwin_header"></LI><B>wxWindows standard header</B> <a href="header.txt">here</a>. The
+copyright holder is the original author. It is assumed the author does not assert copyright,
+under the terms of the wxWindows licence. This is a legal interpretation of the informal
+usage 'public domain' (the copyright holder does not assert the copyright).<P>
+    <P><LI><A NAME="indentation"></LI><B>Indent your code with 4 spaces (no tabs!)</B>
+    <P><LI><A NAME="class_decl"></LI><B>Order of parts in a class declarations</B><P>
+  </OL>
+
+  <P><LI>More about naming conventions</LI><P>
+  <OL>
+    <P><LI><A NAME="wx_prefix"></LI><B>Use wx or WX prefix for all public symbols</B>.
+wx should be used for functions and classes, WX for macros.
+    <P><LI><A NAME="wxdllexport"</LI><B>Use WXDLLEXPORT with all classes/functions in
+                                wxMSW/common code</B>
+The title says it all - every public (in the sense that it is not internal to
+the library) function or class should have WXDLLEXPORT macro in its
+declaration to allow compilation of wxWindows as shared library. For example:<P>
+
+<pre>
+bool WXDLLEXPORT wxYield(void);
+class WXDLLEXPORT MyClass;  // (for forward declarations and real declarations)
+WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
+</pre>
+
+The reason for the strange syntax for data is that some compilers use different
+keyword ordering for exporting data.
+
+<P>There also several other places where you should take care of shared
+library case: all IMPLEMENT_xxx macros which are usually used in the
+corresponding .cpp files must be taken inside
+"<TT>&#35;if !USE_SHARED_LIBRARY</TT>" and in the <TT>&#35;if USE_SHARED_LIBRARY</TT>
+case you should put them inside <TT>common/cmndata.cpp</TT> file.
+
+    <P><LI><A NAME="set_get"></LI><B>Use Set/Get prefixes for accessors</B><P>
+There is a convention in wxWindows to prefix the accessors (i.e. any simple, in
+general, inline function which does nothing else except changing or returning
+the value of a member variable) with either <TT>Set</TT> or <TT>Get</TT>.
+
+    <P><LI><A NAME="constants"></LI><B>wxNAMING_CONSTANTS</B><P>
+The constants in wxWindows code should be defined using <TT>enum</TT> C++
+keyword (and not with <TT>#define</TT> or <TT>static const int</TT>). They
+should be declared in the global scope (and not inside class declaration) and
+their names should start with a <TT>wx</TT> prefix. Finally, the constants
+should be in all capital letters (except the first 2) to make it easier to
+distinguish them from the variables with underscores separating the words.
+
+<P>For example, file-related constants should be declared like this:
+<pre>
+enum
+{
+    wxFILEOPEN_READ,
+    wxFILEOPEN_WRITE,
+    wxFILEOPEN_READWRITE
+};
+</pre>
+
+  </OL>
+
+  <P><LI>Miscellaneous</LI><P>
+  <OL>
+    <P><LI><A NAME="forward_decl"></LI><B>Use forward declarations whenever possible</B><P>
+It's really a trivial piece of advice, but remember that using forward declarations
+instead of including the header of corresponding class is better because not
+only does it minimize the compile time, it also simplifies the dependencies
+between different source files.
+<P>On a related subject, in general, you should try not to include other
+headers from a header file.
+
+    <P><LI><A NAME="debug_macros"></LI><B>Use debugging macros</B><P>
+wxWindows provides the debugging macros <TT>wxASSERT, wxFAIL</TT> and
+<TT>wxCHECK_RET</TT> in <TT><wx/wx.h></TT> file. Please use them as often as
+you can - they will never do you any harm but can greatly simplify the bug
+tracking both for you and for others.
+<P>Also, please use <TT>wxFAIL_MSG("not implemented")</TT> instead of writing
+stubs for not (yet) implemented functions which silently return incorrect
+values - otherwise, a person using a not implemented function has no idea that
+it is, in fact, not implemented.
+<P>As all debugging macros only do something useful if the symbol
+<TT>__WXDEBUG__</TT> is defined, you should compile your programs in debug mode to profit
+from them.
+  </OL>
+</UL>
+
+<P>
+
+<HR>
+Please send any comments to <A HREF=mailto:zeitlin@dptmaths.ens-cachan.fr>Vadim Zeitlin</A>.
+
+</font>
+
+</BODY>
+</HTML>
--- a/docs/html/wxbook.htm
+++ b/docs/html/wxbook.htm
@@ -0,0 +1,168 @@
+<HTML>
+
+<HEAD>
+<TITLE>wxWindows Book</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows Book
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+<center>
+<a href="#about">About</a> |
+<a href="#participants">Participants</a> |
+<a href="#publication">Publication</a> |
+<a href="#suggestions">Suggestions</a> |
+<a href="#format">Format</a> |
+<a href="#contents">Contents</a>
+</center>
+
+<hr>
+
+<H3><a name="about">About the wxWindows book</a></H3>
+
+Discussions have been taking place on the wxwin-developers list about
+collaboratively writing a wxWindows book. The concensus is to write a tutorial
+book for people with reasonable C++ experience, with the possibility of including the API reference either in a very compact
+form at the back of the book, or as a separate volume. The book would almost certainly
+contain a CD-ROM with wxWindows and its documentation. It would probably be available
+for free on-line, publisher permitting.<P>
+
+Goals for the book:<P>
+
+<ol>
+<li> to allow users to become accomplished wxWindows developers rapidly;
+<li> to be useful over a longer period than just the first few weeks, since
+there are a lot of complex areas to address and not all features will be
+used up-front in a project;
+<li> to promote wxWindows to a wider audience;
+<li> to make at least some money for the authors.
+</ol>
+
+<P>
+
+Audience: beginners + experienced wxWindows users, but with reasonable C++
+knowledge.<P>
+
+It is suggested that any financial return from the book be allocated on a points system,
+with a predefined number of points for chapters, indexing, editing, proof-reading etc.<P>
+
+<hr>
+
+<H3><a name="participants">Participants</a></H3>
+
+So far, the following people are interested in taking part in this project:<P>
+
+<ul>
+<li><a href="mailto:tomr@scitechsoft.com">Tom Ryan</a>, SciTech Software.
+<li><a href="mailto:robin@alldunn.com">Robin Dunn</a>. <i>Chapter on wxPython.</i>
+<li><a href="mailto:mheck@www.surveyorcorp.com">Matt Heck</a>, SurveyorCorp Inc.
+<i>
+<ol>
+  <li>a case study of how and why we've used wxWindows at Surveyor Corp., and
+  how it's worked out so far;
+  <li>an appendix something similar about how to use wxLIVID for video capture and display;
+  <li>proofreading
+</ol>
+</i>
+<li><a href="mailto:julian.smart@ukonline.co.uk">Julian Smart</a>.
+<li><a href="mailto:zeitlin@dptmaths.ens-cachan.fr">Vadim Zeitlin</a>.
+<li><a href="mailto:slavik2@czn.cz">Vaclav Slavik</a>. <i>wxHTML section</i>
+<li><a href="mailto:csomor@advancedconcepts.ch">Stefan Csomor</a>. <i>the sequence of events i.e. which action provokes which event sequence,
+this is implicit for the use on MSW, but very important for other systems; and porting to new platforms</i>
+<li><a href="mailto:karsten@phy.hw.ac.uk">Karsten Ballueder</a>. <i>short tutorials on some useful
+GNU tools, like autoconf/configure/make, programming
+strategies, etc.</i>
+</ul>
+
+<hr>
+
+<H3><a name="publication">Publication</a></H3>
+
+Tom Ryan originally wrote:<P>
+
+<PRE>
+Hi Guys,
+
+I just wanted to let you know that I have spoken with officials here 
+at California State University, Chico and they are potentially 
+interested in publishing a book on wxWindows!  A wxWindows 
+book would give wxWindows a great deal of exposure.
+
+These discussions came out of the fact that CSUC wanted to 
+switch from MFC to wxWindows in their GUI programming classes, 
+but there was not a book available for students to work with. 
+
+I was thinking that the first edition could be primarily the reference 
+documentation combined with a basic wxTutorial and examples. In 
+this case, it would be fairly straightforward to get something out 
+initially and then we could take it from there.
+</PRE>
+
+<p>
+
+<a href="mailto:benles@powernet.net">Ben Allfree</a> has also expressed an interest
+in publishing a wxWindows book, and distributing it via Amazon. Ben was thinking
+in terms of a quickie job using the existing reference manual.<P>
+
+Another publishing name to think of is O'Reilly. They would probably give us a lot
+of guidance for style, formatting, etc.<P>
+
+<a href="mailto:Roald.Ribe@winlink.no">Roald Ribe</a> writes:
+"<a href="http://www.bruceeckel.com/javabook.html" target=_new>Thinking in Java</a>
+is published both as a PDF for internet (by the author) and in print by Prentice Hall."<P>
+
+<hr>
+
+<H3><a name="suggestions">Suggestions and comments</a></H3>
+
+<ul>
+<li>Chapter on converting from MFC. (Julian Smart)
+<li>A chapter on why some inconsistencies are almost always going to show up in a
+multiplatform toolkit, how to avoid them, how to deal with when you have
+no choice, and (if wxBook explains the internals or philosophy of
+wxWindows at all) how wxWindows attempts to minimize the number we
+encounter. (Matt Heck)
+<li>Creating the shortest possible path to writing "Hello World" from scratch in wxWindows. (Matt Heck)
+<li>How will royalties for subsequent editions be shared out? (Tom Ryan)
+<li>"My personal feeling is that this project will wind up being developed 
+by a small team, led by an editor that will wind up doing about half 
+of the total amount of work." (Tom Ryan)
+</ul>
+
+<hr>
+
+<H3><a name="format">Text format</a></H3>
+
+This depends partly on the publisher, but one possibility is to target Word but have
+submissions in a number of formats including Latex. We should eventually write a style
+and formatting guide.<P>
+
+<hr>
+
+<H3><a name="contents">Contents</a></H3>
+
+This is open to suggestion.<P>
+
+Last year, <a href="mailto:mlorenz@visionx.com">Mike Lorenz</a> of <a href="http://www.visionx.com">VisionX</a>
+suggested this
+<a href="http://www.visionx.com/wx/tutorial_outline.htm">tutorial outline</a>, which could
+be a good starting point.<P>
+
+</font>
+
+</BODY>
+
+</HTML>
--- a/docs/index.htm
+++ b/docs/index.htm
@@ -0,0 +1,37 @@
+<HTML>
+
+<HEAD>
+<TITLE>Welcome to wxWindows 2</TITLE>
+
+</HEAD>
+
+<BODY BGCOLOR="#FFFFFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<a name="top"></a>
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+Welcome to wxWindows 2
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+Welcome to wxWindows 2, the premiere cross-platform GUI C++ framework.<P>
+
+Please click on <a href="html/index.htm">docs/html/index.htm</a> to view the main document index.<P>
+
+Have fun!<P>
+
+</font>
+
+</BODY>
+
+</HTML>
+
--- a/docs/latex/porting/porting.hpj
+++ b/docs/latex/porting/porting.hpj
@@ -1,5 +1,4 @@
 [OPTIONS]
-BMROOT=d:\wx2\wxwind~1\docs\latex\porting ; Assume that bitmaps are where the source is
 TITLE=wxWindows Porting Guide
 CONTENTS=Contents
 COMPRESS=HIGH
--- a/docs/latex/porting/porting.tex
+++ b/docs/latex/porting/porting.tex
@@ -14,7 +14,7 @@
 \parindent=0pt
 \title{Guide to porting applications from wxWindows 1.xx to 2.0}
 \author{Julian Smart}
-\date{October 1997}
+\date{March 1999}
 \makeindex
 \begin{document}
 \maketitle
@@ -40,13 +40,10 @@ how you can modify your application to be 2.0-compliant.
 You may be worrying that porting to 2.0 will be a lot of work,
 particularly if you have only recently started using 1.xx. In fact,
 the wxWindows 2.0 API has far more in common with 1.xx than it has differences.
-With backward compatibility mode on, much of the conversion can be
-done gradually. The main challenges are doing without the default
+The main challenges are using the new event system, doing without the default
 panel item layout, and the lack of automatic labels in some controls.
-However, if you already use resource files (.wxr), or application-specific positioning,
-or constraints, then even this will be quite painless.

-So please don't be freaked out by the jump to 2.0! For one thing, 1.xx is still available
+Please don't be freaked out by the jump to 2.0! For one thing, 1.xx is still available
 and will be supported by the user community for some time. And when you have
 changed to 2.0, we hope that you will appreciate the benefits in terms
 of greater flexibility, better user interface aesthetics, improved C++ conformance,
@@ -100,7 +97,7 @@ void MyFrame::OnOK(wxCommandEvent& event)

 You may find that writing the extra code to call a member function isn't worth it at this stage,
 but the option is there.
-\item {\bf Use wxString wherever possible.} 2.0 will replace char * with wxString
+\item {\bf Use wxString wherever possible.} 2.0 replaces char * with wxString
 in most cases, and if you use wxString to receive strings returned from
 wxWindows functions (except when you need to save the pointer if deallocation is required), there should
 be no conversion problems later on.
@@ -112,7 +109,7 @@ Windows and X under wxWindows 1.66. Yes, this is not easy... but I think it's be
 standards of each platform, and currently the size difference makes it difficult to
 conform to Windows UI standards. You may eventually wish to build in a global 'fudge-factor' to compensate
 for size differences. The old font sizing will still be available via wx\_setup.h, so do not panic...
-\item {\bf Consider dropping wxForm usage}: an alternative is to be found in utils/wxprop.
+\item {\bf Consider dropping wxForm usage}:
 wxPropertyFormView can be used in a wxForm-like way, except that you specify a pre-constructed panel
 or dialog; or you can use a wxPropertyListView to show attributes in a scrolling list - you don't even need
 to lay panel items out.
@@ -180,7 +177,8 @@ See \helpref{Device contexts and painting}{dc}.
 These objects - instances of classes such as wxPen, wxBrush, wxBitmap (but not wxColour) -
 are now implemented with reference-counting. This makes assignment a very cheap operation,
 and also means that management of the resource is largely automatic. You now pass {\it references} to
-objects to functions such as wxDC::SetPen. The device context does not store a copy of the pen
+objects to functions such as wxDC::SetPen, not pointers, so you will need to derefence your pointers.
+The device context does not store a copy of the pen
 itself, but takes a copy of it (via reference counting), and the object's data gets freed up
 when the reference count goes to zero. The application does not have to worry so much about
 who the object belongs to: it can pass the reference, then destroy the object without
@@ -191,11 +189,8 @@ pointers to GDI objects, and using the FindOrCreate... functions. However, it is
 keep this explicit management to a minimum, instead creating objects on the fly as needed, on the stack,
 unless this causes too much of an overhead in your application.

-At a minimum, you will have to make sure that calls to SetPen, SetBrush etc. work. Some compilers
-will do the conversion from pointer to reference automatically (via a constructor in the GDI
-class) but you cannot rely on this being true for all compilers. Also, where you pass NULL to these
-functions, you will need to either cast to the appropriate reference type, or instead
-use an identifier such as wxNullPen or wxNullBrush.
+At a minimum, you will have to make sure that calls to SetPen, SetBrush etc. work. Also, where you pass NULL to these
+functions, you will need to use an identifier such as wxNullPen or wxNullBrush.

 \chapter{Dialogs and controls}\label{dialogscontrols}

@@ -213,8 +208,7 @@ properties.

 All window constructors have two main changes, apart from the label issue mentioned above.
 Windows now have integer identifiers; and position and size are now passed as wxPoint and
-wxSize objects. In addition, some windows have a wxValidator argument. wxWindows 2.0 may provide
-old-style constructors in WXWIN\_COMPATIBILITY mode for limited backward compatibility.
+wxSize objects. In addition, some windows have a wxValidator argument.

 \wxheading{Show versus ShowModal}

@@ -253,7 +247,7 @@ wxGroupBox is renamed wxStaticBox.

 \wxheading{wxForm}

-Note that wxForm is no longer supported in wxWindows 2.0. Consider using the wxPropertyForm class
+Note that wxForm is no longer supported in wxWindows 2.0. Consider using the wxPropertyFormView class
 instead, which takes standard dialogs and panels and associates controls with property objects.
 You may also find that the new validation method, combined with dialog resources, is easier
 and more flexible than using wxForm.
@@ -278,6 +272,8 @@ If you used device context functions with wxPoint or wxIntPoint before, please n
 that wxPoint now contains integer members, and there is a new class wxRealPoint. wxIntPoint
 no longer exists.

+wxMetaFile and wxMetaFileDC have been renamed to wxMetafile and wxMetafileDC.
+
 \chapter{Miscellaneous}

 \section{Strings}
@@ -325,66 +321,178 @@ Try to use the {\bf const} keyword in your own code where possible.
 \chapter{Backward compatibility}\label{compat}

 Some wxWindows 1.xx functionality has been left to ease the transition to 2.0. This functionality
-(usually) only works if you compile with WXWIN\_COMPATIBILITY set to 1.
+(usually) only works if you compile with WXWIN\_COMPATIBILITY set to 1 in setup.h.

-TODO
-
-OnMenuCommand, OnSize, OnActivate, OnPaint, others?? can all be prefixed with Old (e.g. OldOnMenuCommand)
-and will work as before. You are encouraged to convert your code to the new forms, but
-this will allow you to get your applications up and running a little more quickly.
-
-OnClose can be used as-is without an 'Old' prefix, but officially the OnCloseWindow event table handler should be
-used instead.
+Mostly this defines old names to be the new names (e.g. wxRectangle is defined to be wxRect).

 \chapter{Quick reference}\label{quickreference}

 This section allows you to quickly find features that
 need to be converted.

-TODO
+\section{Include files}
+
+Use the form:
+
+\begin{verbatim}
+#include <wx/wx.h>
+#include <wx/button.h>
+\end{verbatim}
+
+For precompiled header support, use this form:
+
+\begin{verbatim}
+// For compilers that support precompilation, includes "wx.h".
+#include <wx/wxprec.h>
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// Any files you want to include if not precompiling by including
+// the whole of <wx/wx.h>
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include <wx/setup.h>
+    #include <wx/bitmap.h>
+    #include <wx/brush.h>
+#endif
+
+// Any files you want to include regardless of precompiled headers
+#include <wx/toolbar.h>
+\end{verbatim}
+
+\section{IPC classes}
+
+These are now separated out into wxDDEServer/Client/Connection (Windows only) and wxTCPServer/Client/Connection
+(Windows and Unix). Take care to use wxString for your overridden function arguments, instead of char*, as per
+the documentation.
+
+\section{MDI style frames}
+
+MDI is now implemented as a family of separate classes, so you can't switch to MDI just by
+using a different frame style. Please see the documentation for the MDI frame classes, and the MDI
+sample may be helpful too.

 \section{OnActivate}

-Rename to OldOnActivate, or replace arguments with one wxActivateEvent\& argument.
+Replace the arguments with one wxActivateEvent\& argument, make sure the function isn't virtual,
+and add an EVT\_ACTIVATE event table entry.

-\wxheading{See also}
+\section{OnChar}

-\helpref{Backward compatibility}{compat}
+This is now a non-virtual function, with the same wxKeyEvent\& argument as before.
+Add an EVT\_CHAR macro to the event table
+for your window, and the implementation of your function will need very few changes.

 \section{OnClose}

-This can either remain the same as before, or you can add an OnCloseWindow event
-handler using an EVT\_CLOSE event table entry.
+The old virtual function OnClose is now obsolete.
+Add an OnCloseWindow event handler using an EVT\_CLOSE event table entry. For details
+about window destruction, see the Windows Deletion Overview in the manual. This is a subtle
+topic so please read it very carefully. Basically, OnCloseWindow is now responsible for
+destroying a window with Destroy(), but the default implementation (for example for wxDialog) may not
+destroy the window, so to be sure, always provide this event handler so it's obvious what's going on.

-\wxheading{See also}
+\section{OnEvent}

-\helpref{Backward compatibility}{compat}
+This is now a non-virtual function, with the same wxMouseEvent\& argument as before. However
+you may wish to rename it OnMouseEvent. Add an EVT\_MOUSE\_EVENTS macro to the event table
+for your window, and the implementation of your function will need very few changes.
+However, if you wish to intercept different events using different functions, you can
+specify specific events in your event table, such as EVT\_LEFT\_DOWN.
+
+Your OnEvent function is likely to have references to GetDC(), so make sure you create
+a wxClientDC instead. See \helpref{Device contexts}{dc}.
+
+If you are using a wxScrolledWindow (formerly wxCanvas), you should call
+PrepareDC(dc) to set the correct translation for the current scroll position.

 \section{OnMenuCommand}

-Rename to OldOnMenuCommand, or replace with a series of functions, one for
-each case of your old switch statement. Create an event table for your frame
-containing EVT\_MENU macros, and insert DECLARE\_EVENT\_TABLE() in your frame class.
+You need to replace this virtual function with a series of non-virtual functions, one for
+each case of your old switch statement. Each function takes a wxCommandEvent\& argument.
+Create an event table for your frame
+containing EVT\_MENU macros, and insert DECLARE\_EVENT\_TABLE() in your frame class, as
+per the samples.

-\wxheading{See also}
+\section{OnPaint}

-\helpref{Backward compatibility}{compat}
+This is now a non-virtual function, with a wxPaintEvent\& argument.
+Add an EVT\_PAINT macro to the event table
+for your window.
+
+Your function {\it must} create a wxPaintDC object, instead of using GetDC to
+obtain the device context.
+
+If you are using a wxScrolledWindow (formerly wxCanvas), you should call
+PrepareDC(dc) to set the correct translation for the current scroll position.

 \section{OnSize}

-Rename to OldOnSize, or replace arguments with one wxSizeEvent\& argument.
+Replace the arguments with one wxSizeEvent\& argument, make it non-virtual, and add to your
+event table using EVT\_SIZE.

-\wxheading{See also}
+\section{wxApp definition}

-\helpref{Backward compatibility}{compat}
+The definition of OnInit has changed. Return a bool value, not a wxFrame.
+
+Also, do {\it not} declare a global application object. Instead, use the macros
+DECLARE\_APP and IMPLEMENT\_APP as per the samples. Remove any occurrences of IMPLEMENT\_WXWIN\_MAIN:
+this is subsumed in IMPLEMENT\_APP.
+
+\section{wxButton}
+
+For bitmap buttons, use wxBitmapButton.
+
+\section{wxCanvas}
+
+Change the name to wxScrolledWindow.
+
+\section{wxDialogBox}
+
+Change the name to wxDialog, and for modal dialogs, use ShowModal instead of Show.

 \section{wxDialog::Show}

-If you used {\bf Show} to show a modal dialog, or to override the standard
+If you used {\bf Show} to show a modal dialog or to override the standard
 modal dialog {\bf Show}, use {\bf ShowModal} instead.

 \wxheading{See also}

 \helpref{Dialogs and controls}{dialogscontrols}

+\section{wxForm}
+
+Sorry, this class is no longer available. Try using the wxPropertyListView or wxPropertyFormView class
+instead, or use .wxr files and validators.
+
+\section{wxPoint}
+
+The old wxPoint is called wxRealPoint, and wxPoint now uses integers.
+
+\section{wxRectangle}
+
+This is now called wxRect.
+
+\section{wxScrollBar}
+
+The function names have changed for this class: please refer to the documentation for wxScrollBar. Instead
+of setting properties individually, you will call SetScrollbar with several parameters.
+
+\section{wxText, wxMultiText, wxTextWindow}
+
+Change all these to wxTextCtrl. Add the window style wxTE\_MULTILINE if you
+wish to have a multi-line text control.
+
+\section{wxToolBar}
+
+This name is an alias for the most popular form of toolbar for your platform. There is now a family
+of toolbar classes, with for example wxToolBar95, wxToolBarMSW and wxToolBarSimple classes existing
+under Windows 95.
+
+Toolbar management is supported by frames, so calling wxFrame::CreateToolBar and adding tools is usually
+enough, and the SDI or MDI frame will manage the positioning for you. The client area of the frame is the space
+left over when the menu bar, toolbar and status bar have been taken into account.
+
 \end{document}
--- a/docs/latex/porting/tex2rtf.ini
+++ b/docs/latex/porting/tex2rtf.ini
@@ -11,7 +11,7 @@ headerRule = yes
 footerRule = yes
 useHeadingStyles = yes
 listItemIndent=40
-generateHPJ = yes
+generateHPJ = no
 htmlBrowseButtons = bitmap
 winHelpContents = yes
 winHelpVersion = 3 ; 3 for Windows 3.x, 4 for Windows 95
--- a/docs/latex/proplist/back.gif
+++ b/docs/latex/proplist/back.gif
--- a/docs/latex/proplist/body.tex
+++ b/docs/latex/proplist/body.tex
@@ -97,10 +97,10 @@ $$\image{8cm;0cm}{prop2.eps}$$
 The property class library comprises the following files:

 \begin{itemize}\itemsep=0pt
-\item wx\_prop.h: base property class header
-\item wx\_plist.h: wxPropertyListView and associated classes
-\item wx\_pform.h: wxPropertyListView and associated classes
-\item wx\_prop.cc: base property class implementation
-\item wx\_plist.cc: wxPropertyListView and associated class implementions
-\item wx\_pform.cc: wxPropertyFormView and associated class implementions
+\item prop.h: base property class header
+\item proplist.h: wxPropertyListView and associated classes
+\item propform.h: wxPropertyListView and associated classes
+\item prop.cpp: base property class implementation
+\item proplist.cpp: wxPropertyListView and associated class implementions
+\item propform.cpp: wxPropertyFormView and associated class implementions
 \end{itemize}
--- a/docs/latex/proplist/books.bmp
+++ b/docs/latex/proplist/books.bmp
--- a/docs/latex/proplist/books.gif
+++ b/docs/latex/proplist/books.gif
--- a/docs/latex/proplist/bullet.bmp
+++ b/docs/latex/proplist/bullet.bmp
--- a/Show More
+++ b/Show More