This commit was manufactured by cvs2svn to create tag

'BC5_SNAPSHOT_LATEST'. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/BC5_SNAPSHOT_LATEST@2596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-05-30 05:49:49 +00:00
2638 changed files with 137877 additions and 399887 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,7 +3,6 @@ bin
 .gdb_history
 Test
 config.cache
-configarg.cache
 config.status
 system.list
 linux.system.cache
@@ -18,18 +17,7 @@ linux-gnu.system.cache
 *.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
@@ -1,242 +0,0 @@
------------------------------------------------------------------------
-                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/175
+++ b/175
@@ -0,0 +1,175 @@
+# Top-level Makefile for wxGTK by Wolfram Gloger
+# based on the version for wx-Xt by Martin Sperl
+
+SHELL=/bin/sh
+
+DIRS=src
+
+#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
+
+install::
+	@echo "entering directory src for installing"
+	@cd src; ${MAKE} install
+#	@echo "entering directory utils for installing"
+#	@cd utils; ${MAKE} install
+	
+# the following ones recreate all Makefiles.
+
+makefiles:: recreate
+Makefiles:: recreate
+recreate::
+	@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
@@ -1,116 +0,0 @@
-*** \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/autogen.sh
+++ b/autogen.sh
@@ -1,2 +0,0 @@
-#!/bin/sh
-autoconf
--- a/config.guess
+++ b/config.guess
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 93, 94, 95, 1996 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
@@ -51,55 +51,15 @@ 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]]`
+    alpha:OSF1:[VX]*:*)
+	# After 1.2, OSF1 uses "V1.3" for uname -r.
+	# After 4.x, OSF1 uses "X4.x" for uname -r.
+	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VX]//'`
 	exit 0 ;;
+    alpha:OSF1:*:*)
+	# 1.2 uses "1.2" for uname -r.
+	echo alpha-dec-osf${UNAME_RELEASE}
+        exit 0 ;;
    21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
@@ -109,58 +69,21 @@ EOF
    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.
+    Pyramid*:OSx*:*:*)
 	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.*:*)
+    sun4*: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/[^.]*//'`
+	echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
    sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -180,84 +103,25 @@ EOF
    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}
+    mips:*:4*:UMIPS)
+	echo mips-mips-riscos4sysv
 	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
+    mips:*:5*:RISCos)
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
    Night_Hawk:Power_UNIX:*:*)
@@ -274,8 +138,8 @@ EOF
 	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
+        UNAME_PROCESSOR=`uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
 	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
 	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
 		echo m88k-dg-dgux${UNAME_RELEASE}
@@ -301,10 +165,10 @@ EOF
    *: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.
+   ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
+    i[34]86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
    *:AIX:2:3)
@@ -330,8 +194,7 @@ EOF
 	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
+	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -350,7 +213,7 @@ EOF
 	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
+	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
@@ -364,44 +227,12 @@ EOF
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
+    9000/[3478]??: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
+	    9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;;
+	    9000/8?? )            HP_ARCH=hppa1.0 ;;
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -448,13 +279,6 @@ EOF
    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 ;;
@@ -482,36 +306,17 @@ EOF
    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}
+    CRAY*C90:*:*:*)
+	echo c90-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}
+    i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
@@ -519,150 +324,46 @@ EOF
    *: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
+	echo i386-unknown-cygwin32
 	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,/.*$,,'`
+	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
+	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
+	  echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
+	  echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
+	  echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
+	  echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
+	  echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
+	elif test "${UNAME_MACHINE}" = "alpha" ; then
+	  echo alpha-unknown-linux ; exit 0
 	else
-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
-	  # or one that does not give us useful --help.
-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	  # If ld does not provide *any* "supported emulations:"
-	  # that means it is gnuoldld.
-	  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
+	  # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
+	  # useful --help.  Gcc wants to distinguish between linuxoldld and linuxaout.
+	  test ! -d /usr/lib/ldscripts/. \
+	    && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
 	  # Determine whether the default compiler is a.out or elf
 	  cat >dummy.c <<EOF
-#include <features.h>
 main(argc, argv)
-     int argc;
-     char *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
+  printf ("%s-unknown-linux\n", argv[1]);
 #else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+  printf ("%s-unknown-linuxaout\n", argv[1]);
 #endif
  return 0;
 }
@@ -672,52 +373,32 @@ EOF
 	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*:*)
+    i[34]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.*:*)
+    i[34]86:*:4.*:* | i[34]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}
+		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
-    i?86:*:3.2:*)
+    i[34]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
+		echo ${UNAME_MACHINE}-unknown-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
+		echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-pc-sysv32
+		echo ${UNAME_MACHINE}-unknown-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
+	echo i386-unknown-mach3
 	exit 0 ;;
    paragon:*:*:*)
 	echo i860-intel-osf1
@@ -733,36 +414,28 @@ EOF
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    M680[234]0:*: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.0 | 3[34]??,*:*:4.0:3.0)
+        uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4.3 && exit 0 ;;
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+        uname -p 2>/dev/null | grep 86 >/dev/null \
          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
+    m680[234]0:LynxOS:2.[23]*:*)
+	echo m68k-lynx-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}
+    i[34]86:LynxOS:2.[23]*:*)
+	echo i386-lynx-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
+    TSUNAMI:LynxOS:2.[23]*:*)
+	echo sparc-lynx-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}
+    rs6000:LynxOS:2.[23]*:*)
+	echo rs6000-lynx-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
@@ -775,41 +448,16 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
-        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:*:*)
+    R3000:*System_V*:*:*)
 	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
@@ -853,7 +501,7 @@ main ()
 #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);
+  printf ("%s-next-nextstep%s\n", __ARCHITECTURE__,  version==2 ? "2" : "3");
  exit (0);
 #endif

@@ -870,7 +518,7 @@ main ()
 #endif

 #if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
+  printf ("i386-unknown-bsd\n"); exit (0);
 #endif

 #if defined (sequent)
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92, 93, 94, 95, 1996 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,20 +149,19 @@ 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 | 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)
+	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)
 		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[34567]86)
+	i[3456]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -171,18 +170,14 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | 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-*)
+	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-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -209,9 +204,9 @@ case $basic_machine in
 	amiga | amiga-*)
 		basic_machine=m68k-cbm
 		;;
-	amigaos | amigados)
+	amigados)
 		basic_machine=m68k-cbm
-		os=-amigaos
+		os=-amigados
 		;;
 	amigaunix | amix)
 		basic_machine=m68k-cbm
@@ -350,19 +345,19 @@ case $basic_machine in
 		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i[3456]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i[3456]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i[3456]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i[3456]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -394,14 +389,6 @@ 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/'`
 		;;
@@ -469,23 +456,25 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | nexen)
-		basic_machine=i586-pc
+	pentium | p5)
+		basic_machine=i586-intel
 		;;
-	pentiumpro | p6 | k6 | 6x86)
-		basic_machine=i686-pc
+	pentiumpro | p6)
+		basic_machine=i686-intel
 		;;
