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

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

.cvsignore

@@ -21,10 +21,23 @@ linux-gnu.system.cache
 *.d
 *.swp
 *.swo
+*.swq
 Release
 Debug
-ReleaseDLL
+ReleaseDll
-DebugDLL
+DebugDll
+ReleaseUnicode
+DebugUnicode
+ReleaseUnicodeDll
+DebugUnicodeDll
+BaseRelease
+BaseDebug
+BaseReleaseDll
+BaseDebugDll
+BaseReleaseUnicode
+BaseDebugUnicode
+BaseReleaseUnicodeDll
+BaseDebugUnicodeDll
 robert
 stamp-h.in
 Makefile
@@ -37,10 +50,6 @@ base
 gtk
 motif
 win32
-base-debug
-gtk-debug
-motif-debug
-win32-debug
 base-release
 gtk-release
 motif-release

BuildCVS.txt

@@ -2,9 +2,6 @@
                 How to build the sources from CVS
 ------------------------------------------------------------------------
 
-Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
-etc. alongside these instructions.
-
 I) Windows using plain makefiles
 ----------------------------------------
 
@@ -118,38 +115,23 @@ ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
 Of course, you can also build the library using plain makefiles (see
 section I).
 
-IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
+IV) wxBase
 ----------------------------------------
 
-Refer to the readme.txt and install.txt files in docs/mac to build
+wxBase is the non GUI part of wxWindows. Currently it can be only built using
-wxWindows under Classic Mac OS using CodeWarrior.
+configure (i.e. under Unix and probably under Win32 with cygwin) and with
+Visual C++.
 
-If you are checking out the CVS sources using cvs under Mac OS X and
+To build it using configure, just add "--disable-gui" argument to it.
-compiling under Classic Mac OS, make sure that all text files have a
-Mac OS type of 'TEXT' otherwise CodeWarrior may ignore them. Checking
-out the CVS sources using cvs under Mac OS X creates untyped files
-which can lead to compialtion errors under CodeWarrior which are hard
-to track down.
 
-V) MacOS X using configure and the Developer Tools
+To build wxBase with VC++, use the project files wxBase.dsp and wxBaseDll.dsp
+included in the CVS. See http://www.wxwindows.org/vadim/wxDocs/buildmsw.html
+for the instructions on how to generate the project files for the programs
+using wxBase.
+
+V) MacOS
 ----------------------------------------
 
-You need to have the Developer Tools installed. If this is not the case,
-you will need to register at the Apple Developer web site (this is a free
-registration) in order to download the Developer Tools installer.
-
-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).
-
--> type: mkdir macbuild
--> type: cd macbuild
--> type: ../configure --with-mac
-or type: ../configure
--> type: make
-
 VI) OS/2
 ----------------------------------------
 

Makefile.in

@@ -42,31 +42,11 @@ VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
-VP12 = @top_srcdir@/src/msw/ole
-
-FTVP01 = @top_srcdir@/src/freetype/unix
-FTVP02 = @top_srcdir@/src/freetype/autohint
-FTVP03 = @top_srcdir@/src/freetype/base
-FTVP04 = @top_srcdir@/src/freetype/cff
-FTVP05 = @top_srcdir@/src/freetype/cid
-FTVP06 = @top_srcdir@/src/freetype/macfond
-FTVP07 = @top_srcdir@/src/freetype/otlayout
-FTVP08 = @top_srcdir@/src/freetype/psnames
-FTVP09 = @top_srcdir@/src/freetype/raster1
-FTVP10 = @top_srcdir@/src/freetype/sfnt
-FTVP11 = @top_srcdir@/src/freetype/smooth
-FTVP12 = @top_srcdir@/src/freetype/truetype
-FTVP13 = @top_srcdir@/src/freetype/type1
-FTVP14 = @top_srcdir@/src/freetype/type1z
-FTVP15 = @top_srcdir@/src/freetype/winfonts
-
-VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
-VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -138,9 +118,7 @@ GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
-MACDIR   = $(WXDIR)/src/mac
 ODBCDIR  = $(WXDIR)/src/iodbc
-FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 DEMODIR  = $(WXDIR)/demos
@@ -152,20 +130,17 @@ INTLDIR  = $(WXDIR)/locale
 
 ########################## Archive name ###############################
 
-# append a version suffix x.y.z to all file names
+WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
-VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
+WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
-WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
-WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
+WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
-WXSAMPLES=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
-WXDEMOS=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
 
-WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2
+WXARCHIVE_BZIP = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
-WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
+WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
-WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
+WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
-WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
+WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
 
-DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX)
+DISTDIR = ./_dist_dir/@DISTDIR@
-DISTDIR=./_dist_dir/$(DISTDIRNAME)
 
 
 ############################## Files ##################################
@@ -220,24 +195,6 @@ PNGOBJS     = \
 		pngget.o \
 		pngset.o
 
-FREETYPEOBJS = \
-		ftsystem.o \
-		autohint.o \
-		ftbase.o \
-		ftdebug.o \
-		ftglyph.o \
-		ftinit.o \
-		ftmm.o \
-		cff.o \
-		type1cid.o \
-		psnames.o \
-		psmodule.o \
-		raster1.o \
-		sfnt.o \
-		smooth.o \
-		truetype.o \
-		type1z.o \
-		winfnt.o
 
 JPEGOBJS    = \
 		jcomapi.o \
@@ -339,14 +296,6 @@ IODBCOBJS = \
 		prepare.o \
 		result.o
         
-OLEOBJS = \
-		automtn.o \
-		dataobj.o \
-		dropsrc.o \
-		droptgt.o \
-		oleutils.o \
-		uuid.o
-
 ############################## Rules ##################################
 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
@@ -372,12 +321,6 @@ all: @WX_ALL@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
 	
-./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc
-	$(DEREZ) $^ $(DEREZFLAGS) > $@
-
-./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc: $(MACRESOURCES)
-	$(REZ) $(REZFLAGS) $^ -o $@
-
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
@@ -594,6 +537,8 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
+	cp $(DOCDIR)/base/todo.txt $(DISTDIR)/wxBASE.todo
+	cp $(DOCDIR)/base/install.txt $(DISTDIR)/wxBASE.install
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
@@ -663,8 +608,10 @@ BASE_DIST: ALL_DIST
 	cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
 	cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
 	cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
+	cp $(DOCDIR)/base/install.txt $(DISTDIR)/INSTALL.txt
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
+	cp $(DOCDIR)/base/todo.txt $(DISTDIR)/TODO.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
@@ -707,9 +654,6 @@ MOTIF_DIST: ALL_GUI_DIST
 	cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
 	cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
-MACX_DIST: ALL_GUI_DIST
-	echo "Apple Mac OS X specific distribution not complete"
-
 MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
@@ -873,16 +817,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
 
-	mkdir $(DISTDIR)/samples/erase
-	cp $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase
-	cp $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase
-	cp $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase
-
-	mkdir $(DISTDIR)/samples/event
-	cp $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event
-	cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
-	cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
-
 	mkdir $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
@@ -961,7 +895,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/internat
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
-	mkdir $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
@@ -970,10 +903,8 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
-	cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
-	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
 
 	mkdir $(DISTDIR)/samples/ipc
 	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
@@ -1078,6 +1009,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
 	cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
 
+	mkdir $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
+
 	mkdir $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
@@ -1307,58 +1243,24 @@ PYTHON_DIST:
 distclean:
 	$(RM) -r _dist_dir
 
-# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
-#     the files twice
-dist-only:
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
-	@if test "$(USE_GUI)" = 1; then \
-	cd $(DISTDIR); \
-	mv samples wxSamples-$(VER_SUFFIX); \
-	echo "*** Creating wxSamples archive..."; \
-	tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
-	mv wxSamples-$(VER_SUFFIX) samples; \
-	mv demos wxDemos-$(VER_SUFFIX); \
-	echo "*** Creating wxDemos archive..."; \
-	tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
-	mv wxDemos-$(VER_SUFFIX) demos; \
-	fi
-
 dist: @GUIDIST@
-	cp $(WXDIR)/src/files.lst $(DISTDIR)/src
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
+	cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
-	mv samples wxSamples-$(VER_SUFFIX); \
+	mv samples wxSamples; \
-	echo "*** Creating wxSamples archive..."; \
+	tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \
-	tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
+	mv wxSamples samples; \
-	mv wxSamples-$(VER_SUFFIX) samples; \
+	mv demos wxDemos; \
-	mv demos wxDemos-$(VER_SUFFIX); \
+	tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \
-	echo "*** Creating wxDemos archive..."; \
+	mv wxDemos demos; \
-	tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
-	mv wxDemos-$(VER_SUFFIX) demos; \
-	fi
-
-bzip-dist-only:
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
-	@if test "$(USE_GUI)" = 1; then \
-	cd $(DISTDIR); \
-	mv samples wxSamples-${VER_SUFFIX}; \
-	echo "*** Creating wxSamples archive..."; \
-	tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
-	mv wxSamples-${VER_SUFFIX} samples; \
-	mv demos wxDemos-${VER_SUFFIX}; \
-	echo "*** Creating wxDemos archive..."; \
-	tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
-	mv wxDemos-${VER_SUFFIX} demos; \
 	fi
 
 bzip-dist: @GUIDIST@
 	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
+	cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples; \
@@ -1385,22 +1287,6 @@ clean:
 	$(RM) *.d
 	$(RM) parser.c
 	$(RM) lexer.c
-	$(RM) -r ./lib/wx/*
+	$(RM) -r ./lib/*
-	$(RM) ./lib/lib*
 
 cleanall: clean
-
-
-RPMTOP=_dist_dir/_rpm_top
-
-rpm: dist
-	@echo "*** Building RPMs ***"
-	-mkdir $(RPMTOP)
-	-mkdir $(RPMTOP)/SOURCES
-	-mkdir $(RPMTOP)/SPECS
-	-mkdir $(RPMTOP)/BUILD
-	-mkdir $(RPMTOP)/RPMS
-	-mkdir $(RPMTOP)/SRPMS
-	cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
-	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
-	mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .

aclocal.m4

@@ -1,194 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-dnl
-AC_DEFUN(AM_PATH_GTK_2_0,
-[dnl 
-dnl Get the cflags and libraries from the gtk-config-2.0 script
-dnl
-AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-            gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
-		    , enable_gtktest=yes)
-
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             gtk_config_args="$gtk_config_args gthread"
-         ;;
-      esac
-  done
-
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG_2_0+set} != xset ; then
-        GTK_CONFIG_2_0=$gtk_config_exec_prefix/bin/gtk-config-2.0
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG_2_0+set} != xset ; then
-        GTK_CONFIG_2_0=$gtk_config_prefix/bin/gtk-config-2.0
-     fi
-  fi
-
-  AC_PATH_PROG(GTK_CONFIG_2_0, gtk-config-2.0, no)
-  min_gtk_version=ifelse([$1], ,1.3.1,$1)
-  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-  no_gtk=""
-  if test "$GTK_CONFIG_2_0" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG_2_0 $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG_2_0 $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
-dnl checks the results of gtk-config-2.0 to some extent
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config-2.0 was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
-      printf("*** to point to the correct copy of gtk-config-2.0, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config-2.0 shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG_2_0 environment to point to the\n");
-        printf("*** correct copy of gtk-config-2.0. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GTK_CONFIG_2_0" = "no" ; then
-       echo "*** The gtk-config-2.0 script installed by GTK could not be found"
-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
-       echo "*** full path to gtk-config-2.0."
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-          echo "*** may want to edit the gtk-config-2.0 script: $GTK_CONFIG_2_0" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])

config.guess

@@ -1,10 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
 #   Free Software Foundation, Inc.
-
+#
-version='2000-10-23'
-
 # 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
@@ -25,7 +23,8 @@ version='2000-10-23'
 # the same distribution terms that you use for the rest of that program.
 
 # Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -38,46 +37,6 @@ version='2000-10-23'
 # (but try to keep the structure clean).
 #
 
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of this system.
-
-Operation modes:
-  -h, --help               print this help, then exit
-  -V, --version            print version number, then exit"
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case "$1" in
-    --version | --vers* | -V )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       exec >&2
-       echo "$me: invalid option $1"
-       echo "$help"
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
 # Use $HOST_CC if defined. $CC may point to a cross-compiler
 if test x"$CC_FOR_BUILD" = x; then
   if test x"$HOST_CC" != x; then
@@ -109,43 +68,6 @@ 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
-    *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
-	esac
-	# The Operating System including object format.
-	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep __ELF__ >/dev/null
-	then
-	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-	    # Return netbsd for either.  FIX?
-	    os=netbsd
-	else
-	    os=netbsdelf
-	fi
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -155,51 +77,41 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
 	.globl main
-	.align 4
 	.ent main
 main:
-	.frame \$30,16,\$26,0
+	.frame \$30,0,\$26,0
-	ldgp \$29,0(\$27)
+	.prologue 0
-	.prologue 1
+	.long 0x47e03d80 # implver $0
-	.long 0x47e03d80 # implver \$0
+	lda \$2,259
-	lda \$2,-1
+	.long 0x47e20c21 # amask $2,$1
-	.long 0x47e20c21 # amask \$2,\$1
+	srl \$1,8,\$2
-	lda \$16,\$Lformat
+	sll \$2,2,\$2
-	mov \$0,\$17
+	sll \$0,3,\$0
-	not \$1,\$18
+	addl \$1,\$0,\$0
-	jsr \$26,printf
+	addl \$2,\$0,\$0
-	ldgp \$29,0(\$26)
+	ret \$31,(\$26),1
-	mov 0,\$16
-	jsr \$26,exit
 	.end main
 EOF
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		case `./$dummy` in
+		./$dummy
-			0-0)
+		case "$?" in
+			7)
 				UNAME_MACHINE="alpha"
 				;;
-			1-0)
+			15)
 				UNAME_MACHINE="alphaev5"
 				;;
-			1-1)
+			14)
 				UNAME_MACHINE="alphaev56"
 				;;
-			1-101)
+			10)
 				UNAME_MACHINE="alphapca56"
 				;;
-			2-303)
+			16)
 				UNAME_MACHINE="alphaev6"
 				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
@@ -215,7 +127,10 @@ EOF
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
       exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -241,12 +156,12 @@ EOF
     wgrisc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	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;;
@@ -303,6 +218,9 @@ EOF
     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 ;;
@@ -332,9 +250,15 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${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 ;;
@@ -347,6 +271,9 @@ EOF
     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 ;;
@@ -362,7 +289,6 @@ EOF
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -402,17 +328,14 @@ EOF
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
 		echo m88k-dg-dgux${UNAME_RELEASE}
 	else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
 	fi
-	else
+        else echo i586-dg-dgux${UNAME_RELEASE}
-	    echo i586-dg-dgux${UNAME_RELEASE}
         fi
  	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
@@ -479,7 +402,7 @@ EOF
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+    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:*:*)
@@ -500,8 +423,6 @@ EOF
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
               sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
               #include <stdlib.h>
               #include <unistd.h>
 
@@ -532,7 +453,7 @@ EOF
                   exit (0);
               }
 EOF
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	($CC_FOR_BUILD $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]*//'`
@@ -626,13 +547,10 @@ EOF
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo t90-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
     CRAY*T3E:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo t3e-cray-unicosmk${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
@@ -645,10 +563,13 @@ EOF
     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 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -658,8 +579,17 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
+	if test -x /usr/bin/objformat; then
+	    if test "elf" = "`/usr/bin/objformat`"; then
+		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+		exit 0
+	    fi
+	fi
 	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 ;;
@@ -669,9 +599,6 @@ EOF
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -690,57 +617,31 @@ EOF
     *:GNU:*:*)
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
     *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
+	  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. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_supported_emulations=`cd /; ld --help 2>&1 \
+	ld_help_string=`cd /; 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
-	  *ia64)
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
-		echo "${UNAME_MACHINE}-unknown-linux"
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
-		exit 0
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-		;;
+	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  i?86linux)
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+	  elf32ppc)
-		exit 0
-		;;
-	  elf_i?86)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  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
-		;;
-	  elf32arm*)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
-		exit 0
-		;;
-	  armelf_linux*)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-		exit 0
-		;;
-	  m68klinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  elf32ppc | elf32ppclinux)
 		# Determine Lib Version
 		cat >$dummy.c <<EOF
 #include <features.h>
@@ -769,63 +670,47 @@ EOF
 			fi
 		fi	
 		rm -f $dummy.c $dummy
-		echo powerpc-unknown-linux-gnu${LIBC}
+		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
-		exit 0
-		;;
-	  shelf_linux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-		exit 0
-		;;
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then
-		cat <<EOF >$dummy.s
+		sed 's/^	//'  <<EOF >$dummy.s
-			.data
-		\$Lformat:
-			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-			.text
 		.globl main
-			.align 4
 		.ent main
 	main:
-			.frame \$30,16,\$26,0
+		.frame \$30,0,\$26,0
-			ldgp \$29,0(\$27)
+		.prologue 0
-			.prologue 1
+		.long 0x47e03d80 # implver $0
-			.long 0x47e03d80 # implver \$0
+		lda \$2,259
-			lda \$2,-1
+		.long 0x47e20c21 # amask $2,$1
-			.long 0x47e20c21 # amask \$2,\$1
+		srl \$1,8,\$2
-			lda \$16,\$Lformat
+		sll \$2,2,\$2
-			mov \$0,\$17
+		sll \$0,3,\$0
-			not \$1,\$18
+		addl \$1,\$0,\$0
-			jsr \$26,printf
+		addl \$2,\$0,\$0
-			ldgp \$29,0(\$26)
+		ret \$31,(\$26),1
-			mov 0,\$16
-			jsr \$26,exit
 		.end main
 EOF
 		LIBC=""
 		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			case `./$dummy` in
+			./$dummy
-			0-0)
+			case "$?" in
+			7)
 				UNAME_MACHINE="alpha"
 				;;
-			1-0)
+			15)
 				UNAME_MACHINE="alphaev5"
 				;;
-			1-1)
+			14)
 				UNAME_MACHINE="alphaev56"
 				;;
-			1-101)
+			10)
 				UNAME_MACHINE="alphapca56"
 				;;
-			2-303)
+			16)
 				UNAME_MACHINE="alphaev6"
 				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
 			esac
 
 			objdump --private-headers $dummy | \
@@ -839,7 +724,6 @@ EOF
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >$dummy.c <<EOF
 #ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -855,32 +739,14 @@ EOF
 EOF
 	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
-	elif test "${UNAME_MACHINE}" = "s390"; then
-	  echo s390-ibm-linux && exit 0
-	elif test "${UNAME_MACHINE}" = "x86_64"; then
-	  echo x86_64-unknown-linux-gnu && exit 0
-	elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa"; then
-	  # Look for CPU level
-	  case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	    PA7*)
-		echo hppa1.1-unknown-linux-gnu
-		;;
-	    PA8*)
-		echo hppa2.0-unknown-linux-gnu
-		;;
-	    *)
-		echo hppa-unknown-linux-gnu
-		;;
-	  esac
-	  exit 0
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
 	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
 	  # If ld does not provide *any* "supported emulations:"
 	  # that means it is gnuoldld.
