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

BuildCVS.txt

@@ -2,6 +2,9 @@
                 How to build the sources from CVS
 ------------------------------------------------------------------------
 
+Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
+etc. alongside these instructions.
+
 I) Windows using plain makefiles
 ----------------------------------------
 
@@ -115,9 +118,38 @@ ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
 Of course, you can also build the library using plain makefiles (see
 section I).
 
-V) MacOS
+IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
 ----------------------------------------
 
+Refer to the readme.txt and install.txt files in docs/mac to build
+wxWindows under Classic Mac OS using CodeWarrior.
+
+If you are checking out the CVS sources using cvs under Mac OS X and
+compiling under Classic Mac OS, make sure that all text files have a
+Mac OS type of 'TEXT' otherwise CodeWarrior may ignore them. Checking
+out the CVS sources using cvs under Mac OS X creates untyped files
+which can lead to compialtion errors under CodeWarrior which are hard
+to track down.
+
+V) MacOS X using configure and the Developer Tools
+----------------------------------------
+
+You need to have the Developer Tools installed. If this is not the case,
+you will need to register at the Apple Developer web site (this is a free
+registration) in order to download the Developer Tools installer.
+
+In order to create configure, you need to have the
+GNU autoconf package (version 2.13 or 2.14) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf).
+
+-> type: mkdir macbuild
+-> type: cd macbuild
+-> type: ../configure --with-mac
+or type: ../configure
+-> type: make
+
 VI) OS/2
 ----------------------------------------
 

Makefile.in

@@ -42,6 +42,7 @@ VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
+VP12 = @top_srcdir@/src/msw/ole
 
 FTVP01 = @top_srcdir@/src/freetype/unix
 FTVP02 = @top_srcdir@/src/freetype/autohint
@@ -59,13 +60,13 @@ FTVP13 = @top_srcdir@/src/freetype/type1
 FTVP14 = @top_srcdir@/src/freetype/type1z
 FTVP15 = @top_srcdir@/src/freetype/winfonts
 
-VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
-VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
+VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -137,6 +138,7 @@ GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
+MACDIR   = $(WXDIR)/src/mac
 ODBCDIR  = $(WXDIR)/src/iodbc
 FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
@@ -150,15 +152,17 @@ INTLDIR  = $(WXDIR)/locale
 
 ########################## Archive name ###############################
 
-WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+# append a version suffix x.y.z to all file names
-WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
-WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
-WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
+WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
 
-WXARCHIVE_BZIP = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2
-WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
-WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
-WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
 
 DISTDIR = ./_dist_dir/@DISTDIR@
 
@@ -333,7 +337,15 @@ IODBCOBJS = \
 		misc.o \
 		prepare.o \
 		result.o
-        
+
+OLEOBJS = \
+		automtn.o \
+		dataobj.o \
+		dropsrc.o \
+		droptgt.o \
+		oleutils.o \
+		uuid.o
+
 ############################## Rules ##################################
 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
@@ -354,11 +366,17 @@ all: @WX_ALL@
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
-	
+
 @WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
-	
+
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.r: ./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc
+	$(DEREZ) $^ $(DEREZFLAGS) > $@
+
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc: $(MACRESOURCES)
+	$(REZ) $(REZFLAGS) $^ -o $@
+
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
@@ -367,7 +385,7 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
 		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
 		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
-	
+
 CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
@@ -376,7 +394,7 @@ CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
 		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
 		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
 		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
-	
+
 CREATE_INSTALLED_LINKS: preinstall
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
@@ -385,7 +403,7 @@ CREATE_INSTALLED_LINKS: preinstall
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
-	
+
 CREATE_INSTALLED_LINKS_GL: preinstall_gl
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
@@ -394,7 +412,7 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
-	
+
 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c
@@ -448,7 +466,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
 	$(INSTALL) -d $(libdir)/wx/include/wx
 	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
 	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
-	
+
 	$(INSTALL) -d $(includedir)/wx
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
@@ -575,8 +593,6 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
-	cp $(DOCDIR)/base/todo.txt $(DISTDIR)/wxBASE.todo
-	cp $(DOCDIR)/base/install.txt $(DISTDIR)/wxBASE.install
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
@@ -646,10 +662,8 @@ BASE_DIST: ALL_DIST
 	cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
 	cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
 	cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
-	cp $(DOCDIR)/base/install.txt $(DISTDIR)/INSTALL.txt
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
-	cp $(DOCDIR)/base/todo.txt $(DISTDIR)/TODO.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
@@ -692,6 +706,9 @@ MOTIF_DIST: ALL_GUI_DIST
 	cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
 	cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
+MACX_DIST: ALL_GUI_DIST
+	echo "Apple Mac OS X specific distribution not complete"
+
 MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
@@ -710,9 +727,9 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
 	cp $(DEMODIR)/configure $(DISTDIR)/demos
 	cp $(DEMODIR)/configure.in $(DISTDIR)/demos
-	
+
 	cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
-	    
+
 	mkdir $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
@@ -720,7 +737,7 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
-	
+
 	mkdir $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
@@ -728,7 +745,7 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
-	
+
 	mkdir $(DISTDIR)/demos/life
 	mkdir $(DISTDIR)/demos/life/bitmaps
 	cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
@@ -739,7 +756,7 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life
 	cp $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life
 	cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
-	
+
 	mkdir $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
@@ -748,12 +765,12 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
-    
+
 	mkdir $(DISTDIR)/demos/fractal
 	cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
 	cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
 	cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
-	
+
 SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples
 	cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
@@ -929,7 +946,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
-    
+
 	mkdir $(DISTDIR)/samples/internat
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
@@ -941,8 +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/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/de
 
 	mkdir $(DISTDIR)/samples/ipc
 	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
@@ -1047,11 +1066,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
 	cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
 
-	mkdir $(DISTDIR)/samples/plot
-	cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
-	cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
-	cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
-
 	mkdir $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
@@ -1079,7 +1093,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
-    
+
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/makefile.unx $(DISTDIR)/samples/richedit
@@ -1088,35 +1102,35 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
-    
+
 	mkdir $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
-    
+
 	mkdir $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
-    
+
 	mkdir $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/makefile.unx $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
-    
+
 	mkdir $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
-    
+
 	mkdir $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
-    
+
 	mkdir $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
@@ -1127,7 +1141,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
-    
+
 	mkdir $(DISTDIR)/samples/statbar
 	cp $(SAMPDIR)/statbar/Makefile.in $(DISTDIR)/samples/statbar
 	cp $(SAMPDIR)/statbar/makefile.unx $(DISTDIR)/samples/statbar
@@ -1139,12 +1153,12 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
-    
+
 	mkdir $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
-    
+
 	mkdir $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/makefile.unx $(DISTDIR)/samples/toolbar
@@ -1152,7 +1166,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
 	mkdir $(DISTDIR)/samples/toolbar/bitmaps
 	cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
-    
+
 	mkdir $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/makefile.unx $(DISTDIR)/samples/treectrl
@@ -1161,33 +1175,33 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
 	mkdir $(DISTDIR)/samples/treectrl/bitmaps
 	cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps
-    
+
 	mkdir $(DISTDIR)/samples/treelay
 	cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
 	cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
 	cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
 	cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
-    
+
 	mkdir $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/makefile.unx $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
-    
+
 	mkdir $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/makefile.unx $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
-    
+
 	mkdir $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/makefile.unx $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
-    
+
 UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
 	cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
@@ -1254,7 +1268,6 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/demo
 	mkdir $(DISTDIR)/wxPython/demo/bitmaps
 	mkdir $(DISTDIR)/wxPython/demo/data
-	mkdir $(DISTDIR)/wxPython/distrib
 	mkdir $(DISTDIR)/wxPython/src
 	mkdir $(DISTDIR)/wxPython/src/gtk
 	mkdir $(DISTDIR)/wxPython/wxPython
@@ -1263,7 +1276,9 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers
 
 	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/contrib/buildall.py $(DISTDIR)/wxPython/contrib
+	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
 	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
 	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
 	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
@@ -1271,13 +1286,11 @@ PYTHON_DIST:
 	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
 	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
 	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
-	cp $(WXDIR)/wxPython/distrib/build.py $(DISTDIR)/wxPython/distrib
 	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
 	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
 	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