-	pentiumii | pentium2)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | nexen-*)
+	pentium-* | p5-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | k6-* | 6x86-*)
+	pentiumpro-* | p6-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i786-`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
 		;;
 	pn)
 		basic_machine=pn-gould
@@ -569,12 +558,6 @@ 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
 		;;
@@ -594,7 +577,7 @@ case $basic_machine in
 		basic_machine=vax-dec
 		os=-vms
 		;;
-	vpp*|vx|vx-*)
+       vpp*|vx|vx-*)
               basic_machine=f301-fujitsu
               ;;
 	vxworks960)
@@ -624,11 +607,7 @@ 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)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
+		basic_machine=mips-mips
 		;;
 	romp)
 		basic_machine=romp-ibm
@@ -689,12 +668,9 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
-	-svr4*)
+	-unixware* | svr4*)
 		os=-sysv4
 		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
@@ -705,8 +681,7 @@ 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* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
@@ -714,7 +689,7 @@ case $os in
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos*)
+	      | -linux-gnu* | -uxpv*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-linux*)
@@ -827,9 +802,6 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
-	*-be)
-		os=-beos
-		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -843,7 +815,7 @@ case $basic_machine in
 		os=-sysv
 		;;
 	*-cbm)
-		os=-amigaos
+		os=-amigados
 		;;
 	*-dg)
 		os=-dgux
--- a/13887
+++ b/13887
--- a/configure.in
+++ b/configure.in
--- a/distrib/gtk/README.txt
+++ b/distrib/gtk/README.txt
@@ -1,30 +1,44 @@
 wxPython README
 ---------------

-Welcome to the wonderful world of wxPython!
+Introduction
+------------
+The code in this subtree is a Python Extension Module that enables the
+use of wxWindows from the Python language.  So what is Python?  Go to
+http://www.python.org to learn more but in a nutshell, it's an
+extremly cool object oriented language.  It's easier than Perl and
+nearly as powerful.  It runs on more platforms than Java, and by some
+reports, is even faster than Java with a JIT compiler!

-Once you have installed the wxPython extension module, you can try it
-out by going to the [install dir]\wxPython\demo directory and typing:
+So why would you want to use wxPython over just C++ and wxWindows?
+Personally I prefer using Python for everything.  I only use C++ when
+I absolutly have to eek more performance out of an algorithm, and even
+then I ususally code it as an extension module and leave the majority
+of the program in Python.  Another good thing to use wxPython for is
+quick prototyping of your wxWindows apps.  With C++ you have to
+continuously go though the edit-compile-link-run cycle, which can be
+quite time comsuming.  With Python it is only an edit-run cycle.  You
+can easily build an application in a few hours with Python that would
+normally take a few days with C++.  Converting a wxPython app to a
+C++/wxWindows app should be a straight forward task.

-    python demo.py
+This extension module attempts to mirror the class heiarchy of
+wxWindows as closely as possble.  This means that there is a wxFrame
+class in wxPython that looks, smells, tastes and acts almost the same
+as the wxFrame class in the C++ version.  Unfortunatly, I wasn't able
+to match things exactly because of differences in the languages, but
+the differences should be easy to absorb because they are natural to
+Python.  For example, some methods that return mutliple values via
+argument pointers in C++ will return a tuple of values in Python.
+These differences have not been documented yet so if something isn't
+working the same as described in the wxWindows documents the best
+thing to do is to scan through the wxPython sources, especially the .i
+files, as that is where the interfaces for wxPython are defined.

-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.
+I have reports of successfully embedding wxPython within a wxWindows
+C++ app on GTK.  It hasn't yet been attempted on MSW (to my knowledge)
+so I don't know how successful such an attempt would be.  However it
+is certainly possible.



@@ -43,84 +57,6 @@ 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
@@ -153,9 +89,6 @@ 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
@@ -192,7 +125,7 @@ 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
+have added notes within the class references about where wxPython
 diverges from wxWindows.

 Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
@@ -250,6 +183,7 @@ 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...

@@ -269,8 +203,6 @@ version segfault shortly after starting up.

 3. Varioius bug fixes, enhancements, etc.

----------------------------------------------------------------------
-


 Build Instructions
@@ -286,8 +218,8 @@ 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.
+http://starship.skyport.net/crew/robind/python/#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
@@ -318,24 +250,23 @@ above.
 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/.
+http://starship.skyport.net/crew/robind/python.

-6. Change to the $(WXWIN)/utils/wxPython/demo directory.
+6. Change to the $(WXWIN)/utils/wxPython/tests directory.

-7. Try executing the demo program.  For example:
+7. Try executing the test programs.  Note that some of these print
+diagnositc or test info to standard output, so they will require the
+console version of python.  For example:

-    python demo.py
+    python test1.py

-To run it without requiring a console, you can use the pythonw.exe
+To run them 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.

@@ -364,11 +295,14 @@ module:

 5. Change to the $(WXWIN)/utils/wxPython/tests directory.

-6. Try executing the demo program.  For example:
+6. Try executing the test programs.  For example:

-    python demo.py
+    python test1.py
+
+    
+------------------------
+10/20/1998

----------------
 Robin Dunn
 robin@alldunn.com

--- a/distrib/gtk/Setup
+++ b/distrib/gtk/Setup
@@ -36,8 +36,8 @@ 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 \
+	frames.cpp stattool.cpp windows3.cpp image.cpp \
+	utils.cpp \
 	## 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 \
--- a/distrib/gtk/copy_src
+++ b/distrib/gtk/copy_src
@@ -15,21 +15,21 @@ echo Base dir..

 cd ../..
 cp wxGTK.spec ~/wxgtk_dist/wxGTK
+cp Makefile ~/wxgtk_dist/wxGTK
 cp configure ~/wxgtk_dist/wxGTK
+cp configure.in ~/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 template.mak ~/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
@@ -41,141 +41,127 @@ echo Include dir..

 mkdir ~/wxgtk_dist/wxGTK/include
 cd include
-cp Makefile.am ~/wxgtk_dist/wxGTK/include
-cp Makefile.in ~/wxgtk_dist/wxGTK/include
+cp install-sh ~/wxgtk_dist/wxGTK/include

 mkdir ~/wxgtk_dist/wxGTK/include/wx
 cd wx
+cp install-sh ~/wxgtk_dist/wxGTK/include/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 ../..
+cd ..
+cd ..
+
+echo Base lib..
+
+mkdir ~/wxgtk_dist/wxGTK/lib
+cp ./lib/dummy ~/wxgtk_dist/wxGTK/lib

 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 ../..
+
+cp ./misc/afm/*.afm ~/wxgtk_dist/wxGTK/misc/afm
+cp ./misc/gs_afm/*.afm ~/wxgtk_dist/wxGTK/misc/gs_afm
+
+echo Setup dir..
+
+cd setup
+mkdir ~/wxgtk_dist/wxGTK/setup
+cp maketmpl.in ~/wxgtk_dist/wxGTK/setup
+cp setup.hin ~/wxgtk_dist/wxGTK/setup
+cp substit.in ~/wxgtk_dist/wxGTK/setup
+
+cd general
+mkdir ~/wxgtk_dist/wxGTK/setup/general
+cp createall ~/wxgtk_dist/wxGTK/setup/general
+cp jointar ~/wxgtk_dist/wxGTK/setup/general
+cp makeapp ~/wxgtk_dist/wxGTK/setup/general
+cp makedirs ~/wxgtk_dist/wxGTK/setup/general
+cp makedoc ~/wxgtk_dist/wxGTK/setup/general
+cp mygrep ~/wxgtk_dist/wxGTK/setup/general
+cp needed ~/wxgtk_dist/wxGTK/setup/general
+cd ..
+
+cd rules
+mkdir ~/wxgtk_dist/wxGTK/setup/rules
+cp * ~/wxgtk_dist/wxGTK/setup/rules
+
+cd generic
+mkdir ~/wxgtk_dist/wxGTK/setup/rules/generic
+cp * ~/wxgtk_dist/wxGTK/setup/rules/generic
+cd ..
+
+cd ..
+
+cd shared
+mkdir ~/wxgtk_dist/wxGTK/setup/shared
+cp * ~/wxgtk_dist/wxGTK/setup/shared
+cd ..
+
+cd ..
+
+echo User dir..
+
+cd src
+mkdir ~/wxgtk_dist/wxGTK/user
+cp Makefile ~/wxgtk_dist/wxGTK/user
+cd ..

 echo Src dir..

 cd src
 mkdir ~/wxgtk_dist/wxGTK/src
-cp Makefile.am ~/wxgtk_dist/wxGTK/src
+cp Makefile ~/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 ..
+cp gtk.inc ~/wxgtk_dist/wxGTK/src

 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 y_tab.c ~/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 gtk
+mkdir ~/wxgtk_dist/wxGTK/src/gtk
+cp *.xbm ~/wxgtk_dist/wxGTK/src/gtk
+cp *.c ~/wxgtk_dist/wxGTK/src/gtk
+cp *.inc ~/wxgtk_dist/wxGTK/src/gtk
+cp *.cpp ~/wxgtk_dist/wxGTK/src/gtk
+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
@@ -199,14 +185,15 @@ cd ..
 cd jpeg
 mkdir ~/wxgtk_dist/wxGTK/src/jpeg
 cp * ~/wxgtk_dist/wxGTK/src/jpeg
-cd ../..
+cd ..
+
+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
+cp Makefile ~/wxgtk_dist/wxGTK/utils

 echo wxGLCanvas..

@@ -289,8 +276,10 @@ 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/tests
+cp ./tests/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/tests
+cp ./tests/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/tests

 mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo
 cp ./demo/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/demo
@@ -299,20 +288,37 @@ 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

+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps
+cp ./tests/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps
+cd ..
+
+echo wxOLE..
+
+cd wxOLE
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/gtk
+cp ./gtk/wxole.* ~/wxgtk_dist/wxGTK/utils/wxOLE/gtk
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/samples
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/Makefile ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/*.xpm ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/*.cpp ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/*.gnorba ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+
 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
+cp Makefile ~/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 ~/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
@@ -322,28 +328,18 @@ echo Bombs sample..

 cd bombs
 mkdir ~/wxgtk_dist/wxGTK/samples/bombs
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/bombs
+cp Makefile ~/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 ~/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
@@ -353,7 +349,7 @@ echo Config sample..

 cd config
 mkdir ~/wxgtk_dist/wxGTK/samples/config
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/config
+cp Makefile ~/wxgtk_dist/wxGTK/samples/config
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/config
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/config
 cd ..
@@ -362,7 +358,7 @@ echo Controls sample..

 cd controls
 mkdir ~/wxgtk_dist/wxGTK/samples/controls
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/controls
+cp Makefile ~/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
@@ -375,30 +371,29 @@ echo Db sample..

 cd db
 mkdir ~/wxgtk_dist/wxGTK/samples/db
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/db
+cp Makefile ~/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 DDE sample..
+
+cd dde
+mkdir ~/wxgtk_dist/wxGTK/samples/dde
+cp Makefile ~/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 ~/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
@@ -408,7 +403,7 @@ echo DnD sample..

 cd dnd
 mkdir ~/wxgtk_dist/wxGTK/samples/dnd
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dnd
+cp Makefile ~/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
@@ -418,7 +413,7 @@ echo Docview sample..

 cd docview
 mkdir ~/wxgtk_dist/wxGTK/samples/docview
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/docview
+cp Makefile ~/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
@@ -429,7 +424,7 @@ echo DocvwMDI sample..

 cd docvwmdi
 mkdir ~/wxgtk_dist/wxGTK/samples/docvwmdi
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/docvwmdi
+cp Makefile ~/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
@@ -439,7 +434,7 @@ echo Dynamic sample..

 cd dynamic
 mkdir ~/wxgtk_dist/wxGTK/samples/dynamic
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dynamic
+cp Makefile ~/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
@@ -449,7 +444,7 @@ echo Drawing sample..

 cd drawing
 mkdir ~/wxgtk_dist/wxGTK/samples/drawing
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/drawing
+cp Makefile ~/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
@@ -459,7 +454,7 @@ echo Forty sample..

 cd forty
 mkdir ~/wxgtk_dist/wxGTK/samples/forty
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/forty
+cp Makefile ~/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
@@ -471,7 +466,7 @@ echo Fractal sample..

 cd fractal
 mkdir ~/wxgtk_dist/wxGTK/samples/fractal
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/fractal
+cp Makefile ~/wxgtk_dist/wxGTK/samples/fractal
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/fractal
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/fractal
 cd ..
@@ -480,7 +475,7 @@ echo Grid sample..

 cd grid
 mkdir ~/wxgtk_dist/wxGTK/samples/grid
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/grid
+cp Makefile ~/wxgtk_dist/wxGTK/samples/grid
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/grid
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/grid
 cd ..
@@ -489,7 +484,7 @@ echo Help sample..

 cd help
 mkdir ~/wxgtk_dist/wxGTK/samples/help
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/help
+cp Makefile ~/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
@@ -498,47 +493,11 @@ 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 ~/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
@@ -550,7 +509,7 @@ echo Internat sample..

 cd internat
 mkdir ~/wxgtk_dist/wxGTK/samples/internat
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/internat
+cp Makefile ~/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
@@ -565,7 +524,7 @@ echo Layout sample..

 cd layout
 mkdir ~/wxgtk_dist/wxGTK/samples/layout
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/layout
+cp Makefile ~/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
@@ -575,7 +534,7 @@ echo Listctrl sample..

 cd listctrl
 mkdir ~/wxgtk_dist/wxGTK/samples/listctrl
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/listctrl
+cp Makefile ~/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
@@ -589,7 +548,7 @@ echo MDI sample..

 cd mdi
 mkdir ~/wxgtk_dist/wxGTK/samples/mdi
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/mdi
+cp Makefile ~/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
@@ -603,7 +562,7 @@ echo Memcheck sample..

 cd memcheck
 mkdir ~/wxgtk_dist/wxGTK/samples/memcheck
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/memcheck
+cp Makefile ~/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
@@ -613,7 +572,7 @@ echo Minifram sample..

 cd minifram
 mkdir ~/wxgtk_dist/wxGTK/samples/minifram
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/minifram
+cp Makefile ~/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
@@ -627,7 +586,7 @@ echo Notebook sample..

 cd notebook
 mkdir ~/wxgtk_dist/wxGTK/samples/notebook
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/notebook
+cp Makefile ~/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
@@ -637,7 +596,7 @@ echo PNG sample..

 cd png
 mkdir ~/wxgtk_dist/wxGTK/samples/png
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/png
+cp Makefile ~/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
@@ -648,7 +607,7 @@ echo Printing sample..

 cd printing
 mkdir ~/wxgtk_dist/wxGTK/samples/printing
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/printing
+cp Makefile ~/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
@@ -659,7 +618,7 @@ echo Proplist sample..

 cd proplist
 mkdir ~/wxgtk_dist/wxGTK/samples/proplist
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/proplist
+cp Makefile ~/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
@@ -669,7 +628,7 @@ echo Resource sample..

 cd resource
 mkdir ~/wxgtk_dist/wxGTK/samples/resource
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/resource
+cp Makefile ~/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
@@ -680,7 +639,7 @@ echo Sashtest sample..

 cd sashtest
 mkdir ~/wxgtk_dist/wxGTK/samples/sashtest
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/sashtest
+cp Makefile ~/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
@@ -690,7 +649,7 @@ echo Scroll sample..

 cd sashtest
 mkdir ~/wxgtk_dist/wxGTK/samples/scroll
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/scroll
+cp Makefile ~/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
@@ -700,25 +659,26 @@ echo Splitter sample..

 cd splitter
 mkdir ~/wxgtk_dist/wxGTK/samples/splitter
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/splitter
+cp Makefile ~/wxgtk_dist/wxGTK/samples/splitter
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/splitter
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/splitter
 cd ..

-echo Text sample..
+echo Tab 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 tab
+mkdir ~/wxgtk_dist/wxGTK/samples/tab
+cp Makefile ~/wxgtk_dist/wxGTK/samples/tab
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/tab
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/tab
+cp *.h ~/wxgtk_dist/wxGTK/samples/tab
 cd ..

 echo Thread sample..

 cd thread
 mkdir ~/wxgtk_dist/wxGTK/samples/thread
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/thread
+cp Makefile ~/wxgtk_dist/wxGTK/samples/thread
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/thread
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/thread
 cd ..
@@ -727,7 +687,7 @@ echo Toolbar sample..

 cd toolbar
 mkdir ~/wxgtk_dist/wxGTK/samples/toolbar
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/toolbar
+cp Makefile ~/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
@@ -741,7 +701,7 @@ echo TreeCtrl sample..

 cd treectrl
 mkdir ~/wxgtk_dist/wxGTK/samples/treectrl
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/treectrl
+cp Makefile ~/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
@@ -752,7 +712,7 @@ echo typetest sample..

 cd typetest
 mkdir ~/wxgtk_dist/wxGTK/samples/typetest
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/typetest
+cp Makefile ~/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
@@ -763,7 +723,7 @@ echo Validate sample..

 cd validate
 mkdir ~/wxgtk_dist/wxGTK/samples/validate
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/validate
+cp Makefile ~/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
@@ -774,7 +734,7 @@ echo wxPoem sample..

 cd wxpoem
 mkdir ~/wxgtk_dist/wxGTK/samples/wxpoem
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp Makefile ~/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
@@ -788,7 +748,7 @@ echo wxSocket sample..

 cd wxsocket
 mkdir ~/wxgtk_dist/wxGTK/samples/wxsocket
-cp Makefile.am ~/wxgtk_dist/wxGTK/samples/wxsocket
+cp Makefile ~/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
@@ -800,5 +760,5 @@ 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
@@ -1,690 +0,0 @@
-#! /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
@@ -1,2 +1,3 @@
 src/bc32.ide
+src/bc32d.ide
 samples/bc32.ide
--- a/distrib/msw/copy_src.bat
+++ b/distrib/msw/copy_src.bat
@@ -1,736 +0,0 @@
-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/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -1,37 +1,6 @@
-*.spec
-BuildCVS.txt
-acconfig.h
-*.m4
-autogen.sh
-configure
-config.guess
-config.sub
-configure.in
-setup.h.in
-install-sh
-ltconfig
-ltmain.sh
-missing
-mkinstalldirs
-modules
-template.mak
-wx-config.in
-makefile.unx.in
-wxinstall
-Makefile
-
 distrib/msw/*.rsp
 distrib/msw/*.bat
-distrib/msw/*.cpp
-distrib/msw/*.txt
 distrib/msw/tardist
-distrib/msw/tmake/*.t
-distrib/msw/tmake/Makefile
-distrib/msw/tmake/filelist.txt
-distrib/msw/tmake/makeall.bat
-distrib/msw/tmake/makeall.sh
-distrib/msw/tmake/wxwin.pro
-distrib/msw/tmake/tmake.conf
 distrib/gtk/*

 locale/*.po
@@ -49,20 +18,9 @@ docs/bugs.txt
 docs/*.htm
 docs/html/*.htm
 docs/html/*.gif
-docs/html/*.png

-src/makeenvs/*.env
-src/make.env
-src/makeprog.env
-src/makelib.env
-
-src/Makefile
 src/*.inc
 src/mkdir
-src/Makefile
-src/make.env.in
-src/makeprog.env.in
-src/makelib.env.in

 src/common/*.cpp
 src/common/dosyacc.c
@@ -70,8 +28,6 @@ src/common/doslex.c
 src/common/vmsyacc.c
 src/common/vmslex.c
 src/common/extended.c
-src/common/unzip.c
-src/common/unzip.h
 src/common/*.l
 src/common/*.y
 src/common/*.inc
@@ -80,12 +36,7 @@ src/generic/*.cpp
 src/generic/*.c
 src/generic/*.inc

-src/html/*.cpp
-src/html/*.h
-src/html/bitmaps/*.xpm
-
 src/unix/*.cpp
-src/unix/*.c

 src/png/*.c
 src/png/*.h
@@ -117,14 +68,11 @@ include/wx/protocol/*.h
 include/wx/wx_setup.vms
 include/wx/common/*.h
 include/wx/generic/*.h
-include/wx/generic/*.xpm
 include/wx/unix/*.h
-include/wx/html/*.h
-include/wx/html/msw/*.bmp
-include/wx/html/msw/*.ico
-include/wx/html/msw/*.rc
 lib/dummy

+bin/*.*
+
 tools/gettext/*.*

 bitmaps/xpm/16x16/*.*
@@ -228,20 +176,6 @@ utils/dialoged/test/*.ico
 utils/dialoged/test/*.prj
 utils/dialoged/test/*.bmp

-utils/wxMMedia2/makefile*
-utils/wxMMedia2/README
-utils/wxMMedia2/lib/*.h
-utils/wxMMedia2/lib/*.cpp
-utils/wxMMedia2/lib/*.def
-utils/wxMMedia2/lib/*.rc
-utils/wxMMedia2/lib/makefile*
-utils/wxMMedia2/sample/*.h
-utils/wxMMedia2/sample/*.cpp
-utils/wxMMedia2/sample/makefile*
-utils/wxMMedia2/sample/*.xbm
-utils/wxMMedia2/sample/*.xpm
-utils/wxMMedia2/sample/*.txt
-
 samples/*.txt
 samples/makefile*

@@ -257,18 +191,6 @@ samples/config/*.bmp
 samples/config/*.rc
 samples/config/*.wav

-samples/db/*.cpp
-samples/db/*.h
-samples/db/*.def
-samples/db/makefile*
-samples/db/*.xbm
-samples/db/*.xpm
-samples/db/*.txt
-samples/db/*.ico
-samples/db/*.bmp
-samples/db/*.rc
-samples/db/*.wav
-
 samples/dynamic/*.cpp
 samples/dynamic/*.h
 samples/dynamic/*.def
@@ -638,17 +560,6 @@ samples/grid/*.xpm
 samples/grid/*.ico
 samples/grid/*.bmp

-samples/newgrid/*.cpp
-samples/newgrid/*.h
-samples/newgrid/*.def
-samples/newgrid/*.rc
-samples/newgrid/*.txt
-samples/newgrid/makefile*
-samples/newgrid/*.xbm
-samples/newgrid/*.xpm
-samples/newgrid/*.ico
-samples/newgrid/*.bmp
-
 samples/internat/*.cpp
 samples/internat/*.h
 samples/internat/*.def
@@ -814,225 +725,3 @@ samples/drawing/*.png
 samples/drawing/*.ico
 samples/drawing/*.txt

-samples/html/makefile*
-samples/html/*.txt
-
-samples/html/about/*.cpp
-samples/html/about/*.h
-samples/html/about/makefile*
-samples/html/about/*.rc
-samples/html/about/*.def
-samples/html/about/*.bmp
-samples/html/about/*.xpm
-samples/html/about/*.xbm
-samples/html/about/*.png
-samples/html/about/*.ico
-samples/html/about/*.txt
-samples/html/about/data/*.htm
-samples/html/about/data/*.png
-
-samples/html/help/*.cpp
-samples/html/help/*.h
-samples/html/help/makefile*
-samples/html/help/*.rc
-samples/html/help/*.def
-samples/html/help/*.bmp
-samples/html/help/*.xpm
-samples/html/help/*.xbm
-samples/html/help/*.png
-samples/html/help/*.ico
-samples/html/help/*.txt
-samples/html/help/helpfiles/*.htm
-samples/html/help/helpfiles/*.hhc
-samples/html/help/helpfiles/*.hhk
-samples/html/help/helpfiles/*.hhp
-
-samples/html/printing/*.cpp
-samples/html/printing/*.h
-samples/html/printing/makefile*
-samples/html/printing/*.rc
-samples/html/printing/*.def
-samples/html/printing/*.bmp
-samples/html/printing/*.xpm
-samples/html/printing/*.xbm
-samples/html/printing/*.png
-samples/html/printing/*.ico
-samples/html/printing/*.htm
-
-samples/html/test/*.cpp
-samples/html/test/*.h
-samples/html/test/makefile*
-samples/html/test/*.rc
-samples/html/test/*.def
-samples/html/test/*.bmp
-samples/html/test/*.xpm
-samples/html/test/*.xbm
-samples/html/test/*.png
-samples/html/test/*.ico
-samples/html/test/*.htm
-samples/html/test/*.html
-
-samples/html/virtual/*.cpp
-samples/html/virtual/*.h
-samples/html/virtual/makefile*
-samples/html/virtual/*.rc
-samples/html/virtual/*.def
-samples/html/virtual/*.bmp
-samples/html/virtual/*.xpm
-samples/html/virtual/*.xbm
-samples/html/virtual/*.png
-samples/html/virtual/*.ico
-samples/html/virtual/*.htm
-samples/html/virtual/*.html
-
-samples/html/widget/*.cpp
-samples/html/widget/*.h
-samples/html/widget/makefile*
-samples/html/widget/*.rc
-samples/html/widget/*.def
-samples/html/widget/*.bmp
-samples/html/widget/*.xpm
-samples/html/widget/*.xbm
-samples/html/widget/*.png
-samples/html/widget/*.ico
-samples/html/widget/*.htm
-samples/html/widget/*.html
-
-samples/html/zip/*.cpp
-samples/html/zip/*.h
-samples/html/zip/makefile*
-samples/html/zip/*.rc
-samples/html/zip/*.def
-samples/html/zip/*.bmp
-samples/html/zip/*.xpm
-samples/html/zip/*.xbm
-samples/html/zip/*.png
-samples/html/zip/*.ico
-samples/html/zip/*.htm
-samples/html/zip/*.html
-samples/html/zip/*.zip
-
-samples/html/helpview/*.cpp
-samples/html/helpview/*.h
-samples/html/helpview/makefile*
-samples/html/helpview/*.rc
-samples/html/helpview/*.def
-samples/html/helpview/*.bmp
-samples/html/helpview/*.xpm
-samples/html/helpview/*.xbm
-samples/html/helpview/*.png
-samples/html/helpview/*.ico
-samples/html/helpview/*.htm
-samples/html/helpview/*.html
-samples/html/helpview/test.zip
-
-samples/richedit/*.cpp
-samples/richedit/*.h
-samples/richedit/makefile*
-samples/richedit/*.rc
-samples/richedit/*.def
-samples/richedit/*.bmp
-samples/richedit/*.xpm
-samples/richedit/*.xbm
-samples/richedit/*.png
-samples/richedit/*.ico
-samples/richedit/*.txt
-samples/richedit/TODO
-samples/richedit/README
-
-samples/text/*.cpp
-samples/text/*.h
-samples/text/makefile*
-samples/text/*.rc
-samples/text/*.def
-samples/text/*.bmp
-samples/text/*.xpm
-samples/text/*.xbm
-samples/text/*.png
-samples/text/*.ico
-samples/text/*.txt
-
-samples/wizard/*.cpp
-samples/wizard/*.h
-samples/wizard/makefile*
-samples/wizard/*.rc
-samples/wizard/*.def
-samples/wizard/*.bmp
-samples/wizard/*.xpm
-samples/wizard/*.xbm
-samples/wizard/*.png
-samples/wizard/*.ico
-samples/wizard/*.txt
-
-samples/console/*.cpp
-samples/console/*.h
-samples/console/makefile*
-samples/console/*.rc
-samples/console/*.def
-samples/console/*.bmp
-samples/console/*.xpm
-samples/console/*.xbm
-samples/console/*.png
-samples/console/*.ico
-samples/console/*.txt
-
-samples/font/*.cpp
-samples/font/*.h
-samples/font/makefile*
-samples/font/*.rc
-samples/font/*.def
-samples/font/*.bmp
-samples/font/*.xpm
-samples/font/*.xbm
-samples/font/*.png
-samples/font/*.ico
-samples/font/*.txt
-
-samples/nettest/*.cpp
-samples/nettest/*.h
-samples/nettest/makefile*
-samples/nettest/*.rc
-samples/nettest/*.def
-samples/nettest/*.bmp
-samples/nettest/*.xpm
-samples/nettest/*.xbm
-samples/nettest/*.png
-samples/nettest/*.ico
-samples/nettest/*.txt
-
-samples/scrollsub/*.cpp
-samples/scrollsub/*.h
-samples/scrollsub/makefile*
-samples/scrollsub/*.rc
-samples/scrollsub/*.def
-samples/scrollsub/*.bmp
-samples/scrollsub/*.xpm
-samples/scrollsub/*.xbm
-samples/scrollsub/*.png
-samples/scrollsub/*.ico
-samples/scrollsub/*.txt
-
-samples/menu/*.cpp
-samples/menu/*.h
-samples/menu/makefile*
-samples/menu/*.rc
-samples/menu/*.def
-samples/menu/*.bmp
-samples/menu/*.xpm
-samples/menu/*.xbm
-samples/menu/*.png
-samples/menu/*.ico
-samples/menu/*.txt
-
-samples/font/*.cpp
-samples/font/*.h
-samples/font/makefile*
-samples/font/*.rc
-samples/font/*.def
-samples/font/*.bmp
-samples/font/*.xpm
-samples/font/*.xbm
-samples/font/*.png
-samples/font/*.ico
-samples/font/*.txt
-
--- a/distrib/msw/glcanvas.rsp
+++ b/distrib/msw/glcanvas.rsp
@@ -1,4 +1,3 @@
-utils/glcanvas/Makefile.in
 utils/glcanvas/docs/*.*
 utils/glcanvas/win/*.cpp
 utils/glcanvas/win/*.h
--- a/distrib/msw/gtk.rsp
+++ b/distrib/msw/gtk.rsp
@@ -1,4 +1,13 @@
+install-sh
+Makefile
+template.mak
 configure
+configure.in
+config.guess
+config.sub
+wx-config.in
+mkinstalldirs
+wxGTK.spec

 distrib/gtk/copy_src
 distrib/gtk/README.txt
@@ -6,15 +15,19 @@ 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/Makefile
+src/Makefile.in
+src/gtk.inc
+src/make.env
+src/makelib.env
+src/makeprog.env
+
 src/gtk/*.cpp
 src/gtk/*.c
 src/gtk/*.inc
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -1,79 +1,91 @@
-Makefile.in
-src/Makefile
-locale/Makefile
-samples/Makefile.in
 samples/bombs/Makefile.in
-samples/caret/Makefile.in
+samples/bombs/Makefile
 samples/checklst/Makefile.in
+samples/checklst/Makefile
 samples/config/Makefile.in
+samples/config/Makefile
 samples/controls/Makefile.in
+samples/controls/Makefile
 samples/db/Makefile.in
+samples/db/Makefile
+samples/dde/Makefile.in
+samples/dde/Makefile
 samples/dialogs/Makefile.in
+samples/dialogs/Makefile
 samples/dnd/Makefile.in
+samples/dnd/Makefile
 samples/docview/Makefile.in
+samples/docview/Makefile
 samples/docvwmdi/Makefile.in
-samples/drawing/Makefile.in
+samples/docvwmdi/Makefile
 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/dynamic/Makefile
+samples/forty/Makefile.in
+samples/forty/Makefile
+samples/fractal/Makefile.in
+samples/fractal/Makefile
+samples/grid/Makefile.in
+samples/grid/Makefile
+samples/help/Makefile.in
+samples/help/Makefile
 samples/image/Makefile.in
+samples/image/Makefile
+samples/internat/Makefile.in
+samples/internat/Makefile
 samples/layout/Makefile.in
+samples/layout/Makefile
 samples/listctrl/Makefile.in
+samples/listctrl/Makefile
 samples/mdi/Makefile.in
+samples/mdi/Makefile
+samples/memcheck/Makefile.in
+samples/memcheck/Makefile
 samples/minifram/Makefile.in
+samples/minifram/Makefile
 samples/minimal/Makefile.in
+samples/minimal/Makefile
 samples/notebook/Makefile.in
+samples/notebook/Makefile
+samples/png/Makefile.in
+samples/png/Makefile
 samples/printing/Makefile.in
+samples/printing/Makefile
 samples/proplist/Makefile.in
+samples/proplist/Makefile
+samples/resource/Makefile.in
+samples/resource/Makefile
 samples/sashtest/Makefile.in
-samples/scroll/Makefile.in
+samples/sashtest/Makefile
 samples/splitter/Makefile.in
-samples/text/Makefile.in
+samples/splitter/Makefile
+samples/tab/Makefile.in
+samples/tab/Makefile
 samples/thread/Makefile.in
+samples/thread/Makefile
 samples/toolbar/Makefile.in
+samples/toolbar/Makefile
 samples/treectrl/Makefile.in
+samples/treectrl/Makefile
 samples/typetest/Makefile.in
+samples/typetest/Makefile
 samples/validate/Makefile.in
-samples/wizard/Makefile.in
+samples/validate/Makefile
 samples/wxpoem/Makefile.in
+samples/wxpoem/Makefile
 samples/wxsocket/Makefile.in
-samples/nettest/Makefile.in
-samples/scrollsub/Makefile.in
-utils/glcanvas/motif/Makefile.in
-utils/Makefile.in
-utils/wxMMedia2/Makefile.in
-utils/wxMMedia2/lib/Makefile.in
-utils/wxMMedia2/sample/Makefile.in
-include/wx/msw/Makefile.am
-include/wx/msw/ctl3d/Makefile.am
-include/wx/msw/gnuwin32/Makefile.am
-misc/Makefile.am
-misc/afm/Makefile.am
-misc/gs_afm/Makefile.am
-samples/animatn/Makefile.am
-samples/db/Makefile.am
-samples/forty/Makefile.am
-samples/fractal/Makefile.am
-samples/grid/Makefile.am
-samples/help/Makefile.am
-samples/internat/Makefile.am
-samples/joytest/Makefile.am
-samples/memcheck/Makefile.am
-samples/mfc/Makefile.am
-samples/nativdlg/Makefile.am
-samples/oleauto/Makefile.am
-samples/ownerdrw/Makefile.am
-samples/png/Makefile.am
-samples/regtest/Makefile.am
-samples/resource/Makefile.am
-samples/richedit/Makefile.am
-samples/tab/Makefile.am
-samples/taskbar/Makefile.am
-src/msw/Makefile.am
+samples/wxsocket/Makefile
+samples/scroll/Makefile.in
+samples/scroll/Makefile
+samples/caret/Makefile.in
+samples/caret/Makefile
+samples/drawing/Makefile.in
+samples/drawing/Makefile
+src/Makefile.in
+src/Makefile
+utils/ogl/samples/ogledit/Makefile.in
+utils/ogl/samples/ogledit/Makefile
+utils/ogl/samples/studio/Makefile.in
+utils/ogl/samples/studio/Makefile
+utils/ogl/src/Makefile.in
+utils/ogl/src/Makefile
+
--- a/distrib/msw/makewise.bat
+++ b/distrib/msw/makewise.bat
@@ -1,51 +0,0 @@
-@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
@@ -1,3 +1,21 @@
+install-sh
+Makefile
+template.mak
+configure
+configure.in
+config.guess
+config.sub
+wx-config.in
+mkinstalldirs
+wxinstall
+
+src/makeenvs/*.env
+src/make.env
+src/makeprog.env
+src/makelib.env
+
+src/Makefile
+src/Makefile.in
 src/motif.inc

 src/motif/*.cpp
@@ -30,8 +48,6 @@ include/wx/install-sh

 docs/motif/*.txt
 docs/motif/makewxmotif
-docs/motif2/*.txt
-docs/motif2/COPYING.LIB

 lib/dummy

--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -1,14 +1,5 @@
-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
+docs/licence.txt

 distrib/msw/*.rsp
 distrib/msw/*.bat
@@ -50,8 +41,6 @@ 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
@@ -59,9 +48,12 @@ 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

--- a/distrib/msw/ogl.rsp
+++ b/distrib/msw/ogl.rsp
@@ -1,4 +1,3 @@
-utils/ogl/Makefile.in
 utils/ogl/Makefile

 utils/ogl/src/*.cpp
--- a/distrib/msw/readme.txt
+++ b/distrib/msw/readme.txt
@@ -1,36 +0,0 @@
-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
@@ -1,106 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// 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/tmake/Makefile
+++ b/distrib/msw/tmake/Makefile
@@ -1,44 +0,0 @@
-# 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
@@ -1,347 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,318 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,295 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,76 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,903 +0,0 @@
-###############################################################################
-# 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
@@ -1,263 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,312 +0,0 @@
-#!#############################################################################
-#! 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
-
-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
-
-#OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS)
-
-ifeq ($(MINGW32),1)
-  ifeq ($(MINGW32VERSION),2.95)
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
-  else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
-  endif
-else
-  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(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
@@ -1,55 +0,0 @@
-@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
@@ -1,54 +0,0 @@
-#!/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
@@ -1,122 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,57 +0,0 @@
-#
-# $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
@@ -1,643 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,155 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,162 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,361 +0,0 @@
-#!#############################################################################
-#! 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
@@ -1,10 +0,0 @@
-###############################################################################
-# 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
@@ -3,15 +3,25 @@ user/Makefile
 user/wxConvert/*.cpp
 user/wxConvert/*.h
 user/wxConvert/Makefile
+user/wxConvert/Makefile.in

 user/wxFile/*.cpp
 user/wxFile/*.h
 user/wxFile/Makefile
+user/wxFile/Makefile.in
 user/wxFile/*.xpm

 user/wxTest/*.cpp
 user/wxTest/*.h
 user/wxTest/Makefile
+user/wxTest/Makefile.in
 user/wxTest/*.xpm
 user/wxTest/*.png

+user/wxLayout/*.cpp
+user/wxLayout/*.h
+user/wxLayout/Makefile
+user/wxLayout/Makefile.in
+user/wxLayout/*.xpm
+user/wxLayout/*.png
+
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -1,11 +1,10 @@
 src/wxvc.dsp
 src/wxvc.dsw
+src/wxvc6.dsp
+src/wxvc6.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

@@ -137,8 +136,8 @@ 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/win/GlcanvasVC.dsp
+utils/glcanvas/win/GlcanvasVC.dsw
 utils/glcanvas/samples/cube/CubeVC.dsp
 utils/glcanvas/samples/cube/CubeVC.dsw
 utils/glcanvas/samples/isosurf/IsosurfVC.dsp
--- a/distrib/msw/wisebott.txt
+++ b/distrib/msw/wisebott.txt
@@ -1,247 +0,0 @@
-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
@@ -1,21 +0,0 @@
-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
@@ -1,592 +0,0 @@
-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/wxwin01.bmp
+++ b/distrib/msw/wxwin01.bmp
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -2,62 +2,44 @@
 rem Zip up an external, generic + Windows distribution of wxWindows 2.0
 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   %src
 echo   To     %dest
-if "%wise" == "1" echo with WISE setup creation.
 echo CTRL-C if this is not correct.
 pause

-rem goto dounzip
-
-erase %dest\wx*.zip
+erase %dest\wx200*.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 -@ %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
+zip32 -@ %dest\wx200gen.zip < %src\distrib\msw\generic.rsp
+zip32 -@ %dest\wx200msw.zip < %src\distrib\msw\msw.rsp
+zip32 -@ %dest\wx200gtk.zip < %src\distrib\msw\gtk.rsp
+zip32 -@ %dest\wx200stubs.zip < %src\distrib\msw\stubs.rsp
+zip32 -@ %dest\wx200mot.zip < %src\distrib\msw\motif.rsp
+zip32 -@ %dest\wx200user.zip < %src\distrib\msw\user.rsp

-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
+zip32 -@ %dest\wx200doc.zip < %src\distrib\msw\docsrc.rsp
+zip32 -@ %dest\wx200hlp.zip < %src\distrib\msw\wx_hlp.rsp
+zip32 -@ %dest\wx200htm.zip < %src\distrib\msw\wx_html.rsp
+zip32 -@ %dest\wx200pdf.zip < %src\distrib\msw\wx_pdf.rsp
+zip32 -@ %dest\wx200wrd.zip < %src\distrib\msw\wx_word.rsp

 rem VC++ project files
-zip32 -@ %dest\wx%version%_vc.zip < %src\distrib\msw\vc.rsp
+zip32 -@ %dest\wx200vc.zip < %src\distrib\msw\vc.rsp

 rem BC++ project files
-zip32 -@ %dest\wx%version%_bc.zip < %src\distrib\msw\bc.rsp
+zip32 -@ %dest\wx200bc.zip < %src\distrib\msw\bc.rsp

 rem CodeWarrior project files
-zip32 -@ %dest\wx%version%_cw.zip < %src\distrib\msw\cw.rsp
+zip32 -@ %dest\wx200cw.zip < %src\distrib\msw\cw.rsp

 rem OGL 3
 zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
@@ -82,66 +64,14 @@ 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. 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]
+echo DOS wxWindows distribution.
+echo Usage: zipdist source destination
+echo e.g. zipdist d:\wx2\wxWindows d:\wx2\wxWindows\deliver

 :end
--- a/distrib/wine/copy_src
+++ b/distrib/wine/copy_src
@@ -1,675 +0,0 @@
-#! /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
@@ -1,44 +1,31 @@
 wxWindows Buglist
 -----------------

-Until the wxWindows bug database is up and running, please add
-entries in this style:
+wxGTK:
+------

-BUG NUMBER:
-SHORT DESCRIPTION:
-DETAILS:
-WORKAROUND:
-wxWINDOWS VERSION:
-PLATFORM(S):
-DATE IDENTIFIED:
-IDENTIFIED BY:
-DATE FIXED:
-FIXED BY:
+- It is impossible to reposition a window before showing it
+  on screen. Suspected GTK bug.
+  
+- DnD does only moderately work.

-------------------------START OF BUGLIST-------------------------
+wxMSW:
+------

-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:
+- TODO
+
+wxMotif:
+--------
+
+- If a popup wxMenu is destroyed after its parent window has been
+  destroyed, we get the message "Object XXX does not have windowed
+  ancestor".
+  Workaround: delete the menu before deleting the window on which it
+  was popped up.
+  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).

-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.
@@ -57,29 +44,11 @@ DETAILS:

 - 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-------------------------
+General:
+--------

+- 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.

--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,11 +1,6 @@
 wxWindows 2 Change Log
 ----------------------

-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
 -----------------------

--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,710 +0,0 @@
-
-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
@@ -1,132 +1,83 @@
-
-  !!! 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):
+If you compile wxWindows on Unix 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
+./configure
 make
-cd ..
+su <type root password>
+make install
+ldconfig
+exit

-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.
+configure reports, that you don't have GTK 1.X installed
+although you are certainly sure you have. Well, you have
+installed it, but you also have another version of the
+GTK installed, which you may need to removed including
+other versions of glib (and its headers).

-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.
+You get errors during compilation. The reason is that you
+probably have a broken compiler, which includes almost
+everything that is called gcc. If there is just any way
+for you to use egcs, use egcs. We are sorry, but we cannot
+fix gcc.

 * The most simple program
 -------------------------

-Now create your super-application myfoo.app and compile anywhere with
+Now create your super-application myfoo.app and compile anywhere 
+with

-gcc myfoo.cpp `wx-config --libs --cflags` -o myfoo
+g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo

 * General
 -----------------------

-The Unix variants of wxWindows use GNU configure. If you have problems with your 
-make use GNU make instead.
+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 
+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...
+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:
+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 use
+GTK 1.0.X in connection with wxWindows, but we don't support Drag'n'Drop
+for GTK 1.0.X so you have to "configure --without-dnd". wxWindows does 
+NOT work with the 1.1.X versions of the GTK+ library.

+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.
+We also mirror GTK+ 1.2.1 at my ftp site soon. 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:
+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
@@ -134,48 +85,32 @@ this, these Linux distributions have correct glibc 2 support:
 - DLD 6.0
 - SuSE 6.0
 
-You can disable thread support by running 
+You can enable thread support by running 

-./configure "--disable-threads"
+./configure "--with-threads"
+make clean
 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.
+NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE
+ALL PROGRAMS WILL CRASH UPON START-UP! Just always
+use egcs and be happy.

-* Building wxGTK on OS/2
--------------------------
+* Create your configuration
+-----------------------------

-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.
+Usage:
+	./configure options

-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).
+If you want to use system's C and C++ compiler,
+set environment variables CC and CCC as

-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
--------------------------
+	% setenv CC cc
+	% setenv CCC CC
+	% ./configure options

 Using the SGI native compilers, it is recommended that you
 also set CFLAGS and CXXFLAGS before running configure. These 
@@ -192,19 +127,6 @@ 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
@@ -226,68 +148,43 @@ 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-gtk               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.
+	--with-threads          Compile with thread support. Threads
+	                        support is also required for the
+				socket code to work.

-	--disable-shared        Do not create shared libraries.
+	--without-shared        Do not create shared libraries.

-	--enable-static         Create static libraries.
-
-	--disable-optimise	Do not optimise the code. Can
+	--without-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 
+	--with-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.
+	--with-mem_tracing      Add built-in memory tracing. 
 				
-	--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.
+	--with-dmalloc          Use the dmalloc memory debugger.
 	                        Read more at www.letters.com/dmalloc/
 				
-	--enable-debug_info	Add debug info to object files and
+	--with-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
+	--with-debug_flag	Define __DEBUG__ and __WXDEBUG__ when
 	                        compiling. This enable wxWindows' very
 				useful internal debugging tricks (such
 				as automatically reporting illegal calls)
@@ -298,9 +195,6 @@ The following options handle the kind of library you want to build.
 * 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 
@@ -311,39 +205,23 @@ are
 	
 	--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
+        --without-wxresources   Disables the use of *.wxr type
 	                        resources.
 		
-	--disable-threads       Disables threads. Will also
+	--without-threads       Disables threads. Will also
 	                        disable sockets.

-	--disable-sockets       Disables sockets.
+	--without-sockets       Disables sockets.

-	--disable-dnd           Disables Drag'n'Drop.
+	--without-dnd           Disables Drag'n'Drop.
 	
-	--disable-clipboard     Disables Clipboard.
+	--without-clipboard     Disables Clipboard.
 	
-	--disable-serial        Disables object instance serialiasation.
+	--without-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.
+	--without-streams       Disables the wxStream classes.
 	
 Apart from disabling certain features you can very often "strip"
 the program of its debugging information resulting in a significant
@@ -361,11 +239,14 @@ 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 
+386SX possibly week. 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.
+if you want to be more selective:
+
+	make    	will build only the base libraries
+	make samples	will build the samples
+	make user	will build everything in user

 Then you may install the library and it's header files under
 /usr/local/include/wx and /usr/local/lib respectively. You
@@ -373,11 +254,21 @@ 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
 	
+Depending on the configuration of some files, the libraries
+and binaries will be placed in different directories.
+The "global" binaries and libraries will be placed in:
+
+	bin/$(OSTYPE) and
+	lib/$(OSTYPE) respectively
+
+"local" binaries and libraries will be placed in:
+
+	(basedir of that application)/$(OSTYPE).
+
+This is also the place where all the object-files will go.
+(Currently there arent any global binaries).
+
 If you want to save disk space by removing unnecessary
 object-files:

@@ -388,6 +279,8 @@ in the various directories will do the work for you.
 * Creating a new Project
 --------------------------

+There are two ways to create your own project:
+
 1) The first way uses the installed libraries and header files
 automatically using wx-config

@@ -411,15 +304,181 @@ 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.
+directories of wxWindows: In this case I propose to put 
+all contributed programs in the directory "/user", with a 
+directory of its own.

----------------------
+This directory then should include the following files:
+
+Makefile        (You can copy this one from any application in samples
+                 probably you will not need to edit this one. There is
+                 only one case where you might be interested in changing
+                 this file, but about that see later.)
+Makefile.in	(This is the base application-Makefile template, from
+                 which the actual Makefile for each system is created.
+                 More about this later)
+
+put ALL your source code along with all the other stuff you need for
+your application in this directory (subdirectories are welcome).
+
+
+** Something about Makefiles
+------------------------------
+
+On general principle it should only contain ONE line, which is as follows:
+
+	include ../../setup/general/makeapp
+
+this will include all the necessary definitions for creating the applications
+
+the only case where you might want to add another line is the following:
+this version of configure also supports creation of source archives of the
+application for easy distribution and updates to newer version of wxWindows.
+    For this purpose all files in the application-directory will be put into
+a gziped tar-file in the full notation user/<your application>/*
+if you want to include some other files that you want "more visible", like
+a README.<yourApp> or a shell script for easy 
+compilation/installation/distribution, then you have to add a variable
+
+	DISTRIBUTE_ADDITIONAL=<your files>
+
+to the Makefile.
+So it would look like this:
+
+	DISTRIBUTE_ADDITIONAL=README.TheApp
+	include ../../setup/general/makeapp
+
+As we have already talked about distribution the command to create a 
+distribution is:
+
+	make distrib
+
+NOTE: If you are in the base directory of wxWindows it will create 
+distribution packages for wxWindows as well as for all packages in the
+user directory.
+    So if you want to create only packages for the files in user,
+then go to the directory other and type:
+
+	make distrib
+
+or if you only want one application to be created then
+enter the specific directory and type there:
+make distrib
+
+All the distribution files will be put in the directory
+distrib at the base of the wxWindows-tree (where also configure
+and template.mak can be found).
+
+** Something about Makefile.in
+--------------------------------
+
+As you have already seen with Makefile, configure makes a lot of use
+if the include statement in make to keep the Makefiles as simple as 
+possible.
+
+So basically there are only variables to define and then a include command.
+Exception to this rule is if you have special rules for some stuff...
+These rules should go AFTER the include statement!!!
+
+so the general header looks like this:
+
+	# wxWindows base directory
+	WXBASEDIR=@WXBASEDIR@
+	# set the OS type for compilation
+	OS=@OS@
+	# compile a library only
+	RULE=bin
+
+and the general footer will look like this:
+
+	# include the definitions now
+	include ../../../template.mak
+
+the key variable is RULE, which defines what make should create
+in this directory.
+
+here are some examples:
+
+  RULE	  description              
+  ===========================================================================
+  bin	  creates a local binary (for a global binary prefix bin with g)
+  	  additional variables needed:
+  		BIN_TARGET	this gives the name of your application
+  		BIN_OBJ		this gives the object files needed to
+  				link the application
+  	  optional variables are:
+  		BIN_SRC		this gives the list of c/c++ files for
+  				which dependencies will be checked.
+  				(This can be achieved with: make depend)
+  		BIN_LINK	this gives commands for additional
+  				libraries needed to link the application
+  ---------------------------------------------------------------------------
+  bin2	  creates two local binaries (for global binaries prefix bin2 with g)
+  	  in addition to the variables specified above you MUST also
+  	  provide the same variables with BIN2_ instead of BIN_
+  ---------------------------------------------------------------------------
+  lib	  creates a local library (for a global binary prefix bin with g)
+  	  additional variables needed:
+  		LIB_TARGET	this gives the name of your library
+  		LIB_OBJ		this gives the object files needed for
+  				the library to be build.
+  	  optional variables are:
+  		LIB_SRC		this gives the list of c/c++ files for
+  				which dependencies will be checked.
+  	  libbin and libgbin are also possible and will need in addition
+  	  the variables from bin
+  ---------------------------------------------------------------------------
+  gslib	  is similar to lib, but it creates a shared library if the system
+  	  supports it.
+  	  additional variables needed:
+  		LIB_MAJOR	major number of the shared library
+  		LIB_MINOR	minor number of the shared library
+  ---------------------------------------------------------------------------
+  other additional variables:
+
+  	  ADD_COMPILE	   define additional includes/defines that
+  			   are needed to compile the object files
+  			   (if you need to reference some directory
+  			   utils - like wxGrid -, then please 
+  			   reference them with the variables defined
+  			   in template.mak - e.g.: $(SRCDIR),$(UTILS),
+  			   $(SAMPLES),$(OTHERS))
+
+  	  NEEDED_DEFINES   lists all the defines that HAVE to be set in
+  			   /include/wx/setup.h to compile correctly.
+
+	  SRC_DIR	   lists all directories that are needed to
+			   compile. (i.e: lists all the directories,
+			   where there are source-files.) But it is 
+			   also needed to clean an object and for 
+			   machines, for which make does not support 
+			   VPATH
+
+currently there are the following compiling rules provided:
+object files are created for the following file extensions:
+.c .cc .cpp
+
+Please have a closer look at the Makefiles in this distribution.
+
+* Platforms configure is working with
+---------------------------------------
+
+Please report build succes on any machine. Especially non-
+Linux operating systems (which I don't have).
+
+Original author of the autoconf system for wxxt-1.66 and for this INSTALL
+file:
+
+	Martin Sperl	sperl@dsn.ast.univie.ac.at
+	
+Ported to wxGTK 0.1:
+
+	Wolfram Gloger  wmglo@dent.med.uni-muenchen.de
+
+Thanks alot to both of them.

 In the hope that it will be useful,

-        Robert Roebling <roebling@sun2.ruf.uni-freiburg.de>
+        Robert Roebling roebling@sun2.ruf.uni-freiburg.de
 	
 	
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,64 +1,64 @@

-   Welcome to wxWindows/Gtk 2.1.11
+  Welcome to wxWindows/Gtk 2.1 snapshot 5,

 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.
-
+the wxWindows GUI library. This is a developers release
+and is it not suited for production development. Beware
+that major changes can happen before a final release -
+Particularly the makefile system will change entirly.
+ 
 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:
+and about the wxWindows project as a whole (and the
+Windows and Motif ports in particular) can be found
+at Julian Smart'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:
+many systems (when using GTK 1.0 read the INSTALL.txt):

-./configure --with-gtk
+./configure
 make
 su <type root password>
 make install
 ldconfig
 exit

-When you run into problems, please read the INSTALL.txt and 
+Type the following to make the samples
+
+make samples
+
+To start the samples, change into the directory that
+corresponds to the sample and your system, e.g on a
+linux-gnu machine the minimal sample would get started
+from the wxWindows base dir with
+
+./samples/minimal/linux-gnu/minimal
+
+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...
+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...

 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.
+libwx_gtk2.a (static) and libwx_gtk2.so.1.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.
+bug reports or comments to the wxWindows users 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.
+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,

--- a/docs/gtk/todo.txt
+++ b/docs/gtk/todo.txt
--- a/docs/html/faqgen.htm
+++ b/docs/html/faqgen.htm
@@ -192,9 +192,6 @@ We are using the <a href="cvs.htm">CVS</a> system to develop and maintain wxWind
 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>
@@ -206,8 +203,8 @@ finished?) to think very far ahead. However, we know we want to make wxWindows a
 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 possibilities include: DCOM/CORBA compatibility; a wxWindows book; an
+<a href="http://web.ukonline.co.uk/julian.smart/wxwin/wxide.htm">IDE</a>;
 other platforms; other interface abilities such as speech output.<P>

 We will investigate the possibility of compiler or operating system vendors bundling wxWindows with
--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -166,79 +166,6 @@ 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>

--- 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
@@ -134,7 +134,7 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 </td>

 <td align=center>
-<a href="../winhelp/proplist.hlp">Property List Classes</a>
+<a href="../winhelp/proplist.hlp">Propert List Classes</a>
 </td>

 <td align=center>
@@ -185,13 +185,10 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P

 <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.
@@ -206,34 +203,19 @@ For printing-related dialogs, see the printing sample.
 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.
@@ -246,8 +228,6 @@ platforms that don't support it, a normal-sized title bar is displayed.
 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).
@@ -257,13 +237,8 @@ Excel to be present).
 <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
@@ -271,8 +246,6 @@ 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.
@@ -280,7 +253,6 @@ programming.
 <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>
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -1,292 +0,0 @@
-<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
@@ -1,90 +0,0 @@
-<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
@@ -1,205 +0,0 @@
-<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
@@ -1,882 +0,0 @@
-<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
@@ -1,168 +0,0 @@
-<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/latex/wx/accel.tex
+++ b/docs/latex/wx/accel.tex
@@ -137,10 +137,6 @@ Loads the accelerator table from a Windows resource (Windows only).

 \docparam{resource}{Name of a Windows accelerator.}

-\pythonnote{The wxPython constructor accepts a list of
-wxAcceleratorEntry objects, or 3-tuples consisting of flags, keyCode,
-and cmd values like you would construct wxAcceleratorEntry objects with.}
-
 \membersection{wxAcceleratorTable::\destruct{wxAcceleratorTable}}

 \func{}{\destruct{wxAcceleratorTable}}{\void}
--- a/docs/latex/wx/alignv.bmp
+++ b/docs/latex/wx/alignv.bmp
--- a/docs/latex/wx/alignv.gif
+++ b/docs/latex/wx/alignv.gif
--- a/docs/latex/wx/app.tex
+++ b/docs/latex/wx/app.tex
@@ -441,15 +441,3 @@ needs to use the top window.

 \helpref{wxApp::GetTopWindow}{wxappgettopwindow}, \helpref{wxApp::OnInit}{wxapponinit}

-\membersection{wxApp::GetStdIcon}\label{wxappgetstdicon}
-
-\func{virtual wxIcon}{GetStdIcon}{\param{int }{which}} const
-
-Returns the icons used by wxWindows internally, e.g. the ones used for 
-message boxes.  This function is used internally and 
-can be overridden by the user to change the default icons.
-
-\wxheading{Parameters}
-
-\docparam{which}{One of the wxICON_XXX defines and chooses which icon to return.}
-
--- a/docs/latex/wx/arrstrng.tex
+++ b/docs/latex/wx/arrstrng.tex
@@ -6,8 +6,8 @@ wxArrayString is an efficient container for storing
 are added to it (so it is as easy to use as a linked list), but the access
 time to the elements is constant, instead of being linear in number of
 elements as in the case of linked lists. It is also very size efficient and
-doesn't take more space than a C array {\it wxString[]} type (wxArrayString
-uses its knowledge of internals of wxString class to achieve this).
+doesn't take more space than a C array {\it wxString[]} type. wxArrayString
+uses its knowledge of internals of wxString class to achieve this.

 This class is used in the same way as other dynamic \helpref{arrays}{wxarray},
 except that no {\it WX\_DEFINE\_ARRAY} declaration is needed for it. When a
@@ -26,18 +26,8 @@ array elements may be modified in place like this
    array.Last().MakeUpper();
 \end{verbatim}

-There is also a varian of wxArrayString called wxSortedArrayString which has
-exactly the same methods as wxArrayString, but which always keeps the string
-in it in (alphabetical) order. wxSortedArrayString uses binary search in its 
-\helpref{Index}{wxarraystringindex} function (insteadf of linear search for
-wxArrayString::Index) which makes it much more efficient if you add strings to
-the array rarely (because, of course, you have to pay for Index() efficiency
-by having Add() be slower) but search for them often. Several methods should
-not be used with sorted array (basicly, all which break the order of items)
-which is mentioned in their description.
-
-Final word: none of the methods of wxArrayString is virtual including its
-destructor, so this class should not be used as a base class.
+Finally, none of the methods of this class is virtual including its
+destructor, so this class should not be derived from.

 \wxheading{Derived from}

@@ -64,9 +54,6 @@ functions.

 Default and copy constructors.

-Note that when an array is assigned to a sorted array, its contents is
-automatically sorted during construction.
-
 \membersection{wxArrayString::\destruct{wxArrayString}}\label{wxarraystringdtor}

 \func{}{\destruct{wxArrayString}}{}
@@ -82,7 +69,7 @@ Assignment operator.

 \membersection{wxArrayString::operator[]}\label{wxarraystringoperatorindex}

-\func{wxString\&}{operator[]}{\param{size\_t }{nIndex}}
+\func{wxString\&}{operatorp[]}{\param{size\_t }{nIndex}}

 Return the array element at position {\it nIndex}. An assert failure will
 result from an attempt to access an element beyond the end of array in debug
@@ -92,15 +79,9 @@ This is the operator version of \helpref{Item}{wxarraystringitem} method.

 \membersection{wxArrayString::Add}\label{wxarraystringadd}

-\func{size\_t}{Add}{\param{const wxString\& }{str}}
+\func{void}{Add}{\param{const wxString\& }{str}}

-Appends a new item to the array and return the index of th new item in the
-array.
-
-{\bf Warning:} For sorted arrays, the index of the inserted item will not be,
-in general, equal to \helpref{GetCount()}{wxarraystringgetcount} - 1 because
-the item is inserted at the correct position to keep the array sorted and not
-appended.
+Appends a new item to the array.

 See also: \helpref{Insert}{wxarraystringinsert}

@@ -155,10 +136,6 @@ Search the element in the array, starting from the beginning if
 {\it bFromEnd} is FALSE or from end otherwise. If {\it bCase}, comparison is
 case sensitive (default), otherwise the case is ignored.

-This function uses linear search for wxArrayString and binary search for
-wxSortedArrayString, but it ignores the {\it bCase} and {\it bFromEnd} 
-parameters in the latter case.
-
 Returns index of the first item matched or wxNOT\_FOUND if there is no match.

 \membersection{wxArrayString::Insert}\label{wxarraystringinsert}
@@ -175,10 +152,6 @@ Insert("foo", 0);
 If {\it nIndex} is equal to {\it GetCount() + 1} this function behaves as 
 \helpref{Add}{wxarraystringadd}.

-{\bf Warning:} this function should not be used with sorted array because it
-could break the order of items and, for example, subsequent calls to 
-\helpref{Index()}{wxarraystringindex} would not work then!
-
 \membersection{wxArrayString::IsEmpty}\label{wxarraystringisempty}

 \func{}{IsEmpty}{}
@@ -238,10 +211,6 @@ See also: \helpref{Alloc}{wxarraystringalloc}, \helpref{Dynamic array memory man
 Sorts the array in alphabetical order or in reverse alphabetical order if
 {\it reverseOrder} is TRUE.

-{\bf Warning:} this function should not be used with sorted array because it
-could break the order of items and, for example, subsequent calls to 
-\helpref{Index()}{wxarraystringindex} would not work then!
-
 See also: \helpref{Sort}{wxarraystringsortcallback}

 \membersection{wxArrayString::Sort (user defined)}\label{wxarraystringsortcallback}
@@ -276,9 +245,5 @@ array.Add("four");
 array.Sort(CompareStringLen);
 \end{verbatim}

-{\bf Warning:} this function should not be used with sorted array because it
-could break the order of items and, for example, subsequent calls to 
-\helpref{Index()}{wxarraystringindex} would not work then!
-
 See also: \helpref{Sort}{wxarraystringsort}

--- a/docs/latex/wx/bbutton.tex
+++ b/docs/latex/wx/bbutton.tex
@@ -54,15 +54,9 @@ when the button is clicked.}

 Default constructor.

-\func{}{wxBitmapButton}{
-\param{wxWindow* }{parent}, 
-\param{wxWindowID }{id}, 
-\param{const wxBitmap\& }{bitmap},\rtfsp
-\param{const wxPoint\& }{pos = wxDefaultPosition}, 
-\param{const wxSize\& }{size = wxDefaultSize},\rtfsp
-\param{long }{style = wxBU\_AUTODRAW}, 
-\param{const wxValidator\& }{validator = wxDefaultValidator}, 
-\param{const wxString\& }{name = ``button"}}
+\func{}{wxBitmapButton}{\param{wxWindow* }{parent}, \param{wxWindowID}{ id}, \param{const wxBitmap\& }{bitmap},\rtfsp
+\param{const wxPoint\& }{pos}, \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
+\param{long}{ style = wxBU\_AUTODRAW}, \param{const wxValidator\& }{validator}, \param{const wxString\& }{name = ``button"}}

 Constructor, creating and showing a button.

--- a/docs/latex/wx/bitmap.tex
+++ b/docs/latex/wx/bitmap.tex
@@ -43,21 +43,15 @@ Copy constructor.
 \func{}{wxBitmap}{\param{void*}{ data}, \param{int}{ type}, \param{int}{ width}, \param{int}{ height}, \param{int}{ depth = -1}}

 Creates a bitmap from the given data, which can be of arbitrary type.
-Windows only, I think.

 \func{}{wxBitmap}{\param{const char}{ bits[]}, \param{int}{ width}, \param{int}{ height}\\
  \param{int}{ depth = 1}}

 Creates a bitmap from an array of bits.

-Note that the bit depth is ignored on GTK+ and Motif. If you want to create a bitmap
-from something else than a 1-bit data array, use the \helpref{wxImage}{wximage} class.
-
 \func{}{wxBitmap}{\param{int}{ width}, \param{int}{ height}, \param{int}{ depth = -1}}

-Creates a new bitmap. A depth of -1 indicates the depth of the current screen or
-visual. Some platforms only support 1 for monochrome and -1 for the current colour
-setting.
+Creates a new bitmap.

 \func{}{wxBitmap}{\param{const char**}{ bits}}

@@ -143,8 +137,6 @@ Under X, {\it type} defaults to wxBITMAP\_TYPE\_XPM.
 \pythonnote{Constructors supported by wxPython are:\par
 \indented{2cm}{\begin{twocollist}
 \twocolitem{\bf{wxBitmap(name, flag)}}{Loads a bitmap from a file}
-\twocolitem{\bf{wxBitmapFromData(data, type, width, height, depth=1)}}{Creates
-a bitmap from the given data, which can be of arbitrary type.}
 \twocolitem{\bf{wxNoRefBitmap(name, flag)}}{This one won't own the
 reference, so Python won't call the destructor, this is good for toolbars
 and such where the parent will manage the bitmap.}
--- a/docs/latex/wx/bmpdatob.tex
+++ b/docs/latex/wx/bmpdatob.tex
@@ -1,26 +1,16 @@
 \section{\class{wxBitmapDataObject}}\label{wxbitmapdataobject}

-wxBitmapDataObject is a specialization of wxDataObject for bitmap data. It can
-be used without change to paste data into the
-\helpref{wxClipboard}{wxclipboard} or a \helpref{wxDropSource}{wxdropsource}. A
-user may wish to derive a new class from this class for providing a bitmap
-on-demand in order to minimize memory consumption when offering data in several
-formats, such as a bitmap and GIF.
+wxBitmapDataObject is a specialization of wxDataObject for bitmap data. It can be
+used without change to paste data into the \helpref{wxClipboard}{wxclipboard}
+or a \helpref{wxDropSource}{wxdropsource}. A user may wish to derive a new class
+from this class for providing a bitmap on-demand in order to minimize memory consumption
+when offering data in several formats, such as a bitmap and GIF.

-\pythonnote{If you wish to create a derived wxBitmapDataObject class in
-wxPython you should derive the class from wxPyBitmapDataObject
-in order to get Python-aware capabilities for the various virtual
-methods.}
-
-\wxheading{Virtual functions to override}
-
-This class may be used as is, but
-\helpref{GetBitmap}{wxbitmapdataobjectgetbitmap} may be overridden to increase
-efficiency.
+In order to offer bitmap data on-demand \helpref{GetSize}{wxbitmapdataobjectgetsize} 
+and \helpref{WriteData}{wxbitmapdataobjectwritedata} will have to be overridden.

 \wxheading{Derived from}

-\helpref{wxDataObjectSimple}{wxdataobjectsimple}\\
 \helpref{wxDataObject}{wxdataobject}

 \wxheading{Include files}
@@ -29,19 +19,66 @@ efficiency.

 \wxheading{See also}

-\helpref{Clipboard and drag and drop overview}{wxdndoverview},
-\helpref{wxDataObject}{wxdataobject},
-\helpref{wxDataObjectSimple}{wxdataobjectsimple},
-\helpref{wxFileDataObject}{wxfiledataobject},
-\helpref{wxTextDataObject}{wxtextdataobject},
 \helpref{wxDataObject}{wxdataobject}

-\func{}{wxBitmapDataObject}{\param{const wxBitmap\& }{bitmap = wxNullBitmap}}
+\latexignore{\rtfignore{\wxheading{Members}}}

-Constructor, optionally passing a bitmap (otherwise use
-\helpref{SetBitmap}{wxbitmapdataobjectsetbitmap} later)
+\membersection{wxBitmapDataObject::wxBitmapDataObject}\label{wxbitmapdataobjectwxbitmapdataobject}

-\membersection{wxBitmapDataObject::GetBitmap}\label{wxbitmapdataobjectgetbitmap}
+\func{}{wxBitmapDataObject}{\void}
+
+Default constructor. Call \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap} later
+or override \helpref{WriteData}{wxbitmapdataobjectwritedata} and 
+\helpref{GetSize}{wxbitmapdataobjectgetsize} for providing data on-demand.
+
+\func{}{wxBitmapDataObject}{\param{const wxBitmap\& }{bitmap}}
+
+Constructor, passing a bitmap.
+
+\membersection{wxBitmapDataObject::GetSize}\label{wxbitmapdataobjectgetsize}
+
+\constfunc{virtual size\_t}{GetSize}{\void}
+
+Returns the data size. By default, returns the size of the bitmap data
+set in the constructor or using \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap}.
+This can be overridden to provide size data on-demand. Note that you'd
+have to call the inherited GetSize method as this is the only way
+to get to know the transfer size of the bitmap in a platform dependent
+way - a bitmap has different size under GTK and Windows. In practice, 
+this would look like this:
+
+\begin{verbatim}
+size_t MyBitmapDataObject::GetSize()
+{
+  // Get bitmap from global container. This container
+  // should be able to "produce" data in all formats
+  // offered by the application but store it only in
+  // one format to reduce memory consumption.
+
+  wxBitmap my_bitmap = my_global_container->GetBitmap();
+  
+  // temporarily set bitmap
+  
+  SetBitmap( my_bitmap );
+
+  size_t ret = wxBitmapDataObject::GetSize();
+  
+  // unset bitmap again
+  
+  SetBitmap( wxNullBitmap );
+
+  retrun ret;
+}
+\end{verbatim}
+
+TODO: Offer a nicer way to do this. Maybe by providing a platform
+dependent function in this class like 
+
+\begin{verbatim}
+size_t GetBitmapSize( const wxBitmap &bitmap )
+\end{verbatim}
+
+\membersection{wxBitmapDataObject::GetBitmap}\label{wxbitmapdataobjectgettext}

 \constfunc{virtual wxBitmap}{GetBitmap}{\void}

@@ -54,7 +91,26 @@ the \helpref{wxClipboard}{wxclipboard}.

 \func{virtual void}{SetBitmap}{\param{const wxBitmap\& }{bitmap}}

-Sets the bitmap associated with the data object. This method is called when the
-data object receives data. Usually there will be no reason to override this
-function.
+Sets the bitmap associated with the data object. This method is called
+internally when retrieving data from the \helpref{wxClipboard}{wxclipboard}
+and may be used to paste data to the clipboard directly (instead of
+on-demand).
+
+\membersection{wxBitmapDataObject::WriteData}\label{wxbitmapdataobjectwritedata}
+
+\constfunc{virtual void}{WriteData}{\param{void}{*dest} }
+
+Write the data owned by this class to {\it dest}. By default, this
+calls \helpref{WriteBitmap}{wxbitmapdataobjectwritebitmap} with the bitmap
+set in the constructor or using \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap}.
+This can be overridden to provide bitmap data on-demand; in this case
+\helpref{WriteBitmap}{wxbitmapdataobjectwritebitmap} must be called from
+within th overriding WriteData() method.
+
+\membersection{wxBitmapDataObject::WriteBitmap}\label{wxbitmapdataobjectwritebitmap}
+
+\constfunc{void}{WriteBitmap}{\param{const wxBitmap\& }{bitmap}\param{void}{*dest} }
+
+Writes the the bitmap {\it bitmap} to {\it dest}. This method must be called
+from \helpref{WriteData}{wxbitmapdataobjectwritedata}.

--- a/docs/latex/wx/body.tex
+++ b/docs/latex/wx/body.tex
@@ -8,14 +8,13 @@
 wxWindows is a C++ framework providing GUI (Graphical User
 Interface) and other facilities on more than one platform.  Version 2.0 currently
 supports MS Windows (16-bit, Windows 95 and Windows NT), Unix with GTK+, and Unix with Motif.
-A Mac port is in an advanced state, an OS/2 port and a port to the MGL graphics library
-have been started.
+A Mac port is in an advanced state.

 wxWindows was originally developed at the Artificial Intelligence
 Applications Institute, University of Edinburgh, for internal use.
 wxWindows has been released into the public domain in the hope
 that others will also find it useful. Version 2.0 is written and
-maintained by Julian Smart, Robert Roebling, Vadim Zeitlin and others.
+maintained by Julian Smart, Robert Roebling and others.

 This manual discusses wxWindows in the context of multi-platform
 development.\helpignore{For more detail on the wxWindows version 2.0 API
@@ -183,29 +182,21 @@ Metrowerks CodeWarrior.
 (b) Unix:

 \begin{enumerate}\itemsep=0pt
-\item Almost any C++ compiler, including GNU C++ (EGCS 1.1.1 or above).
-\item Almost any Unix workstation, and one of: GTK+ 1.0, GTK+ 1.2, Motif 1.2 or higher, Lesstif.
+\item Almost any C++ compiler, including GNU C++.
+\item Almost any Unix workstation, and one of: GTK+ 1.0, Motif 1.2 or higher, Lesstif.
 \item At least 60 MB of disk space.
 \end{enumerate}

 \section{Availability and location of wxWindows}

-wxWindows is available by anonymous FTP and World Wide Web:
+wxWindows is currently available from the Artificial Intelligence
+Applications Institute by anonymous FTP and World Wide Web:

 \begin{verbatim}
  ftp://www.remstar.com/pub/wxwin
  http://www.wxwindows.org
 \end{verbatim}

-You can also buy a CD-ROM using the form on the Web site, or by contacting:
-
-Julian Smart\\
-12 North Street West\\
-Uppingham\\
-Rutland\\
-LE15 9SG\\
-julian.smart@ukonline.co.uk
-
 \section{Acknowledgments}

 Thanks are due to AIAI for being willing to release the original version of
@@ -220,7 +211,7 @@ Dunn, Hermann Dunkel, Jos van Eijndhoven, Tom Felici, Thomas Fettig, Matthew Fla
 Wolfram Gloger, Norbert Grotz, Stefan Gunter, Bill Hale, Patrick Halke, Stefan Hammes, Guillaume Helle, Harco de Hilster, Cord Hockemeyer, Markus 
 Holzem, Olaf Klein, Leif Jensen, Bart Jourquin, Guilhem Lavaux, Jan Lessner, Nicholas Liebmann, Torsten Liermann, Per Lindqvist, Thomas Runge, Tatu
 M\"{a}nnist\"{o}, Scott Maxwell, Thomas Myers, Oliver Niedung, Hernan Otero, Ian Perrigo, Timothy Peters, Giordano Pezzoli, Harri Pasanen, Thomaso Paoletti, 
-Garrett Potts, Marcel Rasche, Robert Roebling, Dino Scaringella, Jobst Schmalenbach, Arthur Seaton, Paul Shirley, Vaclav Slavik, Stein Somers, Petr Smilauer, Neil Smith, 
+Garrett Potts, Marcel Rasche, Robert Roebling, Dino Scaringella, Jobst Schmalenbach, Arthur Seaton, Paul Shirley, Stein Somers, Petr Smilauer, Neil Smith, 
 Kari Syst\"{a}, Arthur Tetzlaff-Deas, Jonathan Tonberg, Jyrki Tuomi, Janos Vegh, Andrea Venturoli, Vadim Zeitlin, Xiaokun Zhu, Edward Zimmermann.

 `Graphplace', the basis for the wxGraphLayout library, is copyright Dr. Jos