-	  test -z "$ld_supported_emulations" \
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
-	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
 
 	  case "${UNAME_MACHINE}" in
 	  i?86)
@@ -894,7 +760,6 @@ EOF
 	  cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -917,7 +782,6 @@ EOF
 EOF
 	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
-	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
@@ -933,22 +797,20 @@ EOF
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i?86:*:5:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
+    i?86:*:5:7*)
+	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
+	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
+	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+	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`
@@ -967,11 +829,7 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i?86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
     pc:*:*:*)
-	# Left here for compatibility:
         # 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
@@ -995,7 +853,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.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`
@@ -1054,7 +912,7 @@ EOF
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
-    news*:NEWS-OS:6*:*)
+    news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@ -1085,41 +943,6 @@ EOF
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1259,47 +1082,6 @@ then
     esac
 fi
 
-cat >&2 <<EOF
+#echo '(Unable to guess system type)' 1>&2
-$0: unable to guess system type
-
-The $version version of this script cannot recognize your system type.
-Please download the most up to date version of the config scripts:
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess version = $version
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
 
 exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "version='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

config.sub

@@ -1,10 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
-
-version='2000-11-04'
-
 # 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.
@@ -29,8 +25,6 @@ version='2000-11-04'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
-#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -51,61 +45,30 @@ version='2000-11-04'
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-me=`echo "$0" | sed -e 's,.*/,,'`
+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
 
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help               print this help, then exit
-  -V, --version            print version number, then exit"
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case "$1" in
-    --version | --vers* | -V )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       exec >&2
-       echo "$me: invalid option $1"
-       echo "$help"
-       exit 1 ;;
-
-    *local*)
 # First pass through any local machine types.
+case $1 in
+	*local*)
 		echo $1
-       exit 0;;
+		exit 0
-
+		;;
 	*)
-       break ;;
+	;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos*)
+  linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -131,7 +94,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple)
 		os=
 		basic_machine=$1
 		;;
@@ -142,7 +105,7 @@ case $os in
 	-scout)
 		;;
 	-wrs)
-		os=-vxworks
+		os=vxworks
 		basic_machine=$1
 		;;
 	-hiux*)
@@ -193,46 +156,33 @@ case $os in
 	-psos*)
 		os=-psos
 		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| arme[lb] | armv[2345] | armv[345][lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
+		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
 		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore \
+		| mips64vr5000 | miprs64vr5000el \
 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr)
+		| thumb | d10v)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
 		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[234567]86 | x86_64)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -241,28 +191,23 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 	      | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
 	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
+	      | mipstx39-* | mipstx39el-* \
-	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+	      | f301-* | armv*-* | t3e-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -299,14 +244,14 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-sysv4
 		;;
 	apollo68)
@@ -360,9 +305,6 @@ case $basic_machine in
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -483,6 +425,7 @@ case $basic_machine in
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
+		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i[34567]86v32)
@@ -517,10 +460,6 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-mingw32
 		;;
-	i[34567]86-pw32 | pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -549,7 +488,7 @@ case $basic_machine in
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+	*mint | *MiNT)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
@@ -567,10 +506,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -579,10 +514,6 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-msdos
 		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -592,7 +523,7 @@ case $basic_machine in
 		os=-netbsd
 		;;
 	netwinder)
-		basic_machine=armv4l-rebel
+		basic_machine=armv4l-corel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -640,16 +571,9 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
 		basic_machine=np1-gould
 		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -679,19 +603,19 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+	pentiumpro-* | p6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
@@ -794,10 +718,6 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
@@ -806,10 +726,6 @@ case $basic_machine in
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -911,9 +827,6 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4)
-		basic_machine=sh-unknown
-		;;
 	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
@@ -994,25 +907,12 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* | -storm-chaos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i[34567]86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@@ -1026,12 +926,6 @@ case $os in
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -1056,9 +950,6 @@ case $os in
 	-ns2 )
 	        os=-nextstep2
 		;;
-	-nsk*)
-		os=-nsk
-		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -1121,7 +1012,7 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-rebel)
+	arm*-corel)
 		os=-linux
 		;;
 	arm*-semi)
@@ -1295,7 +1186,7 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			-mvs*)
 				vendor=ibm
 				;;
 			-ptx*)
@@ -1322,11 +1213,3 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "version='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

contrib/Makefile.in

@@ -8,8 +8,6 @@ all:
 clean:
 	cd src; make clean
 	cd samples; make clean
-	cd utils; make clean
-    
 
 samples:
 	cd samples; make

contrib/configure

@@ -817,31 +817,12 @@ trap 'rm -fr `echo "
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
-            src/xrc/Makefile
-            src/canvas/Makefile
-            src/gizmos/Makefile
-            src/plot/Makefile
-            src/applet/Makefile
             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
-            samples/canvas/Makefile
-            samples/canvas/test/Makefile
-            samples/canvas/simple/Makefile
-            samples/gizmos/Makefile
-            samples/gizmos/multicell/Makefile
-            samples/gizmos/splittree/Makefile
-            samples/gizmos/editlbox/Makefile
-            samples/xrc/Makefile
-            samples/plot/Makefile
-            samples/applet/Makefile
-            utils/Makefile
-            utils/wxrc/Makefile
-            utils/wxrcedit/Makefile
-            utils/convertrc/Makefile
          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -925,31 +906,12 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
-            src/xrc/Makefile
-            src/canvas/Makefile
-            src/gizmos/Makefile
-            src/plot/Makefile
-            src/applet/Makefile
             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
-            samples/canvas/Makefile
-            samples/canvas/test/Makefile
-            samples/canvas/simple/Makefile
-            samples/gizmos/Makefile
-            samples/gizmos/multicell/Makefile
-            samples/gizmos/splittree/Makefile
-            samples/gizmos/editlbox/Makefile
-            samples/xrc/Makefile
-            samples/plot/Makefile
-            samples/applet/Makefile
-            utils/Makefile
-            utils/wxrc/Makefile
-            utils/wxrcedit/Makefile
-            utils/convertrc/Makefile
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF

contrib/configure.in

@@ -42,29 +42,10 @@ AC_OUTPUT([
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
-            src/xrc/Makefile
-            src/canvas/Makefile
-            src/gizmos/Makefile
-            src/plot/Makefile
-            src/applet/Makefile
             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
-            samples/canvas/Makefile
-            samples/canvas/test/Makefile
-            samples/canvas/simple/Makefile
-            samples/gizmos/Makefile
-            samples/gizmos/multicell/Makefile
-            samples/gizmos/splittree/Makefile
-            samples/gizmos/editlbox/Makefile
-            samples/xrc/Makefile
-            samples/plot/Makefile
-            samples/applet/Makefile
-            utils/Makefile
-            utils/wxrc/Makefile
-            utils/wxrcedit/Makefile
-            utils/convertrc/Makefile
          ])

contrib/docs/.cvsignore

@@ -0,0 +1,5 @@
+html
+htmlhelp
+pdf
+winhelp
+htb

contrib/docs/latex/mmedia/sndfile.tex

@@ -214,30 +214,15 @@ been set. In all other cases, you must return FALSE.
 \membersection{wxSoundFileStream::RepositionStream}\label{wxsoundfilestreamrepositionstream}
 \func{bool}{RepositionStream}{\param{wxUint32 }{position}}
 
-This is called by wxSoundFileStream::SetPosition to seek the input stream
-to the right position. This must be overidden by the file codec class.
-The position is relative to the beginning of the samples.
-If it is impossible (as for a piped input stream), you must return FALSE.
 
 \membersection{wxSoundFileStream::FinishPreparation}\label{wxsoundfilestreamfinishpreparation}
 \func{void}{FinishPreparation}{\param{wxUint32 }{len}}
 
-This is an internal function but it must called by the file codec class when
-the "playing" preparation is finished and you know the size of the stream.
-If it is an {\it infinite} stream, you should set this to wxSOUND\_INFINITE\_TIME.
 
 \membersection{wxSoundFileStream::GetData}\label{wxsoundfilestreamgetdata}
 \func{wxUint32}{GetData}{\param{void* }{buffer}, \param{wxUint32 }{len}}
 
-This is called by wxSoundFileStream when it needs to get new sound data to
-send to the device driver (or to a conversion codec). This must be eventually
-overidden by the file codec class. The default behaviour is simply to read from
-the input stream.
 
 \membersection{wxSoundFileStream::PutData}\label{wxsoundfilestreamputdata}
 \func{wxUint32}{PutData}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
 
-This is called by wxSoundFileStream when it needs to put new sound data received
-from the device driver (or from a conversion codec). This must be eventually
-overidden by the file codec class. The default behaviour is simply to write to
-the input stream.

contrib/docs/latex/mmedia/sndrter.tex

@@ -6,8 +6,8 @@
 
 \section{\class{wxSoundRouterStream}}\label{wxsoundrouterstream}
 
-This is the router "codec" class. It should do codec routing when the device
+
-driver does not deal with a format.
+Codec router class
 
 \wxheading{Derived from}
 
@@ -17,21 +17,43 @@ driver does not deal with a format.
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
-\membersection{wxSoundRouterStream::wxSoundRouterStream}\label{wxsoundrouterstreamwxsoundrouterstream}
-\func{}{wxSoundRouterStream}{\param{wxSoundStream\& }{sndio}}
 
-\helpref{wxSoundCodec}{wxsoundcodec}
+\membersection{wxSoundRouterStream::wxSoundRouterStream}\label{wxsoundrouterstreamwxsoundrouterstream}
+
+\func{}{wxSoundRouterStream}{\param{wxSoundStream\& }{sndio}}
 
 
 \membersection{wxSoundRouterStream::\destruct{wxSoundRouterStream}}\label{wxsoundrouterstreamdtor}
+
 \func{}{\destruct{wxSoundRouterStream}}{\void}
 
-Destructor.
+
+\membersection{wxSoundRouterStream::Read}\label{wxsoundrouterstreamread}
+
+\func{wxSoundStream\&}{Read}{\param{void* }{buffer}, \param{wxUint32 }{len}}
+
+
+\membersection{wxSoundRouterStream::Write}\label{wxsoundrouterstreamwrite}
+
+\func{wxSoundStream\&}{Write}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
+
 
 \membersection{wxSoundRouterStream::SetSoundFormat}\label{wxsoundrouterstreamsetsoundformat}
+
 \func{bool}{SetSoundFormat}{\param{const wxSoundFormatBase\& }{format}}
 
-SetSoundFormat will first try to setup the device driver with the specified
+
-format. If this fails, it will try to find a codec which will convert the
+\membersection{wxSoundRouterStream::StartProduction}\label{wxsoundrouterstreamstartproduction}
-input format to a valid format for the device driver. It uses an internal
+
-codec database.
+\func{bool}{StartProduction}{\param{int }{evt}}
+
+
+\membersection{wxSoundRouterStream::StopProduction}\label{wxsoundrouterstreamstopproduction}
+
+\func{bool}{StopProduction}{\void}
+
+
+\membersection{wxSoundRouterStream::GetBestSize}\label{wxsoundrouterstreamgetbestsize}
+
+\constfunc{wxUint32}{GetBestSize}{\void}
+

contrib/docs/latex/mmedia/tex2rtf.ini

@@ -1,4 +1,3 @@
-;    Last change:  JAC  13 Oct 100    5:16 pm
 runTwice = yes
 titleFontSize = 12
 authorFontSize = 10
@@ -14,7 +13,7 @@ htmlBrowseButtons = bitmap
 winHelpVersion = 3
 winHelpContents = yes
 winHelpTitle = "MMedia Manual"
-truncateFilenames = no
+truncateFilenames = yes
 combineSubSections = yes
 \overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
 \htmlonly{\image{}{books.gif}}\helpref{#1}{#2}

contrib/docs/latex/ogl/tex2rtf.ini

@@ -1,4 +1,4 @@
-;    Last change:  JAC  13 Oct 100    5:11 pm
+;    Last change:  JS    8 Sep 98    2:54 pm
 runTwice = yes
 titleFontSize = 12
 authorFontSize = 10

contrib/include/wx/applet/applet.h

@@ -1,85 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the wxApplet class
-*
-****************************************************************************/
-
-#ifndef __WX_APPLET_H
-#define __WX_APPLET_H
-
-#include "wx/panel.h"
-#include "wx/html/htmlwin.h"
-
-// Forward declaration
-class wxHtmlAppletWindow;
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Defines the abstract base class for wxApplet objects.
-****************************************************************************/
-class wxApplet : public wxPanel {
-private:
-    DECLARE_ABSTRACT_CLASS(wxApplet);
-    DECLARE_EVENT_TABLE();
-
-protected:
-    //wxHtmlAppletWindow  *m_parent;
-
-            // Special handler for background erase messages
-            void OnEraseBackground(wxEraseEvent&);
-
-public:
-            // Constructor (called during dynamic creation)
-            wxApplet() { m_parent = NULL; };
-
-            // Psuedo virtual constructor
-    virtual bool Create(
-                wxHtmlAppletWindow *parent,
-                const wxHtmlTag& params,
-                const wxSize& size,
-                long style = wxTAB_TRAVERSAL | wxNO_BORDER);
-
-            // Virtual destructor
-    virtual ~wxApplet();
-
-            // Handle HTML navigation to a new URL
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link) = 0;
-
-            // Handle HTML navigation forward command in applet
-    virtual void OnHistoryForward() = 0;
-
-            // Handle HTML navigation back command in applet
-    virtual void OnHistoryBack() = 0;
-
-            // Handle messages from the wxAppletManager and other applets
-    virtual void OnMessage(wxEvent& msg) = 0;
-    };
-
-
-
-#endif // __WX_APPLET_H
-

contrib/include/wx/applet/echovar.h