-	cp $(WXDIR)/wxPython/wxPython/lib/sizers/*.py $(DISTDIR)/wxPython/wxPython/lib/sizers
 
 distclean:
 	$(RM) -r _dist_dir
@@ -1285,15 +1298,18 @@ distclean:
 dist: @GUIDIST@
 	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(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; \
+	mv samples wxSamples-$(VER_SUFFIX); \
-	tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \
+	tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
-	mv wxSamples samples; \
+	mv wxSamples-$(VER_SUFFIX) samples; \
-	mv demos wxDemos; \
+	mv demos wxDemos-$(VER_SUFFIX); \
-	tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \
+	tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
-	mv wxDemos demos; \
+	mv wxDemos-$(VER_SUFFIX) demos; \
 	fi
 
 bzip-dist: @GUIDIST@
@@ -1330,3 +1346,18 @@ clean:
 	$(RM) ./lib/lib*
 
 cleanall: clean
+
+
+RPMTOP=_dist_dir/_rpm_top
+
+rpm: dist
+	@echo "*** Building RPMs ***"
+	-mkdir $(RPMTOP)
+	-mkdir $(RPMTOP)/SOURCES
+	-mkdir $(RPMTOP)/SPECS
+	-mkdir $(RPMTOP)/BUILD
+	-mkdir $(RPMTOP)/RPMS
+	-mkdir $(RPMTOP)/SRPMS
+	cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
+	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
+	mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .

configure.in

@@ -448,27 +448,39 @@ AC_CANONICAL_SYSTEM
 dnl When making releases do:
 dnl
 dnl WX_RELEASE_NUMBER += 1
-dnl WX_INTERFACE_AGE += 1
-dnl WX_BINARY_AGE += 1
 dnl
-dnl if any functions have been added, do:
+dnl ..and update WX_CURRENT, WX_RELEASE and WX_AGE according to the
+dnl following rules:
 dnl
-dnl WX_INTERFACE_AGE = 0
+dnl    If any changes have been made to the public interface, that is if any
+dnl    exported class, method, global or global type has been added, removed
+dnl    or changed in any way, then do:  WX_CURRENT += 1
+dnl
+dnl    If source changes have been made that *do not* alter the public
+dnl    interface then do:  WX_REVISION += 1
+dnl    If WX_CURRENT was incremented (as above) instead do:  WX_REVISION = 0
+dnl
+dnl    If any public interface was added, do:  WX_AGE += 1
+dnl    If any public interface was removed (or altered in a way effectively
+dnl    removing the previous definition), instead do:  WX_AGE = 0
+dnl
+dnl When the major or minor version numbers are incremented, all the above
+dnl variables should be reset to 0.
+dnl
+dnl The resulting library name will be of the form:
+dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=3
 WX_RELEASE_NUMBER=0
 
-WX_INTERFACE_AGE=0
-WX_BINARY_AGE=0
-
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
-
-dnl wxWindows shared library versioning
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
-WX_CURRENT=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE`
+
-WX_REVISION=$WX_INTERFACE_AGE
+WX_CURRENT=0
-WX_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE`
+WX_REVISION=0
+WX_AGE=0
+
 
 dnl ------------------------------------------------------------------------
 dnl Check platform (host system)
@@ -478,6 +490,7 @@ dnl assume Unix
 USE_UNIX=1
 USE_WIN32=0
 USE_BEOS=0
+USE_MAC=0
 
 USE_LINUX=
 USE_SGI=
@@ -492,6 +505,7 @@ USE_ALPHA=
 USE_OSF=
 USE_BSD=
 USE_FREEBSD=
+USE_OPENBSD=
 USE_NETBSD=
 USE_VMS=
 USE_ULTRIX=
@@ -505,13 +519,14 @@ dnl than checking it during run-time
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
 dnl the list of all available toolkits
-ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE PM"
+ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF MAC WINE PM"
 
 dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
 dnl     which are either yes or no
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
+DEFAULT_wxUSE_MAC=0
 DEFAULT_wxUSE_WINE=0
 DEFAULT_wxUSE_PM=0
 
@@ -521,6 +536,7 @@ dnl nothing was found in the cache
 DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
+DEFAULT_DEFAULT_wxUSE_MAC=0
 DEFAULT_DEFAULT_wxUSE_WINE=0
 DEFAULT_DEFAULT_wxUSE_PM=0
 
@@ -580,6 +596,13 @@ case "${host}" in
     AC_DEFINE(__BSD__)
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
+  *-*-openbsd*)
+    USE_BSD=1
+    USE_OPENBSD=1
+    AC_DEFINE(__FREEBSD__)
+    AC_DEFINE(__OPENBSD__)
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
   *-*-netbsd*)
     USE_BSD=1
     USE_NETBSD=1
@@ -619,7 +642,7 @@ case "${host}" in
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
-  *-*-cygwin32* | *-*-mingw32* )
+  *-*-cygwin* | *-*-mingw32* )
     USE_UNIX=0
     USE_WIN32=1
     AC_DEFINE(__WIN32__)
@@ -638,6 +661,15 @@ case "${host}" in
     DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 
+  *-*-darwin* )
+    USE_BSD=1
+    USE_MAC=1
+    AC_DEFINE(__MAC__)
+    AC_DEFINE(__BSD__)
+    AC_DEFINE(__UNIX__)
+    DEFAULT_DEFAULT_wxUSE_MAC=1
+  ;;
+
   *-*-beos* )
     dnl leave USE_UNIX on - BeOS is sufficiently Unix-like for this
     USE_BEOS=1
@@ -779,7 +811,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_PLOT=no
   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
@@ -793,6 +824,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_STATLINE=no
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no
+  DEFAULT_wxUSE_TOGGLEBTN=no
   DEFAULT_wxUSE_TOOLBAR=no
   DEFAULT_wxUSE_TOOLBAR_NATIVE=no
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
@@ -801,9 +833,11 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
+  DEFAULT_wxUSE_IMAGE=no
   DEFAULT_wxUSE_GIF=no
   DEFAULT_wxUSE_PCX=no
   DEFAULT_wxUSE_PNM=no
+  DEFAULT_wxUSE_XPM=no
 else
   DEFAULT_wxUSE_THREADS=yes
 
@@ -902,7 +936,6 @@ else
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_PLOT=yes
   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
@@ -916,6 +949,7 @@ else
   DEFAULT_wxUSE_STATLINE=yes
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no
+  DEFAULT_wxUSE_TOGGLEBTN=yes
   DEFAULT_wxUSE_TOOLBAR=yes
   DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
@@ -924,9 +958,11 @@ else
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
+  DEFAULT_wxUSE_IMAGE=yes
   DEFAULT_wxUSE_GIF=yes
   DEFAULT_wxUSE_PCX=yes
   DEFAULT_wxUSE_PNM=yes
+  DEFAULT_wxUSE_XPM=yes
 fi
 
 dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -962,6 +998,7 @@ if test "$wxUSE_GUI" = "yes"; then
 
 AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
 AC_ARG_WITH(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(cygwin,        [  --with-cygwin           use Cygwin for MS-Windows], [wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mingw,         [  --with-mingw            use GCC Minimal MS-Windows], [wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1])
@@ -1093,6 +1130,7 @@ dnl ---------------------------------------------------------------------------
 
 WX_ARG_ENABLE(clipboard,   [  --enable-clipboard      use wxClipboard classes], wxUSE_CLIPBOARD)
 WX_ARG_ENABLE(dnd,         [  --enable-dnd            use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
+WX_ARG_ENABLE(metafile,    [  --enable-metafile       use win32 metafiles], wxUSE_METAFILE)
 
 dnl TODO: doesn't work yet
 WX_ARG_ENABLE(wxtree,      [  --enable-wxtree         make wxTree library], wxUSE_WXTREE)
@@ -1134,6 +1172,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_STATLINE=yes
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TAB_DIALOG=yes
+  DEFAULT_wxUSE_TOGGLEBTN=yes
   DEFAULT_wxUSE_TOOLBAR=yes
   DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
@@ -1167,6 +1206,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_STATLINE=no
   DEFAULT_wxUSE_STATUSBAR=no
   DEFAULT_wxUSE_TAB_DIALOG=no
+  DEFAULT_wxUSE_TOGGLEBTN=no
   DEFAULT_wxUSE_TOOLBAR=no
   DEFAULT_wxUSE_TOOLBAR_NATIVE=no
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
@@ -1201,6 +1241,7 @@ WX_ARG_ENABLE(statbox,     [  --enable-statbox        use wxStaticBox class], wx
 WX_ARG_ENABLE(statline,    [  --enable-statline       use wxStaticLine class], wxUSE_STATLINE)
 WX_ARG_ENABLE(statusbar,   [  --enable-statusbar      use wxStatusBar class], wxUSE_STATUSBAR)
 WX_ARG_ENABLE(tabdialog,   [  --enable-tabdialog      use wxTabControl class], wxUSE_TABDIALOG)
+WX_ARG_ENABLE(togglebtn,   [  --enable-togglebtn      use wxToggleButton class], wxUSE_TOGGLEBTN)
 WX_ARG_ENABLE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUSE_TOOLBAR)
 WX_ARG_ENABLE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
 WX_ARG_ENABLE(tbarsmpl,    [  --enable-tbarsmpl       use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
@@ -1221,16 +1262,17 @@ WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUS
 WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
 WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
 WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
-WX_ARG_ENABLE(plot,        [  --enable-plot           use wxPlot], wxUSE_PLOT)
 WX_ARG_ENABLE(joystick,    [  --enable-joystick       compile in joystick support (Linux only)], wxUSE_JOYSTICK)
 
 dnl ---------------------------------------------------------------------------
 dnl support for image formats that do not rely on external library
 dnl ---------------------------------------------------------------------------
 
+WX_ARG_ENABLE(image,       [  --enable-image          use wxImage class], wxUSE_IMAGE)
 WX_ARG_ENABLE(gif,         [  --enable-gif            use gif images (GIF file format)], wxUSE_GIF)
 WX_ARG_ENABLE(pcx,         [  --enable-pcx            use pcx images (PCX file format)], wxUSE_PCX)
 WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
+WX_ARG_ENABLE(pnm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
 
 fi
 dnl for GUI only
@@ -1269,7 +1311,7 @@ else
 fi
 
 dnl we suppose that expr exists...
-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
 
 dnl Allow wxUSE_PM only for OS/2 with EMX.
 dnl Path separator; ':' for unix.
@@ -1538,10 +1580,6 @@ USE_GUI=1
 TOOLKIT=
 TOOLKIT_INCLUDE=
 
-GUIOBJS=
-COMMONOBJS=
-GENERICOBJS=
-
 GUI_TK_LIBRARY=
 GUI_TK_LINK=
 
@@ -1583,12 +1621,6 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
     fi
 
     TOOLKIT=MSW
-
-    GUIOBJS="\$(MSW_GUIOBJS)"
-    GUIHEADERS="\$(MSW_HEADERS)"
-    COMMONOBJS="\$(MSW_COMMONOBJS)"
-    GENERICOBJS="\$(MSW_GENERICOBJS)"
-    UNIXOBJS=
     GUIDIST=MSW_DIST
 
     dnl we should calculate these
@@ -1636,19 +1668,9 @@ dnl       GUI_TK_LIBRARY="$GTK_LIBS -gthread12"
 dnl    else
 dnl       GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
 dnl    fi
-    TOOLKIT=GTK
 
     AFMINSTALL=afminstall
-
+    TOOLKIT=GTK
-    GUIOBJS="\$(GTK_GUIOBJS)"
-    GUIHEADERS="\$(GTK_HEADERS)"
-    COMMONOBJS="\$(GTK_COMMONOBJS)"
-    GENERICOBJS="\$(GTK_GENERICOBJS)"
-    GUIDEPS="\$(GTK_GUIDEPS)"
-    COMMONDEPS="\$(GTK_COMMONDEPS)"
-    GENERICDEPS="\$(GTK_GENERICDEPS)"
-    UNIXOBJS="\$(UNIX_OBJS)"
-    UNIXDEPS="\$(UNIX_DEPS)"
     GUIDIST=GTK_DIST
 
     dnl test for XIM support in libgdk
@@ -1694,16 +1716,6 @@ if test "$wxUSE_WINE" = 1; then
     GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
     WXWINE=1
     TOOLKIT=MSW
-
-    GUIHEADERS="\$(MSW_HEADERS)"
-    GUIOBJS="\$(MSW_GUIOBJS)"
-    COMMONOBJS="\$(MSW_COMMONOBJS)"
-    GENERICOBJS="\$(MSW_GENERICOBJS)"
-    GUIDEPS="\$(MSW_GUIDEPS)"
-    COMMONDEPS="\$(MSW_COMMONDEPS)"
-    GENERICDEPS="\$(MSW_GENERICDEPS)"
-    UNIXOBJS="\$(UNIX_OBJS)"
-    UNIXDEPS="\$(UNIX_DEPS)"
     GUIDIST=MSW_DIST
 fi
 
@@ -1880,31 +1892,17 @@ if test "$wxUSE_MOTIF" = 1; then
     GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
     GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
     TOOLKIT=MOTIF
-
-    GUIHEADERS="\$(MOTIF_HEADERS)"
-    GUIOBJS="\$(MOTIF_GUIOBJS)"
-    COMMONOBJS="\$(MOTIF_COMMONOBJS)"
-    GENERICOBJS="\$(MOTIF_GENERICOBJS)"
-    GUIDEPS="\$(MOTIF_GUIDEPS)"
-    COMMONDEPS="\$(MOTIF_COMMONDEPS)"
-    GENERICDEPS="\$(MOTIF_GENERICDEPS)"
-    UNIXOBJS="\$(UNIX_OBJS)"
-    UNIXDEPS="\$(UNIX_DEPS)"
     GUIDIST=MOTIF_DIST
 fi
 
+if test "$wxUSE_MAC" = 1; then
+    TOOLKIT=MAC
+    dnl we can't call this MAC_DIST or autoconf thinks its a macro
+    GUIDIST=MACX_DIST
+fi
+
 if test "$wxUSE_PM" = 1; then
     TOOLKIT=PM
-
-    GUIOBJS="\$(PM_GUIOBJS)"
-    GUIHEADERS="\$(PM_HEADERS)"
-    COMMONOBJS="\$(PM_COMMONOBJS)"
-    GENERICOBJS="\$(PM_GENERICOBJS)"
-    GUIDEPS="\$(PM_GUIDEPS)"
-    COMMONDEPS="\$(PM_COMMONDEPS)"
-    GENERICDEPS="\$(PM_GENERICDEPS)"
-    UNIXOBJS=
-    UNIXDEPS=
     GUIDIST=GTK_DIST
 fi
 
@@ -1932,10 +1930,8 @@ fi
     ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)"
 
     dnl ODBC objects are Unix only
-    if test "$TOOLKIT" != "MSW"; then
+    if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
-        if test "$wxUSE_ODBC" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
-            ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
-        fi
     fi
 
     if test "$wxUSE_LIBJPEG" = "yes" ; then
@@ -1978,8 +1974,8 @@ else
     TOOLKIT_DEF="-D__WXBASE__"
 
     dnl the sources, their dependenices and the headers
-    ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}"
+    ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)"
-    ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}"
+    ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)"
 
     if test "$wxUSE_ZLIB" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
@@ -2109,7 +2105,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
       ;;
-      *-*-freebsd* | *-*-netbsd*)
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
         SHARED_LD="${CC} -shared -o"
         PIC_FLAG="-fPIC"
         if test "$wxUSE_OPENGL" = "yes"; then
@@ -2120,6 +2116,29 @@ if test "$wxUSE_SHARED" = "yes"; then
             WX_ALL="CREATE_LINKS"
         fi
       ;;
+      *-*-darwin* )
+        SHARED_LD="${CXX} -dynamiclib -o"
+        PIC_FLAG="-dynamic -fPIC"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        else
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+            WX_ALL="CREATE_LINKS"
+        fi
+	dnl add the resources target
+	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}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
+	WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
+	dnl the name of the links to the shared library
+	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}.${WX_CURRENT}.dylib"
+	WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
+	WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
+      ;;
       *-*-osf* )
         SHARED_LD="${CXX} -shared -o"
         PIC_FLAG="-fPIC"
@@ -2142,7 +2161,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
         WX_ALL=${WX_LIBRARY_NAME_SHARED}
       ;;
-      *-*-cygwin32* )
+      *-*-cygwin* )
         dnl only static for now
         WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
         WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
@@ -2252,6 +2271,22 @@ AC_TYPE_SIZE_T
 dnl   defines uid_t and gid_t if not already defined
 AC_TYPE_UID_T
 
+dnl   check for wchar_t
+AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
+[
+    AC_TRY_COMPILE([#include <wchar.h>],
+        [
+	    wchar_t wc, *ws;
+	    wc = L'a';
+	    ws = L"Hello, world!";
+        ],
+	wx_cv_type_wchar_t=yes,
+	wx_cv_type_wchar_t=no)
+])
+if test "$wx_cv_type_wchar_t" = yes ; then
+    AC_DEFINE(wxUSE_WCHAR_T)
+fi
+
 dnl ---------------------------------------------------------------------------
 dnl Checks for structures
 dnl ---------------------------------------------------------------------------
@@ -2292,13 +2327,37 @@ dnl check the sizes of integral types (give some reasonable default values for
 dnl cross-compiling)
 dnl   defines the size of certain types of variables in SIZEOF_<TYPE>
 AC_CHECK_SIZEOF(char, 1)
-AC_CHECK_SIZEOF(wchar_t, 4)
 AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(int *, 4)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 4)
 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
+AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
+[
+    AC_TRY_RUN(
+        [
+	    #include <wchar.h>
+	    #include <stdio.h>
+	    int main()
+	    {
+            FILE *f=fopen("conftestval", "w");
+            if (!f) exit(1);
+	    fprintf(f, "%i", sizeof(wchar_t));
+	    exit(0);
+	    }
+        ],
+	wx_cv_sizeof_wchar_t=`cat conftestval`,
+	wx_cv_sizeof_wchar_t=0,
+	wx_cv_sizeof_wchar_t=4
+	)
+])
+
+AC_DEFINE_UNQUOTED(SIZEOF_WCHAR_T, $wx_cv_sizeof_wchar_t)
+
+
 dnl for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling)
 WX_C_BIGENDIAN
 
@@ -2329,8 +2388,6 @@ AC_CHECK_LIB(c, wcslen, [
 dnl check for vprintf/vsprintf() which are GNU extensions
 AC_FUNC_VPRINTF
 
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
 
 dnl check for vsscanf() and vsnprintf() - on some platforms (Linux, glibc
 dnl 2.1.1 for the first one, HP-UX for the second) it's available in the
@@ -2344,6 +2401,14 @@ dnl understand why it works, remember that AC_TRY_COMPILE() just prepends
 dnl "int main() {" in the beginning of the code and "; return 0; }" at the
 dnl end...
 
+dnl if we fail to find vsnprintf, also try for _vsnprintf as that is what
+dnl we'll find under MSW if it exists.
+
+dnl final note: AC_TRY_COMPILE will only be executed if there is nothing in
+dnl the cache so we have to do AC_DEFINE(HAVE_VSNPRINTF) below and not inside
+dnl it or the symbol wouldn't be defined for the 2nd and subsequent configure
+dnl runs
+
 dnl check for vsnprintf() - a safe version of vsprintf()
 AC_CACHE_CHECK([for vsnprintf], wx_cv_func_vsnprintf,
 [
@@ -2366,14 +2431,40 @@ AC_CACHE_CHECK([for vsnprintf], wx_cv_func_vsnprintf,
                     vsnprintf(s, 42, fmt, argp);
                     va_end(argp);
                  ], [
-                    AC_DEFINE(HAVE_VSNPRINTF)
                     wx_cv_func_vsnprintf=yes
                  ], [
-                    AC_MSG_WARN(unsafe function sprintf will be used instead of snprintf)
+                    AC_TRY_COMPILE([
-                    wx_cv_func_vsnprintf=no
+                                      #include <stdio.h>
+                                      #include <stdarg.h>
+                                   ], [
+                                      int wx_test_vsnprintf(const char *, ...);
+
+                                      wx_test_vsnprintf("%s");
+                                      return 0;
+                                   }
+
+                                   int wx_test_vsnprintf(const char *fmt, ...)
+                                   {
+                                      char *s;
+
+                                      va_list argp;
+                                      va_start(argp, fmt);
+                                      _vsnprintf(s, 42, fmt, argp);
+                                      va_end(argp);
+                                   ], [
+                                      wx_cv_func_vsnprintf=yes
+                                   ], [
+                                      wx_cv_func_vsnprintf=no
+                                   ])
                  ])
 ])
 
+if test "$wx_cv_func_vsnprintf" = yes; then
+    AC_DEFINE(HAVE_VSNPRINTF)
+else
+    AC_MSG_WARN(unsafe function sprintf will be used instead of snprintf)
+fi
+
 dnl check for vsscanf()
 AC_CACHE_CHECK([for vsscanf], wx_cv_func_vsscanf,
 [
@@ -2394,18 +2485,43 @@ AC_CACHE_CHECK([for vsscanf], wx_cv_func_vsscanf,
                     vsscanf("42", fmt, argp);
                     va_end(argp);
                 ], [
-                    AC_DEFINE(HAVE_VSSCANF)
                     wx_cv_func_vsscanf=yes
                 ], [
                     wx_cv_func_vsscanf=no
                 ])
 ])
 
+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
 
+dnl check for available version of iconv()
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CACHE_CHECK([if iconv() takes char**], wx_cv_iconv_takes_char,
+[
+    AC_TRY_COMPILE([#include <iconv.h>],
+    [
+        char **inbuf, **outbuf;
+	iconv_t cd;
+	size_t insz, outsz;
+	iconv(cd, inbuf, &insz, outbuf, &outsz);
+    ],
+    wx_cv_iconv_takes_char=yes,
+    wx_cv_iconv_takes_char=no)
+])
+AC_LANG_RESTORE
+if test "$wx_cv_iconv_takes_char" = yes ; then
+    AC_DEFINE(WX_ICONV_TAKES_CHAR)
+fi
+
+
 dnl check for POSIX signals if we need them
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
     AC_CHECK_FUNCS(sigaction)
@@ -2457,6 +2573,13 @@ if test "$USE_BEOS" = 1; then
     HAVE_SOME_SLEEP_FUNC=1
 fi
 
+if test "$USE_MAC" = 1; then
+    dnl Mac OS X has both nanosleep and usleep
+    dnl but only usleep is defined in unistd.h
+    AC_DEFINE(HAVE_USLEEP)
+    HAVE_SOME_SLEEP_FUNC=1
+fi
+
 if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
     dnl try nanosleep() in libc and libposix4, if this fails - usleep()
     POSIX4_LINK=
@@ -2469,7 +2592,9 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
                     POSIX4_LINK="-lposix4"
                 ],
                 [
-                    AC_CHECK_FUNCS(usleep)
+                    AC_CHECK_FUNCS(usleep,
+        		AC_DEFINE(HAVE_USLEEP),
+		    )
                     AC_MSG_WARN([wxSleep() function will not work])
                 ]
             )
@@ -2555,8 +2680,10 @@ if test "$wxUSE_THREADS" = "yes" ; then
     dnl find if POSIX threads are available
 
     dnl AIX calls the library libpthreads - thanks IBM!
-    if test "$wxUSE_AIX" = 1; then
+    if test "$USE_AIX" = 1; then
         THREADS_LIB=pthreads
+    elif test "$USE_MAC" = 1; then
+        THREADS_LIB=cc_dynamic
     else
         THREADS_LIB=pthread
     fi
@@ -2573,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"
+                    ])
                 ])
             ])
         ])
@@ -2654,13 +2787,72 @@ if test "$wxUSE_THREADS" = "yes" ; then
                     pthread_cleanup_pop(0);
                  ], [
                     wx_cv_func_pthread_cleanup_push=yes
-                    AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
                  ], [
                     wx_cv_func_pthread_cleanup_push=no
                  ])
   ])
 
+  if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
+      AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
+  fi
+
+  dnl mutexattr_t initialization is done in quite different ways on different
+  dnl platforms, so check for a few things:
+  dnl
+  dnl HAVE_MUTEX_RECURSIVE means that we can create recursive mutexes
+  dnl HAVE_MUTEXATTR_SETTYPE means that we do it using
+  dnl pthread_mutexattr_settype(PTHREAD_MUTEX_RECURSIVE) and if it is not
+  dnl defined, we do it by directly assigned
+  dnl PTHREAD_MUTEX_RECURSIVE_MUTEX_INITIALIZER_NP to attr
+
+  AC_CACHE_CHECK([for pthread_mutexattr_t], wx_cv_type_pthread_mutexattr_t,
+  [
+    AC_TRY_COMPILE([#include <pthread.h>],
+        [
+           pthread_mutexattr_t attr;
+           pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+        ], [
+           wx_cv_type_pthread_mutexattr_t=yes
+        ], [
+           wx_cv_type_pthread_mutexattr_t=no
+        ]
+    )
+  ])
+
+  if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
+    AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_T)
+  else
+    dnl don't despair, there may be another way to do it
+    AC_CACHE_CHECK([for PTHREAD_RECURSIVE_MUTEX_INITIALIZER],
+                   wx_cv_type_pthread_rec_mutex_init,
+    [
+        AC_TRY_COMPILE([#include <pthread.h>],
+            [
+                pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+            ], [
+                wx_cv_type_pthread_rec_mutex_init=yes
+            ], [
+                wx_cv_type_pthread_rec_mutex_init=no
+            ]
+        )
+    ])
+    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
+      AC_MSG_WARN([wxMutex won't be recursive on this platform])
+    fi
+  fi
+
   THREADS_LINK="-l$THREADS_LINK"
+
+  dnl building MT programs under Solaris with the native compiler requires -mt
+  dnl switch
+  if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
+      CFLAGS="${CFLAGS} -mt"
+      CXXFLAGS="${CXXFLAGS} -mt"
+      LDFLAGS="${LDFLAGS} -mt"
+  fi
 fi
 
 dnl from if !MSW
@@ -2669,9 +2861,11 @@ fi
 if test "$wxUSE_THREADS" = "yes"; then
   AC_DEFINE(wxUSE_THREADS)
 
-  dnl must define _REENTRANT for multithreaded code
+  dnl must define _REENTRANT for multithreaded code except for Mac OS X
-  CFLAGS="${CFLAGS} -D_REENTRANT"
+  if test "$wxUSE_MAC" = "0"; then
-  CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+    CFLAGS="${CFLAGS} -D_REENTRANT"
+    CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+  fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
@@ -2706,6 +2900,20 @@ if test "$WXWINE" = 1 ; then
   TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
 fi
 
+if test "$wxUSE_MAC" = 1 ; then
+  TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__POWERPC__ -DTARGET_CARBON"
+  CFLAGS="${CFLAGS} -fno-common -fpascal-strings"
+  CPPFLAGS="${CPPFLAGS} -fno-common -fpascal-strings"
+  AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
+  AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
+  RESCOMP=${REZ}
+  REZFLAGS="-d __UNIX__ -useDF"
+  DEREZFLAGS="Carbon.r -useDF"
+  RESFLAGS="Carbon.r -t APPL"
+  LIBWXMACRES="\$(LIBWX_MACRES)"
+  LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)"
+fi
+
 if test "$wxUSE_CYGWIN" = 1 ; then
   TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__"
 fi
@@ -2749,12 +2957,13 @@ fi
 
 DEP_INFO_FLAGS=
 CODE_GEN_FLAGS=
+CODE_GEN_FLAGS_CXX=
 if test "$GCC" = yes ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then
-        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-rtti"
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti"
     fi
     if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
-        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions"
     fi
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
@@ -3005,10 +3214,6 @@ if test "$wxUSE_GEOMETRY" = "yes"; then
   AC_DEFINE(wxUSE_GEOMETRY)
 fi
 
-if test "$wxUSE_PLOT" = "yes"; then
-  AC_DEFINE(wxUSE_PLOT)
-fi
-
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
@@ -3169,8 +3374,9 @@ if test "$wxUSE_SOCKETS" = "yes"; then
     )
 fi
 
-fi
+dnl this test may be appropriate if building under cygwin
-dnl if !MSW
+dnl right now I'm assuming it also uses the winsock stuff
+dnl like mingw does..  -- RL
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     dnl determine the type of third argument for getsockname
@@ -3226,6 +3432,9 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
     fi
 fi
 
+fi
+dnl if !MSW
+
 if test "$wxUSE_SOCKETS" = "yes" ; then
     AC_DEFINE(wxUSE_SOCKETS)
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
@@ -3271,10 +3480,14 @@ if test "$TOOLKIT" != "MSW"; then
 HAVE_DL_FUNCS=0
 HAVE_SHL_FUNCS=0
 if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
-    dnl the test is a bit complicated because we check for dlopen() both with
+    if test "$USE_MAC" = 1; then
-    dnl and without -ldl and we also try to find shl_load() if there is no
+        dnl Mac OS X needs dl_macosx.c to be compiled in to fake dlopen/dlerror
-    dnl dlopen() on this system
+        HAVE_DL_FUNCS=1
-    AC_CHECK_FUNCS(dlopen,
+    else
+        dnl the test is a bit complicated because we check for dlopen() both with
+        dnl and without -ldl and we also try to find shl_load() if there is no
+        dnl dlopen() on this system
+        AC_CHECK_FUNCS(dlopen,
         [
             AC_DEFINE(HAVE_DLOPEN)
             HAVE_DL_FUNCS=1
@@ -3308,6 +3521,7 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
                        AC_DEFINE(HAVE_DLERROR),
                        AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)))
     fi
+    fi
 
     if test "$HAVE_DL_FUNCS" = 0; then
         if test "$HAVE_SHL_FUNCS" = 0; then
@@ -3364,9 +3578,6 @@ if test "$wxUSE_ODBC" = "yes" ; then
     AC_DEFINE(wxUSE_ODBC)
     WXODBCFLAG="-D_IODBC_"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-    IODBCOBJS="\$(IODBC_OBJS)"
-else
-    IODBCOBJS=
 fi
 
 dnl ----------------------------------------------------------------
@@ -3463,11 +3674,36 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
         wxUSE_DRAG_AND_DROP=no
     fi
 
+    if test "$wxUSE_MAC" = 1; then
+        AC_MSG_WARN([Drag and drop is not yet supported under Mac OS X])
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
     if test "$USE_WIN32" = 1; then
         dnl check for ole headers and disable DnD if not present (earlier
         dnl versions of mingw32 don't have them)
+
         AC_CHECK_HEADERS(ole2.h)
-        if test "x$HAVE_OLE2_H" = x ; then
+
+	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)"
+                ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
+                CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+                LIBS="$LIBS -lole32 -luuid"
+
+                dnl metafiles need the ole code, right??  if not this
+                dnl doesn't need to be in here.
+                if test "$wxUSE_METAFILE" = "yes"; then
+                    AC_DEFINE(wxUSE_METAFILE)
+                    dnl this one should probably be made separately configurable
+                    AC_DEFINE(wxUSE_ENH_METAFILE)
+                fi
+            fi
+        else
             AC_MSG_WARN(Drag and drop disabled because OLE headers not found)
             wxUSE_DRAG_AND_DROP=no
         fi
@@ -3617,6 +3853,10 @@ if test "$wxUSE_TABDIALOG" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
+if test "$wxUSE_TOGGLEBTN" = "yes"; then
+  AC_DEFINE(wxUSE_TOGGLEBTN)
+fi
+
 if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
     AC_DEFINE(wxUSE_TOOLBAR_SIMPLE)
     wxUSE_TOOLBAR="yes"
@@ -3667,10 +3907,6 @@ dnl if test "$wxUSE_WXTREE" = "yes"; then
 dnl   AC_DEFINE(wxUSE_WXTREE)
 dnl fi
 
-if test "$wxUSE_METAFILE" = "yes"; then
-    AC_DEFINE(wxUSE_METAFILE)
-fi
-
 if test "$wxUSE_DIRDLG" = "yes"; then
     if test "$wxUSE_CONSTRAINTS" != "yes"; then
        AC_MSG_WARN(wxDirDialog requires constraints so it won't be compiled without them)
@@ -3719,6 +3955,10 @@ if test "$wxUSE_VALIDATORS" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
+if test "$wxUSE_IMAGE" = "yes" ; then
+  AC_DEFINE(wxUSE_IMAGE)
+fi
+
 if test "$wxUSE_GIF" = "yes" ; then
   AC_DEFINE(wxUSE_GIF)
 fi
@@ -3731,6 +3971,10 @@ if test "$wxUSE_PNM" = "yes" ; then
   AC_DEFINE(wxUSE_PNM)
 fi
 
+if test "$wxUSE_XPM" = "yes" ; then
+  AC_DEFINE(wxUSE_XPM)
+fi
+
 dnl ---------------------------------------------------------------------------
 dnl get the string with OS info - used by wxGetOsDescription()
 dnl ---------------------------------------------------------------------------
@@ -3755,9 +3999,12 @@ OPENGL_LIBS="$OPENGL_LINK"
 
 dnl all additional libraries (except wxWindows itself) we link with
 dnl
-dnl note that we always link with -lm - extended.c uses floor() and is always
+dnl note that we always link with -lm except for Mac OS X
-dnl linked in
+dnl extended.c uses floor() and is always linked in
 EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+if test "$USE_MAC" = 1 ; then
+    EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
+fi
 if test "$wxUSE_GUI" = "yes"; then
     EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
 fi
@@ -3796,8 +4043,9 @@ if test "$wxUSE_GUI" = "yes"; then
 
     dnl TODO some samples are never built so far:
     dnl      ipc, mfc, nativdlg, oleauto, ownerdrw, proplist
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag drawing dynamic \
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag \
-                     font fractal image menu minimal richedit"
+                     drawing dynamic event font fractal image menu \
+                     minimal richedit"
 
     dnl this is needed to be able to find AFM files
     CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
@@ -3851,6 +4099,7 @@ AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)
 AC_SUBST(DEP_INFO_FLAGS)
 AC_SUBST(CODE_GEN_FLAGS)
+AC_SUBST(CODE_GEN_FLAGS_CXX)
 AC_SUBST(BURNT_LIBRARY_NAME)
 AC_SUBST(BURNT_LIBRARY_NAME_GL)
 AC_SUBST(WX_TARGET_LIBRARY_SONAME)
@@ -3870,16 +4119,6 @@ AC_SUBST(TOOLKIT_INCLUDE)
 AC_SUBST(WXCONFIG_INCLUDE)
 
 dnl what to compile
-AC_SUBST(GUIHEADERS)
-AC_SUBST(GUIOBJS)
-AC_SUBST(COMMONOBJS)
-AC_SUBST(GENERICOBJS)
-AC_SUBST(GUIDEPS)
-AC_SUBST(COMMONDEPS)
-AC_SUBST(GENERICDEPS)
-AC_SUBST(IODBCOBJS)
-AC_SUBST(UNIXOBJS)
-AC_SUBST(UNIXDEPS)
 AC_SUBST(ALL_OBJECTS)
 AC_SUBST(ALL_DEPFILES)
 
@@ -3912,6 +4151,13 @@ AC_SUBST(RCOUTPUTSWITCH)
 AC_SUBST(RESPROGRAM)
 AC_SUBST(RESCOMP)
 AC_SUBST(RESFLAGS)
+dnl additional for Mac OS X
+AC_SUBST(REZ)
+AC_SUBST(REZFLAGS)
+AC_SUBST(DEREZ)
+AC_SUBST(DEREZFLAGS)
+AC_SUBST(LIBWXMACRES)
+AC_SUBST(LIBWXMACRESCOMP)
 
 dnl These seam to be missing
 AC_SUBST(DLLTOOL)
@@ -3969,7 +4215,7 @@ AC_OUTPUT([
             
             dnl the debian build process wants setup.h in the lib subdir so we
             dnl can pretend wxWin is already installed, so we *copy* it there
-            
+         
             if test ! -d lib; then
               mkdir lib
             fi
@@ -3986,7 +4232,7 @@ AC_OUTPUT([
               mkdir lib/wx/include/wx/${TOOLKIT_NAME}
             fi
             if test -f setup.h; then
-                cp -f setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
+                cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
             fi
 
             dnl *move* setup.h to its final place
@@ -4001,7 +4247,7 @@ AC_OUTPUT([
               mkdir include/wx/${TOOLKIT_DIR}
             fi
             if test -f setup.h; then
-                mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+                cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h
             fi
             
           ],

contrib/configure

@@ -820,6 +820,8 @@ trap 'rm -fr `echo "
             src/xml/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
+            src/plot/Makefile
+            src/applet/Makefile
             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
@@ -833,6 +835,8 @@ trap 'rm -fr `echo "
             samples/gizmos/multicell/Makefile
             samples/gizmos/splittree/Makefile
             samples/xml/Makefile
+            samples/plot/Makefile
+            samples/applet/Makefile
             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile
@@ -923,6 +927,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             src/xml/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
+            src/plot/Makefile
+            src/applet/Makefile
             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
@@ -936,6 +942,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             samples/gizmos/multicell/Makefile
             samples/gizmos/splittree/Makefile
             samples/xml/Makefile
+            samples/plot/Makefile
+            samples/applet/Makefile
             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile

contrib/configure.in

@@ -45,6 +45,8 @@ AC_OUTPUT([
             src/xml/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
+            src/plot/Makefile
+            src/applet/Makefile
             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
@@ -58,6 +60,8 @@ AC_OUTPUT([
             samples/gizmos/multicell/Makefile
             samples/gizmos/splittree/Makefile
             samples/xml/Makefile
+            samples/plot/Makefile
+            samples/applet/Makefile
             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile

contrib/include/wx/applet/applet.h

@@ -0,0 +1,83 @@
+/****************************************************************************
+*
+*                       wxWindows HTML Applet Package
+*
+*               Copyright (C) 1991-2001 SciTech Software, Inc.
+*                            All rights reserved.
+*
+*  ======================================================================
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  |                                                                    |
+*  |This copyrighted computer code is a proprietary trade secret of     |
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
+*  |written authorization from SciTech to possess or use this code, you |
+*  |may be subject to civil and/or criminal penalties.                  |
+*  |                                                                    |
+*  |If you received this code in error or you would like to report      |
+*  |improper use, please immediately contact SciTech Software, Inc. at  |
+*  |530-894-8400.                                                       |
+*  |                                                                    |
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  ======================================================================
+*
+* Language:     ANSI C++
+* Environment:  Any
+*
+* Description:  Header file for the wxApplet class
+*
+****************************************************************************/
+
+#ifndef __WX_APPLET_H
+#define __WX_APPLET_H
+
+#include "wx/panel.h"
+#include "wx/applet/window.h"
+
+/*--------------------------- Class Definitions ---------------------------*/
+
+/****************************************************************************
+REMARKS:
+Defines the abstract base class for wxApplet objects.
+****************************************************************************/
+class wxApplet : public wxPanel {
+private:
+    DECLARE_ABSTRACT_CLASS(wxApplet);
+    DECLARE_EVENT_TABLE();
+    
+protected:
+    wxHtmlAppletWindow  *m_Parent;
+
+            // Special handler for background erase messages            
+            void OnEraseBackground(wxEraseEvent&);
+        
+public:
+            // Constructor (called during dynamic creation)
+            wxApplet() { m_Parent = NULL; }
+    
+            // Psuedo virtual constructor
+    virtual bool Create(
+                wxHtmlAppletWindow *parent,
+                const wxSize& size,
+                long style = wxTAB_TRAVERSAL | wxNO_BORDER);
+                
+            // Virtual destructor
+    virtual ~wxApplet();
+
+            // Handle HTML navigation to a new URL
+    virtual void OnLinkClicked(const wxHtmlLinkInfo& link) = 0; 
+            
+            // Handle HTML navigation forward command in applet
+    virtual void OnHistoryForward() = 0;
+            
+            // Handle HTML navigation back command in applet
+    virtual void OnHistoryBack() = 0;
+            
+            // Handle messages from the wxAppletManager and other applets
+    virtual void OnMessage(wxEvent& msg) = 0;
+    };
+    
+#endif // __WX_APPLET_H
+