@@ -365,7 +356,7 @@ STACKSIZE    8192
 The only lines which will usually have to be changed per application are
 NAME and DESCRIPTION.

-\section{Allocating and deleting wxWindows objects}
+\subsection{Allocating and deleting wxWindows objects}

 In general, classes derived from wxWindow must dynamically allocated
 with {\it new} and deleted with {\it delete}. If you delete a window,
@@ -395,26 +386,6 @@ make calls like wxDC::SetPen(wxNullPen) or wxDC::SelectObject(wxNullBitmap) befo
 a drawing object that may be in use. Code that doesn't do this will probably work
 fine on some platforms, and then fail under Windows.

-\section{Architecture dependency}
-
-A problem which sometimes arises from writing multi-platform programs is that
-the basic C types are not defiend the same on all platforms. This holds true
-for both the length in bits of the standard types (such as int and long) as 
-well as their byte order, which might be little endian (typically
-on Intel computers) or big endian (typically on some Unix workstations). wxWindows
-defines types and macros that make it easy to write architecture independent
-code. The types are:
-
-wxInt32, wxInt16, wxInt8, wxUint32, wxUint16 = wxWord, wxUint8 = wxByte
-
-where wxInt32 stands for a 32-bit signed integer type etc. You can also check
-which architecture the program is compiled on using the wxBYTE\_ORDER define
-which is either wxBIG\_ENDIAN or wxLITTLE\_ENDIAN (in the future maybe wxPDP\_ENDIAN
-as well).
-
-The macros handling bit-swapping with respect to the applications endianness
-are described in the \helpref{Macros}{macros} section.
-
 \section{Conditional compilation}

 One of the purposes of wxWindows is to reduce the need for conditional