@@ -1,95 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for wxEchoVariable Class, Dynamically constructed
-* objects representing variables in SSI #echo directive
-*
-****************************************************************************/
-
-#ifndef __WX_ECHOVAR_H
-#define __WX_ECHOVAR_H
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-wxEchoVariable class Definition
-****************************************************************************/
-class wxEchoVariable : public wxObject {
-private:
-    DECLARE_ABSTRACT_CLASS(wxEchoVariable);
-
-public:
-    wxEchoVariable() : wxObject() {}
-    ~wxEchoVariable() {}
-	
-	/****************************************************************************
-    RETURNS:
-    The boolean value of the variable
-
-    PARAMETERS:
-    parms   - Optional parameter string passed from parm= field in HTML
-
-    REMARKS:
-    To create new variables for the #echo HTML preprocessing directives
-    you need to derive classes from wxEchoVariable and override the
-    pure virtual GetValue function. However this should not be done directly
-    but by using the BEGIN_ECHO_VARIABLE and END_ECHO_VARIABLE macros
-
-    SEE ALSO:
-    wxEchoPrep, BEGIN_ECHO_VARIABLE, END_ECHO_VARIABLE
-    ****************************************************************************/
-    virtual wxString GetValue(const char *parms = NULL) const = 0;
-
-
-public:
-    // static function to retrieve any variable avaliable
-    static wxString GetValue(const wxString &cls, const char *parms = NULL);
-};
-	
-/*--------------------------------- MACROS --------------------------------*/
-
-#define ECHO_PARM (_BEV_parm)
-#define BEGIN_ECHO_VARIABLE(name)                                           \
-    class wxEchoVariable##name : public wxEchoVariable {                    \
-    private:                                                                \
-        DECLARE_DYNAMIC_CLASS(wxEchoVariable##name##);                      \
-    public:                                                                 \
-        wxEchoVariable##name##() : wxEchoVariable() {}                      \
-        virtual wxString GetValue(const char *parms = NULL) const;          \
-        };                                                                  \
-    IMPLEMENT_DYNAMIC_CLASS(wxEchoVariable##name##, wxEchoVariable);        \
-    wxString wxEchoVariable##name :: GetValue(const char *parms) const {    \
-    wxString _BEV_parm = wxString(parms);
-
-#define END_ECHO_VARIABLE(name, returnval)                                  \
-    return returnval;                                                       \
-    }
-
-#define STRING_ECHO_VARIABLE(name, string)                                  \
-    BEGIN_ECHO_VARIABLE(##name##);                                          \
-    END_ECHO_VARIABLE(##name##, wxString(##string##))
-	
-#endif // __WX_ECHOVAR_H
-

contrib/include/wx/applet/ifelsevar.h

@@ -1,95 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for wxIfElseVariable Class, Dynamically constructed
-* objects representing variables in SSI #if, #else and #endif directives
-*
-****************************************************************************/
-
-#ifndef __WX_IFELSEVAR_H
-#define __WX_IFELSEVAR_H
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-This class is used to create variables for the HTML preprocessor #if, #else,
-and #endif directives.
-
-SEE ALSO:
-wxIfElsePrep
-****************************************************************************/
-class wxIfElseVariable : public wxObject {
-private:
-    DECLARE_ABSTRACT_CLASS(wxIfElseVariable);
-
-public:
-    wxIfElseVariable() : wxObject() {}
-    ~wxIfElseVariable() {}
-	
-    /****************************************************************************
-    RETURNS:
-    The boolean value of the variable
-
-    REMARKS:
-    To create new variables for the #if, #else and #endif HTML preprocessing
-    blocks you need to derive classes from wxIfElseVariable and override the
-    pure virtual GetValue function. However this should not be done directly
-    but by using the BEGIN_IFELSE_VARIABLE and END_IFELSE_VARIABLE macros
-
-    SEE ALSO:
-    wxIfElsePrep, BEGIN_IFELSE_VARIABLE, END_IFELSE_VARIABLE
-    ****************************************************************************/
-    virtual bool GetValue() const = 0;
-
-
-public:
-    // static function to retrieve any variable avaliable
-    static bool GetValue(const wxString &cls);
-};
-
-/*--------------------------------- MACROS --------------------------------*/
-
-#define BEGIN_IFELSE_VARIABLE(name)                                         \
-    class wxIfElseVariable##name : public wxIfElseVariable {                \
-    private:                                                                \
-        DECLARE_DYNAMIC_CLASS(wxIfElseVariable##name##);                    \
-    public:                                                                 \
-        wxIfElseVariable##name##() : wxIfElseVariable() {}                  \
-        virtual bool GetValue() const;                                      \
-        };                                                                  \
-    IMPLEMENT_DYNAMIC_CLASS(wxIfElseVariable##name##, wxIfElseVariable);    \
-    bool wxIfElseVariable##name :: GetValue() const {
-
-#define END_IFELSE_VARIABLE(name, returnval)                                \
-    return returnval;                                                       \
-    }
-
-#define IFELSE_VARIABLE(name, state)                                        \
-    BEGIN_IFELSE_VARIABLE(##name##);                                        \
-    END_IFELSE_VARIABLE(##name##, bool (state))
-
-
-#endif // __WX_IFELSEVAR_H
-

contrib/include/wx/applet/loadpage.h

@@ -1,109 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the wxLoadPage Event class
-*
-****************************************************************************/
-
-#ifndef __WX_LOAD_PAGE_H
-#define __WX_LOAD_PAGE_H
-
-#include "wx/html/htmlwin.h"
-
-// Forward declaration
-class wxHtmlAppletWindow;
-
-// If we are compiling this code into a library that links against
-// the DLL, we need to remove all the __declspec(dllimports) that
-// would declare our classes below incorrectly.
-
-#ifndef WXMAKINGDLL
-#undef  WXDLLEXPORT
-#define WXDLLEXPORT
-#endif
-// Declare our local load page event type
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_LOAD_PAGE,   wxEVT_USER_FIRST+1)
-    DECLARE_EVENT_TYPE(wxEVT_PAGE_LOADED, wxEVT_USER_FIRST+2)
-END_DECLARE_EVENT_TYPES()
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Defines the class for load page events.
-****************************************************************************/
-class wxLoadPageEvent : public wxEvent {
-    DECLARE_DYNAMIC_CLASS(wxLoadPageEvent);
-
-protected:
-    wxString            m_hRef;
-    wxHtmlAppletWindow  *m_htmlWindow;
-
-public:
-            // Constructor
-            wxLoadPageEvent(const wxString &hRef = "",wxHtmlAppletWindow *htmlWindow = NULL);
-
-            // Destructor
-            ~wxLoadPageEvent() {}
-
-            // Return the hmtl window for the load page operation
-            wxHtmlAppletWindow  *GetHtmlWindow() { return m_htmlWindow; };
-
-            // Get the hRef string for the load page operation
-            const wxString & GetHRef() { return m_hRef; };
-
-            // Copy constructor for the object
-            void CopyObject(wxObject& obj) const;
-    };
-
-
-// Define the macro to create our event type
-typedef void (wxEvtHandler::*wxLoadPageEventFunction)(wxLoadPageEvent&);
-#define EVT_LOAD_PAGE(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LOAD_PAGE, -1, -1, (wxObjectEventFunction)(wxEventFunction)(wxLoadPageEventFunction) & fn, (wxObject *) NULL ),
-
-/****************************************************************************
-REMARKS:
-Defines the class for pageloaded events.
-****************************************************************************/
-class wxPageLoadedEvent : public wxEvent {
-    DECLARE_DYNAMIC_CLASS(wxPageLoadedEvent);
-
-public:
-            // Constructor
-            wxPageLoadedEvent();
-
-            // Destructor
-            ~wxPageLoadedEvent() {}
-
-            // Copy constructor for the object
-            void CopyObject(wxObject& obj) const;
-    };
-
-// Define the macro to create our event type
-typedef void (wxEvtHandler::*wxPageLoadedEventFunction)(wxPageLoadedEvent&);
-#define EVT_PAGE_LOADED(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_PAGE_LOADED, -1, -1, (wxObjectEventFunction)(wxEventFunction)(wxPageLoadedEventFunction) & fn, (wxObject *) NULL ),
-
-
-#endif // __WX_LOAD_PAGE_H

contrib/include/wx/applet/prepecho.h

@@ -1,59 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for the Preprocessor of the #echo directive
-* in wxHTML.
-*
-****************************************************************************/
-
-#ifndef __WX_PREPECHO_H
-#define __WX_PREPECHO_H
-
-#include "wx/html/htmlproc.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Echo Preprocessor class Definition
-****************************************************************************/
-class wxEchoPrep : public wxHtmlProcessor {
-private:
-    //DECLARE_DYNAMIC_CLASS(wxEchoPrep);
-
-public:
-    wxEchoPrep() : wxHtmlProcessor() {}
-    ~wxEchoPrep() {}
-	
-	// Process input text and return processed result
-    wxString Process(const wxString& text) const;
-
-    // Return priority value of this processor. The higher, the sooner
-    // is the processor applied to the text.
-    int GetPriority() const { return wxHTML_PRIORITY_SYSTEM-2; }
-	};
-	
-	
-#endif // __WX_PREPECHO_H
-

contrib/include/wx/applet/prepifelse.h

@@ -1,59 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for the Preprocessor of the #if SSI directive
-* in wxHTML.
-*
-****************************************************************************/
-
-#ifndef __WX_PREPIFELSE_H
-#define __WX_PREPIFELSE_H
-
-#include "wx/html/htmlproc.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-If Else Preprocessor class Definition
-****************************************************************************/
-class wxIfElsePrep : public wxHtmlProcessor {
-private:
-    //DECLARE_DYNAMIC_CLASS(wxIfElsePrep);
-
-public:
-    wxIfElsePrep() : wxHtmlProcessor() {}
-    ~wxIfElsePrep() {}
-	
-	// Process input text and return processed result
-    wxString Process(const wxString& text) const;
-
-    // Return priority value of this processor. The higher, the sooner
-    // is the processor applied to the text.
-    int GetPriority() const { return wxHTML_PRIORITY_SYSTEM-2; }
-	};
-	
-	
-#endif // __WX_PREPECHO_H
-

contrib/include/wx/applet/prepinclude.h

@@ -1,63 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for the Preprocessor of the #include directive
-* in wxHTML.
-*
-****************************************************************************/
-
-#ifndef __WX_PREPINCLUDE_H
-#define __WX_PREPINCLUDE_H
-
-#include "wx/html/htmlproc.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-wxIncludePrep class Definition
-****************************************************************************/
-class wxIncludePrep : public wxHtmlProcessor {
-private:
-    //DECLARE_DYNAMIC_CLASS(wxIncludePrep);
-    wxString DOC_ROOT;
-
-public:
-    wxIncludePrep() : wxHtmlProcessor() {DOC_ROOT = wxString("");}
-    ~wxIncludePrep() {}
-	
-	// Process input text and return processed result
-    wxString Process(const wxString& text) const;
-
-    // Return priority value of this processor. The higher, the sooner
-    // is the processor applied to the text.
-    int GetPriority() const { return wxHTML_PRIORITY_SYSTEM; }
-	
-    void ChangeDirectory(const wxString &dir);
-    wxString GetDirectory() { return DOC_ROOT; }
-    };
-	
-	
-#endif // __WX_PREPINCLUDE_H
-

contrib/include/wx/applet/window.h

@@ -1,165 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the wxHtmlAppletWindow class
-*
-****************************************************************************/
-
-#ifndef __WX_APPLET_WINDOW_H
-#define __WX_APPLET_WINDOW_H
-
-#include "wx/html/htmlwin.h"
-
-// Forward declare
-class wxApplet;
-class wxLoadPageEvent;
-class wxPageLoadedEvent;
-class wxIncludePrep;
-
-// Declare a linked list of wxApplet pointers
-WX_DECLARE_LIST(wxApplet, wxAppletList);
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Defines the class for virtual-link data types
-****************************************************************************/
-class VirtualData : public wxObject {
-private:
-    wxString m_name;
-    wxString m_group;
-    wxString m_href;
-
-public:
-            // Ctors
-            VirtualData(
-                wxString& name,
-                wxString& group,
-                wxString& href );
-
-            // Gets
-            wxString GetName(){ return m_name;};
-            wxString GetGroup(){ return m_group;};
-            wxString GetHref(){ return m_href;};
-
-            // Sets
-            void SetName (wxString& s){ m_name = s; };
-            void SetGroup(wxString& s){ m_group = s; };
-            void SetHref (wxString& s){ m_href = s; };
-    };
-
-/****************************************************************************
-REMARKS:
-Defines the class for wxAppletWindow. This class is derived from the
-wxHtmlWindow class and extends it with functionality to handle embedded
-wxApplet's on the HTML pages.
-****************************************************************************/
-class wxHtmlAppletWindow : public wxHtmlWindow {
-private:
-    DECLARE_CLASS(wxHtmlAppletWindow);
-    DECLARE_EVENT_TABLE();
-
-    bool m_mutexLock;
-    wxIncludePrep *incPreprocessor;  // deleted by list it is added too in constructor
-protected:
-	wxAppletList		m_AppletList;		
-	static wxHashTable	m_Cookies;
-    wxToolBarBase       *m_NavBar;
-    int                 m_NavBackId;
-    int                 m_NavForwardId;
-		
-public:
-            // Constructor
-            wxHtmlAppletWindow(
-                wxWindow *parent,
-                wxWindowID id = -1,
-                wxToolBarBase *navBar = NULL,
-                int navBackId = -1,
-                int navForwardId = -1,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxHW_SCROLLBAR_AUTO,
-                const wxString& name = "htmlAppletWindow");
-
-            // Destructor
-            ~wxHtmlAppletWindow();
-
-            // Create an instance of an applet based on it's class name
-            wxApplet *CreateApplet(
-                const wxString& classId,
-                const wxString& iName,
-                const wxHtmlTag &params,
-                const wxSize& size);
-
-            // Find an instance of an applet based on it's class name
-            wxApplet *FindApplet(const wxString& className);
-
-            // Remove an applet from the window. Called during applet destruction
-            bool RemoveApplet(const wxApplet *applet);
-
-            // Load a new URL page
-    virtual bool LoadPage(const wxString& location);
-
-            // Called when users clicked on hypertext link.
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
-
-            // Handles forward navigation within the HTML stack
-            bool HistoryForward();
-
-            // Handles backwards navigation within the HTML stack
-            bool HistoryBack();
-
-            // Broadcast a message to all applets on the page
-            void SendMessage(wxEvent& msg);
-
-            // Register a cookie of data in the applet manager
-            bool RegisterCookie(const wxString& name,wxObject *cookie);
-
-            // UnRegister a cookie of data in the applet manager
-            bool UnRegisterCookie(const wxString& name);
-
-            // Find a cookie of data given it's public name
-            wxObject *FindCookie(const wxString& name);
-			
-            // Event handlers to load a new page	
-			void OnLoadPage(wxLoadPageEvent &event);
-
-            // Event handlers to load a new page	
-    		void OnPageLoaded(wxPageLoadedEvent &event);
-
-            // LoadPage mutex locks
-            void Lock() { m_mutexLock = true;};
-            void UnLock() { m_mutexLock = false;};
-
-            // Returns TRUE if the mutex is locked, FALSE otherwise.
-            bool IsLocked() { return m_mutexLock;};
-
-            // Tries to lock the mutex. If it can't, returns immediately with false.
-            bool TryLock();
-
-    };
-
-#endif // __WX_APPLET_WINDOW_H
-

contrib/include/wx/canvas/bbox.h

@@ -1,76 +0,0 @@
-#ifndef __WXBOUNDINGBOX_H__
-#define __WXBOUNDINGBOX_H__
-
-#ifdef __GNUG__
-    #pragma interface "bbox.cpp"
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "wx/matrix.h"
-#include "wx/geometry.h"
-
-enum OVERLAP {_IN,_ON,_OUT};
-
-//Purpose   The wxBoundingBox class stores one wxBoundingBox.
-//The wxBoundingBox is defined by two coordiates,
-//a upperleft coordinate and a lowerright coordinate.
-class wxBoundingBox
-{
-public:
-    wxBoundingBox();
-    wxBoundingBox(wxBoundingBox&);
-    wxBoundingBox(const wxPoint2DDouble&);
-    wxBoundingBox(double xmin, double ymin, double xmax, double ymax);
-
-    bool And(wxBoundingBox*, double Marge = 0);
-
-    void EnLarge(const double Marge);
-    void Shrink(const double Marge);
-
-    void Expand(const wxPoint2DDouble& , const wxPoint2DDouble&);
-    void Expand(const wxPoint2DDouble&);
-    void Expand(double x,double y);
-    void Expand(const wxBoundingBox& bbox);
-
-    OVERLAP Intersect( wxBoundingBox &, double Marge = 0);
-    bool LineIntersect(const wxPoint2DDouble& begin, const wxPoint2DDouble& end );
-    bool PointInBox( const wxPoint2DDouble&, double Marge = 0);
-    bool PointInBox( double, double, double Marge = 0);
-
-    void Reset();
-
-    void Translate( wxPoint2DDouble& );
-    void MapBbox( const wxTransformMatrix& matrix);
-
-    double  GetWidth() {return m_maxx-m_minx;};
-    double  GetHeight(){return m_maxy-m_miny;};
-    bool    GetValid()  const;
-    void    SetValid(bool);
-
-    void    SetBoundingBox(const wxPoint2DDouble& a_point);
-
-    void    SetMin(double, double);
-    void    SetMax(double, double);
-    inline  wxPoint2DDouble GetMin();
-    inline  wxPoint2DDouble GetMax();
-    inline  double GetMinX(){return m_minx;};
-    inline  double GetMinY(){return m_miny;};
-    inline  double GetMaxX(){return m_maxx;};
-    inline  double GetMaxY(){return m_maxy;};
-
-    wxBoundingBox&  operator+( wxBoundingBox& );
-    wxBoundingBox&  operator=(  const wxBoundingBox& );
-
-protected:
-    //bounding box in world
-    double        m_minx;
-    double        m_miny;
-    double        m_maxx;
-    double        m_maxy;
-    bool          m_validbbox;
-};
-
-#endif

contrib/include/wx/canvas/canvas.h

@@ -1,859 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        canvas.h
-// Author:      Robert Roebling
-// Created:     XX/XX/XX
-// Copyright:   2000 (c) Robert Roebling
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WXCANVAS_H__
-#define __WXCANVAS_H__
-
-#ifdef __GNUG__
-    #pragma interface "canvas.cpp"
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "wx/image.h"
-#include "wx/txtstrm.h"
-#include "wx/geometry.h"
-#include "wx/matrix.h"
-#include "bbox.h"
-
-
-//----------------------------------------------------------------------------
-// decls
-//----------------------------------------------------------------------------
-
-class wxCanvas;
-class wxCanvasAdmin;
-
-//----------------------------------------------------------------------------
-// wxCanvasObject
-//----------------------------------------------------------------------------
-enum wxDRAG_MODE
-{
-    wxDRAG_RECTANGLE,
-    wxDRAG_ONTOP,
-    wxDRAG_REDRAW
-};
-
-//:defenition
-// wxCanvasObject is the base class for  Canvas Objects.
-// All Objects for drawing one the canvas are derived from this class.
-// It supports dragging and moving methods that can be used in derived
-// classes for defining several ways of dragging.
-// Also it is possible to plug in events handlers to do this for all derived classes at once.
-//
-// wxCanvasObjects have themselves as their event handlers by default,
-// but their event handlers could be set to another object entirely. This
-// separation can reduce the amount of derivation required, and allow
-// alteration of a  wxCanvasObject functionality
-class wxCanvasObject: public wxEvtHandler
-{
-public:
-
-    wxCanvasObject();
-
-    //If the position (x,y) is within the object this return a pointer to the object
-    //Normally this function needs to be defined for each derived wxCanvasObject.
-    //The default is a simple bounding box test.
-    virtual wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-    //render this object to the canvas (either on its buffer or directly on the canvas)
-    //this depends on the wxDC that is set for the active canvas.
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-
-    //x position in world coordinates of the object
-    virtual double  GetPosX()=0;
-    //y position in world coordinates of the object
-    virtual double  GetPosY()=0;
-
-    //set position in world coordinates for the object
-    virtual void  SetPosXY( double x, double y)=0;
-
-    //absolute moving the object to position x,y in world coordinates
-    //also does an update of the old and new area
-    virtual void MoveAbsolute( double x, double y );
-
-    //relative moving the object to position x,y in world coordinates
-    //also does an update of the old and new area
-    virtual void MoveRelative( double x, double y );
-
-    //relative translate the object to position x,y in world coordinates
-    //does NOT update the old and new area
-    //this function must be defined for each derived object,
-    //it is used internally for dragging and moving objects.
-    virtual void TransLate( double x, double y )=0;
-
-    //choose one of the three diffrenet drag methods |
-    //DRAG_RECTANGLE = as a rectangle when drag is in progress |
-    //DRAG_ONTOP = only redraw the object when dragging |
-    //DRAG_REDRAW = redraw the damaged areas when dragging
-    void SetDragMode(wxDRAG_MODE mode) { m_dragmode=mode; };
-
-    //return the dragmode
-    wxDRAG_MODE GetDragMode() { return m_dragmode; };
-
-    //called when starting a drag
-    virtual void DragStart();
-    //called when dragging is in progress
-    virtual void DragRelative( double x, double y);
-    //called when dragging is ended
-    virtual void DragEnd();
-
-    //return the object if it is part of the given object or
-    //if the given object is part of a group within this object.
-    //For group objects this means recursively search for it.
-    virtual wxCanvasObject* Contains( wxCanvasObject* obj );
-
-    //calculate the boundingbox in world coordinates
-    virtual void CalcBoundingBox()=0;
-
-    //write the object as SVG (scalable vector grafhics
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    //get the administrator for the object,
-    //this will give access to the canvas's where it is displayed upon.
-    //It is used to render the object to the active canvas.
-    //Conversion from world to Device coordinates and visa versa is
-    //done using the Active canvas at that moment.
-    wxCanvasAdmin *GetAdmin()              { return m_admin; }
-
-    //set the administrator
-    virtual void SetAdmin( wxCanvasAdmin *admin )  { m_admin = admin; }
-
-    //is this a control type of canvas object
-    bool        IsControl()     { return m_isControl; }
-    //is this a vector type of canvas object
-    bool        IsVector()      { return m_isVector; }
-    //is this an Image type of canvas object
-    bool        IsImage()       { return m_isImage; }
-
-    //get minimum X of the boundingbox in world coordinates
-    inline double  GetXMin()     { return m_bbox.GetMinX(); }
-    //get minimum Y of the boundingbox in world coordinates
-    inline double  GetYMin()     { return m_bbox.GetMinY(); }
-    //get maximum X of the boundingbox in world coordinates
-    inline double  GetXMax()     { return m_bbox.GetMaxX(); }
-    //get maximum Y of the boundingbox in world coordinates
-    inline double  GetYMax()     { return m_bbox.GetMaxY(); }
-
-    //get boundingbox
-    inline wxBoundingBox GetBbox() { return m_bbox; }
-
-    //redirect all mouse events for the canvas to this object
-    void CaptureMouse();
-    //release the mouse capture for this object
-    void ReleaseMouse();
-    //is the mouse captured for this object
-    bool IsCapturedMouse();
-
-    //set if this object will visible (be rendered or not)
-    inline void SetVisible(bool visible) { m_visible=visible; }
-    //get visibility
-    inline bool GetVisible() {return m_visible; }
-
-    //can the object be dragged
-    inline void SetDraggable(bool drag) { m_dragable=drag; }
-    //get if the object can be dragged
-    inline bool GetDraggable() {return m_dragable; }
-
-    //get absolute area in the device coordinates where the object
-    //its boundingbox in world coordinates is first translated using the matrix.
-    wxRect GetAbsoluteArea(const wxTransformMatrix& cworld);
-
-    //get currently used eventhandler (always the first in the list)
-    wxEvtHandler *GetEventHandler() const { return m_eventHandler; }
-
-    //process an event for the object, starting with the first eventhandler
-    // in the list.
-    bool ProcessCanvasObjectEvent(wxEvent& event);
-
-    // push/pop event handler: allows to chain a custom event handler to
-    // already existing ones
-    void PushEventHandler( wxEvtHandler *handler );
-
-    //remove first eventhandler in the list (one will be always stay in)
-    wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
-    //append an eventhandler to the list, this event handler will be called
-    //if the other skipped the event to process.
-    void AppendEventHandler(wxEvtHandler *handler);
-    //remove last event handler in the list (one will always stay in)
-    wxEvtHandler *RemoveLastEventHandler(bool deleteHandler);
-
-protected:
-
-    //administator for rendering and accessing the canvas's
-    wxCanvasAdmin* m_admin;
-
-    //active event handler, default the object itself
-    wxEvtHandler* m_eventHandler;
-
-    bool m_isControl:1;
-    bool m_isVector:1;
-    bool m_isImage:1;
-    bool m_visible:1;
-    bool m_dragable:1;
-    wxDRAG_MODE m_dragmode:3;
-
-    //boundingbox in world coordinates
-    wxBoundingBox m_bbox;
-
-    //used for dragging
-    wxBitmap m_atnewpos;
-};
-
-//:defenition
-// wxCanvasObjectGroup is a container for wxCanvas derived Objects.
-// It renders itself by calling the render methods of the wxCanvasObjects it contains.
-// It can have nested groups also, in the same way as the other wxCanvasObjects it already contains.
-// The group has a matrix to position/rotate/scale the group.
-class wxCanvasObjectGroup: public wxCanvasObject
-{
-public:
-    wxCanvasObjectGroup(double x, double y);
-    virtual ~wxCanvasObjectGroup();
-
-    void SetAdmin(wxCanvasAdmin* admin);
-
-    //prepend a wxCanvasObject to this group
-    virtual void Prepend( wxCanvasObject* obj );
-    //append a wxCanvasObject to this group
-    virtual void Append( wxCanvasObject* obj );
-    //insert a wxCanvasObject to this group
-    virtual void Insert( size_t before, wxCanvasObject* obj );
-    //remove the given object from the group
-    virtual void Remove( wxCanvasObject* obj );
-
-    //those this group contain the given object.
-    //in case of nested groups also search in there to the lowwest level.
-    virtual wxCanvasObject* Contains( wxCanvasObject* obj );
-
-    //returns index of the given wxCanvasObject in this group
-    virtual int IndexOf( wxCanvasObject* obj );
-
-    double  GetPosX() { return lworld.GetValue(2,0); }
-    double  GetPosY() { return lworld.GetValue(2,1); }
-    void    SetPosXY( double x, double y) {lworld.SetValue(2,0,x);lworld.SetValue(2,1,y);CalcBoundingBox();};
-
-    void TransLate( double x, double y );
-
-    void CalcBoundingBox();
-    //remove all wxCanvasObjects from the group (flag for deletion of the objectsalso)
-    void DeleteContents( bool );
-    virtual void Render(wxTransformMatrix* cworld,int x, int y, int width, int height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    //recursive call the IsHitWorld on all contained objects, the first
-    //one that is hit will be returned
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-    //recursive calls for contained objects to set eventhandlers,
-    //and also sets its own eventhandler
-    void PushEventHandler( wxEvtHandler *handler );
-    //recursive calls for contained objects to set eventhandlers,
-    //and also sets its own eventhandler
-    wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
-    //recursive calls for contained objects to set eventhandlers,
-    //and also sets its own eventhandler
-    void AppendEventHandler(wxEvtHandler *handler);
-    //recursive calls for contained objects to set eventhandlers,
-    //and also sets its own eventhandler
-    wxEvtHandler *RemoveLastEventHandler(bool deleteHandler);
-
-protected:
-
-    //to position the object
-    wxTransformMatrix lworld;
-
-    wxList        m_objects;
-
-    friend class wxCanvas;
-};
-
-//:defenition
-// wxCanvasObjectRef is a reference to any wxCanvasObject derived class.
-// It does not duplicate the referenced object.
-// It has a matrix to reposition/rotate/scale the object it references.
-// The position/matrix of the referenced Object is accumulated with the one here.
-class wxCanvasObjectRef: public wxCanvasObject
-{
-public:
-    wxCanvasObjectRef(double x, double y,wxCanvasObject* obj);
-
-    //set rotation for the reference
-    void SetRotation(double rotation);
-
-    //set scale in x and y ( > zero)
-    void SetScale( double scalex, double scaley );
-
-    void SetAdmin(wxCanvasAdmin* admin);
-
-    double  GetPosX() { return lworld.GetValue(2,0); }
-    double  GetPosY() { return lworld.GetValue(2,1); }
-    void    SetPosXY( double x, double y) {lworld.SetValue(2,0,x);lworld.SetValue(2,1,y);CalcBoundingBox();};
-
-    void TransLate( double x, double y );
-    void CalcBoundingBox();
-    virtual void Render(wxTransformMatrix* cworld,int x, int y, int width, int height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    //return this object if one of the objects it references is hit
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-    virtual wxCanvasObject* Contains( wxCanvasObject* obj );
-
-    //recursive calls for contained objects to set eventhandlers,
-    //and also sets its own eventhandler
-    void PushEventHandler( wxEvtHandler *handler );
-    //recursive calls for contained objects to set eventhandlers,
-    //and also sets its own eventhandler
-    wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
-    //recursive calls for contained objects to set eventhandlers,
-    //and also sets its own eventhandler
-    void AppendEventHandler(wxEvtHandler *handler);
-    //recursive calls for contained objects to set eventhandlers,
-    //and also sets its own eventhandler
-    wxEvtHandler *RemoveLastEventHandler(bool deleteHandler);
-
-protected:
-
-    //to position the object
-    wxTransformMatrix lworld;
-
-    //reference to another wxCanvasObject
-    wxCanvasObject* m_obj;
-};
-
-//:defenition
-// wxCanvasRect
-class wxCanvasRect: public wxCanvasObject
-{
-public:
-    wxCanvasRect( double x, double y, double w, double h , double radius=0 );
-    void SetBrush( const wxBrush& brush)  { m_brush = brush; };
-    void SetPen( const wxPen& pen)        { m_pen = pen; CalcBoundingBox(); };
-
-    double  GetPosX() { return m_x; }
-    double  GetPosY() { return m_y; }
-    void    SetPosXY( double x, double y) {m_x=x; m_y=y; CalcBoundingBox();};
-
-    void TransLate( double x, double y );
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-private:
-    wxPen         m_pen;
-    wxBrush       m_brush;
-
-    double        m_x;
-    double        m_y;
-    double        m_width;
-    double        m_height;
-    double        m_radius;
-};
-
-//----------------------------------------------------------------------------
-// wxCanvasCircle
-//----------------------------------------------------------------------------
-class wxCanvasCircle: public wxCanvasObject
-{
-public:
-    wxCanvasCircle( double x, double y, double radius );
-    void SetBrush( const wxBrush& brush)  { m_brush = brush; };
-    void SetPen( const wxPen& pen)        { m_pen = pen; CalcBoundingBox(); };
-
-    double  GetPosX() { return m_x; }
-    double  GetPosY() { return m_y; }
-    void    SetPosXY( double x, double y) {m_x=x; m_y=y;CalcBoundingBox(); };
-
-    void TransLate( double x, double y );
-
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-private:
-    wxPen         m_pen;
-    wxBrush       m_brush;
-
-    double        m_x;
-    double        m_y;
-    double        m_radius;
-};
-
-//:defenition
-// wxCanvasEllipse
-class wxCanvasEllipse: public wxCanvasObject
-{
-public:
-    wxCanvasEllipse( double x, double y, double width, double height );
-    void SetBrush( const wxBrush& brush)  { m_brush = brush; };
-    void SetPen( const wxPen& pen)        { m_pen = pen; CalcBoundingBox(); };
-
-    double  GetPosX() { return m_x; }
-    double  GetPosY() { return m_y; }
-    void    SetPosXY( double x, double y) {m_x=x; m_y=y; CalcBoundingBox();};
-
-    void TransLate( double x, double y );
-
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-private:
-    wxPen         m_pen;
-    wxBrush       m_brush;
-
-    double        m_x;
-    double        m_y;
-    double        m_width;
-    double        m_height;
-};
-
-//:defenition
-// wxCanvasEllipticArc
-class wxCanvasEllipticArc: public wxCanvasObject
-{
-public:
-    wxCanvasEllipticArc( double x, double y, double width, double height, double start, double end );
-    void SetBrush( const wxBrush& brush)  { m_brush = brush; };
-    void SetPen( const wxPen& pen)        { m_pen = pen; CalcBoundingBox(); };
-
-    double  GetPosX() { return m_x; }
-    double  GetPosY() { return m_y; }
-    void    SetPosXY( double x, double y) {m_x=x; m_y=y; CalcBoundingBox();};
-
-    void TransLate( double x, double y );
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-private:
-    wxPen         m_pen;
-    wxBrush       m_brush;
-
-    double        m_x;
-    double        m_y;
-    double        m_width;
-    double        m_height;
-    double        m_start;
-    double        m_end;
-};
-
-//:defenition
-// wxCanvasLine
-class wxCanvasLine: public wxCanvasObject
-{
-public:
-    wxCanvasLine( double x1, double y1, double x2, double y2 );
-    void SetPen( const wxPen& pen)    { m_pen = pen; CalcBoundingBox(); };
-
-
-    double  GetPosX() { return m_x1; }
-    double  GetPosY() { return m_y1; }
-    void    SetPosXY( double x, double y) {m_x1=x; m_y1=y; CalcBoundingBox();};
-
-    void TransLate( double x, double y );
-
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-private:
-    wxPen         m_pen;
-
-    double        m_x1;
-    double        m_y1;
-    double        m_x2;
-    double        m_y2;
-};
-
-//:defenition
-// wxCanvasImage
-class wxCanvasImage: public wxCanvasObject
-{
-public:
-    wxCanvasImage( const wxImage &image, double x, double y, double w, double h );
-
-    double  GetPosX() { return m_x; }
-    double  GetPosY() { return m_y; }
-    void    SetPosXY( double x, double y);
-
-    void TransLate( double x, double y );
-
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-private:
-    double      m_x;
-    double      m_y;
-    double      m_width;
-    double      m_height;
-
-    wxImage     m_image;
-    int         m_orgw,m_orgh;
-    
-    // cache
-    wxBitmap    m_cBitmap;
-    wxImage     m_cImage;
-    int         m_cW;
-    int         m_cH;
-    double      m_cR;
-};
-
-//----------------------------------------------------------------------------
-// wxCanvasControl
-//----------------------------------------------------------------------------
-
-class wxCanvasControl: public wxCanvasObject
-{
-public:
-    wxCanvasControl( wxWindow *control );
-    ~wxCanvasControl();
-
-    double  GetPosX();
-    double  GetPosY();
-    void    SetPosXY( double x, double y);
-
-    void TransLate( double x, double y );
-    void MoveRelative( double x, double y );
-
-    void CalcBoundingBox();
-
-private:
-    wxWindow     *m_control;
-};
-
-//:defenition
-// wxCanvasText
-class wxCanvasText: public wxCanvasObject
-{
-public:
-    wxCanvasText( const wxString &text, double x, double y, const wxString &foneFile, int size );
-    ~wxCanvasText();
-
-    double  GetPosX() { return m_x; }
-    double  GetPosY() { return m_y; }
-    void    SetPosXY( double x, double y) {m_x=x; m_y=y;CalcBoundingBox(); };
-
-    void TransLate( double x, double y );
-
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    void SetRGB( unsigned char red, unsigned char green, unsigned char blue );
-    void SetFlag( int flag );
-    int GetFlag()              { return m_flag; }
-
-private:
-    wxString        m_text;
-    double          m_x;
-    double          m_y;
-    unsigned char  *m_alpha;
-    void           *m_faceData;
-    int             m_flag;
-    int             m_red;
-    int             m_green;
-    int             m_blue;
-    wxString        m_fontFileName;
-    int             m_size;
-};
-
-//:defenition
-// wxCanvas is used to display a wxCanvasGroupObject, which contains wxCanvasObject derived
-// drawable objects. The group to draw is called the root.
-// All objects are defined in world coordinates, relative to its parent (e.g. nested groups)
-// There are methods to convert from world to device coordinates and visa versa.
-// Rendering a draw is normally started on the root, it to a buffer, afterwords
-// an update of the damaged parts will blitted from the buffer to the screen.
-// This is done in Idle time, but can also be forced.
-// World coordinates can be with the Y axis going up are down.
-// The area of the drawing in world coordinates that is visible on the canvas
-// can be set. Parts of this area can be zoomed into resulting in scroll bars
-// to be displayed.
-class wxCanvas: public wxScrolledWindow
-{
-public:
-    // constructors and destructors
-    wxCanvas( wxCanvasAdmin* admin ,wxWindow *parent, wxWindowID id = -1,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxScrolledWindowStyle );
-    virtual ~wxCanvas();
-
-    //background colour for the canvas
-    virtual  void SetColour( const wxColour& background );
-
-    //update the area given in device coordinates
-    virtual void Update( int x, int y, int width, int height, bool blit = TRUE );
-
-    //blit all updated areas now to the screen, else it will happen in idle time.
-    //Use this to support dragging for instance, becuase in such cases idle time
-    //will take to long.
-    virtual void UpdateNow();
-
-    //prevent canvas activety
-    virtual void Freeze();
-    //allow canvas activety
-    virtual void Thaw();
-
-    //get the buffer that is used for rendering in general
-    inline wxBitmap *GetBuffer() { return &m_buffer; }
-    //get the DC that is used for rendering
-    inline wxDC *GetDC()   { return m_renderDC; }
-    //set the DC that is used for rendering
-    inline void  SetDC(wxDC* dc)   { m_renderDC=dc; }
-
-    inline int GetBufferWidth()  { return m_buffer.GetWidth(); }
-    inline int GetBufferHeight() { return m_buffer.GetHeight(); }
-
-    //updating is needed for the canvas if the buffer did change
-    bool NeedUpdate()            { return m_needUpdate; }
-    bool IsFrozen()              { return m_frozen; }
-
-    //blit damaged areas in the buffer to the screen
-    void BlitBuffer( wxDC &dc );
-
-    //redirect events to this canvas object
-    void SetCaptureMouse( wxCanvasObject *obj );
-    //are events redirected, if so return the object else NULL
-    inline wxCanvasObject* GetCaptured() { return m_captureMouse;}
-
-    //set the root group where the objects for this canvas are stored
-    void SetRoot(wxCanvasObjectGroup* aroot){m_root=aroot;}
-
-    //get root group that is displayed on the canvas
-    wxCanvasObjectGroup* GetRoot(){return m_root;}
-
-    //scroll the window in device coordinates
-    virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = (wxRect *) NULL );
-
-    //get y axis orientation
-    virtual bool GetYaxis() { return FALSE; }
-    
-    //get the visible part in world coordinates
-    virtual double GetMinX() const;
-    virtual double GetMinY() const;
-    virtual double GetMaxX() const;
-    virtual double GetMaxY() const;
-
-    //convert from window to virtual coordinates
-    virtual double DeviceToLogicalX(int x) const;
-    virtual double DeviceToLogicalY(int y) const;
-    virtual double DeviceToLogicalXRel(int x) const;
-    virtual double DeviceToLogicalYRel(int y) const;
-    virtual int LogicalToDeviceX(double x) const;
-    virtual int LogicalToDeviceY(double y) const;
-    virtual int LogicalToDeviceXRel(double x) const;
-    virtual int LogicalToDeviceYRel(double y) const;
-
-protected:
-    wxBitmap         m_buffer;
-
-    //always available and m_buffer selected
-    wxDC*            m_renderDC;
-    
-    bool             m_needUpdate;
-    wxList           m_updateRects;
-    wxCanvasObjectGroup* m_root;
-
-    wxColour         m_background;
-    bool             m_frozen;
-    wxCanvasObject  *m_lastMouse;
-    wxCanvasObject  *m_captureMouse;
-
-    int              m_oldDeviceX,m_oldDeviceY;
-
-    wxCanvasAdmin*   m_admin;
-    
-private:
-    int              m_bufferX,m_bufferY;
-
-protected:
-    void OnMouse( wxMouseEvent &event );
-    void OnPaint( wxPaintEvent &event );
-    void OnSize( wxSizeEvent &event );
-    void OnIdle( wxIdleEvent &event );
-    void OnSetFocus( wxFocusEvent &event );
-    void OnKillFocus( wxFocusEvent &event );
-    void OnEraseBackground( wxEraseEvent &event );
-
-private:
-    DECLARE_CLASS(wxCanvas)
-    DECLARE_EVENT_TABLE()
-};
-
-
-
-class wxVectorCanvas: public wxCanvas
-{
-public:
-    // constructors and destructors
-    wxVectorCanvas( wxCanvasAdmin* admin ,wxWindow *parent, wxWindowID id = -1,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxScrolledWindowStyle );
-
-    //scroll the window in device coordinates
-    virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = (wxRect *) NULL );
-
-    //set if the Yaxis goes up or down
-    void SetYaxis(bool up) { m_yaxis=up; }
-
-    //get currently used Yaxis setting
-    virtual bool GetYaxis() { return m_yaxis; }
-
-    //to set the total area in world coordinates that can be scrolled.
-    // when totaly zoomed out (SetMappingScroll same size as given here),
-    // this will be the area displayed.
-    // To display all of a drawing, set this here to the boundingbox of the root group
-    // of the canvas.
-    void SetScroll(double vx1,double vy1,double vx2,double vy2);
-
-    //given the virtual size to be displayed, the mappingmatrix will be calculated
-    //in such a manner that it fits (same ratio in width and height) to the window size.
-    //The window size is used to intitialize the mapping.
-    //The virtual size is just an indication, it will be ajusted to fit in the client window ratio.
-    //When border is set an extra margin is added so that the drawing will fit nicely.
-    // To display all of a drawing, set this here to the boundingbox of the root group
-    // of the canvas.
-    void SetMappingScroll(double vx1,double vy1,double vx2,double vy2,bool border);
-
-    //matrix for calculating the virtual coordinate given a screen coordinate
-    wxTransformMatrix   GetInverseMappingMatrix();
-
-    //matrix for calculating the screen coordinate given a virtual coordinate
-    wxTransformMatrix   GetMappingMatrix();
-
-    //get minimum X of the visible part in world coordinates
-    virtual double GetMinX() const;
-    virtual double GetMinY() const;
-    virtual double GetMaxX() const;
-    virtual double GetMaxY() const;
-    
-    //convert from window to virtual coordinates and back
-    virtual double DeviceToLogicalX(int x) const;
-    virtual double DeviceToLogicalY(int y) const;
-    virtual double DeviceToLogicalXRel(int x) const;
-    virtual double DeviceToLogicalYRel(int y) const;
-    virtual int LogicalToDeviceX(double x) const;
-    virtual int LogicalToDeviceY(double y) const;
-    virtual int LogicalToDeviceXRel(double x) const;
-    virtual int LogicalToDeviceYRel(double y) const;
-
-protected:
-    // up or down
-    bool m_yaxis;
-
-    // holds the matrix for mapping from virtual to screen coordinates
-    wxTransformMatrix m_mapping_matrix;
-
-    // holds the inverse of the mapping matrix
-    wxTransformMatrix m_inverse_mapping;
-
-    //virtual coordinates of total drawing
-    double m_virtm_minX, m_virtm_minY, m_virtm_maxX, m_virtm_maxY;
-
-    // virtual coordinates box
-    double m_virt_minX, m_virt_minY, m_virt_maxX, m_virt_maxY;
-
-    // bounding box
-    double m_minX, m_minY, m_maxX, m_maxY;
-
-    //are scroll bars active?
-    bool m_scrolled;
-
-private:
-    void OnScroll(wxScrollWinEvent& event);
-    void OnChar( wxKeyEvent &event );
-    void OnSize( wxSizeEvent &event );
-
-private:
-    DECLARE_CLASS(wxVectorCanvas)
-    DECLARE_EVENT_TABLE()
-};
-
-
-
-//:defenition
-//Contains a list of wxCanvas Objects that will be maintained through this class.
-//Each wxCanvasObject can be displayed on several wxCanvas Objects at the same time.
-//The active wxCanvas is used to render and convert coordinates from world to device.
-//So it is important to set the active wxCanvas based on the wxCanvas that has the focus
-//or is scrolled etc. This is normally done within wxCanvas when appropriate.
-class wxCanvasAdmin
-{
-public:
-    // constructors and destructors
-    wxCanvasAdmin();
-    virtual ~wxCanvasAdmin();
-
-    //convert from window to virtual coordinates
-    double DeviceToLogicalX(int x) const;
-    //convert from window to virtual coordinates
-    double DeviceToLogicalY(int y) const;
-    //convert from window to virtual coordinates relatif
-    double DeviceToLogicalXRel(int x) const;
-    //convert from window to virtual coordinates relatif
-    double DeviceToLogicalYRel(int y) const;
-    //convert from virtual to window coordinates
-    int LogicalToDeviceX(double x) const;
-    //convert from virtual to window coordinates
-    int LogicalToDeviceY(double y) const;
-    //convert from virtual to window coordinates relatif
-    int LogicalToDeviceXRel(double x) const;
-    //convert from virtual to window coordinates relatif
-    int LogicalToDeviceYRel(double y) const;
-
-    //update in the buffer off all canvases, the area given in world coordinates
-    virtual void Update(wxCanvasObject* obj, double x, double y, double width, double height);
-
-    //blit all updated areas now to the screen, else it will happen in idle time.
-    //Use this to support dragging for instance, becuase in such cases idle time
-    //will take to long.
-    virtual void UpdateNow();
-
-    //append another canvas
-    virtual void Append( wxCanvas* canvas );
-
-    //remove a canvas
-    virtual void Remove( wxCanvas* canvas );
-
-    //set the given canvas as active (for rendering, coordinate conversion etc.)
-    void SetActive(wxCanvas* activate);
-
-    //get active canvas
-    inline wxCanvas* GetActive() {return m_active;};
-
-private:
-    wxList m_canvaslist;
-    wxCanvas* m_active;
-};
-
-#endif
-    // WXCANVAS
-

contrib/include/wx/canvas/liner.h

@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        liner.h
-// Author:      Klaas Holwerda
-// Created:     1/10/2000
-// Copyright:   2000 (c) Klaas Holwerda
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-#ifndef __WXLINER_H
-#define __WXLINER_H
-
-#ifdef __GNUG__
-    #pragma interface "liner.cpp"
-#endif
-
-
-#include "wx/geometry.h"
-
-enum OUTPRODUCT {R_IS_LEFT,R_IS_ON,R_IS_RIGHT};
-
-// Status of a point to a wxLine
-enum R_PointStatus {R_LEFT_SIDE, R_RIGHT_SIDE, R_ON_AREA, R_IN_AREA};
-
-class wxLine
-{
-public:
-    // constructors and destructor
-    wxLine( double x1, double y1, double x2, double y2 );
-    wxLine( const wxPoint2DDouble& a, const wxPoint2DDouble& b);
-    ~wxLine();
-
-    wxPoint2DDouble GetBeginPoint();                               // Get the beginpoint from a wxLine
-    wxPoint2DDouble GetEndPoint();                                 // Get the endpoint from a wxLine
-    bool            CheckIntersect( wxLine&, double Marge); // Check if two wxLines intersects
-    int             Intersect( wxLine&,  wxPoint2DDouble& bp ,wxPoint2DDouble& ep ,double Marge) ;   // Intersects two wxLines
-    bool            Intersect( wxLine& lijn, wxPoint2DDouble& crossing); //intersect two (infinit) lines
-    R_PointStatus   PointOnLine( const wxPoint2DDouble& a_Point, double& Distance, double Marge ); //For an infinite wxLine
-    R_PointStatus   PointInLine( const wxPoint2DDouble& a_Point, double& Distance, double Marge ); //For a non-infinite wxLine
-    OUTPRODUCT      OutProduct( const wxLine& two, double accur);              // outproduct of two wxLines
-    double          Calculate_Y( double X);                                 // Caclulate Y if X is known
-    void            Virtual_Point( wxPoint2DDouble& a_point, double distance) const;
-    wxLine&         operator=( const wxLine&);                              // assignment operator
-    void            CalculateLineParameters();                                  // Calculate the parameters if nessecary
-    void            OffsetContour( const wxLine& nextline, double factor,wxPoint2DDouble& offsetpoint) const;
-
-private:
-
-    int   ActionOnTable1(R_PointStatus,R_PointStatus);                          // Function needed for Intersect
-    int   ActionOnTable2(R_PointStatus,R_PointStatus);                          // Function needed for Intersect
-
-    double      m_AA;
-    double      m_BB;
-    double      m_CC;
-    wxPoint2DDouble m_a;
-    wxPoint2DDouble m_b;
-    bool        m_valid_parameters;
-};
-
-#endif

contrib/include/wx/canvas/polygon.h

@@ -1,220 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        polygon.h
-// Author:      Klaas Holwerda
-// Created:     XX/XX/XX
-// Copyright:   2000 (c) Klaas Holwerda
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WXPOLYGON_H__
-#define __WXPOLYGON_H__
-
-#ifdef __GNUG__
-    #pragma interface "polygon.cpp"
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "wx/matrix.h"
-#include "wx/geometry.h"
-#include "bbox.h"
-#include "canvas.h"
-
-enum INOUTPOLY {OUTSIDE_POLY,INSIDE_POLY,ON_POLY};
-
-//----------------------------------------------------------------------------
-// wxCanvasPolygon
-//----------------------------------------------------------------------------
-
-class wxCanvasPolygon: public wxCanvasObject
-{
-public:
-    wxCanvasPolygon( int n, wxPoint2DDouble points[],  bool spline = FALSE );
-    ~wxCanvasPolygon();
-    void SetBrush( const wxBrush& brush)  { m_brush = brush; }
-    void SetPen( const wxPen& pen)        { m_pen = pen; CalcBoundingBox(); }
-
-    //set colour 1
-    //being the background color if filling with a monochrome bitmap
-    //or in case of gradient filling the starting colour for the fill
-    void SetColour1( const wxColour& fg) { m_textfg=fg;}
-    //set colour 1
-    //being the foreground color if filling with a monochrome bitmap
-    //or in case of gradient filling the ending colour for the fill
-    void SetColour2( const wxColour& bg) { m_textbg=bg;}
-    //transparent filling when bitmapbrush is monochrome
-    void SetTransParent(bool transp) { m_transp=transp;}
-    //gradient filling using lines chnging in colour from colour1 to colour2
-    void SetGradient(bool gradient, const wxPen& gpen, double distance)
-    { m_gradient=gradient;
-      m_gpen=gpen;
-      m_gdistance=distance;
-    }
-
-    double  GetPosX() { return m_points[0].m_x; }
-    double  GetPosY() { return m_points[0].m_y; }
-    void    SetPosXY( double x, double y);
-
-    void TransLate( double x, double y );
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-    INOUTPOLY PointInPolygon(const wxPoint2DDouble& P, double marge);
-
-private:
-
-    bool MoveUp(double horline, int& index, int direction);
-    void DetectCriticalPoints();
-    void FillPolygon(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    wxList m_CRlist;
-    wxList m_AETlist;
-
-
-    wxBrush       m_brush;
-    wxPen         m_pen;
-    wxColour      m_textbg;
-    wxColour      m_textfg;
-
-    //if brush is of type bitmap with a mask fill with mask transparent
-    bool          m_transp;
-    bool          m_gradient;
-    wxPen         m_gpen;
-    double        m_gdistance;
-
-    bool          m_spline;
-
-    int           m_n;
-    wxPoint2DDouble* m_points;
-};
-
-//----------------------------------------------------------------------------
-// wxCanvasPolyline
-//----------------------------------------------------------------------------
-
-class wxCanvasPolyline: public wxCanvasObject
-{
-public:
-    wxCanvasPolyline(int n, wxPoint2DDouble points[]);
-    ~wxCanvasPolyline();
-    void SetPen( const wxPen& pen)    { m_pen = pen; CalcBoundingBox(); }
-
-    double  GetPosX() { return m_points[0].m_x; }
-    double  GetPosY() { return m_points[0].m_y; }
-    void    SetPosXY( double x, double y);
-
-    void TransLate( double x, double y );
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-    bool PointOnPolyline(const wxPoint2DDouble& P, double marge);
-
-private:
-
-    wxPen         m_pen;
-
-    int           m_n;
-    wxPoint2DDouble* m_points;
-};
-
-//----------------------------------------------------------------------------
-// wxCanvasPolygon
-//----------------------------------------------------------------------------
-
-class wxCanvasPolygonL: public wxCanvasObject
-{
-public:
-    wxCanvasPolygonL(wxList* points, bool spline = FALSE);
-    ~wxCanvasPolygonL();
-    void SetBrush( const wxBrush& brush)  { m_brush = brush; }
-    void SetPen( const wxPen& pen)        { m_pen = pen; CalcBoundingBox(); }
-    void SetColour1( const wxColour& fg) { m_textfg=fg;}
-    void SetColour2( const wxColour& bg) { m_textbg=bg;}
-    void SetTransParent(bool transp) { m_transp=transp;}
-
-    double  GetPosX();
-    double  GetPosY();
-    void    SetPosXY( double x, double y);
-    void TransLate( double x, double y );
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-    INOUTPOLY PointInPolygon(const wxPoint2DDouble& P, double marge);
-
-private:
-
-    wxBrush       m_brush;
-    wxPen         m_pen;
-    bool          m_spline;
-    wxColour      m_textbg;
-    wxColour      m_textfg;
-    //if brush is of type bitmap with a mask fill with mask transparent
-    bool          m_transp;
-
-    wxList*       m_lpoints;
-};
-
-//----------------------------------------------------------------------------
-// wxCanvasPolyline
-//----------------------------------------------------------------------------
-
-class wxCanvasPolylineL: public wxCanvasObject
-{
-public:
-    wxCanvasPolylineL(wxList* points, bool spline );
-    ~wxCanvasPolylineL();
-    void SetPen( const wxPen& pen)    { m_pen = pen; CalcBoundingBox(); }
-
-    double  GetPosX();
-    double  GetPosY();
-    void    SetPosXY( double x, double y);
-
-    void TransLate( double x, double y );
-    void CalcBoundingBox();
-
-    virtual void Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int clip_width, int clip_height );
-    virtual void WriteSVG( wxTextOutputStream &stream );
-
-    wxCanvasObject* IsHitWorld( double x, double y, double margin = 0 );
-
-    bool PointOnPolyline(const wxPoint2DDouble& P, double marge);
-
-private:
-    wxPen         m_pen;
-    bool          m_spline;
-
-    wxList*       m_lpoints;
-};
-
-//active edge table
-class wxAET
-{
-public:
-    inline void CalculateLineParameters( const wxPoint2DDouble& p1 , const wxPoint2DDouble& p2 );
-    inline void CalculateXs( double y );
-
-    //line paramters
-    bool m_horizontal;
-    double m_BdivA;
-    double m_CdivA;
-    int m_index;
-    int m_direction;
-    //intersection point with scanline;
-    double m_xs;
-};
-
-#endif
-

contrib/include/wx/gizmos/editlbox.h

@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        editlbox.h
-// Purpose:     ListBox with editable items
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef __WX_EDITLBOX_H__
-#define __WX_EDITLBOX_H__
-
-#ifdef __GNUG__
-	#pragma interface "editlbox.h"
-#endif
-
-#include "wx/panel.h"
-
-
-class WXDLLEXPORT wxBitmapButton;
-class WXDLLEXPORT wxListCtrl;
-class WXDLLEXPORT wxListEvent;
-               
-// This class provides a composite control that lets the
-// user easily enter list of strings
-
-class WXDLLEXPORT wxEditableListBox : public wxPanel
-{
-	DECLARE_CLASS(wxEditableListBox);
-
-public:
-    wxEditableListBox(wxWindow *parent, wxWindowID id,
-                      const wxString& label,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize,
-                      const wxString& name = wxT("editableListBox"));
-
-    void SetStrings(const wxArrayString& strings);
-    void GetStrings(wxArrayString& strings);
-
-protected:
-    wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit;
-    wxListCtrl *m_listCtrl;
-    int m_selection;
-    bool m_edittingNew;
-
-    void OnItemSelected(wxListEvent& event);
-    void OnEndLabelEdit(wxListEvent& event);
-    void OnNewItem(wxCommandEvent& event);
-    void OnDelItem(wxCommandEvent& event);
-    void OnEditItem(wxCommandEvent& event);
-    void OnUpItem(wxCommandEvent& event);
-    void OnDownItem(wxCommandEvent& event);
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif

contrib/include/wx/gizmos/multicell.h

@@ -1,167 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        multicell.h
-// Purpose:     provide two new classes for layout, wxMultiCellSizer and wxMultiCellCanvas
-// Author:      Jonathan Bayer
-// Modified by:
-// Created:
-// RCS-ID:      $Id:
-// Copyright:   (c) Jonathan Bayer
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// This was inspired by the gbsizer class written by Alex Andruschak
-
-
-#ifndef __WX_MULTICELL_H__
-#define __WX_MULTICELL_H__
-
-#ifdef __GNUG__
-	#pragma interface "multicell.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-// The classes are derived from wxSizer
-#include "wx/sizer.h"
-
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-enum wxResizable
-{
-	wxNOT_RESIZABLE =           0x00,
-	wxHORIZENTAL_RESIZABLE =    0x01,
-	wxVERTICAL_RESIZABLE =      0x10,
-	wxRESIZABLE =               0x11
-};
-
-//---------------------------------------------------------------------------
-// classes
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-// wxMultiCellItemHandle
-//---------------------------------------------------------------------------
-
-class WXDLLEXPORT wxMultiCellItemHandle: public wxObject
-{
-	DECLARE_CLASS(wxMultiCellItemHandle);
-protected:
-	int             m_column;
-	int             m_row;
-	int             m_width;
-	int             m_height;
-	wxResizable     m_style;
-	wxSize          m_fixedSize;
-	int             m_alignment;
-	wxSize          m_weight;
-
-public:
-	wxMultiCellItemHandle( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-	wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-	wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-	wxMultiCellItemHandle( int row, int column, int align);
-	int             GetColumn();
-	int             GetRow();
-	int             GetWidth();
-	int             GetHeight();
-	wxResizable     GetStyle();
-	wxSize          GetLocalSize();
-	int             GetAlignment();
-	wxSize          GetWeight();
-
-private:
-	void Initialize( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-
-};
-
-//---------------------------------------------------------------------------
-// wxMultiCellSizer
-//---------------------------------------------------------------------------
-
-class WXDLLEXPORT wxMultiCellSizer : virtual public wxSizer
-{
-	DECLARE_CLASS(wxMultiCellSizer);
-
-protected:
-	wxSize m_cell_count;
-
-public:
-	wxMultiCellSizer(wxSize & size);
-	wxMultiCellSizer(int rows, int cols);
-	~wxMultiCellSizer();
-
-	virtual void 	RecalcSizes();
-	virtual wxSize 	CalcMin();
-	bool 			SetDefaultCellSize(wxSize size);
-	bool 			SetColumnWidth(int column, int colSize = 5, bool expandable = FALSE);
-	bool 			SetRowHeight(int row, int rowSize = 5, bool expandable = FALSE);
-	bool			EnableGridLines(wxWindow *win);
-	bool			SetGridPen(wxPen *pen);
-	void 			OnPaint(wxDC& dc);
-
-private:
-	void 			GetMinimums();
-	int 			Sum(int *array, int x);
-
-private:
-	int 			*m_maxHeight;
-	int 			*m_maxWidth;
-	int 			*m_rowStretch;
-	int 			*m_colStretch;
-	wxSize 			**m_weights;
-	wxSize			**m_minSizes;
-	int				m_maxWeights;
-	wxSize			m_defaultCellSize;
-	wxWindow		*m_win; // usually used for debugging
-	wxPen			*m_pen;
-
-	void			DrawGridLines(wxDC& dc);
-	void			Initialize(wxSize size);
-};
-
-
-// wxCell is used internally, so we don't need to declare it here
-
-class wxCell;
-
-//---------------------------------------------------------------------------
-// wxMultiCellCanvas
-//---------------------------------------------------------------------------
-
-class wxMultiCellCanvas : public wxFlexGridSizer
-{
-public:
-	wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);
-	void Add(wxWindow *win, unsigned int row, unsigned int col);
-
-	void Resize(int numRows, int numCols);
-	int MaxRows()
-	{
-		return m_maxRows;
-	};
-	int MaxCols()
-	{
-		return m_maxCols;
-	};
-	void CalculateConstraints();
-	void SetMinCellSize(const wxSize size)
-	{
-		m_minCellSize = size;
-	};
-
-private:
-	wxWindow            *m_parent;
-	unsigned int         m_maxRows, m_maxCols;
-
-	wxSize              m_minCellSize;
-	wxCell              **m_cells;
-};
-
-#endif
-
-
-
-/*** End of File ***/

contrib/include/wx/gizmos/splittree.h

@@ -1,227 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        splittree.h
-// Purpose:     Classes to achieve a remotely-scrolled tree in a splitter
-//              window that can be scrolled by a scrolled window higher in the
-//              hierarchy
-// Author:      Julian Smart
-// Modified by:
-// Created:     8/7/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SPLITTREE_H_
-#define _WX_SPLITTREE_H_
-
-#ifdef __GNUG__
-	#pragma interface "splittree.h"
-#endif
-
-// Set this to 1 to use generic tree control (doesn't yet work properly)
-#define USE_GENERIC_TREECTRL 0
-
-#include "wx/wx.h"
-#include "wx/treectrl.h"
-#include "wx/splitter.h"
-#include "wx/scrolwin.h"
-
-#if USE_GENERIC_TREECTRL
-#include "wx/generic/treectlg.h"
-#ifndef wxTreeCtrl
-#define wxTreeCtrl wxGenericTreeCtrl
-#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl
-#endif
-#endif
-
-class wxRemotelyScrolledTreeCtrl;
-class wxThinSplitterWindow;
-class wxSplitterScrolledWindow;
-
-/*
- * wxRemotelyScrolledTreeCtrl
- *
- * This tree control disables its vertical scrollbar and catches scroll
- * events passed by a scrolled window higher in the hierarchy.
- * It also updates the scrolled window vertical scrollbar as appropriate.
- */
-
-class wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
-{
-	DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
-public:
-    wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
-        const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
-	~wxRemotelyScrolledTreeCtrl();
-
-//// Events
-	void OnSize(wxSizeEvent& event);
-	void OnExpand(wxTreeEvent& event);
-    void OnScroll(wxScrollWinEvent& event);
-
-//// Overrides
-    // Override this in case we're using the generic tree control.
-    // Calls to this should disable the vertical scrollbar.
-
-    // Number of pixels per user unit (0 or -1 for no scrollbar)
-    // Length of virtual canvas in user units
-    // Length of page in user units
-    virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
-                             int noUnitsX, int noUnitsY,
-                             int xPos = 0, int yPos = 0,
-                             bool noRefresh = FALSE );
-
-    // In case we're using the generic tree control.
-    // Get the view start
-    virtual void GetViewStart(int *x, int *y) const;
-
-    // In case we're using the generic tree control.
-    virtual void PrepareDC(wxDC& dc);
-
-    // In case we're using the generic tree control.
-    virtual int GetScrollPos(int orient) const;
-
-//// Helpers
-	void HideVScrollbar();
-
-	// Calculate the tree overall size so we can set the scrollbar
-	// correctly
-	void CalcTreeSize(wxRect& rect);
-	void CalcTreeSize(const wxTreeItemId& id, wxRect& rect);
-
-	// Adjust the containing wxScrolledWindow's scrollbars appropriately
-	void AdjustRemoteScrollbars();
-
-	// Find the scrolled window that contains this control
-	wxScrolledWindow* GetScrolledWindow() const;
-
-    // Scroll to the given line (in scroll units where each unit is
-    // the height of an item)
-    void ScrollToLine(int posHoriz, int posVert);
-
-//// Accessors
-
-	// The companion window is one which will get notified when certain
-	// events happen such as node expansion
-	void SetCompanionWindow(wxWindow* companion) { m_companionWindow = companion; }
-	wxWindow* GetCompanionWindow() const { return m_companionWindow; }
-
-
-    DECLARE_EVENT_TABLE()
-protected:
-	wxWindow*	m_companionWindow;
-};
-
-/*
- * wxTreeCompanionWindow
- *
- * A window displaying values associated with tree control items.
- */
-
-class wxTreeCompanionWindow: public wxWindow
-{
-public:
-    DECLARE_CLASS(wxTreeCompanionWindow)
-
-    wxTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
-      const wxPoint& pos = wxDefaultPosition,
-      const wxSize& sz = wxDefaultSize,
-      long style = 0);
-
-//// Overrides
-	virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect);
-
-//// Events
-	void OnPaint(wxPaintEvent& event);    
-    void OnScroll(wxScrollWinEvent& event);
-	void OnExpand(wxTreeEvent& event);
-
-//// Operations
-
-//// Accessors
-	wxRemotelyScrolledTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; };
-	void SetTreeCtrl(wxRemotelyScrolledTreeCtrl* treeCtrl) { m_treeCtrl = treeCtrl; }
-
-//// Data members
-protected:
-	wxRemotelyScrolledTreeCtrl*	m_treeCtrl;
-
-    DECLARE_EVENT_TABLE()
-};
-
-
-/*
- * wxThinSplitterWindow
- *
- * Implements a splitter with a less obvious sash
- * than the usual one.
- */
-
-class wxThinSplitterWindow: public wxSplitterWindow
-{
-public:
-    DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)
-
-    wxThinSplitterWindow(wxWindow* parent, wxWindowID id = -1,
-      const wxPoint& pos = wxDefaultPosition,
-      const wxSize& sz = wxDefaultSize,
-      long style = wxSP_3D | wxCLIP_CHILDREN);
-
-//// Overrides
-
-    void SizeWindows();
-    // Tests for x, y over sash. Overriding this allows us to increase
-    // the tolerance.
-    bool SashHitTest(int x, int y, int tolerance = 2);
-	void DrawSash(wxDC& dc);
-
-//// Events
-    
-    void OnSize(wxSizeEvent& event);
-
-//// Operations
-
-//// Accessors
-
-//// Data members
-protected:
-    DECLARE_EVENT_TABLE()
-};
-
-/*
- * wxSplitterScrolledWindow
- *
- * This scrolled window is aware of the fact that one of its
- * children is a splitter window. It passes on its scroll events
- * (after some processing) to both splitter children for them
- * scroll appropriately.
- */
-
-class wxSplitterScrolledWindow: public wxScrolledWindow
-{
-public:
-    DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)
-
-    wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = -1,
-      const wxPoint& pos = wxDefaultPosition,
-      const wxSize& sz = wxDefaultSize,
-      long style = 0);
-
-//// Overrides
-
-//// Events
-    
-    void OnScroll(wxScrollWinEvent& event);
-    void OnSize(wxSizeEvent& event);
-
-//// Operations
-
-//// Accessors
-
-//// Data members
-public:
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-        // _SPLITTREE_H_