contrib/include/wx/applet/window.h

@@ -0,0 +1,114 @@
+/****************************************************************************
+*
+*                       wxWindows HTML Applet Package
+*
+*               Copyright (C) 1991-2001 SciTech Software, Inc.
+*                            All rights reserved.
+*
+*  ======================================================================
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  |                                                                    |
+*  |This copyrighted computer code is a proprietary trade secret of     |
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
+*  |written authorization from SciTech to possess or use this code, you |
+*  |may be subject to civil and/or criminal penalties.                  |
+*  |                                                                    |
+*  |If you received this code in error or you would like to report      |
+*  |improper use, please immediately contact SciTech Software, Inc. at  |
+*  |530-894-8400.                                                       |
+*  |                                                                    |
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  ======================================================================
+*
+* Language:     ANSI C++
+* Environment:  Any
+*
+* Description:  Header file for the wxHtmlAppletWindow class
+*
+****************************************************************************/
+
+#ifndef __WX_APPLET_WINDOW_H
+#define __WX_APPLET_WINDOW_H
+
+#include "wx/html/htmlwin.h"
+
+/*--------------------------- Class Definitions ---------------------------*/
+
+// Declare a linked list of wxApplet pointers
+class wxApplet;
+WX_DECLARE_LIST(wxApplet, wxAppletList);
+
+/****************************************************************************
+MEMBERS:
+appletModules   - List of register applet modules   
+appletList      - List of all active applets instances
+cookies         - Hash table for managing cookies       
+
+REMARKS:
+Defines the class for wxAppletWindow. This class is derived from the
+wxHtmlWindow class and extends it with functionality to handle embedded
+wxApplet's on the HTML pages.
+****************************************************************************/
+class wxHtmlAppletWindow : public wxHtmlWindow {
+private:
+    DECLARE_CLASS(wxHtmlAppletWindow);
+    DECLARE_EVENT_TABLE();
+    
+protected:
+    wxAppletList    m_AppletList;       
+    wxHashTable     m_Cookies;
+        
+public:
+            // Constructor
+            wxHtmlAppletWindow(
+                wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxHW_SCROLLBAR_AUTO,
+                const wxString& name = "htmlAppletWindow");
+                
+            // Destructor
+            ~wxHtmlAppletWindow();
+    
+            // Create an instance of an applet based on it's class name
+            wxApplet *CreateApplet(
+                const wxString& className,          
+                const wxSize& size);
+                
+            // Find an instance of an applet based on it's class name
+            wxApplet *FindApplet(const wxString& className);            
+            
+            // Remove an applet from the window. Called during applet destruction
+            bool RemoveApplet(const wxApplet *applet);          
+
+            // Load a new URL page
+            bool LoadPage(const wxString& hRef);
+            
+            // Called when users clicked on hypertext link.
+            void OnLinkClicked(const wxHtmlLinkInfo& link);
+            
+            // Handles forward navigation within the HTML stack
+            bool HistoryForward();
+            
+            // Handles backwards navigation within the HTML stack
+            bool HistoryBack();
+            
+            // Broadcast a message to all applets on the page
+            void SendMessage(wxEvent& msg);
+            
+            // Register a cookie of data in the applet manager
+            bool RegisterCookie(const wxString& name,wxObject *cookie);
+            
+            // UnRegister a cookie of data in the applet manager
+            bool UnRegisterCookie(const wxString& name);
+            
+            // Find a cookie of data given it's public name
+            wxObject *FindCookie(const wxString& name);
+    };
+    
+#endif // __WX_APPLET_WINDOW_H
+