--- a/docs/latex/wx/border.bmp
+++ b/docs/latex/wx/border.bmp
--- a/docs/latex/wx/border.gif
+++ b/docs/latex/wx/border.gif
--- a/docs/latex/wx/boxsizer.tex
+++ b/docs/latex/wx/boxsizer.tex
@@ -1,117 +0,0 @@
-\section{\class{wxBoxSizer}}\label{wxboxsizer}
-
-The basic idea behind a box sizer is that windows will most often be laid out in rather 
-simple basic geomerty, typically in a row or a column or several hierachies of either.
-
-As an exmaple, we will construct a dialog that will contain a text field at the top and
-two buttons at the bottom. This can be seen as a top-hierarchy column with the text at
-the top and buttons at the bottom and a low-hierchary row with an OK button to the left
-and a Cancel button to the right. In many cases (particulary dialogs under Unix and
-normal frames) the main window will be resizable by the user and this change of size
-will have to get propagated to its children. In our case, we want the text area to grow
-with the dialog, whereas the button shall have a fixed size. In addition, there will be
-a thin border around all controls to make the dialog look nice and - to make matter worse -
-the buttons shall be centred as the width of the dialog changes.
-
-It is the unique feature of a box sizer, that it can grow in both directions (height and
-width) but can distribute its growth in the main direction (horizontal for a row) {\it unevenly}
-among its children. In our example case, the vertical sizer is supposed to propagate all its
-height changes to only the text area, not to the button area. This is determined by the {\it option} parameter
-when adding a window (or another sizer) to a sizer. It is interpreted
-as a weight factor, i.e. it can be zero, indicating that the window may not be resized
-at all, or above zero. If several windows have a value above zero, the value is interpreted
-relative to the sum of all weight factors of the sizer, so when adding two windows with
-a value of 1, they will both get resized equally much and each half as much as the sizer 
-owning them. Then what do we do when a column sizer changes its width? This behaviour is
-controlled by {\it flags} (the second parameter of the Add() function): Zero or no flag indicates that
-the window will get aligned at the left (in a column sizer) and the top (row sizer), whereas
-wxALIGN\_RIGHT and wxALIGN\_BOTTOM will do what they say. The item can also be centered
-using the wxCENTRE flag (same as wxCENTER) or it can be forced to grow with the sizer (using
-the wxGROW flag (same as wxEXPAND)).
-
-As mentioned above, any window belonging to a sizer may have border, and it can be specified
-which of the four sides may have this border, using the wxTOP, wxLEFT, wxRIGHT and wxBOTTOM
-constants or wxALL for all directions (and you may also use wxNORTH, wxWEST etc instead). These
-flags can be used in combintaion with the alignement flags above as the second paramter of the
-Add() method using the binary or operator |. The sizer of the border also must be made known,
-and it is the third parameter in the Add() method. This means, that the entire behaviour of
-a sizer and its children can be controlled by the three parameters of the Add() method.
-
-\begin{verbatim}
-// we want to get a dialog that is stretchable because it
-// has a text ctrl at the top and two buttons at the bottom
-
-MyDialog::MyDialog(wxFrame *parent, wxWindowID id, const wxString &title ) :
-  wxDialog( parent, id, title, wxDefaultPosition, wxDefaultSize, wxDIALOG_STYLE | wxRESIZE_BORDER )
-{
-  wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-  
-  // create text ctrl with minimal size 100x60
-  topsizer->Add( 
-    new wxTextCtrl( this, -1, "My text.", wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE),
-    1,            // make vertically stretchable
-    wxEXPAND |    // make horizontally stretchable
-    wxALL,        //   and make border all around
-    10 );         // set border width to 10
-
-
-  wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
-  button_sizer->Add(
-     new wxButton( this, wxID_OK, "OK" ), 
-     0,           // make horizontally unstretchable
-     wxALL,       // make border all around (implicit top alignment)
-     10 );        // set border width to 10
-  button_sizer->Add(
-     new wxButton( this, wxID_CANCEL, "Cancel" ), 
-     0,           // make horizontally unstretchable
-     wxALL,       // make border all around (implicit top alignment)
-     10 );        // set border width to 10
-  
-  topsizer->Add( 
-     button_sizer,
-     0,          // make vertically unstretchable
-     wxCENTER ); // no border and centre horizontally
-
-  SetAutoLayout( TRUE );     // tell dialog to use sizer
-  SetSizer( topsizer );      // actually set the sizer
-
-  topsizer->Fit( this );            // set size to minimum size as calculated by the sizer
-  topsizer->SetSizeHints( this );   // set size hints to honour mininum size
-}
-\end{verbatim}
-
-\wxheading{Derived from}
-
-\helpref{wxSizer}{wxsizer}\\
-\helpref{wxObject}{wxobject}
-
-\membersection{wxBoxSizer::wxBoxSizer}\label{wxboxsizerwxboxsizer}
-
-\func{}{wxBoxSizer}{\param{int }{orient}}
-
-Constructor for a wxBoxSizer. {\it orient} may be either of wxVERTICAL
-or wxHORIZONTAL for creating either a column sizer or a row sizer.
-
-\membersection{wxBoxSizer::RecalcSizes}\label{wxboxsizerrecalcsizes}
-
-\func{void}{RecalcSizes}{\void}
-
-Implements the calculation of a box sizer's dimensions and then sets
-the size of its its children (calling \helpref{wxWindow::SetSize}{wxwindowsetsize}
-if the child is a window). It is used internally only and must not be called 
-by the users. Documented for information.
-
-\membersection{wxBoxSizer::CalcMin}\label{wxboxsizercalcmin}
-
-\func{wxSize}{CalcMin}{\void}
-
-Implements the calculation of a box sizer's minimal. It is used internally
-only and must not be called by the users. Documented for information.
-
-\membersection{wxBoxSizer::GetOrientation}\label{wxboxsizergetorientation}
-
-\func{int}{GetOrientation}{\void}
-
-Returns the orientation of the boxsizer, either of wxVERTICAL
-or wxHORIZONTAL.
-
--- a/docs/latex/wx/busyinfo.tex
+++ b/docs/latex/wx/busyinfo.tex
@@ -1,34 +0,0 @@
-\section{\class{wxBusyInfo}}\label{wxbusyinfo}
-
-This class makes it easy to tell your user that the program is temporarily busy.
-Just create a wxBusyInfo object on the stack, and within the current scope,
-a message window will be shown.
-
-For example:
-
-\begin{verbatim}
-  wxBusyInfo wait("Please wait, working...");
-
-  for (int i = 0; i < 100000; i++)
-    DoACalculation();
-\end{verbatim}
-
-It works by creating a window in the constructor,
-and deleting it in the destructor.
-
-\wxheading{Derived from}
-
-None
-
-\wxheading{Include files}
-
-<wx/busyinfo.h>
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxBusyInfo::wxBusyInfo}
-
-\func{}{wxBusyInfo}{\param{const wxString\&}{ msg}}
-
-Constructs a busy info object, displays {\it msg}.
-
--- a/docs/latex/wx/button.tex
+++ b/docs/latex/wx/button.tex
@@ -99,14 +99,6 @@ The button's label.

 \helpref{wxButton::SetLabel}{wxbuttonsetlabel}