contrib/include/wx/mmedia/cdbase.h

@@ -27,7 +27,7 @@ class WXDLLEXPORT wxCDAudio : public wxObject {
 public:
   typedef enum { PLAYING, PAUSED, STOPPED } CDstatus;
   // Table of contents manager
-  class WXDLLEXPORT CDtoc {
+  class CDtoc {
   protected:
     wxCDtime *tracks_time, *tracks_pos;
     wxCDtime total_time;

contrib/include/wx/mmedia/sndaiff.h

@@ -22,7 +22,7 @@
 // AIFF codec
 //
 
-class WXDLLEXPORT wxSoundAiff: public wxSoundFileStream {
+class wxSoundAiff: public wxSoundFileStream {
 public:
     wxSoundAiff(wxInputStream& stream, wxSoundStream& io_sound);
     wxSoundAiff(wxOutputStream& stream, wxSoundStream& io_sound);

contrib/include/wx/mmedia/sndbase.h

@@ -112,7 +112,7 @@ class WXDLLEXPORT wxSoundFormatBase {
 // Base class for sound streams
 //
 
-class WXDLLEXPORT wxSoundStream {
+class wxSoundStream {
  public:
   wxSoundStream();
   virtual ~wxSoundStream();

contrib/include/wx/mmedia/sndcodec.h

@@ -15,7 +15,7 @@
 #include "wx/defs.h"
 #include "wx/mmedia/sndbase.h"
 
-class WXDLLEXPORT wxSoundStreamCodec: public wxSoundStream {
+class wxSoundStreamCodec: public wxSoundStream {
  public:
   wxSoundStreamCodec(wxSoundStream& snd_io);
   ~wxSoundStreamCodec();

contrib/include/wx/mmedia/sndcpcm.h

@@ -20,7 +20,7 @@
 // PCM converter class
 //
 
-class WXDLLEXPORT wxSoundStreamPcm: public wxSoundStreamCodec {
+class wxSoundStreamPcm: public wxSoundStreamCodec {
 public:
     typedef void (*ConverterType)(const void *buf_in, void *buf_out,
                                   wxUint32 len);

contrib/include/wx/mmedia/sndmsad.h

@@ -5,8 +5,8 @@
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 2000
 // CVSID: $Id$
 // --------------------------------------------------------------------------
-#ifndef _WX_SNDMSAD_H
+#ifndef _WX_SNDULAW_H
-#define _WX_SNDMSAD_H
+#define _WX_SNDULAW_H
 
 #ifdef __GNUG__
 #pragma interface "sndmsad.h"
@@ -17,7 +17,7 @@
 #include "wx/mmedia/sndcodec.h"
 #include "wx/mmedia/sndbase.h"
 
-WX_DEFINE_EXPORTED_ARRAY(wxInt16, wxMSAdpcmCoeffs);
+WX_DEFINE_EXPORTED_ARRAY(wxUint16, wxMSAdpcmCoeffs);
 
 //
 // MSADPCM format
@@ -30,17 +30,13 @@ public:
   void SetSampleRate(wxUint32 srate);
   wxUint32 GetSampleRate() const;
 
-    void SetCoefs(wxInt16 **coefs, wxUint16 ncoefs, wxUint16 coefs_len);
+  void SetSamplesBlock(wxUint16 sampblock);
-    void GetCoefs(wxInt16 **&coefs, wxUint16& ncoefs,
+  wxUint16 GetSamplesBlock() const;
-                  wxUint16& coefs_len) const;
   
-    void SetBlockSize(wxUint16 block_size);
+  void SetCoefs(wxMSAdpcmCoefs& coefs);
-    wxUint16 GetBlockSize() const;
+  wxMSAdpcmCoefs& GetCoefs() const;
   
-    void SetChannels(wxUint16 channels);
+  wxSoundFormatType GetType() const { return wxSOUND_ULAW; }
-    wxUint16 GetChannels() const;
-    
-    wxSoundFormatType GetType() const { return wxSOUND_MSADPCM; }
   wxSoundFormatBase *Clone() const;
 
   wxUint32 GetTimeFromBytes(wxUint32 bytes) const;
@@ -49,20 +45,18 @@ public:
   bool operator !=(const wxSoundFormatBase& frmt2) const;
 
  protected:
-    wxUint32 m_srate, m_nchannels;
+  wxUint32 m_srate;
-    wxInt16 **m_coefs;
+  wxMSAdpcmCoefs *m_coefs;
-    wxUint16 m_ncoefs, m_coefs_len;
-    wxUint16 m_block_size;
 };
 
 //
 // MS ADPCM converter class
 //
 class WXDLLEXPORT wxSoundRouterStream;
-class WXDLLEXPORT wxSoundStreamMSAdpcm: public wxSoundStreamCodec {
+class WXDLLEXPORT wxSoundStreamAdpcm: public wxSoundStreamCodec {
 public:
-    wxSoundStreamMSAdpcm(wxSoundStream& sndio);
+    wxSoundStreamAdpcm(wxSoundStream& sndio);
-    ~wxSoundStreamMSAdpcm();
+    ~wxSoundStreamAdpcm();
     
     wxSoundStream& Read(void *buffer, wxUint32 len);
     wxSoundStream& Write(const void *buffer, wxUint32 len);
@@ -73,32 +67,6 @@ public:
 
 protected:
     wxSoundRouterStream *m_router;
-
-    typedef struct {
-        wxInt32 predictor;
-        wxInt16 samp1;
-        wxInt16 samp2;
-        wxInt16 coeff[2];
-        wxInt32 iDelta;
-    } AdpcmState;
-
-    AdpcmState m_state[1];
-    
-    bool     m_got_header;
-    bool     m_stereo;
-    wxInt16  **m_coefs;
-    wxUint16 m_block_size;
-    wxUint16 m_ncoefs;
-    wxUint16 m_next_block;
-    
-protected:
-    wxUint32 DecodeMonoADPCM(const void *in_buffer, void *out_buffer,
-                             wxUint32 in_len);
-    wxUint32 DecodeStereoADPCM(const void *in_buffer, void *out_buffer,
-                               wxUint32 in_len);
-    void Nibble(wxInt8 nyb,
-                AdpcmState *state,
-                wxInt16 **out_buffer);
 };
 
 #endif

contrib/include/wx/mmedia/sndoss.h

@@ -21,7 +21,7 @@
 // OSS output class
 //
 
-class WXDLLEXPORT wxSoundStreamOSS : public wxSoundStream {
+class wxSoundStreamOSS : public wxSoundStream {
  public:
   wxSoundStreamOSS(const wxString& dev_name = wxT("/dev/dsp"));
   ~wxSoundStreamOSS();

contrib/include/wx/mmedia/sndwav.h

@@ -42,18 +42,12 @@ protected:
     wxUint32 GetData(void *buffer, wxUint32 len);
     wxUint32 PutData(const void *buffer, wxUint32 len);
     
-    bool HandleOutputPCM(wxDataInputStream& data, wxUint32 len,
+    bool HandleOutputPCM(wxDataInputStream& data, wxUint16 channels,
-                         wxUint16 channels, wxUint32 sample_fq,
+                         wxUint32 sample_fq, wxUint32 byte_p_sec,
-                         wxUint32 byte_p_sec, wxUint16 byte_p_spl,
+                         wxUint16 byte_p_spl, wxUint16 bits_p_spl);
-                         wxUint16 bits_p_spl);
+    bool HandleOutputG721(wxDataInputStream& data, wxUint16 channels,
-    bool HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len,
+                          wxUint32 sample_fq, wxUint32 byte_p_sec,
-                             wxUint16 channels, wxUint32 sample_fq,
+                          wxUint16 byte_p_spl, wxUint16 bits_p_spl);
-                             wxUint32 byte_p_sec, wxUint16 byte_p_spl,
-                             wxUint16 bits_p_spl);
-    bool HandleOutputG721(wxDataInputStream& data, wxUint32 len,
-                          wxUint16 channels, wxUint32 sample_fq,
-                          wxUint32 byte_p_sec, wxUint16 byte_p_spl,
-                          wxUint16 bits_p_spl);
     wxSoundFormatBase *HandleInputPCM(wxDataOutputStream& data);
     wxSoundFormatBase *HandleInputG72X(wxDataOutputStream& data);
 

contrib/include/wx/plot/wxplot.rc

@@ -1,8 +0,0 @@
-
-// For /plot.cpp
-plot_up_bmp             BITMAP  "wx/plot/plot_up.bmp"
-plot_dwn_bmp            BITMAP  "wx/plot/plot_dwn.bmp"
-plot_enl_bmp            BITMAP  "wx/plot/plot_enl.bmp"
-plot_shr_bmp            BITMAP  "wx/plot/plot_shr.bmp"
-plot_zin_bmp            BITMAP  "wx/plot/plot_zin.bmp"
-plot_zot_bmp            BITMAP  "wx/plot/plot_zot.bmp"

contrib/include/wx/stc/stc.h

@@ -29,9 +29,6 @@
 //       and regenerate
 
 #define wxSTC_INVALID_POSITION -1
-
-// Define start of Scintilla messages to be greater than all edit (EM_*) messages
-// as many EM_ messages can be used although that use is deprecated.
 #define wxSTC_START 2000
 #define wxSTC_OPTIONAL_START 3000
 #define wxSTC_LEXER_START 4000
@@ -99,7 +96,7 @@
 #define wxSTC_INDIC0_MASK 32
 #define wxSTC_INDIC1_MASK 64
 #define wxSTC_INDIC2_MASK 128
-#define wxSTC_INDICS_MASK 224
+#define wxSTC_INDICS_MASK 32 | 64 | 128
 
 // PrintColourMode - use same colours as screen.
 #define wxSTC_PRINT_NORMAL 0
@@ -1256,7 +1253,6 @@ private:
     void OnMouseMove(wxMouseEvent& evt);
     void OnMouseLeftUp(wxMouseEvent& evt);
     void OnMouseRightUp(wxMouseEvent& evt);
-    void OnMouseWheel(wxMouseEvent& evt);
     void OnChar(wxKeyEvent& evt);
     void OnKeyDown(wxKeyEvent& evt);
     void OnLoseFocus(wxFocusEvent& evt);
@@ -1353,26 +1349,10 @@ private:
 #endif
 };
 
-#ifndef SWIG
+
-BEGIN_DECLARE_EVENT_TYPES()
+// Event types
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHANGE, 1650)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_STYLENEEDED, 1651)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHARADDED, 1652)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_UPDATEUI, 1653)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTREACHED, 1654)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTLEFT, 1655)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ROMODIFYATTEMPT, 1656)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DOUBLECLICK, 1657)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MODIFIED, 1658)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_KEY, 1659)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MACRORECORD, 1660)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MARGINCLICK, 1661)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_NEEDSHOWN, 1662)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_POSCHANGED, 1663)
-END_DECLARE_EVENT_TYPES()
-#else
 enum {
-        wxEVT_STC_CHANGE,
+    wxEVT_STC_CHANGE = 1650,
     wxEVT_STC_STYLENEEDED,
     wxEVT_STC_CHARADDED,
     wxEVT_STC_UPDATEUI,
@@ -1387,27 +1367,25 @@ END_DECLARE_EVENT_TYPES()
     wxEVT_STC_NEEDSHOWN,
     wxEVT_STC_POSCHANGED
 };