contrib/include/wx/canvas/canvas.h

@@ -34,7 +34,12 @@ class wxCanvasAdmin;
 //----------------------------------------------------------------------------
 // wxCanvasObject
 //----------------------------------------------------------------------------
-enum DRAGMODE {DRAG_RECTANGLE,DRAG_ONTOP,DRAG_REDRAW};
+enum wxDRAG_MODE
+{
+    wxDRAG_RECTANGLE,
+    wxDRAG_ONTOP,
+    wxDRAG_REDRAW
+};
 
 //:defenition
 // wxCanvasObject is the base class for  Canvas Objects.
@@ -88,10 +93,10 @@ public:
     //DRAG_RECTANGLE = as a rectangle when drag is in progress |
     //DRAG_ONTOP = only redraw the object when dragging |
     //DRAG_REDRAW = redraw the damaged areas when dragging
-    void SetDragMode(DRAGMODE mode) { m_dragmode=mode; };
+    void SetDragMode(wxDRAG_MODE mode) { m_dragmode=mode; };
 
     //return the dragmode
-    DRAGMODE GetDragMode() { return m_dragmode; };
+    wxDRAG_MODE GetDragMode() { return m_dragmode; };
 
     //called when starting a drag
     virtual void DragStart();
@@ -193,7 +198,7 @@ protected:
     bool m_isImage:1;
     bool m_visible:1;
     bool m_dragable:1;
-    DRAGMODE m_dragmode:2;
+    wxDRAG_MODE m_dragmode:3;
 
     //boundingbox in world coordinates
     wxBoundingBox m_bbox;

contrib/include/wx/gizmos/editlbox.h

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

contrib/include/wx/plot/plot.h

@@ -18,8 +18,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_PLOT
-
 #include "wx/scrolwin.h"
 #include "wx/event.h"
 #include "wx/dynarray.h"
@@ -36,6 +34,32 @@ class WXDLLEXPORT wxPlotXAxisArea;
 class WXDLLEXPORT wxPlotYAxisArea;
 class WXDLLEXPORT wxPlotWindow;
 
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+extern const int wxEVT_PLOT_SEL_CHANGING;
+extern const int wxEVT_PLOT_SEL_CHANGED;
+extern const int wxEVT_PLOT_CLICKED;
+extern const int wxEVT_PLOT_DOUBLECLICKED;
+extern const int wxEVT_PLOT_ZOOM_IN;
+extern const int wxEVT_PLOT_ZOOM_OUT;
+extern const int wxEVT_PLOT_VALUE_SEL_CREATING;
+extern const int wxEVT_PLOT_VALUE_SEL_CREATED;
+extern const int wxEVT_PLOT_VALUE_SEL_CHANGING;
+extern const int wxEVT_PLOT_VALUE_SEL_CHANGED;
+extern const int wxEVT_PLOT_AREA_SEL_CREATING;
+extern const int wxEVT_PLOT_AREA_SEL_CREATED;
+extern const int wxEVT_PLOT_AREA_SEL_CHANGING;
+extern const int wxEVT_PLOT_AREA_SEL_CHANGED;
+extern const int wxEVT_PLOT_BEGIN_X_LABEL_EDIT;
+extern const int wxEVT_PLOT_END_X_LABEL_EDIT;
+extern const int wxEVT_PLOT_BEGIN_Y_LABEL_EDIT;
+extern const int wxEVT_PLOT_END_Y_LABEL_EDIT;
+extern const int wxEVT_PLOT_BEGIN_TITLE_EDIT;
+extern const int wxEVT_PLOT_END_TITLE_EDIT;
+extern const int wxEVT_PLOT_AREA_CREATE;
+
 //-----------------------------------------------------------------------------
 // consts
 //-----------------------------------------------------------------------------
@@ -375,7 +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 },
 
-#endif // wxUSE_PLOT
-
 #endif
    // _WX_PLOT_H_

contrib/include/wx/plot/wxplot.rc

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

contrib/include/wx/stc/stc.h

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

contrib/include/wx/xml/xh_all.h

@@ -44,4 +44,6 @@
 #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

@@ -20,18 +20,18 @@
 
 class WXDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxBitmapXmlHandler();
+    wxBitmapXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 class WXDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxIconXmlHandler();
+    wxIconXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_bmpbt.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxBitmapButtonXmlHandler();
+    wxBitmapButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_bttn.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxButtonXmlHandler();
+    wxButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_cald.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxCalendarCtrlXmlHandler();
+    wxCalendarCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_chckb.h

@@ -22,10 +22,10 @@
 
 class WXDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxCheckBoxXmlHandler();
+    wxCheckBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_chckl.h

@@ -19,13 +19,13 @@
 
 class WXDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxCheckListXmlHandler();
+    wxCheckListXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
-    private:
+private:
-        bool m_InsideBox;
+    bool m_insideBox;
-        wxArrayString strList;
+    wxArrayString strList;
 };
 
 

contrib/include/wx/xml/xh_choic.h

@@ -19,13 +19,13 @@
 
 class WXDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxChoiceXmlHandler();
+    wxChoiceXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
-    private:
+private:
-        bool m_InsideBox;
+    bool m_insideBox;
-        wxArrayString strList;
+    wxArrayString strList;
 };
 
 

contrib/include/wx/xml/xh_combo.h

@@ -21,13 +21,13 @@
 
 class WXDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxComboBoxXmlHandler();
+    wxComboBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
-    private:
+private:
-        bool m_InsideBox;
+    bool m_insideBox;
-        wxArrayString strList;
+    wxArrayString strList;
 };
 
 #endif

contrib/include/wx/xml/xh_dlg.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxDialogXmlHandler();
+    wxDialogXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_frame.h

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

contrib/include/wx/xml/xh_gauge.h

@@ -29,10 +29,10 @@ class WXDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
         wxGAUGE_DEFAULT_RANGE = 100
     };
 
-    public:
+public:
-        wxGaugeXmlHandler();
+    wxGaugeXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_html.h

@@ -23,10 +23,10 @@
 
 class WXDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxHtmlWindowXmlHandler();
+    wxHtmlWindowXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_listb.h

@@ -21,13 +21,13 @@
 
 class WXDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxListBoxXmlHandler();
+    wxListBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
-    private:
+private:
-        bool m_InsideBox;
+    bool m_insideBox;
-        wxArrayString strList;
+    wxArrayString strList;
 };
 
 #endif

contrib/include/wx/xml/xh_listc.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxListCtrlXmlHandler();
+    wxListCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_menu.h

@@ -19,13 +19,13 @@
 
 class WXDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxMenuXmlHandler();
+    wxMenuXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
-        
+
-    private:
+private:
-        bool m_InsideMenu;
+    bool m_insideMenu;
 };
 
 class WXDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler

contrib/include/wx/xml/xh_notbk.h

@@ -22,14 +22,14 @@ class WXDLLEXPORT wxNotebook;
 
 class WXDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxNotebookXmlHandler();
+    wxNotebookXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
-        
+
-    private:
+private:
-        bool m_IsInside;
+    bool m_isInside;
-        wxNotebook *m_Notebook;
+    wxNotebook *m_notebook;
 };
 
 #endif

contrib/include/wx/xml/xh_panel.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxPanelXmlHandler();
+    wxPanelXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_radbt.h

@@ -22,10 +22,10 @@
 
 class WXDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxRadioButtonXmlHandler();
+    wxRadioButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_radbx.h

@@ -21,13 +21,13 @@
 
 class WXDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxRadioBoxXmlHandler();
+    wxRadioBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
-    private:
+private:
-        bool m_InsideBox;
+    bool m_insideBox;
-        wxArrayString strList;
+    wxArrayString strList;
 };
 
 #endif

contrib/include/wx/xml/xh_scrol.h

@@ -29,10 +29,10 @@ class WXDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
         wxSL_DEFAULT_MAX = 100
     };
 
-    public:
+public:
-        wxScrollBarXmlHandler();
+    wxScrollBarXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_sizer.h

@@ -22,16 +22,16 @@ class WXDLLEXPORT wxSizer;
 
 class WXDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxSizerXmlHandler();
+    wxSizerXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
+
+private:
+    bool m_isInside;
+    wxSizer *m_parentSizer;
         
-    private:
+    bool IsSizerNode(wxXmlNode *node);
-        bool m_IsInside;
-        wxSizer *m_ParentSizer;
-        
-        bool IsSizerNode(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_slidr.h

@@ -29,10 +29,10 @@ class WXDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
         wxSL_DEFAULT_MAX = 100
     };
 
-    public:
+public:
-        wxSliderXmlHandler();
+    wxSliderXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_spin.h

@@ -28,10 +28,10 @@ class WXDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
         wxSP_DEFAULT_MAX = 100
     };
 
-    public:
+public:
-        wxSpinButtonXmlHandler();
+    wxSpinButtonXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 #endif
 
@@ -45,10 +45,10 @@ class WXDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
         wxSP_DEFAULT_MAX = 100
     };
 
-    public:
+public:
-        wxSpinCtrlXmlHandler();
+    wxSpinCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 #endif
 

contrib/include/wx/xml/xh_stbmp.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxStaticBitmapXmlHandler();
+    wxStaticBitmapXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_stbox.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxStaticBoxXmlHandler();
+    wxStaticBoxXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_stlin.h

@@ -21,10 +21,10 @@
 
 class WXDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxStaticLineXmlHandler();
+    wxStaticLineXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 #endif

contrib/include/wx/xml/xh_sttxt.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxStaticTextXmlHandler();
+    wxStaticTextXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_text.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxTextCtrlXmlHandler();
+    wxTextCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_toolb.h

@@ -23,14 +23,14 @@ class WXDLLEXPORT wxToolBar;
 
 class WXDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxToolBarXmlHandler();
+    wxToolBarXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
         
-    private:
+private:
-        bool m_IsInside;
+    bool m_isInside;
-        wxToolBar *m_Toolbar;
+    wxToolBar *m_toolbar;
 };
 
 #endif

contrib/include/wx/xml/xh_tree.h

@@ -19,10 +19,10 @@
 
 class WXDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxTreeCtrlXmlHandler();
+    wxTreeCtrlXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xh_unkwn.h