-\membersection{wxButton::GetDefaultSize}\label{wxbuttongetdefaultsize}
-
-\func{wxSize}{GetDefaultSize}{\void}
-
-Returns the default size for the buttons. It is advised to make all the dialog
-buttons of the same size and this function allows to retrieve the (platform and
-current font dependent size) which should be the best suited for this.
-
 \membersection{wxButton::SetDefault}\label{wxbuttonsetdefault}

 \func{void}{SetDefault}{\void}
--- a/docs/latex/wx/category.tex
+++ b/docs/latex/wx/category.tex
@@ -100,22 +100,9 @@ that are not static can have \helpref{validators}{wxvalidator} associated with t

 {\large {\bf Window layout}}

-There are two different systems for layouting windows (and dialogs in particluar).
-One is based upon so-called sizers and it requires less typing, thinking and calculating
-and will in almost all cases produce dialogs looking equally well on all platforms, the
-other is based on so-called constraints and allows for more detailed layouts.
+\overview{Overview}{constraintsoverview}

-These are the classes relevant to the sizer-based layout.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{wxSizer}{wxsizer}}{Abstract base class}
-\twocolitem{\helpref{wxBoxSizer}{wxboxsizer}}{A sizer for laying out windows in a row or column}
-\twocolitem{\helpref{wxStaticBoxSizer}{wxstaticboxsizer}}{Same as wxBoxSizer, but with surrounding static box}
-\end{twocollist}
-
-\overview{Overview}{constraintsoverview} over the constraints-based layout.
-
-These are the classes relevant to constraints-based window layout.
+These are the classes relevant to automated window layout.

 \begin{twocollist}\itemsep=0pt
 \twocolitem{\helpref{wxIndividualLayoutConstraint}{wxindividuallayoutconstraint}}{Represents a single constraint dimension}