-#endif
-
 
 
 #ifndef SWIG
 typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 
-#define EVT_STC_CHANGE(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_CHANGE(id, fn) { wxEVT_STC_CHANGE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_STYLENEEDED(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_STYLENEEDED(id, fn) { wxEVT_STC_STYLENEEDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_CHARADDED(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_CHARADDED(id, fn) { wxEVT_STC_CHARADDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_UPDATEUI(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_UPDATEUI(id, fn) { wxEVT_STC_UPDATEUI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_SAVEPOINTREACHED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_SAVEPOINTREACHED(id, fn) { wxEVT_STC_SAVEPOINTREACHED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_SAVEPOINTLEFT(id, fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_SAVEPOINTLEFT(id, fn) { wxEVT_STC_SAVEPOINTLEFT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_ROMODIFYATTEMPT(id, fn)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_ROMODIFYATTEMPT(id, fn) { wxEVT_STC_ROMODIFYATTEMPT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_DOUBLECLICK(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_DOUBLECLICK(id, fn) { wxEVT_STC_DOUBLECLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_MODIFIED(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_MODIFIED(id, fn) { wxEVT_STC_MODIFIED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_KEY(id, fn)              DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_KEY(id, fn) { wxEVT_STC_KEY, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_MACRORECORD(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_MACRORECORD(id, fn) { wxEVT_STC_MACRORECORD, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_MARGINCLICK(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_MARGINCLICK(id, fn) { wxEVT_STC_MARGINCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_NEEDSHOWN(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_NEEDSHOWN(id, fn) { wxEVT_STC_NEEDSHOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_POSCHANGED(id, fn)       DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_POSCHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_POSCHANGED(id, fn) { wxEVT_STC_POSCHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
 
 #endif
 

