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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_3_1@10870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
fix for rpm uninstallation
2001-07-06 20:15:35 +00:00 · 2001-06-22 00:22:44 +00:00 · 2001-06-22 00:03:40 +00:00 · 2001-06-21 23:54:57 +00:00 · 2001-06-21 23:45:23 +00:00 · 2001-06-21 23:32:16 +00:00
1352 changed files with 45660 additions and 70952 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -153,18 +153,19 @@ INTLDIR  = $(WXDIR)/locale
 ########################## Archive name ###############################

 # append a version suffix x.y.z to all file names
-VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
-WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
-WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
-WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
-WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
+VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
+WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
+WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).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
-WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
-WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
-WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
+WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2
+WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
+WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
+WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2

-DISTDIR = ./_dist_dir/@DISTDIR@
+DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX)
+DISTDIR=./_dist_dir/$(DISTDIRNAME)


 ############################## Files ##################################
@@ -345,7 +346,7 @@ OLEOBJS = \
 		droptgt.o \
 		oleutils.o \
 		uuid.o
-  
+
 ############################## Rules ##################################

 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
@@ -371,10 +372,10 @@ all: @WX_ALL@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)

-./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.r: ./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc
+./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@-${VER_SUFFIX}.rsrc: $(MACRESOURCES)
+./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc: $(MACRESOURCES)
 	$(REZ) $(REZFLAGS) $^ -o $@

 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
@@ -729,7 +730,7 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/configure.in $(DISTDIR)/demos

 	cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
-    
+
 	mkdir $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
@@ -872,6 +873,16 @@ 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
@@ -946,10 +957,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
-    
+
 	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
@@ -958,10 +970,10 @@ 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/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/de
+	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru

 	mkdir $(DISTDIR)/samples/ipc
 	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
@@ -1093,7 +1105,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
-    
+
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/makefile.unx $(DISTDIR)/samples/richedit
@@ -1102,35 +1114,35 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
-    
+
 	mkdir $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
-    
+
 	mkdir $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
-    
+
 	mkdir $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/makefile.unx $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
-    
+
 	mkdir $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
-    
+
 	mkdir $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
-    
+
 	mkdir $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
@@ -1141,7 +1153,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
-    
+
 	mkdir $(DISTDIR)/samples/statbar
 	cp $(SAMPDIR)/statbar/Makefile.in $(DISTDIR)/samples/statbar
 	cp $(SAMPDIR)/statbar/makefile.unx $(DISTDIR)/samples/statbar
@@ -1153,12 +1165,12 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
-    
+
 	mkdir $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
-    
+
 	mkdir $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/makefile.unx $(DISTDIR)/samples/toolbar
@@ -1166,7 +1178,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
 	mkdir $(DISTDIR)/samples/toolbar/bitmaps
 	cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
-    
+
 	mkdir $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/makefile.unx $(DISTDIR)/samples/treectrl
@@ -1175,33 +1187,33 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
 	mkdir $(DISTDIR)/samples/treectrl/bitmaps
 	cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps
-    
+
 	mkdir $(DISTDIR)/samples/treelay
 	cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
 	cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
 	cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
 	cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
-    
+
 	mkdir $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/makefile.unx $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
-    
+
 	mkdir $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/makefile.unx $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
-    
+
 	mkdir $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/makefile.unx $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
-    
+
 UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
 	cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
@@ -1295,27 +1307,58 @@ PYTHON_DIST:
 distclean:
 	$(RM) -r _dist_dir