@@ -20,10 +20,10 @@
 
 class WXDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
 {
-    public:
+public:
-        wxUnknownWidgetXmlHandler();
+    wxUnknownWidgetXmlHandler();
-        virtual wxObject *DoCreateResource();
+    virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
 

contrib/include/wx/xml/xml.h

@@ -53,10 +53,11 @@ enum wxXmlNodeType
 
 enum wxXmlIOType
 {
-    wxXML_IO_AUTO = 0, // detect it automatically
+    wxXML_IO_AUTO = 0,    // detect it automatically
-    wxXML_IO_LIBXML,   // use libxml2 to parse/save XML document
+    wxXML_IO_EXPAT,       // use Expat to load from text/xml document
-    wxXML_IO_BIN,      // save in binary uncompressed proprietary format
+    wxXML_IO_TEXT_OUTPUT, // generic saver into text/xml
-    wxXML_IO_BINZ      // svae in binary zlib-compressed proprietary format
+    wxXML_IO_BIN,         // save in binary uncompressed proprietary format
+    wxXML_IO_BINZ         // svae in binary zlib-compressed proprietary format
 };
 
 
@@ -66,24 +67,25 @@ enum wxXmlIOType
 
 class WXDLLEXPORT wxXmlProperty
 {
-    public:
+public:
-        wxXmlProperty() : m_Next(NULL) {}
+    wxXmlProperty() : m_next(NULL) {}
-        wxXmlProperty(const wxString& name, const wxString& value, wxXmlProperty *next)
+    wxXmlProperty(const wxString& name, const wxString& value, 
-            : m_Name(name), m_Value(value), m_Next(next) {}
+                  wxXmlProperty *next)
-        ~wxXmlProperty() { delete m_Next; }
+            : m_name(name), m_value(value), m_next(next) {}
-    
+    ~wxXmlProperty() { delete m_next; }
-        wxString GetName() const { return m_Name; }
-        wxString GetValue() const { return m_Value; }
-        wxXmlProperty *GetNext() const { return m_Next; }
-        
-        void SetName(const wxString& name) { m_Name = name; }
-        void SetValue(const wxString& value) { m_Value = value; }
-        void SetNext(wxXmlProperty *next) { m_Next = next; }
 
-    private:
+    wxString GetName() const { return m_name; }
-        wxString m_Name;
+    wxString GetValue() const { return m_value; }
-        wxString m_Value;
+    wxXmlProperty *GetNext() const { return m_next; }
-        wxXmlProperty *m_Next;
+
+    void SetName(const wxString& name) { m_name = name; }
+    void SetValue(const wxString& value) { m_value = value; }
+    void SetNext(wxXmlProperty *next) { m_next = next; }
+
+private:
+    wxString m_name;
+    wxString m_value;
+    wxXmlProperty *m_next;
 };
 
 
@@ -93,66 +95,74 @@ class WXDLLEXPORT wxXmlProperty
 // are irrelevant) and wxXML_ELEMENT_NODE (e.g. in <title>hi</title> there is
 // element with name="title", irrelevant content and one child (wxXML_TEXT_NODE
 // with content="hi").
+//
+// If wxUSE_UNICODE is 0, all strings are encoded in UTF-8 encoding (same as
+// ASCII for characters 0-127). You can use wxMBConvUTF8 to convert then to 
+// desired encoding:
+//
+//     wxCSConv myConv("iso8859-2");
+//     wxString s(cMB2WC(node->GetContent().c_str()), myConv);
 
 class WXDLLEXPORT wxXmlNode
 {
-    public:
+public:
-        wxXmlNode() : m_Properties(NULL), m_Parent(NULL), 
+    wxXmlNode() : m_properties(NULL), m_parent(NULL), 
-                      m_Children(NULL), m_Next(NULL) {}
+                  m_children(NULL), m_next(NULL) {}
-        wxXmlNode(wxXmlNode *parent,wxXmlNodeType type, 
+    wxXmlNode(wxXmlNode *parent,wxXmlNodeType type, 
-                  const wxString& name, const wxString& content,
+              const wxString& name, const wxString& content,
-                  wxXmlProperty *props, wxXmlNode *next);
+              wxXmlProperty *props, wxXmlNode *next);
-        ~wxXmlNode() { delete m_Properties; delete m_Next; delete m_Children; }
+    ~wxXmlNode() { delete m_properties; delete m_next; delete m_children; }
 
-        // copy ctor & operator=. Note that this does NOT copy syblings
+    // copy ctor & operator=. Note that this does NOT copy syblings
-        // and parent pointer, i.e. m_Parent and m_Next will be NULL
+    // and parent pointer, i.e. m_parent and m_next will be NULL
-        // after using copy ctor and are never unmodified by operator=.
+    // after using copy ctor and are never unmodified by operator=.
-        // On the other hand, it DOES copy children and properties.
+    // On the other hand, it DOES copy children and properties.
-        wxXmlNode(const wxXmlNode& node);
+    wxXmlNode(const wxXmlNode& node);
-        wxXmlNode& operator=(const wxXmlNode& node);
+    wxXmlNode& operator=(const wxXmlNode& node);
-        
-        // user-friendly creation:
-        wxXmlNode(wxXmlNodeType type, const wxString& name, 
-                  const wxString& content = wxEmptyString);
-        void AddChild(wxXmlNode *child);
-        void InsertChild(wxXmlNode *child, wxXmlNode *before_node);
-        bool RemoveChild(wxXmlNode *child);
-        void AddProperty(const wxString& name, const wxString& value);
-        bool DeleteProperty(const wxString& name);
 
-        // access methods:
+    // user-friendly creation:
-        wxXmlNodeType GetType() const { return m_Type; }
+    wxXmlNode(wxXmlNodeType type, const wxString& name, 
-        wxString GetName() const { return m_Name; }
+              const wxString& content = wxEmptyString);
-        wxString GetContent() const { return m_Content; }
+    void AddChild(wxXmlNode *child);
-        
+    void InsertChild(wxXmlNode *child, wxXmlNode *before_node);
-        wxXmlNode *GetParent() const { return m_Parent; }
+    bool RemoveChild(wxXmlNode *child);
-        wxXmlNode *GetNext() const { return m_Next; }
+    void AddProperty(const wxString& name, const wxString& value);
-        wxXmlNode *GetChildren() const { return m_Children; }
+    bool DeleteProperty(const wxString& name);
 
-        wxXmlProperty *GetProperties() const { return m_Properties; }
+    // access methods:
-        bool GetPropVal(const wxString& propName, wxString *value) const;
+    wxXmlNodeType GetType() const { return m_type; }
-        wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const;
+    wxString GetName() const { return m_name; }
-        bool HasProp(const wxString& propName) const;
+    wxString GetContent() const { return m_content; }
-        
-        void SetType(wxXmlNodeType type) { m_Type = type; }
-        void SetName(const wxString& name) { m_Name = name; }
-        void SetContent(const wxString& con) { m_Content = con; }
-        
-        void SetParent(wxXmlNode *parent) { m_Parent = parent; }
-        void SetNext(wxXmlNode *next) { m_Next = next; }
-        void SetChildren(wxXmlNode *child) { m_Children = child; }
-        
-        void SetProperties(wxXmlProperty *prop) { m_Properties = prop; }
-        void AddProperty(wxXmlProperty *prop);
 
-    private:
+    wxXmlNode *GetParent() const { return m_parent; }
-        wxXmlNodeType m_Type;
+    wxXmlNode *GetNext() const { return m_next; }
-        wxString m_Name;
+    wxXmlNode *GetChildren() const { return m_children; }
-        wxString m_Content;
-        wxXmlProperty *m_Properties;
-        wxXmlNode *m_Parent, *m_Children, *m_Next;
 
-        void DoCopy(const wxXmlNode& node);
+    wxXmlProperty *GetProperties() const { return m_properties; }
+    bool GetPropVal(const wxString& propName, wxString *value) const;
+    wxString GetPropVal(const wxString& propName, 
+                        const wxString& defaultVal) const;
+    bool HasProp(const wxString& propName) const;
+
+    void SetType(wxXmlNodeType type) { m_type = type; }
+    void SetName(const wxString& name) { m_name = name; }
+    void SetContent(const wxString& con) { m_content = con; }
+
+    void SetParent(wxXmlNode *parent) { m_parent = parent; }
+    void SetNext(wxXmlNode *next) { m_next = next; }
+    void SetChildren(wxXmlNode *child) { m_children = child; }
+
+    void SetProperties(wxXmlProperty *prop) { m_properties = prop; }
+    void AddProperty(wxXmlProperty *prop);
+
+private:
+    wxXmlNodeType m_type;
+    wxString m_name;
+    wxString m_content;
+    wxXmlProperty *m_properties;
+    wxXmlNode *m_parent, *m_children, *m_next;
+
+    void DoCopy(const wxXmlNode& node);
 };
 
 
@@ -167,51 +177,61 @@ class WXDLLEXPORT wxXmlNode
 
 class WXDLLEXPORT wxXmlDocument : public wxObject
 {
-    public:
+public:
-        wxXmlDocument() : wxObject(), m_Version(_T("1.0")), m_Root(NULL)  {}
+    wxXmlDocument() : wxObject(), m_version(wxT("1.0")), m_root(NULL)  {}
-        wxXmlDocument(const wxString& filename, wxXmlIOType io_type = wxXML_IO_AUTO);
+    wxXmlDocument(const wxString& filename, 
-        wxXmlDocument(wxInputStream& stream, wxXmlIOType io_type = wxXML_IO_AUTO);
+                  wxXmlIOType io_type = wxXML_IO_AUTO);
-        ~wxXmlDocument() { delete m_Root; }
+    wxXmlDocument(wxInputStream& stream, 
-        
+                  wxXmlIOType io_type = wxXML_IO_AUTO);
-        wxXmlDocument(const wxXmlDocument& doc);
+    ~wxXmlDocument() { delete m_root; }
-        wxXmlDocument& operator=(const wxXmlDocument& doc);
-    
-        // Parses .xml file and loads data. Returns TRUE on success, FALSE
-        // otherwise. 
-        // NOTE: Any call to this method will result into linking against libxml
-        //       and app's binary size will grow by ca. 250kB
-        bool Load(const wxString& filename, wxXmlIOType io_type = wxXML_IO_AUTO);
-        bool Load(wxInputStream& stream, wxXmlIOType io_type = wxXML_IO_AUTO);
-        
-        // Saves document as .xml file.
-        bool Save(const wxString& filename, wxXmlIOType io_type) const;
-        bool Save(wxOutputStream& stream, wxXmlIOType io_type) const;
-        
-        // Returns root node of the document.
-        wxXmlNode *GetRoot() const { return m_Root; }
-        
-        // Returns version of document (may be empty).
-        wxString GetVersion() const { return m_Version; }
-        // Returns encoding of document (may be empty).
-        wxString GetEncoding() const { return m_Encoding; }
-        
-        // Write-access methods:
-        void SetRoot(wxXmlNode *node) { delete m_Root ; m_Root = node; }
-        void SetVersion(const wxString& version) { m_Version = version; }
-        void SetEncoding(const wxString& encoding) { m_Encoding = encoding; }
 
-        static void AddHandler(wxXmlIOHandler *handler);
+    wxXmlDocument(const wxXmlDocument& doc);
-        static void CleanUpHandlers();
+    wxXmlDocument& operator=(const wxXmlDocument& doc);
-        static void InitStandardHandlers();
 
-    protected:
+    // Parses .xml file and loads data. Returns TRUE on success, FALSE
-        static wxList *sm_Handlers;
+    // otherwise. 
+    // NOTE: Any call to this method will result into linking against libxml
+    //       and app's binary size will grow by ca. 250kB
+    bool Load(const wxString& filename, wxXmlIOType io_type = wxXML_IO_AUTO);
+    bool Load(wxInputStream& stream, wxXmlIOType io_type = wxXML_IO_AUTO);
 
-    private:
+    // Saves document as .xml file.
-        wxString m_Version, m_Encoding;
+    bool Save(const wxString& filename, 
-        wxXmlNode *m_Root;
+              wxXmlIOType io_type = wxXML_IO_TEXT_OUTPUT) const;
-        
+    bool Save(wxOutputStream& stream, 
-        void DoCopy(const wxXmlDocument& doc);
+              wxXmlIOType io_type = wxXML_IO_TEXT_OUTPUT) const;
+
+    bool IsOk() const { return m_root != NULL; }
+
+    // Returns root node of the document.
+    wxXmlNode *GetRoot() const { return m_root; }
+
+    // Returns version of document (may be empty).
+    wxString GetVersion() const { return m_version; }
+    // Returns encoding of document (may be empty).
+    // Note: this is the encoding original fail was saved in, *not* the
+    // encoding of in-memory representation! Data in wxXmlNode are always
+    // stored in wchar_t (in Unicode build) or UTF-8 encoded 
+    // (if wxUSE_UNICODE is 0).
+    wxString GetEncoding() const { return m_encoding; }
+
+    // Write-access methods:
+    void SetRoot(wxXmlNode *node) { delete m_root ; m_root = node; }
+    void SetVersion(const wxString& version) { m_version = version; }
+    void SetEncoding(const wxString& encoding) { m_encoding = encoding; }
+
+    static void AddHandler(wxXmlIOHandler *handler);
+    static void CleanUpHandlers();
+    static void InitStandardHandlers();
+
+protected:
+    static wxList *sm_handlers;
+
+private:
+    wxString m_version, m_encoding;
+    wxXmlNode *m_root;
+
+    void DoCopy(const wxXmlDocument& doc);
 };
 
 

contrib/include/wx/xml/xmlio.h

@@ -20,21 +20,45 @@
 #include "wx/xml/xml.h"
 
 
+class WXDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
+{
+public:
+    virtual wxXmlIOType GetType() { return wxXML_IO_EXPAT; }
+    virtual bool CanLoad(wxInputStream& stream);
+    virtual bool CanSave() { return FALSE; }
+
+    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
+    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc) { return FALSE; }
+};
+
+
+class WXDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
+{
+public:
+    virtual wxXmlIOType GetType() { return wxXML_IO_TEXT_OUTPUT; }
+    virtual bool CanLoad(wxInputStream& stream) { return FALSE; }
+    virtual bool CanSave() { return TRUE; }
+
+    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc) { return FALSE; }
+    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
+};
+
+
 class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
 {
-    public:
+public:
-        wxXmlIOHandlerBin() {}
+    wxXmlIOHandlerBin() {}
 
-        virtual wxXmlIOType GetType() { return wxXML_IO_BIN; }
+    virtual wxXmlIOType GetType() { return wxXML_IO_BIN; }
-        virtual bool CanLoad(wxInputStream& stream);
+    virtual bool CanLoad(wxInputStream& stream);
-        virtual bool CanSave() { return TRUE; }
+    virtual bool CanSave() { return TRUE; }
 
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
+    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
+    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
-        
+
-    protected: 
+protected: 
-        wxString ReadHeader(wxInputStream& stream);
+    wxString ReadHeader(wxInputStream& stream);
-        void WriteHeader(wxOutputStream& stream, const wxString& header);
+    void WriteHeader(wxOutputStream& stream, const wxString& header);
 };
 
 
@@ -43,30 +67,17 @@ class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
 
 class WXDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
 {
-    public:
+public:
-        wxXmlIOHandlerBinZ() {}
+    wxXmlIOHandlerBinZ() {}
 
-        virtual wxXmlIOType GetType() { return wxXML_IO_BINZ; }
+    virtual wxXmlIOType GetType() { return wxXML_IO_BINZ; }
-        virtual bool CanLoad(wxInputStream& stream);
+    virtual bool CanLoad(wxInputStream& stream);
 
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
+    virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
+    virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
 };
 
 #endif
 
 
-
-class WXDLLEXPORT wxXmlIOHandlerLibxml : public wxXmlIOHandler
-{
-    public:
-        virtual wxXmlIOType GetType() { return wxXML_IO_LIBXML; }
-        virtual bool CanLoad(wxInputStream& stream);
-        virtual bool CanSave();
-
-        virtual bool Load(wxInputStream& stream, wxXmlDocument& doc);
-        virtual bool Save(wxOutputStream& stream, const wxXmlDocument& doc);
-};
-
-
 #endif // _WX_XMLIO_H_

contrib/include/wx/xml/xmlres.h

@@ -30,22 +30,46 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxDialog;
 class WXDLLEXPORT wxPanel;
 class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 
 class WXDLLEXPORT wxXmlResourceHandler;
 
 #include "wx/xml/xml.h"
 
+// These macros indicate current version of XML resources (this information is
+// encoded in root node of XRC file as "version" property).
+//
+// Rules for increasing version number:
+//   - change it only if you made incompatible change to the format. Addition of new
+//     attribute to control handler is _not_ incompatible change, because older
+//     versions of the library may ignore it.
+//   - if you change version number, follow these steps:
+//       - set major, minor and release numbers to respective version numbers of
+//         the wxWindows library (see wx/version.h)
+//       - reset revision to 0 unless the first three are same as before, in which
+//         case you should increase revision by one
+#define WX_XMLRES_CURRENT_VERSION_MAJOR            2
+#define WX_XMLRES_CURRENT_VERSION_MINOR            3
+#define WX_XMLRES_CURRENT_VERSION_RELEASE          0
+#define WX_XMLRES_CURRENT_VERSION_REVISION         1
+#define WX_XMLRES_CURRENT_VERSION_STRING    "2.3.0.1"
+
+#define WX_XMLRES_CURRENT_VERSION \
+                (WX_XMLRES_CURRENT_VERSION_MAJOR * 256*256*256 + \
+                 WX_XMLRES_CURRENT_VERSION_MINOR * 256*256 + \
+                 WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
+                 WX_XMLRES_CURRENT_VERSION_REVISION)
 
 class WXDLLEXPORT wxXmlResourceDataRecord
 {
-    public:
+public:
-        wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
+    wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
-        ~wxXmlResourceDataRecord() {delete Doc;}
+    ~wxXmlResourceDataRecord() {delete Doc;}
-    
+
-        wxString File;
+    wxString File;
-        wxXmlDocument *Doc;
+    wxXmlDocument *Doc;
-        wxDateTime Time;
+    wxDateTime Time;
 };
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
@@ -56,95 +80,113 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
 
 class WXDLLEXPORT wxXmlResource : public wxObject
 {
-    public:
+public:
-        // Ctor. If use_locale is TRUE, translatable strings are
+    // Ctor. If use_locale is TRUE, translatable strings are
-        // translated via _(). You can disable it by passing use_locale=FALSE
+    // translated via _(). You can disable it by passing use_locale=FALSE
-        // (for example if you provide resource file for each locale)
+    // (for example if you provide resource file for each locale)
-        wxXmlResource(bool use_locale = TRUE);
+    wxXmlResource(bool use_locale = TRUE);
-        wxXmlResource(const wxString& filemask, bool use_locale = TRUE);
+    wxXmlResource(const wxString& filemask, bool use_locale = TRUE);
-        ~wxXmlResource();
+    ~wxXmlResource();
 
-        // Loads resources from XML files that match given filemask.
+    // Loads resources from XML files that match given filemask.
-        // This method understands VFS (see filesys.h).
+    // This method understands VFS (see filesys.h).
-        bool Load(const wxString& filemask);
+    bool Load(const wxString& filemask);
-        
-        // Initialize handlers for all supported controls/windows. This will
-        // make the executable quite big because it forces linking against
-        // most of wxWin library
-        void InitAllHandlers();
-        
-        // Initialize only specific handler (or custom handler). Convention says
-        // that handler name is equal to control's name plus 'XmlHandler', e.g.
-        // wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. XML resource compiler
-        // (xmlres) can create include file that contains initialization code for 
-        // all controls used within the resource.
-        void AddHandler(wxXmlResourceHandler *handler);
-        
-        // Removes all handlers
-        void ClearHandlers();
-        
-        // Loads menu from resource. Returns NULL on failure.
-        wxMenu *LoadMenu(const wxString& name);
 
-        // Loads menubar from resource. Returns NULL on failure.
+    // Initialize handlers for all supported controls/windows. This will
-        wxMenuBar *LoadMenuBar(const wxString& name);
+    // make the executable quite big because it forces linking against
+    // most of wxWin library
+    void InitAllHandlers();
+
+    // Initialize only specific handler (or custom handler). Convention says
+    // that handler name is equal to control's name plus 'XmlHandler', e.g.
+    // wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. XML resource compiler
+    // (xmlres) can create include file that contains initialization code for 
+    // all controls used within the resource.
+    void AddHandler(wxXmlResourceHandler *handler);
+
+    // Removes all handlers
+    void ClearHandlers();
+
+    // Loads menu from resource. Returns NULL on failure.
+    wxMenu *LoadMenu(const wxString& name);
+
+    // Loads menubar from resource. Returns NULL on failure.
+    wxMenuBar *LoadMenuBar(const wxString& name);
 
 #if wxUSE_TOOLBAR
-        // Loads toolbar
+    // Loads toolbar
-        wxToolBar *LoadToolBar(wxWindow *parent, const wxString& name);
+    wxToolBar *LoadToolBar(wxWindow *parent, const wxString& name);
 #endif
 
-        // Loads dialog. dlg points to parent window (if any). Second form
+    // Loads dialog. dlg points to parent window (if any). Second form
-        // is used to finish creation of already existing instance (main reason
+    // is used to finish creation of already existing instance (main reason
-        // for this is that you may want to use derived class with new event table)
+    // for this is that you may want to use derived class with new event table)
-        // Example (typical usage):
+    // Example (typical usage):
-        //      MyDialog dlg;
+    //      MyDialog dlg;
-        //      wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog");
+    //      wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog");
-        //      dlg->ShowModal();
+    //      dlg->ShowModal();
-        wxDialog *LoadDialog(wxWindow *parent, const wxString& name);
+    wxDialog *LoadDialog(wxWindow *parent, const wxString& name);
-        bool LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name);
+    bool LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name);
 
-        // Loads panel. panel points to parent window (if any). Second form
+    // Loads panel. panel points to parent window (if any). Second form
-        // is used to finish creation of already existing instance.
+    // is used to finish creation of already existing instance.
-        wxPanel *LoadPanel(wxWindow *parent, const wxString& name);
+    wxPanel *LoadPanel(wxWindow *parent, const wxString& name);
-        bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name);
+    bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name);
 
-        // Loads bitmap or icon resource from file:
+    bool LoadFrame(wxFrame* frame, wxWindow *parent, const wxString& name);
-        wxBitmap LoadBitmap(const wxString& name);
-        wxIcon LoadIcon(const wxString& name);
 
-        // Returns numeric ID that is equivalent to string id used in XML
+    // Loads bitmap or icon resource from file:
-        // resource. To be used in event tables
+    wxBitmap LoadBitmap(const wxString& name);
-        // Macro XMLID is provided for convenience
+    wxIcon LoadIcon(const wxString& name);
-        static int GetXMLID(const char *str_id);
+    
+    // Attaches unknown control into given panel/window/dialog:
+    // (unknown controls are used in conjunction with <object class="unknown">)
+    bool AttachUnknownControl(const wxString& name, wxWindow *control,
+                              wxWindow *parent = NULL);
 