contrib/include/wx/xrc/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/xrc/xh_menu.h"
-#include "wx/xrc/xh_panel.h"
-#include "wx/xrc/xh_dlg.h"
-#include "wx/xrc/xh_bttn.h"
-#include "wx/xrc/xh_chckb.h"
-#include "wx/xrc/xh_gauge.h"
-#include "wx/xrc/xh_html.h"
-#include "wx/xrc/xh_spin.h"
-#include "wx/xrc/xh_sttxt.h"
-#include "wx/xrc/xh_slidr.h"
-#include "wx/xrc/xh_radbt.h"
-#include "wx/xrc/xh_radbx.h"
-#include "wx/xrc/xh_combo.h"
-#include "wx/xrc/xh_chckl.h"
-#include "wx/xrc/xh_choic.h"
-#include "wx/xrc/xh_sizer.h"
-#include "wx/xrc/xh_stbmp.h"
-#include "wx/xrc/xh_notbk.h"
-#include "wx/xrc/xh_text.h"
-#include "wx/xrc/xh_listb.h"
-#include "wx/xrc/xh_toolb.h"
-#include "wx/xrc/xh_bmpbt.h"
-#include "wx/xrc/xh_stbox.h"
-#include "wx/xrc/xh_scrol.h"
-#include "wx/xrc/xh_tree.h"
-#include "wx/xrc/xh_cald.h"
-#include "wx/xrc/xh_listc.h"
-#include "wx/xrc/xh_stlin.h"
-#include "wx/xrc/xh_bmp.h"
-#include "wx/xrc/xh_unkwn.h"
-#include "wx/xrc/xh_frame.h"
-
-#endif // _WX_XMLRES_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxBitmapXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxIconXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BMP_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxBitmapButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BMPBT_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BTTN_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxCalendarCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_CALD_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-#include "wx/defs.h"
-
-#if wxUSE_CHECKBOX
-
-class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxCheckBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-
-#endif // _WX_XH_CHECKBOX_H_
-

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxCheckListXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-
-
-#endif // _WX_XH_CHECKLIST_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxChoiceXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-
-#endif // _WX_XH_CHOIC_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-#if wxUSE_COMBOBOX
-
-class WXXMLDLLEXPORT 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_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxDialogXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_DLG_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxFrameXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_FRAME_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
-{
-    enum
-    {
-        wxGAUGE_DEFAULT_RANGE = 100
-    };
-
-public:
-    wxGaugeXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_GAUGE_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-#include "wx/defs.h"
-
-#if wxUSE_HTML
-
-class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxHtmlWindowXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_SLIDER_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-#if wxUSE_LISTBOX
-
-class WXXMLDLLEXPORT 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_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxListCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_LISTC_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxMenuXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideMenu;
-};
-
-class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxMenuBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_MENU_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-#if wxUSE_NOTEBOOK
-
-class WXDLLEXPORT wxNotebook;
-
-class WXXMLDLLEXPORT 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_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxPanelXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_PANEL_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-#include "wx/defs.h"
-
-#if wxUSE_RADIOBOX
-
-class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxRadioButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_RADIOBUTTON_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-#if wxUSE_RADIOBOX
-
-class WXXMLDLLEXPORT 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_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-#include "wx/defs.h"
-
-
-
-class WXXMLDLLEXPORT 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_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-
-class WXDLLEXPORT wxSizer;
-
-class WXXMLDLLEXPORT 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_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-#include "wx/defs.h"
-
-#if wxUSE_SLIDER
-
-class WXXMLDLLEXPORT 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_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-#include "wx/defs.h"
-
-#if wxUSE_SPINBTN
-class WXXMLDLLEXPORT 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 WXXMLDLLEXPORT 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_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxStaticBitmapXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_STBMP_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxStaticBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_STBOX_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-#if wxUSE_STATLINE
-
-class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxStaticLineXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_STLIN_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxStaticTextXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_STBMP_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxTextCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_TEXT_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-#if wxUSE_TOOLBAR
-
-class WXDLLEXPORT wxToolBar;
-
-class WXXMLDLLEXPORT 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_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxTreeCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_TREE_H_