@@ -191,12 +178,9 @@ An event object contains information about a specific event. Event handlers
 \twocolitem{\helpref{wxMouseEvent}{wxmouseevent}}{A mouse event}
 \twocolitem{\helpref{wxMoveEvent}{wxmoveevent}}{A move event}
 \twocolitem{\helpref{wxNotebookEvent}{wxnotebookevent}}{A notebook control event}
-\twocolitem{\helpref{wxNotifyEvent}{wxnotifyevent}}{A notification event, which can be vetoed}
 \twocolitem{\helpref{wxPaintEvent}{wxpaintevent}}{A paint event}
 \twocolitem{\helpref{wxProcessEvent}{wxprocessevent}}{A process ending event}
 \twocolitem{\helpref{wxQueryLayoutInfoEvent}{wxquerylayoutinfoevent}}{Used to query layout information}
-\twocolitem{\helpref{wxScrollEvent}{wxscrollevent}}{A scroll event from sliders, stand-alone scrollbars and spin buttons}
-\twocolitem{\helpref{wxScrollWinEvent}{wxscrollwinevent}}{A scroll event from scrolled windows}
 \twocolitem{\helpref{wxSizeEvent}{wxsizeevent}}{A size event}
 \twocolitem{\helpref{wxSocketEvent}{wxsocketevent}}{A socket event}
 \twocolitem{\helpref{wxSysColourChangedEvent}{wxsyscolourchangedevent}}{A system colour change event}
@@ -236,7 +220,6 @@ These are the data structure classes supported by wxWindows.
 \twocolitem{\helpref{wxRegion}{wxregion}}{A class representing a region}
 \twocolitem{\helpref{wxString}{wxstring}}{A string class}
 \twocolitem{\helpref{wxStringList}{wxstringlist}}{A class representing a list of strings}
-\twocolitem{\helpref{wxStringTokenizer}{wxstringtokenizer}}{A class for interpreting a string as a list of tokens or words}
 \twocolitem{\helpref{wxRealPoint}{wxrealpoint}}{Representation of a point using floating point numbers}
 \twocolitem{\helpref{wxSize}{wxsize}}{Representation of a size}
 \twocolitem{\helpref{wxTime}{wxtime}}{A class for time manipulation}
@@ -282,8 +265,7 @@ classes, functions and macros.
 \overview{Overview}{ipcoverview}

 wxWindows provides a simple interprocess communications facilities
-based on DDE. [Note that this is currently work in progress and may not
-function properly.]
+based on DDE.

 \begin{twocollist}\itemsep=0pt
 \twocolitem{\helpref{wxDDEClient}{wxddeclient}}{Represents a client}
@@ -293,7 +275,7 @@ function properly.]
 \twocolitem{\helpref{wxTCPConnection}{wxtcpconnection}}{Represents the connection between a client and a server}
 \twocolitem{\helpref{wxTCPServer}{wxtcpserver}}{Represents a server}
 \twocolitem{\helpref{wxSocketClient}{wxsocketclient}}{Represents a socket client}
-%\twocolitem{\helpref{wxSocketHandler}{wxsockethandler}}{Represents a socket handler}
+\twocolitem{\helpref{wxSocketHandler}{wxsockethandler}}{Represents a socket handler}
 \twocolitem{\helpref{wxSocketServer}{wxsocketserver}}{Represents a socket server}
 \end{twocollist}

@@ -359,11 +341,10 @@ The older classes are as follows:

 \begin{twocollist}\itemsep=0pt
 \twocolitem{\helpref{wxDataObject}{wxdataobject}}{Data object class}
-\twocolitem{\helpref{wxDataFormat}{wxdataformat}}{Represents a data format}
 \twocolitem{\helpref{wxTextDataObject}{wxtextdataobject}}{Text data object class}
 \twocolitem{\helpref{wxFileDataObject}{wxtextdataobject}}{File data object class}
 \twocolitem{\helpref{wxBitmapDataObject}{wxbitmapdataobject}}{Bitmap data object class}
-\twocolitem{\helpref{wxCustomDataObject}{wxcustomdataobject}}{Custom data object class}
+\twocolitem{\helpref{wxPrivateDataObject}{wxprivatedataobject}}{Private data object class}
 \twocolitem{\helpref{wxClipboard}{wxclipboard}}{Clipboard class}
 \twocolitem{\helpref{wxDropTarget}{wxdroptarget}}{Drop target class}
 \twocolitem{\helpref{wxFileDropTarget}{wxfiledroptarget}}{File drop target class}
@@ -394,10 +375,8 @@ libraries, and to provide enhanced functionality.
 \twocolitem{\helpref{wxOutputStream}{wxoutputstream}}{Output stream class}
 \twocolitem{\helpref{wxFilterInputStream}{wxfilterinputstream}}{Filtered input stream class}
 \twocolitem{\helpref{wxFilterOutputStream}{wxfilteroutputstream}}{Filtered output stream class}
-\twocolitem{\helpref{wxDataInputStream}{wxdatainputstream}}{Platform-independent binary data input stream class}
-\twocolitem{\helpref{wxDataOutputStream}{wxdataoutputstream}}{Platform-independent binary data output stream class}
-\twocolitem{\helpref{wxTextInputStream}{wxtextinputstream}}{Platform-independent text data input stream class}
-\twocolitem{\helpref{wxTextOutputStream}{wxtextoutputstream}}{Platform-independent text data output stream class}
+\twocolitem{\helpref{wxDataInputStream}{wxdatainputstream}}{Platform-independent data input stream class}
+\twocolitem{\helpref{wxDataOutputStream}{wxdataoutputstream}}{Platform-independent data output stream class}
 \twocolitem{\helpref{wxFileInputStream}{wxfileinputstream}}{File input stream class}
 \twocolitem{\helpref{wxFileOutputStream}{wxfileoutputstream}}{File output stream class}
 \twocolitem{\helpref{wxZlibInputStream}{wxzlibinputstream}}{Zlib (compression) input stream class}
--- a/docs/latex/wx/checkbox.tex
+++ b/docs/latex/wx/checkbox.tex
@@ -99,8 +99,7 @@ Returns TRUE if it is checked, FALSE otherwise.

 \func{void}{SetValue}{\param{const bool}{ state}}

-Sets the checkbox to the given state. This does not cause a
-wxEVT\_COMMAND\_CHECKBOX\_CLICKED event to get emitted.
+Sets the checkbox to the given state.

 \wxheading{Parameters}

--- a/docs/latex/wx/choice.tex
+++ b/docs/latex/wx/choice.tex
@@ -90,17 +90,10 @@ Destructor, destroying the choice item.

 Adds the item to the end of the choice control.

-\func{void}{Append}{\param{const wxString\& }{ item}, \param{void* }{clientData}}
-
-Adds the item to the end of the combobox, associating the given data
-with the item.
-
 \wxheading{Parameters}

 \docparam{item}{String to add.}

-\docparam{clientData}{Client data to associate with the item.}
-
 \membersection{wxChoice::Clear}\label{wxchoiceclear}

 \func{void}{Clear}{\void}
@@ -140,20 +133,6 @@ Gets the number of columns in this choice item.

 This is implemented for Motif only.

-\membersection{wxChoice::GetClientData}\label{wxchoicegetclientdata}
-
-\constfunc{void*}{GetClientData}{\param{int}{ n}}
-
-Returns a pointer to the client data associated with the given item (if any).
-
-\wxheading{Parameters}
-
-\docparam{n}{An item, starting from zero.}
-
-\wxheading{Return value}
-
-A pointer to the client data, or NULL if the item was not found.
-
 \membersection{wxChoice::GetSelection}\label{wxchoicegetselection}

 \constfunc{int}{GetSelection}{\void}
@@ -186,18 +165,6 @@ Gets the selected string, or the empty string if no string is selected.

 Returns the number of strings in the choice control.

