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

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

Makefile.in

@@ -154,18 +154,17 @@ INTLDIR  = $(WXDIR)/locale
 
 # append a version suffix x.y.z to all file names
 VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
-WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
+WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
-WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
+WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
-WXSAMPLES=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
-WXDEMOS=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
+WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
 
-WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2
+WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2
-WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
+WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
-WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
+WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
-WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
+WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
 
-DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX)
+DISTDIR = ./_dist_dir/@DISTDIR@
-DISTDIR=./_dist_dir/$(DISTDIRNAME)
 
 
 ############################## Files ##################################
@@ -372,10 +371,10 @@ all: @WX_ALL@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
 
-./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.r: ./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc
 	$(DEREZ) $^ $(DEREZFLAGS) > $@
 
-./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc: $(MACRESOURCES)
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc: $(MACRESOURCES)
 	$(REZ) $(REZFLAGS) $^ -o $@
 
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
@@ -873,16 +872,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
 
-	mkdir $(DISTDIR)/samples/erase
-	cp $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase
-	cp $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase
-	cp $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase
-
-	mkdir $(DISTDIR)/samples/event
-	cp $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event
-	cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
-	cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
-
 	mkdir $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
@@ -961,7 +950,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/internat
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
-	mkdir $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
@@ -970,10 +958,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/ru
+	#cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
-	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
+	#cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/de
 
 	mkdir $(DISTDIR)/samples/ipc
 	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
@@ -1307,58 +1295,27 @@ PYTHON_DIST:
 distclean:
 	$(RM) -r _dist_dir
 
-# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
-#     the files twice
-dist-only:
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
-	@if test "$(USE_GUI)" = 1; then \
-	cd $(DISTDIR); \
-	mv samples wxSamples-$(VER_SUFFIX); \
-	echo "*** Creating wxSamples archive..."; \
-	tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
-	mv wxSamples-$(VER_SUFFIX) samples; \
-	mv demos wxDemos-$(VER_SUFFIX); \
-	echo "*** Creating wxDemos archive..."; \
-	tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
-	mv wxDemos-$(VER_SUFFIX) demos; \
-	fi
-
 dist: @GUIDIST@
-	cp $(WXDIR)/src/files.lst $(DISTDIR)/src
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
+	@cd _dist_dir; \
+	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
+	tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
+	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
 	@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 $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
+	cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples; \

configure.in

@@ -184,10 +184,10 @@ AC_DEFUN(WX_CPP_NEW_HEADERS,
 
     AC_CHECK_HEADERS(iostream)
 
-    if test "$ac_cv_header_iostream" = "yes" ; then
+    if test "x$HAVE_IOSTREAM" = x ; then
-      ifelse([$1], , :, [$1])
-    else
       ifelse([$2], , :, [$2])
+    else
+      ifelse([$1], , :, [$1])
     fi
 
     AC_LANG_RESTORE
@@ -216,6 +216,7 @@ AC_DEFUN(WX_CPP_BOOL,
         return 0;
       ],
       [
+        AC_DEFINE(HAVE_BOOL)
         wx_cv_cpp_bool=yes
       ],
       [
@@ -293,7 +294,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,
                       [
@@ -338,7 +339,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,
                       [
@@ -375,7 +376,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,
                         [
@@ -471,7 +472,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=1
+WX_RELEASE_NUMBER=0
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -744,7 +745,6 @@ 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,7 +870,6 @@ 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
@@ -1088,7 +1087,6 @@ 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)
@@ -1352,7 +1350,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
@@ -1436,7 +1434,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
@@ -1456,7 +1454,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,
@@ -1466,7 +1464,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
@@ -2129,15 +2127,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}.r"
+	WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r"
 	dnl the name of the shared library
-	WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+	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}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+	WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
 	dnl the name of the links to the shared library
-	WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
+	WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.dylib"
 	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}.dylib.${WX_CURRENT}"
+	WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.dylib"
 	WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
 	WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
       ;;
@@ -2236,10 +2234,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
@@ -2278,76 +2276,17 @@ AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
 [
     AC_TRY_COMPILE([#include <wchar.h>],
         [
-            wchar_t wc, *ws;
+	    wchar_t wc, *ws;
-            wc = L'a';
+	    wc = L'a';
-            ws = L"Hello, world!";
+	    ws = L"Hello, world!";
         ],
-        wx_cv_type_wchar_t=yes,
+	wx_cv_type_wchar_t=yes,
-        AC_TRY_COMPILE([#include <stdlib.h>],
+	wx_cv_type_wchar_t=no)
-            [
-                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 ---------------------------------------------------------------------------
@@ -2396,17 +2335,11 @@ 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(
         [
-	    #ifdef HAVE_WCHAR_H
+	    #include <wchar.h>
-	    #  include <wchar.h>
-	    #endif
-	    #ifdef HAVE_STDLIB_H
-	    #  include <stdlib.h>
-	    #endif
 	    #include <stdio.h>
 	    int main()
 	    {
@@ -2562,6 +2495,8 @@ 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
 
@@ -2574,9 +2509,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;
+	iconv_t cd;
-        size_t insz, outsz;
+	size_t insz, outsz;
-        iconv(cd, inbuf, &insz, outbuf, &outsz);
+	iconv(cd, inbuf, &insz, outbuf, &outsz);
     ],
     wx_cv_iconv_takes_char=yes,
     wx_cv_iconv_takes_char=no)
@@ -2624,21 +2559,10 @@ 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 function to modify the environment
+dnl look for a functiopn to modify the environment
 AC_CHECK_FUNCS(putenv setenv, break)
 
 HAVE_SOME_SLEEP_FUNC=0
@@ -2669,9 +2593,9 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
                 ],
                 [
                     AC_CHECK_FUNCS(usleep,
-                        AC_DEFINE(HAVE_USLEEP),
+        		AC_DEFINE(HAVE_USLEEP),
-                        AC_MSG_WARN([wxSleep() function will not work])
+		    )
-                    )
+                    AC_MSG_WARN([wxSleep() function will not work])
                 ]
             )
         ]
@@ -2758,6 +2682,8 @@ 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
@@ -2774,9 +2700,15 @@ if test "$wxUSE_THREADS" = "yes" ; then
                 THREADS_OBJ="threadpsx.lo"
                 THREADS_LINK="c_r"
             ], [
-                dnl VZ: SGI threads are not supported currently
+                dnl thread functions are in libcc_dynamic under Mac OS X/Darwin
-                AC_CHECK_HEADER(sys/prctl.h, [
+                AC_CHECK_LIB(cc_dynamic, pthread_create, [
-                    THREADS_OBJ="threadsgi.lo"
+                    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"
+                    ])
                 ])
             ])
         ])