contrib/include/wx/xrc/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/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxUnknownWidgetXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_UNKWN_H_

contrib/include/wx/xrc/xml.h

@@ -1,264 +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"
-
-#ifdef WXXMLISDLL
-#define WXXMLDLLEXPORT WXDLLEXPORT
-#else
-#define WXXMLDLLEXPORT
-#endif
-
-class WXXMLDLLEXPORT wxXmlNode;
-class WXXMLDLLEXPORT wxXmlProperty;
-class WXXMLDLLEXPORT wxXmlDocument;
-class WXXMLDLLEXPORT 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_EXPAT,       // use Expat to load from text/xml document
-    wxXML_IO_TEXT_OUTPUT, // generic saver into text/xml
-    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 WXXMLDLLEXPORT 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").
-//
-// If wxUSE_UNICODE is 0, all strings are encoded in UTF-8 encoding (same as
-// ASCII for characters 0-127). You can use wxMBConvUTF8 to convert then to
-// desired encoding:
-//
-//     wxCSConv myConv("iso8859-2");
-//     wxString s(cMB2WC(node->GetContent().c_str()), myConv);
-
-class WXXMLDLLEXPORT 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 WXXMLDLLEXPORT 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 = wxXML_IO_TEXT_OUTPUT) const;
-    bool Save(wxOutputStream& stream,
-              wxXmlIOType io_type = wxXML_IO_TEXT_OUTPUT) const;
-
-    bool IsOk() const { return m_root != NULL; }
-
-    // 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).
-    // Note: this is the encoding original fail was saved in, *not* the
-    // encoding of in-memory representation! Data in wxXmlNode are always
-    // stored in wchar_t (in Unicode build) or UTF-8 encoded
-    // (if wxUSE_UNICODE is 0).
-    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 WXXMLDLLEXPORT 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;
-};
-
-
-
-void wxXmlInitXmlModule();
-
-#endif // _WX_XML_H_

contrib/include/wx/xrc/xmlio.h

@@ -1,85 +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/xrc/xml.h"
-
-
-class WXXMLDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
-{
-public:
-    virtual wxXmlIOType GetType() { return wxXML_IO_EXPAT; }
-    virtual bool CanLoad(wxInputStream& stream);
-    virtual bool CanSave() { return FALSE; }
-
-    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-    virtual bool Save(wxOutputStream& WXUNUSED(stream), const wxXmlDocument& WXUNUSED(doc))
-        { return FALSE; }
-};
-
-
-class WXXMLDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
-{
-public:
-    virtual wxXmlIOType GetType() { return wxXML_IO_TEXT_OUTPUT; }
-    virtual bool CanLoad(wxInputStream& WXUNUSED(stream)) { return FALSE; }
-    virtual bool CanSave() { return TRUE; }
-
-    virtual bool Load(wxInputStream& WXUNUSED(stream), wxXmlDocument& WXUNUSED(doc)) 
-        { return FALSE; }
-    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
-};
-
-
-class WXXMLDLLEXPORT 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 WXXMLDLLEXPORT 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
-
-
-#endif // _WX_XMLIO_H_

contrib/include/wx/xrc/xmlres.h

@@ -1,358 +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"
-
-#include "wx/xrc/xml.h"
-
-class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxDialog;
-class WXDLLEXPORT wxPanel;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxToolBar;
-
-class WXXMLDLLEXPORT wxXmlResourceHandler;
-
-
-// These macros indicate current version of XML resources (this information is
-// encoded in root node of XRC file as "version" property).
-//
-// Rules for increasing version number:
-//   - change it only if you made incompatible change to the format. Addition of new
-//     attribute to control handler is _not_ incompatible change, because older
-//     versions of the library may ignore it.
-//   - if you change version number, follow these steps:
-//       - set major, minor and release numbers to respective version numbers of
-//         the wxWindows library (see wx/version.h)
-//       - reset revision to 0 unless the first three are same as before, in which
-//         case you should increase revision by one
-#define WX_XMLRES_CURRENT_VERSION_MAJOR            2
-#define WX_XMLRES_CURRENT_VERSION_MINOR            3
-#define WX_XMLRES_CURRENT_VERSION_RELEASE          0
-#define WX_XMLRES_CURRENT_VERSION_REVISION         1
-#define WX_XMLRES_CURRENT_VERSION_STRING    "2.3.0.1"
-
-#define WX_XMLRES_CURRENT_VERSION \
-                (WX_XMLRES_CURRENT_VERSION_MAJOR * 256*256*256 + \
-                 WX_XMLRES_CURRENT_VERSION_MINOR * 256*256 + \
-                 WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
-                 WX_XMLRES_CURRENT_VERSION_REVISION)
-
-class WXXMLDLLEXPORT wxXmlResourceDataRecord
-{
-public:
-    wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
-    ~wxXmlResourceDataRecord() {delete Doc;}
-
-    wxString File;
-    wxXmlDocument *Doc;
-    wxDateTime Time;
-};
-
-
-#ifdef WXXMLISDLL
-WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
-#else
-WX_DECLARE_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
-#endif
-
-
-// This class holds XML resources from one or more .xml files
-// (or derived forms, either binary or zipped -- see manual for
-// details).
-
-class WXXMLDLLEXPORT 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);
-
-    // Attaches unknown control into given panel/window/dialog:
-    // (unknown controls are used in conjunction with <object class="unknown">)
-    bool AttachUnknownControl(const wxString& name, wxWindow *control,
-                              wxWindow *parent = NULL);
-
-    // 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);
-
-    // Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
-    long GetVersion() const { return m_version; }
-
-    // Compares resources version to argument. Returns -1 if resources version
-    // is less than the argument, +1 if greater and 0 if they equal.
-    int CompareVersion(int major, int minor, int release, int revision) const
-        { return GetVersion() -
-                 (major*256*256*256 + minor*256*256 + release*256 + revision); }
-
-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:
-    long m_version;
-
-    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 WXXMLDLLEXPORT 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"));
-
-#ifdef __WXDEBUG__
-#define XMLCTRL(window, id, type) \
-    (wxDynamicCast((window).FindWindow(XMLID(id)), type))
-#else
-#define XMLCTRL(window, id, type) \
-    ((type*)((window).FindWindow(XMLID(id))))
-#endif
-
-
-class WXXMLDLLEXPORT 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)
-
-
-void wxXmlInitResourceModule();
-
-#endif // _WX_XMLRES_H_

contrib/samples/Makefile.in

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

contrib/samples/applet/Makefile.in

@@ -1,25 +0,0 @@
-#
-# File:		Makefile.in
-# Author:	Julian Smart
-# Created:	2000
-# Updated:	
-# Copyright:	(c) 2000 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for the multicell example (UNIX).
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../..
-program_dir = contrib/samples/applet
-
-PROGRAM=monitor
-
-DATAFILES=about.html index.html
-
-OBJECTS=applet.o dialogs_wdr.o monitorapplet.o combobox.o
-
-APPEXTRALIBS=$(top_builddir)/lib/libapplet.@WX_TARGET_LIBRARY_TYPE@
-APPEXTRADEFS=-I$(top_srcdir)/contrib/include
-
-include $(top_builddir)/src/makeprog.env

contrib/samples/applet/about.html

@@ -1,10 +0,0 @@
-<html>
-<head><title>Scitech Display Doctor</title></head>
-<body>
-
-<BODY BGCOLOR="#FFFFFF" >
-<center><IMG SRC="biglogo.bmp"></center>
-<hr>
-</body>
-</html>
-

contrib/samples/applet/applet.cpp

@@ -1,156 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxApplet sample program
-*
-****************************************************************************/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/wx.h"
-#include "wx/applet/window.h"
-#include "applet.h"
-
-/*---------------------------- Global variables ---------------------------*/
-
-// Define the event tables for handling application frame events
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(Minimal_Quit,      MyFrame::OnQuit)
-    EVT_MENU(Minimal_About,     MyFrame::OnAbout)
-    EVT_MENU(Minimal_Back,      MyFrame::OnBack)
-    EVT_MENU(Minimal_Forward,   MyFrame::OnForward)
-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 --------------------------------*/
-
-/****************************************************************************
-PARAMETERS:
-title   - Title for the frame window
-pos     - Position to place to frame window
-size    - Size of the frame window
-
-REMARKS:
-Application frame window constructor
-****************************************************************************/
-MyFrame::MyFrame(
-    const wxString& title,
-    const wxPoint& pos,
-    const wxSize& size)
-    : wxFrame(NULL, -1, title, pos, size)
-{
-    // Create a menu bar
-    wxMenu *menuFile = new wxMenu;
-    wxMenu *menuNav = new wxMenu;
-    menuFile->Append(Minimal_Quit, "E&xit");
-    menuNav->Append(Minimal_Back, "Go &back");
-    menuNav->Append(Minimal_Forward, "Go &forward");
-
-    // Now append the freshly created menu to the menu bar...
-    wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append(menuFile, "&File");
-    menuBar->Append(menuNav, "&Navigate");
-
-    // ... and attach this menu bar to the frame
-    SetMenuBar(menuBar);
-    CreateStatusBar(2);
-
-    // Create the HTML window
-    html = new wxHtmlAppletWindow(this);
-    html->SetRelatedFrame(this, "wxApplet Demo: '%s'");
-    html->SetRelatedStatusBar(1);
-    html->LoadPage("index.html");
-}
-
-/****************************************************************************
-REMARKS:
-Event handler for the 'Exit' menu item
-****************************************************************************/
-void MyFrame::OnQuit(
-    wxCommandEvent&)
-{
-    // TRUE is to force the frame to close
-    Close(TRUE);
-}
-
-/****************************************************************************
-REMARKS:
-Event handler for the 'About' menu item
-****************************************************************************/
-void MyFrame::OnAbout(
-    wxCommandEvent&)
-{
-    // TODO: Bring up and about html page!
-}
-
-/****************************************************************************
-REMARKS:
-Event handler for the 'Go back' menu item
-****************************************************************************/
-void MyFrame::OnBack(
-    wxCommandEvent&)
-{
-    if (!html -> HistoryBack())
-        wxMessageBox("You reached prehistory era!");
-}
-
-/****************************************************************************
-REMARKS:
-Event handler for the 'Go forward' menu item
-****************************************************************************/
-void MyFrame::OnForward(
-    wxCommandEvent&)
-{
-    if (!html -> HistoryForward())
-        wxMessageBox("No more items in history!");
-}
-
-/****************************************************************************
-REMARKS:
-`Main program' equivalent: the program execution "starts" here
-****************************************************************************/
-bool MyApp::OnInit()
-{
-    // Create the main application window
-    MyFrame *frame = new MyFrame("wxApplet testing application",
-        wxPoint(50, 50), wxSize(640, 480));
-
-    // Show it and tell the application that it's our main window
-    frame->Show(TRUE);
-    SetTopWindow(frame);
-
-    // Success: wxApp::OnRun() will be called to run the application
-    return TRUE;
-}
-

contrib/samples/applet/applet.h

@@ -1,77 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxApplet sample program header file
-*
-****************************************************************************/
-
-#ifndef __SAMPLE_H
-
-/*------------------------------ Constants --------------------------------*/
-
-enum {
-    // Menu items
-    Minimal_Quit = 1,
-    Minimal_About,
-    Minimal_Back,
-    Minimal_Forward,
-
-    // Controls start here (the numbers are, of course, arbitrary)
-    Minimal_Text = 1000,
-    };
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Define a new application type, each program should derive a class from wxApp
-****************************************************************************/
-class MyApp : public wxApp {
-public:
-    // Initialise the application on startup
-    virtual bool OnInit();
-    };
-
-/****************************************************************************
-REMARKS:
-Define a new frame type: this is going to be our main frame
-****************************************************************************/
-class MyFrame : public wxFrame {
-private:
-    DECLARE_EVENT_TABLE()       // Declare event table
-    wxHtmlAppletWindow *html;   // Pointer to the html applet window
-
-public:
-            // Constructor
-            MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
-
-            // Event handlers
-            void OnQuit(wxCommandEvent& event);
-            void OnAbout(wxCommandEvent& event);
-            void OnBack(wxCommandEvent& event);
-            void OnForward(wxCommandEvent& event);
-    };
-
-#endif  // __SAMPLE_H
-

contrib/samples/applet/combobox.cpp