-\membersection{wxChoice::SetClientData}\label{wxchoicesetclientdata}
-
-\func{void}{SetClientData}{\param{int}{ n}, \param{void* }{data}}
-
-Associates the given client data pointer with the given item.
-
-\wxheading{Parameters}
-
-\docparam{n}{The zero-based item.}
-
-\docparam{data}{The client data.}
-
 \membersection{wxChoice::SetColumns}\label{wxchoicesetcolumns}

 \func{void}{SetColumns}{\param{int}{ n = 1}}
@@ -216,8 +183,7 @@ This is implemented for Motif only.

 \func{void}{SetSelection}{\param{int}{ n}}

-Sets the choice by passing the desired string position. This does not cause
-a wxEVT\_COMMAND\_CHOICE\_SELECTED event to get emitted.
+Sets the choice by passing the desired string position.

 \wxheading{Parameters}

@@ -231,8 +197,7 @@ a wxEVT\_COMMAND\_CHOICE\_SELECTED event to get emitted.

 \func{void}{SetStringSelection}{\param{const wxString\& }{ string}}

-Sets the choice by passing the desired string. This does not cause
-a wxEVT\_COMMAND\_CHOICE\_SELECTED event to get emitted.
+Sets the choice by passing the desired string.

 \wxheading{Parameters}

--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -9,15 +9,12 @@
 \input array.tex
 \input arrstrng.tex
 \input autoobj.tex
+\input busycurs.tex
+\input button.tex
 \input bitmap.tex
 \input bbutton.tex
 \input bmpdatob.tex
-\input boxsizer.tex
 \input brush.tex
-\input busycurs.tex
-\input busyinfo.tex
-\input button.tex
-\input strmbfrd.tex
 \input calclevt.tex
 \input checkbox.tex
 \input checklst.tex
@@ -37,13 +34,9 @@
 \input control.tex
 \input critsect.tex
 \input crtslock.tex
-\input custdobj.tex
 \input cursor.tex
 \input database.tex
-\input dataform.tex
 \input dataobj.tex
-\input dobjcomp.tex
-\input dobjsmpl.tex
 \input datstrm.tex
 \input date.tex
 \input dc.tex
@@ -73,19 +66,14 @@
 \input fildrptg.tex
 \input filehist.tex
 \input strmfile.tex
-\input filesys.tex
-\input filesysh.tex
 \input filetype.tex
 \input fltinstr.tex
 \input fltoutst.tex
 \input focusevt.tex
 \input font.tex
 \input fontdlg.tex
-\input fontenum.tex
 \input fontlist.tex
-\input fontmap.tex
 \input frame.tex
-\input fsfile.tex
 \input ftp.tex
 \input gauge.tex
 \input gdiobj.tex
@@ -93,24 +81,6 @@
 \input grid.tex
 \input hash.tex
 \input helpinst.tex
-\input htcell.tex
-\input htcolor.tex
-\input htcontnr.tex
-\input htdcrend.tex
-\input hteasypr.tex
-\input htfilter.tex
-\input hthelpct.tex
-\input hthlpdat.tex
-\input hthlpfrm.tex
-\input htparser.tex
-\input htprint.tex
-\input httag.tex
-\input httaghnd.tex
-\input httagmod.tex
-\input htwidget.tex
-\input htwindow.tex
-\input htwinprs.tex
-\input htwinhnd.tex
 \input http.tex
 \input idleevt.tex
 \input icon.tex
@@ -167,6 +137,7 @@
 \input postscpt.tex
 \input prevwin.tex
 \input print.tex
+\input prvdatob.tex
 \input prvtdrpt.tex
 \input process.tex
 \input progdlg.tex
@@ -183,16 +154,13 @@
 \input sashevt.tex
 \input sashlayw.tex
 \input sashwin.tex
-\input sbsizer.tex
 \input screendc.tex
 \input scrolbar.tex
-\input scrlwevt.tex
 \input scrolevt.tex
 \input scrolwin.tex
 \input sngchdlg.tex
 \input size.tex
 \input sizeevt.tex
-\input sizer.tex
 \input slider.tex
 \input sckaddr.tex
 \input socket.tex
@@ -221,7 +189,6 @@
 \input tempfile.tex
 \input text.tex
 \input txtdatob.tex
-\input txtstrm.tex
 \input textdlg.tex
 \input txtdrptg.tex
 \input valtext.tex
@@ -229,7 +196,6 @@
 \input thread.tex
 \input time.tex
 \input timer.tex
-\input tipprov.tex
 \input toolbar.tex
 \input treectrl.tex
 \input treeevt.tex
@@ -241,7 +207,6 @@
 \input wave.tex
 \input window.tex
 \input windowdc.tex
-\input zipstrm.tex
 \input strmzlib.tex
 \input function.tex
 \input keycode.tex
--- a/docs/latex/wx/clientdc.tex
+++ b/docs/latex/wx/clientdc.tex
@@ -12,7 +12,6 @@ To draw on the whole window including decorations, construct a \helpref{wxWindow

 \wxheading{Derived from}

-\helpref{wxWindowDC}{wxwindowdc}\\
 \helpref{wxDC}{wxdc}

 \wxheading{Include files}
--- a/docs/latex/wx/clipbrd.tex
+++ b/docs/latex/wx/clipbrd.tex
@@ -6,8 +6,8 @@ clipboard class from wxWindows 1.xx, which has the same name but a different imp
 To use the clipboard, you call member functions of the global {\bf wxTheClipboard} object.

 Call \helpref{wxClipboard::Open}{wxclipboardopen} to get ownership of the clipboard. If this operation returns TRUE, you
-now own the clipboard. Call \helpref{wxClipboard::SetData}{wxclipboardsetdata} to put data
-on the clipboard, or \helpref{wxClipboard::GetData}{wxclipboardgetdata} to
+now own the clipboard. Call \helpref{wxClipboard::AddData}{wxclipboardadddata} to put data
+on the clipboard (one or more times), or \helpref{wxClipboard::GetData}{wxclipboardgetdata} to
 retrieve data from the clipboard. Call \helpref{wxClipboard::Close}{wxclipboardclose} to close
 the clipboard and relinquish ownership. You should keep the clipboard open only momentarily.

@@ -19,18 +19,18 @@ For example:
  {
    // This data objects are held by the clipboard, 
    // so do not delete them in the app.
-    wxTheClipboard->SetData( new wxTextDataObject("Some text") );
+    wxTheClipboard->AddData( new wxTextDataObject("Some text") );
    wxTheClipboard->Close();
  }

  // Read some text
  if (wxTheClipboard->Open())
  {
-    if (wxTheClipboard->IsSupported( wxDF_TEXT ))
+    wxTextDataObject data;
+    if (wxTheClipboard->IsSupported(data))
    {
-      wxTextDataObject data;
-      wxTheClipboard->GetData( data );
-      wxMessageBox( data.GetText() );
+      wxTheClipboard->GetData(data);
+      wxMessageBox(data.GetText());
    }  
    wxTheClipboard->Close();
  }
@@ -62,6 +62,13 @@ Constructor.

 Destructor.

+\membersection{wxClipboard::AddData}\label{wxclipboardadddata}
+
+\func{bool}{AddData}{\param{wxDataObject*}{ data}}
+
+Call this function to add a data object to the clipboard. This function can be called several times
+to put different formats on the clipboard.
+
 \membersection{wxClipboard::Clear}\label{wxclipboardclear}

 \func{void}{Clear}{\void}
@@ -83,7 +90,7 @@ format. Returns TRUE on success.

 \membersection{wxClipboard::IsSupported}\label{wxclipboardissupported}

-\func{bool}{IsSupported}{\param{const wxDataFormat\&}{ format}}
+\func{bool}{IsSupported}{\param{wxDataObject\&}{ data}}

 Returns TRUE if the format of the given data object is available on the clipboard.

@@ -107,12 +114,3 @@ Call this function to set the data object to the clipboard. This function will
 clear all previous contents in the clipboard, so calling it several times
 does not make any sense.

-\membersection{wxClipboard::UsePrimarySelection}\label{wxclipboarduseprimary}
-
-\func{void}{UsePrimarySelection}{\param{bool}{ primary = TRUE}}
-
-On platforms supporting it (currently only GTK), selects the so called
-PRIMARY SELECTION as the clipboard as opposed to the normal clipboard,
-if {\it primary} is TRUE.
-
-
--- a/docs/latex/wx/cmdevent.tex
+++ b/docs/latex/wx/cmdevent.tex
@@ -80,10 +80,10 @@ which is generated by a control.}

 \membersection{wxCommandEvent::m\_clientData}

-\member{void*}{m\_clientData}
+\member{char*}{m\_clientData}

 Contains a pointer to client data for listboxes and choices, if the event
-was a selection. Beware, this is not implemented anyway...
+was a selection.

 \membersection{wxCommandEvent::m\_commandInt}

@@ -123,10 +123,10 @@ Returns TRUE or FALSE for a checkbox selection event.

 \membersection{wxCommandEvent::GetClientData}

-\func{void*}{GetClientData}{\void}
+\func{char*}{GetClientData}{\void}

 Returns client data pointer for a listbox or choice selection event
-(not valid for a deselection). Beware, this is not implmented anywhere...
+(not valid for a deselection).

 \membersection{wxCommandEvent::GetExtraLong}

@@ -163,7 +163,7 @@ is a deselection.

 \membersection{wxCommandEvent::SetClientData}

-\func{void}{SetClientData}{\param{void*}{ clientData}}
+\func{void}{SetClientData}{\param{char*}{ clientData}}

 Sets the client data for this event.

--- a/docs/latex/wx/combobox.tex
+++ b/docs/latex/wx/combobox.tex
@@ -21,7 +21,7 @@ A combobox permits a single selection only. Combobox items are numbered from zer
 \wxheading{Window styles}

 \begin{twocollist}\itemsep=0pt
-\twocolitem{\windowstyle{wxCB\_SIMPLE}}{Creates a combobox with a permanently displayed list. Windows only. }
+\twocolitem{\windowstyle{wxCB\_SIMPLE}}{Creates a combobox with a permanently displayed list.}
 \twocolitem{\windowstyle{wxCB\_DROPDOWN}}{Creates a combobox with a drop-down list.}
 \twocolitem{\windowstyle{wxCB\_READONLY}}{Creates a combo box consisting of a drop-down list and static text item
 displaying the current selection.}
@@ -102,7 +102,7 @@ Destructor, destroying the combobox.

 Adds the item to the end of the combobox.

-\func{void}{Append}{\param{const wxString\& }{ item}, \param{void* }{clientData}}
+\func{void}{Append}{\param{const wxString\& }{ item}, \param{char* }{clientData}}

 Adds the item to the end of the combobox, associating the given data
 with the item.
@@ -168,7 +168,7 @@ The position if found, or -1 if not found.

 \membersection{wxComboBox::GetClientData}\label{wxcomboboxgetclientdata}

-\constfunc{void*}{GetClientData}{\param{int}{ n}}
+\constfunc{char*}{GetClientData}{\param{int}{ n}}

 Returns a pointer to the client data associated with the given item (if any).

@@ -265,7 +265,7 @@ Removes the text between the two positions in the combobox text field.

 \membersection{wxComboBox::SetClientData}\label{wxcomboboxsetclientdata}

-\func{void}{SetClientData}{\param{int}{ n}, \param{void* }{data}}
+\func{void}{SetClientData}{\param{int}{ n}, \param{char* }{data}}

 Associates the given client data pointer with the given item.

@@ -295,8 +295,7 @@ Sets the insertion point at the end of the combobox text field.

 \func{void}{SetSelection}{\param{int}{ n}}

-Selects the given item in the combobox list. This does not cause a
-wxEVT\_COMMAND\_COMBOBOX\_SELECTED event to get emitted.
+Selects the given item in the combobox list.

 \func{void}{SetSelection}{\param{long}{ from}, \param{long}{ to}}

@@ -310,9 +309,6 @@ Selects the text between the two positions, in the combobox text field.

 \docparam{to}{The second position.}

-\pythonnote{The second form of this method is called \tt{SetMark} in
-wxPython.}
-
 \membersection{wxComboBox::SetValue}\label{wxcomboboxsetvalue}

 \func{void}{SetValue}{\param{const wxString\& }{text}}
--- a/docs/latex/wx/conditn.tex
+++ b/docs/latex/wx/conditn.tex
@@ -1,6 +1,6 @@
 \section{\class{wxCondition}}\label{wxcondition}

-Condition class for code protection in multithreaded applications.
+TODO

 \wxheading{Derived from}

@@ -62,3 +62,4 @@ Waits until a signal is raised or the timeout has elapsed.

 The second form returns if the signal was raised, or FALSE if there was a timeout.

+
--- a/docs/latex/wx/cont.bmp
+++ b/docs/latex/wx/cont.bmp
--- a/docs/latex/wx/cont.gif
+++ b/docs/latex/wx/cont.gif
--- a/docs/latex/wx/contbox.bmp
+++ b/docs/latex/wx/contbox.bmp
--- a/docs/latex/wx/contbox.gif
+++ b/docs/latex/wx/contbox.gif
--- a/docs/latex/wx/critsect.tex
+++ b/docs/latex/wx/critsect.tex
@@ -1,6 +1,6 @@
 \section{\class{wxCriticalSection}}\label{wxcriticalsection}

-A critical section object is used for the same exactly purpose as 
+A critical section object is used exactly for the same purpose as 
 \helpref{mutexes}{wxMutex}. The only difference is that under Windows platform
 critical sections are only visible inside one process, while mutexes may be
 shared between processes, so using critical sections is slightly more