-    protected:
+    // Returns numeric ID that is equivalent to string id used in XML
-        // Scans resources list for unloaded files and loads them. Also reloads
+    // resource. To be used in event tables
-        // files that have been modified since last loading.
+    // Macro XMLID is provided for convenience
-        void UpdateResources();
+    static int GetXMLID(const char *str_id);
-        
+    
-        // Finds resource (calls UpdateResources) and returns node containing it
+    // Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
-        wxXmlNode *FindResource(const wxString& name, const wxString& classname);
+    long GetVersion() const { return m_version; }
-        
+    
-        // Creates resource from info in given node:
+    // Compares resources version to argument. Returns -1 if resources version
-        wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
+    // is less than the argument, +1 if greater and 0 if they equal.
+    int CompareVersion(int major, int minor, int release, int revision) const
+        { return GetVersion() - 
+                 (major*256*256*256 + minor*256*256 + release*256 + revision); }
 
-        // Remove nodes with property "platform" that does not
+protected:
-        // match current platform
+    // Scans resources list for unloaded files and loads them. Also reloads
-        void ProcessPlatformProperty(wxXmlNode *node);
+    // files that have been modified since last loading.
-        
+    void UpdateResources();
-        bool GetUseLocale() { return m_UseLocale; }
 
-    private:
+    // Finds resource (calls UpdateResources) and returns node containing it
-        bool m_UseLocale;
+    wxXmlNode *FindResource(const wxString& name, const wxString& classname);
-        wxList m_Handlers;
+
-        wxXmlResourceDataRecords m_Data;
+    // Creates resource from info in given node:
+    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
+
+    // Remove nodes with property "platform" that does not
+    // match current platform
+    void ProcessPlatformProperty(wxXmlNode *node);
+
+    bool GetUseLocale() { return m_useLocale; }
+
+private:
+    long m_version;
+    
+    bool m_useLocale;
+    wxList m_handlers;
+    wxXmlResourceDataRecords m_data;
 #if wxUSE_FILESYSTEM
-        wxFileSystem m_CurFileSystem;
+    wxFileSystem m_curFileSystem;
-        wxFileSystem& GetCurFileSystem() { return m_CurFileSystem; }
+    wxFileSystem& GetCurFileSystem() { return m_curFileSystem; }
 #endif
 
-        friend class wxXmlResourceHandler;
+    friend class wxXmlResourceHandler;
 };
 
 
@@ -163,7 +205,7 @@ extern wxXmlResource *wxTheXmlResource;
 //    END_EVENT_TABLE()    
 
 #define XMLID(str_id) \
-    wxXmlResource::GetXMLID(_T(str_id))
+    wxXmlResource::GetXMLID(wxT(str_id))
 
 
 // This macro returns pointer to particular control in dialog
@@ -172,7 +214,7 @@ extern wxXmlResource *wxTheXmlResource;
 // Example:
 //    wxDialog dlg;
 //    wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog");
-//    XMLCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(_T("default value"));
+//    XMLCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(wxT("default value"));
 
 #define XMLCTRL(window, id, type) \
     ((type*)((window).FindWindow(XMLID(id))))
@@ -181,119 +223,123 @@ extern wxXmlResource *wxTheXmlResource;
 
 class WXDLLEXPORT wxXmlResourceHandler : public wxObject
 {
-    public:
+public:
-        wxXmlResourceHandler();
+    wxXmlResourceHandler();
-        virtual ~wxXmlResourceHandler() {}
+    virtual ~wxXmlResourceHandler() {}
 
-        // Creates object (menu, dialog, control, ...) from XML node.
+    // Creates object (menu, dialog, control, ...) from XML node.
-        // Should check for validity.
+    // Should check for validity.
-        // parent is higher-level object (usually window, dialog or panel)
+    // parent is higher-level object (usually window, dialog or panel)
-        // that is often neccessary to create resource
+    // that is often neccessary to create resource
-        // if instance != NULL it should not create new instance via 'new' but
+    // if instance != NULL it should not create new instance via 'new' but
-        // rather use this one and call its Create method
+    // rather use this one and call its Create method
-        wxObject *CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance);
+    wxObject *CreateResource(wxXmlNode *node, wxObject *parent, 
+                             wxObject *instance);
 
-        // This one is called from CreateResource after variables
+    // This one is called from CreateResource after variables
-        // were filled
+    // were filled
-        virtual wxObject *DoCreateResource() = 0;
+    virtual wxObject *DoCreateResource() = 0;
-        
-        // Returns TRUE if it understands this node and can create
-        // resource from it, FALSE otherwise.
-        virtual bool CanHandle(wxXmlNode *node) = 0;
 
-        void SetParentResource(wxXmlResource *res) { m_Resource = res; }
+    // Returns TRUE if it understands this node and can create
+    // resource from it, FALSE otherwise.
+    virtual bool CanHandle(wxXmlNode *node) = 0;
+
+    void SetParentResource(wxXmlResource *res) { m_resource = res; }
 
 
-    protected:
+protected:
 
-        wxXmlResource *m_Resource;
+    wxXmlResource *m_resource;
-        wxArrayString m_StyleNames;
+    wxArrayString m_styleNames;
-        wxArrayInt m_StyleValues;
+    wxArrayInt m_styleValues;
 
-        // Variables (filled by CreateResource)
+    // Variables (filled by CreateResource)
-        wxXmlNode *m_Node;
+    wxXmlNode *m_node;
-        wxString m_Class;
+    wxString m_class;
-        wxObject *m_Parent, *m_Instance;
+    wxObject *m_parent, *m_instance;
-        wxWindow *m_ParentAsWindow, *m_InstanceAsWindow;
+    wxWindow *m_parentAsWindow, *m_instanceAsWindow;
-        
-        // --- Handy methods:
 
-        // Returns true if the node has property class equal to classname,
+    // --- Handy methods:
-        // e.g. <object class="wxDialog">
-        bool IsOfClass(wxXmlNode *node, const wxString& classname)
-            { return node->GetPropVal(_T("class"), wxEmptyString) == classname; }
 
-        // Gets node content from wxXML_ENTITY_NODE
+    // Returns true if the node has property class equal to classname,
-        // (the problem is, <tag>content<tag> is represented as
+    // e.g. <object class="wxDialog">
-        // wxXML_ENTITY_NODE name="tag", content=""
+    bool IsOfClass(wxXmlNode *node, const wxString& classname)
-        //    |-- wxXML_TEXT_NODE or 
+        { return node->GetPropVal(wxT("class"), wxEmptyString) == classname; }
-        //        wxXML_CDATA_SECTION_NODE name="" content="content"
-        wxString GetNodeContent(wxXmlNode *node);
 
-        // Check to see if a param exists
+    // Gets node content from wxXML_ENTITY_NODE
-        bool HasParam(const wxString& param);      
+    // (the problem is, <tag>content<tag> is represented as
+    // wxXML_ENTITY_NODE name="tag", content=""
+    //    |-- wxXML_TEXT_NODE or 
+    //        wxXML_CDATA_SECTION_NODE name="" content="content"
+    wxString GetNodeContent(wxXmlNode *node);
 
-        // Finds the node or returns NULL
+    // Check to see if a param exists
-        wxXmlNode *GetParamNode(const wxString& param);
+    bool HasParam(const wxString& param);      
-        wxString GetParamValue(const wxString& param);
-            
-        // Add style flag (e.g. wxMB_DOCKABLE) to list of flags
-        // understood by this handler
-        void AddStyle(const wxString& name, int value);
-	
-        // Add styles common to all wxWindow-derived classes
-        void AddWindowStyles();
-        
-        // Gets style flags from text in form "flag | flag2| flag3 |..."
-        // Only understads flags added with AddStyle
-        int GetStyle(const wxString& param = _T("style"), int defaults = 0);
-        
-        // Gets text from param and does some convertions:
-        // - replaces \n, \r, \t by respective chars (according to C syntax)
-        // - replaces $ by & and $$ by $ (needed for $File => &File because of XML)
-        // - calls wxGetTranslations (unless disabled in wxXmlResource)
-        wxString GetText(const wxString& param);
 
-        // Return XMLID
+    // Finds the node or returns NULL
-        int GetID();
+    wxXmlNode *GetParamNode(const wxString& param);
-        wxString GetName();
+    wxString GetParamValue(const wxString& param);
 
-        // Get bool flag (1,t,yes,on,true are TRUE, everything else is FALSE)
+    // Add style flag (e.g. wxMB_DOCKABLE) to list of flags
-        bool GetBool(const wxString& param, bool defaultv = FALSE);
+    // understood by this handler
+    void AddStyle(const wxString& name, int value);
 
-        // Get integer value from param
+    // Add styles common to all wxWindow-derived classes
-        long GetLong( const wxString& param, long defaultv = 0 );
+    void AddWindowStyles();
-        
-        // Get colour in HTML syntax (#RRGGBB)
-        wxColour GetColour(const wxString& param);
-        
-        // Get size/position (may be in dlg units):
-        wxSize GetSize(const wxString& param = _T("size"));
-        wxPoint GetPosition(const wxString& param = _T("pos"));
 
-        // Get dimension (may be in dlg units):
+    // Gets style flags from text in form "flag | flag2| flag3 |..."
-        wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0);
+    // Only understads flags added with AddStyle
-        
+    int GetStyle(const wxString& param = wxT("style"), int defaults = 0);
-        // Get bitmap:
-        wxBitmap GetBitmap(const wxString& param = _T("bitmap"), wxSize size = wxDefaultSize);
-        wxIcon GetIcon(const wxString& param = _T("icon"), wxSize size = wxDefaultSize);
-        
-        // Get font:
-        wxFont GetFont(const wxString& param = _T("font"));
-        
-        // Sets common window options:
-        void SetupWindow(wxWindow *wnd);
-    
-        void CreateChildren(wxObject *parent, bool this_hnd_only = FALSE);
-        void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL);
-        wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL)
-            { return m_Resource->CreateResFromNode(node, parent, instance); }
 
-        // helper
+    // Gets text from param and does some convertions:
-        wxFileSystem& GetCurFileSystem() { return m_Resource->GetCurFileSystem(); }
+    // - replaces \n, \r, \t by respective chars (according to C syntax)
+    // - replaces $ by & and $$ by $ (needed for $File => &File because of XML)
+    // - calls wxGetTranslations (unless disabled in wxXmlResource)
+    wxString GetText(const wxString& param);
+
+    // Return XMLID
+    int GetID();
+    wxString GetName();
+
+    // Get bool flag (1,t,yes,on,true are TRUE, everything else is FALSE)
+    bool GetBool(const wxString& param, bool defaultv = FALSE);
+
+    // Get integer value from param
+    long GetLong( const wxString& param, long defaultv = 0 );
+
+    // Get colour in HTML syntax (#RRGGBB)
+    wxColour GetColour(const wxString& param);
+
+    // Get size/position (may be in dlg units):
+    wxSize GetSize(const wxString& param = wxT("size"));
+    wxPoint GetPosition(const wxString& param = wxT("pos"));
+
+    // Get dimension (may be in dlg units):
+    wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0);
+
+    // Get bitmap:
+    wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
+                       wxSize size = wxDefaultSize);
+    wxIcon GetIcon(const wxString& param = wxT("icon"),
+                   wxSize size = wxDefaultSize);
+
+    // Get font:
+    wxFont GetFont(const wxString& param = wxT("font"));
+
+    // Sets common window options:
+    void SetupWindow(wxWindow *wnd);
+
+    void CreateChildren(wxObject *parent, bool this_hnd_only = FALSE);
+    void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL);
+    wxObject *CreateResFromNode(wxXmlNode *node, 
+                                wxObject *parent, wxObject *instance = NULL)
+        { return m_resource->CreateResFromNode(node, parent, instance); }
+
+    // helper
+    wxFileSystem& GetCurFileSystem() { return m_resource->GetCurFileSystem(); }
 };
 
-#define ADD_STYLE(style) AddStyle(_T(#style), style)
+#define ADD_STYLE(style) AddStyle(wxT(#style), style)
 
 
 

contrib/samples/Makefile.in

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

contrib/samples/applet/Makefile.in

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

contrib/samples/applet/about.html

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

contrib/samples/applet/applet.cpp

@@ -0,0 +1,157 @@
+/****************************************************************************
+*
+*                       wxWindows HTML Applet Package
+*
+*  ========================================================================
+*
+*    The contents of this file are subject to the wxWindows licence; you
+*    may not use this file except in compliance with the License. You may
+*    obtain a copy of the License at http://www.wxwindows.org/licence.htm
+*
+*    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++
+* Environment:  Any
+*
+* Description:  Main wxApplet sample program
+*
+****************************************************************************/
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include <wx/wxprec.h>
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/wx.h"
+#include "wx/applet/window.h"
+#include "applet.h"
+
+/*---------------------------- Global variables ---------------------------*/
+
+// Define the event tables for handling application frame events
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU(Minimal_Quit,      MyFrame::OnQuit)
+    EVT_MENU(Minimal_About,     MyFrame::OnAbout)
+    EVT_MENU(Minimal_Back,      MyFrame::OnBack)
+    EVT_MENU(Minimal_Forward,   MyFrame::OnForward)
+END_EVENT_TABLE()
+
+// Create a new application object: this macro will allow wxWindows to create
+// the application object during program execution (it's better than using a
+// static object for many reasons) and also declares the accessor function
+// wxGetApp() which will return the reference of the right type (i.e. MyApp and
+// not wxApp)
+IMPLEMENT_APP(MyApp)
+
+/*------------------------- Implementation --------------------------------*/
+
+/****************************************************************************
+PARAMETERS:
+title   - Title for the frame window
+pos     - Position to place to frame window
+size    - Size of the frame window
+
+REMARKS:
+Application frame window constructor
+****************************************************************************/
+MyFrame::MyFrame(
+    const wxString& title,
+    const wxPoint& pos,
+    const wxSize& size)
+    : wxFrame(NULL, -1, title, pos, size)
+{
+    // Create a menu bar
+    wxMenu *menuFile = new wxMenu;
+    wxMenu *menuNav = new wxMenu;
+    menuFile->Append(Minimal_Quit, "E&xit");
+    menuNav->Append(Minimal_Back, "Go &back");
+    menuNav->Append(Minimal_Forward, "Go &forward");
+    
+    // Now append the freshly created menu to the menu bar...
+    wxMenuBar *menuBar = new wxMenuBar;
+    menuBar->Append(menuFile, "&File");
+    menuBar->Append(menuNav, "&Navigate");
+    
+    // ... and attach this menu bar to the frame
+    SetMenuBar(menuBar);
+    CreateStatusBar(2);
+
+    // Create the HTML window   
+    html = new wxHtmlAppletWindow(this);
+    html->SetRelatedFrame(this, "wxApplet Demo: '%s'");
+    html->SetRelatedStatusBar(1);
+    html->LoadPage("index.html");
+}
+
+/****************************************************************************
+REMARKS:
+Event handler for the 'Exit' menu item
+****************************************************************************/
+void MyFrame::OnQuit(
+    wxCommandEvent&)
+{
+    // TRUE is to force the frame to close
+    Close(TRUE);
+}
+
+/****************************************************************************
+REMARKS:
+Event handler for the 'About' menu item
+****************************************************************************/
+void MyFrame::OnAbout(
+    wxCommandEvent&)
+{
+    // TODO: Bring up and about html page!
+}
+
+/****************************************************************************
+REMARKS:
+Event handler for the 'Go back' menu item
+****************************************************************************/
+void MyFrame::OnBack(
+    wxCommandEvent&)
+{
+    if (!html -> HistoryBack())
+        wxMessageBox("You reached prehistory era!");
+}
+
+/****************************************************************************
+REMARKS:
+Event handler for the 'Go forward' menu item
+****************************************************************************/
+void MyFrame::OnForward(
+    wxCommandEvent&)
+{
+    if (!html -> HistoryForward())
+        wxMessageBox("No more items in history!");
+}
+
+/****************************************************************************
+REMARKS:
+`Main program' equivalent: the program execution "starts" here
+****************************************************************************/
+bool MyApp::OnInit()
+{
+    // Create the main application window
+    MyFrame *frame = new MyFrame("wxApplet testing application",
+        wxPoint(50, 50), wxSize(640, 480));
+
+    // Show it and tell the application that it's our main window
+    frame->Show(TRUE);
+    SetTopWindow(frame);
+
+    // Success: wxApp::OnRun() will be called to run the application
+    return TRUE;
+}
+

contrib/samples/applet/applet.h