@@ -1,173 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Combobox wrapper. This file implements the custom
-*               combo boxes used for this sample program.
-*
-****************************************************************************/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/wx.h"
-#include "combobox.h"
-
-/*------------------------- Implementation --------------------------------*/
-
-ComboBox::ComboBox(
-    wxWindow *parent,
-    int listid,
-    int textid)
-    : m_Parent(parent), m_ListBoxId(listid), m_TextCtrlId(textid)
-{
-    m_ListBox  = wxDynamicCast(m_Parent->FindWindow(listid),wxListBox);
-    m_TextCtrl = wxDynamicCast(m_Parent->FindWindow(textid),wxTextCtrl);
-}
-
-int ComboBox::GetListBoxId()
-{
-    return m_ListBoxId;
-}
-
-int ComboBox::GetSelection()
-{
-    return m_ListBox->GetSelection();
-}
-
-wxString ComboBox::GetStringSelection()
-{
-    return m_ListBox->GetStringSelection();
-}
-
-bool ComboBox::SetStringSelection(const wxString& s, bool select)
-{
-    select = TRUE;
-    select = m_ListBox->SetStringSelection(s, select);
-    m_TextCtrl->SetValue(GetStringSelection());
-    return select;
-}
-
-void ComboBox::Select(int n)
-{
-    m_ListBox->Select(n);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Deselect(int n)
-{
-    m_ListBox->Deselect(n);
-}
-
-void ComboBox::Insert(const wxString& item, int pos)
-{
-    m_ListBox->Insert(item,pos);
-}
-
-void ComboBox::Insert(const wxString& item, int pos, void *clientData)
-{
-    m_ListBox->Insert(item, pos, clientData);
-}
-
-void ComboBox::Insert(const wxString& item, int pos, wxClientData *clientData)
-{
-    m_ListBox->Insert(item, pos, clientData);
-}
-
-void ComboBox::InsertItems(int nItems, const wxString *items, int pos)
-{
-    m_ListBox->InsertItems(nItems, items, pos);
-}
-
-void ComboBox::InsertItems(const wxArrayString& items, int pos)
-{
-    m_ListBox->InsertItems(items, pos);
-}
-
-void ComboBox::Set(int n, const wxString* items, void **clientData)
-{
-    m_ListBox->Set(n, items, clientData);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Set(const wxArrayString& items, void **clientData)
-{
-    m_ListBox->Set(items, clientData);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-int ComboBox::FindString(const wxString &s)
-{
-    return (m_ListBox->FindString(s));
-}
-
-void ComboBox::SetFirstItem(int n)
-{
-    m_ListBox->SetFirstItem(n);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::SetFirstItem(const wxString &s)
-{
-    m_ListBox->SetFirstItem(s);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Append(const wxString &item)
-{
-    m_ListBox->Append(item);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Append(const wxString& item, void *clientData)
-{
-    m_ListBox->Append(item, clientData);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Append(const wxString& item, wxClientData *clientData)
-{
-    m_ListBox->Append(item, clientData);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Clear()
-{
-    m_ListBox->Clear();
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Delete(int n)
-{
-    m_ListBox->Delete(n);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::OnChange(wxCommandEvent &)
-{
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-

contrib/samples/applet/combobox.h

@@ -1,97 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Combobox wrapper. This header file defines the custom
-*               combo boxes used for this sample program.
-*
-****************************************************************************/
-
-#ifndef __COMBOBOX_H
-#define __COMBOBOX_H
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Defines a Custom ComboBox. This combobox is a portable implementation of
-the msw combobox control. It is made of the wxWindows textctrl primitive and
-the listbox primitive. This object does not create or display the controls,
-it provides the relationship and underlying behavior layer for the primitives
-allready created via wxDesigner.
-****************************************************************************/
-class ComboBox {
-private:
-    int         m_ListBoxId;
-    int         m_TextCtrlId;
-    wxWindow    *m_Parent;
-    wxListBox   *m_ListBox;
-    wxTextCtrl  *m_TextCtrl;
-
-public:
-            // Constructor
-            ComboBox(wxWindow *parent, int,int);
-
-            // Returns the id of the listbox: listBoxId.
-            int GetListBoxId();
-
-            // Inserts: Used to insert items into the listbox
-            void Insert(const wxString& item, int pos);
-            void Insert(const wxString& item, int pos, void *clientData);
-            void Insert(const wxString& item, int pos, wxClientData *clientData);
-            void InsertItems(int nItems, const wxString *items, int pos);
-            void InsertItems(const wxArrayString& items, int pos);
-
-            // Sets: Used to set items in the combo box
-            void Set(int n, const wxString* items, void **clientData );
-            void Set(const wxArrayString& items, void **clientData);
-            int FindString(const wxString &s);
-
-            // Selections: Used to get/de/select items in the listbox
-            void Select(int n);
-            void Deselect(int n);
-            int GetSelection();
-            wxString GetStringSelection();
-            bool SetStringSelection(const wxString& s, bool select);
-
-            // Set the specified item at the first visible item or scroll to max
-            // range.
-            void SetFirstItem(int n);
-            void SetFirstItem(const wxString& s);
-
-            // Append items to the listbox
-            void Append(const wxString& item);
-            void Append(const wxString& item, void *clientData);
-            void Append(const wxString& item, wxClientData *clientData);
-
-            // Deleting items from the list box
-            void Clear();
-            void Delete(int n);
-
-            // OnChange event function (called from SDD dialog box code, see: dialog.h) Mimic
-            // msw combobox behavior: Click on listbox item it shows in textbox.
-            void OnChange(wxCommandEvent &event);
-    };
-
-#endif  // __COMBOBOX_H
-

contrib/samples/applet/dialogs_wdr.cpp

@@ -1,106 +0,0 @@
-//------------------------------------------------------------------------------
-// Source code generated by wxDesigner from file: dialogs.wdr
-// Do not modify this file, all changes will be lost!
-//------------------------------------------------------------------------------
-
-#ifdef __GNUG__
-    #pragma implementation "dialogs_wdr.cpp"
-#endif
-
-// For compilers that support precompilation
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// Include private header
-#include "dialogs_wdr.h"
-
-
-// Implement window functions
-
-wxSizer *MonitorDialogFunc( wxPanel *parent, bool call_fit, bool set_sizer )
-{
-    wxSizer *item0 = new wxBoxSizer( wxVERTICAL );
-
-    wxSizer *item1 = new wxFlexGridSizer( 2, 0, 0 );
-
-    wxSizer *item2 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item3 = new wxStaticText( parent, ID_TEXT_MANUFACTURER, "Manufacturer:", wxDefaultPosition, wxSize(180,-1), 0 );
-    item3->SetForegroundColour( *wxBLACK );
-    item3->SetBackgroundColour( *wxWHITE );
-    item2->Add( item3, 0, wxALIGN_CENTRE, 5 );
-
-    item2->Add( 10, 20, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item2, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxSizer *item4 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item5 = new wxStaticText( parent, ID_TEXT_MODEL, "Model:", wxDefaultPosition, wxSize(250,-1), 0 );
-    item5->SetForegroundColour( *wxBLACK );
-    item5->SetBackgroundColour( *wxWHITE );
-    item4->Add( item5, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxSizer *item6 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxTextCtrl *item7 = new wxTextCtrl( parent, ID_TEXTCTRL_MFTR, "", wxDefaultPosition, wxSize(190,-1), wxTE_READONLY );
-    item7->SetForegroundColour( *wxBLACK );
-    item7->SetBackgroundColour( *wxWHITE );
-    item6->Add( item7, 0, wxALIGN_CENTRE, 5 );
-
-    item6->Add( 15, 20, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item6, 0, wxALIGN_CENTRE, 5 );
-
-    wxSizer *item8 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxTextCtrl *item9 = new wxTextCtrl( parent, ID_TEXTCTRL_MDL, "", wxDefaultPosition, wxSize(260,-1), wxTE_READONLY );
-    item8->Add( item9, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item8, 0, wxALIGN_CENTRE, 5 );
-
-    wxSizer *item10 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxString *strs11 = (wxString*) NULL;
-    wxListBox *item11 = new wxListBox( parent, ID_LISTBOX_MFTR, wxDefaultPosition, wxSize(190,150), 0, strs11, wxLB_SORT|wxLB_ALWAYS_SB );
-    item10->Add( item11, 0, wxALIGN_CENTRE, 5 );
-
-    item10->Add( 15, 20, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item10, 0, wxALIGN_CENTRE, 5 );
-
-    wxSizer *item12 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxString *strs13 = (wxString*) NULL;
-    wxListBox *item13 = new wxListBox( parent, ID_LISTBOX_MDL, wxDefaultPosition, wxSize(260,150), 0, strs13, wxLB_SORT|wxLB_NEEDED_SB );
-    item13->SetForegroundColour( *wxBLACK );
-    item13->SetBackgroundColour( *wxWHITE );
-    item12->Add( item13, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item12, 0, wxALIGN_CENTRE, 5 );
-
-    item0->Add( item1, 0, wxALIGN_CENTRE, 15 );
-
-    if (set_sizer)
-    {
-        parent->SetAutoLayout( TRUE );
-        parent->SetSizer( item0 );
-        if (call_fit)
-        {
-            item0->Fit( parent );
-            item0->SetSizeHints( parent );
-        }
-    }
-    
-    return item0;
-}
-
-// Implement bitmap functions
-
-
-// End of generated file

contrib/samples/applet/dialogs_wdr.h

@@ -1,42 +0,0 @@
-//------------------------------------------------------------------------------
-// Header generated by wxDesigner from file: dialogs.wdr
-// Do not modify this file, all changes will be lost!
-//------------------------------------------------------------------------------
-
-#ifndef __WDR_dialogs_H__
-#define __WDR_dialogs_H__
-
-#ifdef __GNUG__
-    #pragma interface "dialogs_wdr.cpp"
-#endif
-
-// Include wxWindows' headers
-
-#ifndef WX_PRECOMP
-    #include <wx/wx.h>
-#endif
-
-#include <wx/image.h>
-#include <wx/statline.h>
-#include <wx/spinbutt.h>
-#include <wx/spinctrl.h>
-#include <wx/splitter.h>
-#include <wx/listctrl.h>
-#include <wx/treectrl.h>
-#include <wx/notebook.h>
-
-// Declare window functions
-
-#define ID_TEXT_MANUFACTURER 10000
-#define ID_TEXT_MODEL 10001
-#define ID_TEXTCTRL_MFTR 10
-#define ID_TEXTCTRL_MDL 20
-#define ID_LISTBOX_MFTR 11
-#define ID_LISTBOX_MDL 21
-wxSizer *MonitorDialogFunc( wxPanel *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-
-// Declare bitmap functions
-
-#endif
-
-// End of generated file

contrib/samples/applet/index.html

@@ -1,21 +0,0 @@
-<html>
-<head><title>Widgets demo</title></head>
-<body text="#000000" bgcolor="#D0D0D0">
-
-<h3>wxHtmlWidgetCell demonstration</h3>
-
-There is an embedded window somewhere around. Enjoy it.
-
-<A HREF="about.html">About...</A>
-
-<insert "wxChipsetName">
-
-<hr>
-<center>
-<embed applet="MonitorApplet" width=100 height=100>
-</center>
-<hr>
-
-</body>
-</html>
-

contrib/samples/applet/monitorapplet.cpp

@@ -1,218 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxApplet class implementation
-*
-****************************************************************************/
-
-// For compilers that support precompilation
-#include "wx/wxprec.h"
-
-// Include private headers
-#include "wx/wx.h"
-#include "monitorapplet.h"
-
-/*---------------------------- Global variables ---------------------------*/
-
-// Implement the dynamic class so it can be constructed dynamically
-IMPLEMENT_DYNAMIC_CLASS(MonitorApplet, wxApplet);
-
-// Event handler table.
-BEGIN_EVENT_TABLE(MonitorApplet, wxApplet)
-    EVT_LISTBOX(ID_LISTBOX_MFTR,        MonitorApplet::OnChange)
-    EVT_LISTBOX(ID_LISTBOX_MDL,         MonitorApplet::OnChange)
-END_EVENT_TABLE()
-
-// Include database of known monitors. Normally this would come from a
-// real database on disk, but for this simple example we hard code all
-// the values into a table.
-#include "monitors.c"
-
-/*------------------------- Implementation --------------------------------*/
-
-/****************************************************************************
-REMARKS:
-Constructor called during dynamic creation. Simple initialise all
-internal values for the class so that it can be properly created later
-via the virtual Create member function.
-****************************************************************************/
-MonitorApplet::MonitorApplet()
-{
-    m_Mfr = NULL;
-    m_Model = NULL;
-    m_Data = NULL;
-}
-
-/****************************************************************************
-REMARKS:
-Psuedo virtual constructor for the MonitorApplet class.
-****************************************************************************/
-bool MonitorApplet::Create(
-    wxHtmlAppletWindow *parent,
-    const wxSize& size,
-    long style)
-{
-    bool ret = wxApplet::Create(parent, size, style);
-    if (ret) {
-        // Read our cookie or create it if it does not exist
-        if ((m_Data = (MonitorData*)parent->FindCookie(MONITOR_COOKIE_NAME)) == NULL) {
-            m_Data = new MonitorData;
-            memset(&m_Data->m_Monitor,0,sizeof(m_Data->m_Monitor));
-            parent->RegisterCookie(MONITOR_COOKIE_NAME,m_Data);
-            }
-
-        // Create all the controls and initialise them
-        MonitorDialogFunc(this,true,true);
-        if ((m_Mfr = new ComboBox(this , ID_LISTBOX_MFTR, ID_TEXTCTRL_MFTR)) == NULL)
-            return false;
-        if ((m_Model = new ComboBox(this , ID_LISTBOX_MDL, ID_TEXTCTRL_MDL)) == NULL)
-            return false;
-        ReadMfrList();
-        ReadModelList(true);
-        }
-    return ret;
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the MonitorApplet class.
-****************************************************************************/
-MonitorApplet::~MonitorApplet()
-{
-    delete m_Mfr;
-    delete m_Model;
-}
-
-/****************************************************************************
-REMARKS:
-Save the current state for the applet to our cookie
-****************************************************************************/
-void MonitorApplet::SaveCurrentState()
-{
-    // Read currently selected strings into cookie
-    strcpy(m_Data->m_Monitor.m_Mfr,m_Mfr->GetStringSelection());
-    strcpy(m_Data->m_Monitor.m_Model,m_Model->GetStringSelection());
-}
-
-/****************************************************************************
-REMARKS:
-Handles user navigation away from the applet via an HTML link
-****************************************************************************/
-void MonitorApplet::OnLinkClicked(
-    const wxHtmlLinkInfo&)
-{
-    SaveCurrentState();
-}
-
-/****************************************************************************
-REMARKS:
-Handles user navigation away from the applet via the history forward command
-****************************************************************************/
-void MonitorApplet::OnHistoryForward()
-{
-    SaveCurrentState();
-}
-
-/****************************************************************************
-REMARKS:
-Handles user navigation away from the applet via the history back command
-****************************************************************************/
-void MonitorApplet::OnHistoryBack()
-{
-    SaveCurrentState();
-}
-
-/****************************************************************************
-REMARKS:
-Handles inter applet communication messages
-****************************************************************************/
-void MonitorApplet::OnMessage(
-    wxEvent& msg)
-{
-    msg.Skip(true);
-}
-
-/****************************************************************************
-REMARKS:
-****************************************************************************/
-void MonitorApplet::OnChange(
-    wxCommandEvent &evt)
-{
-    if (evt.GetId() == m_Mfr->GetListBoxId()) {
-        m_Mfr->OnChange(evt);
-        ReadModelList(true);
-        }
-    else if (evt.GetId() == m_Model->GetListBoxId()) {
-        m_Model->OnChange(evt);
-        }
-}
-
-/****************************************************************************
-REMARKS:
-Updates the manufacturer list for the dialog box from the database.
-****************************************************************************/
-void MonitorApplet::ReadMfrList()
-{
-    char            buf[80] = "";
-    int             i,selected = 0;
-    MonitorEntry    *m;
-
-    m_Mfr->Clear();
-    for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) {
-        if (wxStricmp(buf,m->m_Mfr) != 0) {
-            m_Mfr->Append(m->m_Mfr);
-            if (wxStricmp(m_Data->m_Monitor.m_Mfr,m->m_Mfr) == 0)
-                selected = i;
-            strcpy(buf,m->m_Mfr);
-            i++;
-            }
-        }
-    m_Mfr->Select(selected);
-}
-
-/****************************************************************************
-REMARKS:
-Updates the model list for the dialog box for the currently selected
-manufacturer type.
-****************************************************************************/
-void MonitorApplet::ReadModelList(
-    bool selectCurrent)
-{
-    int             i,selected = 0;
-    MonitorEntry    *m;
-    wxString        mfrStr;
-
-    mfrStr = m_Mfr->GetStringSelection();
-    m_Model->Clear();
-    for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) {
-        if (wxStricmp(mfrStr,m->m_Mfr) == 0) {
-            m_Model->Append(m->m_Model);
-            if (selectCurrent && wxStricmp(m_Data->m_Monitor.m_Model,m->m_Model) == 0)
-                selected = i;
-            i++;
-            }
-        }
-    m_Model->Select(selected);
-}
-

contrib/samples/applet/monitorapplet.h

@@ -1,112 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the MonitorApplet class
-*
-****************************************************************************/
-
-#ifndef __WX_MONITORAPPLET_H
-#define __WX_MONITORAPPLET_H
-
-#include "wx/applet/applet.h"
-#include "combobox.h"
-#include "dialogs_wdr.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Structure defining the simple monitor database records.
-****************************************************************************/
-struct MonitorEntry {
-    char    m_Mfr[60];
-    char    m_Model[60];
-    };
-
-/****************************************************************************
-REMARKS:
-Defines our wxMonitorData cookie object that is stored to maintain state
-information for this MonitorApplet.
-****************************************************************************/
-class MonitorData : public wxObject {
-public:
-    MonitorEntry    m_Monitor;
-    };
-
-// Name used to track the monitor data cookie
-#define MONITOR_COOKIE_NAME "MonitorData"
-
-/****************************************************************************
-REMARKS:
-Defines our wxMonitor applet class
-****************************************************************************/
-class MonitorApplet : public wxApplet {
-private:
-    DECLARE_DYNAMIC_CLASS(MonitorApplet);
-    DECLARE_EVENT_TABLE();
-
-protected:
-    ComboBox            *m_Mfr;
-    ComboBox            *m_Model;
-    MonitorData         *m_Data;
-    static MonitorEntry m_Monitors[];
-
-            // Flush the current state to a cookie
-            void SaveCurrentState();
-
-public:
-            // Constructor (called during dynamic creation)
-            MonitorApplet();
-
-            // Psuedo virtual constructor
-    virtual bool Create(
-                wxHtmlAppletWindow *parent,
-                const wxSize& size,
-                long style);
-
-            // Virtual destructor
-    virtual ~MonitorApplet();
-
-            // Handle HTML navigation to a new URL
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
-
-            // Handle HTML navigation forward command in applet
-    virtual void OnHistoryForward();
-
-            // Handle HTML navigation back command in applet
-    virtual void OnHistoryBack();
-
-            // Handle messages from the wxAppletManager and other applets
-    virtual void OnMessage(wxEvent& msg);
-
-            // Update the model and menufacturer lists
-            void ReadMfrList();
-            void ReadModelList(bool selectCurrent);
-
-            // Event handlers
-            void OnChange(wxCommandEvent &event);
-    };
-
-#endif // __WX_MONITORAPPLET_H
-

contrib/samples/canvas/Makefile.in

@@ -1,10 +0,0 @@
-# $Id$
-
-CONTRIB_SAMPLES=test simple
-
-all:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
-
-clean:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE) clean); done
-

contrib/samples/canvas/simple/Makefile.in

@@ -1,23 +0,0 @@
-#
-# File:		Makefile.in
-# Author:	Julian Smart
-# Created:	2000
-# Updated:	
-# Copyright:	(c) 2000 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for the multicell example (UNIX).
-
-top_srcdir = @top_srcdir@/..
-top_builddir = ../../../..
-program_dir = contrib/samples/canvas/simple
-
-PROGRAM=simple
-
-OBJECTS=simple.o
-
-APPEXTRALIBS=$(top_builddir)/lib/libcanvas.@WX_TARGET_LIBRARY_TYPE@
-APPEXTRADEFS=-I$(top_srcdir)/contrib/include
-
-include $(top_builddir)/src/makeprog.env

contrib/samples/canvas/simple/SimpleVC.dsp

@@ -1,175 +0,0 @@
-# Microsoft Developer Studio Project File - Name="SimpleVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=SimpleVC - 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 "SimpleVC.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 "SimpleVC.mak" CFG="SimpleVC - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SimpleVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "SimpleVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "SimpleVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "SimpleVC - 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)" == "SimpleVC - 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 png.lib zlib.lib jpeg.lib tiff.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/simple.exe" /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "SimpleVC - 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" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "SimpleVC - 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 canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Release DLL"
-
-# 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 canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SimpleVC - Win32 Release"
-# Name "SimpleVC - Win32 Debug"
-# Name "SimpleVC - Win32 Debug DLL"
-# Name "SimpleVC - Win32 Release DLL"
-# Begin Source File
-
-SOURCE=.\simple.cpp
-
-!IF  "$(CFG)" == "SimpleVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Debug DLL"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\simple.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "..\..\include"
-# End Source File
-# End Target
-# End Project

contrib/samples/canvas/simple/SimpleVC.dsw

@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "SimpleVC"=.\SimpleVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

contrib/samples/canvas/simple/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=simple
-
-EXTRALIBS=$(WXDIR)\lib\canvas.lib
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-

contrib/samples/canvas/simple/makefile.g95

@@ -1,14 +0,0 @@
-# File:     makefile.g95 for Plot demo
-# Author:	Julian Smart
-# Created:	2001-06-12
-# Updated:
-
-WXDIR = ../../../..
-
-TARGET = simple
-OBJECTS = $(TARGET).o
-EXTRAINC = -I$(WXDIR)/contrib/include
-EXTRALIBS = -lcanvas
-
-include $(WXDIR)/src/makeprog.g95
-

contrib/samples/canvas/simple/makefile.vc

@@ -1,14 +0,0 @@
-# File:		makefile.vc for Plot sample
-# Author:	Julian Smart
-# Created:	2001-06-12
-# Updated:
-
-WXDIR = $(WXWIN)
-PROGRAM = simple
-
-OBJECTS = $(PROGRAM).obj
-EXTRALIBS = $(WXDIR)\lib\canvas$(LIBEXT).lib
-EXTRAINC = -I$(WXDIR)\contrib\include
-
-!include $(WXDIR)\src\makeprog.vc
-

contrib/samples/canvas/simple/mondrian.xpm

@@ -1,44 +0,0 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-"                                ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-"                                ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++      ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++                    ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-"                                "
-};