--- a/docs/latex/wx/custdobj.tex
+++ b/docs/latex/wx/custdobj.tex
@@ -1,107 +0,0 @@
-\section{\class{wxCustomDataObject}}\label{wxcustomdataobject}
-
-wxCustomDataObject is a specialization of
-\helpref{wxDataObjectSimple}{wxdataobjectsimple} for some
-application-specific data in arbitrary (either custom or one of the standard
-ones). The only restriction is that it is supposed that this data can be
-copied bitwise (i.e. with {\tt memcpy()}), so it would be a bad idea to make
-it contain a C++ object (though C struct is fine).
-
-By default, wxCustomDataObject stores the data inside in a buffer. To put the
-data into the buffer you may use either
-\helpref{SetData}{wxcustomdataobjectsetdata} or
-\helpref{TakeData}{wxcustomdataobjecttakedata} depending on whether you want
-the object to make a copy of data or not.
-
-If you already store the data in another place, it may be more convenient and
-efficient to provide the data on-demand which is possible too if you override
-the virtual functions mentioned below.
-
-\wxheading{Virtual functions to override}
-
-This class may be used as is, but if you don't want store the data inside the
-object but provide it on demand instead, you should override
-\helpref{GetSize}{wxcustomdataobjectgetsize},
-\helpref{GetData}{wxcustomdataobjectgetdata} and
-\helpref{SetData}{wxcustomdataobjectsetdata} (or may be only the first two or
-only the last one if you only allow reading/writing the data)
-
-\wxheading{Derived from}
-
-\helpref{wxDataObjectSimple}{wxdataobjectsimple}\\
-\helpref{wxDataObject}{wxdataobject}
-
-\wxheading{Include files}
-
-<wx/dataobj.h>
-
-\wxheading{See also}
-
-\helpref{wxDataObject}{wxdataobject}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxCustomDataObject::wxCustomDataObject}\label{wxcustomdataobjectwxcustomdataobject}
-
-\func{}{wxCustomDataObject}{\param{const wxDataFormat\& }{format = wxFormatInvalid}}
-
-The constructor accepts a {\it format} argument which specifies the (single)
-format supported by this object. If it isn't set here,
-\helpref{SetFormat}{wxdataobjectsimplesetformat} should be used.
-
-\membersection{wxCustomDataObject::\destruct{wxCustomDataObject}}\label{wxcustomdataobjectdtor}
-
-\func{}{\destruct{wxCustomDataObject}}{\void}
-
-The destructor will free the data hold by the object. Notice that although it
-calls a virtual \helpref{Free()}{wxcustomdataobjectfree} function, the base
-class version will always be called (C++ doesn't allow calling virtual
-functions from constructors or destructors), so if you override {\tt Free()}, you
-should override the destructor in your class as well (which would probably
-just call the derived class' version of {\tt Free()}).
-
-\membersection{wxCustomDataObject::Alloc}\label{wxcustomdataobjectalloc}
-
-\func{virtual void *}{Alloc}{\param{size\_t }{size}}
-
-This function is called to allocate {\it size} bytes of memory from SetData().
-The default version just uses the operator new.
-
-\membersection{wxCustomDataObject::Free}\label{wxcustomdataobjectfree}
-
-\pythonnote{This method expects a string in wxPython.  You can pass
-nearly any object by pickling it first.}
-
-\func{virtual void}{Free}{\void}
-
-This function is called when the data is freed, you may override it to anything
-you want (or may be nothing at all). The default version calls operator
-delete$[]$ on the data.
-
-\membersection{wxCustomDataObject::GetSize}\label{wxcustomdataobjectgetsize}
-
-\constfunc{virtual size\_t}{GetSize}{\void}
-
-Returns the data size in bytes.
-
-\membersection{wxCustomDataObject::GetData}\label{wxcustomdataobjectgetdata}
-
-\constfunc{virtual void *}{GetData}{\void}
-
-Returns a pointer to the data.
-
-\membersection{wxCustomDataObject::SetData}\label{wxcustomdataobjectsetdata}
-
-\func{virtual void}{SetData}{
- \param{size\_t }{size}, \param{const void }{*data}}
-
-Set the data. The data object will make an internal copy.
-
-\membersection{wxCustomDataObject::TakeData}\label{wxcustomdataobjecttakedata}
-
-\func{virtual void}{TakeData}{
- \param{size\_t }{size}, \param{const void }{*data}}
-
-Like \helpref{SetData}{wxcustomdataobjectsetdata}, but doesn't copy the data -
-instead the object takes ownership of the pointer.
-
--- a/docs/latex/wx/dataform.tex
+++ b/docs/latex/wx/dataform.tex
@@ -1,116 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Name:        dataform.tex
-%% Purpose:     wxDataFormat documentation
-%% Author:      Vadim Zeitlin
-%% Modified by:
-%% Created:     03.11.99
-%% RCS-ID:      $Id$
-%% Copyright:   (c) Vadim Zeitlin
-%% Licence:     wxWindows licence
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\section{\class{wxDataFormat}}\label{wxdataformat}
-
-A wxDataFormat is an encapsulation of a platform-specific format handle which
-is used by the system for the clipboard and drag and drop operations. The
-applications are usually only interested in, for example, pasting data from the
-clipboard only if the data is in a format the program understands and a data
-format is something which uniquely identifies this format.
-
-On the system level, a data format is usually just a number ({\tt CLIPFORMAT}
-under Windows or {\tt Atom} under X11, for example) and the standard formats
-are, indeed, just numbers which can be implicitly converted to wxDataFormat.
-The standard formats are:
-
-\begin{twocollist}\itemsep=1cm
-\twocolitem{wxDF\_INVALID}{An invalid format - used as default argument for
-functions taking a wxDataFormat argument sometimes}
-\twocolitem{wxDF\_TEXT}{Text format (wxString)}
-\twocolitem{wxDF\_BITMAP}{A bitmap (wxBitmap)}
-\twocolitem{wxDF\_METAFILE}{A metafile (wxMetafile, Windows only)}
-\twocolitem{wxDF\_FILENAME}{A list of filenames}
-\end{twocollist}
-
-As mentioned above, these standard formats may be passed to any function taking
-wxDataFormat argument because wxDataFormat has an implicit conversion from
-them (or, to be precise from the type {\tt wxDataFormat::NativeFormat} which is
-the type used by the underlying platform for data formats).
-
-Aside the standard formats, the application may also use custom formats which
-are identified by their names (strings) and not numeric identifiers. Although
-internally custom format must be created (or {\it registered}) first, you
-shouldn't care about it because it is done automatically the first time the
-wxDataFormat object corresponding to a given format name is created. The only
-implication of this is that you should avoid having global wxDataFormat objects
-with non-default constructor because their constructors are executed before the
-program has time to perform all necessary initialisations and so an attempt to
-do clipboard format registration at this time will usually lead to a crash!
-
-\wxheading{Virtual functions to override}
-
-None, this class doesn't have any.
-
-\wxheading{Derived from}
-
-None
-
-\wxheading{See also}
-
-\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
-\helpref{DnD sample}{samplednd}, 
-\helpref{wxDataObject}{wxdataobject}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDataFormat::wxDataFormat}\label{wxdataformatwxdataformatdef}
-
-\func{}{wxDataFormat}{\param{NativeFormat}{ format = wxDF\_INVALID}}
-
-Constructs a data format object for one of the standard data formats or an
-empty data object (use \helpref{SetType}{wxdataformatsettype} or 
-\helpref{SetId}{wxdataformatsetid} later in this case)
-
-\membersection{wxDataFormat::wxDataFormat}\label{wxdataformatwxdataformat}
-
-\func{}{wxDataFormat}{\param{const wxChar }{*format}}
-
-Constructs a data format object for a custom format identified by its name 
-{\it format}.
-
-\membersection{wxDataFormat::operator $==$}\label{wxdataformatoperatoreq}
-
-\constfunc{bool}{operator $==$}{\param{const wxDataFormat\&}{ format}}
-
-Returns TRUE if the formats are equal.
-
-\membersection{wxDataFormat::operator $!=$}\label{wxdataformatoperatorneq}
-
-\constfunc{bool}{operator $!=$}{\param{const wxDataFormat\&}{ format}}
-
-Returns TRUE if the formats are different.
-
-\membersection{wxDataFormat::GetId}\label{wxdataformatgetid}
-
-\constfunc{wxString}{GetId}{\void}
-
-Returns the name of a custom format (this function will fail for a standard
-format).
-
-\membersection{wxDataFormat::GetType}\label{wxdataformatgettype}
-
-\constfunc{NativeFormat}{GetType}{\void}
-
-Returns the platform-specific number identifying the format.
-
-\membersection{wxDataFormat::SetId}\label{wxdataformatsetid}
-
-\func{void}{SetId}{\param{const wxChar }{*format}}
-
-Sets the format to be the custom format identified by the given name.
-
-\membersection{wxDataFormat::SetType}\label{wxdataformatsettype}
-
-\func{void}{SetType}{\param{NativeFormat}{ format}}
-
-Sets the format to the given value, which should be one of wxDF\_XXX constants.
-
--- a/docs/latex/wx/dataobj.tex
+++ b/docs/latex/wx/dataobj.tex
@@ -1,121 +1,47 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Name:        dataobj.tex
-%% Purpose:     wxDataObject documentation
-%% Author:      Vadim Zeitlin
-%% Modified by:
-%% Created:     18.10.99
-%% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% Licence:     wxWindows licence
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 \section{\class{wxDataObject}}\label{wxdataobject}

 A wxDataObject represents data that can be copied to or from the clipboard, or
-dragged and dropped. The important thing about wxDataObject is that this is a
-'smart' piece of data unlike usual 'dumb' data containers such as memory
-buffers or files. Being 'smart' here means that the data object itself should
-know what data formats it supports and how to render itself in each of
-supported formats.
+dragged and dropped.

-A supported format, incidentally, is exactly the format in which the data can
-be requested from a data object or from which the data object may be set. In
-the general case, an object may support different formats on 'input' and
-'output', i.e. it may be able to render itself in a given format but not be
-created from data on this format or vice versa. wxDataObject defines an
-enumeration type
+There are several predefined data object classes, such as \helpref{wxFileDataObject}{wxfiledataobject}, 
+\helpref{wxTextDataObject}{wxtextdataobject}, and \helpref{wxBitmapDataObject}{wxbitmapdataobject} which
+can be used without change or can be altered (by deriving a new class from them) in order to deliver
+data and data size on-demand. There is no need to ever use wxDataObject itself or derive directly from it.

-\begin{verbatim}
-enum Direction
-{
-    Get  = 0x01,    // format is supported by GetDataHere()
-    Set  = 0x02     // format is supported by SetData()
-};
-\end{verbatim}
+You may also derive your own data object classes from \helpref{wxPrivateDataObject}{wxprivatedataobject}
+for user-defined types. The format of user-defined data is given as mime-type string literal, 
+such as "application/word" or "image/png". These strings are used as they are under Unix (so 
+far only GTK) to identify a format and are translated into their Windows equivalent under 
+Win32 (using the OLE IDataObject for data exchange to and from the clipboard and for Drag'n'Drop).
+Note that the format string translation under Windows is not yet finnished.

-which allows to distinguish between them. See
-\helpref{wxDataFormat}{wxdataformat} documentation for more about formats.
+As mentioned above, data may be placed into the \helpref{wxClipboard}{wxclipboard}
+or a \helpref{wxDropSource}{wxdropsource} instance either directly or on-demand. 
+As long as only one format is offerred, putting data directly into the clipboard may 
+be sufficient. But imagine that you paste a large piece of text to the clipboard and 
+offer it in "text/plain", "text/rtf", "text/html", "application/word" and your own 
+format for internal use - here offering data on-demand is required to minimize memory 
+consumption. This would generally get implemented using a central object that
+contains clipboard information in the format with the maximum of information. Note
+that neither the GTK data transfer mechanisms for the clipboard and Drag'n'Drop
+nor the OLE data transfer copies any data until another application actually
+requests the data. This is in contrast to the "feel" offered to the user of a
+program who would normally think that the data resides in the clipboard after
+having pressed "Copy" - in reality it is only declared to be available.

-Not surprizingly, being 'smart' comes at a price of added complexity. This is
-reasonable for the situations when you really need to support multiple formats,
-but may be annoying if you only want to do something simple like cut and paste
-text.
-
-To provide a solution for both cases, wxWindows has two predefined classes
-which derive from wxDataObject: \helpref{wxDataObjectSimple}{wxdataobjectsimple} and
-\helpref{wxDataObjectComposite}{wxdataobjectcomposite}.
-\helpref{wxDataObjectSimple}{wxdataobjectsimple} is
-the simplest wxDataObject possible and only holds data in a single format (such
-as HTML or text) and \helpref{wxDataObjectComposite}{wxdataobjectcomposite} is
-the simplest way to implement wxDataObject which does support multiple formats
-because it achievs this by simply holding several wxDataObjectSimple objects.
-
-So, you have several solutions when you need a wxDataObject class (and you need
-one as soon as you want to transfer data via the clipboard or drag and drop):
-
-\begin{twocollist}\itemsep=1cm
-\twocolitem{{\bf 0. Use one of built-in classes}}{You may use wxTextDataObject,
-wxBitmapDataObject or wxFileDataObject in the simplest cases when you only need
-to support one format and your data is either text, bitmap or list of files.}
-\twocolitem{{\bf 1. Use wxDataObjectSimple}}{Deriving from wxDataObjectSimple is the simplest
-solution for custom data - you will only support one format and so probably
-won't be able to communicate with other programs, but data transfer will work
-in your program (or between different copies of it).}
-\twocolitem{{\bf 2. Use wxDataObjectComposite}}{This is a simple but powerful
-solution which allows you to support any number of formats (either
-standard or custom if you combine it with the previous solution).}
-\twocolitem{{\bf 3. Use wxDataObject directly}}{This is the solution for
-maximal flexibility and efficiency, but it also is the most difficult to
-implement.}
-\end{twocollist}
-
-Please note that the easiest way to use drag and drop and the clipboard with
-multiple formats is by using wxDataObjectComposite, but it is not the most
-efficient one as each wxDataObjectSimple would contain the whole data in its
-respective formars. Now imagine that you want to paste 200 pages of text in
-your proprietary format, as well as Word, RTF, HTML, Unicode and plain text to
-the clipboard and even today's computers are in trouble. For this case, you
-will have to derive from wxDataObject directly and make it enumerate its
-formats and provide the data in the requested format on demand.
-
-Note that neither the GTK data transfer mechanisms for the clipboard and
-drag and drop, neither does the OLE data transfer copy any data until another application
-actually requests the data. This is in contrast to the 'feel' offered to the
-user of a program who would normally think that the data resides in the
-clipboard after having pressed 'Copy' - in reality it is only declared to be
-available.
-
-There are several predefined data object classes derived from
-wxDataObjectSimple: \helpref{wxFileDataObject}{wxfiledataobject},
-\helpref{wxTextDataObject}{wxtextdataobject} and
-\helpref{wxBitmapDataObject}{wxbitmapdataobject} which can be used without
-change.
-
-You may also derive your own data object classes from 
-\helpref{wxCustomDataObject}{wxcustomdataobject} for user-defined types. The
-format of user-defined data is given as mime-type string literal, such as
-"application/word" or "image/png". These strings are used as they are under
-Unix (so far only GTK) to identify a format and are translated into their
-Windows equivalent under Win32 (using the OLE IDataObject for data exchange to
-and from the clipboard and for drag and drop). Note that the format string
-translation under Windows is not yet finished.
-
-\pythonnote{At this time this class is directly usable from wxPython.
-Derive a class from \helpref{wxPyDataObjectSimple}{wxdataobjectsimple}
-instead.}
-
-\wxheading{Virtual functions to override}
-
-Each class derived directly from wxDataObject must override and implement all
-of its functions which are pure virtual in the base class.
-
-The data objects which only render their data or only set it (i.e. work in
-only one direction), should return 0 from
-\helpref{GetFormatCount}{wxdataobjectgetformatcount}.
+Let's assume that you have written an HTML editor and want it to paste contents
+in the formats "text/plain" and "text/html" to the clipboard. For offering
+data on-demand in "text/plain" you would derive your class from \helpref{wxTextDataObject}{wxtextdataobject}
+and for offering data on-demand in "text/html" you would derive your own class from
+\helpref{wxPrivateDataObject}{wxprivatedataobject} and set its ID string
+identifying the format to "text/html" using \helpref{wxPrivateDataObject::SetId}{wxprivatedataobjectsetid}.
+In your two derived classed you'd then have a pointer or reference to the central
+data container and you'd override the methods returning the size of the
+available data and the WriteData() methods in both classes.

 \wxheading{Derived from}

-None
+\helpref{wxObject}{wxobject}

 \wxheading{Include files}

@@ -123,16 +49,13 @@ None

 \wxheading{See also}

-\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
-\helpref{DnD sample}{samplednd}, 
 \helpref{wxFileDataObject}{wxfiledataobject}, 
 \helpref{wxTextDataObject}{wxtextdataobject}, 
 \helpref{wxBitmapDataObject}{wxbitmapdataobject}, 
-\helpref{wxCustomDataObject}{wxcustomdataobject}, 
-\helpref{wxDropTarget}{wxdroptarget}, 
+\helpref{wxPrivateDataObject}{wxprivatedataobject}, 
+\helpref{Drag and drop overview}{wxdndoverview}, \helpref{wxDropTarget}{wxdroptarget}, 
 \helpref{wxDropSource}{wxdropsource}, 
-\helpref{wxTextDropTarget}{wxtextdroptarget}, 
-\helpref{wxFileDropTarget}{wxfiledroptarget}
+\helpref{wxTextDropTarget}{wxtextdroptarget}, \helpref{wxFileDropTarget}{wxfiledroptarget}

 \latexignore{\rtfignore{\wxheading{Members}}}

@@ -148,46 +71,18 @@ Constructor.

 Destructor.

-\membersection{wxDataObject::GetAllFormats}\label{wxdataobjectgetallformats}
+\membersection{wxDataObject::WriteData}\label{wxdataobjectwritedata}

-\constfunc{virtual void}{GetAllFormats}{ \param{wxDataFormat *}{formats}, \param{Direction}{ dir = Get}}
+\constfunc{virtual void}{WriteData}{\param{void}{*dest} }

-Copy all supported formats in the given direction to the array pointed to by
-{\it formats}. There is enough space for GetFormatCount(dir) formats in it.
+Write the data owned by this class to {\it dest}. This method is a pure
+virtual function and must be overridden.

-\membersection{wxDataObject::GetDataHere}\label{wxdataobjectgetdatahere}
+\membersection{wxDataObject::GetSize}\label{wxdataobjectgetdatasize}

-\constfunc{virtual bool}{GetDataHere}{\param{const wxDataFormat\&}{ format}, \param{void }{*buf} }
+\constfunc{virtual size\_t}{GetSize}{\void}

-The method will write the data of the format {\it format} in the buffer {\it
-buf} and return TRUE on success, FALSE on failure.
+Returns the data size. This method is a pure
+virtual function and must be overridden.

-\membersection{wxDataObject::GetDataSize}\label{wxdataobjectgetdatasize}
-
-\constfunc{virtual size\_t}{GetDataSize}{\param{const wxDataFormat\&}{ format} }
-
-Returns the data size of the given format {\it format}.
-
-\membersection{wxDataObject::GetFormatCount}\label{wxdataobjectgetformatcount}
-
-\constfunc{virtual size\_t}{GetFormatCount}{\param{Direction}{ dir = Get}}
-
-Returns the number of available formats for rendering or setting the data.
-
-\membersection{wxDataObject::GetPreferredFormat}\label{wxdataobjectgetpreferredformat}
-
-\constfunc{virtual wxDataFormat}{GetPreferredFormat}{\param{Direction}{ dir = Get}}
-
-Returns the preferred format for either rendering the data (if {\it dir} is {\tt Get},
-its default value) or for setting it. Usually this will be the
-native format of the wxDataObject.
-
-\membersection{wxDataObject::SetData}\label{wxdataobjectsetdata}
-
-\func{virtual bool}{SetData}{ \param{const wxDataFormat\&}{ format}, \param{size\_t}{ len}, \param{const void }{*buf} }
-
-Set the data in the format {\it format} of the length {\it len} provided in the
-buffer {\it buf}.
-
-Returns TRUE on success, FALSE on failure.

--- a/Show More
+++ b/Show More