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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/TESTED@4425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-07 18:34:36 +00:00
5213 changed files with 1202158 additions and 18341 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,35 @@
+system.list
+bin
+.gdb_history
+Test
+config.cache
+configarg.cache
+config.status
+system.list
+linux.system.cache
+wx-config
+config.log
+linux-gnu.system.cache
+*.dsp
+*.dsw
+*.plg
+*.opt
+*.aps
+*.ncb
+*.pro
+*.opt
+*.d
+*.swp
+*.swo
+Release
+Debug
+ReleaseDLL
+DebugDLL
+robert
+stamp-h.in
+Makefile
+configure
+setup.h
+stamp-h
+libtool
+aclocal.m4
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -0,0 +1,242 @@
+------------------------------------------------------------------------
+                How to build the sources from CVS
+------------------------------------------------------------------------
+
+I) Windows using plain makefiles
+----------------------------------------
+
+a) If using Microsoft Visual C++ 5.0 or 6.0
+
+Ensure that the command-line compiler and tools (including
+nmake) are installed and ready to run.  Depending on your
+installation there may be a batch file (named something like
+VCVARS32.BAT) that needs to be run to set correct environment
+varaibles and PATH entries.
+
+Continue with item c) below.
+
+
+b) If using the GNU MinGW32 or GNU CygWin32 compilers
+
+You'll need the compiler itself which is available from
+
+  http://www.cygwin.com
+
+When using MingW32 you'll need GNU make which is a part
+of the CygWin32 toolchain and is also available as a stand
+alone port without the infamous Cygwin.dll from
+
+  http://agnes.dida.physik.uni-essen.de/~janjaap/mingw32
+
+The makefile has small problems with Cygwin<69>s tools
+so it is recommended not to use these (but MingGW32
+and its make.exe).
+
+-> Set your path so that it includes the directory
+   where your compiler and tools reside
+
+b-2) Using Mingw32 with gcc-2.95 and Anders Norlander's
+     Win32 headers
+
+Using the newer gcc-2.95/Noralander header combination
+will allow you to compile more of the MSW code, such
+as OLE and Drag-n-Drop.
+
+Instructions are similar to those for Regular Mingw32 except
+
+->Get the compiler from
+    ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
+
+->patch the gcc headers with info in wxWin\Mingw32-gcc295.patches.
+  PLEASE APPLY THESE PATCHES BY HAND! There are apparently a few
+  different versions of the headers floating around.
+
+->Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
+  the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
+  If using MINGW32, also set the MINGW32VERSION variable
+  appropriately.
+
+
+c) Build instructions
+
+-> Assumming that you installed the wxWindows sources
+   into c:\wxWin
+-> Copy c:\wxWin\include\wx\msw\setup0.h
+   to   c:\wxWin\include\wx\msw\setup.h
+-> Edit c:\wxWin\include\wx\msw\setup.h so that
+   most features are enabled (i.e. defined to 1) with
+   #define wxUSE_ODBC          0
+   #define wxUSE_SOCKETS       0
+   #define wxUSE_HTML          1
+   #define wxUSE_THREADS       1
+   #define wxUSE_FS_INET       0
+   #define wxUSE_FS_ZIP        1
+   #define wxUSE_BUSYINFO      1
+   #define wxUSE_DYNLIB_CLASS  1
+   #define wxUSE_ZIPSTREAM     1
+   #define wxUSE_LIBJPEG       1
+   #define wxUSE_LIBPNG        1
+
+   and iostreams ares disabled with
+   #define wxUSE_STD_IOSTREAM   0
+
+   note: ODBC and SOCKETS can be 1 for gcc-2.95
+
+-> type: cd c:\wxWin\src\msw
+-> type: make -f makefile.g95  (if using GNU tools)
+or type: make -f makefile.vc   (if using MS VC++)
+
+
+II) Unix ports
+--------------
+
+Building wxGTK or wxMotif completely without configure
+won't ever work, but there is now a new makefile system
+that works without libtool and automake, using only
+configure to create what is needed.
+
+In order to create configure, you need to have the
+GNU autoconf package (version 2.13 or 2.14) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf).
+
+Set WXWIN environment variable to the base directory such
+as ~/wxWindows (this is actually not really needed).
+
+-> type: export WXWIN=~/wxWindows
+-> type: md mybuild
+-> type: cd mybuild
+-> type: ../configure --with-motif
+or type: ../configure --with-gtk
+-> type: make
+-> type: su <type root password>
+-> type: make install
+-> type: ldconfig
+-> type: exit
+
+Call configure with --disable-shared to create a static
+library. Calling "make uninstall" will remove the installed
+library and "make dist" will create a distribution (not
+yet complete).
+
+III) Windows using configure
+----------------------------------------
+
+Take a look at Unix->Windows cross compiling. With minor
+modifications, this should work in Windows if you've got the cygnus
+utilities (bash, GNU make, etc) and either mingw32 or cygwin32 installed.
+See http://www.cygnus.com for these programs, or go straight to their
+ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
+
+Of course, you can also build the library using plain makefiles (see
+section I).
+
+V) MacOS
+----------------------------------------
+
+VI) OS/2
+----------------------------------------
+
+VII) Unix->Windows cross-compiling using configure
+--------------------------------------------------
+
+First you'll need a cross-compiler; linux glibc binaries of mingw32 and
+cygwin32 (both based on egcs) can be found at
+ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Otherwise you can
+compile one yourself. Check the relevant FAQs.
+
+[ A Note about cygwin32 and mingw32: the main difference is that cygwin32
+binaries are always linked against cygwin.dll. This dll encapsulates most
+standard Unix C extensions, which is very handy if you're porting unix
+software to windows. However, wxMSW doesn't need this, so mingw32 is
+preferable if you write portable C(++). ]
+
+You might want to build both Unix and Windows binaries in the same source
+tree; to do this make subdirs for each e.g. unix and win32. If you've
+already build wxWindows in the main dir, do a 'make distclean' there,
+otherwise configure will get confused. (In any case, read the section 'Unix
+using configure' and make sure you're able to build a native wxWindows
+library; cross-compiling errors can be pretty obscure and you'll want to be
+sure that your configure setup is basically sound.)
+
+To cross compile the windows library, do
+-> cd win32
+(or whatever you called it)
+Now run configure. There are two ways to do this
+-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw \
+   --enable-dnd=no --without-odbc
+where --build= should read whatever platform you're building on. Configure
+will notice that build and host platforms differ, and automatically prepend
+i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
+The other way to run configure is by specifying the names of the binaries
+yourself:
+-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
+   DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
+   ../configure --host=i586-mingw32 --with-mingw --enable-dnd=no
+
+(all assuming you're using mingw32)
+Drag'n'drop is disabled because mingw32 lacks (AFAIK) OLE headers.
+
+[ Update: some new mingw32 versions now have a new set of windows header
+files, which apparently can handle ole. Untested at the moment ]
+
+ODBC files don't compile as of 13.10.99 - may be this will be fixed by the
+moment you're reading these lines.
+
+Configure will conclude that shared libraries are out of the question and
+opt for a static one. I haven't looked into DLL creation yet.
+
+Type
+-> make
+and wait, wait, wait. Don't leave the room, because the minute you do there
+will be a compile error :-)
+
+NB: you risk to get quite a few warnings about "ANSI C++ forbids implicit
+    conversion from 'void *'" in all places where va_arg macro is used. This
+    is due to a bug in (some versions of) mingw32 headers which may be
+    corrected by editing the file
+
+    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
+
+    (instead of egcs-2.91.57 you may have something different), searching for
+    the lines
+
+/* Define __gnuc_va_list.  */
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
+typedef char *__gnuc_va_list;
+#else
+typedef void *__gnuc_va_list;
+#endif
+#endif
+
+    and adding "|| defined(_WIN32)" to the list of platforms on which
+    __gnuc_va_list is char *.
+
+If this is successful, you end up with a libwx_msw.a in win32/lib.  Now try
+building the minimal sample:
+
+-> cd samples/minimal
+-> make
+
+and run it with wine, for example (or copy to a Windows box)
+-> wine minimal.exe
+
+If all is well, do an install; from win32
+-> make install
+
+Native and cross-compiled installations can co-exist peacefully
+(as long as their widget sets differ), except for wx-config. You might
+want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
+
+Cross-compiling TODO:
+---------------------
+- resource compiling must be done manually for now (should/can we link the
+default wx resources into libwx_msw.a?) [ No we can't; the linker won't
+link it in... you have to supply an object file ]
+- dynamic libraries
+- static executables are HUGE -- there must be room for improvement.
+
--- a/Makefile.in
+++ b/Makefile.in
--- a/Mingw32-gcc295.patches
+++ b/Mingw32-gcc295.patches
@@ -0,0 +1,116 @@
+*** \gcc-inc\basetyps.h Sat Jul 31 16:48:36 1999
+--- basetyps.h Fri Aug 06 11:14:36 1999
+***************
+*** 74,91 ****
+--- 74,97 ----
+   STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
+  }
+  #define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
+
+ #ifndef GUID_DEFINED
+ #define GUID_DEFINED
+  typedef struct _GUID
+  {
+      unsigned long Data1;
+      unsigned short Data2;
+      unsigned short Data3;
+      unsigned char Data4[8];
+  } GUID;
+ #endif /* GUID_DEFINED */
+  typedef GUID *REFGUID;
+  typedef GUID *LPGUID;
+ #ifndef UUID_DEFINED
+ #define UUID_DEFINED
+  typedef GUID UUID;
+ #endif /* UUID_DEFINED */
+  typedef GUID IID;
+  typedef GUID CLSID;
+  typedef CLSID *LPCLSID;
+  typedef IID *LPIID;
+
+
+*** \gcc-inc\oaidl.h Sat Jul 31 16:48:42 1999
+--- oaidl.h Fri Aug 06 13:18:48 1999
+***************
+*** 39,44 ****
+--- 39,53 ----
+  #define IMPLTYPEFLAG_FRESTRICTED 4
+  #define IMPLTYPEFLAG_FDEFAULTVTABLE 8
+
+ #define DISPID_UNKNOWN ( -1 )
+ #define DISPID_VALUE ( 0 )
+ #define DISPID_PROPERTYPUT ( -3 )
+ #define DISPID_NEWENUM ( -4 )
+ #define DISPID_EVALUATE ( -5 )
+ #define DISPID_CONSTRUCTOR ( -6 )
+ #define DISPID_DESTRUCTOR ( -7 )
+ #define DISPID_COLLECT ( -8 )
+
+  typedef interface ITypeLib *LPTYPELIB;
+  typedef interface ICreateTypeInfo *LPCREATETYPEINFO;
+  typedef interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
+***************
+*** 49,54 ****
+--- 58,73 ----
+  typedef interface IDispatch *LPDISPATCH;
+  typedef interface ICreateErrorInfo *LPCREATEERRORINFO;
+
+ extern "C" const IID IID_ITypeLib;
+ extern "C" const IID IID_ICreateTypeInfo;
+ extern "C" const IID IID_ICreateTypeInfo2;
+ extern "C" const IID IID_ICreateTypeLib;
+ extern "C" const IID IID_ICreateTypeLib2;
+ extern "C" const IID IID_ITypeInfo;
+ extern "C" const IID IID_IErrorInfo;
+ extern "C" const IID IID_IDispatch;
+ extern "C" const IID IID_ICreateErrorInfo;
+
+  typedef enum tagSYSKIND {
+   SYS_WIN16,SYS_WIN32,SYS_MAC
+  } SYSKIND;
+***************
+*** 375,382 ****
+   STDMETHOD_(ULONG,Release)(THIS) PURE;
+   STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+   STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+!  STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID)
+PURE;
+!  STDMETHOD(Invoked)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+  };
+
+  #ifdef __cplusplus
+--- 394,401 ----
+   STDMETHOD_(ULONG,Release)(THIS) PURE;
+   STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+   STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+!  STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*)
+PURE;
+!  STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+  };
+
+  #ifdef __cplusplus
+
+
+*** \gcc-inc\objidl.h Sat Jul 31 16:48:42 1999
+--- objidl.h Fri Aug 06 11:00:19 1999
+***************
+*** 627,633 ****
+   STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
+   STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
+   STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
+!  STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC*) PURE;
+   STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
+   STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
+   STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
+--- 627,633 ----
+   STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
+   STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
+   STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
+!  STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC**) PURE;
+   STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
+   STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
+   STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
+
+
+
+
--- a/autogen.sh
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+autoconf
--- a/config.guess
+++ b/config.guess
@@ -0,0 +1,951 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	cat <<EOF >dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} dummy.s -o dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f dummy.s dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >dummy.c
+	int main (argc, argv) int argc; char **argv; {
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy \
+	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	fi
+        else echo i586-dg-dgux${UNAME_RELEASE}
+        fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i?86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		sed 's/^		//' << EOF >dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+		rm -f dummy.c dummy
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:4)
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=4.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[34678]??:HP-UX:*:*)
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
+              sed 's/^              //' << EOF >dummy.c
+              #include <stdlib.h>
+              #include <unistd.h>
+              
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif 
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+              
+                  switch (cpu) 
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0: 
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits) 
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif 
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+	(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
+	rm -f dummy.c dummy
+	esac
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	sed 's/^	//' << EOF >dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin32
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin32
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
+	esac
+
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us.
+	ld_help_string=`ld --help 2>&1`
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} dummy.s -o dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac	
+
+			objdump --private-headers dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f dummy.s dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >dummy.c <<EOF
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  # Determine whether the default compiler is a.out or elf
+	  cat >dummy.c <<EOF
+#include <features.h>
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+    i?86:DYNIX/ptx:4*:*)
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
+	exit 0 ;;
+    i?86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    i?86:UnixWare:*:*)
+	if /bin/uname -X 2>/dev/null >/dev/null ; then
+	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+	    && UNAME_MACHINE=i586
+	fi
+	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i?86:LynxOS:2.*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+cat >dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+  printf ("vax-dec-bsd\n"); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
+rm -f dummy.c dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1
--- a/config.sub
+++ b/config.sub
@@ -0,0 +1,955 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple)
+		os=
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
+		basic_machine=$basic_machine-unknown
+		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i[34567]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		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-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-cbm
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-cbm
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[34567]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[34567]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[34567]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[34567]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	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/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=rs6000-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+	        ;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+	        ;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# 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
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sparc)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-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* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+        *-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
--- a/12971
+++ b/12971
--- a/configure.in
+++ b/configure.in
--- a/contrib/include/wx/xml/xh_all.h
+++ b/contrib/include/wx/xml/xh_all.h
@@ -1,49 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_all.h
-// Purpose:     includes all xh_*.h files
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_ALL_H_
-#define _WX_XH_ALL_H_
-
-
-// Existing handlers:
-
-#include "wx/xml/xh_menu.h"
-#include "wx/xml/xh_panel.h"
-#include "wx/xml/xh_dlg.h"
-#include "wx/xml/xh_bttn.h"
-#include "wx/xml/xh_chckb.h"
-#include "wx/xml/xh_gauge.h"
-#include "wx/xml/xh_html.h"
-#include "wx/xml/xh_spin.h"
-#include "wx/xml/xh_sttxt.h"
-#include "wx/xml/xh_slidr.h"
-#include "wx/xml/xh_radbt.h"
-#include "wx/xml/xh_radbx.h"
-#include "wx/xml/xh_combo.h"
-#include "wx/xml/xh_chckl.h"
-#include "wx/xml/xh_choic.h"
-#include "wx/xml/xh_sizer.h"
-#include "wx/xml/xh_stbmp.h"
-#include "wx/xml/xh_notbk.h"
-#include "wx/xml/xh_text.h"
-#include "wx/xml/xh_listb.h"
-#include "wx/xml/xh_toolb.h"
-#include "wx/xml/xh_bmpbt.h"
-#include "wx/xml/xh_stbox.h"
-#include "wx/xml/xh_scrol.h"
-#include "wx/xml/xh_tree.h"
-#include "wx/xml/xh_cald.h"
-#include "wx/xml/xh_listc.h"
-#include "wx/xml/xh_stlin.h"
-#include "wx/xml/xh_bmp.h"
-#include "wx/xml/xh_unkwn.h"
-#include "wx/xml/xh_frame.h"
-
-#endif // _WX_XMLRES_H_
--- a/contrib/include/wx/xml/xh_bmp.h
+++ b/contrib/include/wx/xml/xh_bmp.h
@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmp.h
-// Purpose:     XML resource handler for wxBitmap and wxIcon
-// Author:      Vaclav Slavik
-// Created:     2000/09/00
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BMP_H_
-#define _WX_XH_BMP_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_bmp.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-
-class WXDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxBitmapXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-class WXDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxIconXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BMP_H_
--- a/contrib/include/wx/xml/xh_bmpbt.h
+++ b/contrib/include/wx/xml/xh_bmpbt.h
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmpbt.h
-// Purpose:     XML resource handler for bitmap buttons
-// Author:      Brian Gavin
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BMPBT_H_
-#define _WX_XH_BMPBT_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_bmpbt.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-
-class WXDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxBitmapButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BMPBT_H_
--- a/contrib/include/wx/xml/xh_bttn.h
+++ b/contrib/include/wx/xml/xh_bttn.h
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bttn.h
-// Purpose:     XML resource handler for buttons
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BTTN_H_
-#define _WX_XH_BTTN_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_bttn.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BTTN_H_
--- a/contrib/include/wx/xml/xh_cald.h
+++ b/contrib/include/wx/xml/xh_cald.h
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_cald.h
-// Purpose:     XML resource handler for wxCalendarCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CALD_H_
-#define _WX_XH_CALD_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_cald.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxCalendarCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_CALD_H_
--- a/contrib/include/wx/xml/xh_chckb.h
+++ b/contrib/include/wx/xml/xh_chckb.h
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_chckb.h
-// Purpose:     XML resource handler for wxCheckBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CHCKB_H_
-#define _WX_XH_CHCKB_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_chckb.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-#include "wx/defs.h"
-
-#if wxUSE_CHECKBOX
-
-class WXDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxCheckBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-
-#endif // _WX_XH_CHECKBOX_H_
-
--- a/contrib/include/wx/xml/xh_chckl.h
+++ b/contrib/include/wx/xml/xh_chckl.h
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_chckl.h
-// Purpose:     XML resource handler for wxCheckListBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CHCKL_H_
-#define _WX_XH_CHCKL_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_chckl.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxCheckListXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
-};
-
-
-
-#endif // _WX_XH_CHECKLIST_H_
--- a/contrib/include/wx/xml/xh_choic.h
+++ b/contrib/include/wx/xml/xh_choic.h
@@ -1,32 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_choic.h
-// Purpose:     XML resource handler for wxChoice
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CHOIC_H_
-#define _WX_XH_CHOIC_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_choic.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxChoiceXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
-};
-
-
-#endif // _WX_XH_CHOIC_H_
--- a/contrib/include/wx/xml/xh_combo.h
+++ b/contrib/include/wx/xml/xh_combo.h
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_combo.h
-// Purpose:     XML resource handler for wxComboBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_COMBO_H_
-#define _WX_XH_COMBO_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_combo.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-#if wxUSE_COMBOBOX
-
-class WXDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxComboBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
-};
-
-#endif
-
-#endif // _WX_XH_COMBO_H_
--- a/contrib/include/wx/xml/xh_dlg.h
+++ b/contrib/include/wx/xml/xh_dlg.h
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_dlg.h
-// Purpose:     XML resource handler for dialogs
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_DLG_H_
-#define _WX_XH_DLG_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_dlg.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxDialogXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_DLG_H_
--- a/contrib/include/wx/xml/xh_frame.h
+++ b/contrib/include/wx/xml/xh_frame.h
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_frame.h
-// Purpose:     XML resource handler for dialogs
-// Author:      Vaclav Slavik & Aleks.
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_FRAME_H_
-#define _WX_XH_FRAME_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_frame.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxFrameXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_FRAME_H_
--- a/contrib/include/wx/xml/xh_gauge.h
+++ b/contrib/include/wx/xml/xh_gauge.h
@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_gauge.h
-// Purpose:     XML resource handler for wxGauge
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_GAUGE_H_
-#define _WX_XH_GAUGE_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_gauge.h"
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-
-#include "wx/xml/xmlres.h"
-
-
-class WXDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
-{
-    enum 
-    {
-        wxGAUGE_DEFAULT_RANGE = 100
-    };
-
-    public:
-        wxGaugeXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_GAUGE_H_
--- a/contrib/include/wx/xml/xh_html.h
+++ b/contrib/include/wx/xml/xh_html.h
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_html.h
-// Purpose:     XML resource handler for wxHtmlWindow
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_HTML_H_
-#define _WX_XH_HTML_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_html.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-#include "wx/defs.h"
-
-#if wxUSE_HTML
-
-class WXDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxHtmlWindowXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_SLIDER_H_
--- a/contrib/include/wx/xml/xh_listb.h
+++ b/contrib/include/wx/xml/xh_listb.h
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_listb.h
-// Purpose:     XML resource handler for wxListbox
-// Author:      Bob Mitchell & Vaclav Slavik
-// Created:     2000/07/29
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell & Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_LISTB_H_
-#define _WX_XH_LISTB_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_listb.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-#if wxUSE_LISTBOX
-
-class WXDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxListBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
-};
-
-#endif
-
-#endif // _WX_XH_LISTB_H_
--- a/contrib/include/wx/xml/xh_listc.h
+++ b/contrib/include/wx/xml/xh_listc.h
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_listc.h
-// Purpose:     XML resource handler for wxCalendarCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_LISTC_H_
-#define _WX_XH_LISTC_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_listc.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxListCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_LISTC_H_
--- a/contrib/include/wx/xml/xh_menu.h
+++ b/contrib/include/wx/xml/xh_menu.h
@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_menu.h
-// Purpose:     XML resource handler for menus/menubars
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_MENU_H_
-#define _WX_XH_MENU_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_menu.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxMenuXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-        
-    private:
-        bool m_InsideMenu;
-};
-
-class WXDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxMenuBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_MENU_H_
--- a/contrib/include/wx/xml/xh_notbk.h
+++ b/contrib/include/wx/xml/xh_notbk.h
@@ -1,37 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_notbk.h
-// Purpose:     XML resource handler for wxNotebook
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_NOTBK_H_
-#define _WX_XH_NOTBK_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_notbk.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-#if wxUSE_NOTEBOOK
-
-class WXDLLEXPORT wxNotebook;
-
-class WXDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxNotebookXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-        
-    private:
-        bool m_IsInside;
-        wxNotebook *m_Notebook;
-};
-
-#endif
-
-#endif // _WX_XH_NOTBK_H_
--- a/contrib/include/wx/xml/xh_panel.h
+++ b/contrib/include/wx/xml/xh_panel.h
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_panel.h
-// Purpose:     XML resource handler for panels
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_PANEL_H_
-#define _WX_XH_PANEL_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_panel.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxPanelXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_PANEL_H_
--- a/contrib/include/wx/xml/xh_radbt.h
+++ b/contrib/include/wx/xml/xh_radbt.h
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_radbt.h
-// Purpose:     XML resource handler for radio buttons
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_RADBT_H_
-#define _WX_XH_RADBT_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_radbt.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-#include "wx/defs.h"
-
-#if wxUSE_RADIOBOX
-
-class WXDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxRadioButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_RADIOBUTTON_H_
--- a/contrib/include/wx/xml/xh_radbx.h
+++ b/contrib/include/wx/xml/xh_radbx.h
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_radbx.h
-// Purpose:     XML resource handler for radio box
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_RADBX_H_
-#define _WX_XH_RADBX_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_radbx.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-#if wxUSE_RADIOBOX
-
-class WXDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxRadioBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-    private:
-        bool m_InsideBox;
-        wxArrayString strList;
-};
-
-#endif
-
-#endif // _WX_XH_RADBX_H_
--- a/contrib/include/wx/xml/xh_scrol.h
+++ b/contrib/include/wx/xml/xh_scrol.h
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_scrol.h
-// Purpose:     XML resource handler for wxScrollBar
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SCROL_H_
-#define _WX_XH_SCROL_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_scrol.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-#include "wx/defs.h"
-
-
-
-class WXDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
-{
-    enum 
-    {
-        wxSL_DEFAULT_VALUE = 0,
-        wxSL_DEFAULT_MIN = 0,
-        wxSL_DEFAULT_MAX = 100
-    };
-
-    public:
-        wxScrollBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_SCROL_H_
--- a/contrib/include/wx/xml/xh_sizer.h
+++ b/contrib/include/wx/xml/xh_sizer.h
@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_sizer.h
-// Purpose:     XML resource handler for wxBoxSizer
-// Author:      Vaclav Slavik
-// Created:     2000/04/24
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SIZER_H_
-#define _WX_XH_SIZER_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_sizer.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-
-class WXDLLEXPORT wxSizer;
-
-class WXDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxSizerXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-        
-    private:
-        bool m_IsInside;
-        wxSizer *m_ParentSizer;
-        
-        bool IsSizerNode(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BOXSIZER_H_
--- a/contrib/include/wx/xml/xh_slidr.h
+++ b/contrib/include/wx/xml/xh_slidr.h
@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_slidr.h
-// Purpose:     XML resource handler for wxSlider
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SLIDR_H_
-#define _WX_XH_SLIDR_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_slidr.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-#include "wx/defs.h"
-
-#if wxUSE_SLIDER
-
-class WXDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
-{
-    enum 
-    {
-        wxSL_DEFAULT_VALUE = 0,
-        wxSL_DEFAULT_MIN = 0,
-        wxSL_DEFAULT_MAX = 100
-    };
-
-    public:
-        wxSliderXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_SLIDER_H_
--- a/contrib/include/wx/xml/xh_spin.h
+++ b/contrib/include/wx/xml/xh_spin.h
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_spin.h
-// Purpose:     XML resource handler for wxSpinButton
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SPIN_H_
-#define _WX_XH_SPIN_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_spin.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-#include "wx/defs.h"
-
-#if wxUSE_SPINBTN
-class WXDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
-{
-    enum 
-    {
-        wxSP_DEFAULT_VALUE = 0,
-        wxSP_DEFAULT_MIN = 0,
-        wxSP_DEFAULT_MAX = 100
-    };
-
-    public:
-        wxSpinButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-#endif
-
-#if wxUSE_SPINCTRL
-class WXDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
-{
-    enum 
-    {
-        wxSP_DEFAULT_VALUE = 0,
-        wxSP_DEFAULT_MIN = 0,
-        wxSP_DEFAULT_MAX = 100
-    };
-
-    public:
-        wxSpinCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-#endif
-
-#endif // _WX_XH_SPIN_H_
--- a/contrib/include/wx/xml/xh_stbmp.h
+++ b/contrib/include/wx/xml/xh_stbmp.h
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stbmp.h
-// Purpose:     XML resource handler for wxStaticBitmap
-// Author:      Vaclav Slavik
-// Created:     2000/04/22
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STBMP_H_
-#define _WX_XH_STBMP_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_stbmp.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-
-class WXDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxStaticBitmapXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_STBMP_H_
--- a/contrib/include/wx/xml/xh_stbox.h
+++ b/contrib/include/wx/xml/xh_stbox.h
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stbox.h
-// Purpose:     XML resource handler for wxStaticBox
-// Author:      Brian Gavin
-// Created:     2000/09/00
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STBOX_H_
-#define _WX_XH_STBOX_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_stbox.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-
-class WXDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxStaticBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_STBOX_H_
--- a/contrib/include/wx/xml/xh_stlin.h
+++ b/contrib/include/wx/xml/xh_stlin.h
@@ -1,32 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stlin.h
-// Purpose:     XML resource handler for wxStaticLine
-// Author:      Vaclav Slavik
-// Created:     2000/09/00
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STLIN_H_
-#define _WX_XH_STLIN_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_stlin.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-#if wxUSE_STATLINE
-
-class WXDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxStaticLineXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_STLIN_H_
--- a/contrib/include/wx/xml/xh_sttxt.h
+++ b/contrib/include/wx/xml/xh_sttxt.h
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_sttxt.h
-// Purpose:     XML resource handler for wxStaticBitmap
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STTXT_H_
-#define _WX_XH_STTXT_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_sttxt.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-
-class WXDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxStaticTextXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_STBMP_H_
--- a/contrib/include/wx/xml/xh_text.h
+++ b/contrib/include/wx/xml/xh_text.h
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_text.h
-// Purpose:     XML resource handler for wxTextCtrl
-// Author:      Aleksandras Gluchovas
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TEXT_H_
-#define _WX_XH_TEXT_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_text.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-
-class WXDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxTextCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_TEXT_H_
--- a/contrib/include/wx/xml/xh_toolb.h
+++ b/contrib/include/wx/xml/xh_toolb.h
@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_toolb.h
-// Purpose:     XML resource handler for wxBoxSizer
-// Author:      Vaclav Slavik
-// Created:     2000/08/11
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TOOLB_H_
-#define _WX_XH_TOOLB_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_toolb.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-#if wxUSE_TOOLBAR
-
-class WXDLLEXPORT wxToolBar;
-
-class WXDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxToolBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-        
-    private:
-        bool m_IsInside;
-        wxToolBar *m_Toolbar;
-};
-
-#endif
-
-#endif // _WX_XH_TOOLBAR_H_
--- a/contrib/include/wx/xml/xh_tree.h
+++ b/contrib/include/wx/xml/xh_tree.h
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_tree.h
-// Purpose:     XML resource handler for wxTreeCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TREE_H_
-#define _WX_XH_TREE_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_tree.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-class WXDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxTreeCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_TREE_H_
--- a/contrib/include/wx/xml/xh_unkwn.h
+++ b/contrib/include/wx/xml/xh_unkwn.h
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_unkwn.h
-// Purpose:     XML resource handler for unkown widget
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_UNKWN_H_
-#define _WX_XH_UNKWN_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_unkwn.h"
-#endif
-
-#include "wx/xml/xmlres.h"
-
-
-class WXDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxUnknownWidgetXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_UNKWN_H_
--- a/contrib/include/wx/xml/xml.h
+++ b/contrib/include/wx/xml/xml.h
@@ -1,239 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xml.h
-// Purpose:     wxXmlDocument - XML parser & data holder class
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XML_H_
-#define _WX_XML_H_
-
-#ifdef __GNUG__
-#pragma interface "xml.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/object.h"
-#include "wx/list.h"
-
-
-class WXDLLEXPORT wxXmlNode;
-class WXDLLEXPORT wxXmlProperty;
-class WXDLLEXPORT wxXmlDocument;
-class WXDLLEXPORT wxXmlIOHandler;
-class WXDLLEXPORT wxInputStream;
-class WXDLLEXPORT wxOutputStream;
-
-
-// Represents XML node type.
-enum wxXmlNodeType
-{
-    // note: values are synchronized with xmlElementType from libxml
-    wxXML_ELEMENT_NODE       =  1,
-    wxXML_ATTRIBUTE_NODE     =  2,
-    wxXML_TEXT_NODE          =  3,
-    wxXML_CDATA_SECTION_NODE =  4,
-    wxXML_ENTITY_REF_NODE    =  5,
-    wxXML_ENTITY_NODE        =  6,
-    wxXML_PI_NODE            =  7,
-    wxXML_COMMENT_NODE       =  8,
-    wxXML_DOCUMENT_NODE      =  9,
-    wxXML_DOCUMENT_TYPE_NODE = 10,
-    wxXML_DOCUMENT_FRAG_NODE = 11,
-    wxXML_NOTATION_NODE      = 12,
-    wxXML_HTML_DOCUMENT_NODE = 13
-};
-
-
-// Types of XML files:
-
-enum wxXmlIOType
-{
-    wxXML_IO_AUTO = 0, // detect it automatically
-    wxXML_IO_LIBXML,   // use libxml2 to parse/save XML document
-    wxXML_IO_BIN,      // save in binary uncompressed proprietary format
-    wxXML_IO_BINZ      // svae in binary zlib-compressed proprietary format
-};
-
-
-// Represents node property(ies).
-// Example: in <img src="hello.gif" id="3"/> "src" is property with value
-//          "hello.gif" and "id" is prop. with value "3".
-
-class WXDLLEXPORT wxXmlProperty
-{
-    public:
-        wxXmlProperty() : m_Next(NULL) {}
-        wxXmlProperty(const wxString& name, const wxString& value, wxXmlProperty *next)
-            : m_Name(name), m_Value(value), m_Next(next) {}
-        ~wxXmlProperty() { delete m_Next; }
-    
-        wxString GetName() const { return m_Name; }
-        wxString GetValue() const { return m_Value; }
-        wxXmlProperty *GetNext() const { return m_Next; }
-        
-        void SetName(const wxString& name) { m_Name = name; }
-        void SetValue(const wxString& value) { m_Value = value; }
-        void SetNext(wxXmlProperty *next) { m_Next = next; }
-
-    private:
-        wxString m_Name;
-        wxString m_Value;
-        wxXmlProperty *m_Next;
-};
-
-
-
-// Represents node in XML document. Node has name and may have content
-// and properties. Most common node types are wxXML_TEXT_NODE (name and props
-// are irrelevant) and wxXML_ELEMENT_NODE (e.g. in <title>hi</title> there is
-// element with name="title", irrelevant content and one child (wxXML_TEXT_NODE
-// with content="hi").
-
-class WXDLLEXPORT wxXmlNode
-{
-    public:
-        wxXmlNode() : m_Properties(NULL), m_Parent(NULL), 
-                      m_Children(NULL), m_Next(NULL) {}
-        wxXmlNode(wxXmlNode *parent,wxXmlNodeType type, 
-                  const wxString& name, const wxString& content,
-                  wxXmlProperty *props, wxXmlNode *next);
-        ~wxXmlNode() { delete m_Properties; delete m_Next; delete m_Children; }
-
-        // copy ctor & operator=. Note that this does NOT copy syblings
-        // and parent pointer, i.e. m_Parent and m_Next will be NULL
-        // after using copy ctor and are never unmodified by operator=.
-        // On the other hand, it DOES copy children and properties.
-        wxXmlNode(const wxXmlNode& node);
-        wxXmlNode& operator=(const wxXmlNode& node);
-        
-        // user-friendly creation:
-        wxXmlNode(wxXmlNodeType type, const wxString& name, 
-                  const wxString& content = wxEmptyString);
-        void AddChild(wxXmlNode *child);
-        void InsertChild(wxXmlNode *child, wxXmlNode *before_node);
-        bool RemoveChild(wxXmlNode *child);
-        void AddProperty(const wxString& name, const wxString& value);
-        bool DeleteProperty(const wxString& name);
-
-        // access methods:
-        wxXmlNodeType GetType() const { return m_Type; }
-        wxString GetName() const { return m_Name; }
-        wxString GetContent() const { return m_Content; }
-        
-        wxXmlNode *GetParent() const { return m_Parent; }
-        wxXmlNode *GetNext() const { return m_Next; }
-        wxXmlNode *GetChildren() const { return m_Children; }
-
-        wxXmlProperty *GetProperties() const { return m_Properties; }
-        bool GetPropVal(const wxString& propName, wxString *value) const;
-        wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const;
-        bool HasProp(const wxString& propName) const;
-        
-        void SetType(wxXmlNodeType type) { m_Type = type; }
-        void SetName(const wxString& name) { m_Name = name; }
-        void SetContent(const wxString& con) { m_Content = con; }
-        
-        void SetParent(wxXmlNode *parent) { m_Parent = parent; }
-        void SetNext(wxXmlNode *next) { m_Next = next; }
-        void SetChildren(wxXmlNode *child) { m_Children = child; }
-        
-        void SetProperties(wxXmlProperty *prop) { m_Properties = prop; }
-        void AddProperty(wxXmlProperty *prop);
-
-    private:
-        wxXmlNodeType m_Type;
-        wxString m_Name;
-        wxString m_Content;
-        wxXmlProperty *m_Properties;
-        wxXmlNode *m_Parent, *m_Children, *m_Next;
-
-        void DoCopy(const wxXmlNode& node);
-};
-
-
-
-
-
-
-
-// This class holds XML data/document as parsed by libxml. Note that 
-// internal representation is independant on libxml and you can use 
-// it without libxml (see Load/SaveBinary).
-
-class WXDLLEXPORT wxXmlDocument : public wxObject
-{
-    public:
-        wxXmlDocument() : wxObject(), m_Version(wxT("1.0")), m_Root(NULL)  {}
-        wxXmlDocument(const wxString& filename, wxXmlIOType io_type = wxXML_IO_AUTO);
-        wxXmlDocument(wxInputStream& stream, wxXmlIOType io_type = wxXML_IO_AUTO);
-        ~wxXmlDocument() { delete m_Root; }
-        
-        wxXmlDocument(const wxXmlDocument& doc);
-        wxXmlDocument& operator=(const wxXmlDocument& doc);
-    
-        // Parses .xml file and loads data. Returns TRUE on success, FALSE
-        // otherwise. 
-        // NOTE: Any call to this method will result into linking against libxml
-        //       and app's binary size will grow by ca. 250kB
-        bool Load(const wxString& filename, wxXmlIOType io_type = wxXML_IO_AUTO);
-        bool Load(wxInputStream& stream, wxXmlIOType io_type = wxXML_IO_AUTO);
-        
-        // Saves document as .xml file.
-        bool Save(const wxString& filename, wxXmlIOType io_type) const;
-        bool Save(wxOutputStream& stream, wxXmlIOType io_type) const;
-        
-        // Returns root node of the document.
-        wxXmlNode *GetRoot() const { return m_Root; }
-        
-        // Returns version of document (may be empty).
-        wxString GetVersion() const { return m_Version; }
-        // Returns encoding of document (may be empty).
-        wxString GetEncoding() const { return m_Encoding; }
-        
-        // Write-access methods:
-        void SetRoot(wxXmlNode *node) { delete m_Root ; m_Root = node; }
-        void SetVersion(const wxString& version) { m_Version = version; }
-        void SetEncoding(const wxString& encoding) { m_Encoding = encoding; }
-
-        static void AddHandler(wxXmlIOHandler *handler);
-        static void CleanUpHandlers();
-        static void InitStandardHandlers();
-
-    protected:
-        static wxList *sm_Handlers;
-
-    private:
-        wxString m_Version, m_Encoding;
-        wxXmlNode *m_Root;
-        
-        void DoCopy(const wxXmlDocument& doc);
-};
-
-
-
-// wxXmlIOHandler takes care of loading and/or saving XML data.
-// see xmlio.h for available handlers
-
-class WXDLLEXPORT wxXmlIOHandler : public wxObject
-{
-    public:
-        wxXmlIOHandler() {}
-        
-        virtual wxXmlIOType GetType() = 0;
-        virtual bool CanLoad(wxInputStream& stream) = 0;
-        virtual bool CanSave() = 0;
-        
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc) = 0;
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc) = 0;
-};
-
-
-
-
-
-#endif // _WX_XML_H_
--- a/contrib/include/wx/xml/xmlio.h
+++ b/contrib/include/wx/xml/xmlio.h
@@ -1,72 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xmlio.h
-// Purpose:     wxXmlIOHandler - XML I/O classes
-// Author:      Vaclav Slavik
-// Created:     2000/07/24
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XMLIO_H_
-#define _WX_XMLIO_H_
-
-#ifdef __GNUG__
-#pragma interface "xmlio.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/xml/xml.h"
-
-
-class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
-{
-    public:
-        wxXmlIOHandlerBin() {}
-
-        virtual wxXmlIOType GetType() { return wxXML_IO_BIN; }
-        virtual bool CanLoad(wxInputStream& stream);
-        virtual bool CanSave() { return TRUE; }
-
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
-        
-    protected: 
-        wxString ReadHeader(wxInputStream& stream);
-        void WriteHeader(wxOutputStream& stream, const wxString& header);
-};
-
-
-
-#if wxUSE_ZLIB
-
-class WXDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
-{
-    public:
-        wxXmlIOHandlerBinZ() {}
-
-        virtual wxXmlIOType GetType() { return wxXML_IO_BINZ; }
-        virtual bool CanLoad(wxInputStream& stream);
-
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
-};
-
-#endif
-
-
-
-class WXDLLEXPORT wxXmlIOHandlerLibxml : public wxXmlIOHandler
-{
-    public:
-        virtual wxXmlIOType GetType() { return wxXML_IO_LIBXML; }
-        virtual bool CanLoad(wxInputStream& stream);
-        virtual bool CanSave();
-
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
-};
-
-
-#endif // _WX_XMLIO_H_
--- a/contrib/include/wx/xml/xmlres.h
+++ b/contrib/include/wx/xml/xmlres.h
@@ -1,303 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xmlres.h
-// Purpose:     XML resources
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XMLRES_H_
-#define _WX_XMLRES_H_
-
-#ifdef __GNUG__
-#pragma interface "xmlres.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/dynarray.h"
-#include "wx/datetime.h"
-#include "wx/list.h"
-#include "wx/gdicmn.h"
-#include "wx/filesys.h"
-#include "wx/bitmap.h"
-#include "wx/icon.h"
-
-class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxDialog;
-class WXDLLEXPORT wxPanel;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxToolBar;
-
-class WXDLLEXPORT wxXmlResourceHandler;
-
-#include "wx/xml/xml.h"
-
-
-class WXDLLEXPORT wxXmlResourceDataRecord
-{
-    public:
-        wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
-        ~wxXmlResourceDataRecord() {delete Doc;}
-    
-        wxString File;
-        wxXmlDocument *Doc;
-        wxDateTime Time;
-};
-
-WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
-
-// This class holds XML resources from one or more .xml files 
-// (or derived forms, either binary or zipped -- see manual for
-// details). 
-
-class WXDLLEXPORT wxXmlResource : public wxObject
-{
-    public:
-        // Ctor. If use_locale is TRUE, translatable strings are
-        // translated via _(). You can disable it by passing use_locale=FALSE
-        // (for example if you provide resource file for each locale)
-        wxXmlResource(bool use_locale = TRUE);
-        wxXmlResource(const wxString& filemask, bool use_locale = TRUE);
-        ~wxXmlResource();
-
-        // Loads resources from XML files that match given filemask.
-        // This method understands VFS (see filesys.h).
-        bool Load(const wxString& filemask);
-        
-        // Initialize handlers for all supported controls/windows. This will
-        // make the executable quite big because it forces linking against
-        // most of wxWin library
-        void InitAllHandlers();
-        
-        // Initialize only specific handler (or custom handler). Convention says
-        // that handler name is equal to control's name plus 'XmlHandler', e.g.
-        // wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. XML resource compiler
-        // (xmlres) can create include file that contains initialization code for 
-        // all controls used within the resource.
-        void AddHandler(wxXmlResourceHandler *handler);
-        
-        // Removes all handlers
-        void ClearHandlers();
-        
-        // Loads menu from resource. Returns NULL on failure.
-        wxMenu *LoadMenu(const wxString& name);
-
-        // Loads menubar from resource. Returns NULL on failure.
-        wxMenuBar *LoadMenuBar(const wxString& name);
-
-#if wxUSE_TOOLBAR
-        // Loads toolbar
-        wxToolBar *LoadToolBar(wxWindow *parent, const wxString& name);
-#endif
-
-        // Loads dialog. dlg points to parent window (if any). Second form
-        // is used to finish creation of already existing instance (main reason
-        // for this is that you may want to use derived class with new event table)
-        // Example (typical usage):
-        //      MyDialog dlg;
-        //      wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog");
-        //      dlg->ShowModal();
-        wxDialog *LoadDialog(wxWindow *parent, const wxString& name);
-        bool LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name);
-
-        // Loads panel. panel points to parent window (if any). Second form
-        // is used to finish creation of already existing instance.
-        wxPanel *LoadPanel(wxWindow *parent, const wxString& name);
-        bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name);
-
-        bool LoadFrame(wxFrame* frame, wxWindow *parent, const wxString& name);
-
-        // Loads bitmap or icon resource from file:
-        wxBitmap LoadBitmap(const wxString& name);
-        wxIcon LoadIcon(const wxString& name);
-
-        // Returns numeric ID that is equivalent to string id used in XML
-        // resource. To be used in event tables
-        // Macro XMLID is provided for convenience
-        static int GetXMLID(const char *str_id);
-
-    protected:
-        // Scans resources list for unloaded files and loads them. Also reloads
-        // files that have been modified since last loading.
-        void UpdateResources();
-        
-        // Finds resource (calls UpdateResources) and returns node containing it
-        wxXmlNode *FindResource(const wxString& name, const wxString& classname);
-        
-        // Creates resource from info in given node:
-        wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
-
-        // Remove nodes with property "platform" that does not
-        // match current platform
-        void ProcessPlatformProperty(wxXmlNode *node);
-        
-        bool GetUseLocale() { return m_UseLocale; }
-
-    private:
-        bool m_UseLocale;
-        wxList m_Handlers;
-        wxXmlResourceDataRecords m_Data;
-#if wxUSE_FILESYSTEM
-        wxFileSystem m_CurFileSystem;
-        wxFileSystem& GetCurFileSystem() { return m_CurFileSystem; }
-#endif
-
-        friend class wxXmlResourceHandler;
-};
-
-
-// Global instance of resource class. For your convenience.
-extern wxXmlResource *wxTheXmlResource;
-
-// This macro translates string identifier (as used in XML resource,
-// e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
-// wxWindows event tables.
-// Example:
-//    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-//       EVT_MENU(XMLID("quit"), MyFrame::OnQuit)
-//       EVT_MENU(XMLID("about"), MyFrame::OnAbout)
-//       EVT_MENU(XMLID("new"), MyFrame::OnNew)
-//       EVT_MENU(XMLID("open"), MyFrame::OnOpen)
-//    END_EVENT_TABLE()    
-
-#define XMLID(str_id) \
-    wxXmlResource::GetXMLID(wxT(str_id))
-
-
-// This macro returns pointer to particular control in dialog
-// created using XML resources. You can use it to set/get values from
-// controls.
-// Example:
-//    wxDialog dlg;
-//    wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog");
-//    XMLCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(wxT("default value"));
-
-#define XMLCTRL(window, id, type) \
-    ((type*)((window).FindWindow(XMLID(id))))
-
-
-
-class WXDLLEXPORT wxXmlResourceHandler : public wxObject
-{
-    public:
-        wxXmlResourceHandler();
-        virtual ~wxXmlResourceHandler() {}
-
-        // Creates object (menu, dialog, control, ...) from XML node.
-        // Should check for validity.
-        // parent is higher-level object (usually window, dialog or panel)
-        // that is often neccessary to create resource
-        // if instance != NULL it should not create new instance via 'new' but
-        // rather use this one and call its Create method
-        wxObject *CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance);
-
-        // This one is called from CreateResource after variables
-        // were filled
-        virtual wxObject *DoCreateResource() = 0;
-        
-        // Returns TRUE if it understands this node and can create
-        // resource from it, FALSE otherwise.
-        virtual bool CanHandle(wxXmlNode *node) = 0;
-
-        void SetParentResource(wxXmlResource *res) { m_Resource = res; }
-
-
-    protected:
-
-        wxXmlResource *m_Resource;
-        wxArrayString m_StyleNames;
-        wxArrayInt m_StyleValues;
-
-        // Variables (filled by CreateResource)
-        wxXmlNode *m_Node;
-        wxString m_Class;
-        wxObject *m_Parent, *m_Instance;
-        wxWindow *m_ParentAsWindow, *m_InstanceAsWindow;
-        
-        // --- Handy methods:
-
-        // Returns true if the node has property class equal to classname,
-        // e.g. <object class="wxDialog">
-        bool IsOfClass(wxXmlNode *node, const wxString& classname)
-            { return node->GetPropVal(wxT("class"), wxEmptyString) == classname; }
-
-        // Gets node content from wxXML_ENTITY_NODE
-        // (the problem is, <tag>content<tag> is represented as
-        // wxXML_ENTITY_NODE name="tag", content=""
-        //    |-- wxXML_TEXT_NODE or 
-        //        wxXML_CDATA_SECTION_NODE name="" content="content"
-        wxString GetNodeContent(wxXmlNode *node);
-
-        // Check to see if a param exists
-        bool HasParam(const wxString& param);      
-
-        // Finds the node or returns NULL
-        wxXmlNode *GetParamNode(const wxString& param);
-        wxString GetParamValue(const wxString& param);
-            
-        // Add style flag (e.g. wxMB_DOCKABLE) to list of flags
-        // understood by this handler
-        void AddStyle(const wxString& name, int value);
-	
-        // Add styles common to all wxWindow-derived classes
-        void AddWindowStyles();
-        
-        // Gets style flags from text in form "flag | flag2| flag3 |..."
-        // Only understads flags added with AddStyle
-        int GetStyle(const wxString& param = wxT("style"), int defaults = 0);
-        
-        // Gets text from param and does some convertions:
-        // - replaces \n, \r, \t by respective chars (according to C syntax)
-        // - replaces $ by & and $$ by $ (needed for $File => &File because of XML)
-        // - calls wxGetTranslations (unless disabled in wxXmlResource)
-        wxString GetText(const wxString& param);
-
-        // Return XMLID
-        int GetID();
-        wxString GetName();
-
-        // Get bool flag (1,t,yes,on,true are TRUE, everything else is FALSE)
-        bool GetBool(const wxString& param, bool defaultv = FALSE);
-
-        // Get integer value from param
-        long GetLong( const wxString& param, long defaultv = 0 );
-        
-        // Get colour in HTML syntax (#RRGGBB)
-        wxColour GetColour(const wxString& param);
-        
-        // Get size/position (may be in dlg units):
-        wxSize GetSize(const wxString& param = wxT("size"));
-        wxPoint GetPosition(const wxString& param = wxT("pos"));
-
-        // Get dimension (may be in dlg units):
-        wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0);
-        
-        // Get bitmap:
-        wxBitmap GetBitmap(const wxString& param = wxT("bitmap"), wxSize size = wxDefaultSize);
-        wxIcon GetIcon(const wxString& param = wxT("icon"), wxSize size = wxDefaultSize);
-        
-        // Get font:
-        wxFont GetFont(const wxString& param = wxT("font"));
-        
-        // Sets common window options:
-        void SetupWindow(wxWindow *wnd);
-    
-        void CreateChildren(wxObject *parent, bool this_hnd_only = FALSE);
-        void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL);
-        wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL)
-            { return m_Resource->CreateResFromNode(node, parent, instance); }
-
-        // helper
-        wxFileSystem& GetCurFileSystem() { return m_Resource->GetCurFileSystem(); }
-};
-
-#define ADD_STYLE(style) AddStyle(wxT(#style), style)
-
-
-
-#endif // _WX_XMLRES_H_
--- a/contrib/samples/xml/Makefile.in
+++ b/contrib/samples/xml/Makefile.in
@@ -1,23 +0,0 @@
-###############################################################################
-# Purpose: Makefile.in for xml resources sample for Unix with autoconf
-# Created: 17.09.00
-# Author:  VS
-# Version: $Id$
-###############################################################################
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../..
-program_dir = contrib/samples/xml
-
-PROGRAM=xmldemo
-
-OBJECTS=$(PROGRAM).o
-
-APPEXTRALIBS=$(top_builddir)/lib/libwxxml.@WX_TARGET_LIBRARY_TYPE@
-APPEXTRADEFS=-I$(top_srcdir)/contrib/include
-
-DATADIRS = rc
-DATAFILES = rc/resource.xrc rc/fileopen.gif rc/filesave.gif rc/fuzzy.gif \
-            rc/quotes.gif rc/scanning.gif rc/update.gif
-
-include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/xml/XmlDemoVC.dsp
+++ b/contrib/samples/xml/XmlDemoVC.dsp
@@ -1,175 +0,0 @@
-# Microsoft Developer Studio Project File - Name="XmlDemoVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=XmlDemoVC - 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 "XmlDemoVC.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 "XmlDemoVC.mak" CFG="XmlDemoVC - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "XmlDemoVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "XmlDemoVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "XmlDemoVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "XmlDemoVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "XmlDemoVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib wxxml.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib wxxmld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Debug DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugDLL"
-# PROP BASE Intermediate_Dir "DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdlld.lib wxxmld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Release DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseDLL"
-# PROP BASE Intermediate_Dir "ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdll.lib wxxml.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "XmlDemoVC - Win32 Release"
-# Name "XmlDemoVC - Win32 Debug"
-# Name "XmlDemoVC - Win32 Debug DLL"
-# Name "XmlDemoVC - Win32 Release DLL"
-# Begin Source File
-
-SOURCE=.\xmldemo.cpp
-
-!IF  "$(CFG)" == "XmlDemoVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmldemo.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include"
-# End Source File
-# End Target
-# End Project
--- a/contrib/samples/xml/XmlDemoVC.dsw
+++ b/contrib/samples/xml/XmlDemoVC.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "XmlDemoVC"=.\XmlDemoVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/contrib/samples/xml/makefile.b32
+++ b/contrib/samples/xml/makefile.b32
@@ -1,18 +0,0 @@
-#
-# File:		makefile.b32
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:
-#
-# Makefile : Builds sample for 32-bit BC++
-
-WXDIR = $(WXWIN)
-
-TARGET=xmldemo
-
-EXTRALIBS=$(WXDIR)\contrib\lib\wxxml.lib
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-
--- a/contrib/samples/xml/makefile.g95
+++ b/contrib/samples/xml/makefile.g95
@@ -1,14 +0,0 @@
-# File:     makefile.g95 for stectrl
-# Author:	Robin Dunn
-# Created:	1-Feb-2000
-# Updated:
-
-WXDIR = ../../..
-
-TARGET = xmldemo
-OBJECTS = $(TARGET).o
-EXTRAINC = -I$(WXDIR)/contrib/include
-EXTRALIBS = -lwxxml
-
-include $(WXDIR)/src/makeprog.g95
-
--- a/contrib/samples/xml/makefile.vc
+++ b/contrib/samples/xml/makefile.vc
@@ -1,14 +0,0 @@
-# File:		makefile.vc  For stectrl
-# Author:	Robin Dunn
-# Created:	1-Feb-2000
-# Updated:
-
-WXDIR = $(WXWIN)
-PROGRAM = xmldemo
-
-OBJECTS = $(PROGRAM).obj
-EXTRALIBS = $(WXDIR)\contrib\lib\wxxml$(LIBEXT).lib
-EXTRAINC = -I$(WXDIR)\contrib\include
-
-!include $(WXDIR)\src\makeprog.vc
-
--- a/contrib/samples/xml/rc/appicon.ico
+++ b/contrib/samples/xml/rc/appicon.ico
--- a/contrib/samples/xml/rc/appicon.xpm
+++ b/contrib/samples/xml/rc/appicon.xpm
@@ -1,61 +0,0 @@
-/* XPM */
-static char* appicon_xpm[]={
-"32 32 26 1",
-"s c #000000",
-"u c #ff8000",
-"m c #ffc0ff",
-"q c #400000",
-". c None",
-"t c #004040",
-"d c #303030",
-"n c #ffdca8",
-"e c #c0c0c0",
-"x c #808000",
-"o c #c00000",
-"c c #585858",
-"b c #a0a0a4",
-"f c #c000c0",
-"# c #000000",
-"i c #808080",
-"p c #ffa858",
-"v c #ffff00",
-"k c #800000",
-"w c #c0c000",
-"r c #004000",
-"h c #404000",
-"j c #ffc0c0",
-"a c #ffffff",
-"l c #c05800",
-"g c #ff0000",
-".....#####...........##.........",
-"...##abbccd........##c#.........",
-"###aaaebfgh########abi#.........",
-"#cbaaaejggkiibeeaaaeeic#........",
-"#ieaaaefggldggfjmnaaeei#........",
-"#ibeaajggggcggggfmaaabi#b.......",
-"#iieaajggggolgggggmaaeec#.......",
-"#cieaajgggggdgggggpmaeec#.......",
-"#cieaajgggggqgggggggaabi#.......",
-"#dieaajpgggcc##cggggaaebc###....",
-"#ribaamecccccs##cgggaebccth##...",
-"#dieaa#qtdcch###tcs#iichd####...",
-"##cbea##dccccs##qhhccccct#####..",
-"##iiea##rhccch##tsdtcccdh#####..",
-"##cbea###tccookk#hrdhccccs####..",
-"##ciea###koogookkddtcccch###q#..",
-"##tiea##qoggggokkqhqccccckokkk#.",
-"##hbeb#qkoogggookkqkoklkoookkk#.",
-"###icb#kkooggggokkdkogggggookk#.",
-"###d..#kkoogggouukqkooggggookk#.",
-"##....#kkkoguvvvwuhkogggggooko#.",
-"##....##kolwvvvvvulcllggggulll#.",
-"##....##kuuvvvvvuvudwuuuuuvuuu#.",
-"......##uuuuvvvvvuuqivvvvvvuuu#.",
-"......##uuuvvwwiqcllhuvvvvvuuu#.",
-"......##uuuwl##xuphdivvvvvvvul#.",
-"......##uuu##e.#vltcuvuvvvvux#..",
-"......##ux#e....###uuww######...",
-"......##i#......bbb####.........",
-"......###.......................",
-"......##........................",
-"......##........................"};
--- a/contrib/samples/xml/rc/fileopen.gif
+++ b/contrib/samples/xml/rc/fileopen.gif
--- a/contrib/samples/xml/rc/filesave.gif
+++ b/contrib/samples/xml/rc/filesave.gif
--- a/contrib/samples/xml/rc/fuzzy.gif
+++ b/contrib/samples/xml/rc/fuzzy.gif
--- a/contrib/samples/xml/rc/quotes.gif
+++ b/contrib/samples/xml/rc/quotes.gif
--- a/contrib/samples/xml/rc/resource.xrc
+++ b/contrib/samples/xml/rc/resource.xrc
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<resource>
-  <object class="wxMenuBar" name="mainmenu">
-    <style>wxMB_DOCKABLE</style>
-    <object class="wxMenu" name="menu_file">
-      <label>$File</label>
-      <style>wxMENU_TEAROFF</style>
-      <object class="wxMenuItem" name="menu_about">
-        <label>$About...</label>
-        <bitmap>filesave.gif</bitmap>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="menu_dlg1">
-        <label>Dialog 1</label>
-      </object>
-      <object class="wxMenuItem" name="menu_dlg2">
-        <label>Dialog 2</label>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="menu_quit">
-        <label>E$xit\tAlt-X</label>
-      </object>
-    </object>
-  </object>
-  <object class="wxToolBar" name="toolbar">
-    <style>wxTB_FLAT|wxTB_DOCKABLE</style>
-    <margins>2,2</margins>
-    <object class="tool" name="menu_open">
-      <bitmap>fileopen.gif</bitmap>
-      <tooltip>Open catalog</tooltip>
-    </object>
-    <object class="tool" name="menu_save">
-      <bitmap>filesave.gif</bitmap>
-      <tooltip>Save catalog</tooltip>
-    </object>
-    <object class="tool" name="menu_update">
-      <bitmap>update.gif</bitmap>
-      <tooltip>Update catalog - synchronize it with sources</tooltip>
-    </object>
-    <separator/>
-    <object class="tool" name="menu_quotes">
-      <bitmap>quotes.gif</bitmap>
-      <toggle>1</toggle>
-      <tooltip>Display quotes around the string?</tooltip>
-    </object>
-    <object class="separator"/>
-    <object class="tool" name="menu_fuzzy">
-      <bitmap>fuzzy.gif</bitmap>
-      <tooltip>Toggled if selected string is fuzzy translation</tooltip>
-      <toggle>1</toggle>
-    </object>
-  </object>
-  <object class="wxDialog" name="dlg1">
-    <object class="wxBoxSizer">
-      <object class="sizeritem">
-        <object class="wxBitmapButton">
-          <bitmap>fuzzy.gif</bitmap>
-          <focus>fileopen.gif</focus>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxPanel">
-          <object class="wxStaticText">
-            <label>fdgdfgdfgdfg</label>
-          </object>
-          <style>wxSUNKEN_BORDER</style>
-        </object>
-        <flag>wxALIGN_CENTER</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxButton">
-          <label>Buttonek</label>
-        </object>
-        <border>10d</border>
-        <flag>wxALL</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxHtmlWindow">
-          <htmlcode>&lt;h1&gt;Hi,&lt;/h1&gt;man</htmlcode>
-          <size>100,45d</size>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxNotebook">
-          <object class="notebookpage">
-            <object class="wxPanel">
-              <object class="wxBoxSizer">
-                <object class="sizeritem">
-                  <object class="wxHtmlWindow">
-                    <htmlcode>Hello, we are inside a &lt;u&gt;NOTEBOOK&lt;/u&gt;...</htmlcode>
-                    <size>50,50d</size>
-                  </object>
-                  <option>1</option>
-                </object>
-              </object>
-            </object>
-            <label>Page</label>
-          </object>
-          <object class="notebookpage">
-            <object class="wxPanel">
-              <object class="wxBoxSizer">
-                <object class="sizeritem">
-                  <object class="wxHtmlWindow">
-                    <htmlcode>Hello, we are inside a &lt;u&gt;NOTEBOOK&lt;/u&gt;...</htmlcode>
-                    <size>50,50d</size>
-                  </object>
-                </object>
-              </object>
-            </object>
-            <label>Page 2</label>
-          </object>
-          <usenotebooksizer>1</usenotebooksizer>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <orient>wxVERTICAL</orient>
-    </object>
-  </object>
-  <object class="wxDialog" name="dlg2">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem" name="dfgdfg">
-        <object class="wxTextCtrl">
-          <size>200,200d</size>
-          <style>wxTE_MULTILINE|wxSUNKEN_BORDER</style>
-          <value>Hello, this is an ordinary multiline\n         textctrl....</value>
-        </object>
-        <option>1</option>
-        <flag>wxEXPAND|wxALL</flag>
-        <border>10</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_OK">
-              <label>Ok</label>
-              <default>1</default>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
-            </object>
-            <border>10</border>
-            <flag>wxLEFT</flag>
-          </object>
-        </object>
-        <flag>wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_RIGHT</flag>
-        <border>10</border>
-      </object>
-    </object>
-    <title>Second testing dialog</title>
-  </object>
-</resource>
--- a/contrib/samples/xml/rc/scanning.gif
+++ b/contrib/samples/xml/rc/scanning.gif
--- a/contrib/samples/xml/rc/update.gif
+++ b/contrib/samples/xml/rc/update.gif
--- a/contrib/samples/xml/xmldemo.cpp
+++ b/contrib/samples/xml/xmldemo.cpp
@@ -1,168 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xmldemo.cpp
-// Purpose:     XML resources sample
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-#ifdef __GNUG__
-    #pragma implementation "xmldemo.cpp"
-    #pragma interface "xmldemo.cpp"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "wx/image.h"
-#include "wx/xml/xmlres.h"
-
-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-// the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-    #include "rc/appicon.xpm"
-#endif
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// Define a new application type, each program should derive a class from wxApp
-class MyApp : public wxApp
-{
-public:
-    // override base class virtuals
-    // ----------------------------
-
-    // this one is called on application startup and is a good place for the app
-    // initialization (doing it here and not in the ctor allows to have an error
-    // return: if OnInit() returns false, the application terminates)
-    virtual bool OnInit();
-};
-
-// Define a new frame type: this is going to be our main frame
-class MyFrame : public wxFrame
-{
-public:
-    // ctor(s)
-    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
-
-    // event handlers (these functions should _not_ be virtual)
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    void OnDlg1(wxCommandEvent& event);
-    void OnDlg2(wxCommandEvent& event);
-
-private:
-    // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
-// ----------------------------------------------------------------------------
-
-// the event tables connect the wxWindows events with the functions (event
-// handlers) which process them. It can be also done at run-time, but for the
-// simple menu events like this the static method is much simpler.
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(XMLID("menu_quit"),  MyFrame::OnQuit)
-    EVT_MENU(XMLID("menu_about"), MyFrame::OnAbout)
-    EVT_MENU(XMLID("menu_dlg1"), MyFrame::OnDlg1)
-    EVT_MENU(XMLID("menu_dlg2"), MyFrame::OnDlg2)
-END_EVENT_TABLE()
-
-// Create a new application object: this macro will allow wxWindows to create
-// the application object during program execution (it's better than using a
-// static object for many reasons) and also declares the accessor function
-// wxGetApp() which will return the reference of the right type (i.e. MyApp and
-// not wxApp)
-IMPLEMENT_APP(MyApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// the application class
-// ----------------------------------------------------------------------------
-
-// 'Main program' equivalent: the program execution "starts" here
-bool MyApp::OnInit()
-{
-    wxImage::AddHandler(new wxGIFHandler);
-    wxTheXmlResource->InitAllHandlers();
-    wxTheXmlResource->Load("rc/resource.xrc");
-
-    MyFrame *frame = new MyFrame("XML resources demo",
-                                 wxPoint(50, 50), wxSize(450, 340));
-    frame->Show(TRUE);
-    return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-// main frame
-// ----------------------------------------------------------------------------
-
-// frame constructor
-MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
-{
-    SetIcon(wxICON(appicon));
-
-    SetMenuBar(wxTheXmlResource->LoadMenuBar("mainmenu"));
-    SetToolBar(wxTheXmlResource->LoadToolBar(this, "toolbar"));
-}
-
-
-// event handlers
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    // TRUE is to force the frame to close
-    Close(TRUE);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxString msg;
-    msg.Printf( _T("This is the about dialog of XML resources demo.\n")
-                _T("Welcome to %s"), wxVERSION_STRING);
-
-    wxMessageBox(msg, "About XML resources demo", wxOK | wxICON_INFORMATION, this);
-}
-
-void MyFrame::OnDlg1(wxCommandEvent& WXUNUSED(event))
-{
-    wxDialog dlg;
-    wxTheXmlResource->LoadDialog(&dlg, this, "dlg1");
-    dlg.ShowModal();
-}
-
-
-void MyFrame::OnDlg2(wxCommandEvent& WXUNUSED(event))
-{
-    wxDialog dlg;
-    wxTheXmlResource->LoadDialog(&dlg, this, "dlg2");
-    dlg.ShowModal();
-}
--- a/contrib/samples/xml/xmldemo.rc
+++ b/contrib/samples/xml/xmldemo.rc
@@ -1,2 +0,0 @@
-appicon ICON   "rc/appicon.ico"
-#include "wx/msw/wx.rc"
--- a/contrib/src/xml/FORMAT.txt
+++ b/contrib/src/xml/FORMAT.txt
@@ -1,324 +0,0 @@
-
-                         XML resources file format
-                      ===============================
-                      
- 1. Basics
-----------
-
-XML resource is well-formed XML document, i.e. all tags are paired
-and there is only one root node, which is always <resource>.
-
-In the following text, I will use standard XML terminology:
-
-<tag_one prop1="prop" prop2='yes'>
-   <tag_two/>
-</tag_one>
-
-Here, tag_one is a node (the word 'tag' refers to the type of the node),
-prop1 and prop2 are properties and tag_two is a child node of tag_one.
-Property's default value is the value that will be assigned to the property
-if you do not specify it explicitly.
-
-I will use the term "primary node" to refer to nodes than represent controls,
-dialogs etc. "Secondary nodes" are nodes used to store data: 
-
-<dialog name="my_dlg">                primary
-  <title>Demo Dialog...</title>       secondary
-  <size>100,200d</size>               secondary
-  <children>                          secondary
-    <button name="wxID_OK">           primary
-      <label>Ok</label>               secondary
-      <pos>10,10d</pos>               secondary
-    </button>
-  </children>
-</dialog>
-
-In the example above, <label>, <pos>, <size> and <title> are "variables",
-i.e. they contain a value and not a list of children (unlike <children> node).
-
-Any node (but the root one) may have property "platform" with possible 
-values "unix", "win", "mac" or "os2". All nodes with "platform" property
-specified and other than the platform the program is currently being executed
-on will be removed when reading XML resource file.
-
-Root node may have children of these and only these types: <menu>, <menubar>,
-<dialog>, <panel>
-
-
-
- 2. IDs
--------
-
-Any primary node may have property "name" used to identify it. Default value
-is "-1", any string is legal name. Names 
-    wxID_OPEN, wxID_CLOSE, wxID_NEW,
-    wxID_SAVE, wxID_SAVEAS, wxID_REVERT, 
-    wxID_EXIT, wxID_UNDO, wxID_REDO,
-    wxID_HELP, wxID_PRINT, wxID_PRINT_SETUP, 
-    wxID_PREVIEW, wxID_ABOUT, wxID_HELP_CONTENTS,
-    wxID_HELP_COMMANDS, wxID_HELP_PROCEDURES,
-    wxID_CUT, wxID_COPY, wxID_PASTE,
-    wxID_CLEAR, wxID_FIND, wxID_DUPLICATE,
-    wxID_SELECTALL, wxID_OK, wxID_CANCEL,
-    wxID_APPLY, wxID_YES, wxID_NO,
-    wxID_STATIC, wxID_FORWARD, wxID_BACKWARD,
-    wxID_DEFAULT, wxID_MORE, wxID_SETUP,
-    wxID_RESET, wxID_HELP_CONTEXT
-are translated into corresponding wxWindows ID constant, XMLID macro is used
-otherwise to generate unique ID. wxWindows control created from named node
-will have name=name and id=XMLID(name) or wxID_XXXX.
-
-
- 3. Common variables types
--------------------------- 
-
-Variables are always of a known type:
-
-bool       - boolean value. "1", "true", "t", "on" mean TRUE, anything
-             else (namely "0", "false", "f", "off") means FALSE.
-             FIXME: maybe use only 1/0 ??
-             
-integer    - integer value, i.e. digits 0-9 plus optional minus sign.
-             
-text       - anything. Within text node all occurences of $ are replaced 
-             by & (used for shortcuts, e.g. "E&xit"), $$ by $, \\, \n, \r,
-             \t as usual in C++.
-
-style      - (also called flags) list of flags delimined by any combination 
-             of spaces and | characters. Resources parser accepts only 
-             _registered_ flags -- i.e. flags that are valid for given 
-             node/control. Example:
-                  <flag>wxEXPAND | wxTOP|wxBOTTOM</flag>
-                  
-color      - color in HTML format: #rrggbb where rr,gg,bb are hexadecimal 
-             values (00-FF) for red, green and blue components in 
-             the RGB color model
-             
-coord      - size or position information. Consists of two integers
-             separated by comma ("x,y"). The values are in pixels 
-             unless "d" is attached to the right side of it -- 
-             in which case the values are interpreted as dialog units.
-             Value of -1 means "use default". Examples: 
-                  30,30
-                  -1,-1
-                  50,-1
-                  145,56d
-                  67,-1d
-
-
-
- 4. Layout
----------- 
-
-Most common nodes layout is as follows:
-
-<primary_node name="name" platform="platform">
-    <var_1>...</var_1>
-    .
-    .
-    .
-    <var_n>...</var_n>
-    <children>
-        (n primary nodes)
-    </children>
-</primary_node>
-
-where children node is supported only by panels, dialogs etc. -- see 
-nodes description for details.
-
-In the following text, 
-
-   TYPE var_name [ (= default_value) ]
-   
-means that given primary node may have child node with name var_name
-and content type TYPE. If default value is given, the node is optional
-and default_value will be used if not specified. Otherwise, the node
-is mandatory and must always be present. For example, "color fg" means
-than variable tag fg, e.g. <fg>#rr0000</fg> is expected.
-
-
-
- 5. Common controls variables
------------------------------
-
-_All_ nodes that represent wxWindows controls (gauge, panel, dialog, 
-textctrl etc.) accept the following properties:
-
-coord   pos       (= -1,-1) position of the control. Default value 
-                  equals to wxDefaultPosition
-coord   size      (= -1,-1) size of the control. Default value equals to 
-                  wxDefaultSize
-text    tooltip   window's tooltip
-color   bg        background color of the control
-color   fg        foreground/text color of the control
-style   style     control style flag. Default value is 
-                  control-dependent (but 0 is common value)
-style   exstyle   control extended style flag
-bool    enabled   (= 1) is the control enabled?
-bool    hidden    (= 0) is the control hidden?
-bool    focused   (= 0) has the control focus?
-
-
-_Usually_ (but not always, only when it makes sense) controls support text
-variable label which contains displayed text and/or value which contains
-editable text. These are always explicitly mentioned in tag description.
-
-
-
-
- 6. Tags description
---------------------
-
-If 'Control' is derived from wxControl, it supports all variables from '5.'
-'Styles' section lists all acceptable flags for style and exstyle variables.
-
-
- <panel>
--------- 
-      Control:
-         wxPanel
-
-      Variables:
-         only common controls variables
-
-      Styles:
-         wxNO_3D, wxTAB_TRAVERSAL, wxWS_EX_VALIDATE_RECURSIVELY
-
-
-
- <dialog>
----------
-      Control:
-         wxDialog
-
-      Variables:
-         style    style     (= wxDEFAULT_DIALOG_style)
-         text     title     dialog's title         
-
-      Styles:
-         wxSTAY_ON_TOP, wxCAPTION, wxDEFAULT_DIALOG_style, wxTHICK_FRAME,
-         wxSYSTEM_MENU, wxRESIZE_BORDER, wxRESIZE_BOX, wxDIALOG_MODAL,
-         wxDIALOG_MODELESS, wxNO_3D, wxTAB_TRAVERSAL, 
-         wxWS_EX_VALIDATE_RECURSIVELY
-
-
-
- <boxsizer>
--------------
-      Control:
-         wxBoxSizer (not a control)
-
-      Behaviour:
-         boxsizer's parent must be either <panel>, <dialog> or another
-         sizer, nothing else!
-         
-         If the sizer does not have parent sizer, the sizer will attach itself
-         to the parent panel/dialog using SetAutoLayout(TRUE) and SetSizer().
-         If the parent panel/dialog has default size (i.e. not specified in
-         the resource), the sizer will fit it using wxSizer::Fit(). If the
-         parent panel/dialog is resizable, size hints will be set 
-         automatically.
-
-      Variables:
-         style    orient    (= wxHORIZONTAL) orientation, either 
-                            wxHORIZONTAL or wxVERTICAL
-
-      Styles:
-         wxHORIZONTAL, wxVERTICAL (for orient variable)
-
-         wxLEFT, wxRIGHT, wxTOP, wxBOTTOM, wxNORTH, wxSOUTH, wxEAST, wxWEST,
-         wxALL, wxGROW, wxEXPAND, wxSHAPED, wxSTRETCH_NOT, wxALIGN_CENTER,
-         wxALIGN_CENTRE, wxALIGN_LEFT, wxALIGN_TOP, wxALIGN_RIGHT, 
-         wxALIGN_BOTTOM, wxALIGN_CENTER_HORIZONTAL, wxALIGN_CENTRE_HORIZONTAL,
-         wxALIGN_CENTER_HORIZONTAL, wxALIGN_CENTRE_HORIZONTAL (for flag
-         variable of <item> or <spacer> child nodes)
-
-      Child nodes:
-         Contains child node <children> which has arbitrary number of
-         <sizeritem> and <spacer> child nodes.
-         
-          <sizeritem>
-         -------------
-            Variables:
-               integer  option    (= 0) relative size of the widget
-               style    flag      (= 0) style flag
-               integer  border    (= 0) surrounding border
-               
-            Has exactly one child node <window> that contains the control
-            (or child sizer because sizers may be nested) 
-            to be inserted into the sizer.
-
-          <spacer>
-         ----------
-            Variables:
-               integer  option    (= 0) relative size of the widget
-               style    flag      (= 0) style flag
-               integer  border    (= 0) surrounding border
-
-            Inserts empty space into the sizer
-            
-
-
- <staticboxsizer>
------------------
-      Control:
-         wxStaticBoxSizer (not a control)
-
-      Same as <boxsizer> except that it has additional variable:
-      
-               text     label     (= "") label of surrounding static box
-
-      wxStaticBox required by wxStaticBoxSizer is created automatically!
-
-
-
- <notebooksizer>
-----------------
-      Control:
-         wxNotebookSizer (not a control)
-
-      Behaviour:
-         notebooksizer's parent must be a sizer (not notebooksizer,
-         see below)!
-
-      Variables:
-         none
-
-      Styles:
-         none
-
-      Child nodes:
-         Has exactly one child node <window> that contains the notebook
-         (nothing else is allowed!) to be inserted into the sizer.
-
-
-
- <textctrl>
------------ 
-      Control:
-         wxTextCtrl
-
-      Variables:
-         text     value     (= "")default text of the control
-
-      Styles:
-         wxTE_PROCESS_ENTER, wxTE_PROCESS_TAB, wxTE_MULTILINE, wxTE_PASSWORD,
-         wxTE_READONLY, wxHSCROLL
-
-
-
- <htmlwindow>
--------------
-      Control:
-         wxHtmlWindow
-
-      Variables:
-         integer  borders   (= 0) window's borders 
-                            (see wxHtmlWindow::SetBorders)
-         text     url       (= "") if present, given page will be loaded
-         text     htmlcode  (= "") if present, given _text_ will be displayed                            
-                            (you will have to use CDATA section
-                            to embed HTML code into XML document)
-
-      Styles:
-         wxHW_SCROLLBAR_NEVER, wxHW_SCROLLBAR_AUTO
--- a/contrib/src/xml/Makefile.in
+++ b/contrib/src/xml/Makefile.in
@@ -1,34 +0,0 @@
-# $Id$
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../..
-libsrc_dir = contrib/src/xml
-
-TARGET_LIBNAME=libwxxml
-
-LIBVERSION_CURRENT=0
-LIBVERSION_REVISION=1
-LIBVERSION_AGE=0
-
-HEADER_PATH=$(top_srcdir)/contrib/include/wx
-HEADER_SUBDIR=xml
-
-HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \
-        xh_dlg.h xh_gauge.h xh_html.h xh_menu.h xh_notbk.h xh_panel.h \
-        xh_radbt.h xh_radbx.h xh_sizer.h xh_slidr.h xh_spin.h xh_stbmp.h \
-        xh_sttxt.h xh_text.h xh_listb.h xml.h xmlio.h xmlres.h xh_toolb.h \
-        xh_bmpbt.h xh_cald.h xh_listc.h xh_scrol.h xh_stbox.h xh_tree.h \
-        xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h
-
-
-OBJECTS=xml.o xmlbin.o xmlbinz.o xmlpars.o xmlres.o xmlrsall.o \
-        xh_bttn.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o \
-        xh_gauge.o xh_html.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o \
-        xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \
-        xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \
-        xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o
-
-APPEXTRADEFS=-I$(top_srcdir)/contrib/include
-
-include $(top_builddir)/src/makelib.env
-
--- a/contrib/src/xml/README
+++ b/contrib/src/xml/README
@@ -1,11 +0,0 @@
-
-
-This is hightly incomplete version, not meant for general use!
-
-You will need libxml version 2.2.3 or higher, available
-from http://xmlsoft.org. There is a link to precompiled win32 DLL as well.
-
-libxml is distributed under either GNU LGPL or W3C IPR 
-(http://www.w3.org/Consortium/Legal/copyright-software-19980720.html),
-you can choose from them.
-
--- a/contrib/src/xml/makefile.b32
+++ b/contrib/src/xml/makefile.b32
@@ -1,48 +0,0 @@
-#
-# File:		makefile.b32
-# Author:	Julian Smart
-# Created:	2000
-# Updated:	
-# Copyright:
-#
-# Makefile : Builds BC++ library for 32-bit BC++
-
-WXDIR = $(WXWIN)
-
-
-# Do not specify the 'libxml' directory on
-# this -I line, as the #includes use
-# <libxml/xxxx.h>.  If your libxml is installed
-# in "d:\libxml\libxml2-2.1.1\libxml" you would use:
-# wxLIBXMLDIR=/Id:\libxml\libxml2-2.1.1\include
-wxLIBXMLDIR=/Ic:\progra~1\libxml\libxml2-2.3.3\include
-
-!if "$(wxLIBXMLDIR)" == ""
-!message
-!message SETUP REQUIRED
-!message
-!message You must set the wxLIBXMLDIR variable in makefile.b32 before compiling
-!message
-!message If you do not have the libxml library, you will need to obtain & install
-!message it before compiling the wxXML code.  You can obtain libxml from:
-!message http://www.xmlsoft.org
-!message
-!error
-!endif
-
-# Set this to where your libxml directory is
-EXTRACPPFLAGS=$(wxLIBXMLDIR)
-
-
-LIBTARGET=$(WXDIR)\lib\wxxml.lib
-
-OBJECTS=xml.obj xmlbin.obj xmlbinz.obj xmlpars.obj xmlres.obj xmlrsall.obj \
-        xh_bttn.obj xh_chckb.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj \
-        xh_gauge.obj xh_html.obj xh_menu.obj xh_notbk.obj xh_panel.obj xh_radbt.obj \
-        xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj \
-        xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj \
-        xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj \
-        xh_tree.obj xh_unkwn.obj xh_frame.obj
-
-!include $(WXDIR)\src\makelib.b32
-
--- a/contrib/src/xml/makefile.g95
+++ b/contrib/src/xml/makefile.g95
@@ -1,24 +0,0 @@
-#
-# File:         makefile.g95
-# Author:       Julian Smart
-# Created:      2000
-# Updated:
-# Copyright:    (c) Julian Smart, 2000
-#
-# Makefile for wxWindows wxXML library (Cygwin/Mingw32).
-
-WXDIR = ../../..
-
-EXTRACPPFLAGS=-Ic:/progra~1/libxml/libxml2-2.3.3/include
-LIBTARGET=$(WXDIR)/lib/libwxxml.a
-
-OBJECTS=xml.o xmlbin.o xmlbinz.o xmlpars.o xmlres.o xmlrsall.o \
-        xh_bttn.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o \
-        xh_gauge.o xh_html.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o \
-        xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \
-        xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \
-        xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \
-        xh_frame.o
-
-include $(WXDIR)/src/makelib.g95
-
--- a/contrib/src/xml/makefile.vc
+++ b/contrib/src/xml/makefile.vc
@@ -1,145 +0,0 @@
-
-# File:		makefile.vc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds wxXML classes library (MS VC++).
-# Use FINAL=1 argument to nmake to build final version with no debugging
-# info
-
-# Set WXDIR for your system
-WXDIR = $(WXWIN)
-wxXMLDIR = $(WXDIR)\contrib\src\xml
-wxXMLINC = $(WXDIR)\contrib\include\wx\xml
-THISDIR = $(WXDIR)\contrib\src\xml
-DOCDIR=$(WXDIR)\contrib\docs
-LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\xml
-
-# Do not specify the 'libxml' directory on
-# this -I line, as the #includes use
-# <libxml/xxxx.h>.  If your libxml is installed
-# in "d:\libxml\libxml2-2.1.1\libxml" you would use:
-# wxLIBXMLDIR=-Id:\libxml\libxml2-2.1.1
-wxLIBXMLDIR=
-
-!if "$(wxLIBXMLDIR)" == ""
-!message
-!message SETUP REQUIRED
-!message
-!message You must set the wxLIBXMLDIR variable in makefile.vc before compiling
-!message
-!message If you do not have the libxml library, you will need to obtain & install
-!message it before compiling the wxXML code.  You can obtain libxml from:
-!message http://www.xmlsoft.org
-!message
-!error
-!endif
-
-# Set this to where your libxml directory is
-EXTRAFLAGS=$(wxLIBXMLDIR)
-
-# Unfortunately we need this _before_ we include makelib.vc
-!if "$(FINAL)" == "1"
-D=Release
-!else
-D=Debug
-LIBEXT=d
-!endif
-
-LIBTARGET=$(WXDIR)\lib\wxxml$(LIBEXT).lib
-EXTRATARGETS=$(D)
-
-OBJECTS=$(D)\xml.obj $(D)\xmlbin.obj $(D)\xmlbinz.obj $(D)\xmlpars.obj $(D)\xmlres.obj $(D)\xmlrsall.obj \
-        $(D)\xh_bttn.obj $(D)\xh_chckb.obj $(D)\xh_chckl.obj $(D)\xh_choic.obj $(D)\xh_combo.obj $(D)\xh_dlg.obj \
-        $(D)\xh_frame.obj $(D)\xh_gauge.obj $(D)\xh_html.obj $(D)\xh_menu.obj $(D)\xh_notbk.obj $(D)\xh_panel.obj $(D)\xh_radbt.obj \
-        $(D)\xh_radbx.obj $(D)\xh_sizer.obj $(D)\xh_slidr.obj $(D)\xh_spin.obj $(D)\xh_stbmp.obj $(D)\xh_sttxt.obj \
-        $(D)\xh_text.obj $(D)\xh_listb.obj $(D)\xh_toolb.obj \
-        $(D)\xh_bmpbt.obj $(D)\xh_cald.obj $(D)\xh_listc.obj $(D)\xh_scrol.obj \
-        $(D)\xh_stbox.obj $(D)\xh_tree.obj $(D)\xh_stlin.obj $(D)\xh_bmp.obj \
-        $(D)\xh_unkwn.obj
-
-!include $(WXDIR)\src\makelib.vc
-
-DOCSOURCES=$(LOCALDOCDIR)\xml.tex \
- $(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\
- $(LOCALDOCDIR)\classes.tex $(LOCALDOCDIR)\intro.tex\
- $(LOCALDOCDIR)\topics.tex $(LOCALDOCDIR)\sample.tex
-
-html: $(DOCDIR)\html\xml\xml.htm
-htmlhelp: $(DOCDIR)\htmlhelp\xml.chm
-htb:	$(DOCDIR)\htb\xml.htb
-hlp: $(DOCDIR)\winhelp\xml.hlp
-pdfrtf: $(DOCDIR)\pdf\xml.rtf
-ps: $(DOCDIR)\ps\xml.ps
-
-touchmanual:
-	touch $(LOCALDOCDIR)\xml.tex
-
-
-$(DOCDIR)\winhelp\xml.hlp:         $(LOCALDOCDIR)\xml.rtf $(LOCALDOCDIR)\xml.hpj
-        cd $(LOCALDOCDIR)
-        -erase xml.ph
-        hc xml
-        move xml.hlp $(DOCDIR)\winhelp\xml.hlp
-        move xml.cnt $(DOCDIR)\winhelp\xml.cnt
-        cd $(THISDIR)
-
-$(LOCALDOCDIR)\xml.rtf: $(DOCSOURCES)
-        cd $(LOCALDOCDIR)
-        -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\xml.tex $(LOCALDOCDIR)\xml.rtf -twice -winhelp
-        cd $(THISDIR)
-
-$(DOCDIR)\pdf\xml.rtf: $(DOCSOURCES)
-        cd $(LOCALDOCDIR)
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\xml.tex $(DOCDIR)\pdf\xml.rtf -twice -rtf
-        cd $(THISDIR)
-
-$(DOCDIR)\html\xml\xml.htm:         $(DOCSOURCES)
-        cd $(LOCALDOCDIR)
-        -mkdir $(DOCDIR)\html\xml
-        copy *.gif $(DOCDIR)\html\xml
-        -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\xml.tex $(DOCDIR)\html\xml\xml.htm -twice -html
-        -erase $(DOCDIR)\html\xml\*.con
-        -erase *.con
-        -erase $(DOCDIR)\html\xml\*.ref
-        cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\xml.chm: $(DOCDIR)\html\xml\xml.htm $(DOCDIR)\html\xml\xml.hhp
-	cd $(DOCDIR)\html\xml
-	-hhc xml.hhp
-    move xml.chm $(DOCDIR)\htmlhelp\xml.chm
-	cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\xml.htb: $(DOCDIR)\html\xml\xml.htm
-	cd $(DOCDIR)\html\xml
-    -erase xml.zip xml.htb
-    zip xml.zip *.htm *.gif *.hhp *.hhc *.hhk
-    -mkdir $(DOCDIR)\htb
-    move xml.zip $(DOCDIR)\htb\xml.htb
-    cd $(THISDIR)
-
-$(LOCALDOCDIR)\xml.dvi:	$(DOCSOURCES)
-	cd $(LOCALDOCDIR)
-        -latex xml
-        -latex xml
-        -makeindx xml
-        -bibtex xml
-        -latex xml
-        -latex xml
-        cd $(THISDIR)
-
-$(WXDIR)\docs\ps\xml.ps:	$(LOCALDOCDIR)\xml.dvi
-	cd $(LOCALDOCDIR)
-        -dvips32 -o xml.ps xml
-        move xml.ps $(WXDIR)\docs\ps\xml.ps
-        cd $(THISDIR)
-
--- a/contrib/src/xml/makefile.wat
+++ b/contrib/src/xml/makefile.wat
@@ -1,31 +0,0 @@
-# wxXML makefile
-
-WXDIR = ..\..\..
-
-EXTRACPPFLAGS=/Id:\libxml\libxml2-2.1.1
-
-!include $(WXDIR)\src\makewat.env
-
-WXXMLLIB = $(WXDIR)\lib\wxxml.lib
-THISDIR = $(WXDIR)\contrib\src\xml
-
-NAME = wxxml
-LNK = $(name).lnk
-
-OBJECTS=xml.obj xmlbin.obj xmlbinz.obj xmlpars.obj xmlres.obj xmlrsall.obj &
-        xh_bttn.obj xh_chckb.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj &
-        xh_gauge.obj xh_html.obj xh_menu.obj xh_notbk.obj xh_panel.obj xh_radbt.obj &
-        xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj &
-        xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj &
-        xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj &
-        xh_tree.obj xh_unkwn.obj xh_frame.obj
-
-
-all: $(WXXMLLIB)
-
-$(WXXMLLIB): $(OBJECTS)
-	*wlib /b /c /n /P=256 $(WXXMLLIB) $(OBJECTS)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(WXXMLLIB) *.lbc
-
--- a/contrib/src/xml/wxXMLVC.dsp
+++ b/contrib/src/xml/wxXMLVC.dsp
@@ -1,230 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wxXMLVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=wxXMLVC - 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 "wxXMLVC.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 "wxXMLVC.mak" CFG="wxXMLVC - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxXMLVC - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxXMLVC - 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)" == "wxXMLVC - 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 /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "d:\libxml\libxml2-2.1.1" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\wxxml.lib"
-
-!ELSEIF  "$(CFG)" == "wxXMLVC - 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 /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "d:\libxml\libxml2-2.1.1" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\wxxmld.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wxXMLVC - Win32 Release"
-# Name "wxXMLVC - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\xh_bttn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_chckb.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_chckl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_choic.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_combo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_dlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_gauge.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_html.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_menu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_notbk.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_panel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_radbt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_radbx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_sizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_slidr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_spin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_stbmp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_sttxt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_text.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_listb.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_toolb.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xml.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmlbin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmlbinz.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmlpars.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmlres.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_bmpbt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_cald.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_listc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_scrol.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_stbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_tree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_stlin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_bmp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xh_unkwn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmlrsall.cpp
-# End Source File
-# End Target
-# End Project
--- a/contrib/src/xml/wxXMLVC.dsw
+++ b/contrib/src/xml/wxXMLVC.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "wxXMLVC"=.\wxXMLVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/contrib/src/xml/xh_bmp.cpp
+++ b/contrib/src/xml/xh_bmp.cpp
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmp.cpp
-// Purpose:     XML resource for wxBitmap and wxIcon
-// Author:      Vaclav Slavik
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_bmp.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_bmp.h"
-#include "wx/bitmap.h"
-
-
-wxBitmapXmlHandler::wxBitmapXmlHandler() 
-: wxXmlResourceHandler() 
-{
-}
-
-wxObject *wxBitmapXmlHandler::DoCreateResource()
-{ 
-    return new wxBitmap(GetBitmap(wxT("")));
-}
-
-
-
-bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxBitmap"));
-}
-
-
-wxIconXmlHandler::wxIconXmlHandler() 
-: wxXmlResourceHandler() 
-{
-}
-
-wxObject *wxIconXmlHandler::DoCreateResource()
-{ 
-    return new wxIcon(GetIcon(wxT("")));
-}
-
-
-
-bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxIcon"));
-}
-
--- a/contrib/src/xml/xh_bmpbt.cpp
+++ b/contrib/src/xml/xh_bmpbt.cpp
@@ -1,66 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmpbt.cpp
-// Purpose:     XML resource for bitmap buttons
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_bmpbt.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_bmpbt.h"
-#include <wx/bmpbuttn.h>
-
-wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE(wxBU_AUTODRAW);
-    ADD_STYLE(wxBU_LEFT);
-    ADD_STYLE(wxBU_RIGHT);
-    ADD_STYLE(wxBU_TOP);
-    ADD_STYLE(wxBU_BOTTOM);
-    AddWindowStyles();
-}
-
-
-wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
-{ 
-    wxBitmapButton *button = new wxBitmapButton(m_ParentAsWindow,
-                                    GetID(),
-                                    GetBitmap(wxT("bitmap")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(wxT("style"), wxBU_AUTODRAW),
-                                    wxDefaultValidator,
-                                    GetName());
-    if (GetBool(wxT("default"), 0) == 1) button->SetDefault();
-    SetupWindow(button);
-    
-    if (!GetParamValue(wxT("selected")).IsEmpty())
-        button->SetBitmapSelected(GetBitmap(wxT("selected")));
-    if (!GetParamValue(wxT("focus")).IsEmpty())
-        button->SetBitmapFocus(GetBitmap(wxT("focus")));
-    if (!GetParamValue(wxT("disabled")).IsEmpty())
-        button->SetBitmapDisabled(GetBitmap(wxT("disabled")));
-    
-    return button;
-}
-
-
-
-bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxBitmapButton"));
-}
-
-
--- a/contrib/src/xml/xh_bttn.cpp
+++ b/contrib/src/xml/xh_bttn.cpp
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bttn.cpp
-// Purpose:     XML resource for buttons
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_bttn.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_bttn.h"
-#include "wx/button.h"
-
-
-wxButtonXmlHandler::wxButtonXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    AddWindowStyles();
-}
-
-
-wxObject *wxButtonXmlHandler::DoCreateResource()
-{ 
-    wxButton *button = new wxButton(m_ParentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName());
-    if (GetBool(wxT("default"), 0) == 1) button->SetDefault();
-    SetupWindow(button);
-    
-    return button;
-}
-
-
-
-bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxButton"));
-}
-
-
--- a/contrib/src/xml/xh_cald.cpp
+++ b/contrib/src/xml/xh_cald.cpp
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_cald.cpp
-// Purpose:     XML resource for wxCalendarCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_cald.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_cald.h"
-#include "wx/calctrl.h"
-
-
-wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE(wxCAL_SUNDAY_FIRST);
-    ADD_STYLE(wxCAL_MONDAY_FIRST);
-    ADD_STYLE(wxCAL_SHOW_HOLIDAYS);
-    ADD_STYLE(wxCAL_NO_YEAR_CHANGE);
-    ADD_STYLE(wxCAL_NO_MONTH_CHANGE);
-    AddWindowStyles();
-}
-
-
-wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
-{ 
-    wxCalendarCtrl *calendar = new wxCalendarCtrl(m_ParentAsWindow,
-                                    GetID(),
-                                    wxDefaultDateTime,
-                                    /*TODO: take it from resource*/
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    GetName());
-    
-    SetupWindow(calendar);
-    
-    return calendar;
-}
-
-
-
-bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxCalendarCtrl"));
-}
-
-
--- a/contrib/src/xml/xh_chckb.cpp
+++ b/contrib/src/xml/xh_chckb.cpp
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_chckb.cpp
-// Purpose:     XML resource for wxCheckBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_chckb.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_chckb.h"
-#include "wx/checkbox.h"
-
-#if wxUSE_CHECKBOX
-
-wxCheckBoxXmlHandler::wxCheckBoxXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    AddWindowStyles();
-}
-
-wxObject *wxCheckBoxXmlHandler::DoCreateResource()
-{ 
-    wxCheckBox *control = new wxCheckBox(m_ParentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-    control->SetValue( GetBool( wxT("checked")));
-    SetupWindow(control);
-    
-    return control;
-}
-
-
-
-bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxCheckBox"));
-}
-
-#endif
--- a/contrib/src/xml/xh_chckl.cpp
+++ b/contrib/src/xml/xh_chckl.cpp
@@ -1,109 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_chckl.cpp
-// Purpose:     XML resource for wxCheckList
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_chckl.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_chckl.h"
-#include "wx/checklst.h"
-
-wxCheckListXmlHandler::wxCheckListXmlHandler() 
-: wxXmlResourceHandler(), m_InsideBox(FALSE)
-{
-    // no styles
-    AddWindowStyles();
-}
-
-wxObject *wxCheckListXmlHandler::DoCreateResource()
-{ 
-    if (m_Class == wxT("wxCheckList"))
-    {
-        // need to build the list of strings from children
-        m_InsideBox = TRUE;
-        CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
-        wxString *strings = (wxString *) NULL;
-        if( strList.GetCount() > 0 )
-        {
-            strings = new wxString[strList.GetCount()];
-            int count = strList.GetCount();
-            for( int i = 0; i < count; i++ )
-                strings[i]=strList[i];
-        }
-
-
-        wxCheckListBox *control = new wxCheckListBox(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    strList.GetCount(),
-                                    strings,
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-        // step through children myself (again.)
-        wxXmlNode *n = GetParamNode(wxT("content"));
-        if (n) n = n->GetChildren();
-        int i = 0;
-        while (n)
-        {
-            if (n->GetType() != wxXML_ELEMENT_NODE ||
-                n->GetName() != wxT("item"))
-               { n = n->GetNext(); continue; }
-
-            // checking boolean is a bit ugly here (see GetBool() )
-            wxString v = n->GetPropVal(wxT("checked"), wxEmptyString);
-            v.MakeLower();
-            if (v && v == wxT("1"))
-                control->Check( i, TRUE );
-
-            i++;        
-            n = n->GetNext();
-        }
-        
-        SetupWindow(control);
-
-        if( strings != NULL )
-            delete [] strings;
-        strList.Clear();    // dump the strings   
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle <item checked="boolean">Label</item>
-
-        // add to the list
-        strList.Add( GetNodeContent(m_Node) );
-
-        return NULL;
-    }
-
-}
-
-
-
-bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxCheckList")) ||
-           (m_InsideBox && node->GetName() == wxT("item"))
-           );
-}
-
-
--- a/contrib/src/xml/xh_choic.cpp
+++ b/contrib/src/xml/xh_choic.cpp
@@ -1,95 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_choic.cpp
-// Purpose:     XML resource for wxChoice
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_choic.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_choic.h"
-#include "wx/choice.h"
-
-wxChoiceXmlHandler::wxChoiceXmlHandler() 
-: wxXmlResourceHandler() , m_InsideBox(FALSE)
-{
-    ADD_STYLE(wxCB_SORT);
-    AddWindowStyles();
-}
-
-wxObject *wxChoiceXmlHandler::DoCreateResource()
-{ 
-    if( m_Class == wxT("wxChoice"))
-    {
-        // find the selection
-        long selection = GetLong( wxT("selection"), -1 );
-
-        // need to build the list of strings from children
-        m_InsideBox = TRUE;
-        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
-        wxString *strings = (wxString *) NULL;
-        if( strList.GetCount() > 0 )
-        {
-            strings = new wxString[strList.GetCount()];
-            int count = strList.GetCount();
-            for( int i = 0; i < count; i++ )
-                strings[i]=strList[i];
-        }
-
-
-        wxChoice *control = new wxChoice(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    strList.GetCount(),
-                                    strings,
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-        if( selection != -1 )
-            control->SetSelection( selection );
-
-        SetupWindow(control);
-
-        if( strings != NULL )
-            delete [] strings;
-        strList.Clear();    // dump the strings   
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle <item>Label</item>
-        
-        // add to the list
-        strList.Add( GetNodeContent(m_Node) );
-
-        return NULL;
-    }
-
-}
-
-
-
-bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxChoice")) ||
-           (m_InsideBox && node->GetName() == wxT("item"))
-           );
-}
-
-
--- a/contrib/src/xml/xh_combo.cpp
+++ b/contrib/src/xml/xh_combo.cpp
@@ -1,101 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_combo.cpp
-// Purpose:     XML resource for wxRadioBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_combo.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_combo.h"
-#include "wx/combobox.h"
-
-#if wxUSE_COMBOBOX
-
-wxComboBoxXmlHandler::wxComboBoxXmlHandler() 
-: wxXmlResourceHandler() , m_InsideBox(FALSE)
-{
-    ADD_STYLE(wxCB_SIMPLE);
-    ADD_STYLE(wxCB_SORT);
-    ADD_STYLE(wxCB_READONLY);
-    ADD_STYLE(wxCB_DROPDOWN);
-    AddWindowStyles();
-}
-
-wxObject *wxComboBoxXmlHandler::DoCreateResource()
-{ 
-    if( m_Class == wxT("wxComboBox"))
-    {
-        // find the selection
-        long selection = GetLong( wxT("selection"), -1 );
-
-        // need to build the list of strings from children
-        m_InsideBox = TRUE;
-        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
-        wxString *strings = (wxString *) NULL;
-        if( strList.GetCount() > 0 )
-        {
-            strings = new wxString[strList.GetCount()];
-            int count = strList.GetCount();
-            for( int i = 0; i < count; i++ )
-                strings[i]=strList[i];
-        }
-
-
-        wxComboBox *control = new wxComboBox(m_ParentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("value")),
-                                    GetPosition(), GetSize(),
-                                    strList.GetCount(),
-                                    strings,
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-        if( selection != -1 )
-            control->SetSelection( selection );
-
-        SetupWindow(control);
-
-        if( strings != NULL )
-            delete [] strings;
-        strList.Clear();    // dump the strings   
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle <item>Label</item>
-
-        // add to the list
-        strList.Add( GetNodeContent(m_Node) );
-
-        return NULL;
-    }
-
-}
-
-
-
-bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxComboBox")) ||
-           (m_InsideBox && node->GetName() == wxT("item"))
-           );
-}
-
-#endif
--- a/contrib/src/xml/xh_dlg.cpp
+++ b/contrib/src/xml/xh_dlg.cpp
@@ -1,80 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_dlg.cpp
-// Purpose:     XML resource for dialogs
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_dlg.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_dlg.h"
-#include "wx/dialog.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-
-
-wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
-{
-    ADD_STYLE(wxSTAY_ON_TOP);
-    ADD_STYLE(wxCAPTION);
-    ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
-    ADD_STYLE(wxTHICK_FRAME);
-    ADD_STYLE(wxSYSTEM_MENU);
-    ADD_STYLE(wxRESIZE_BORDER);
-    ADD_STYLE(wxRESIZE_BOX);
-    ADD_STYLE(wxDIALOG_MODAL);
-    ADD_STYLE(wxDIALOG_MODELESS);
-
-    ADD_STYLE(wxNO_3D);
-    ADD_STYLE(wxTAB_TRAVERSAL);
-    ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    ADD_STYLE(wxCLIP_CHILDREN);
-    AddWindowStyles();
-}
-
-
-
-wxObject *wxDialogXmlHandler::DoCreateResource()
-{ 
-    wxDialog *dlg = wxDynamicCast(m_Instance, wxDialog);
-    
-    wxASSERT_MSG(dlg, _("XML resource: Cannot create dialog without instance."));
-    
-    dlg->Create(m_ParentAsWindow,
-                GetID(),
-                GetText(wxT("title")),
-                wxDefaultPosition, wxDefaultSize,
-                GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),
-                GetName());
-    dlg->SetClientSize(GetSize());
-    dlg->Move(GetPosition());
-    SetupWindow(dlg);
-
-    CreateChildren(dlg);
-    
-    if (GetBool(_("centered"), FALSE))
-        dlg->Centre();
-    
-    return dlg;
-}
-
-
-
-bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxDialog"));
-}
-
-
--- a/contrib/src/xml/xh_frame.cpp
+++ b/contrib/src/xml/xh_frame.cpp
@@ -1,84 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_frame.cpp
-// Purpose:     XML resource for dialogs
-// Author:      Vaclav Slavik & Aleks.
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_frame.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_frame.h"
-#include "wx/frame.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-
-
-wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
-{
-    ADD_STYLE(wxSTAY_ON_TOP);
-    ADD_STYLE(wxCAPTION);
-    ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
-    ADD_STYLE(wxTHICK_FRAME);
-    ADD_STYLE(wxSYSTEM_MENU);
-    ADD_STYLE(wxRESIZE_BORDER);
-    ADD_STYLE(wxRESIZE_BOX);
-
-    ADD_STYLE(wxFRAME_TOOL_WINDOW);
-    ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
-    ADD_STYLE(wxMAXIMIZE_BOX);
-    ADD_STYLE(wxMINIMIZE_BOX);
-    ADD_STYLE(wxSTAY_ON_TOP);
-
-    ADD_STYLE(wxNO_3D);
-    ADD_STYLE(wxTAB_TRAVERSAL);
-    ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    ADD_STYLE(wxCLIP_CHILDREN);
-    AddWindowStyles();
-}
-
-
-
-wxObject *wxFrameXmlHandler::DoCreateResource()
-{ 
-    wxFrame *frame = wxDynamicCast(m_Instance, wxFrame);
-    
-    wxASSERT_MSG(frame, _("XML resource: Cannot create dialog without instance."));
-    
-    frame->Create(m_ParentAsWindow,
-                GetID(),
-                GetText(_T("title")),
-                wxDefaultPosition, wxDefaultSize,
-                GetStyle(_T("style"), wxDEFAULT_FRAME_STYLE),
-                GetName());
-    frame->SetClientSize(GetSize());
-    frame->Move(GetPosition());
-    SetupWindow(frame);
-
-    CreateChildren(frame);
-    
-    if (GetBool(_("centered"), FALSE))
-        frame->Centre();
-    
-    return frame;
-}
-
-
-
-bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, _T("wxFrame"));
-}
-
-
--- a/contrib/src/xml/xh_gauge.cpp
+++ b/contrib/src/xml/xh_gauge.cpp
@@ -1,74 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_gauge.cpp
-// Purpose:     XML resource for wxGauge
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_gauge.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_gauge.h"
-#include "wx/gauge.h"
-
-#if wxUSE_GAUGE
-
-wxGaugeXmlHandler::wxGaugeXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE( wxGA_HORIZONTAL );
-    ADD_STYLE( wxGA_VERTICAL );
-    ADD_STYLE( wxGA_PROGRESSBAR );
-    ADD_STYLE( wxGA_SMOOTH );   // windows only
-    AddWindowStyles();
-}
-
-wxObject *wxGaugeXmlHandler::DoCreateResource()
-{ 
-    wxGauge *control = new wxGauge(m_ParentAsWindow,
-                                    GetID(),
-                                    GetLong( wxT("range"), wxGAUGE_DEFAULT_RANGE), 
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-    if( HasParam( wxT("value") ))
-    {
-        control->SetValue( GetLong( wxT("value") ));
-    }
-    if( HasParam( wxT("shadow") ))
-    {
-        control->SetShadowWidth( GetDimension( wxT("shadow") ));
-    }
-    if( HasParam( wxT("bezel") ))
-    {
-        control->SetBezelFace( GetDimension( wxT("bezel") ));
-    }
-
-    SetupWindow(control);
-    
-    return control;
-}
-
-
-
-bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxGauge"));
-}
-
-
-#endif // wxUSE_GAUGE
--- a/contrib/src/xml/xh_html.cpp
+++ b/contrib/src/xml/xh_html.cpp
@@ -1,72 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_html.cpp
-// Purpose:     XML resource for wxHtmlWindow
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_html.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_html.h"
-
-#if wxUSE_HTML
-
-#include "wx/html/htmlwin.h"
-
-
-wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE( wxHW_SCROLLBAR_NEVER );
-    ADD_STYLE( wxHW_SCROLLBAR_AUTO );
-    AddWindowStyles();
-}
-
-wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
-{ 
-    wxHtmlWindow *control = new wxHtmlWindow(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    GetStyle( wxT("style" ), wxHW_SCROLLBAR_AUTO),
-                                    GetName()
-                                    );
-
-    if( HasParam( wxT("borders") ))
-    {
-        control->SetBorders( GetDimension( wxT("borders" )));
-    }
-
-    if( HasParam( wxT("url") ))
-    {
-        control->LoadPage( GetParamValue( wxT("url" )));
-    }
-    else if( HasParam( wxT("htmlcode") ))
-    {
-        control->SetPage( GetText(wxT("htmlcode")) );
-    }
-
-    SetupWindow(control);
-    
-    return control;
-}
-
-
-
-bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxHtmlWindow"));
-}
-
-#endif // wxUSE_HTML
--- a/contrib/src/xml/xh_listb.cpp
+++ b/contrib/src/xml/xh_listb.cpp
@@ -1,101 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_listb.cpp
-// Purpose:     XML resource for wxListBox
-// Author:      Bob Mitchell & Vaclav Slavik
-// Created:     2000/07/29
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_listb.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_listb.h"
-#include "wx/listbox.h"
-
-wxListBoxXmlHandler::wxListBoxXmlHandler() 
-: wxXmlResourceHandler() , m_InsideBox(FALSE)
-{
-    ADD_STYLE(wxLB_SINGLE);
-    ADD_STYLE(wxLB_MULTIPLE);
-    ADD_STYLE(wxLB_EXTENDED);
-    ADD_STYLE(wxLB_HSCROLL);
-    ADD_STYLE(wxLB_ALWAYS_SB);
-    ADD_STYLE(wxLB_NEEDED_SB);
-    ADD_STYLE(wxLB_SORT);
-    AddWindowStyles();
-}
-
-wxObject *wxListBoxXmlHandler::DoCreateResource()
-{ 
-    if( m_Class == wxT("wxListBox"))
-    {
-        // find the selection
-        long selection = GetLong( wxT("selection"), -1 );
-
-        // need to build the list of strings from children
-        m_InsideBox = TRUE;
-        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
-        wxString *strings = (wxString *) NULL;
-        if( strList.GetCount() > 0 )
-        {
-            strings = new wxString[strList.GetCount()];
-            int count = strList.GetCount();
-            for( int i = 0; i < count; i++ )
-                strings[i]=strList[i];
-        }
-
-
-        wxListBox *control = new wxListBox(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    strList.GetCount(),
-                                    strings,
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-        if( selection != -1 )
-            control->SetSelection( selection );
-
-        SetupWindow(control);
-
-        if( strings != NULL )
-            delete [] strings;
-        strList.Clear();    // dump the strings   
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle <item>Label</item>
-        
-        // add to the list
-        strList.Add( GetNodeContent(m_Node) );
-
-        return NULL;
-    }
-
-}
-
-
-
-bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxListBox")) ||
-           (m_InsideBox && node->GetName() == wxT("item"))
-           );
-}
-
-
--- a/contrib/src/xml/xh_listc.cpp
+++ b/contrib/src/xml/xh_listc.cpp
@@ -1,67 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_listc.cpp
-// Purpose:     XML resource for wxListCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_listc.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/textctrl.h"
-#include "wx/xml/xh_listc.h"
-#include "wx/listctrl.h"
-
-
-wxListCtrlXmlHandler::wxListCtrlXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE(wxLC_LIST);
-    ADD_STYLE(wxLC_REPORT);
-    ADD_STYLE(wxLC_ICON);
-    ADD_STYLE(wxLC_SMALL_ICON);
-    ADD_STYLE(wxLC_ALIGN_TOP);
-    ADD_STYLE(wxLC_ALIGN_LEFT);
-    ADD_STYLE(wxLC_AUTOARRANGE);
-    ADD_STYLE(wxLC_USER_TEXT);
-    ADD_STYLE(wxLC_EDIT_LABELS);
-    ADD_STYLE(wxLC_NO_HEADER);
-    ADD_STYLE(wxLC_SINGLE_SEL);
-    ADD_STYLE(wxLC_SORT_ASCENDING);
-    ADD_STYLE(wxLC_SORT_DESCENDING);
-    AddWindowStyles();
-}
-
-
-wxObject *wxListCtrlXmlHandler::DoCreateResource()
-{ 
-    wxListCtrl *list = new wxListCtrl(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName());
-    /* TODO: columns definition */
-    
-    SetupWindow(list);
-    
-    return list;
-}
-
-
-
-bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxListCtrl"));
-}
--- a/contrib/src/xml/xh_menu.cpp
+++ b/contrib/src/xml/xh_menu.cpp
@@ -1,130 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_menu.cpp
-// Purpose:     XML resource for menus and menubars
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_menu.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_menu.h"
-#include "wx/menu.h"
-
-
-wxMenuXmlHandler::wxMenuXmlHandler() : 
-        wxXmlResourceHandler(), m_InsideMenu(FALSE)
-{
-    ADD_STYLE(wxMENU_TEAROFF);
-}
-
-
-
-wxObject *wxMenuXmlHandler::DoCreateResource()
-{
-    if (m_Class == wxT("wxMenu"))
-    {
-        wxMenu *menu = new wxMenu(GetStyle());
-        wxString title = GetText(wxT("label"));
-        wxString help = GetText(wxT("help"));
-    
-        bool oldins = m_InsideMenu;
-        m_InsideMenu = TRUE;
-        CreateChildren(menu, TRUE/*only this handler*/);
-        m_InsideMenu = oldins;
-
-        wxMenuBar *p_bar = wxDynamicCast(m_Parent, wxMenuBar);
-        if (p_bar)
-            p_bar->Append(menu, title);
-        else
-        {
-            wxMenu *p_menu = wxDynamicCast(m_Parent, wxMenu);
-            if (p_menu)
-                p_menu->Append(GetID(), title, menu, help);
-        }
-
-        return menu;
-    }
-
-    else
-    {
-        wxMenu *p_menu = wxDynamicCast(m_Parent, wxMenu);
-        
-        if (m_Class == wxT("separator"))
-            p_menu->AppendSeparator();
-        else if (m_Class == wxT("break"))
-            p_menu->Break();
-        else /*wxMenuItem*/
-        {
-            int id = GetID();
-            bool checkable = GetBool(wxT("checkable"));
-
-            wxMenuItem *mitem = new wxMenuItem(p_menu, id, GetText(wxT("label")),
-                                               GetText(wxT("help")), checkable);
-                                               
-#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
-                if (HasParam(wxT("bitmap")))
-                    mitem->SetBitmap(GetBitmap(wxT("bitmap")));
-#endif
-            p_menu->Append(mitem);
-            mitem->Enable(GetBool(wxT("enabled"), TRUE));
-            if (checkable) mitem->Check(GetBool(wxT("checked")));
-        }
-        return NULL;
-    }
-}
-
-
-
-bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxMenu")) ||
-           (m_InsideMenu && 
-               (IsOfClass(node, wxT("wxMenuItem")) ||
-                IsOfClass(node, wxT("break")) ||
-                IsOfClass(node, wxT("separator")))
-           );
-}
-
-
-
-
-
-
-
-
-
-
-
-wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
-{
-    ADD_STYLE(wxMB_DOCKABLE);
-}
-
-
-
-wxObject *wxMenuBarXmlHandler::DoCreateResource()
-{
-    wxMenuBar *menubar = new wxMenuBar(GetStyle());
-    CreateChildren(menubar);
-    return menubar;
-}
-
-
-
-bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxMenuBar"));
-}
-
--- a/contrib/src/xml/xh_notbk.cpp
+++ b/contrib/src/xml/xh_notbk.cpp
@@ -1,100 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_notbk.cpp
-// Purpose:     XML resource for wxNotebook
-// Author:      Vaclav Slavik
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_notbk.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_notbk.h"
-
-#if wxUSE_NOTEBOOK
-
-#include "wx/log.h"
-#include "wx/notebook.h"
-#include "wx/sizer.h"
-
-wxNotebookXmlHandler::wxNotebookXmlHandler() 
-: wxXmlResourceHandler(), m_IsInside(FALSE), m_Notebook(NULL)
-{
-    ADD_STYLE(wxNB_FIXEDWIDTH);
-    ADD_STYLE(wxNB_LEFT);
-    ADD_STYLE(wxNB_RIGHT);
-    ADD_STYLE(wxNB_BOTTOM);
-    AddWindowStyles();
-}
-
-
-
-wxObject *wxNotebookXmlHandler::DoCreateResource()
-{ 
-    if (m_Class == wxT("notebookpage"))
-    {
-        wxXmlNode *n = GetParamNode(wxT("object"));
-
-        if (n)
-        {
-            bool old_ins = m_IsInside;
-            m_IsInside = FALSE;
-            m_IsInside = old_ins;
-            wxObject *item = CreateResFromNode(n, m_Notebook, NULL);
-            wxWindow *wnd = wxDynamicCast(item, wxWindow);
-
-            if (wnd)
-                m_Notebook->AddPage(wnd, GetText(wxT("label")),
-                                         GetBool(wxT("selected"), 0));
-            else 
-                wxLogError(wxT("Error in resource."));              
-            return wnd;
-        }
-        else
-        {
-            wxLogError(wxT("Error in resource: no control within notebook's <page> tag."));
-            return NULL;
-        }
-    }
-    
-    else {
-        wxNotebook *nb = new wxNotebook(m_ParentAsWindow, 
-                                        GetID(),
-                                        GetPosition(), GetSize(),
-                                        GetStyle( wxT("style" )),
-                                        GetName());
-    
-        wxNotebook *old_par = m_Notebook;
-        m_Notebook = nb;
-        bool old_ins = m_IsInside;
-        m_IsInside = TRUE;
-        CreateChildren(m_Notebook, TRUE/*only this handler*/);
-        m_IsInside = old_ins;
-        m_Notebook = old_par;
-
-        if (GetBool(wxT("usenotebooksizer"), FALSE))
-            return new wxNotebookSizer(nb);
-        else
-            return nb;
-    }
-}
-
-
-
-bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return ((!m_IsInside && IsOfClass(node, wxT("wxNotebook"))) ||
-            (m_IsInside && IsOfClass(node, wxT("notebookpage"))));
-}
-
-#endif
--- a/contrib/src/xml/xh_panel.cpp
+++ b/contrib/src/xml/xh_panel.cpp
@@ -1,63 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_panel.cpp
-// Purpose:     XML resource for panels
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_panel.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_panel.h"
-#include "wx/panel.h"
-
-
-wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
-{
-    ADD_STYLE(wxNO_3D);
-    ADD_STYLE(wxTAB_TRAVERSAL);
-    ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    ADD_STYLE(wxCLIP_CHILDREN);
-    AddWindowStyles();
-}
-
-
-
-wxObject *wxPanelXmlHandler::DoCreateResource()
-{ 
-    wxPanel *panel = wxDynamicCast(m_Instance, wxPanel);
-
-    if (panel == NULL)
-        panel = new wxPanel(m_ParentAsWindow,
-                                 GetID(),
-                                 GetPosition(), GetSize(),
-                                 GetStyle(wxT("style"), 0),
-                                 GetName());
-    else
-        panel->Create(m_ParentAsWindow,
-                                 GetID(),
-                                 GetPosition(), GetSize(),
-                                 GetStyle(wxT("style"), 0),
-                                 GetName());
-    SetupWindow(panel);
-    CreateChildren(panel);
-    
-    return panel;
-}
-
-
-bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxPanel"));
-}
--- a/contrib/src/xml/xh_radbt.cpp
+++ b/contrib/src/xml/xh_radbt.cpp
@@ -1,66 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_radbt.cpp
-// Purpose:     XML resource for wxRadioButton
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_radbt.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_radbt.h"
-#include "wx/radiobut.h"
-
-#if wxUSE_RADIOBOX
-
-wxRadioButtonXmlHandler::wxRadioButtonXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE( wxRB_GROUP );
-    AddWindowStyles();
-}
-
-wxObject *wxRadioButtonXmlHandler::DoCreateResource()
-{ 
-    /* BOBM - implementation note.
-     * once the wxBitmapRadioButton is implemented.
-     * look for a bitmap property. If not null, 
-     * make it a wxBitmapRadioButton instead of the 
-     * normal radio button.
-     */ 
-
-    wxRadioButton *control = new wxRadioButton(m_ParentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-    control->SetValue( GetBool(wxT("value"), 0));
-    SetupWindow(control);
-    
-    return control;
-}
-
-
-
-bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxRadioButton"));
-}
-
-
-#endif
--- a/contrib/src/xml/xh_radbx.cpp
+++ b/contrib/src/xml/xh_radbx.cpp
@@ -1,102 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_radbx.cpp
-// Purpose:     XML resource for wxRadioBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_radbx.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_radbx.h"
-#include "wx/radiobox.h"
-
-#if wxUSE_RADIOBOX
-
-wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() 
-: wxXmlResourceHandler() , m_InsideBox(FALSE)
-{
-    ADD_STYLE(wxRA_SPECIFY_COLS);
-    ADD_STYLE(wxRA_HORIZONTAL);
-    ADD_STYLE(wxRA_SPECIFY_ROWS);
-    ADD_STYLE(wxRA_VERTICAL);
-    AddWindowStyles();
-}
-
-wxObject *wxRadioBoxXmlHandler::DoCreateResource()
-{ 
-    if( m_Class == wxT("wxRadioBox"))
-    {
-        // find the selection
-        long selection = GetLong( wxT("selection"), -1 );
-
-        // need to build the list of strings from children
-        m_InsideBox = TRUE;
-        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
-        wxString *strings = (wxString *) NULL;
-        if( strList.GetCount() > 0 )
-        {
-            strings = new wxString[strList.GetCount()];
-            int count = strList.GetCount();
-            for( int i = 0; i < count; i++ )
-                strings[i]=strList[i];
-        }
-
-
-        wxRadioBox *control = new wxRadioBox(m_ParentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    strList.GetCount(),
-                                    strings,
-                                    GetLong( wxT("dimension"), 1 ),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-        if( selection != -1 )
-            control->SetSelection( selection );
-
-        SetupWindow(control);
-
-        if( strings != NULL )
-            delete [] strings;
-        strList.Clear();    // dump the strings   
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle <item selected="boolean">Label</item>
-
-        // add to the list
-        strList.Add( GetNodeContent(m_Node) );
-
-        return NULL;
-    }
-
-}
-
-
-
-bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxRadioBox")) ||
-           (m_InsideBox && node->GetName() == wxT("item"))
-           );
-}
-
-#endif
--- a/contrib/src/xml/xh_scrol.cpp
+++ b/contrib/src/xml/xh_scrol.cpp
@@ -1,63 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_scrol.cpp
-// Purpose:     XML resource for wxScrollBar
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_scrol.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_scrol.h"
-#include "wx/scrolbar.h"
-
-
-wxScrollBarXmlHandler::wxScrollBarXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE( wxSB_HORIZONTAL );
-    ADD_STYLE( wxSB_VERTICAL );
-    AddWindowStyles();
-}
-
-wxObject *wxScrollBarXmlHandler::DoCreateResource()
-{ 
-    wxScrollBar *control = new wxScrollBar(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-    control->SetScrollbar(GetLong( wxT("value"), 0), 
-                          GetLong( wxT("thumbsize"),1),
-                          GetLong( wxT("range"), 10),
-                          GetLong( wxT("pagesize"),1)
-                          );
-                          
-    
-    SetupWindow(control);
-    
-    return control;
-}
-
-
-
-bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxScrollBar"));
-}
-
-
-
--- a/contrib/src/xml/xh_sizer.cpp
+++ b/contrib/src/xml/xh_sizer.cpp
@@ -1,219 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_sizer.cpp
-// Purpose:     XML resource for wxBoxSizer
-// Author:      Vaclav Slavik
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_sizer.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_sizer.h"
-#include "wx/sizer.h"
-#include "wx/log.h"
-#include "wx/statbox.h"
-#include "wx/notebook.h"
-#include "wx/tokenzr.h"
-
-bool wxSizerXmlHandler::IsSizerNode(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxBoxSizer"))) ||
-           (IsOfClass(node, wxT("wxStaticBoxSizer"))) ||
-           (IsOfClass(node, wxT("wxGridSizer"))) ||
-           (IsOfClass(node, wxT("wxFlexGridSizer")));
-}
-
-
-
-wxSizerXmlHandler::wxSizerXmlHandler() 
-: wxXmlResourceHandler(), m_IsInside(FALSE), m_ParentSizer(NULL)
-{
-    ADD_STYLE(wxHORIZONTAL);
-    ADD_STYLE(wxVERTICAL);
-
-    // and flags
-    ADD_STYLE(wxLEFT);
-    ADD_STYLE(wxRIGHT);
-    ADD_STYLE(wxTOP);
-    ADD_STYLE(wxBOTTOM);
-    ADD_STYLE(wxNORTH);
-    ADD_STYLE(wxSOUTH);
-    ADD_STYLE(wxEAST);
-    ADD_STYLE(wxWEST);
-    ADD_STYLE(wxALL);
-
-    ADD_STYLE(wxGROW);
-    ADD_STYLE(wxEXPAND);
-    ADD_STYLE(wxSHAPED);
-    ADD_STYLE(wxSTRETCH_NOT);
-
-    ADD_STYLE(wxALIGN_CENTER);
-    ADD_STYLE(wxALIGN_CENTRE);
-    ADD_STYLE(wxALIGN_LEFT);
-    ADD_STYLE(wxALIGN_TOP);
-    ADD_STYLE(wxALIGN_RIGHT);
-    ADD_STYLE(wxALIGN_BOTTOM);
-    ADD_STYLE(wxALIGN_CENTER_HORIZONTAL);
-    ADD_STYLE(wxALIGN_CENTRE_HORIZONTAL);
-    ADD_STYLE(wxALIGN_CENTER_VERTICAL);
-    ADD_STYLE(wxALIGN_CENTRE_VERTICAL);
-}
-
-
-
-wxObject *wxSizerXmlHandler::DoCreateResource()
-{ 
-    if (m_Class == wxT("sizeritem"))
-    {
-        wxXmlNode *n = GetParamNode(wxT("object"));
-
-        if (n)
-        {
-            bool old_ins = m_IsInside;
-            wxSizer *old_par = m_ParentSizer;
-            m_IsInside = FALSE;
-            if (!IsSizerNode(n)) m_ParentSizer = NULL;
-            wxObject *item = CreateResFromNode(n, m_Parent, NULL);
-            m_IsInside = old_ins;
-            m_ParentSizer = old_par;
-            wxSizer *sizer = wxDynamicCast(item, wxSizer);
-            wxWindow *wnd = wxDynamicCast(item, wxWindow);
-            wxSize minsize = GetSize(wxT("minsize"));
-
-            if (sizer)
-            {
-                m_ParentSizer->Add(sizer, GetLong(wxT("option")), 
-                                   GetStyle(wxT("flag")), GetDimension(wxT("border")));
-                if (!(minsize == wxDefaultSize))
-                    m_ParentSizer->SetItemMinSize(sizer, minsize.x, minsize.y);
-            }
-            else if (wnd)
-            {
-                m_ParentSizer->Add(wnd, GetLong(wxT("option")), 
-                                   GetStyle(wxT("flag")), GetDimension(wxT("border")));
-                if (!(minsize == wxDefaultSize))
-                    m_ParentSizer->SetItemMinSize(wnd, minsize.x, minsize.y);
-            }
-            else 
-                wxLogError(wxT("Error in resource."));
-
-            return item;
-        }
-        else /*n == NULL*/
-        {
-            wxLogError(wxT("Error in resource: no control/sizer within sizer's <item> tag."));
-            return NULL;
-        }
-    }
-    
-    else if (m_Class == wxT("spacer"))
-    {
-        wxCHECK_MSG(m_ParentSizer, NULL, wxT("Incorrect syntax of XML resource: spacer not within sizer!"));
-        wxSize sz = GetSize();
-        m_ParentSizer->Add(sz.x, sz.y,
-            GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border")));
-        return NULL;
-    }
-    
-
-    else {
-        wxSizer *sizer = NULL;
-        
-        wxXmlNode *parentNode = m_Node->GetParent();
-
-        wxCHECK_MSG(m_ParentSizer != NULL ||
-                ((IsOfClass(parentNode, wxT("wxPanel")) ||
-                  IsOfClass(parentNode, wxT("wxDialog"))) &&
-                 parentNode->GetType() == wxXML_ELEMENT_NODE), NULL,
-                wxT("Incorrect use of sizer: parent is not 'wxDialog' or 'wxPanel'."));
-
-        if (m_Class == wxT("wxBoxSizer"))
-            sizer = new wxBoxSizer(GetStyle(wxT("orient"), wxHORIZONTAL));
-
-        else if (m_Class == wxT("wxStaticBoxSizer"))
-        {
-            sizer = new wxStaticBoxSizer(
-                         new wxStaticBox(m_ParentAsWindow, -1, GetText(wxT("label"))),
-                         GetStyle(wxT("orient"), wxHORIZONTAL));
-        }
-        
-        else if (m_Class == wxT("wxGridSizer"))
-            sizer = new wxGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
-                                    GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
-                                    
-        else if (m_Class == wxT("wxFlexGridSizer"))
-        {
-            wxFlexGridSizer *fsizer = 
-                  new wxFlexGridSizer(GetLong(wxT("rows")), GetLong(wxT("cols")),
-                      GetDimension(wxT("vgap")), GetDimension(wxT("hgap")));
-            sizer = fsizer;
-            wxStringTokenizer tkn;
-            unsigned long l;
-            tkn.SetString(GetParamValue(wxT("growablerows")), wxT(","));
-            while (tkn.HasMoreTokens())
-            {
-                if (!tkn.GetNextToken().ToULong(&l))
-                    wxLogError(wxT("growablerows must be comma-separated list of row numbers"));
-                else
-                    fsizer->AddGrowableRow(l);
-            }
-            tkn.SetString(GetParamValue(wxT("growablecols")), wxT(","));
-            while (tkn.HasMoreTokens())
-            {
-                if (!tkn.GetNextToken().ToULong(&l))
-                    wxLogError(wxT("growablecols must be comma-separated list of column numbers"));
-                else
-                    fsizer->AddGrowableCol(l);
-            }
-        }
-
-        wxSize minsize = GetSize(wxT("minsize"));
-        if (!(minsize == wxDefaultSize))
-            sizer->SetMinSize(minsize);
-
-        wxSizer *old_par = m_ParentSizer;
-        m_ParentSizer = sizer;
-        bool old_ins = m_IsInside;
-        m_IsInside = TRUE;
-        CreateChildren(m_Parent, TRUE/*only this handler*/);
-        m_IsInside = old_ins;
-        m_ParentSizer = old_par;
-        
-        if (m_ParentSizer == NULL) // setup window:
-        {
-            m_ParentAsWindow->SetAutoLayout(TRUE);
-            m_ParentAsWindow->SetSizer(sizer);
-
-            wxXmlNode *nd = m_Node;
-            m_Node = parentNode;
-            if (GetSize() == wxDefaultSize)
-                sizer->Fit(m_ParentAsWindow);
-            m_Node = nd;
-
-            if (m_ParentAsWindow->GetWindowStyle() & (wxRESIZE_BOX | wxRESIZE_BORDER))
-                sizer->SetSizeHints(m_ParentAsWindow);
-        }
-        
-        return sizer;
-    }
-}
-
-
-
-bool wxSizerXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return ((!m_IsInside && IsSizerNode(node)) ||
-            (m_IsInside && IsOfClass(node, wxT("sizeritem"))) ||
-            (m_IsInside && IsOfClass(node, wxT("spacer"))));
-}
--- a/contrib/src/xml/xh_slidr.cpp
+++ b/contrib/src/xml/xh_slidr.cpp
@@ -1,94 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_slidr.cpp
-// Purpose:     XML resource for wxSlider
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_slidr.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_slidr.h"
-#include "wx/slider.h"
-
-#if wxUSE_SLIDER
-
-wxSliderXmlHandler::wxSliderXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE( wxSL_HORIZONTAL );
-    ADD_STYLE( wxSL_VERTICAL );
-    ADD_STYLE( wxSL_AUTOTICKS );
-    ADD_STYLE( wxSL_LABELS );
-    ADD_STYLE( wxSL_LEFT );
-    ADD_STYLE( wxSL_TOP );
-    ADD_STYLE( wxSL_RIGHT );
-    ADD_STYLE( wxSL_BOTTOM );
-    ADD_STYLE( wxSL_BOTH );
-    ADD_STYLE( wxSL_SELRANGE );
-    AddWindowStyles();
-}
-
-wxObject *wxSliderXmlHandler::DoCreateResource()
-{ 
-    wxSlider *control = new wxSlider(m_ParentAsWindow,
-                                    GetID(),
-                                    GetLong( wxT("value"), wxSL_DEFAULT_VALUE), 
-                                    GetLong( wxT("min"), wxSL_DEFAULT_MIN),
-                                    GetLong( wxT("max"), wxSL_DEFAULT_MAX),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-    if( HasParam( wxT("tickfreq") ))
-    {
-        control->SetTickFreq( GetLong( wxT("tickfreq") ), 0 );
-    }
-    if( HasParam( wxT("pagesize") ))
-    {
-        control->SetPageSize( GetLong( wxT("pagesize") ) );
-    }
-    if( HasParam( wxT("linesize") ))
-    {
-        control->SetLineSize( GetLong( wxT("linesize") ));
-    }
-    if( HasParam( wxT("thumb") ))
-    {
-        control->SetThumbLength( GetLong( wxT("thumb") ));
-    }
-    if( HasParam( wxT("tick") ))
-    {
-        control->SetTick( GetLong( wxT("tick") ));
-    }
-    if( HasParam( wxT("selmin") ) && HasParam( wxT("selmax")) )
-    {
-        control->SetSelection( GetLong( wxT("selmin") ), GetLong( wxT("selmax")) );
-    }
-
-    SetupWindow(control);
-    
-    return control;
-}
-
-
-
-bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxSlider"));
-}
-
-
-#endif
--- a/contrib/src/xml/xh_spin.cpp
+++ b/contrib/src/xml/xh_spin.cpp
@@ -1,99 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_spin.cpp
-// Purpose:     XML resource for wxSpinButton
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_spin.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_spin.h"
-#include "wx/spinctrl.h"
-
-#if wxUSE_SPINBTN
-
-wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE( wxSP_HORIZONTAL );
-    ADD_STYLE( wxSP_VERTICAL );
-    ADD_STYLE( wxSP_ARROW_KEYS );
-    ADD_STYLE( wxSP_WRAP );
-    AddWindowStyles();
-}
-
-wxObject *wxSpinButtonXmlHandler::DoCreateResource()
-{ 
-    wxSpinButton *control = new wxSpinButton(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    GetStyle( wxT("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS ),
-                                    GetName()
-                                    );
-
-    control->SetValue( GetLong( wxT("value"), wxSP_DEFAULT_VALUE) );
-    control->SetRange( GetLong( wxT("min"), wxSP_DEFAULT_MIN),
-            GetLong( wxT("max"), wxSP_DEFAULT_MAX) );
-    SetupWindow(control);
-    
-    return control;
-}
-
-
-
-bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return node->GetName() == wxT("spinbutton");
-}
-
-#endif // wxUSE_SPINBTN
-
-#if wxUSE_SPINCTRL
-
-wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE( wxSP_HORIZONTAL );
-    ADD_STYLE( wxSP_VERTICAL );
-    ADD_STYLE( wxSP_ARROW_KEYS );
-    ADD_STYLE( wxSP_WRAP );
-}
-
-wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
-{ 
-    wxSpinCtrl *control = new wxSpinCtrl(m_ParentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("value")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle( wxT("style"), wxSP_ARROW_KEYS ),
-                                    GetLong( wxT("min"), wxSP_DEFAULT_MIN),
-                                    GetLong( wxT("max"), wxSP_DEFAULT_MAX),
-                                    GetLong( wxT("value"), wxSP_DEFAULT_VALUE),
-                                    GetName()
-                                    );
-
-    SetupWindow(control);
-    
-    return control;
-}
-
-
-
-bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxSpinCtrl"));
-}
-
-#endif // wxUSE_SPINCTRL
--- a/contrib/src/xml/xh_stbmp.cpp
+++ b/contrib/src/xml/xh_stbmp.cpp
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stbmp.cpp
-// Purpose:     XML resource for wxStaticBitmap
-// Author:      Vaclav Slavik
-// Created:     2000/04/22
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_stbmp.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_stbmp.h"
-#include "wx/statbmp.h"
-
-wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    AddWindowStyles();
-}
-
-wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
-{ 
-    wxStaticBitmap *bmp = new wxStaticBitmap(m_ParentAsWindow,
-                                    GetID(),
-                                    GetBitmap(wxT("bitmap"), GetSize()),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    GetName()
-                                    );
-    SetupWindow(bmp);
-    
-    return bmp;
-}
-
-
-
-bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxStaticBitmap"));
-}
-
-
--- a/contrib/src/xml/xh_stbox.cpp
+++ b/contrib/src/xml/xh_stbox.cpp
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stbox.cpp
-// Purpose:     XML resource for wxStaticBox
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_stbox.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_stbox.h"
-#include "wx/statbox.h"
-
-wxStaticBoxXmlHandler::wxStaticBoxXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    AddWindowStyles();
-}
-
-wxObject *wxStaticBoxXmlHandler::DoCreateResource()
-{ 
-    wxStaticBox *box = new wxStaticBox(m_ParentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    GetName()
-                                    );
-    SetupWindow(box);
-    
-    return box;
-}
-
-
-
-bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxStaticBox"));
-}
-
-
--- a/contrib/src/xml/xh_stlin.cpp
+++ b/contrib/src/xml/xh_stlin.cpp
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stbox.cpp
-// Purpose:     XML resource for wxStaticLine
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_stlin.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_stlin.h"
-#include "wx/statline.h"
-
-#if wxUSE_STATLINE
-
-wxStaticLineXmlHandler::wxStaticLineXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE(wxLI_HORIZONTAL);
-    ADD_STYLE(wxLI_VERTICAL);
-    AddWindowStyles();
-}
-
-wxObject *wxStaticLineXmlHandler::DoCreateResource()
-{ 
-    wxStaticLine *line = new wxStaticLine(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(wxT("style"), wxLI_HORIZONTAL),
-                                    GetName()
-                                    );
-    SetupWindow(line);
-    
-    return line;
-}
-
-
-
-bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxStaticLine"));
-}
-
-#endif
--- a/contrib/src/xml/xh_sttxt.cpp
+++ b/contrib/src/xml/xh_sttxt.cpp
@@ -1,53 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_sttxt.cpp
-// Purpose:     XML resource for wxStaticText
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_sttxt.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_sttxt.h"
-#include "wx/stattext.h"
-
-wxStaticTextXmlHandler::wxStaticTextXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE( wxST_NO_AUTORESIZE );
-    AddWindowStyles();
-}
-
-wxObject *wxStaticTextXmlHandler::DoCreateResource()
-{ 
-    wxStaticText *text = new wxStaticText(m_ParentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    GetName()
-                                    );
-    SetupWindow(text);
-    
-    return text;
-}
-
-
-
-bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxStaticText"));
-}
-
-
--- a/contrib/src/xml/xh_text.cpp
+++ b/contrib/src/xml/xh_text.cpp
@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_text.cpp
-// Purpose:     XML resource for wxTextCtrl
-// Author:      Aleksandras Gluchovas
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_text.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_text.h"
-#include "wx/textctrl.h"
-
-wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler() 
-{
-    ADD_STYLE(wxTE_PROCESS_ENTER);
-    ADD_STYLE(wxTE_PROCESS_TAB);
-    ADD_STYLE(wxTE_MULTILINE);
-    ADD_STYLE(wxTE_PASSWORD);
-    ADD_STYLE(wxTE_READONLY);
-    ADD_STYLE(wxHSCROLL);
-    AddWindowStyles();
-}
-
-wxObject *wxTextCtrlXmlHandler::DoCreateResource()
-{ 
-    wxTextCtrl *text = new wxTextCtrl(m_ParentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("value")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-    SetupWindow(text);
-    
-    return text;
-}
-
-
-
-bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxTextCtrl"));
-}
-
-
--- a/contrib/src/xml/xh_toolb.cpp
+++ b/contrib/src/xml/xh_toolb.cpp
@@ -1,129 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_toolb.cpp
-// Purpose:     XML resource for wxBoxSizer
-// Author:      Vaclav Slavik
-// Created:     2000/08/11
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_toolb.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_toolb.h"
-#include "wx/toolbar.h"
-
-
-#if wxUSE_TOOLBAR
-
-wxToolBarXmlHandler::wxToolBarXmlHandler() 
-: wxXmlResourceHandler(), m_IsInside(FALSE), m_Toolbar(NULL)
-{
-    ADD_STYLE(wxTB_FLAT);
-    ADD_STYLE(wxTB_DOCKABLE);
-    ADD_STYLE(wxTB_VERTICAL);
-    ADD_STYLE(wxTB_HORIZONTAL);
-}
-
-
-
-wxObject *wxToolBarXmlHandler::DoCreateResource()
-{ 
-    if (m_Class == wxT("tool"))
-    {
-        wxCHECK_MSG(m_Toolbar, NULL, wxT("Incorrect syntax of XML resource: tool not within a toolbar!"));
-        m_Toolbar->AddTool(GetID(),
-                           GetBitmap(wxT("bitmap")),
-                           GetBitmap(wxT("bitmap2")),
-                           GetBool(wxT("toggle")),
-                           GetPosition().x,
-                           GetPosition().y,
-                           NULL,
-                           GetText(wxT("tooltip")),
-                           GetText(wxT("longhelp")));
-        return m_Toolbar; // must return non-NULL
-    }
-    
-    else if (m_Class == wxT("separator"))
-    {
-        wxCHECK_MSG(m_Toolbar, NULL, wxT("Incorrect syntax of XML resource: separator not within a toolbar!"));
-        m_Toolbar->AddSeparator();
-        return m_Toolbar; // must return non-NULL
-    }
-    
-    else /*<object class="wxToolBar">*/
-    {
-        int style = GetStyle(wxT("style"), wxNO_BORDER | wxTB_HORIZONTAL);
-#ifdef __WXMSW__
-        if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
-#endif
-        wxToolBar *toolbar = new wxToolBar(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(),
-                                    GetSize(),
-                                    style,
-                                    GetName());
-
-        wxSize bmpsize = GetSize(wxT("bitmapsize"));
-        if (!(bmpsize == wxDefaultSize))
-            toolbar->SetToolBitmapSize(bmpsize);
-        wxSize margins = GetSize(wxT("margins"));
-        if (!(margins == wxDefaultSize))
-            toolbar->SetMargins(margins.x, margins.y);
-        long packing = GetLong(wxT("packing"), -1);
-        if (packing != -1)
-            toolbar->SetToolPacking(packing);
-        long separation = GetLong(wxT("separation"), -1);
-        if (separation != -1)
-            toolbar->SetToolSeparation(separation);
-
-        wxXmlNode *children_node = GetParamNode(wxT("object"));
-        if (children_node == NULL) return toolbar;
-
-        m_IsInside = TRUE;
-        m_Toolbar = toolbar;
-
-        wxXmlNode *n = children_node;
-
-        while (n)
-        {
-            if (n->GetType() == wxXML_ELEMENT_NODE && 
-                n->GetName() == wxT("object"))
-            {
-                wxObject *created = CreateResFromNode(n, toolbar, NULL);
-                wxControl *control = wxDynamicCast(created, wxControl);
-                if (IsOfClass(n, wxT("tool")) &&
-                    IsOfClass(n, wxT("separator")) &&
-                    control != NULL)
-                    toolbar->AddControl(control);
-            }
-            n = n->GetNext();
-        }
-
-        m_IsInside = FALSE;
-        m_Toolbar = NULL;
-
-        toolbar->Realize();
-        return toolbar;
-    }
-}
-
-
-
-bool wxToolBarXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return ((!m_IsInside && IsOfClass(node, wxT("wxToolBar"))) ||
-            (m_IsInside && IsOfClass(node, wxT("tool"))) || 
-            (m_IsInside && IsOfClass(node, wxT("separator"))));
-}
-
-#endif
--- a/contrib/src/xml/xh_tree.cpp
+++ b/contrib/src/xml/xh_tree.cpp
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_tree.cpp
-// Purpose:     XML resource for wxTreeCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_tree.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/xml/xh_tree.h"
-#include "wx/treectrl.h"
-
-
-wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler() 
-: wxXmlResourceHandler() 
-{
-    ADD_STYLE(wxTR_HAS_BUTTONS);
-    ADD_STYLE(wxTR_EDIT_LABELS);
-    ADD_STYLE(wxTR_MULTIPLE);
-    AddWindowStyles();
-}
-
-
-wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
-{ 
-    wxTreeCtrl *tree = new wxTreeCtrl(m_ParentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName());
-    
-    SetupWindow(tree);
-    
-    return tree;
-}
-
-
-
-bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxTreeCtrl"));
-}
-
-
--- a/Show More
+++ b/Show More