@@ -2799,7 +2731,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             ])
@@ -2810,7 +2742,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)
                 )]
@@ -2827,7 +2759,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"
@@ -2904,7 +2836,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
@@ -3235,10 +3167,6 @@ 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
@@ -3371,16 +3299,13 @@ 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)
@@ -3760,6 +3685,9 @@ 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)"
@@ -3926,14 +3854,7 @@ if test "$wxUSE_TABDIALOG" = "yes"; then
 fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
+  AC_DEFINE(wxUSE_TOGGLEBTN)
-        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
@@ -4273,10 +4194,6 @@ 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
@@ -4292,14 +4209,9 @@ AC_OUTPUT([
             Makefile
           ],
           [
-            dnl don't move the file on itself - this happens when we run
+            chmod +x wx-config
-            dnl config.status which, as configure, executes these commands
+            mv wx-config wx${TOOLKIT_NAME}-config
-            dnl but, unlike it, doesn't create wx-config
+            ${LN_S} wx${TOOLKIT_NAME}-config 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
@@ -4346,4 +4258,3 @@ AC_OUTPUT([
           ]
          )
 
-dnl vi: set et ts=4 sw=4 list:

contrib/configure

@@ -817,7 +817,7 @@ trap 'rm -fr `echo "
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
-            src/xrc/Makefile
+            src/xml/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile
@@ -834,8 +834,7 @@ trap 'rm -fr `echo "
             samples/gizmos/Makefile
             samples/gizmos/multicell/Makefile
             samples/gizmos/splittree/Makefile
-            samples/gizmos/editlbox/Makefile
+            samples/xml/Makefile
-            samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile
             utils/Makefile
@@ -925,7 +924,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
-            src/xrc/Makefile
+            src/xml/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile
@@ -942,8 +941,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             samples/gizmos/Makefile
             samples/gizmos/multicell/Makefile
             samples/gizmos/splittree/Makefile
-            samples/gizmos/editlbox/Makefile
+            samples/xml/Makefile
-            samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile
             utils/Makefile

contrib/configure.in

@@ -42,7 +42,7 @@ AC_OUTPUT([
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
-            src/xrc/Makefile
+            src/xml/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile
@@ -59,8 +59,7 @@ AC_OUTPUT([
             samples/gizmos/Makefile
             samples/gizmos/multicell/Makefile
             samples/gizmos/splittree/Makefile
-            samples/gizmos/editlbox/Makefile
+            samples/xml/Makefile
-            samples/xrc/Makefile
             samples/plot/Makefile
             samples/applet/Makefile
             utils/Makefile

contrib/include/wx/applet/applet.h

@@ -5,19 +5,23 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
-*  ========================================================================
+*  ======================================================================
-*
+*  |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
+*  |This copyrighted computer code is a proprietary trade secret of     |
-*    compliance with the License. You may obtain a copy of the License at
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*    http://www.wxwindows.org/licence3.txt
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*    Software distributed under the License is distributed on an
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+*  |written authorization from SciTech to possess or use this code, you |
-*    implied. See the License for the specific language governing
+*  |may be subject to civil and/or criminal penalties.                  |
-*    rights and limitations under the License.
+*  |                                                                    |
-*
+*  |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|
+*  ======================================================================
 *
 * Language:     ANSI C++
 * Environment:  Any
@@ -30,10 +34,7 @@
 #define __WX_APPLET_H
 
 #include "wx/panel.h"
-#include "wx/html/htmlwin.h"
+#include "wx/applet/window.h"
-
-// Forward declaration
-class wxHtmlAppletWindow;
 
 /*--------------------------- Class Definitions ---------------------------*/
 
@@ -47,19 +48,18 @@ private:
     DECLARE_EVENT_TABLE();
     
 protected:
-    //wxHtmlAppletWindow  *m_parent;
+    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);
                 
@@ -79,7 +79,5 @@ public:
     virtual void OnMessage(wxEvent& msg) = 0;
     };
     
-
-
 #endif // __WX_APPLET_H
 

contrib/include/wx/applet/echovar.h

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

contrib/include/wx/applet/ifelsevar.h

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

contrib/include/wx/applet/loadpage.h

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

contrib/include/wx/applet/prepecho.h

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

contrib/include/wx/applet/prepifelse.h

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

contrib/include/wx/applet/prepinclude.h

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

contrib/include/wx/applet/window.h

@@ -5,19 +5,23 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
-*  ========================================================================
+*  ======================================================================
-*
+*  |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
+*  |This copyrighted computer code is a proprietary trade secret of     |
-*    compliance with the License. You may obtain a copy of the License at
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*    http://www.wxwindows.org/licence3.txt
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*    Software distributed under the License is distributed on an
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+*  |written authorization from SciTech to possess or use this code, you |
-*    implied. See the License for the specific language governing
+*  |may be subject to civil and/or criminal penalties.                  |
-*    rights and limitations under the License.
+*  |                                                                    |
-*
+*  |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|
+*  ======================================================================
 *
 * Language:     ANSI C++
 * Environment:  Any
@@ -31,46 +35,18 @@
 
 #include "wx/html/htmlwin.h"
 
-// Forward declare
-class wxApplet;
-class wxLoadPageEvent;
-class wxPageLoadedEvent;
-class wxIncludePrep;
-
-// Declare a linked list of wxApplet pointers
-WX_DECLARE_LIST(wxApplet, wxAppletList);
-
 /*--------------------------- Class Definitions ---------------------------*/
 
-/****************************************************************************
+// Declare a linked list of wxApplet pointers
-REMARKS:
+class wxApplet;
-Defines the class for virtual-link data types
+WX_DECLARE_LIST(wxApplet, wxAppletList);
-****************************************************************************/
-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; };
-    };
 
 /****************************************************************************
+MEMBERS:
+appletModules   - List of register applet modules   
+appletList      - List of all active applets instances
+cookies         - Hash table for managing cookies       
+
 REMARKS:
 Defines the class for wxAppletWindow. This class is derived from the
 wxHtmlWindow class and extends it with functionality to handle embedded
@@ -81,23 +57,15 @@ 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;		
+    wxAppletList    m_AppletList;       
-	static wxHashTable	m_Cookies;
+    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,
@@ -108,9 +76,7 @@ public:
     
             // Create an instance of an applet based on it's class name
             wxApplet *CreateApplet(
-                const wxString& classId,
+                const wxString& className,          
-                const wxString& iName,
-                const wxHtmlTag &params,
                 const wxSize& size);
                 
             // Find an instance of an applet based on it's class name
@@ -120,10 +86,10 @@ public:
             bool RemoveApplet(const wxApplet *applet);          
 
             // Load a new URL page
-    virtual bool LoadPage(const wxString& location);
+            bool LoadPage(const wxString& hRef);
             
             // Called when users clicked on hypertext link.
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
+            void OnLinkClicked(const wxHtmlLinkInfo& link);
             
             // Handles forward navigation within the HTML stack
             bool HistoryForward();
@@ -142,23 +108,6 @@ public:
             
             // Find a cookie of data given it's public name
             wxObject *FindCookie(const wxString& name);
-			
-            // Event handlers to load a new page	
-			void OnLoadPage(wxLoadPageEvent &event);
-
-            // Event handlers to load a new page	
-    		void OnPageLoaded(wxPageLoadedEvent &event);
-
-            // LoadPage mutex locks
-            void Lock() { m_mutexLock = true;};
-            void UnLock() { m_mutexLock = false;};
-
-            // Returns TRUE if the mutex is locked, FALSE otherwise.
-            bool IsLocked() { return m_mutexLock;};
-
-            // Tries to lock the mutex. If it can't, returns immediately with false.
-            bool TryLock();
-
     };
     
 #endif // __WX_APPLET_WINDOW_H

contrib/include/wx/plot/plot.h

@@ -35,7 +35,7 @@ class WXDLLEXPORT wxPlotYAxisArea;
 class WXDLLEXPORT wxPlotWindow;
 
 //-----------------------------------------------------------------------------
-// consts
+// classes
 //-----------------------------------------------------------------------------
 
 extern const int wxEVT_PLOT_SEL_CHANGING;
@@ -60,6 +60,9 @@ 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
@@ -374,8 +377,6 @@ 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 },
@@ -398,31 +399,5 @@ 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_

contrib/include/wx/xml/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/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_

contrib/include/wx/xml/xh_bmp.h

@@ -15,10 +15,10 @@
 #pragma interface "xh_bmp.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 
-class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxBitmapXmlHandler();
@@ -26,7 +26,7 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxIconXmlHandler();

contrib/include/wx/xml/xh_bmpbt.h

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

contrib/include/wx/xml/xh_bttn.h

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

contrib/include/wx/xml/xh_cald.h

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

contrib/include/wx/xml/xh_chckb.h

@@ -15,12 +15,12 @@
 #pragma interface "xh_chckb.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 #include "wx/defs.h"
 
 #if wxUSE_CHECKBOX
 
-class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxCheckBoxXmlHandler();

contrib/include/wx/xml/xh_chckl.h

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

contrib/include/wx/xml/xh_choic.h

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

contrib/include/wx/xml/xh_combo.h

@@ -15,11 +15,11 @@
 #pragma interface "xh_combo.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 #if wxUSE_COMBOBOX
 
-class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxComboBoxXmlHandler();

contrib/include/wx/xml/xh_dlg.h

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

contrib/include/wx/xml/xh_frame.h

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

contrib/include/wx/xml/xh_gauge.h

@@ -19,10 +19,10 @@
 
 #if wxUSE_GAUGE
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 
-class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
 {
     enum 
     {

contrib/include/wx/xml/xh_html.h

@@ -15,13 +15,13 @@
 #pragma interface "xh_html.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 #include "wx/defs.h"
 
 #if wxUSE_HTML
 
-class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxHtmlWindowXmlHandler();

contrib/include/wx/xml/xh_listb.h

@@ -15,11 +15,11 @@
 #pragma interface "xh_listb.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 #if wxUSE_LISTBOX
 
-class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxListBoxXmlHandler();

contrib/include/wx/xml/xh_listc.h

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

contrib/include/wx/xml/xh_menu.h

@@ -15,9 +15,9 @@
 #pragma interface "xh_menu.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
-class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxMenuXmlHandler();
@@ -28,7 +28,7 @@ private:
     bool m_insideMenu;
 };
 
-class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
     public:
         wxMenuBarXmlHandler();

contrib/include/wx/xml/xh_notbk.h

@@ -14,13 +14,13 @@
 #pragma interface "xh_notbk.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 #if wxUSE_NOTEBOOK
 
 class WXDLLEXPORT wxNotebook;
 
-class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxNotebookXmlHandler();

contrib/include/wx/xml/xh_panel.h

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

contrib/include/wx/xml/xh_radbt.h

@@ -15,12 +15,12 @@
 #pragma interface "xh_radbt.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 #include "wx/defs.h"
 
 #if wxUSE_RADIOBOX
 
-class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxRadioButtonXmlHandler();

contrib/include/wx/xml/xh_radbx.h

@@ -15,11 +15,11 @@
 #pragma interface "xh_radbx.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 #if wxUSE_RADIOBOX
 
-class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxRadioBoxXmlHandler();

contrib/include/wx/xml/xh_scrol.h

@@ -15,12 +15,12 @@
 #pragma interface "xh_scrol.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 #include "wx/defs.h"
 
 
 
-class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
 {
     enum 
     {

contrib/include/wx/xml/xh_sizer.h

@@ -15,12 +15,12 @@
 #pragma interface "xh_sizer.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 
 class WXDLLEXPORT wxSizer;
 
-class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxSizerXmlHandler();

contrib/include/wx/xml/xh_slidr.h

@@ -15,12 +15,12 @@
 #pragma interface "xh_slidr.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 #include "wx/defs.h"
 
 #if wxUSE_SLIDER
 
-class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
 {
     enum 
     {

contrib/include/wx/xml/xh_spin.h

@@ -15,11 +15,11 @@
 #pragma interface "xh_spin.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 #include "wx/defs.h"
 
 #if wxUSE_SPINBTN
-class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
 {
     enum 
     {
@@ -36,7 +36,7 @@ public:
 #endif
 
 #if wxUSE_SPINCTRL
-class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
 {
     enum 
     {

contrib/include/wx/xml/xh_stbmp.h

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

contrib/include/wx/xml/xh_stbox.h

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

contrib/include/wx/xml/xh_stlin.h

@@ -15,11 +15,11 @@
 #pragma interface "xh_stlin.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 #if wxUSE_STATLINE
 
-class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxStaticLineXmlHandler();

contrib/include/wx/xml/xh_sttxt.h

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

contrib/include/wx/xml/xh_text.h

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

contrib/include/wx/xml/xh_toolb.h

@@ -15,13 +15,13 @@
 #pragma interface "xh_toolb.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
 #if wxUSE_TOOLBAR
 
 class WXDLLEXPORT wxToolBar;
 
-class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxToolBarXmlHandler();

contrib/include/wx/xml/xh_tree.h

@@ -15,9 +15,9 @@
 #pragma interface "xh_tree.h"
 #endif
 
-#include "wx/xrc/xmlres.h"
+#include "wx/xml/xmlres.h"
 
-class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
 {
 public:
     wxTreeCtrlXmlHandler();

contrib/include/wx/xml/xh_unkwn.h

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

contrib/include/wx/xml/xml.h

@@ -20,16 +20,11 @@
 #include "wx/object.h"
 #include "wx/list.h"
 
-#ifdef WXXMLISDLL
-#define WXXMLDLLEXPORT WXDLLEXPORT
-#else
-#define WXXMLDLLEXPORT
-#endif
 
-class WXXMLDLLEXPORT wxXmlNode;
+class WXDLLEXPORT wxXmlNode;
-class WXXMLDLLEXPORT wxXmlProperty;
+class WXDLLEXPORT wxXmlProperty;
-class WXXMLDLLEXPORT wxXmlDocument;
+class WXDLLEXPORT wxXmlDocument;
-class WXXMLDLLEXPORT wxXmlIOHandler;
+class WXDLLEXPORT wxXmlIOHandler;
 class WXDLLEXPORT wxInputStream;
 class WXDLLEXPORT wxOutputStream;
 
@@ -70,7 +65,7 @@ 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 WXXMLDLLEXPORT wxXmlProperty
+class WXDLLEXPORT wxXmlProperty
 {
 public:
     wxXmlProperty() : m_next(NULL) {}
@@ -108,7 +103,7 @@ private:
 //     wxCSConv myConv("iso8859-2");
 //     wxString s(cMB2WC(node->GetContent().c_str()), myConv);
 
-class WXXMLDLLEXPORT wxXmlNode
+class WXDLLEXPORT wxXmlNode
 {
 public:
     wxXmlNode() : m_properties(NULL), m_parent(NULL), 
@@ -180,7 +175,7 @@ private:
 // internal representation is independant on libxml and you can use 
 // it without libxml (see Load/SaveBinary).
 
-class WXXMLDLLEXPORT wxXmlDocument : public wxObject
+class WXDLLEXPORT wxXmlDocument : public wxObject
 {
 public:
     wxXmlDocument() : wxObject(), m_version(wxT("1.0")), m_root(NULL)  {}
@@ -244,7 +239,7 @@ private:
 // wxXmlIOHandler takes care of loading and/or saving XML data.
 // see xmlio.h for available handlers
 
-class WXXMLDLLEXPORT wxXmlIOHandler : public wxObject
+class WXDLLEXPORT wxXmlIOHandler : public wxObject
 {
     public:
         wxXmlIOHandler() {}
@@ -259,6 +254,6 @@ class WXXMLDLLEXPORT wxXmlIOHandler : public wxObject
 
 
 
-void wxXmlInitXmlModule();
+
 
 #endif // _WX_XML_H_

contrib/include/wx/xml/xmlio.h

@@ -17,10 +17,10 @@
 
 #include "wx/defs.h"
 #include "wx/string.h"
-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"
 
 
-class WXXMLDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
+class WXDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
 {
 public:
     virtual wxXmlIOType GetType() { return wxXML_IO_EXPAT; }
@@ -28,25 +28,23 @@ public:
     virtual bool CanSave() { return FALSE; }
 
     virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-    virtual bool Save(wxOutputStream& WXUNUSED(stream), const wxXmlDocument& WXUNUSED(doc))
+    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc) { return FALSE; }
-        { return FALSE; }
 };
 
 
-class WXXMLDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
+class WXDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
 {
 public:
     virtual wxXmlIOType GetType() { return wxXML_IO_TEXT_OUTPUT; }
-    virtual bool CanLoad(wxInputStream& WXUNUSED(stream)) { return FALSE; }
+    virtual bool CanLoad(wxInputStream& stream) { return FALSE; }
     virtual bool CanSave() { return TRUE; }
 
-    virtual bool Load(wxInputStream& WXUNUSED(stream), wxXmlDocument& WXUNUSED(doc)) 
+    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc) { return FALSE; }
-        { return FALSE; }
     virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
 };
 
 
-class WXXMLDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
+class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
 {
 public:
     wxXmlIOHandlerBin() {}
@@ -67,7 +65,7 @@ protected:
 
 #if wxUSE_ZLIB
 
-class WXXMLDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
+class WXDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
 {
 public:
     wxXmlIOHandlerBinZ() {}

contrib/include/wx/xml/xmlres.h

@@ -25,8 +25,6 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 
-#include "wx/xrc/xml.h"
-
 class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxDialog;
@@ -35,8 +33,9 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 
-class WXXMLDLLEXPORT wxXmlResourceHandler;
+class WXDLLEXPORT 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).
@@ -62,7 +61,7 @@ class WXXMLDLLEXPORT wxXmlResourceHandler;
                  WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
                  WX_XMLRES_CURRENT_VERSION_REVISION)
 
-class WXXMLDLLEXPORT wxXmlResourceDataRecord
+class WXDLLEXPORT wxXmlResourceDataRecord
 {
 public:
     wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
@@ -73,19 +72,13 @@ 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 
 // (or derived forms, either binary or zipped -- see manual for
 // details). 
 
-class WXXMLDLLEXPORT wxXmlResource : public wxObject
+class WXDLLEXPORT wxXmlResource : public wxObject
 {
 public:
     // Ctor. If use_locale is TRUE, translatable strings are
@@ -198,7 +191,7 @@ private:
 
 
 // Global instance of resource class. For your convenience.
-extern WXXMLDLLEXPORT wxXmlResource *wxTheXmlResource;
+extern wxXmlResource *wxTheXmlResource;
 
 // This macro translates string identifier (as used in XML resource,
 // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
@@ -223,16 +216,12 @@ extern WXXMLDLLEXPORT 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 WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject
+
+class WXDLLEXPORT wxXmlResourceHandler : public wxObject
 {
 public:
     wxXmlResourceHandler();
@@ -353,6 +342,5 @@ protected:
 #define ADD_STYLE(style) AddStyle(wxT(#style), style)
 
 
-void wxXmlInitResourceModule();
 
 #endif // _WX_XMLRES_H_

contrib/include/wx/xrc/xh_all.h

@@ -1,49 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_all.h
-// Purpose:     includes all xh_*.h files
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_ALL_H_
-#define _WX_XH_ALL_H_
-
-
-// Existing handlers:
-
-#include "wx/xrc/xh_menu.h"
-#include "wx/xrc/xh_panel.h"
-#include "wx/xrc/xh_dlg.h"
-#include "wx/xrc/xh_bttn.h"
-#include "wx/xrc/xh_chckb.h"
-#include "wx/xrc/xh_gauge.h"
-#include "wx/xrc/xh_html.h"
-#include "wx/xrc/xh_spin.h"
-#include "wx/xrc/xh_sttxt.h"
-#include "wx/xrc/xh_slidr.h"
-#include "wx/xrc/xh_radbt.h"
-#include "wx/xrc/xh_radbx.h"
-#include "wx/xrc/xh_combo.h"
-#include "wx/xrc/xh_chckl.h"
-#include "wx/xrc/xh_choic.h"
-#include "wx/xrc/xh_sizer.h"
-#include "wx/xrc/xh_stbmp.h"
-#include "wx/xrc/xh_notbk.h"
-#include "wx/xrc/xh_text.h"
-#include "wx/xrc/xh_listb.h"
-#include "wx/xrc/xh_toolb.h"
-#include "wx/xrc/xh_bmpbt.h"
-#include "wx/xrc/xh_stbox.h"
-#include "wx/xrc/xh_scrol.h"
-#include "wx/xrc/xh_tree.h"
-#include "wx/xrc/xh_cald.h"
-#include "wx/xrc/xh_listc.h"
-#include "wx/xrc/xh_stlin.h"
-#include "wx/xrc/xh_bmp.h"
-#include "wx/xrc/xh_unkwn.h"
-#include "wx/xrc/xh_frame.h"
-
-#endif // _WX_XMLRES_H_

contrib/include/wx/xrc/xh_bmp.h

@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmp.h
-// Purpose:     XML resource handler for wxBitmap and wxIcon
-// Author:      Vaclav Slavik
-// Created:     2000/09/00
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BMP_H_
-#define _WX_XH_BMP_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_bmp.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxBitmapXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxIconXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BMP_H_

contrib/include/wx/xrc/xh_bmpbt.h

@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmpbt.h
-// Purpose:     XML resource handler for bitmap buttons
-// Author:      Brian Gavin
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BMPBT_H_
-#define _WX_XH_BMPBT_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_bmpbt.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxBitmapButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BMPBT_H_

contrib/include/wx/xrc/xh_bttn.h

@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bttn.h
-// Purpose:     XML resource handler for buttons
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BTTN_H_
-#define _WX_XH_BTTN_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_bttn.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_BTTN_H_

contrib/include/wx/xrc/xh_choic.h

@@ -1,32 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_choic.h
-// Purpose:     XML resource handler for wxChoice
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CHOIC_H_
-#define _WX_XH_CHOIC_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_choic.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxChoiceXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-
-#endif // _WX_XH_CHOIC_H_

contrib/include/wx/xrc/xh_combo.h

@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_combo.h
-// Purpose:     XML resource handler for wxComboBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_COMBO_H_
-#define _WX_XH_COMBO_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_combo.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_COMBOBOX
-
-class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxComboBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-#endif
-
-#endif // _WX_XH_COMBO_H_

contrib/include/wx/xrc/xh_gauge.h

@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_gauge.h
-// Purpose:     XML resource handler for wxGauge
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_GAUGE_H_
-#define _WX_XH_GAUGE_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_gauge.h"
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-
-#include "wx/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
-{
-    enum
-    {
-        wxGAUGE_DEFAULT_RANGE = 100
-    };
-
-public:
-    wxGaugeXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif
-
-#endif // _WX_XH_GAUGE_H_

contrib/include/wx/xrc/xh_listb.h

@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_listb.h
-// Purpose:     XML resource handler for wxListbox
-// Author:      Bob Mitchell & Vaclav Slavik
-// Created:     2000/07/29
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell & Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_LISTB_H_
-#define _WX_XH_LISTB_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_listb.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_LISTBOX
-
-class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxListBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-#endif
-
-#endif // _WX_XH_LISTB_H_

contrib/include/wx/xrc/xh_listc.h

@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_listc.h
-// Purpose:     XML resource handler for wxCalendarCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_LISTC_H_
-#define _WX_XH_LISTC_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_listc.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxListCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_LISTC_H_

contrib/include/wx/xrc/xh_menu.h

@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_menu.h
-// Purpose:     XML resource handler for menus/menubars
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_MENU_H_
-#define _WX_XH_MENU_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_menu.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxMenuXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideMenu;
-};
-
-class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
-{
-    public:
-        wxMenuBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_MENU_H_

contrib/include/wx/xrc/xh_scrol.h

@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_scrol.h
-// Purpose:     XML resource handler for wxScrollBar
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SCROL_H_
-#define _WX_XH_SCROL_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_scrol.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
-
-
-
-class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
-{
-    enum
-    {
-        wxSL_DEFAULT_VALUE = 0,
-        wxSL_DEFAULT_MIN = 0,
-        wxSL_DEFAULT_MAX = 100
-    };
-
-public:
-    wxScrollBarXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_SCROL_H_

contrib/include/wx/xrc/xh_spin.h

@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_spin.h
-// Purpose:     XML resource handler for wxSpinButton
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SPIN_H_
-#define _WX_XH_SPIN_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_spin.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
-
-#if wxUSE_SPINBTN
-class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
-{
-    enum
-    {
-        wxSP_DEFAULT_VALUE = 0,
-        wxSP_DEFAULT_MIN = 0,
-        wxSP_DEFAULT_MAX = 100
-    };
-
-public:
-    wxSpinButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-#endif
-
-#if wxUSE_SPINCTRL
-class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
-{
-    enum
-    {
-        wxSP_DEFAULT_VALUE = 0,
-        wxSP_DEFAULT_MIN = 0,
-        wxSP_DEFAULT_MAX = 100
-    };
-
-public:
-    wxSpinCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-#endif
-
-#endif // _WX_XH_SPIN_H_

contrib/include/wx/xrc/xh_stbox.h

@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stbox.h
-// Purpose:     XML resource handler for wxStaticBox
-// Author:      Brian Gavin
-// Created:     2000/09/00
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STBOX_H_
-#define _WX_XH_STBOX_H_
-
-#ifdef __GNUG__
-#pragma interface "xh_stbox.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-
-class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxStaticBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_STBOX_H_

contrib/samples/Makefile.in

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

contrib/samples/applet/applet.cpp

@@ -2,21 +2,22 @@
 *
 *                       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
+*    The contents of this file are subject to the wxWindows licence; you
-*    Version 3.0 (the "License"); you may not use this file except in
+*    may not use this file except in compliance with the License. You may
-*    compliance with the License. You may obtain a copy of the License at
+*    obtain a copy of the License at http://www.wxwindows.org/licence.htm
-*    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++

contrib/samples/applet/applet.h

@@ -2,21 +2,22 @@
 *
 *                       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
+*    The contents of this file are subject to the wxWindows licence; you
-*    Version 3.0 (the "License"); you may not use this file except in
+*    may not use this file except in compliance with the License. You may
-*    compliance with the License. You may obtain a copy of the License at
+*    obtain a copy of the License at http://www.wxwindows.org/licence.htm
-*    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++

contrib/samples/applet/combobox.cpp

@@ -2,21 +2,22 @@
 *
 *                       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
+*    The contents of this file are subject to the wxWindows licence; you
-*    Version 3.0 (the "License"); you may not use this file except in
+*    may not use this file except in compliance with the License. You may
-*    compliance with the License. You may obtain a copy of the License at
+*    obtain a copy of the License at http://www.wxwindows.org/licence.htm
-*    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++

contrib/samples/applet/combobox.h

@@ -2,21 +2,22 @@
 *
 *                       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
+*    The contents of this file are subject to the wxWindows licence; you
-*    Version 3.0 (the "License"); you may not use this file except in
+*    may not use this file except in compliance with the License. You may
-*    compliance with the License. You may obtain a copy of the License at
+*    obtain a copy of the License at http://www.wxwindows.org/licence.htm
-*    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++

contrib/samples/applet/monitorapplet.cpp

@@ -5,19 +5,23 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
-*  ========================================================================
+*  ======================================================================
-*
+*  |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
+*  |This copyrighted computer code is a proprietary trade secret of     |
-*    compliance with the License. You may obtain a copy of the License at
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*    http://www.wxwindows.org/licence3.txt
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*    Software distributed under the License is distributed on an
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+*  |written authorization from SciTech to possess or use this code, you |
-*    implied. See the License for the specific language governing
+*  |may be subject to civil and/or criminal penalties.                  |
-*    rights and limitations under the License.
+*  |                                                                    |
-*
+*  |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|
+*  ======================================================================
 *
 * Language:     ANSI C++
 * Environment:  Any

contrib/samples/applet/monitorapplet.h

@@ -1,23 +1,25 @@
 /****************************************************************************
 *
-*                       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|
-*    The contents of this file are subject to the wxWindows License
+*  |                                                                    |
-*    Version 3.0 (the "License"); you may not use this file except in
+*  |This copyrighted computer code is a proprietary trade secret of     |
-*    compliance with the License. You may obtain a copy of the License at
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*    http://www.wxwindows.org/licence3.txt
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*    Software distributed under the License is distributed on an
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+*  |written authorization from SciTech to possess or use this code, you |
-*    implied. See the License for the specific language governing
+*  |may be subject to civil and/or criminal penalties.                  |
-*    rights and limitations under the License.
+*  |                                                                    |
-*
+*  |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|
+*  ======================================================================
 *
 * Language:     ANSI C++
 * Environment:  Any

contrib/samples/canvas/simple/SimpleVC.dsp

@@ -1,175 +0,0 @@
-# Microsoft Developer Studio Project File - Name="SimpleVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=SimpleVC - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "SimpleVC.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "SimpleVC.mak" CFG="SimpleVC - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "SimpleVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "SimpleVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "SimpleVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "SimpleVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "SimpleVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/simple.exe" /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Debug DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugDLL"
-# PROP BASE Intermediate_Dir "DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdlld.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Release DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseDLL"
-# PROP BASE Intermediate_Dir "ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdll.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "SimpleVC - Win32 Release"
-# Name "SimpleVC - Win32 Debug"
-# Name "SimpleVC - Win32 Debug DLL"
-# Name "SimpleVC - Win32 Release DLL"
-# Begin Source File
-
-SOURCE=.\simple.cpp
-
-!IF  "$(CFG)" == "SimpleVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Debug DLL"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "SimpleVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\simple.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "..\..\include"
-# End Source File
-# End Target
-# End Project

contrib/samples/canvas/simple/SimpleVC.dsw

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

contrib/samples/canvas/simple/makefile.b32

@@ -1,18 +0,0 @@
-#
-# File:		makefile.b32
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:
-#
-# Makefile : Builds sample for 32-bit BC++
-
-WXDIR = $(WXWIN)
-
-TARGET=simple
-
-EXTRALIBS=$(WXDIR)\lib\canvas.lib
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-

contrib/samples/canvas/simple/makefile.g95

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

contrib/samples/canvas/simple/makefile.vc

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

contrib/samples/canvas/test/TestVC.dsp

@@ -1,175 +0,0 @@
-# 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

contrib/samples/canvas/test/TestVC.dsw

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

contrib/samples/canvas/test/makefile.g95

@@ -1,14 +0,0 @@
-# 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
-

contrib/samples/canvas/test/makefile.vc

@@ -1,14 +0,0 @@
-# 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
-

contrib/samples/canvas/test/test.rc

@@ -1,3 +0,0 @@
-#include "wx/msw/wx.rc"
-
-

contrib/samples/gizmos/Makefile.in

@@ -1,6 +1,6 @@
 # $Id$
 
-CONTRIB_SAMPLES=multicell splittree editlbox
+CONTRIB_SAMPLES=multicell splittree
 
 all:
 	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done

contrib/samples/gizmos/editlbox/makefile.b32

@@ -1,17 +0,0 @@
-#
-# 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
-

contrib/samples/gizmos/editlbox/makefile.g95

@@ -1,11 +0,0 @@
-# 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
-

contrib/samples/gizmos/multicell/makefile.b32

@@ -5,7 +5,6 @@ WXDIR = $(WXWIN)
 
 TARGET=mtest
 OBJECTS = $(TARGET).obj
-EXTRALIBS=$(WXDIR)\lib\gizmos.lib
 
 !include $(WXDIR)\src\makeprog.b32
 

contrib/samples/gizmos/multicell/makefile.g95

@@ -5,7 +5,7 @@ WXDIR = ../../../..
 
 TARGET=mtest
 OBJECTS = $(TARGET).o
-EXTRALIBS=$(WXDIR)/lib/libgizmos.a
+EXTRALIBS=$(WXDIR)/lib/libgizmos.lib
 
 include $(WXDIR)/src/makeprog.g95
 

contrib/samples/gizmos/splittree/makefile.b32

@@ -9,9 +9,8 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=tree
+TARGET=minimal
 OBJECTS = $(TARGET).obj
-EXTRALIBS=$(WXDIR)\lib\gizmos.lib
 
 !include $(WXDIR)\src\makeprog.b32
 

contrib/samples/gizmos/splittree/makefile.g95

@@ -7,11 +7,10 @@
 #
 # Makefile for wxWindows sample (Cygwin/Mingw32).
 
-WXDIR = ../../../..
+WXDIR = ../..
 
-TARGET=tree
+TARGET=minimal
 OBJECTS = $(TARGET).o
-EXTRALIBS=$(WXDIR)/lib/libgizmos.a
 
 include $(WXDIR)/src/makeprog.g95
 

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 splittree sample.\n")
+    msg.Printf( _T("This is the about dialog of tree sample.\n")
                 _T("Welcome to %s"), wxVERSION_STRING);
 
     wxMessageBox(msg, "About Tree Test", wxOK | wxICON_INFORMATION, this);
@@ -282,6 +282,8 @@ 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);

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_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"
+# 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"
 
 !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_1.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_0.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ENDIF
 

contrib/samples/ogl/ogledit/OGLEditVC.dsp

@@ -1,5 +1,6 @@
 # Microsoft Developer Studio Project File - Name="OGLEditVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
@@ -24,7 +25,6 @@ CFG=OGLEditVC - Win32 Debug
 !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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD 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" /nodefaultlib:"libci.lib" /nodefaultlib:"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,libci.lib,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 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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD 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" /nodefaultlib:"libcid.lib" /nodefaultlib:"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,libcid.lib,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 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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD 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_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"
+# 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"
 
 !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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD 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,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_1.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_0.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
 
 !ENDIF
 
@@ -147,30 +147,6 @@ LINK32=link.exe
 # Name "OGLEditVC - Win32 Release DLL"
 # Begin Source File
 
-SOURCE=.\doc.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.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\ogledit.cpp
 
 !IF  "$(CFG)" == "OGLEditVC - Win32 Release"
@@ -191,13 +167,23 @@ SOURCE=.\ogledit.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\ogledit.h
+SOURCE=.\doc.cpp
-# End Source File
+
-# Begin Source File
+!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
 
-SOURCE=.\ogledit.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
 # End Source File
 # Begin Source File
 
@@ -221,10 +207,6 @@ SOURCE=.\palette.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\palette.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\view.cpp
 
 !IF  "$(CFG)" == "OGLEditVC - Win32 Release"
@@ -245,7 +227,89 @@ SOURCE=.\view.cpp
 # 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
+
+# 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

contrib/samples/ogl/ogledit/OGLEditVC.dsw

@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
+Microsoft Developer Studio Workspace File, Format Version 5.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

contrib/samples/ogl/ogledit/doc.cpp

@@ -34,7 +34,7 @@
 #include "view.h"
 
 #if wxUSE_STD_IOSTREAM
-#include <ioswrap.h>
+#include <iostream.h>
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(DiagramDocument, wxDocument)
@@ -54,7 +54,7 @@ bool DiagramDocument::OnCloseDocument(void)
 }
 
 #if wxUSE_STD_IOSTREAM
-wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
+ostream& DiagramDocument::SaveObject(ostream& stream)
 {
   wxDocument::SaveObject(stream);
   
@@ -69,7 +69,7 @@ wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
   return stream;
 }
 
-wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)
+istream& DiagramDocument::LoadObject(istream& stream)
 {
   wxDocument::LoadObject(stream);
 

contrib/samples/ogl/ogledit/doc.h

@@ -23,7 +23,8 @@
 #include <wx/ogl/ogl.h>
 
 #if wxUSE_STD_IOSTREAM
- #include <iosfwd>
+class ostream;
+class istream;
 #endif
 
 /*
@@ -97,8 +98,8 @@ class DiagramDocument: public wxDocument
   ~DiagramDocument(void);
 
 #if wxUSE_STD_IOSTREAM
-    virtual wxSTD ostream& SaveObject(wxSTD ostream& stream);
+    virtual ostream& SaveObject(ostream& stream);
-    virtual wxSTD istream& LoadObject(wxSTD istream& stream);
+    virtual istream& LoadObject(istream& stream);
 #else
     virtual wxOutputStream& SaveObject(wxOutputStream& stream);
     virtual wxInputStream& LoadObject(wxInputStream& stream);

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_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"
+# 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"
 
 !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_1.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_0.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
 
 !ENDIF 
 

contrib/samples/plot/PlotVC.dsp

@@ -1,175 +0,0 @@
-# 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

contrib/samples/plot/PlotVC.dsw

@@ -1,29 +0,0 @@
-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>
-{{{
-}}}
-
-###############################################################################
-

contrib/samples/plot/makefile.b32

@@ -1,18 +0,0 @@
-#
-# File:		makefile.b32
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:
-#
-# Makefile : Builds sample for 32-bit BC++
-
-WXDIR = $(WXWIN)
-
-TARGET=plot
-
-EXTRALIBS=$(WXDIR)\lib\plot.lib
-OBJECTS = $(TARGET).obj
-
-!include $(WXDIR)\src\makeprog.b32
-

contrib/samples/plot/makefile.g95

@@ -1,15 +0,0 @@
-# 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
-

contrib/samples/plot/makefile.vc

@@ -1,14 +0,0 @@
-# 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
-

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_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"
+# 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"
 
 !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_1.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_0.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ENDIF
 

contrib/samples/stc/makefile.vc

@@ -7,7 +7,7 @@ WXDIR = $(WXWIN)
 PROGRAM = stctest
 
 OBJECTS = $(PROGRAM).obj
-EXTRALIBS = $(WXDIR)\lib\stc$(LIBEXT).lib
+EXTRALIBS = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib
 EXTRAINC = -I$(WXDIR)\contrib\include
 
 !include $(WXDIR)\src\makeprog.vc