-dist: @GUIDIST@
-	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+# 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; \
-	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
-	tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
-	mv @DISTDIR@-$(VER_SUFFIX) @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
+	@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
+
+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 @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
+	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples; \
@@ -1346,3 +1389,18 @@ clean:
 	$(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"` .
--- a/1803
+++ b/1803
--- a/configure.in
+++ b/configure.in
@@ -184,10 +184,10 @@ AC_DEFUN(WX_CPP_NEW_HEADERS,

    AC_CHECK_HEADERS(iostream)

-    if test "x$HAVE_IOSTREAM" = x ; then
-      ifelse([$2], , :, [$2])
-    else
+    if test "$ac_cv_header_iostream" = "yes" ; then
      ifelse([$1], , :, [$1])
+    else
+      ifelse([$2], , :, [$2])
    fi

    AC_LANG_RESTORE
@@ -216,7 +216,6 @@ AC_DEFUN(WX_CPP_BOOL,
        return 0;
      ],
      [
-        AC_DEFINE(HAVE_BOOL)
        wx_cv_cpp_bool=yes
      ],
      [
@@ -294,7 +293,7 @@ dnl   possible arguments are 'yes', 'no', or 'sys'
 dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
 AC_DEFUN(WX_ARG_SYS_WITH,
        [
-          AC_MSG_CHECKING("for --with-$1")
+          AC_MSG_CHECKING([for --with-$1])
          no_cache=0
          AC_ARG_WITH($1, $2,
                      [
@@ -339,7 +338,7 @@ dnl this macro checks for a command line argument and caches the result
 dnl usage: WX_ARG_WITH(option, helpmessage, variable-name)
 AC_DEFUN(WX_ARG_WITH,
        [
-          AC_MSG_CHECKING("for --with-$1")
+          AC_MSG_CHECKING([for --with-$1])
          no_cache=0
          AC_ARG_WITH($1, $2,
                      [
@@ -376,7 +375,7 @@ dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
 dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name)
 AC_DEFUN(WX_ARG_ENABLE,
        [
-          AC_MSG_CHECKING("for --enable-$1")
+          AC_MSG_CHECKING([for --enable-$1])
          no_cache=0
          AC_ARG_ENABLE($1, $2,
                        [
@@ -472,7 +471,7 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)

 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=0
+WX_RELEASE_NUMBER=1

 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -745,6 +744,7 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_OPENGL=no

  DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
+  DEFAULT_wxUSE_SNGLINST_CHECKER=no
  DEFAULT_wxUSE_STD_IOSTREAM=no
  DEFAULT_wxUSE_FILE=no
  DEFAULT_wxUSE_TEXTFILE=no
@@ -870,6 +870,7 @@ else
  DEFAULT_wxUSE_OPENGL=no

  DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
+  DEFAULT_wxUSE_SNGLINST_CHECKER=yes
  DEFAULT_wxUSE_STD_IOSTREAM=no
  DEFAULT_wxUSE_FILE=yes
  DEFAULT_wxUSE_TEXTFILE=yes
@@ -1087,6 +1088,7 @@ WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesyst
 WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], wxUSE_ZIPSTREAM)

 WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
+WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)

 dnl ---------------------------------------------------------------------------
 dnl "big" options (i.e. those which change a lot of things throughout the library)
@@ -1350,7 +1352,7 @@ for toolkit in `echo $ALL_TOOLKITS`; do
      echo "$var=$value" >> ${wx_arg_cache_file}
    fi
    if test "$value" = 1; then
-      AC_MSG_RESULT(`echo $toolkit | tr [[A-Z]] [[a-z]]`)
+      AC_MSG_RESULT([`echo $toolkit | tr [[A-Z]] [[a-z]]`])
    fi
  fi
 done
@@ -1434,7 +1436,7 @@ dnl   defines STRIP as strip or nothing if not found
 AC_CHECK_PROG(STRIP, strip, strip, true)

 dnl check if VPATH works
-AC_MSG_CHECKING("make for VPATH support")
+AC_MSG_CHECKING([make for VPATH support])
 dnl create Makefile
 cat - << EOF > confMake
 check : file
@@ -1454,7 +1456,7 @@ if test "$RESULT" = 0; then
  AC_MSG_RESULT(yes)
 else
  AC_MSG_RESULT(no)
-  AC_MSG_ERROR(
+  AC_MSG_ERROR([
 You need a make-utility that is able to use the variable
 VPATH correctly.
 If your version of make does not support VPATH correctly,
@@ -1464,7 +1466,7 @@ export MAKE=gmake; ./configure  for sh-type shells
 setenv MAKE gmake; ./configure  for csh-type shells
 Also please do remember to use gmake in this case every time
 you are trying to compile.
-)
+])
 fi

 dnl YACC checks
@@ -2127,15 +2129,15 @@ if test "$wxUSE_SHARED" = "yes"; then
            WX_ALL="CREATE_LINKS"
        fi
 	dnl add the resources target
-	WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r"
+	WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
 	dnl the name of the shared library
-	WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
-	WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
+	WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+	WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
 	dnl the name of the links to the shared library
-	WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.dylib"
+	WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
 	WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib"
 	WX_LIBRARY_LINK3="lib${WX_LIBRARY}.dylib"
-	WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.dylib"
+	WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}"
 	WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
 	WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
      ;;
@@ -2234,10 +2236,10 @@ dnl ------------------------------------------------------------------------

 dnl defines HAVE_STRINGS_H (where some string functions live on AIX for example)
 AC_CHECK_HEADERS(strings.h)
+dnl defines HAVE_STDLIB_H
+AC_CHECK_HEADERS(stdlib.h)
 dnl defines HAVE_UNISTD_H
 AC_CHECK_HEADERS(unistd.h)
-dnl defines HAVE_FCNTL_H
-AC_CHECK_HEADERS(fcntl.h)
 dnl defines HAVE_WCHAR_H
 AC_CHECK_HEADERS(wchar.h)
 dnl defines HAVE_WCSTR_H
@@ -2276,17 +2278,76 @@ AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
 [
    AC_TRY_COMPILE([#include <wchar.h>],
        [
-	    wchar_t wc, *ws;
-	    wc = L'a';
-	    ws = L"Hello, world!";
+            wchar_t wc, *ws;
+            wc = L'a';
+            ws = L"Hello, world!";
        ],
-	wx_cv_type_wchar_t=yes,
-	wx_cv_type_wchar_t=no)
+        wx_cv_type_wchar_t=yes,
+        AC_TRY_COMPILE([#include <stdlib.h>],
+            [
+                wchar_t wc, *ws;
+                wc = L'a';
+                ws = L"Hello, world!";
+            ],
+        wx_cv_type_wchar_t=yes,
+        wx_cv_type_wchar_t=no)
+    )
 ])
-if test "$wx_cv_type_wchar_t" = yes ; then
+
+if test "$wx_cv_type_wchar_t" = "yes"; then
    AC_DEFINE(wxUSE_WCHAR_T)
 fi

+dnl check what exactly size_t is on this machine - this is necessary to avoid
+dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CACHE_CHECK([if size_t is unsigned int],
+    wx_cv_size_t_is_uint,
+    dnl an obvious check like AC_TRY_COMPILE[struct Foo { ... };] doesn't work
+    dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate
+    dnl methods in a local class (i.e. class inside a function) declaration
+    dnl without any objections!!
+    dnl
+    dnl hence the hack below: we must have Foo at global scope!
+    AC_TRY_COMPILE([#include <stddef.h>],
+        [
+            return 0; }
+
+            struct Foo { void foo(size_t); void foo(unsigned int); };
+
+            int bar() {
+        ],
+        wx_cv_size_t_is_uint=no,
+        wx_cv_size_t_is_uint=yes
+    )
+)
+
+if test "$wx_cv_size_t_is_uint" = "yes"; then
+    AC_DEFINE(wxSIZE_T_IS_UINT)
+else
+    AC_CACHE_CHECK([if size_t is unsigned long],
+        wx_cv_size_t_is_ulong,
+        AC_TRY_COMPILE([#include <stddef.h>],
+            [
+                return 0; }
+
+                struct Foo { void foo(size_t); void foo(unsigned long); };
+
+                int bar() {
+            ],
+            wx_cv_size_t_is_ulong=no,
+            wx_cv_size_t_is_ulong=yes
+        )
+    )
+
+    if test "$wx_cv_size_t_is_ulong" = "yes"; then
+        AC_DEFINE(wxSIZE_T_IS_ULONG)
+    fi
+fi
+
+AC_LANG_RESTORE
+
 dnl ---------------------------------------------------------------------------
 dnl Checks for structures
 dnl ---------------------------------------------------------------------------
@@ -2335,11 +2396,17 @@ AC_CHECK_SIZEOF(long long, 0)

 dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
 dnl wchar_t an AC_CHECK_SIZEOF only includes stdio.h
+dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
 AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
 [
    AC_TRY_RUN(
        [
-	    #include <wchar.h>
+	    #ifdef HAVE_WCHAR_H
+	    #  include <wchar.h>
+	    #endif
+	    #ifdef HAVE_STDLIB_H
+	    #  include <stdlib.h>
+	    #endif
 	    #include <stdio.h>
 	    int main()
 	    {
@@ -2495,8 +2562,6 @@ if test "$wx_cv_func_vsscanf" = yes; then
    AC_DEFINE(HAVE_VSSCANF)
 fi

-AC_LANG_RESTORE
-
 dnl the following tests are for Unix(like) systems only
 if test "$TOOLKIT" != "MSW"; then

@@ -2509,9 +2574,9 @@ AC_CACHE_CHECK([if iconv() takes char**], wx_cv_iconv_takes_char,
    AC_TRY_COMPILE([#include <iconv.h>],
    [
        char **inbuf, **outbuf;
-	iconv_t cd;
-	size_t insz, outsz;
-	iconv(cd, inbuf, &insz, outbuf, &outsz);
+        iconv_t cd;
+        size_t insz, outsz;
+        iconv(cd, inbuf, &insz, outbuf, &outsz);
    ],
    wx_cv_iconv_takes_char=yes,
    wx_cv_iconv_takes_char=no)
@@ -2559,10 +2624,21 @@ fi
 dnl check for vfork() (even if it's the same as fork() in modern Unices)
 AC_CHECK_FUNCS(vfork)

+dnl check for fcntl() or at least flock() needed by Unix implementation of
+dnl wxSingleInstanceChecker
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+    AC_CHECK_FUNCS(fcntl flock, break)
+
+    if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
+        AC_MSG_WARN(wxSingleInstanceChecker not available)
+        wxUSE_SNGLINST_CHECKER=no
+    fi
+fi
+
 dnl check for timegm() used by datetime.cpp
 AC_CHECK_FUNCS(timegm)

-dnl look for a functiopn to modify the environment
+dnl look for a function to modify the environment
 AC_CHECK_FUNCS(putenv setenv, break)

 HAVE_SOME_SLEEP_FUNC=0
@@ -2593,9 +2669,9 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
                ],
                [
                    AC_CHECK_FUNCS(usleep,
-        		AC_DEFINE(HAVE_USLEEP),
-		    )
-                    AC_MSG_WARN([wxSleep() function will not work])
+                        AC_DEFINE(HAVE_USLEEP),
+                        AC_MSG_WARN([wxSleep() function will not work])
+                    )
                ]
            )
        ]
@@ -2682,8 +2758,6 @@ if test "$wxUSE_THREADS" = "yes" ; then
    dnl AIX calls the library libpthreads - thanks IBM!
    if test "$USE_AIX" = 1; then
        THREADS_LIB=pthreads
-    elif test "$USE_MAC" = 1; then
-        THREADS_LIB=cc_dynamic
    else
        THREADS_LIB=pthread
    fi
@@ -2700,15 +2774,9 @@ if test "$wxUSE_THREADS" = "yes" ; then
                THREADS_OBJ="threadpsx.lo"
                THREADS_LINK="c_r"
            ], [
-                dnl thread functions are in libcc_dynamic under Mac OS X/Darwin
-                AC_CHECK_LIB(cc_dynamic, pthread_create, [
-                    THREADS_OBJ="threadpsx.lo"
-                    THREADS_LINK="cc_dynamic"
-                ], [
-                    dnl VZ: SGI threads are not supported currently
-                    AC_CHECK_HEADER(sys/prctl.h, [
-                        THREADS_OBJ="threadsgi.lo"
-                    ])
+                dnl VZ: SGI threads are not supported currently
+                AC_CHECK_HEADER(sys/prctl.h, [
+                    THREADS_OBJ="threadsgi.lo"
                ])
            ])
        ])
@@ -2731,7 +2799,7 @@ if test "$wxUSE_THREADS" = "yes" ; then
  dnl [
  dnl     AC_CHECK_LIB($THREADS_LINK, $1,
  dnl            AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'),
-  dnl            [AC_CHECK_LIB("posix4", $1,
+  dnl            [AC_CHECK_LIB([posix4], $1,
  dnl                [AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'))
  dnl                 POSIX4_LINK="-lposix4"
  dnl             ])
@@ -2742,7 +2810,7 @@ if test "$wxUSE_THREADS" = "yes" ; then

  AC_CHECK_LIB($THREADS_LINK, sched_yield,
               AC_DEFINE(HAVE_SCHED_YIELD),
-               [AC_CHECK_LIB("posix4", sched_yield,
+               [AC_CHECK_LIB([posix4], sched_yield,
                   [AC_DEFINE(HAVE_SCHED_YIELD) POSIX4_LINK="-lposix4"],
                   AC_MSG_WARN(wxThread::Yield will not work properly)
                )]
@@ -2759,7 +2827,7 @@ if test "$wxUSE_THREADS" = "yes" ; then
                 AC_CHECK_LIB($THREADS_LINK, pthread_attr_setschedparam,
                   AC_CHECK_LIB($THREADS_LINK, sched_get_priority_max,
                       HAVE_PRIOR_FUNCS=1,
-                       AC_CHECK_LIB("posix4", sched_get_priority_max,
+                       AC_CHECK_LIB([posix4], sched_get_priority_max,
                         [
                            HAVE_PRIOR_FUNCS=1
                            POSIX4_LINK="-lposix4"
@@ -2836,7 +2904,7 @@ if test "$wxUSE_THREADS" = "yes" ; then
            ]
        )
    ])
-    if test "$wx_cv_type_pthread_rec_mutex_init"="yes"; then
+    if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
      AC_DEFINE(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
    else
      dnl this may break code working elsewhere, so at least warn about it
@@ -3054,7 +3122,7 @@ fi
 TIFF_INCLUDE=
 if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
  AC_DEFINE(wxUSE_LIBTIFF)
-  if test "$wxUSE_LIBTIFF" = "yes" ; then  
+  if test "$wxUSE_LIBTIFF" = "yes" ; then
    TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
  else
    TIFF_LINK=
@@ -3167,6 +3235,10 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
  AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
 fi

+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+  AC_DEFINE(wxUSE_SNGLINST_CHECKER)
+fi
+
 if test "$wxUSE_BUSYINFO" = "yes"; then
  AC_DEFINE(wxUSE_BUSYINFO)
 fi
@@ -3299,13 +3371,16 @@ if test "$wxUSE_TIMEDATE" = "yes"; then
                ],
                [
                    wx_cv_struct_tm_has_gmtoff=yes
-                    AC_DEFINE(WX_GMTOFF_IN_TM)
                ],
                wx_cv_struct_tm_has_gmtoff=no
            )
        ])
    fi

+    if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
+        AC_DEFINE(WX_GMTOFF_IN_TM)
+    fi
+
    dnl check for gettimeofday (SVr4, BSD 4.3) and ftime (V7, BSD 4.3) for the
    dnl function to be used for high resolution timers
    AC_CHECK_FUNCS(gettimeofday ftime, break)
@@ -3685,9 +3760,6 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then

        AC_CHECK_HEADERS(ole2.h)

-	dnl for some reason this test always fails here??
-        dnl if test "x$HAVE_OLE2_H" != x ; then
-	dnl this one does the right thing though
        if test "$ac_cv_header_ole2_h" = "yes" ; then
            if test "$GCC" = yes ; then
                ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
@@ -3854,7 +3926,14 @@ if test "$wxUSE_TABDIALOG" = "yes"; then
 fi

 if test "$wxUSE_TOGGLEBTN" = "yes"; then
-  AC_DEFINE(wxUSE_TOGGLEBTN)
+    if test "$wxUSE_MAC" = 1; then
+        AC_MSG_WARN([Toggle button is not yet supported under Mac OS X])
+        wxUSE_TOGGLEBTN=no
+    fi
+
+    if test "$wxUSE_TOGGLEBTN" = "yes"; then
+        AC_DEFINE(wxUSE_TOGGLEBTN)
+    fi
 fi

 if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
@@ -4177,12 +4256,12 @@ if test -d include; then
    if test -d include/wx; then
        if test -d include/wx/${TOOLKIT_DIR}; then
            if test -f include/wx/${TOOLKIT_DIR}/setup.h; then
-                mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h 
+                mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h
            fi
        fi
    fi
 fi
-            
+
 AC_CONFIG_HEADER(setup.h:setup.h.in)

 dnl some more GUI only things
@@ -4194,6 +4273,10 @@ if test "$wxUSE_GUI" = "yes"; then
    wx_cv_program_ext=$PROGRAM_EXT
    wx_cv_target_library=$WX_TARGET_LIBRARY
    wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
+    dnl we need to export them because passing them through cache won't
+    dnl work when cache=/dev/null (which is default for autoconf 2.50)
+    export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
+           wx_cv_target_library wx_cv_target_libtype
    AC_CONFIG_SUBDIRS(demos samples utils contrib)
 fi
 dnl from wxUSE_GUI
@@ -4209,13 +4292,18 @@ AC_OUTPUT([
            Makefile
          ],
          [
-            chmod +x wx-config
-            mv wx-config wx${TOOLKIT_NAME}-config
-            ${LN_S} wx${TOOLKIT_NAME}-config wx-config
-            
+            dnl don't move the file on itself - this happens when we run
+            dnl config.status which, as configure, executes these commands
+            dnl but, unlike it, doesn't create wx-config
+            if test ! -L wx-config; then
+                chmod +x wx-config
+                mv wx-config wx${TOOLKIT_NAME}-config
+                ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+            fi
+
            dnl the debian build process wants setup.h in the lib subdir so we
            dnl can pretend wxWin is already installed, so we *copy* it there
-         
+
            if test ! -d lib; then
              mkdir lib
            fi
@@ -4249,7 +4337,7 @@ AC_OUTPUT([
            if test -f setup.h; then
                cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h
            fi
-            
+
          ],
          [
            TOOLKIT_DIR="${TOOLKIT_DIR}"
@@ -4258,3 +4346,4 @@ AC_OUTPUT([
          ]
         )

+dnl vi: set et ts=4 sw=4 list:
--- a/contrib/configure
+++ b/contrib/configure
@@ -817,7 +817,7 @@ trap 'rm -fr `echo "
            src/ogl/Makefile
            src/mmedia/Makefile
            src/stc/Makefile
-            src/xml/Makefile
+            src/xrc/Makefile
            src/canvas/Makefile
            src/gizmos/Makefile
            src/plot/Makefile
@@ -834,7 +834,8 @@ trap 'rm -fr `echo "
            samples/gizmos/Makefile
            samples/gizmos/multicell/Makefile
            samples/gizmos/splittree/Makefile
-            samples/xml/Makefile
+            samples/gizmos/editlbox/Makefile
+            samples/xrc/Makefile
            samples/plot/Makefile
            samples/applet/Makefile
            utils/Makefile
@@ -924,7 +925,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
            src/ogl/Makefile
            src/mmedia/Makefile
            src/stc/Makefile
-            src/xml/Makefile
+            src/xrc/Makefile
            src/canvas/Makefile
            src/gizmos/Makefile
            src/plot/Makefile
@@ -941,7 +942,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
            samples/gizmos/Makefile
            samples/gizmos/multicell/Makefile
            samples/gizmos/splittree/Makefile
-            samples/xml/Makefile
+            samples/gizmos/editlbox/Makefile
+            samples/xrc/Makefile
            samples/plot/Makefile
            samples/applet/Makefile
            utils/Makefile
--- a/contrib/configure.in
+++ b/contrib/configure.in
@@ -42,7 +42,7 @@ AC_OUTPUT([
            src/ogl/Makefile
            src/mmedia/Makefile
            src/stc/Makefile
-            src/xml/Makefile
+            src/xrc/Makefile
            src/canvas/Makefile
            src/gizmos/Makefile
            src/plot/Makefile
@@ -59,7 +59,8 @@ AC_OUTPUT([
            samples/gizmos/Makefile
            samples/gizmos/multicell/Makefile
            samples/gizmos/splittree/Makefile
-            samples/xml/Makefile
+            samples/gizmos/editlbox/Makefile
+            samples/xrc/Makefile
            samples/plot/Makefile
            samples/applet/Makefile
            utils/Makefile
--- a/contrib/include/wx/applet/applet.h
+++ b/contrib/include/wx/applet/applet.h
@@ -5,23 +5,19 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
-*  ======================================================================
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  |                                                                    |
-*  |This copyrighted computer code is a proprietary trade secret of     |
-*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*  |written authorization from SciTech to possess or use this code, you |
-*  |may be subject to civil and/or criminal penalties.                  |
-*  |                                                                    |
-*  |If you received this code in error or you would like to report      |
-*  |improper use, please immediately contact SciTech Software, Inc. at  |
-*  |530-894-8400.                                                       |
-*  |                                                                    |
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  ======================================================================
+*  ========================================================================
+*
+*    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
@@ -34,7 +30,10 @@
 #define __WX_APPLET_H

 #include "wx/panel.h"
-#include "wx/applet/window.h"
+#include "wx/html/htmlwin.h"
+
+// Forward declaration
+class wxHtmlAppletWindow;

 /*--------------------------- Class Definitions ---------------------------*/

@@ -46,38 +45,41 @@ class wxApplet : public wxPanel {
 private:
    DECLARE_ABSTRACT_CLASS(wxApplet);
    DECLARE_EVENT_TABLE();
-    
-protected:
-    wxHtmlAppletWindow  *m_Parent;

-            // Special handler for background erase messages            
+protected:
+    //wxHtmlAppletWindow  *m_parent;
+
+            // Special handler for background erase messages
            void OnEraseBackground(wxEraseEvent&);
-        
+
 public:
            // Constructor (called during dynamic creation)
-            wxApplet() { m_Parent = NULL; }
-    
+            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; 
-            
+    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

--- a/contrib/include/wx/applet/echovar.h
+++ b/contrib/include/wx/applet/echovar.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+*
+*                       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
+
--- a/contrib/include/wx/applet/ifelsevar.h
+++ b/contrib/include/wx/applet/ifelsevar.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+*
+*                       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
+
--- a/contrib/include/wx/applet/loadpage.h
+++ b/contrib/include/wx/applet/loadpage.h
@@ -0,0 +1,109 @@
+/****************************************************************************
+*
+*                       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
--- a/contrib/include/wx/applet/prepecho.h
+++ b/contrib/include/wx/applet/prepecho.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+*
+*                       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
+
--- a/contrib/include/wx/applet/prepifelse.h
+++ b/contrib/include/wx/applet/prepifelse.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+*
+*                       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
+
--- a/contrib/include/wx/applet/prepinclude.h
+++ b/contrib/include/wx/applet/prepinclude.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+*
+*                       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
+
--- a/contrib/include/wx/applet/window.h
+++ b/contrib/include/wx/applet/window.h
@@ -5,23 +5,19 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
-*  ======================================================================
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  |                                                                    |
-*  |This copyrighted computer code is a proprietary trade secret of     |
-*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*  |written authorization from SciTech to possess or use this code, you |
-*  |may be subject to civil and/or criminal penalties.                  |
-*  |                                                                    |
-*  |If you received this code in error or you would like to report      |
-*  |improper use, please immediately contact SciTech Software, Inc. at  |
-*  |530-894-8400.                                                       |
-*  |                                                                    |
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  ======================================================================
+*  ========================================================================
+*
+*    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
@@ -35,18 +31,46 @@

 #include "wx/html/htmlwin.h"

-/*--------------------------- Class Definitions ---------------------------*/
+// Forward declare
+class wxApplet;
+class wxLoadPageEvent;
+class wxPageLoadedEvent;
+class wxIncludePrep;

 // Declare a linked list of wxApplet pointers
-class wxApplet;
 WX_DECLARE_LIST(wxApplet, wxAppletList);

-/****************************************************************************
-MEMBERS:
-appletModules   - List of register applet modules   
-appletList      - List of all active applets instances
-cookies         - Hash table for managing cookies       
+/*--------------------------- 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
@@ -56,59 +80,86 @@ 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;       
-    wxHashTable     m_Cookies;
-        
+	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& className,          
+                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);            
-            
+            wxApplet *FindApplet(const wxString& className);
+
            // Remove an applet from the window. Called during applet destruction
-            bool RemoveApplet(const wxApplet *applet);          
+            bool RemoveApplet(const wxApplet *applet);

            // Load a new URL page
-            bool LoadPage(const wxString& hRef);
-            
+    virtual bool LoadPage(const wxString& location);
+
            // Called when users clicked on hypertext link.
-            void OnLinkClicked(const wxHtmlLinkInfo& 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

--- a/contrib/include/wx/plot/plot.h
+++ b/contrib/include/wx/plot/plot.h
@@ -35,7 +35,7 @@ class WXDLLEXPORT wxPlotYAxisArea;
 class WXDLLEXPORT wxPlotWindow;

 //-----------------------------------------------------------------------------
-// classes
+// consts
 //-----------------------------------------------------------------------------

 extern const int wxEVT_PLOT_SEL_CHANGING;
@@ -60,9 +60,6 @@ extern const int wxEVT_PLOT_BEGIN_TITLE_EDIT;
 extern const int wxEVT_PLOT_END_TITLE_EDIT;
 extern const int wxEVT_PLOT_AREA_CREATE;

-//-----------------------------------------------------------------------------
-// consts
-//-----------------------------------------------------------------------------

 #define wxPLOT_X_AXIS          0x0004
 #define wxPLOT_Y_AXIS          0x0008
@@ -377,6 +374,8 @@ private:

 typedef void (wxEvtHandler::*wxPlotEventFunction)(wxPlotEvent&);

+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+
 #define EVT_PLOT(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
 #define EVT_PLOT_SEL_CHANGING(id, fn) { wxEVT_PLOT_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
 #define EVT_PLOT_SEL_CHANGED(id, fn) { wxEVT_PLOT_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
@@ -399,5 +398,31 @@ typedef void (wxEvtHandler::*wxPlotEventFunction)(wxPlotEvent&);
 #define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) { wxEVT_PLOT_BEGIN_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
 #define EVT_PLOT_END_TITLE_EDIT(id, fn) { wxEVT_PLOT_END_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },

+#else
+
+#define EVT_PLOT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_CLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_DOUBLECLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_ZOOM_IN(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_ZOOM_IN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_ZOOM_OUT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_ZOOM_OUT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_VALUE_SEL_CREATING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_VALUE_SEL_CREATED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_VALUE_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_VALUE_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_AREA_SEL_CREATING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_AREA_SEL_CREATED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_AREA_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_AREA_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_BEGIN_X_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_END_X_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_BEGIN_Y_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_END_Y_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PLOT_END_TITLE_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL ),
+
+#endif
+
 #endif
   // _WX_PLOT_H_
--- a/contrib/include/wx/xml/xh_all.h
+++ b/contrib/include/wx/xml/xh_all.h
@@ -1,49 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_all.h
-// Purpose:     includes all xh_*.h files
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_ALL_H_
-#define _WX_XH_ALL_H_
-
-
-// Existing handlers:
-
-#include "wx/xml/xh_menu.h"
-#include "wx/xml/xh_panel.h"
-#include "wx/xml/xh_dlg.h"
-#include "wx/xml/xh_bttn.h"
-#include "wx/xml/xh_chckb.h"
-#include "wx/xml/xh_gauge.h"
-#include "wx/xml/xh_html.h"
-#include "wx/xml/xh_spin.h"
-#include "wx/xml/xh_sttxt.h"
-#include "wx/xml/xh_slidr.h"
-#include "wx/xml/xh_radbt.h"
-#include "wx/xml/xh_radbx.h"
-#include "wx/xml/xh_combo.h"
-#include "wx/xml/xh_chckl.h"
-#include "wx/xml/xh_choic.h"
-#include "wx/xml/xh_sizer.h"
-#include "wx/xml/xh_stbmp.h"
-#include "wx/xml/xh_notbk.h"
-#include "wx/xml/xh_text.h"
-#include "wx/xml/xh_listb.h"
-#include "wx/xml/xh_toolb.h"
-#include "wx/xml/xh_bmpbt.h"
-#include "wx/xml/xh_stbox.h"
-#include "wx/xml/xh_scrol.h"
-#include "wx/xml/xh_tree.h"
-#include "wx/xml/xh_cald.h"
-#include "wx/xml/xh_listc.h"
-#include "wx/xml/xh_stlin.h"
-#include "wx/xml/xh_bmp.h"
-#include "wx/xml/xh_unkwn.h"
-#include "wx/xml/xh_frame.h"
-
-#endif // _WX_XMLRES_H_
--- a/contrib/include/wx/xrc/xh_all.h
+++ b/contrib/include/wx/xrc/xh_all.h
@@ -0,0 +1,49 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
--- a/contrib/include/wx/xrc/xh_bmp.h
+++ b/contrib/include/wx/xrc/xh_bmp.h
@@ -15,10 +15,10 @@
 #pragma interface "xh_bmp.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"


-class WXDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxBitmapXmlHandler();
@@ -26,7 +26,7 @@ public:
    virtual bool CanHandle(wxXmlNode *node);
 };

-class WXDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxIconXmlHandler();
--- a/contrib/include/wx/xrc/xh_bmpbt.h
+++ b/contrib/include/wx/xrc/xh_bmpbt.h
@@ -15,10 +15,10 @@
 #pragma interface "xh_bmpbt.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"


-class WXDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxBitmapButtonXmlHandler();
--- a/contrib/include/wx/xrc/xh_bttn.h
+++ b/contrib/include/wx/xrc/xh_bttn.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_bttn.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxButtonXmlHandler();
--- a/contrib/include/wx/xrc/xh_cald.h
+++ b/contrib/include/wx/xrc/xh_cald.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_cald.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxCalendarCtrlXmlHandler();
--- a/contrib/include/wx/xrc/xh_chckb.h
+++ b/contrib/include/wx/xrc/xh_chckb.h
@@ -15,12 +15,12 @@
 #pragma interface "xh_chckb.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"
 #include "wx/defs.h"

 #if wxUSE_CHECKBOX

-class WXDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxCheckBoxXmlHandler();
--- a/contrib/include/wx/xrc/xh_chckl.h
+++ b/contrib/include/wx/xrc/xh_chckl.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_chckl.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxCheckListXmlHandler();
--- a/contrib/include/wx/xrc/xh_choic.h
+++ b/contrib/include/wx/xrc/xh_choic.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_choic.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxChoiceXmlHandler();
--- a/contrib/include/wx/xrc/xh_combo.h
+++ b/contrib/include/wx/xrc/xh_combo.h
@@ -15,11 +15,11 @@
 #pragma interface "xh_combo.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

 #if wxUSE_COMBOBOX

-class WXDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxComboBoxXmlHandler();
--- a/contrib/include/wx/xrc/xh_dlg.h
+++ b/contrib/include/wx/xrc/xh_dlg.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_dlg.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxDialogXmlHandler();
--- a/contrib/include/wx/xrc/xh_frame.h
+++ b/contrib/include/wx/xrc/xh_frame.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_frame.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxFrameXmlHandler();
--- a/contrib/include/wx/xrc/xh_gauge.h
+++ b/contrib/include/wx/xrc/xh_gauge.h
@@ -19,12 +19,12 @@

 #if wxUSE_GAUGE

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"


-class WXDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
 {
-    enum 
+    enum
    {
        wxGAUGE_DEFAULT_RANGE = 100
    };
--- a/contrib/include/wx/xrc/xh_html.h
+++ b/contrib/include/wx/xrc/xh_html.h
@@ -15,13 +15,13 @@
 #pragma interface "xh_html.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

 #include "wx/defs.h"

 #if wxUSE_HTML

-class WXDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxHtmlWindowXmlHandler();
--- a/contrib/include/wx/xrc/xh_listb.h
+++ b/contrib/include/wx/xrc/xh_listb.h
@@ -15,11 +15,11 @@
 #pragma interface "xh_listb.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

 #if wxUSE_LISTBOX

-class WXDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxListBoxXmlHandler();
--- a/contrib/include/wx/xrc/xh_listc.h
+++ b/contrib/include/wx/xrc/xh_listc.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_listc.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxListCtrlXmlHandler();
--- a/contrib/include/wx/xrc/xh_menu.h
+++ b/contrib/include/wx/xrc/xh_menu.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_menu.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxMenuXmlHandler();
@@ -28,7 +28,7 @@ private:
    bool m_insideMenu;
 };

-class WXDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
    public:
        wxMenuBarXmlHandler();
--- a/contrib/include/wx/xrc/xh_notbk.h
+++ b/contrib/include/wx/xrc/xh_notbk.h
@@ -14,13 +14,13 @@
 #pragma interface "xh_notbk.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

 #if wxUSE_NOTEBOOK

 class WXDLLEXPORT wxNotebook;

-class WXDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxNotebookXmlHandler();
--- a/contrib/include/wx/xrc/xh_panel.h
+++ b/contrib/include/wx/xrc/xh_panel.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_panel.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxPanelXmlHandler();
--- a/contrib/include/wx/xrc/xh_radbt.h
+++ b/contrib/include/wx/xrc/xh_radbt.h
@@ -15,12 +15,12 @@
 #pragma interface "xh_radbt.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"
 #include "wx/defs.h"

 #if wxUSE_RADIOBOX

-class WXDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxRadioButtonXmlHandler();
--- a/contrib/include/wx/xrc/xh_radbx.h
+++ b/contrib/include/wx/xrc/xh_radbx.h
@@ -15,11 +15,11 @@
 #pragma interface "xh_radbx.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

 #if wxUSE_RADIOBOX

-class WXDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxRadioBoxXmlHandler();
--- a/contrib/include/wx/xrc/xh_scrol.h
+++ b/contrib/include/wx/xrc/xh_scrol.h
@@ -15,14 +15,14 @@
 #pragma interface "xh_scrol.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"
 #include "wx/defs.h"



-class WXDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
 {
-    enum 
+    enum
    {
        wxSL_DEFAULT_VALUE = 0,
        wxSL_DEFAULT_MIN = 0,
--- a/contrib/include/wx/xrc/xh_sizer.h
+++ b/contrib/include/wx/xrc/xh_sizer.h
@@ -15,12 +15,12 @@
 #pragma interface "xh_sizer.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"


 class WXDLLEXPORT wxSizer;

-class WXDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxSizerXmlHandler();
@@ -30,7 +30,7 @@ public:
 private:
    bool m_isInside;
    wxSizer *m_parentSizer;
-        
+
    bool IsSizerNode(wxXmlNode *node);
 };

--- a/contrib/include/wx/xrc/xh_slidr.h
+++ b/contrib/include/wx/xrc/xh_slidr.h
@@ -15,14 +15,14 @@
 #pragma interface "xh_slidr.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"
 #include "wx/defs.h"

 #if wxUSE_SLIDER

-class WXDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
 {
-    enum 
+    enum
    {
        wxSL_DEFAULT_VALUE = 0,
        wxSL_DEFAULT_MIN = 0,
--- a/contrib/include/wx/xrc/xh_spin.h
+++ b/contrib/include/wx/xrc/xh_spin.h
@@ -15,13 +15,13 @@
 #pragma interface "xh_spin.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"
 #include "wx/defs.h"

 #if wxUSE_SPINBTN
-class WXDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
 {
-    enum 
+    enum
    {
        wxSP_DEFAULT_VALUE = 0,
        wxSP_DEFAULT_MIN = 0,
@@ -36,9 +36,9 @@ public:
 #endif

 #if wxUSE_SPINCTRL
-class WXDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
 {
-    enum 
+    enum
    {
        wxSP_DEFAULT_VALUE = 0,
        wxSP_DEFAULT_MIN = 0,
--- a/contrib/include/wx/xrc/xh_stbmp.h
+++ b/contrib/include/wx/xrc/xh_stbmp.h
@@ -15,10 +15,10 @@
 #pragma interface "xh_stbmp.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"


-class WXDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxStaticBitmapXmlHandler();
--- a/contrib/include/wx/xrc/xh_stbox.h
+++ b/contrib/include/wx/xrc/xh_stbox.h
@@ -15,10 +15,10 @@
 #pragma interface "xh_stbox.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"


-class WXDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxStaticBoxXmlHandler();
--- a/contrib/include/wx/xrc/xh_stlin.h
+++ b/contrib/include/wx/xrc/xh_stlin.h
@@ -15,11 +15,11 @@
 #pragma interface "xh_stlin.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

 #if wxUSE_STATLINE

-class WXDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxStaticLineXmlHandler();
--- a/contrib/include/wx/xrc/xh_sttxt.h
+++ b/contrib/include/wx/xrc/xh_sttxt.h
@@ -15,10 +15,10 @@
 #pragma interface "xh_sttxt.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"


-class WXDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxStaticTextXmlHandler();
--- a/contrib/include/wx/xrc/xh_text.h
+++ b/contrib/include/wx/xrc/xh_text.h
@@ -15,10 +15,10 @@
 #pragma interface "xh_text.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"


-class WXDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxTextCtrlXmlHandler();
--- a/contrib/include/wx/xrc/xh_toolb.h
+++ b/contrib/include/wx/xrc/xh_toolb.h
@@ -15,19 +15,19 @@
 #pragma interface "xh_toolb.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

 #if wxUSE_TOOLBAR

 class WXDLLEXPORT wxToolBar;

-class WXDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxToolBarXmlHandler();
    virtual wxObject *DoCreateResource();
    virtual bool CanHandle(wxXmlNode *node);
-        
+
 private:
    bool m_isInside;
    wxToolBar *m_toolbar;
--- a/contrib/include/wx/xrc/xh_tree.h
+++ b/contrib/include/wx/xrc/xh_tree.h
@@ -15,9 +15,9 @@
 #pragma interface "xh_tree.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"

-class WXDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxTreeCtrlXmlHandler();
--- a/contrib/include/wx/xrc/xh_unkwn.h
+++ b/contrib/include/wx/xrc/xh_unkwn.h
@@ -15,10 +15,10 @@
 #pragma interface "xh_unkwn.h"
 #endif

-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"


-class WXDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
 {
 public:
    wxUnknownWidgetXmlHandler();
--- a/contrib/include/wx/xrc/xml.h
+++ b/contrib/include/wx/xrc/xml.h
@@ -20,11 +20,16 @@
 #include "wx/object.h"
 #include "wx/list.h"

+#ifdef WXXMLISDLL
+#define WXXMLDLLEXPORT WXDLLEXPORT
+#else
+#define WXXMLDLLEXPORT
+#endif

-class WXDLLEXPORT wxXmlNode;
-class WXDLLEXPORT wxXmlProperty;
-class WXDLLEXPORT wxXmlDocument;
-class WXDLLEXPORT wxXmlIOHandler;
+class WXXMLDLLEXPORT wxXmlNode;
+class WXXMLDLLEXPORT wxXmlProperty;
+class WXXMLDLLEXPORT wxXmlDocument;
+class WXXMLDLLEXPORT wxXmlIOHandler;
 class WXDLLEXPORT wxInputStream;
 class WXDLLEXPORT wxOutputStream;

@@ -65,11 +70,11 @@ enum wxXmlIOType
 // Example: in <img src="hello.gif" id="3"/> "src" is property with value
 //          "hello.gif" and "id" is prop. with value "3".

-class WXDLLEXPORT wxXmlProperty
+class WXXMLDLLEXPORT wxXmlProperty
 {
 public:
    wxXmlProperty() : m_next(NULL) {}
-    wxXmlProperty(const wxString& name, const wxString& value, 
+    wxXmlProperty(const wxString& name, const wxString& value,
                  wxXmlProperty *next)
            : m_name(name), m_value(value), m_next(next) {}
    ~wxXmlProperty() { delete m_next; }
@@ -97,18 +102,18 @@ private:
 // 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 
+// 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 WXDLLEXPORT wxXmlNode
+class WXXMLDLLEXPORT wxXmlNode
 {
 public:
-    wxXmlNode() : m_properties(NULL), m_parent(NULL), 
+    wxXmlNode() : m_properties(NULL), m_parent(NULL),
                  m_children(NULL), m_next(NULL) {}
-    wxXmlNode(wxXmlNode *parent,wxXmlNodeType type, 
+    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; }
@@ -121,7 +126,7 @@ public:
    wxXmlNode& operator=(const wxXmlNode& node);

    // user-friendly creation:
-    wxXmlNode(wxXmlNodeType type, const wxString& name, 
+    wxXmlNode(wxXmlNodeType type, const wxString& name,
              const wxString& content = wxEmptyString);
    void AddChild(wxXmlNode *child);
    void InsertChild(wxXmlNode *child, wxXmlNode *before_node);
@@ -140,7 +145,7 @@ public:

    wxXmlProperty *GetProperties() const { return m_properties; }
    bool GetPropVal(const wxString& propName, wxString *value) const;
-    wxString GetPropVal(const wxString& propName, 
+    wxString GetPropVal(const wxString& propName,
                        const wxString& defaultVal) const;
    bool HasProp(const wxString& propName) const;

@@ -171,17 +176,17 @@ private:



-// This class holds XML data/document as parsed by libxml. Note that 
-// internal representation is independant on libxml and you can use 
+// This class holds XML data/document as parsed by libxml. Note that
+// internal representation is independant on libxml and you can use
 // it without libxml (see Load/SaveBinary).

-class WXDLLEXPORT wxXmlDocument : public wxObject
+class WXXMLDLLEXPORT wxXmlDocument : public wxObject
 {
 public:
    wxXmlDocument() : wxObject(), m_version(wxT("1.0")), m_root(NULL)  {}
-    wxXmlDocument(const wxString& filename, 
+    wxXmlDocument(const wxString& filename,
                  wxXmlIOType io_type = wxXML_IO_AUTO);
-    wxXmlDocument(wxInputStream& stream, 
+    wxXmlDocument(wxInputStream& stream,
                  wxXmlIOType io_type = wxXML_IO_AUTO);
    ~wxXmlDocument() { delete m_root; }

@@ -189,16 +194,16 @@ public:
    wxXmlDocument& operator=(const wxXmlDocument& doc);

    // Parses .xml file and loads data. Returns TRUE on success, FALSE
-    // otherwise. 
+    // 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, 
+    bool Save(const wxString& filename,
              wxXmlIOType io_type = wxXML_IO_TEXT_OUTPUT) const;
-    bool Save(wxOutputStream& stream, 
+    bool Save(wxOutputStream& stream,
              wxXmlIOType io_type = wxXML_IO_TEXT_OUTPUT) const;

    bool IsOk() const { return m_root != NULL; }
@@ -211,7 +216,7 @@ public:
    // 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 
+    // stored in wchar_t (in Unicode build) or UTF-8 encoded
    // (if wxUSE_UNICODE is 0).
    wxString GetEncoding() const { return m_encoding; }

@@ -239,21 +244,21 @@ private:
 // wxXmlIOHandler takes care of loading and/or saving XML data.
 // see xmlio.h for available handlers

-class WXDLLEXPORT wxXmlIOHandler : public wxObject
+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_
--- a/contrib/include/wx/xrc/xmlio.h
+++ b/contrib/include/wx/xrc/xmlio.h
@@ -17,10 +17,10 @@

 #include "wx/defs.h"
 #include "wx/string.h"
-#include "wx/xml/xml.h"
+#include "wx/xrc/xml.h"


-class WXDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
+class WXXMLDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
 {
 public:
    virtual wxXmlIOType GetType() { return wxXML_IO_EXPAT; }
@@ -28,23 +28,25 @@ public:
    virtual bool CanSave() { return FALSE; }

    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc) { return FALSE; }
+    virtual bool Save(wxOutputStream& WXUNUSED(stream), const wxXmlDocument& WXUNUSED(doc))
+        { return FALSE; }
 };


-class WXDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
+class WXXMLDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
 {
 public:
    virtual wxXmlIOType GetType() { return wxXML_IO_TEXT_OUTPUT; }
-    virtual bool CanLoad(wxInputStream& stream) { return FALSE; }
+    virtual bool CanLoad(wxInputStream& WXUNUSED(stream)) { return FALSE; }
    virtual bool CanSave() { return TRUE; }

-    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc) { return FALSE; }
+    virtual bool Load(wxInputStream& WXUNUSED(stream), wxXmlDocument& WXUNUSED(doc)) 
+        { return FALSE; }
    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
 };


-class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
+class WXXMLDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
 {
 public:
    wxXmlIOHandlerBin() {}
@@ -56,7 +58,7 @@ public:
    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);

-protected: 
+protected:
    wxString ReadHeader(wxInputStream& stream);
    void WriteHeader(wxOutputStream& stream, const wxString& header);
 };
@@ -65,7 +67,7 @@ protected:

 #if wxUSE_ZLIB

-class WXDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
+class WXXMLDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
 {
 public:
    wxXmlIOHandlerBinZ() {}
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -25,6 +25,8 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"

+#include "wx/xrc/xml.h"
+
 class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxDialog;
@@ -33,9 +35,8 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;

-class WXDLLEXPORT wxXmlResourceHandler;
+class WXXMLDLLEXPORT wxXmlResourceHandler;

-#include "wx/xml/xml.h"

 // These macros indicate current version of XML resources (this information is
 // encoded in root node of XRC file as "version" property).
@@ -61,7 +62,7 @@ class WXDLLEXPORT wxXmlResourceHandler;
                 WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
                 WX_XMLRES_CURRENT_VERSION_REVISION)

-class WXDLLEXPORT wxXmlResourceDataRecord
+class WXXMLDLLEXPORT wxXmlResourceDataRecord
 {
 public:
    wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
@@ -72,13 +73,19 @@ public:
    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 
+
+// This class holds XML resources from one or more .xml files
 // (or derived forms, either binary or zipped -- see manual for
-// details). 
+// details).

-class WXDLLEXPORT wxXmlResource : public wxObject
+class WXXMLDLLEXPORT wxXmlResource : public wxObject
 {
 public:
    // Ctor. If use_locale is TRUE, translatable strings are
@@ -100,7 +107,7 @@ public:
    // 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 
+    // (xmlres) can create include file that contains initialization code for
    // all controls used within the resource.
    void AddHandler(wxXmlResourceHandler *handler);

@@ -138,7 +145,7 @@ public:
    // 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,
@@ -148,14 +155,14 @@ public:
    // 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() - 
+        { return GetVersion() -
                 (major*256*256*256 + minor*256*256 + release*256 + revision); }

 protected:
@@ -177,7 +184,7 @@ protected:

 private:
    long m_version;
-    
+
    bool m_useLocale;
    wxList m_handlers;
    wxXmlResourceDataRecords m_data;
@@ -191,7 +198,7 @@ private:


 // Global instance of resource class. For your convenience.
-extern wxXmlResource *wxTheXmlResource;
+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
@@ -202,7 +209,7 @@ extern wxXmlResource *wxTheXmlResource;
 //       EVT_MENU(XMLID("about"), MyFrame::OnAbout)
 //       EVT_MENU(XMLID("new"), MyFrame::OnNew)
 //       EVT_MENU(XMLID("open"), MyFrame::OnOpen)
-//    END_EVENT_TABLE()    
+//    END_EVENT_TABLE()

 #define XMLID(str_id) \
    wxXmlResource::GetXMLID(wxT(str_id))
@@ -216,12 +223,16 @@ extern wxXmlResource *wxTheXmlResource;
 //    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 WXDLLEXPORT wxXmlResourceHandler : public wxObject
+class WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject
 {
 public:
    wxXmlResourceHandler();
@@ -233,7 +244,7 @@ public:
    // 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 *CreateResource(wxXmlNode *node, wxObject *parent,
                             wxObject *instance);

    // This one is called from CreateResource after variables
@@ -269,12 +280,12 @@ protected:
    // 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_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);      
+    bool HasParam(const wxString& param);

    // Finds the node or returns NULL
    wxXmlNode *GetParamNode(const wxString& param);
@@ -331,7 +342,7 @@ protected:

    void CreateChildren(wxObject *parent, bool this_hnd_only = FALSE);
    void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL);
-    wxObject *CreateResFromNode(wxXmlNode *node, 
+    wxObject *CreateResFromNode(wxXmlNode *node,
                                wxObject *parent, wxObject *instance = NULL)
        { return m_resource->CreateResFromNode(node, parent, instance); }

@@ -342,5 +353,6 @@ protected:
 #define ADD_STYLE(style) AddStyle(wxT(#style), style)


+void wxXmlInitResourceModule();

 #endif // _WX_XMLRES_H_
--- a/contrib/samples/Makefile.in
+++ b/contrib/samples/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$

-CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xml plot applet
+CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet

 all:
 	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
--- a/contrib/samples/applet/applet.cpp
+++ b/contrib/samples/applet/applet.cpp
@@ -2,22 +2,21 @@
 *
 *                       wxWindows HTML Applet Package
 *
+*               Copyright (C) 1991-2001 SciTech Software, Inc.
+*                            All rights reserved.
+*
 *  ========================================================================
 *
-*    The contents of this file are subject to the wxWindows licence; 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/licence.htm
+*    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.
 *
-*    The Original Code is Copyright (C) 2001 SciTech Software, Inc.
-*
-*    The Initial Developer of the Original Code is SciTech Software, Inc.
-*    All Rights Reserved.
-*
 *  ========================================================================
 *
 * Language:     ANSI C++
@@ -77,17 +76,17 @@ MyFrame::MyFrame(
    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   
+    // Create the HTML window
    html = new wxHtmlAppletWindow(this);
    html->SetRelatedFrame(this, "wxApplet Demo: '%s'");
    html->SetRelatedStatusBar(1);
--- a/contrib/samples/applet/applet.h
+++ b/contrib/samples/applet/applet.h
@@ -2,22 +2,21 @@
 *
 *                       wxWindows HTML Applet Package
 *
+*               Copyright (C) 1991-2001 SciTech Software, Inc.
+*                            All rights reserved.
+*
 *  ========================================================================
 *
-*    The contents of this file are subject to the wxWindows licence; 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/licence.htm
+*    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.
 *
-*    The Original Code is Copyright (C) 2001 SciTech Software, Inc.
-*
-*    The Initial Developer of the Original Code is SciTech Software, Inc.
-*    All Rights Reserved.
-*
 *  ========================================================================
 *
 * Language:     ANSI C++
@@ -37,7 +36,7 @@ enum {
    Minimal_About,
    Minimal_Back,
    Minimal_Forward,
-    
+
    // Controls start here (the numbers are, of course, arbitrary)
    Minimal_Text = 1000,
    };
--- a/contrib/samples/applet/combobox.cpp
+++ b/contrib/samples/applet/combobox.cpp
@@ -2,22 +2,21 @@
 *
 *                       wxWindows HTML Applet Package
 *
+*               Copyright (C) 1991-2001 SciTech Software, Inc.
+*                            All rights reserved.
+*
 *  ========================================================================
 *
-*    The contents of this file are subject to the wxWindows licence; 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/licence.htm
+*    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.
 *
-*    The Original Code is Copyright (C) 2001 SciTech Software, Inc.
-*
-*    The Initial Developer of the Original Code is SciTech Software, Inc.
-*    All Rights Reserved.
-*
 *  ========================================================================
 *
 * Language:     ANSI C++
@@ -77,7 +76,7 @@ void ComboBox::Select(int n)
    m_ListBox->Select(n);
    m_TextCtrl->SetValue(GetStringSelection());
 }
-    
+
 void ComboBox::Deselect(int n)
 {
    m_ListBox->Deselect(n);
@@ -86,7 +85,7 @@ void ComboBox::Deselect(int n)
 void ComboBox::Insert(const wxString& item, int pos)
 {
    m_ListBox->Insert(item,pos);
-}   
+}

 void ComboBox::Insert(const wxString& item, int pos, void *clientData)
 {
@@ -130,13 +129,13 @@ 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);
@@ -155,12 +154,12 @@ void ComboBox::Append(const wxString& item, wxClientData *clientData)
    m_TextCtrl->SetValue(GetStringSelection());
 }

-void ComboBox::Clear()  
+void ComboBox::Clear()
 {
    m_ListBox->Clear();
    m_TextCtrl->SetValue(GetStringSelection());
 }
-        
+
 void ComboBox::Delete(int n)
 {
    m_ListBox->Delete(n);
--- a/contrib/samples/applet/combobox.h
+++ b/contrib/samples/applet/combobox.h
@@ -2,22 +2,21 @@
 *
 *                       wxWindows HTML Applet Package
 *
+*               Copyright (C) 1991-2001 SciTech Software, Inc.
+*                            All rights reserved.
+*
 *  ========================================================================
 *
-*    The contents of this file are subject to the wxWindows licence; 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/licence.htm
+*    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.
 *
-*    The Original Code is Copyright (C) 2001 SciTech Software, Inc.
-*
-*    The Initial Developer of the Original Code is SciTech Software, Inc.
-*    All Rights Reserved.
-*
 *  ========================================================================
 *
 * Language:     ANSI C++
@@ -52,45 +51,45 @@ private:
 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();         
+            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 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.                    
+            // msw combobox behavior: Click on listbox item it shows in textbox.
            void OnChange(wxCommandEvent &event);
    };

--- a/contrib/samples/applet/monitorapplet.cpp
+++ b/contrib/samples/applet/monitorapplet.cpp
@@ -5,23 +5,19 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
-*  ======================================================================
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  |                                                                    |
-*  |This copyrighted computer code is a proprietary trade secret of     |
-*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*  |written authorization from SciTech to possess or use this code, you |
-*  |may be subject to civil and/or criminal penalties.                  |
-*  |                                                                    |
-*  |If you received this code in error or you would like to report      |
-*  |improper use, please immediately contact SciTech Software, Inc. at  |
-*  |530-894-8400.                                                       |
-*  |                                                                    |
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  ======================================================================
+*  ========================================================================
+*
+*    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
@@ -41,7 +37,7 @@

 // 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)
@@ -51,8 +47,8 @@ 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"   
-    
+#include "monitors.c"
+
 /*------------------------- Implementation --------------------------------*/

 /****************************************************************************
@@ -62,7 +58,7 @@ 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;
@@ -85,7 +81,7 @@ bool MonitorApplet::Create(
            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)
@@ -97,7 +93,7 @@ bool MonitorApplet::Create(
        }
    return ret;
 }
-                
+
 /****************************************************************************
 REMARKS:
 Destructor for the MonitorApplet class.
@@ -124,11 +120,11 @@ REMARKS:
 Handles user navigation away from the applet via an HTML link
 ****************************************************************************/
 void MonitorApplet::OnLinkClicked(
-    const wxHtmlLinkInfo&)  
+    const wxHtmlLinkInfo&)
 {
    SaveCurrentState();
 }
-            
+
 /****************************************************************************
 REMARKS:
 Handles user navigation away from the applet via the history forward command
@@ -137,7 +133,7 @@ void MonitorApplet::OnHistoryForward()
 {
    SaveCurrentState();
 }
-            
+
 /****************************************************************************
 REMARKS:
 Handles user navigation away from the applet via the history back command
@@ -146,12 +142,12 @@ void MonitorApplet::OnHistoryBack()
 {
    SaveCurrentState();
 }
-            
+
 /****************************************************************************
 REMARKS:
 Handles inter applet communication messages
 ****************************************************************************/
-void MonitorApplet::OnMessage(  
+void MonitorApplet::OnMessage(
    wxEvent& msg)
 {
    msg.Skip(true);
@@ -168,7 +164,7 @@ void MonitorApplet::OnChange(
        ReadModelList(true);
        }
    else if (evt.GetId() == m_Model->GetListBoxId()) {
-        m_Model->OnChange(evt);     
+        m_Model->OnChange(evt);
        }
 }

@@ -177,7 +173,7 @@ REMARKS:
 Updates the manufacturer list for the dialog box from the database.
 ****************************************************************************/
 void MonitorApplet::ReadMfrList()
-{               
+{
    char            buf[80] = "";
    int             i,selected = 0;
    MonitorEntry    *m;
@@ -202,11 +198,11 @@ 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++) {
--- a/contrib/samples/applet/monitorapplet.h
+++ b/contrib/samples/applet/monitorapplet.h
@@ -1,25 +1,23 @@
 /****************************************************************************
 *
+*                       wxWindows HTML Applet Package
+*
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
-*  ======================================================================
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  |                                                                    |
-*  |This copyrighted computer code is a proprietary trade secret of     |
-*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*  |written authorization from SciTech to possess or use this code, you |
-*  |may be subject to civil and/or criminal penalties.                  |
-*  |                                                                    |
-*  |If you received this code in error or you would like to report      |
-*  |improper use, please immediately contact SciTech Software, Inc. at  |
-*  |530-894-8400.                                                       |
-*  |                                                                    |
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  ======================================================================
+*  ========================================================================
+*
+*    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
@@ -56,9 +54,9 @@ public:
    MonitorEntry    m_Monitor;
    };

-// Name used to track the monitor data cookie   
-#define MONITOR_COOKIE_NAME "MonitorData"   
-    
+// Name used to track the monitor data cookie
+#define MONITOR_COOKIE_NAME "MonitorData"
+
 /****************************************************************************
 REMARKS:
 Defines our wxMonitor applet class
@@ -67,16 +65,16 @@ class MonitorApplet : public wxApplet {
 private:
    DECLARE_DYNAMIC_CLASS(MonitorApplet);
    DECLARE_EVENT_TABLE();
-    
+
 protected:
-    ComboBox            *m_Mfr;             
+    ComboBox            *m_Mfr;
    ComboBox            *m_Model;
-    MonitorData         *m_Data;    
+    MonitorData         *m_Data;
    static MonitorEntry m_Monitors[];
-    
+
            // Flush the current state to a cookie
            void SaveCurrentState();
-            
+
 public:
            // Constructor (called during dynamic creation)
            MonitorApplet();
@@ -86,19 +84,19 @@ public:
                wxHtmlAppletWindow *parent,
                const wxSize& size,
                long style);
-                
+
            // Virtual destructor
    virtual ~MonitorApplet();

            // Handle HTML navigation to a new URL
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link); 
-            
+    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);

@@ -106,9 +104,9 @@ public:
            void ReadMfrList();
            void ReadModelList(bool selectCurrent);

-            // Event handlers   
+            // Event handlers
            void OnChange(wxCommandEvent &event);
    };
-    
+
 #endif // __WX_MONITORAPPLET_H

--- a/contrib/samples/canvas/simple/SimpleVC.dsp
+++ b/contrib/samples/canvas/simple/SimpleVC.dsp
@@ -0,0 +1,175 @@
+# 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
--- a/contrib/samples/canvas/simple/SimpleVC.dsw
+++ b/contrib/samples/canvas/simple/SimpleVC.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00

 ###############################################################################

-Project: "XmlDemoVC"=.\XmlDemoVC.dsp - Package Owner=<4>
+Project: "SimpleVC"=.\SimpleVC.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/canvas/simple/makefile.b32
+++ b/contrib/samples/canvas/simple/makefile.b32
@@ -9,9 +9,9 @@

 WXDIR = $(WXWIN)

-TARGET=xmldemo
+TARGET=simple

-EXTRALIBS=$(WXDIR)\lib\wxxml.lib
+EXTRALIBS=$(WXDIR)\lib\canvas.lib
 OBJECTS = $(TARGET).obj

 !include $(WXDIR)\src\makeprog.b32
--- a/contrib/samples/canvas/simple/makefile.g95
+++ b/contrib/samples/canvas/simple/makefile.g95
@@ -0,0 +1,14 @@
+# 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
+
--- a/contrib/samples/canvas/simple/makefile.vc
+++ b/contrib/samples/canvas/simple/makefile.vc
@@ -0,0 +1,14 @@
+# 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
+
--- a/contrib/samples/canvas/test/TestVC.dsp
+++ b/contrib/samples/canvas/test/TestVC.dsp
@@ -0,0 +1,175 @@
+# Microsoft Developer Studio Project File - Name="TestVC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=TestVC - 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 "TestVC.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 "TestVC.mak" CFG="TestVC - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "TestVC - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "TestVC - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "TestVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "TestVC - 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)" == "TestVC - 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/test.exe" /libpath:"../../../../lib"
+
+!ELSEIF  "$(CFG)" == "TestVC - 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/test.exe" /pdbtype:sept /libpath:"../../../../lib"
+
+!ELSEIF  "$(CFG)" == "TestVC - 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/test.exe" /pdbtype:sept /libpath:"../../../../lib"
+
+!ELSEIF  "$(CFG)" == "TestVC - 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/test.exe" /libpath:"../../../../lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "TestVC - Win32 Release"
+# Name "TestVC - Win32 Debug"
+# Name "TestVC - Win32 Debug DLL"
+# Name "TestVC - Win32 Release DLL"
+# Begin Source File
+
+SOURCE=.\test.cpp
+
+!IF  "$(CFG)" == "TestVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "TestVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "TestVC - Win32 Debug DLL"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "TestVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\test.rc
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809 /i "..\..\..\include"
+# End Source File
+# End Target
+# End Project
--- a/contrib/samples/canvas/test/TestVC.dsw
+++ b/contrib/samples/canvas/test/TestVC.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00

 ###############################################################################

-Project: "wxXMLVC"=.\wxXMLVC.dsp - Package Owner=<4>
+Project: "TestVC"=.\TestVC.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/canvas/test/makefile.b32
+++ b/contrib/samples/canvas/test/makefile.b32
@@ -0,0 +1,18 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=test
+
+EXTRALIBS=$(WXDIR)\lib\canvas.lib
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+
--- a/contrib/samples/canvas/test/makefile.g95
+++ b/contrib/samples/canvas/test/makefile.g95
@@ -0,0 +1,14 @@
+# File:     makefile.g95 for Plot demo
+# Author:	Julian Smart
+# Created:	2001-06-12
+# Updated:
+
+WXDIR = ../../../..
+
+TARGET = test
+OBJECTS = $(TARGET).o
+EXTRAINC = -I$(WXDIR)/contrib/include
+EXTRALIBS = -lcanvas
+
+include $(WXDIR)/src/makeprog.g95
+
--- a/contrib/samples/canvas/test/makefile.vc
+++ b/contrib/samples/canvas/test/makefile.vc
@@ -0,0 +1,14 @@
+# File:		makefile.vc for Plot sample
+# Author:	Julian Smart
+# Created:	2001-06-12
+# Updated:
+
+WXDIR = $(WXWIN)
+PROGRAM = test
+
+OBJECTS = $(PROGRAM).obj
+EXTRALIBS = $(WXDIR)\lib\canvas$(LIBEXT).lib
+EXTRAINC = -I$(WXDIR)\contrib\include
+
+!include $(WXDIR)\src\makeprog.vc
+
--- a/contrib/samples/canvas/test/test.rc
+++ b/contrib/samples/canvas/test/test.rc
@@ -0,0 +1,3 @@
+#include "wx/msw/wx.rc"
+
+
--- a/contrib/samples/gizmos/Makefile.in
+++ b/contrib/samples/gizmos/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$

-CONTRIB_SAMPLES=multicell splittree
+CONTRIB_SAMPLES=multicell splittree editlbox

 all:
 	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
--- a/contrib/samples/gizmos/editlbox/makefile.b32
+++ b/contrib/samples/gizmos/editlbox/makefile.b32
@@ -0,0 +1,17 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=test
+OBJECTS = $(TARGET).obj
+EXTRALIBS=$(WXDIR)\lib\gizmos.lib
+
+!include $(WXDIR)\src\makeprog.b32
+
--- a/contrib/samples/gizmos/editlbox/makefile.g95
+++ b/contrib/samples/gizmos/editlbox/makefile.g95
@@ -0,0 +1,11 @@
+# Purpose: makefile for multicell example (Cygwin/Mingw32)
+# Created 2000-07-28
+
+WXDIR = ../../../..
+
+TARGET=test
+OBJECTS = $(TARGET).o
+EXTRALIBS=$(WXDIR)/lib/libgizmos.a
+
+include $(WXDIR)/src/makeprog.g95
+
--- a/contrib/samples/gizmos/multicell/makefile.b32
+++ b/contrib/samples/gizmos/multicell/makefile.b32
@@ -5,6 +5,7 @@ WXDIR = $(WXWIN)

 TARGET=mtest
 OBJECTS = $(TARGET).obj
+EXTRALIBS=$(WXDIR)\lib\gizmos.lib

 !include $(WXDIR)\src\makeprog.b32

--- a/contrib/samples/gizmos/multicell/makefile.g95
+++ b/contrib/samples/gizmos/multicell/makefile.g95
@@ -5,7 +5,7 @@ WXDIR = ../../../..

 TARGET=mtest
 OBJECTS = $(TARGET).o
-EXTRALIBS=$(WXDIR)/lib/libgizmos.lib
+EXTRALIBS=$(WXDIR)/lib/libgizmos.a

 include $(WXDIR)/src/makeprog.g95

--- a/contrib/samples/gizmos/splittree/makefile.b32
+++ b/contrib/samples/gizmos/splittree/makefile.b32
@@ -9,8 +9,9 @@

 WXDIR = $(WXWIN)

-TARGET=minimal
+TARGET=tree
 OBJECTS = $(TARGET).obj
+EXTRALIBS=$(WXDIR)\lib\gizmos.lib

 !include $(WXDIR)\src\makeprog.b32

--- a/contrib/samples/gizmos/splittree/makefile.g95
+++ b/contrib/samples/gizmos/splittree/makefile.g95
@@ -7,10 +7,11 @@
 #
 # Makefile for wxWindows sample (Cygwin/Mingw32).

-WXDIR = ../..
+WXDIR = ../../../..

-TARGET=minimal
+TARGET=tree
 OBJECTS = $(TARGET).o
+EXTRALIBS=$(WXDIR)/lib/libgizmos.a

 include $(WXDIR)/src/makeprog.g95

--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ b/contrib/samples/gizmos/splittree/tree.cpp
@@ -217,7 +217,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
    wxString msg;
-    msg.Printf( _T("This is the about dialog of tree sample.\n")
+    msg.Printf( _T("This is the about dialog of splittree sample.\n")
                _T("Welcome to %s"), wxVERSION_STRING);

    wxMessageBox(msg, "About Tree Test", wxOK | wxICON_INFORMATION, this);
@@ -282,8 +282,6 @@ void TestTree::OnPaint(wxPaintEvent& event)
    // Reset the device origin since it may have been set
    dc.SetDeviceOrigin(0, 0);

-	wxSize sz = GetClientSize();
-
 	wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
 	dc.SetPen(pen);
 	dc.SetBrush(* wxTRANSPARENT_BRUSH);
--- a/contrib/samples/mmedia/MMboardVC.dsp
+++ b/contrib/samples/mmedia/MMboardVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_0d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_1d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

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

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

 !ENDIF

--- a/contrib/samples/ogl/ogledit/OGLEditVC.dsp
+++ b/contrib/samples/ogl/ogledit/OGLEditVC.dsp
@@ -1,6 +1,5 @@
 # Microsoft Developer Studio Project File - Name="OGLEditVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **

 # TARGTYPE "Win32 (x86) Application" 0x0101
@@ -8,23 +7,24 @@
 CFG=OGLEditVC - 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 
 !MESSAGE NMAKE /f "OGLEditVC.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "OGLEditVC.mak" CFG="OGLEditVC - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "OGLEditVC - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE "OGLEditVC - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "OGLEditVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
 !MESSAGE "OGLEditVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE
+!MESSAGE 

 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -47,8 +47,8 @@ RSC=rc.exe
 # 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 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
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

 !ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"

@@ -72,9 +72,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

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

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

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

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

-!ENDIF
+!ENDIF 

 # Begin Target

@@ -147,26 +147,6 @@ LINK32=link.exe
 # Name "OGLEditVC - Win32 Release DLL"
 # Begin Source File

-SOURCE=.\ogledit.cpp
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\doc.cpp

 !IF  "$(CFG)" == "OGLEditVC - Win32 Release"
@@ -182,11 +162,45 @@ SOURCE=.\doc.cpp

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

-!ENDIF
+!ENDIF 

 # End Source File
 # Begin Source File

+SOURCE=.\doc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogledit.cpp
+
+!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogledit.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogledit.rc
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
+# End Source File
+# Begin Source File
+
 SOURCE=.\palette.cpp

 !IF  "$(CFG)" == "OGLEditVC - Win32 Release"
@@ -202,11 +216,15 @@ SOURCE=.\palette.cpp

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

-!ENDIF
+!ENDIF 

 # End Source File
 # Begin Source File

+SOURCE=.\palette.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\view.cpp

 !IF  "$(CFG)" == "OGLEditVC - Win32 Release"
@@ -222,94 +240,12 @@ SOURCE=.\view.cpp

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

-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\doc.h
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ogledit.h
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\palette.h
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
+!ENDIF 

 # End Source File
 # Begin Source File

 SOURCE=.\view.h
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ogledit.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/ogl/ogledit/OGLEditVC.dsw
+++ b/contrib/samples/ogl/ogledit/OGLEditVC.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
+Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

 ###############################################################################
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/contrib/samples/ogl/ogledit/doc.cpp
@@ -34,7 +34,7 @@
 #include "view.h"

 #if wxUSE_STD_IOSTREAM
-#include <iostream.h>
+#include <ioswrap.h>
 #endif

 IMPLEMENT_DYNAMIC_CLASS(DiagramDocument, wxDocument)
@@ -54,7 +54,7 @@ bool DiagramDocument::OnCloseDocument(void)
 }

 #if wxUSE_STD_IOSTREAM
-ostream& DiagramDocument::SaveObject(ostream& stream)
+wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
 {
  wxDocument::SaveObject(stream);
  
@@ -69,7 +69,7 @@ ostream& DiagramDocument::SaveObject(ostream& stream)
  return stream;
 }

-istream& DiagramDocument::LoadObject(istream& stream)
+wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)
 {
  wxDocument::LoadObject(stream);

--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/contrib/samples/ogl/ogledit/doc.h
@@ -23,8 +23,7 @@
 #include <wx/ogl/ogl.h>

 #if wxUSE_STD_IOSTREAM
-class ostream;
-class istream;
+ #include <iosfwd>
 #endif

 /*
@@ -98,8 +97,8 @@ class DiagramDocument: public wxDocument
  ~DiagramDocument(void);

 #if wxUSE_STD_IOSTREAM
-    virtual ostream& SaveObject(ostream& stream);
-    virtual istream& LoadObject(istream& stream);
+    virtual wxSTD ostream& SaveObject(wxSTD ostream& stream);
+    virtual wxSTD istream& LoadObject(wxSTD istream& stream);
 #else
    virtual wxOutputStream& SaveObject(wxOutputStream& stream);
    virtual wxInputStream& LoadObject(wxInputStream& stream);
--- a/contrib/samples/ogl/studio/StudioVC.dsp
+++ b/contrib/samples/ogl/studio/StudioVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_0d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_1d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"

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

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

 !ENDIF 

--- a/contrib/samples/plot/PlotVC.dsp
+++ b/contrib/samples/plot/PlotVC.dsp
@@ -0,0 +1,175 @@
+# Microsoft Developer Studio Project File - Name="PlotVC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=PlotVC - 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 "PlotVC.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 "PlotVC.mak" CFG="PlotVC - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "PlotVC - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "PlotVC - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "PlotVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "PlotVC - 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)" == "PlotVC - 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 plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "PlotVC - 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 plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "PlotVC - 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 plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "PlotVC - 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 plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "PlotVC - Win32 Release"
+# Name "PlotVC - Win32 Debug"
+# Name "PlotVC - Win32 Debug DLL"
+# Name "PlotVC - Win32 Release DLL"
+# Begin Source File
+
+SOURCE=.\plot.cpp
+
+!IF  "$(CFG)" == "PlotVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "PlotVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "PlotVC - Win32 Debug DLL"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "PlotVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\plot.rc
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809 /i "..\..\include"
+# End Source File
+# End Target
+# End Project
--- a/contrib/samples/plot/PlotVC.dsw
+++ b/contrib/samples/plot/PlotVC.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "PlotVC"=.\PlotVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/contrib/samples/plot/makefile.b32
+++ b/contrib/samples/plot/makefile.b32
@@ -0,0 +1,18 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=plot
+
+EXTRALIBS=$(WXDIR)\lib\plot.lib
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+
--- a/contrib/samples/plot/makefile.g95
+++ b/contrib/samples/plot/makefile.g95
@@ -0,0 +1,15 @@
+# File:     makefile.g95 for Plot demo
+# Author:	Julian Smart
+# Created:	2001-06-12
+# Updated:
+
+WXDIR = ../../..
+
+TARGET = plot
+OBJECTS = $(TARGET).o
+EXTRAINC = -I$(WXDIR)/contrib/include
+RCEXTRAINC = --include-dir $(WXDIR)/contrib/include
+EXTRALIBS = -lplot
+
+include $(WXDIR)/src/makeprog.g95
+
--- a/contrib/samples/plot/makefile.vc
+++ b/contrib/samples/plot/makefile.vc
@@ -0,0 +1,14 @@
+# File:		makefile.vc for Plot sample
+# Author:	Julian Smart
+# Created:	2001-06-12
+# Updated:
+
+WXDIR = $(WXWIN)
+PROGRAM = plot
+
+OBJECTS = $(PROGRAM).obj
+EXTRALIBS = $(WXDIR)\lib\plot$(LIBEXT).lib
+EXTRAINC = -I$(WXDIR)\contrib\include
+
+!include $(WXDIR)\src\makeprog.vc
+
--- a/contrib/samples/stc/StcTestVC.dsp
+++ b/contrib/samples/stc/StcTestVC.dsp
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_0d.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_1d.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

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

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

 !ENDIF

--- a/contrib/samples/stc/makefile.vc
+++ b/contrib/samples/stc/makefile.vc
@@ -7,7 +7,7 @@ WXDIR = $(WXWIN)
 PROGRAM = stctest

 OBJECTS = $(PROGRAM).obj
-EXTRALIBS = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib
+EXTRALIBS = $(WXDIR)\lib\stc$(LIBEXT).lib
 EXTRAINC = -I$(WXDIR)\contrib\include

 !include $(WXDIR)\src\makeprog.vc
--- a/contrib/samples/xrc/Makefile.in
+++ b/contrib/samples/xrc/Makefile.in
@@ -7,13 +7,13 @@

 top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
-program_dir = contrib/samples/xml
+program_dir = contrib/samples/xrc

-PROGRAM=xmldemo
+PROGRAM=xrcdemo

 OBJECTS=$(PROGRAM).o

-APPEXTRALIBS=$(top_builddir)/lib/libwxxml.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include

 DATADIRS = rc
--- a/contrib/samples/xrc/XrcDemoVC.dsp
+++ b/contrib/samples/xrc/XrcDemoVC.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="XmlDemoVC" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="XrcDemoVC" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **

 # TARGTYPE "Win32 (x86) Application" 0x0101

-CFG=XmlDemoVC - Win32 Debug
+CFG=XrcDemoVC - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "XmlDemoVC.mak".
+!MESSAGE NMAKE /f "XrcDemoVC.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "XmlDemoVC.mak" CFG="XmlDemoVC - Win32 Debug"
+!MESSAGE NMAKE /f "XrcDemoVC.mak" CFG="XrcDemoVC - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "XmlDemoVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "XmlDemoVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "XmlDemoVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "XmlDemoVC - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "XrcDemoVC - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "XrcDemoVC - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "XrcDemoVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "XrcDemoVC - Win32 Release DLL" (based on "Win32 (x86) Application")
 !MESSAGE 

 # Begin Project
@@ -31,7 +31,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe

-!IF  "$(CFG)" == "XmlDemoVC - Win32 Release"
+!IF  "$(CFG)" == "XrcDemoVC - Win32 Release"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,9 +56,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib wxxml.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# 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 wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Debug"
+!ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Debug"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -72,7 +72,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD 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"
@@ -82,9 +83,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib wxxmld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# 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 wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Debug DLL"
+!ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Debug DLL"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -108,9 +109,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdlld.lib wxxmld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# 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 wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"

-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Release DLL"
+!ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Release DLL"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -135,41 +136,38 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdll.lib wxxml.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdll.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"

 !ENDIF 

 # Begin Target

-# Name "XmlDemoVC - Win32 Release"
-# Name "XmlDemoVC - Win32 Debug"
-# Name "XmlDemoVC - Win32 Debug DLL"
-# Name "XmlDemoVC - Win32 Release DLL"
+# Name "XrcDemoVC - Win32 Release"
+# Name "XrcDemoVC - Win32 Debug"
+# Name "XrcDemoVC - Win32 Debug DLL"
+# Name "XrcDemoVC - Win32 Release DLL"
 # Begin Source File

-SOURCE=.\xmldemo.cpp
+SOURCE=.\xrcdemo.cpp

-!IF  "$(CFG)" == "XmlDemoVC - Win32 Release"
+!IF  "$(CFG)" == "XrcDemoVC - Win32 Release"

-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Debug"
+!ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Debug"

 # SUBTRACT CPP /YX /Yc /Yu

-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Debug DLL"
+!ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Debug DLL"

-# SUBTRACT BASE CPP /YX /Yc /Yu
 # SUBTRACT CPP /YX /Yc /Yu

-!ELSEIF  "$(CFG)" == "XmlDemoVC - Win32 Release DLL"
+!ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Release DLL"

 !ENDIF 

 # End Source File
 # Begin Source File

-SOURCE=.\xmldemo.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include"
+SOURCE=.\xrcdemo.rc
 # End Source File
 # End Target
 # End Project
--- a/contrib/samples/xrc/XrcDemoVC.dsw
+++ b/contrib/samples/xrc/XrcDemoVC.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "XrcDemoVC"=.\XrcDemoVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/contrib/samples/xrc/makefile.b32
+++ b/contrib/samples/xrc/makefile.b32
@@ -0,0 +1,18 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=xrcdemo
+
+EXTRALIBS=$(WXDIR)\lib\wxxrc.lib
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+
--- a/contrib/samples/xrc/makefile.g95
+++ b/contrib/samples/xrc/makefile.g95
@@ -5,10 +5,10 @@

 WXDIR = ../../..

-TARGET = xmldemo
+TARGET = xrcdemo
 OBJECTS = $(TARGET).o
 EXTRAINC = -I$(WXDIR)/contrib/include
-EXTRALIBS = -lwxxml
+EXTRALIBS = -lwxxrc

 include $(WXDIR)/src/makeprog.g95

--- a/contrib/samples/xrc/makefile.vc
+++ b/contrib/samples/xrc/makefile.vc
@@ -4,10 +4,10 @@
 # Updated:

 WXDIR = $(WXWIN)
-PROGRAM = xmldemo
+PROGRAM = xrcdemo

 OBJECTS = $(PROGRAM).obj
-EXTRALIBS = $(WXDIR)\lib\wxxml$(LIBEXT).lib
+EXTRALIBS = $(WXDIR)\lib\wxxrc$(LIBEXT).lib
 EXTRAINC = -I$(WXDIR)\contrib\include

 !include $(WXDIR)\src\makeprog.vc
--- a/contrib/samples/xrc/rc/appicon.ico
+++ b/contrib/samples/xrc/rc/appicon.ico
--- a/contrib/samples/xrc/rc/appicon.xpm
+++ b/contrib/samples/xrc/rc/appicon.xpm
--- a/contrib/samples/xrc/rc/fileopen.gif
+++ b/contrib/samples/xrc/rc/fileopen.gif
--- a/contrib/samples/xrc/rc/filesave.gif
+++ b/contrib/samples/xrc/rc/filesave.gif
--- a/contrib/samples/xrc/rc/fuzzy.gif
+++ b/contrib/samples/xrc/rc/fuzzy.gif
--- a/Show More
+++ b/Show More