@@ -0,0 +1,78 @@
+/****************************************************************************
+*
+*                       wxWindows HTML Applet Package
+*
+*  ========================================================================
+*
+*    The contents of this file are subject to the wxWindows licence; you
+*    may not use this file except in compliance with the License. You may
+*    obtain a copy of the License at http://www.wxwindows.org/licence.htm
+*
+*    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++
+* Environment:  Any
+*
+* Description:  Main wxApplet sample program header file
+*
+****************************************************************************/
+
+#ifndef __SAMPLE_H
+
+/*------------------------------ Constants --------------------------------*/
+
+enum {
+    // Menu items
+    Minimal_Quit = 1,
+    Minimal_About,
+    Minimal_Back,
+    Minimal_Forward,
+    
+    // Controls start here (the numbers are, of course, arbitrary)
+    Minimal_Text = 1000,
+    };
+
+/*--------------------------- Class Definitions ---------------------------*/
+
+/****************************************************************************
+REMARKS:
+Define a new application type, each program should derive a class from wxApp
+****************************************************************************/
+class MyApp : public wxApp {
+public:
+    // Initialise the application on startup
+    virtual bool OnInit();
+    };
+
+/****************************************************************************
+REMARKS:
+Define a new frame type: this is going to be our main frame
+****************************************************************************/
+class MyFrame : public wxFrame {
+private:
+    DECLARE_EVENT_TABLE()       // Declare event table
+    wxHtmlAppletWindow *html;   // Pointer to the html applet window
+
+public:
+            // Constructor
+            MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+
+            // Event handlers
+            void OnQuit(wxCommandEvent& event);
+            void OnAbout(wxCommandEvent& event);
+            void OnBack(wxCommandEvent& event);
+            void OnForward(wxCommandEvent& event);
+    };
+
+#endif  // __SAMPLE_H
+

contrib/samples/applet/combobox.cpp

@@ -0,0 +1,174 @@
+/****************************************************************************
+*
+*                       wxWindows HTML Applet Package
+*
+*  ========================================================================
+*
+*    The contents of this file are subject to the wxWindows licence; you
+*    may not use this file except in compliance with the License. You may
+*    obtain a copy of the License at http://www.wxwindows.org/licence.htm
+*
+*    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++
+* Environment:  Any
+*
+* Description:  Combobox wrapper. This file implements the custom
+*               combo boxes used for this sample program.
+*
+****************************************************************************/
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include <wx/wxprec.h>
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/wx.h"
+#include "combobox.h"
+
+/*------------------------- Implementation --------------------------------*/
+
+ComboBox::ComboBox(
+    wxWindow *parent,
+    int listid,
+    int textid)
+    : m_Parent(parent), m_ListBoxId(listid), m_TextCtrlId(textid)
+{
+    m_ListBox  = wxDynamicCast(m_Parent->FindWindow(listid),wxListBox);
+    m_TextCtrl = wxDynamicCast(m_Parent->FindWindow(textid),wxTextCtrl);
+}
+
+int ComboBox::GetListBoxId()
+{
+    return m_ListBoxId;
+}
+
+int ComboBox::GetSelection()
+{
+    return m_ListBox->GetSelection();
+}
+
+wxString ComboBox::GetStringSelection()
+{
+    return m_ListBox->GetStringSelection();
+}
+
+bool ComboBox::SetStringSelection(const wxString& s, bool select)
+{
+    select = TRUE;
+    select = m_ListBox->SetStringSelection(s, select);
+    m_TextCtrl->SetValue(GetStringSelection());
+    return select;
+}
+
+void ComboBox::Select(int n)
+{
+    m_ListBox->Select(n);
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+    
+void ComboBox::Deselect(int n)
+{
+    m_ListBox->Deselect(n);
+}
+
+void ComboBox::Insert(const wxString& item, int pos)
+{
+    m_ListBox->Insert(item,pos);
+}   
+
+void ComboBox::Insert(const wxString& item, int pos, void *clientData)
+{
+    m_ListBox->Insert(item, pos, clientData);
+}
+
+void ComboBox::Insert(const wxString& item, int pos, wxClientData *clientData)
+{
+    m_ListBox->Insert(item, pos, clientData);
+}
+
+void ComboBox::InsertItems(int nItems, const wxString *items, int pos)
+{
+    m_ListBox->InsertItems(nItems, items, pos);
+}
+
+void ComboBox::InsertItems(const wxArrayString& items, int pos)
+{
+    m_ListBox->InsertItems(items, pos);
+}
+
+void ComboBox::Set(int n, const wxString* items, void **clientData)
+{
+    m_ListBox->Set(n, items, clientData);
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+
+void ComboBox::Set(const wxArrayString& items, void **clientData)
+{
+    m_ListBox->Set(items, clientData);
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+
+int ComboBox::FindString(const wxString &s)
+{
+    return (m_ListBox->FindString(s));
+}
+
+void ComboBox::SetFirstItem(int n)
+{
+    m_ListBox->SetFirstItem(n);
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+        
+void ComboBox::SetFirstItem(const wxString &s)
+{
+    m_ListBox->SetFirstItem(s);
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+    
+void ComboBox::Append(const wxString &item)
+{
+    m_ListBox->Append(item);
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+
+void ComboBox::Append(const wxString& item, void *clientData)
+{
+    m_ListBox->Append(item, clientData);
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+
+void ComboBox::Append(const wxString& item, wxClientData *clientData)
+{
+    m_ListBox->Append(item, clientData);
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+
+void ComboBox::Clear()  
+{
+    m_ListBox->Clear();
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+        
+void ComboBox::Delete(int n)
+{
+    m_ListBox->Delete(n);
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+
+void ComboBox::OnChange(wxCommandEvent &)
+{
+    m_TextCtrl->SetValue(GetStringSelection());
+}
+

contrib/samples/applet/combobox.h

@@ -0,0 +1,98 @@
+/****************************************************************************
+*
+*                       wxWindows HTML Applet Package
+*
+*  ========================================================================
+*
+*    The contents of this file are subject to the wxWindows licence; you
+*    may not use this file except in compliance with the License. You may
+*    obtain a copy of the License at http://www.wxwindows.org/licence.htm
+*
+*    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++
+* Environment:  Any
+*
+* Description:  Combobox wrapper. This header file defines the custom
+*               combo boxes used for this sample program.
+*
+****************************************************************************/
+
+#ifndef __COMBOBOX_H
+#define __COMBOBOX_H
+
+/*--------------------------- Class Definitions ---------------------------*/
+
+/****************************************************************************
+REMARKS:
+Defines a Custom ComboBox. This combobox is a portable implementation of
+the msw combobox control. It is made of the wxWindows textctrl primitive and
+the listbox primitive. This object does not create or display the controls,
+it provides the relationship and underlying behavior layer for the primitives
+allready created via wxDesigner.
+****************************************************************************/
+class ComboBox {
+private:
+    int         m_ListBoxId;
+    int         m_TextCtrlId;
+    wxWindow    *m_Parent;
+    wxListBox   *m_ListBox;
+    wxTextCtrl  *m_TextCtrl;
+
+public:
+            // Constructor
+            ComboBox(wxWindow *parent, int,int);
+            
+            // Returns the id of the listbox: listBoxId.
+            int GetListBoxId();
+            
+            // Inserts: Used to insert items into the listbox
+            void Insert(const wxString& item, int pos);
+            void Insert(const wxString& item, int pos, void *clientData);
+            void Insert(const wxString& item, int pos, wxClientData *clientData);
+            void InsertItems(int nItems, const wxString *items, int pos);
+            void InsertItems(const wxArrayString& items, int pos);
+            
+            // Sets: Used to set items in the combo box
+            void Set(int n, const wxString* items, void **clientData );
+            void Set(const wxArrayString& items, void **clientData);
+            int FindString(const wxString &s);
+            
+            // Selections: Used to get/de/select items in the listbox
+            void Select(int n);
+            void Deselect(int n);
+            int GetSelection();         
+            wxString GetStringSelection();
+            bool SetStringSelection(const wxString& s, bool select);
+        
+            // Set the specified item at the first visible item or scroll to max
+            // range.
+            void SetFirstItem(int n);
+            void SetFirstItem(const wxString& s);
+                
+            // Append items to the listbox
+            void Append(const wxString& item);
+            void Append(const wxString& item, void *clientData);
+            void Append(const wxString& item, wxClientData *clientData);
+                    
+            // Deleting items from the list box
+            void Clear();   
+            void Delete(int n);
+        
+            // OnChange event function (called from SDD dialog box code, see: dialog.h) Mimic
+            // msw combobox behavior: Click on listbox item it shows in textbox.                    
+            void OnChange(wxCommandEvent &event);
+    };
+
+#endif  // __COMBOBOX_H
+

contrib/samples/applet/dialogs_wdr.cpp

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

contrib/samples/applet/dialogs_wdr.h

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

contrib/samples/applet/index.html

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

contrib/samples/applet/monitorapplet.cpp

@@ -0,0 +1,222 @@
+/****************************************************************************
+*
+*                       wxWindows HTML Applet Package
+*
+*               Copyright (C) 1991-2001 SciTech Software, Inc.
+*                            All rights reserved.
+*
+*  ======================================================================
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  |                                                                    |
+*  |This copyrighted computer code is a proprietary trade secret of     |
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
+*  |written authorization from SciTech to possess or use this code, you |
+*  |may be subject to civil and/or criminal penalties.                  |
+*  |                                                                    |
+*  |If you received this code in error or you would like to report      |
+*  |improper use, please immediately contact SciTech Software, Inc. at  |
+*  |530-894-8400.                                                       |
+*  |                                                                    |
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  ======================================================================
+*
+* Language:     ANSI C++
+* Environment:  Any
+*
+* Description:  Main wxApplet class implementation
+*
+****************************************************************************/
+
+// For compilers that support precompilation
+#include "wx/wxprec.h"
+
+// Include private headers
+#include "wx/wx.h"
+#include "monitorapplet.h"
+
+/*---------------------------- Global variables ---------------------------*/
+
+// Implement the dynamic class so it can be constructed dynamically
+IMPLEMENT_DYNAMIC_CLASS(MonitorApplet, wxApplet);
+    
+// Event handler table.
+BEGIN_EVENT_TABLE(MonitorApplet, wxApplet)
+    EVT_LISTBOX(ID_LISTBOX_MFTR,        MonitorApplet::OnChange)
+    EVT_LISTBOX(ID_LISTBOX_MDL,         MonitorApplet::OnChange)
+END_EVENT_TABLE()
+
+// Include database of known monitors. Normally this would come from a
+// real database on disk, but for this simple example we hard code all
+// the values into a table.
+#include "monitors.c"   
+    
+/*------------------------- Implementation --------------------------------*/
+
+/****************************************************************************
+REMARKS:
+Constructor called during dynamic creation. Simple initialise all
+internal values for the class so that it can be properly created later
+via the virtual Create member function.
+****************************************************************************/
+MonitorApplet::MonitorApplet()
+{   
+    m_Mfr = NULL;
+    m_Model = NULL;
+    m_Data = NULL;
+}
+
+/****************************************************************************
+REMARKS:
+Psuedo virtual constructor for the MonitorApplet class.
+****************************************************************************/
+bool MonitorApplet::Create(
+    wxHtmlAppletWindow *parent,
+    const wxSize& size,
+    long style)
+{
+    bool ret = wxApplet::Create(parent, size, style);
+    if (ret) {
+        // Read our cookie or create it if it does not exist
+        if ((m_Data = (MonitorData*)parent->FindCookie(MONITOR_COOKIE_NAME)) == NULL) {
+            m_Data = new MonitorData;
+            memset(&m_Data->m_Monitor,0,sizeof(m_Data->m_Monitor));
+            parent->RegisterCookie(MONITOR_COOKIE_NAME,m_Data);
+            }
+        
+        // Create all the controls and initialise them
+        MonitorDialogFunc(this,true,true);
+        if ((m_Mfr = new ComboBox(this , ID_LISTBOX_MFTR, ID_TEXTCTRL_MFTR)) == NULL)
+            return false;
+        if ((m_Model = new ComboBox(this , ID_LISTBOX_MDL, ID_TEXTCTRL_MDL)) == NULL)
+            return false;
+        ReadMfrList();
+        ReadModelList(true);
+        }
+    return ret;
+}
+                
+/****************************************************************************
+REMARKS:
+Destructor for the MonitorApplet class.
+****************************************************************************/
+MonitorApplet::~MonitorApplet()
+{
+    delete m_Mfr;
+    delete m_Model;
+}
+
+/****************************************************************************
+REMARKS:
+Save the current state for the applet to our cookie
+****************************************************************************/
+void MonitorApplet::SaveCurrentState()
+{
+    // Read currently selected strings into cookie
+    strcpy(m_Data->m_Monitor.m_Mfr,m_Mfr->GetStringSelection());
+    strcpy(m_Data->m_Monitor.m_Model,m_Model->GetStringSelection());
+}
+
+/****************************************************************************
+REMARKS:
+Handles user navigation away from the applet via an HTML link
+****************************************************************************/
+void MonitorApplet::OnLinkClicked(
+    const wxHtmlLinkInfo&)  
+{
+    SaveCurrentState();
+}
+            
+/****************************************************************************
+REMARKS:
+Handles user navigation away from the applet via the history forward command
+****************************************************************************/
+void MonitorApplet::OnHistoryForward()
+{
+    SaveCurrentState();
+}
+            
+/****************************************************************************
+REMARKS:
+Handles user navigation away from the applet via the history back command
+****************************************************************************/
+void MonitorApplet::OnHistoryBack()
+{
+    SaveCurrentState();
+}
+            
+/****************************************************************************
+REMARKS:
+Handles inter applet communication messages
+****************************************************************************/
+void MonitorApplet::OnMessage(  
+    wxEvent& msg)
+{
+    msg.Skip(true);
+}
+
+/****************************************************************************
+REMARKS:
+****************************************************************************/
+void MonitorApplet::OnChange(
+    wxCommandEvent &evt)
+{
+    if (evt.GetId() == m_Mfr->GetListBoxId()) {
+        m_Mfr->OnChange(evt);
+        ReadModelList(true);
+        }
+    else if (evt.GetId() == m_Model->GetListBoxId()) {
+        m_Model->OnChange(evt);     
+        }
+}
+
+/****************************************************************************
+REMARKS:
+Updates the manufacturer list for the dialog box from the database.
+****************************************************************************/
+void MonitorApplet::ReadMfrList()
+{               
+    char            buf[80] = "";
+    int             i,selected = 0;
+    MonitorEntry    *m;
+
+    m_Mfr->Clear();
+    for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) {
+        if (wxStricmp(buf,m->m_Mfr) != 0) {
+            m_Mfr->Append(m->m_Mfr);
+            if (wxStricmp(m_Data->m_Monitor.m_Mfr,m->m_Mfr) == 0)
+                selected = i;
+            strcpy(buf,m->m_Mfr);
+            i++;
+            }
+        }
+    m_Mfr->Select(selected);
+}
+
+/****************************************************************************
+REMARKS:
+Updates the model list for the dialog box for the currently selected
+manufacturer type.
+****************************************************************************/
+void MonitorApplet::ReadModelList(
+    bool selectCurrent)
+{               
+    int             i,selected = 0;
+    MonitorEntry    *m;
+    wxString        mfrStr;
+    
+    mfrStr = m_Mfr->GetStringSelection();
+    m_Model->Clear();
+    for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) {
+        if (wxStricmp(mfrStr,m->m_Mfr) == 0) {
+            m_Model->Append(m->m_Model);
+            if (selectCurrent && wxStricmp(m_Data->m_Monitor.m_Model,m->m_Model) == 0)
+                selected = i;
+            i++;
+            }
+        }
+    m_Model->Select(selected);
+}
+

contrib/samples/applet/monitorapplet.h

@@ -0,0 +1,114 @@
+/****************************************************************************
+*
+*               Copyright (C) 1991-2001 SciTech Software, Inc.
+*                            All rights reserved.
+*
+*  ======================================================================
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  |                                                                    |
+*  |This copyrighted computer code is a proprietary trade secret of     |
+*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
+*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
+*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
+*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
+*  |written authorization from SciTech to possess or use this code, you |
+*  |may be subject to civil and/or criminal penalties.                  |
+*  |                                                                    |
+*  |If you received this code in error or you would like to report      |
+*  |improper use, please immediately contact SciTech Software, Inc. at  |
+*  |530-894-8400.                                                       |
+*  |                                                                    |
+*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
+*  ======================================================================
+*
+* Language:     ANSI C++
+* Environment:  Any
+*
+* Description:  Header file for the MonitorApplet class
+*
+****************************************************************************/
+
+#ifndef __WX_MONITORAPPLET_H
+#define __WX_MONITORAPPLET_H
+
+#include "wx/applet/applet.h"
+#include "combobox.h"
+#include "dialogs_wdr.h"
+
+/*--------------------------- Class Definitions ---------------------------*/
+
+/****************************************************************************
+REMARKS:
+Structure defining the simple monitor database records.
+****************************************************************************/
+struct MonitorEntry {
+    char    m_Mfr[60];
+    char    m_Model[60];
+    };
+
+/****************************************************************************
+REMARKS:
+Defines our wxMonitorData cookie object that is stored to maintain state
+information for this MonitorApplet.
+****************************************************************************/
+class MonitorData : public wxObject {
+public:
+    MonitorEntry    m_Monitor;
+    };
+
+// Name used to track the monitor data cookie   
+#define MONITOR_COOKIE_NAME "MonitorData"   
+    
+/****************************************************************************
+REMARKS:
+Defines our wxMonitor applet class
+****************************************************************************/
+class MonitorApplet : public wxApplet {
+private:
+    DECLARE_DYNAMIC_CLASS(MonitorApplet);
+    DECLARE_EVENT_TABLE();
+    
+protected:
+    ComboBox            *m_Mfr;             
+    ComboBox            *m_Model;
+    MonitorData         *m_Data;    
+    static MonitorEntry m_Monitors[];
+    
+            // Flush the current state to a cookie
+            void SaveCurrentState();
+            
+public:
+            // Constructor (called during dynamic creation)
+            MonitorApplet();
+
+            // Psuedo virtual constructor
+    virtual bool Create(
+                wxHtmlAppletWindow *parent,
+                const wxSize& size,
+                long style);
+                
+            // Virtual destructor
+    virtual ~MonitorApplet();
+
+            // Handle HTML navigation to a new URL
+    virtual void OnLinkClicked(const wxHtmlLinkInfo& link); 
+            
+            // Handle HTML navigation forward command in applet
+    virtual void OnHistoryForward();
+            
+            // Handle HTML navigation back command in applet
+    virtual void OnHistoryBack();
+            
+            // Handle messages from the wxAppletManager and other applets
+    virtual void OnMessage(wxEvent& msg);
+
+            // Update the model and menufacturer lists
+            void ReadMfrList();
+            void ReadModelList(bool selectCurrent);
+
+            // Event handlers   
+            void OnChange(wxCommandEvent &event);
+    };
+    
+#endif // __WX_MONITORAPPLET_H
+

contrib/samples/canvas/test/test.cpp

@@ -63,18 +63,18 @@ void MywxCanvasObjectRef::OnMouseEvent(wxMouseEvent &event)
     if (event.LeftDown())
     {
         CaptureMouse();
-        if (m_dragmode != DRAG_REDRAW)
+        if (m_dragmode != wxDRAG_REDRAW)
             DragStart();
     }
     else if (event.LeftUp())
     {
         ReleaseMouse();
-        if (m_dragmode != DRAG_REDRAW)
+        if (m_dragmode != wxDRAG_REDRAW)
             DragEnd();
     }
     else if (IsCapturedMouse())
     {
-        if (m_dragmode != DRAG_REDRAW)
+        if (m_dragmode != wxDRAG_REDRAW)
             DragRelative(x-xprev,y-yprev);
         else
             MoveRelative(x-xprev,y-yprev);
@@ -120,18 +120,18 @@ void MyEventHandler::OnMouseEvent(wxMouseEvent &event)
     if (event.LeftDown())
     {
         obj->CaptureMouse();
-        if (obj->GetDragMode() != DRAG_REDRAW)
+        if (obj->GetDragMode() != wxDRAG_REDRAW)
             obj->DragStart();
     }
     else if (event.LeftUp())
     {
         obj->ReleaseMouse();
-        if (obj->GetDragMode() != DRAG_REDRAW)
+        if (obj->GetDragMode() != wxDRAG_REDRAW)
             obj->DragEnd();
     }
     else if (obj->IsCapturedMouse())
     {
-        if (obj->GetDragMode() != DRAG_REDRAW)
+        if (obj->GetDragMode() != wxDRAG_REDRAW)
             obj->DragRelative(x-xprev,y-yprev);
         else
             obj->MoveRelative(x-xprev,y-yprev);
@@ -207,7 +207,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
     m_splitter = new MySplitterWindow(this, SPLITTER_WINDOW);
 
     m_canvas1 = new MyCanvas(&m_canvasadmin, m_splitter, CANVAS1, wxPoint(0, 0), wxSize(400, 400),wxHSCROLL|wxVSCROLL);
-    m_canvas1->SetYaxis(TRUE);
+    m_canvas1->SetYaxis(FALSE);
     m_canvas1->SetMappingScroll(-300,-300,500,500,false);
     m_canvas1->SetScroll(-400,-400,600,600);
     m_canvas1->SetColour(wxColour(255, 255, 255) );
@@ -282,7 +282,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
         m_datatree->Append( new wxCanvasLine( 10,-15,i,300 ) );
 /*
     m_sm4 = new wxCanvasImage( image, 0,270,64,32 );
-    m_sm4->SetDragMode(DRAG_RECTANGLE);
+    m_sm4->SetDragMode(wxDRAG_RECTANGLE);
     m_datatree->Append( m_sm4 );
 */
 
@@ -454,13 +454,13 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
 
     m_ref2 = new MywxCanvasObjectRef(80,450, group1);
     m_ref2->SetRotation(-35);
-    m_ref2->SetDragMode(DRAG_RECTANGLE);
+    m_ref2->SetDragMode(wxDRAG_RECTANGLE);
     m_datatree->Prepend( m_ref2 );
 
     wxCanvasCircle* cir = new  wxCanvasCircle( -100, -150, 100 );
     cir->SetBrush(wxBrush(wxColour(19,215,6),wxHORIZONTAL_HATCH ));
     cir->SetPen(wxPen(wxColour(198,3,105 ),30,wxSOLID));
-    cir->SetDragMode(DRAG_REDRAW);
+    cir->SetDragMode(wxDRAG_REDRAW);
     m_datatree->Prepend( cir );
 
     wxCanvasEllipse* elp = new  wxCanvasEllipse( -100, 250, 100,300 );

contrib/samples/gizmos/editlbox/Makefile.in

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

contrib/samples/gizmos/editlbox/makefile.vc

@@ -1,18 +1,19 @@
-#
-# File:		makefile.vc
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:	(c) Julian Smart
-#
 # Makefile : Builds sample (VC++, WIN32)
 # Use FINAL=1 argument to nmake to build final version with no debug info.
+# Created 2000-07-28
 
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
-
+FINAL=0
-PROGRAM=plot
+PROGRAM=test
 OBJECTS = $(PROGRAM).obj
 
+!if "$(FINAL)" == "0"
+EXTRALIBS=$(WXDIR)\lib\gizmosd.lib
+!else
+EXTRALIBS=$(WXDIR)\lib\gizmos.lib
+!endif
+
 !include $(WXDIR)\src\makeprog.vc
 
+

contrib/samples/gizmos/editlbox/test.cpp

@@ -0,0 +1,65 @@
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers (this file is usually all you
+// need because it includes almost all "standard" wxWindows headers)
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "wx/gizmos/editlbox.h"
+#include "wx/sizer.h"
+
+class MyApp : public wxApp
+{
+public:
+    virtual bool OnInit();
+};
+
+IMPLEMENT_APP(MyApp)
+
+
+bool MyApp::OnInit()
+{
+    wxDialog dlg(NULL, -1, _("Test dialog"), wxDefaultPosition, wxDefaultSize,
+                 wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
+
+    wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(new wxEditableListBox(&dlg, -1, _("Match these wildcards:"), 
+                                     wxDefaultPosition,wxSize(300,200)),
+               1, wxEXPAND|wxALL, 10);
+               
+    sizer->Add(5,5);
+
+    wxEditableListBox *lb = new wxEditableListBox(&dlg, -1, _("Except:"), 
+                                     wxDefaultPosition,wxSize(300,200));
+    wxArrayString ar;
+    ar.Add(_T("*.cpp"));
+    ar.Add(_T("*.h"));
+    ar.Add(_T("*.c"));
+    lb->SetStrings(ar);
+
+    sizer->Add(lb, 1, wxEXPAND|wxALL, 10);
+
+    sizer->Add(5,5);
+               
+    sizer->Add(new wxButton(&dlg, wxID_OK, _("OK")), 0, wxALIGN_RIGHT | wxALL, 10);
+    dlg.SetAutoLayout(TRUE);
+    dlg.SetSizer(sizer);
+    sizer->Fit(&dlg);
+	dlg.Centre();
+  
+    dlg.ShowModal();
+
+    wxString res = _("'Except' contains these strings:\n\n");
+    lb->GetStrings(ar);
+    for (size_t i = 0; i < ar.GetCount(); i++)
+        res << ar[i] << _T("\n");
+    wxMessageBox(res);
+    
+    return FALSE;
+}

contrib/samples/gizmos/editlbox/test.rc

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

contrib/samples/gizmos/splittree/TreeVC.dsp

@@ -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 wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib gizmos.lib 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 /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/tree.exe" /libpath:"d:\wx2\wxWindows\lib"
+# ADD LINK32 wx.lib png.lib zlib.lib jpeg.lib tiff.lib gizmos.lib 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 /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/tree.exe" /libpath:"d:\wx2\wxWindows\lib"
 
 !ELSEIF  "$(CFG)" == "TreeVC - Win32 Debug"
 
@@ -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 wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib gizmosd.lib 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 /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/tree.exe" /pdbtype:sept /libpath:"d:\wx2\wxWindows\lib"
+# ADD LINK32 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib gizmosd.lib 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 /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/tree.exe" /pdbtype:sept /libpath:"d:\wx2\wxWindows\lib"
 
 !ELSEIF  "$(CFG)" == "TreeVC - Win32 Debug DLL"
 

contrib/samples/mmedia/MMboardVC.dsp

@@ -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 xpm.lib png.lib zlib.lib jpeg.lib tiff.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
 
@@ -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 xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
 
@@ -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 wxdlld.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 wxdll.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

@@ -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 xpm.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
 
@@ -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 xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
 
@@ -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 wxdlld.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"
 
@@ -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 wxdll.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
 

contrib/samples/ogl/ogledit/makefile.b32

@@ -10,8 +10,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=ogledit
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
-# EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
 OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
 
 !include $(WXDIR)\src\makeprog.b32

contrib/samples/ogl/ogledit/makefile.bcc

@@ -13,8 +13,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=ogledit
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
-# EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
 OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
 
 !include $(WXDIR)\src\makeprog.b32

contrib/samples/ogl/ogledit/makefile.dos

@@ -16,8 +16,8 @@ WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makemsc.env
 
 THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit
-WXLIB = $(WXDIR)\contrib\lib\wx.lib
+WXLIB = $(WXDIR)\lib\wx.lib
-OGLLIB = $(WXDIR)\contrib\lib\ogl.lib
+OGLLIB = $(WXDIR)\lib\ogl.lib
 
 LIBS=$(WXLIB) $(OGLLIB) oldnames libw llibcew commdlg shell ddeml
 

contrib/samples/ogl/ogledit/makefile.vc

@@ -18,9 +18,9 @@ PROGRAM=ogledit
 FINAL=0
 
 !if "$(FINAL)" == "0"
-EXTRALIBS=$(WXDIR)\contrib\lib\ogld.lib
+EXTRALIBS=$(WXDIR)\lib\ogld.lib
 !else
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 !endif
 
 OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj

contrib/samples/ogl/ogledit/makefile.wat

@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = ogledit
-EXTRALIBS = $(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS = $(WXDIR)\lib\ogl.lib
 OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj
 
 !include $(WXDIR)\src\makeprog.wat

contrib/samples/ogl/ogledit/view.cpp

@@ -292,8 +292,9 @@ void MyCanvas::OnLeftClick(double x, double y, int keys)
   }
   if (info)
   {
-    view->GetDocument()->GetCommandProcessor()->Submit(new DiagramCommand(info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
+    view->GetDocument()->GetCommandProcessor()->Submit(
-      x, y));
+      new DiagramCommand((char*) info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
+         x, y));
   }
 }
 

contrib/samples/ogl/studio/StudioVC.dsp

@@ -1,6 +1,5 @@
 # Microsoft Developer Studio Project File - Name="StudioVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
@@ -8,23 +7,24 @@
 CFG=StudioVC - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "StudioVC.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "StudioVC.mak" CFG="StudioVC - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "StudioVC - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE "StudioVC - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "StudioVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
 !MESSAGE "StudioVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE
+!MESSAGE 
 
 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -47,8 +47,8 @@ RSC=rc.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD 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 xpm.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/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 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/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "StudioVC - 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 xpmd.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/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 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/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "StudioVC - 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 wxdlld.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"
 
@@ -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,9 +135,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxdll.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
+!ENDIF 
 
 # Begin Target
 
@@ -147,26 +147,6 @@ LINK32=link.exe
 # Name "StudioVC - Win32 Release DLL"
 # Begin Source File
 
-SOURCE=.\studio.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\cspalette.cpp
 
 !IF  "$(CFG)" == "StudioVC - Win32 Release"
@@ -182,7 +162,31 @@ SOURCE=.\cspalette.cpp
 
 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
 
-!ENDIF
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\cspalette.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\csprint.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -202,28 +206,12 @@ SOURCE=.\dialogs.cpp
 
 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=.\view.cpp
+SOURCE=.\dialogs.h
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
 # End Source File
 # Begin Source File
 
@@ -242,11 +230,15 @@ SOURCE=.\doc.cpp
 
 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
 
+SOURCE=.\doc.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\mainfrm.cpp
 
 !IF  "$(CFG)" == "StudioVC - Win32 Release"
@@ -262,11 +254,15 @@ SOURCE=.\mainfrm.cpp
 
 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
 
+SOURCE=.\mainfrm.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\project.cpp
 
 !IF  "$(CFG)" == "StudioVC - Win32 Release"
@@ -282,11 +278,15 @@ SOURCE=.\project.cpp
 
 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
 
+SOURCE=.\project.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\shapes.cpp
 
 !IF  "$(CFG)" == "StudioVC - Win32 Release"
@@ -302,11 +302,45 @@ SOURCE=.\shapes.cpp
 
 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
 
+SOURCE=.\shapes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\studio.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\studio.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\studio.rc
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
+# End Source File
+# Begin Source File
+
 SOURCE=.\symbols.cpp
 
 !IF  "$(CFG)" == "StudioVC - Win32 Release"
@@ -322,192 +356,16 @@ SOURCE=.\symbols.cpp
 
 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
 
-!ENDIF
+!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\csprint.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\studio.h
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\cspalette.h
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dialogs.h
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.h
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\doc.h
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mainfrm.h
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\project.h
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\shapes.h
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF
 
 # End Source File
 # Begin Source File
 
 SOURCE=.\symbols.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\view.cpp
 
 !IF  "$(CFG)" == "StudioVC - Win32 Release"
 
@@ -522,14 +380,12 @@ SOURCE=.\symbols.h
 
 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=.\studio.rc
+SOURCE=.\view.h
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
 # End Source File
 # End Target
 # End Project

contrib/samples/ogl/studio/StudioVC.dsw

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

contrib/samples/ogl/studio/makefile.b32

@@ -10,7 +10,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=studio
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
   mainfrm.obj project.obj dialogs.obj csprint.obj
 

contrib/samples/ogl/studio/makefile.bcc

@@ -13,7 +13,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=studio
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
   mainfrm.obj project.obj dialogs.obj csprint.obj
 

contrib/samples/ogl/studio/makefile.vc

@@ -18,9 +18,9 @@ PROGRAM=studio
 FINAL=0
 
 !if "$(FINAL)" == "0"
-EXTRALIBS=$(WXDIR)\contrib\lib\ogld.lib
+EXTRALIBS=$(WXDIR)\lib\ogld.lib
 !else
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 !endif
 
 OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\

contrib/samples/ogl/studio/makefile.wat

@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = studio
-EXTRALIBS = $(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS = $(WXDIR)\lib\ogl.lib
 OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj &
   mainfrm.obj project.obj dialogs.obj csprint.obj
 

contrib/samples/plot/Makefile.in

@@ -0,0 +1,16 @@
+# Makefile for mmedia sample.
+# $Id$
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../..
+program_dir = contrib/samples/plot
+
+PROGRAM=plot
+
+OBJECTS=plot.o
+
+APPEXTRALIBS=$(top_builddir)/lib/libplot.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+
+include $(top_builddir)/src/makeprog.env
+

contrib/samples/plot/plot.cpp

@@ -18,7 +18,7 @@
 #include "wx/wx.h"
 #endif
 
-#include "wx/plot.h"
+#include "wx/plot/plot.h"
 
 #include "wx/image.h"
 #include "wx/listctrl.h"
@@ -121,7 +121,7 @@ MyFrame::MyFrame()
 
     m_plot = new wxPlotWindow( this, -1, wxPoint(0,0), wxSize(100,100), wxSUNKEN_BORDER | wxPLOT_DEFAULT );
     m_plot->SetUnitsPerValue( 0.01 );
-    m_plot->SetScrollOnThumbRelease( TRUE );
+//    m_plot->SetScrollOnThumbRelease( TRUE );
 
     m_plot->Add( new MyPlotCurve( 0,  -1.5, 1.5 ) );
     m_plot->Add( new MyPlotCurve( 50, -1.5, 1.5 ) );

contrib/samples/plot/plot.rc

@@ -0,0 +1,2 @@
+#include "wx/msw/wx.rc"
+#include "wx/plot/wxplot.rc"

contrib/samples/stc/StcTestVC.dsp

@@ -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 xpm.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug"
 
@@ -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 xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug DLL"
 
@@ -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 wxdlld.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 wxdll.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