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

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

.cvsignore

@@ -29,6 +29,8 @@ UnivRelease
 UnivDebug
 BaseRelease
 BaseDebug
+BaseReleaseDLL
+BaseDebugDLL
 robert
 stamp-h.in
 Makefile

BuildCVS.txt

@@ -19,30 +19,29 @@ varaibles and PATH entries.
 Continue with item c) below.
 
 
-b) If using the GNU Mingw32 or GNU Cygwin32 compilers
+b) If using the MinGW or Cygwin compilers
 
-You can get Mingw32 from  http://www.mingw.org
+You can get MinGW from  http://www.mingw.org/
 
-Cygwin32 is available at  http://www.cygwin.com
+Cygwin is available at  http://sources.redhat.com/cygwin/
 
 The makefile might have small problems with Cygwin's tools
-so it is recommended to use Mingw32 and its toolchain instead
+so it is recommended to use MinGW and its toolchain instead
 if possible.
 
 -> Set your path so that it includes the directory
    where your compiler and tools reside
 
--> If your are using an old Mingw32 version (gcc-2.95 or older),
+-> If your are using an old MinGW version (gcc-2.95 or older),
    you might need to fix some headers with the patches contained
    in the wxWin\Mingw32-gcc295.patches file. PLEASE APPLY THESE
    PATCHES BY HAND! There are apparently a few different versions
    of the headers floating around. Note that these patches are
-   not needed if you are using Mingw32 gcc-2.95.2 or newer.
+   not needed if you are using MinGW gcc-2.95.2 or newer.
   
 -> Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
-   the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
+   the file to either 1 (you have MinGW) or 0 (you have Cygwin).
-   If using MINGW32, also set the MINGW32VERSION variable
+   Also set the MINGW32VERSION variable appropiately.
-   appropiately.
 
 
 c) Build instructions
@@ -51,19 +50,8 @@ c) Build instructions
    into c:\wxWin
 -> Copy c:\wxWin\include\wx\msw\setup0.h
    to   c:\wxWin\include\wx\msw\setup.h
--> Edit c:\wxWin\include\wx\msw\setup.h so that
+-> Edit c:\wxWin\include\wx\msw\setup.h to choose
-   most features are enabled (i.e. defined to 1), for example:
+   the features you would like to compile wxWindows with[out].
-   #define wxUSE_ODBC          0
-   #define wxUSE_SOCKETS       1
-   #define wxUSE_HTML          1
-   #define wxUSE_THREADS       1
-   #define wxUSE_FS_INET       0
-   #define wxUSE_FS_ZIP        1
-   #define wxUSE_BUSYINFO      1
-   #define wxUSE_DYNLIB_CLASS  1
-   #define wxUSE_ZIPSTREAM     1
-   #define wxUSE_LIBJPEG       1
-   #define wxUSE_LIBPNG        1
 
    and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
@@ -72,6 +60,8 @@ c) Build instructions
 -> type: make -f makefile.g95  (if using GNU tools)
 or type: nmake -f makefile.vc   (if using MS VC++)
 
+   See also docs/msw/install.txt for additional compilation options.
+
 d) Borland (including free command line tools)
    Download tools from http://www.borland.com/downloads/
    
@@ -117,11 +107,10 @@ yet complete).
 III) Windows using configure
 ----------------------------------------
 
-Take a look at Unix->Windows cross compiling. With minor
+wxWindows can be built on Windows using MSYS (see
-modifications, this should work in Windows if you've got the cygnus
+http://www.mingw.org/), which is a POSIX build environment
-utilities (bash, GNU make, etc) and either mingw32 or cygwin32 installed.
+for Windows. With MSYS you can just ./configure && make (see also VII,
-See http://www.cygnus.com for these programs, or go straight to their
+Unix->Windows cross-compiling using configure).
-ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
 
 Of course, you can also build the library using plain makefiles (see
 section I).
@@ -168,17 +157,17 @@ VI) OS/2
 VII) Unix->Windows cross-compiling using configure
 --------------------------------------------------
 
-First you'll need a cross-compiler; linux glibc binaries of mingw32 and
+First you'll need a cross-compiler; linux glibc binaries of MinGW and
-cygwin32 (both based on egcs) can be found at
+Cygwin (both based on egcs) can be found at
 ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
 based on the latest MinGW release can be found at
-http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html 
+http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
 Otherwise you can compile one yourself.
 
-[ A Note about cygwin32 and mingw32: the main difference is that cygwin32
+[ A Note about Cygwin and MinGW: the main difference is that Cygwin
 binaries are always linked against cygwin.dll. This dll encapsulates most
 standard Unix C extensions, which is very handy if you're porting unix
-software to windows. However, wxMSW doesn't need this, so mingw32 is
+software to windows. However, wxMSW doesn't need this, so MinGW is
 preferable if you write portable C(++). ]
 
 You might want to build both Unix and Windows binaries in the same source
@@ -203,7 +192,7 @@ yourself:
    DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
    ../configure --host=i586-mingw32 --with-mingw
 
-(all assuming you're using mingw32)
+(all assuming you're using MinGW)
 By default this will compile a DLL, if you want a static library,
 specify --disable-shared.
 
@@ -215,7 +204,7 @@ will be a compile error :-)
 NB: if you are using a very old compiler you risk to get quite a few warnings
     about "ANSI C++ forbids implicit conversion from 'void *'" in all places
     where va_arg macro is used. This is due to a bug in (some versions of)
-    mingw32 headers which may be corrected by upgrading your compier,
+    MinGW headers which may be corrected by upgrading your compier,
     otherwise you might edit the file
 
     ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
@@ -238,7 +227,7 @@ typedef void *__gnuc_va_list;
     __gnuc_va_list is char *.
 
 If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
-( or just libwx_msw.a if you opted for a static build ).
+(or just libwx_msw.a if you opted for a static build).
 Now try building the minimal sample:
 
 -> cd samples/minimal

Makefile.in

@@ -321,10 +321,18 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
 	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
 # NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line
-#     but this seems to result in problems with libwx_gtk being linked in twice
+#     but this seems to result in problems with libwx_gtk being linked in twice.
+# RL: This is another example of why sonames exist, and what happens when you
+#     ignore them.  Broken linking like this is now an rc bug in Debian, so we
+#     add them back again (to SONAME_FLAGS_GL) in configure if --enable-soname
+#     is used.  Removing the explicit -L /usr/lib from LDFLAGS would probably
+#     help with the above problem, but building without the soname is broken in
+#     so many other ways that I'm not going to touch that case in 2.4 anymore
+#     if I can help it.
+#
 $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
 	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)
+	$(SHARED_LD) $@ glcanvas.o $(SONAME_FLAGS_GL) $(LDFLAGS_GL) $(OPENGLLIBS) $(EXTRALIBS)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
 	@$(INSTALL) -d $(build_libdir)
@@ -383,30 +391,17 @@ 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@
 
-afminstall: preinstall
-	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
-	$(INSTALL) -d $(datadir)/wx
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-
 m4datainstall: preinstall
 	$(INSTALL) -d $(datadir)/aclocal
 	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
 
 win32install: preinstall
 	$(INSTALL) -d $(includedir)/wx/msw
-	$(INSTALL) -d $(includedir)/wx/msw/gnuwin32
-	$(INSTALL) -d $(includedir)/wx/msw/gnuwin32/gl
 	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/*.cur \
 			$(top_srcdir)/include/wx/msw/*.ico \
 			$(top_srcdir)/include/wx/msw/*.bmp \
 			$(top_srcdir)/include/wx/msw/wx.rc \
 				$(includedir)/wx/msw
-	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/*.h $(includedir)/wx/msw/gnuwin32
-	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/gl/*.h $(includedir)/wx/msw/gnuwin32/gl
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
@@ -474,7 +469,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
 	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
 
-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
+install: @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
 	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@@ -503,11 +498,7 @@ uninstall:
 	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 	@$(RM) $(bindir)/wx-config
 	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
-	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
-	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*
 	# FIXME: wxBase doesnt install these next 3 dirs.
-	@-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-	@-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm
 	@-rmdir $(datadir)/wx/$(VER_MAJMIN)
 	@-rmdir $(datadir)/wx
 	@echo " Removing headers..."
@@ -747,19 +738,12 @@ MACX_DIST: ALL_GUI_DIST
 
 MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
-	mkdir $(DISTDIR)/include/wx/msw/ctl3d
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	mkdir $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
-	cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
-	cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
-	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
-	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw
@@ -771,16 +755,9 @@ MSW_DIST: ALL_GUI_DIST
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
 	mkdir $(DISTDIR)/include/wx/msw
-	mkdir $(DISTDIR)/include/wx/msw/ctl3d
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	mkdir $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
-	cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
-	cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
-	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
-	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/msw/ole
@@ -1153,7 +1130,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles
 	cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
 	cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
-    
+
 	mkdir $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
@@ -1205,7 +1182,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
-	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
 
 	mkdir $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
@@ -1218,7 +1194,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
-	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate
 
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
@@ -1257,6 +1233,12 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
 
+	mkdir $(DISTDIR)/samples/shaped
+	cp $(SAMPDIR)/shaped/Makefile.in $(DISTDIR)/samples/shaped
+	cp $(SAMPDIR)/shaped/makefile.unx $(DISTDIR)/samples/shaped
+	cp $(SAMPDIR)/shaped/*.cpp $(DISTDIR)/samples/shaped
+	cp $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped
+
 	mkdir $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
@@ -1356,6 +1338,7 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/emulator/src/*.in $(DISTDIR)/utils/emulator/src
 	cp $(UTILSDIR)/emulator/src/*.cpp $(DISTDIR)/utils/emulator/src
 	cp $(UTILSDIR)/emulator/src/*.jpg $(DISTDIR)/utils/emulator/src
+	cp $(UTILSDIR)/emulator/src/*.xpm $(DISTDIR)/utils/emulator/src
 	cp $(UTILSDIR)/emulator/src/*.wxe $(DISTDIR)/utils/emulator/src
 	cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs
 	cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
@@ -1399,11 +1382,6 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
 
 MISC_DIST: ALL_GUI_DIST
-	mkdir $(DISTDIR)/misc
-	mkdir $(DISTDIR)/misc/afm
-	cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
-	mkdir $(DISTDIR)/misc/gs_afm
-	cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 
 INTL_DIST:
 	mkdir $(DISTDIR)/locale
@@ -1424,62 +1402,78 @@ MANUAL_DIST:
 
 # this target does not generate a complete wxPython dist, it only includes
 # those files needed for the Debian source package.
-# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
+# see wxPython/distrib for scripts to make a proper wxPython dist.
+#
+# first copy everything and then clean up the CVS stuff and etc...
 PYTHON_DIST:
-	mkdir $(DISTDIR)/wxPython
+	for dir in \
-	mkdir $(DISTDIR)/wxPython/contrib
+		wxPython \
-	mkdir $(DISTDIR)/wxPython/contrib/dllwidget
+		wxPython/contrib \
-	mkdir $(DISTDIR)/wxPython/contrib/gizmos
+		wxPython/contrib/dllwidget \
-	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
+		wxPython/contrib/gizmos \
-	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+		wxPython/contrib/glcanvas \
-	mkdir $(DISTDIR)/wxPython/contrib/ogl
+		wxPython/contrib/glcanvas/gtk \
-	mkdir $(DISTDIR)/wxPython/contrib/stc
+		wxPython/contrib/ogl \
-	mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
+		wxPython/contrib/stc \
-	mkdir $(DISTDIR)/wxPython/contrib/xrc
+		wxPython/contrib/stc/gtk \
-	mkdir $(DISTDIR)/wxPython/demo
+		wxPython/contrib/xrc \
-	mkdir $(DISTDIR)/wxPython/demo/bitmaps
+		wxPython/demo \
-	mkdir $(DISTDIR)/wxPython/demo/bmp_source
+		wxPython/demo/bitmaps \
-	mkdir $(DISTDIR)/wxPython/demo/data
+		wxPython/demo/bmp_source \
-	mkdir $(DISTDIR)/wxPython/demo/dllwidget
+		wxPython/demo/data \
-	mkdir $(DISTDIR)/wxPython/src
+		wxPython/demo/dllwidget \
-	mkdir $(DISTDIR)/wxPython/src/gtk
+		wxPython/distrib \
-	mkdir $(DISTDIR)/wxPython/scripts
+		wxPython/distutils \
-	mkdir $(DISTDIR)/wxPython/wxPython
+		wxPython/distutils/command \
-	mkdir $(DISTDIR)/wxPython/wxPython/lib
+		wxPython/docs \
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+		wxPython/docs/screenshots \
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
+		wxPython/samples/StyleEditor \
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
+		wxPython/samples/doodle \
-	mkdir $(DISTDIR)/wxPython/wxPython/tools
+		wxPython/samples/embedded \
-	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
+		wxPython/samples/frogedit \
-
+		wxPython/samples/hangman \
-	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
+		wxPython/samples/pySketch \
-	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
+		wxPython/samples/pySketch/images \
-	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
+		wxPython/samples/wxProject \
-	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
+		wxPython/samples/wx_examples \
-	cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
+		wxPython/samples/wx_examples/basic \
-	cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
+		wxPython/samples/wx_examples/hello \
-	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
+		wxPython/scripts \
-	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+		wxPython/src \
-	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+		wxPython/src/gtk \
-	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+		wxPython/wx \
-	-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
+		wxPython/wx/lib \
-	-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
+		wxPython/wx/lib/colourchooser \
-	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
+		wxPython/wx/lib/editor \
-	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
+		wxPython/wx/lib/mixins \
-	-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
+		wxPython/wx/py \
-	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+		wxPython/wx/tools \
-	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
+		wxPython/wx/tools/XRCed \
-	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
+		wxPython/wxPython \
-	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
+		wxPython/wxPython/lib \
-	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
+		wxPython/wxPython/lib/PyCrust \
-	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
+		wxPython/wxPython/lib/colourchooser \
-	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
+		wxPython/wxPython/lib/editor \
-	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
+		wxPython/wxPython/lib/mixins \
-	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+		wxPython/wxPython/tools \
-	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
+		wxPython/wxPython/tools/XRCed \
-	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
+		wxPython/wxPython/tools/XRCed/src-images \
-	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
+		wxPython/wxPython/py \
-	cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
+		wxPython/wxPython/py/tests \
+		wxPython/wxPython/py/wxd \
+		; do \
+			echo "Copying dir: $$dir..."; \
+			mkdir -p $(DISTDIR)/$$dir; \
+			cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
+		done; \
+		\
+		find $(DISTDIR)/wxPython -name "*~"           > RM_FILES; \
+		find $(DISTDIR)/wxPython -name "*.pyc"       >> RM_FILES; \
+		find $(DISTDIR)/wxPython -name "*.bat"       >> RM_FILES; \
+		find $(DISTDIR)/wxPython -name "core"        >> RM_FILES; \
+		find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
+		for f in `cat RM_FILES`; do rm $$f; done; \
+		rm RM_FILES
 
 distclean:
 	$(RM) -r _dist_dir
@@ -1573,14 +1567,20 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	@# in other dist targets.  Ugly and hardly portable but it
 	@# will run on any Debian box and that's enough for now.
 
-	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
+
-			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
+	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
-			-print0 | xargs -0 rm -rf
+			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
+			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
+			   -o -name "*.bkl" -o -name "*.pro" -o -name "*.def"    \
+			   -o -name "*.vpj" -o -name "*.sc"                      \
+			   -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
+			\) -print0 | xargs -0 rm -rf
 
 	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 
-debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
+
+@IF_GNU_MAKE@debian-native-dist: $(filter-out DEMOS_DIST,@GUIDIST@) MANUAL_DIST PYTHON_DIST
 	cp $(SRCDIR)/files.lst $(DISTDIR)/src
 
 debian-msw-dirs:
@@ -1588,6 +1588,11 @@ debian-msw-dirs:
 	mkdir $(DISTDIR)/src/msw
 
 
+# This is to keep non-gnu make's happy.
+# ... but is of course stupid and useless here, so make it a noop at least.
+@IF_NOT_GNU_MAKE@debian-native-dist: 
+
+
 clean:
 	$(RM) *.o
 	$(RM) *.d

art/addbookm.xpm

@@ -1,21 +1,24 @@
 /* XPM */
-static char * addbookm_xpm[] = {
+static char *addbookm_xpm[] = {
+/* columns rows colors chars-per-pixel */
 "16 15 3 1",
-" 	c None",
+". c Black",
-".	c #000000",
+"X c #00C000",
-"+	c #C3F9BD",
+"  c None",
-"   ..           ",
+/* pixels */
-"   ..           ",
+"        ....... ",
-"   ..      .    ",
+"        .XXXXX. ",
-"........  .+.   ",
+"   ..   .XXXXX. ",
-"........ .+++.  ",
+"   ..   .XXXXX. ",
-"   ..   .+++++. ",
+" ...... .XXXXX. ",
-"   ..  .+++++.  ",
+" ...... .XXXXX. ",
-"   .. .+++++.   ",
+"   ..   .XXXXX. ",
-"     .+++++.    ",
+"   ..   .XXXXX. ",
-"    .+++++.     ",
+"        .XXXXX. ",
-"   .+++++.      ",
+"        .XXXXX. ",
-"  ....++.       ",
+"        .XXXXX. ",
-"     .+.        ",
+"        .XXXXX. ",
-"     ..         ",
+"        .XX.XX. ",
-"     .          "};
+"        .X. .X. ",
+"        ..   .. "
+};

art/back.xpm

@@ -1,24 +1,21 @@
-/* XPM */
+/* XPM */
-static char * back_xpm[] = {
+static char * back_xpm[] = {
-"16 16 5 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c #000000",
+".	c Black",
-"+	c #C0E4CB",
+"X	c Gray100",
-"@	c #77C490",
+"                ",
-"#	c #808080",
+"                ",
-"                ",
+"      .         ",
-"                ",
+"     ..         ",
-"       .        ",
+"    .X.         ",
-"      ..        ",
+"   .XX........  ",
-"     .+.        ",
+"  .XXXXXXXXXX.  ",
-"    .++........ ",
+" .XXXXXXXXXXX.  ",
-"   .++@+++++++. ",
+" .XXXXXXXXXXX.  ",
-"  .++@@@@@@@@@. ",
+"  .XXXXXXXXXX.  ",
-"   .+@@@@@@@@@. ",
+"   .XX........  ",
-"   #.+@........ ",
+"    .X.         ",
-"    #.+.####### ",
+"     ..         ",
-"     #..#       ",
+"      .         ",
-"      #.#       ",
+"                "};
-"       ##       ",
-"        #       ",
-"                "};

art/deffile.xpm

@@ -1,31 +1,83 @@
 /* XPM */
-static char * deffile_xpm[] = {
+static char *deffile_xpm[] = {
-"16 16 12 1",
+/* columns rows colors chars-per-pixel */
-" 	c None",
+"16 16 61 1",
-".	c #000000",
+"% c #E8E8EC",
-"+	c #808080",
+"k c #D9D9E0",
-"@	c #FFFFFF",
+"= c #E8E8ED",
-"#	c #282829",
+"V c #CACAD4",
-"$	c #505052",
+"8 c #D9D9E1",
-"%	c #78787B",
+"h c #D2D2DA",
-"&	c #A0A0A4",
+"y c #E1E1E7",
-"*	c #404040",
+"l c #D2D2DB",
-"=	c #1F1F1F",
+"< c #E9E9ED",
-"-	c #3F3F3F",
+"t c #E9E9EE",
-";	c #2F2F2F",
+"e c #DADAE1",
-"                ",
+"x c #E2E2E7",
-"   .......      ",
+"+ c #F1F1F4",
-"  .+@@@@@@#     ",
+"m c #D3D3DB",
-"  .+@@@@@@$%    ",
+"1 c #E2E2E8",
-"  .+@@@@@@$&%   ",
+"C c #D3D3DC",
-"  .+@@@@@@#$$#  ",
+"$ c #EAEAEE",
-"  .+@@@@@@@@@@. ",
+"4 c #DBDBE2",
-"  .+@@@@@@@@@@. ",
+"M c #CCCCD6",
-"  .+@@@@@@@@@@. ",
+"q c #E3E3E8",
-"  .+@@@@@@@@@@. ",
+"f c #D4D4DC",
-"  .+@@@@@@@@@@. ",
+"a c #E3E3E9",
-"  .+@@@@@@@@@@. ",
+"v c #D4D4DD",
-"  .*++++++++++. ",
+"7 c #DCDCE2",
-"  .=---=;-----. ",
+": c #EBEBEF",
-"                ",
+"w c #DCDCE3",
-"                "};
+"  c None",
+"O c #F3F3F5",
+"> c #E4E4E9",
+"& c #F3F3F6",
+"n c #D5D5DD",
+"6 c #E4E4EA",
+". c #C6C6D5",
+"g c #DDDDE3",
+"# c #ECECF0",
+"b c #CECED7",
+"j c #DDDDE4",
+"B c #CECED8",
+"0 c #E5E5EA",
+"p c #D6D6DE",
+"; c #EDEDF0",
+"3 c #DEDEE4",
+", c #EDEDF1",
+"Z c #CFCFD8",
+"u c #DEDEE5",
+"o c #F5F5F7",
+"c c #D7D7DE",
+"- c #E6E6EB",
+"r c #D7D7DF",
+"A c #C8C8D3",
+"s c #DFDFE5",
+"@ c #EEEEF2",
+"z c #D0D0D9",
+"X c #9494AD",
+"5 c #E7E7EB",
+"i c #D8D8DF",
+"9 c #E7E7EC",
+"d c #D8D8E0",
+"* c #EFEFF2",
+"2 c #E0E0E6",
+"N c #D1D1DA",
+/* pixels */
+"  ........X     ",
+"  .oO+@#$%XX    ",
+"  .&+*#$=-XXX   ",
+"  .+*;:=->XXXX  ",
+"  .*,:<->1234X  ",
+"  .,:<5612378X  ",
+"  .:<90q23werX  ",
+"  .t90qyuweipX  ",
+"  .90ayswedpfX  ",
+"  .-aysg4dpfhX  ",
+"  .>ysj4kpflzX  ",
+"  .xsj4kcvlzbX  ",
+"  .234krnmzbMX  ",
+"  .378rnmNBMVX  ",
+"  .wernCNZMVAX  ",
+"  XXXXXXXXXXXX  "
+};

art/delbookm.xpm

@@ -1,23 +1,24 @@
 /* XPM */
-static char * delbookm_xpm[] = {
+static char *delbookm_xpm[] = {
-"16 15 5 1",
+/* columns rows colors chars-per-pixel */
-" 	c None",
+"16 15 3 1",
-".	c #808080",
+". c Black",
-"+	c #000000",
+"  c None",
-"@	c #FFFFFF",
+"X c #FF4040",
-"#	c #F4D4D6",
+/* pixels */
-" .+++++.        ",
+"        ....... ",
-".+@+++@+.       ",
+"        .XXXXX. ",
-"+@@@+@@@+  +    ",
+"  .   . .XXXXX. ",
-"++@@@@@++ +#+   ",
+"  .. .. .XXXXX. ",
-"+++@@@++++###+  ",
+"   ...  .XXXXX. ",
-"++@@@@@++#####+ ",
+"    .   .XXXXX. ",
-"+@@@+@@@+####+  ",
+"   ...  .XXXXX. ",
-".+@+++@+.###+   ",
+"  .. .. .XXXXX. ",
-" .+++++.###+    ",
+"  .   . .XXXXX. ",
-"    +#####+     ",
+"        .XXXXX. ",
-"   +#####+      ",
+"        .XXXXX. ",
-"  ++++##+       ",
+"        .XXXXX. ",
-"     +#+        ",
+"        .XX.XX. ",
-"     ++         ",
+"        .X. .X. ",
-"     +          "};
+"        ..   .. "
+};

art/down.xpm

@@ -1,24 +1,21 @@
-/* XPM */
+/* XPM */
-static char * down_xpm[] = {
+static char * down_xpm[] = {
-"16 16 5 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c #000000",
+".	c Black",
-"+	c #808080",
+"X	c Gray100",
-"@	c #C0E4CB",
+"                ",
-"#	c #77C490",
+"     ......     ",
-"                ",
+"     .XXXX.     ",
-"     .....+     ",
+"     .XXXX.     ",
-"     .@##.+     ",
+"     .XXXX.     ",
-"     .@##.+     ",
+"     .XXXX.     ",
-"     .@##.+     ",
+"     .XXXX.     ",
-"     .@##.+     ",
+"     .XXXX.     ",
-"     .@##.+     ",
+"  ....XXXX....  ",
-"     .@##.+++++ ",
+"   .XXXXXXXX.   ",
-"  ....@##....+  ",
+"    .XXXXXX.    ",
-"   .@@####@.+   ",
+"     .XXXX.     ",
-"    .@@##@.+    ",
+"      .XX.      ",
-"     .@@@.+     ",
+"       ..       ",
-"      .@.+      ",
+"                "};
-"       .        ",
-"                ",
-"                "};

art/exefile.xpm

@@ -1,76 +1,73 @@
 /* XPM */
-static char * exefile_xpm[] = {
+static char *exefile_xpm[] = {
-"16 16 57 1",
+/* columns rows colors chars-per-pixel */
-" 	c None",
+"16 16 51 1",
-".	c #000000",
+"% c #E8E8EC",
-"+	c #808080",
+"= c #E8E8ED",
-"@	c #650000",
+"z c #CACAD4",
-"#	c #CB0000",
+"8 c #D9D9E1",
-"$	c #700000",
+"p c #D2D2DA",
-"%	c #CDCDCD",
+"u c #E1E1E7",
-"&	c #D2D2D2",
+"a c #D2D2DB",
-"*	c #D7D7D7",
+"< c #E9E9ED",
-"=	c #282829",
+"q c #DADAE1",
-"-	c #FF0000",
+"+ c #F1F1F4",
-";	c #E60000",
+"g c #D3D3DB",
-">	c #FFFFFF",
+"1 c #E2E2E8",
-",	c #505052",
+"x c #D3D3DC",
-"'	c #78787B",
+"5 c #00A5FF",
-")	c #CC0000",
+"$ c #EAEAEE",
-"!	c #F70000",
+"4 c #DBDBE2",
-"~	c #A0A0A4",
+"h c #CCCCD6",
-"{	c #8C4848",
+"y c #D4D4DC",
-"]	c #FFA0A0",
+"r c #E3E3E9",
-"^	c #A95959",
+"d c #D4D4DD",
-"/	c #DBDBDB",
+"7 c #DCDCE2",
-"(	c #F7F7F7",
+": c #EBEBEF",
-"_	c #0000C8",
+"0 c #DCDCE3",
-":	c #0000F4",
+"  c None",
-"<	c #ECECEC",
+"O c #F3F3F5",
-"[	c #1010BC",
+"> c #E4E4E9",
-"}	c #1313E8",
+"& c #F3F3F6",
-"|	c #EDEDED",
+"j c #D5D5DD",
-"1	c #8B8B8B",
+"6 c #E4E4EA",
-"2	c #AFAFAF",
+". c #C6C6D5",
-"3	c #C4C4C4",
+"# c #ECECF0",
-"4	c #FDFDFD",
+"f c #CECED7",
-"5	c #E8E8E8",
+"l c #CECED8",
-"6	c #FFFF00",
+"e c #D6D6DE",
-"7	c #007300",
+"; c #EDEDF0",
-"8	c #00B200",
+"3 c #DEDEE4",
-"9	c #BFBFBF",
+", c #EDEDF1",
-"0	c #CBCBCB",
+"c c #CFCFD8",
-"a	c #DEDEDE",
+"o c #F5F5F7",
-"b	c #00A800",
+"- c #E6E6EB",
-"c	c #00FF00",
+"w c #D7D7DF",
-"d	c #BEBEBE",
+"v c #C8C8D3",
-"e	c #FCFCFC",
+"i c #DFDFE5",
-"f	c #7D7D7D",
+"@ c #EEEEF2",
-"g	c #F8F8F8",
+"s c #D0D0D9",
-"h	c #888888",
+"X c #9494AD",
-"i	c #F8F800",
+"9 c #D8D8DF",
-"j	c #F7F700",
+"t c #D8D8E0",
-"k	c #006200",
+"* c #EFEFF2",
-"l	c #00A100",
+"2 c #E0E0E6",
-"m	c #757575",
+"k c #D1D1DA",
-"n	c #959595",
+/* pixels */
-"o	c #404040",
+"  ........X     ",
-"p	c #1F1F1F",
+"  .oO+@#$%XX    ",
-"q	c #3F3F3F",
+"  .&+*#$=-XXX   ",
-"r	c #2F2F2F",
+"  .+*;:=->XXXX  ",
-"                ",
+"  .*,:<->1234X  ",
-"   ........     ",
+"  .,5:5612378X  ",
-"  .+@#$%&*=     ",
+"  5,5559530qwX  ",
-"  .+#-;>>>,'    ",
+"  55555550q9eX  ",
-"  .+)-!>>>,~'   ",
+" 5555r5555teyX  ",
-"  .+{]^>>>=,,=  ",
+"  55rui559eypX  ",
-"  .+/>(>>>>>_:. ",
+" 5555i5555yasX  ",
-"  .+<>>>>>>>[}. ",
+"  5555555dasfX  ",
-"  .+|>>>>>>>12. ",
+"  5355595gsfhX  ",
-"  .+|>>>>>>>34. ",
+"  .3595jgklhzX  ",
-"  .+/>56667894. ",
+"  .0qwjxkchzvX  ",
-"  .+0>a666bcde. ",
+"  XXXXXXXXXXXX  "
-"  .+fghiijklmn. ",
+};
-"  .o++++++++++. ",
-"  .pqqqpprqqqq. ",
-"                "};

art/forward.xpm

@@ -1,24 +1,21 @@
-/* XPM */
+/* XPM */
-static char * forward_xpm[] = {
+static char * forward_xpm[] = {
-"16 16 5 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c #000000",
+".	c Black",
-"+	c #C0E4CB",
+"X	c Gray100",
-"@	c #77C490",
+"                ",
-"#	c #808080",
+"                ",
-"                ",
+"         .      ",
-"                ",
+"         ..     ",
-"         .      ",
+"         .X.    ",
-"         ..     ",
+"  ........XX.   ",
-"         .+.    ",
+"  .XXXXXXXXXX.  ",
-"  ........++.   ",
+"  .XXXXXXXXXXX. ",
-"  .+++++++@++.  ",
+"  .XXXXXXXXXXX. ",
-"  .@@@@@@@@@++. ",
+"  .XXXXXXXXXX.  ",
-"  .@@@@@@@@@+.  ",
+"  ........XX.   ",
-"  ........@+.#  ",
+"         .X.    ",
-"  #######.+.#   ",
+"         ..     ",
-"        #..#    ",
+"         .      ",
-"        #.#     ",
+"                "};
-"        ##      ",
-"        #       ",
-"                "};

art/gtk/error.xpm

@@ -1,522 +1,58 @@
 /* XPM */
-static char * error_xpm[] = {
+static char *error_xpm[] = {
-"48 48 471 2",
+/* columns rows colors chars-per-pixel */
-"  	c None",
+"48 48 4 1",
-". 	c #FD3819",
+"  c None",
-"+ 	c #FD3319",
+"X c #242424",
-"@ 	c #FA3019",
+"o c #DCDF00",
-"# 	c #F33119",
+". c #C00000",
-"$ 	c #EE301A",
+/* pixels */
-"% 	c #EB311B",
+"                                                ",
-"& 	c #E9301A",
+"                                                ",
-"* 	c #E9321C",
+"                                                ",
-"= 	c #EB331E",
+"                                                ",
-"- 	c #FF3A1A",
+"                                                ",
-"; 	c #FF3318",
+"                    .....                       ",
-"> 	c #ED2E17",
+"                .............                   ",
-", 	c #D32914",
+"              .................                 ",
-"' 	c #C32714",
+"             ...................                ",
-") 	c #BA2614",
+"           .......................              ",
-"! 	c #B52514",
+"          .........................             ",
-"~ 	c #B22514",
+"         ...........................            ",
-"{ 	c #B12615",
+"         ...........................X           ",
-"] 	c #B42717",
+"        .............................X          ",
-"^ 	c #BC2A18",
+"       ...............................          ",
-"/ 	c #C62C1A",
+"       ...............................X         ",
-"( 	c #CD2E1C",
+"      .................................X        ",
-"_ 	c #CF2F1C",
+"      .................................X        ",
-": 	c #FF3216",
+"      .................................XX       ",
-"< 	c #DD2A14",
+"      ...ooooooooooooooooooooooooooo...XX       ",
-"[ 	c #C32613",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"} 	c #B32311",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"| 	c #AE2312",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"1 	c #AB2313",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"2 	c #A82212",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"3 	c #A52212",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"4 	c #961F11",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"5 	c #952011",
+"      .................................XX       ",
-"6 	c #A22314",
+"      .................................XX       ",
-"7 	c #A72516",
+"       ...............................XXX       ",
-"8 	c #A92718",
+"       ...............................XXX       ",
-"9 	c #AB2719",
+"        .............................XXX        ",
-"0 	c #B32A1A",
+"         ...........................XXXX        ",
-"a 	c #BD2C1D",
+"         ...........................XXX         ",
-"b 	c #B52A1C",
+"          .........................XXX          ",
-"c 	c #FD3518",
+"           .......................XXXX          ",
-"d 	c #EB2D14",
+"            X...................XXXXX           ",
-"e 	c #C32512",
+"             X.................XXXXX            ",
-"f 	c #B12311",
+"               X.............XXXXX              ",
-"g 	c #AC2211",
+"                XXXX.....XXXXXXXX               ",
-"h 	c #A92211",
+"                  XXXXXXXXXXXXX                 ",
-"i 	c #A82312",
+"                      XXXXX                     ",
-"j 	c #A62212",
+"                                                ",
-"k 	c #9F2112",
+"                                                ",
-"l 	c #A32313",
+"                                                ",
-"m 	c #A72415",
+"                                                ",
-"n 	c #A62617",
+"                                                ",
-"o 	c #A32518",
+"                                                "
-"p 	c #A62718",
+};
-"q 	c #A62719",
-"r 	c #A8291B",
-"s 	c #AD2A1B",
-"t 	c #AB291C",
-"u 	c #FE3317",
-"v 	c #D82914",
-"w 	c #B92311",
-"x 	c #A92111",
-"y 	c #A72212",
-"z 	c #962011",
-"A 	c #A02214",
-"B 	c #A72517",
-"C 	c #A62618",
-"D 	c #A2271A",
-"E 	c #A5281B",
-"F 	c #A5291B",
-"G 	c #A82A1D",
-"H 	c #A5291D",
-"I 	c #FF3417",
-"J 	c #D02813",
-"K 	c #B32310",
-"L 	c #A92110",
-"M 	c #A82211",
-"N 	c #A82313",
-"O 	c #A42313",
-"P 	c #9B2013",
-"Q 	c #A62517",
-"R 	c #AB3326",
-"S 	c #A5281A",
-"T 	c #A2281C",
-"U 	c #A42A1D",
-"V 	c #98271C",
-"W 	c #FD3517",
-"X 	c #D52913",
-"Y 	c #A82314",
-"Z 	c #A72414",
-"` 	c #A42415",
-" .	c #9D2214",
-"..	c #A02416",
-"+.	c #A52516",
-"@.	c #A52719",
-"#.	c #AA3427",
-"$.	c #AA3428",
-"%.	c #A4291C",
-"&.	c #9B281C",
-"*.	c #A1291D",
-"=.	c #A1291E",
-"-.	c #9E2A1E",
-";.	c #852319",
-">.	c #FC391A",
-",.	c #E22B15",
-"'.	c #B62412",
-").	c #AC3021",
-"!.	c #AC3022",
-"~.	c #9C2316",
-"{.	c #992416",
-"].	c #A22618",
-"^.	c #A5271A",
-"/.	c #AA3529",
-"(.	c #A93529",
-"_.	c #A9362A",
-":.	c #A42A1E",
-"<.	c #A42B1E",
-"[.	c #A02A1F",
-"}.	c #A02A20",
-"|.	c #99291E",
-"1.	c #671C16",
-"2.	c #FC3017",
-"3.	c #BE2512",
-"4.	c #AA2F20",
-"5.	c #A92F20",
-"6.	c #AC3123",
-"7.	c #A02518",
-"8.	c #962417",
-"9.	c #9C2518",
-"0.	c #A5291C",
-"a.	c #A9362B",
-"b.	c #A9372B",
-"c.	c #A32B1F",
-"d.	c #A32C20",
-"e.	c #A02B20",
-"f.	c #9E2A20",
-"g.	c #8C271D",
-"h.	c #FA3619",
-"i.	c #AE2212",
-"j.	c #A82414",
-"k.	c #941F12",
-"l.	c #9E2E20",
-"m.	c #AB3224",
-"n.	c #AB3225",
-"o.	c #A3271A",
-"p.	c #942417",
-"q.	c #962418",
-"r.	c #A1281C",
-"s.	c #A42B1F",
-"t.	c #A8372C",
-"u.	c #A8382D",
-"v.	c #A32C21",
-"w.	c #A02C20",
-"x.	c #A02C21",
-"y.	c #962920",
-"z.	c #5B1A13",
-"A.	c #FA3118",
-"B.	c #BB2513",
-"C.	c #A42212",
-"D.	c #981F11",
-"E.	c #9D2314",
-"F.	c #AA3326",
-"G.	c #A3281B",
-"H.	c #922519",
-"I.	c #902419",
-"J.	c #9D271B",
-"K.	c #A8382E",
-"L.	c #A8392E",
-"M.	c #A22D22",
-"N.	c #A02D22",
-"O.	c #9B2C21",
-"P.	c #7D231C",
-"Q.	c #DD2D17",
-"R.	c #AF2413",
-"S.	c #A62213",
-"T.	c #9C2112",
-"U.	c #AA3327",
-"V.	c #AF3F33",
-"W.	c #A2291C",
-"X.	c #99271B",
-"Y.	c #92251B",
-"Z.	c #9B281D",
-"`.	c #A22D21",
-" +	c #A7392F",
-".+	c #A93F2F",
-"++	c #A12F22",
-"@+	c #A02E23",
-"#+	c #88281F",
-"$+	c #300E0B",
-"%+	c #F6361B",
-"&+	c #C72816",
-"*+	c #A92413",
-"=+	c #D48D1D",
-"-+	c #E4AF21",
-";+	c #E3AF22",
-">+	c #E1AE24",
-",+	c #E0AD25",
-"'+	c #DFAE28",
-")+	c #DEAD29",
-"!+	c #DDA82A",
-"~+	c #DDAC2A",
-"{+	c #DEB139",
-"]+	c #DFB445",
-"^+	c #DDB03A",
-"/+	c #DAAC2F",
-"(+	c #D9A832",
-"_+	c #D9AC32",
-":+	c #D8A733",
-"<+	c #D2A332",
-"[+	c #C89B30",
-"}+	c #D1A333",
-"|+	c #D4A637",
-"1+	c #D3A638",
-"2+	c #C1782E",
-"3+	c #A12D22",
-"4+	c #9F2E24",
-"5+	c #902B22",
-"6+	c #41130F",
-"7+	c #F7321B",
-"8+	c #BD2716",
-"9+	c #DCAD2D",
-"0+	c #DBAC2E",
-"a+	c #DAAE39",
-"b+	c #DBAF3A",
-"c+	c #DBAD3E",
-"d+	c #D7A734",
-"e+	c #D5A634",
-"f+	c #D2A436",
-"g+	c #D3A63A",
-"h+	c #D2A539",
-"i+	c #A12F25",
-"j+	c #9F2F25",
-"k+	c #952C23",
-"l+	c #4D1712",
-"m+	c #F1321B",
-"n+	c #B52615",
-"o+	c #E2B232",
-"p+	c #DAA82F",
-"q+	c #D5A82E",
-"r+	c #D1A230",
-"s+	c #D9AB3E",
-"t+	c #DAAC3F",
-"u+	c #D6A735",
-"v+	c #D1A53C",
-"w+	c #A13026",
-"x+	c #9F2F26",
-"y+	c #962E24",
-"z+	c #571B15",
-"A+	c #020303",
-"B+	c #EE321B",
-"C+	c #E0B234",
-"D+	c #DFB135",
-"E+	c #D3A332",
-"F+	c #D0A131",
-"G+	c #D5A533",
-"H+	c #D8AC40",
-"I+	c #C79D37",
-"J+	c #C59C39",
-"K+	c #C49C3A",
-"L+	c #A13027",
-"M+	c #9E3026",
-"N+	c #942D25",
-"O+	c #581B16",
-"P+	c #010202",
-"Q+	c #E4311B",
-"R+	c #B12617",
-"S+	c #DFAD36",
-"T+	c #DFB036",
-"U+	c #D3A433",
-"V+	c #CC9F32",
-"W+	c #D2A435",
-"X+	c #D6AB42",
-"Y+	c #D5AB43",
-"Z+	c #D0A53D",
-"`+	c #D0A53F",
-" @	c #A03127",
-".@	c #9E3027",
-"+@	c #912D25",
-"@@	c #4E1814",
-"#@	c #000101",
-"$@	c #DF301C",
-"%@	c #B12718",
-"&@	c #CC9D30",
-"*@	c #D1A436",
-"=@	c #CA9E34",
-"-@	c #CFA337",
-";@	c #D4AA44",
-">@	c #D3AA47",
-",@	c #CFA53E",
-"'@	c #CFA540",
-")@	c #A03128",
-"!@	c #9E3128",
-"~@	c #892B24",
-"{@	c #3D130F",
-"]@	c #D02E1B",
-"^@	c #B62819",
-"/@	c #CD8622",
-"(@	c #DCB03B",
-"_@	c #CB9D31",
-":@	c #D1A437",
-"<@	c #CBA037",
-"[@	c #CFA338",
-"}@	c #D2AA48",
-"|@	c #C18138",
-"1@	c #A03229",
-"2@	c #9A3029",
-"3@	c #7F2821",
-"4@	c #240B0A",
-"5@	c #B72819",
-"6@	c #BA2B1A",
-"7@	c #A32618",
-"8@	c #9C271B",
-"9@	c #9A261B",
-"0@	c #A9372C",
-"a@	c #9A2B1F",
-"b@	c #992B20",
-"c@	c #A22E23",
-"d@	c #992C21",
-"e@	c #992C22",
-"f@	c #A02E24",
-"g@	c #9C2D23",
-"h@	c #A53D34",
-"i@	c #9D3129",
-"j@	c #953028",
-"k@	c #6C221D",
-"l@	c #0D0404",
-"m@	c #C72E1D",
-"n@	c #AB281A",
-"o@	c #98271B",
-"p@	c #95261B",
-"q@	c #9F291E",
-"r@	c #A6362B",
-"s@	c #A32D21",
-"t@	c #902A1F",
-"u@	c #A22F24",
-"v@	c #982D23",
-"w@	c #A02F25",
-"x@	c #9D2F26",
-"y@	c #9F3026",
-"z@	c #A53E35",
-"A@	c #9F332A",
-"B@	c #9D322A",
-"C@	c #8B2C26",
-"D@	c #4E1915",
-"E@	c #010101",
-"F@	c #AE281A",
-"G@	c #AD291B",
-"H@	c #A2271B",
-"I@	c #99281C",
-"J@	c #9E291F",
-"K@	c #9A291E",
-"L@	c #A2362C",
-"M@	c #A22E24",
-"N@	c #87281E",
-"O@	c #8A291F",
-"P@	c #982D24",
-"Q@	c #9C2F26",
-"R@	c #9F3128",
-"S@	c #A23E36",
-"T@	c #983129",
-"U@	c #752620",
-"V@	c #1D0908",
-"W@	c #020202",
-"X@	c #6B1B12",
-"Y@	c #B42C1D",
-"Z@	c #A8291C",
-"`@	c #9A2A1E",
-" #	c #A22B20",
-".#	c #A3382E",
-"+#	c #A1372D",
-"@#	c #9C2C21",
-"##	c #9F2D23",
-"$#	c #A12F24",
-"%#	c #9A2C23",
-"&#	c #9D2F25",
-"*#	c #972D25",
-"=#	c #9D3027",
-"-#	c #9E3129",
-";#	c #9F332B",
-">#	c #9F3E36",
-",#	c #8F3832",
-"'#	c #4E1A16",
-")#	c #8A2216",
-"!#	c #AD2B1D",
-"~#	c #A4291D",
-"{#	c #A73A2F",
-"]#	c #A02D23",
-"^#	c #9D2E23",
-"/#	c #972E26",
-"(#	c #9F322A",
-"_#	c #9E3229",
-":#	c #9D332B",
-"<#	c #8F2F28",
-"[#	c #66221D",
-"}#	c #100605",
-"|#	c #A12A1F",
-"1#	c #A63B31",
-"2#	c #972F27",
-"3#	c #9C322A",
-"4#	c #94302A",
-"5#	c #722620",
-"6#	c #270D0B",
-"7#	c #3A0F0B",
-"8#	c #9C281C",
-"9#	c #9F3930",
-"0#	c #8F2A22",
-"a#	c #982E25",
-"b#	c #963028",
-"c#	c #963029",
-"d#	c #772822",
-"e#	c #361210",
-"f#	c #030303",
-"g#	c #330D09",
-"h#	c #8B251C",
-"i#	c #9B2A1F",
-"j#	c #A23B32",
-"k#	c #90362F",
-"l#	c #982E26",
-"m#	c #A0322A",
-"n#	c #9D332A",
-"o#	c #9A322A",
-"p#	c #8D2E28",
-"q#	c #6D241F",
-"r#	c #33100E",
-"s#	c #1D0907",
-"t#	c #6E1E16",
-"u#	c #96291F",
-"v#	c #9D2B21",
-"w#	c #9F2E23",
-"x#	c #9D3A32",
-"y#	c #943029",
-"z#	c #832C25",
-"A#	c #5C1F1B",
-"B#	c #1E0A08",
-"C#	c #000000",
-"D#	c #41130E",
-"E#	c #85251C",
-"F#	c #912920",
-"G#	c #972C22",
-"H#	c #9C2D24",
-"I#	c #9E3127",
-"J#	c #A23D35",
-"K#	c #9D3229",
-"L#	c #9A312A",
-"M#	c #933028",
-"N#	c #832B24",
-"O#	c #6B241E",
-"P#	c #401512",
-"Q#	c #070302",
-"R#	c #0C0403",
-"S#	c #37100D",
-"T#	c #681E17",
-"U#	c #81261E",
-"V#	c #8B2921",
-"W#	c #8F2B23",
-"X#	c #942E26",
-"Y#	c #902D26",
-"Z#	c #842A24",
-"`#	c #5C1E1A",
-" $	c #36120F",
-".$	c #0D0504",
-"+$	c #170706",
-"@$	c #2D0E0B",
-"#$	c #401310",
-"$$	c #4E1813",
-"%$	c #581C17",
-"&$	c #401411",
-"*$	c #2B0E0C",
-"=$	c #140706",
-"-$	c #030202",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                      . + @ # $ % & * =                                         ",
-"                                - ; > , ' ) ! ~ ~ { ] ^ / ( _                                   ",
-"                              : < [ } | 1 2 3 4 5 6 7 7 8 9 0 a b                               ",
-"                          c d e f g h 2 i j k l m 7 7 n o p q r s t                             ",
-"                        u v w g x h 2 y j z A m 7 B n C q q D E F G H                           ",
-"                      I J K L x M 2 N N O P O 7 Q n C R R S E F T U U V                         ",
-"                    W X f L h 2 2 N Y Z m `  ...+.C q @.#.$.F %.&.*.=.-.;.                      ",
-"                  >.,.'.L h 2 i N Y ).!.7 7 +.~.{.].^.S E /.(._.:.<.[.}.|.1.                    ",
-"                  2.3.g h 2 i N 4.5.m 6.6.n C p 7.8.9.E 0.%.U a.b.c.d.e.f.g.                    ",
-"                h., i.M 2 N N j.k.l.6.B m.n.q q S o.p.q.r.U :.s.t.u.v.w.x.y.z.                  ",
-"                A.B.M 2 C.D.Z m E.7 Q m.n.R F.S E F G.H.I.J.s.c.d.K.L.M.N.O.P.                  ",
-"                Q.R.y N S.T.m 7 7 n C C R U.V.$.0.%.U W.X.Y.Z.d.v.`. +.+++@+#+$+                ",
-"              %+&+*+=+-+-+;+>+>+,+'+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+|+1+2+3+4+5+6+                ",
-"              7+8+N -+;+;+>+>+,+'+'+)+~+~+9+0+a+b+c+_+:+d+d+e+f+|+1+g+h+i+j+k+l+                ",
-"              m+n+Z ;+;+>+o+,+'+)+)+~+9+9+0+p+q+r+s+t+d+u+u+|+1+1+g+v+v+w+x+y+z+A+              ",
-"              B+{ m ;+>+,+,+C+D+)+~+9+9+0+/+/+(+E+F+G+H+H+|+1+1+I+J+J+K+L+M+N+O+P+              ",
-"              Q+R+7 >+,+'+'+)+S+T+9+0+0+/+(+_+:+d+U+V+W+X+Y+Y+g+v+v+Z+`+ @.@+@@@#@              ",
-"              $@%@7 ,+'+'+)+~+~+{+^+0+/+(+_+&@d+d+u+*@=@-@g+;@>@Z+Z+,@'@)@!@~@{@#@              ",
-"              ]@^@n /@)+)+~+~+9+0+^+(@(+_+:+_@_@u+|+|+:@<@[@v+}@}@,@'@|@1@2@3@4@#@              ",
-"              5@6@C 7@q S E F 8@9@U a.0@c.d.v.a@b@c@d@e@f@g@j+L+ @h@1@1@i@j@k@l@P+              ",
-"                m@n@@.S E F %.U o@p@q@r@d.v.s@M.t@t@u@v@i+w@x@y@)@1@z@A@B@C@D@E@A+              ",
-"                F@G@S H@0.%.U :.<.I@J@K@L@x.M.c@M@N@O@P@P@L+y@Q@R@1@A@S@T@U@V@W@                ",
-"                X@Y@Z@0.%.U :.<.c.d.`@ #.#+#@###$#%#&#w+*#)@)@=#-#A@;#>#,#'#E@A+                ",
-"                  )#!#~#*.:.<.c.d.d.a@b@M.{#]#^#f@w+w+ @/#/#1@(#_#;#:#<#[#}#W@A+                ",
-"                    8@U =.|#c.d.v.s@M.d@d@M@1#i+w+L+ @)@1@2#(#;#;#3#4#5#6#E@A+                  ",
-"                    7#8#[.[.e.v.s@M.c@c@u@i+1#9#0#a#)@1@1@b#c#;#:#4#d#e#E@W@f#                  ",
-"                      g#h#i#e.x.x.c@M@$#i+w+P@j#k#l#1@m#A@;#n#o#p#q#r#E@W@A+                    ",
-"                        s#t#u#v#N.]#w#i+w+w+ @/#x#z@(#A@B@o#y#z#A#B#E@W@A+                      ",
-"                          C#D#E#F#G#H#j+j+M+.@I#!@J#K#L#M#N#O#P#Q#W@W@A+                        ",
-"                            C#R#S#T#U#V#W#N+X#X#Y#C@Z#U@`# $.$E@W@W@f#                          ",
-"                                f#W@+$@$#$$$O+%$D@&$*$=$-$W@W@W@A+                              ",
-"                                  f#f#W@W@W@W@W@W@W@W@W@W@W@A+f#                                ",
-"                                        f#f#E@E@A+#@f#f#f#                                      ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                "};

art/gtk/info.xpm

@@ -1,474 +1,63 @@
 /* XPM */
-static char * info_xpm[] = {
+static char *info_xpm[] = {
-"48 48 423 2",
+/* columns rows colors chars-per-pixel */
-"  	c None",
+"48 48 9 1",
-". 	c #FEFEFE",
+"$ c Black",
-"+ 	c #FFFFFF",
+"O c #FFFFFF",
-"@ 	c #F1F1F1",
+"@ c #808080",
-"# 	c #CACACA",
+"+ c #000080",
-"$ 	c #CBCBCB",
+"o c #E8EB01",
-"% 	c #EDEDED",
+"  c None",
-"& 	c #999999",
+"X c #FFFF40",
-"* 	c #4B4B4B",
+"# c #C0C0C0",
-"= 	c #131313",
+". c #ABAD01",
-"- 	c #2E2E2E",
+/* pixels */
-"; 	c #393732",
+"                                                ",
-"> 	c #423F36",
+"                                                ",
-", 	c #242119",
+"                                                ",
-"' 	c #282828",
+"                                                ",
-") 	c #626262",
+"                                                ",
-"! 	c #C2C2C2",
+"                                                ",
-"~ 	c #FAFAFA",
+"                                                ",
-"{ 	c #2D2D2D",
+"                                                ",
-"] 	c #736F61",
+"                                                ",
-"^ 	c #E0CE8A",
+"                     .....                      ",
-"/ 	c #EFDD8F",
+"                   ..XXXXX..                    ",
-"( 	c #F4E298",
+"                 ..XXXXXXXXo..                  ",
-"_ 	c #F4E191",
+"                .XXXOXXXXXXXoo.                 ",
-": 	c #F3E093",
+"                .XOOXXX+XXXXXo.                 ",
-"< 	c #ECD78C",
+"               .XOOOXX+++XXXXoo.                ",
-"[ 	c #D8C78E",
+"               .XOOXXX+++XXXXXo.                ",
-"} 	c #B7AA7C",
+"              .XOOOXXX+++XXXXXXo.               ",
-"| 	c #9B8C5A",
+"              .XOOXXXX+++XXXXXXo.               ",
-"1 	c #5F5C4F",
+"              .XXXXXXX+++XXXXXXX.               ",
-"2 	c #B6B6B6",
+"              .XXXXXXX+++XXXXXXo.               ",
-"3 	c #FEFEFD",
+"              .XXXXXXX+++XXXXXoo.               ",
-"4 	c #A1A1A1",
+"               .XXXXXX+++XXXXXo.                ",
-"5 	c #1E1E1E",
+"               .XXXXXXX+XXXXXXo.                ",
-"6 	c #C2BEAF",
+"                .XXXXXXXXXXXXo.                 ",
-"7 	c #F1DC92",
+"                .XXXXX+++XXXoo.                 ",
-"8 	c #F5E190",
+"                 .XXXX+++XXoo.                  ",
-"9 	c #F7E7A5",
+"                  .XXXXXXXXo.                   ",
-"0 	c #F8EAAE",
+"                  ..XXXXXXo..                   ",
-"a 	c #F9E9A7",
+"                   .XXXXXo..                    ",
-"b 	c #F8E795",
+"                   @#######@                    ",
-"c 	c #F8E796",
+"                   @@@@@@@@@                    ",
-"d 	c #F5E49C",
+"                   @#######@                    ",
-"e 	c #EBDB99",
+"                   @@@@@@@@@                    ",
-"f 	c #E2CD7F",
+"                   @#######@                    ",
-"g 	c #D7C480",
+"                    @@@@@@@                     ",
-"h 	c #21201E",
+"                      ###                       ",
-"i 	c #838383",
+"                      $$$                       ",
-"j 	c #F9F9F9",
+"                                                ",
-"k 	c #DDD9CA",
+"                                                ",
-"l 	c #EFD986",
+"                                                ",
-"m 	c #EFDA8E",
+"                                                ",
-"n 	c #F8EAAF",
+"                                                ",
-"o 	c #F9F0C7",
+"                                                ",
-"p 	c #FAF5DE",
+"                                                ",
-"q 	c #FAF3D0",
+"                                                ",
-"r 	c #FAEAA6",
+"                                                ",
-"s 	c #F9E89E",
+"                                                ",
-"t 	c #F8E793",
+"                                                "
-"u 	c #F7E493",
+};
-"v 	c #EFDD93",
-"w 	c #E5D187",
-"x 	c #DFD2A9",
-"y 	c #595958",
-"z 	c #939393",
-"A 	c #474747",
-"B 	c #BAB6A9",
-"C 	c #F5E4A3",
-"D 	c #F4DE87",
-"E 	c #F4E7B2",
-"F 	c #F9F5E3",
-"G 	c #FAF6E6",
-"H 	c #FBF8ED",
-"I 	c #FBF9EF",
-"J 	c #FAF8EC",
-"K 	c #FAF3DA",
-"L 	c #F9E99B",
-"M 	c #F8E791",
-"N 	c #F6E38F",
-"O 	c #EFDD92",
-"P 	c #DFCB80",
-"Q 	c #D7C896",
-"R 	c #333333",
-"S 	c #C9C9C9",
-"T 	c #B4B4B4",
-"U 	c #545454",
-"V 	c #F0DD9C",
-"W 	c #F3DF8D",
-"X 	c #F7E69F",
-"Y 	c #F8EFCF",
-"Z 	c #FAF5E5",
-"` 	c #F9F4E2",
-" .	c #FBF6E7",
-"..	c #FAF5E7",
-"+.	c #FAF6E9",
-"@.	c #FAEDB7",
-"#.	c #F9E89B",
-"$.	c #F8E691",
-"%.	c #F5E391",
-"&.	c #E8D68B",
-"*.	c #D1BC70",
-"=.	c #A29C84",
-"-.	c #525252",
-";.	c #848484",
-">.	c #989585",
-",.	c #EED681",
-"'.	c #F5E293",
-").	c #F8E8A9",
-"!.	c #FAF4E1",
-"~.	c #FAF6E7",
-"{.	c #F9F5E4",
-"].	c #F9F5E6",
-"^.	c #F7EEC3",
-"/.	c #F7E7A0",
-"(.	c #F7E691",
-"_.	c #F7E58F",
-":.	c #F1E08E",
-"<.	c #DBC878",
-"[.	c #C6B677",
-"}.	c #2A2A27",
-"|.	c #DADADA",
-"1.	c #646464",
-"2.	c #C1B999",
-"3.	c #EFD882",
-"4.	c #F6E499",
-"5.	c #F8EDBA",
-"6.	c #FAF5E4",
-"7.	c #FBF5E6",
-"8.	c #FAF5E6",
-"9.	c #F9F1DB",
-"0.	c #F9F4E3",
-"a.	c #F8F2DB",
-"b.	c #F6EBBE",
-"c.	c #F6E6A0",
-"d.	c #F3E290",
-"e.	c #E4D07E",
-"f.	c #C1AE67",
-"g.	c #646159",
-"h.	c #A0A0A0",
-"i.	c #EFD881",
-"j.	c #F6E498",
-"k.	c #FAF6E8",
-"l.	c #F9F5E5",
-"m.	c #F8F2DE",
-"n.	c #F7EFD0",
-"o.	c #F5E9C2",
-"p.	c #F4E5A0",
-"q.	c #F7E695",
-"r.	c #F3E295",
-"s.	c #E6D27E",
-"t.	c #C6B36A",
-"u.	c #79766C",
-"v.	c #7B7B7B",
-"w.	c #636363",
-"x.	c #B8B095",
-"y.	c #FBF8EE",
-"z.	c #FAF7EB",
-"A.	c #F9F6E5",
-"B.	c #F9F6EA",
-"C.	c #F9F4E0",
-"D.	c #F4EAC9",
-"E.	c #F7EBB1",
-"F.	c #F5E7A2",
-"G.	c #F6E697",
-"H.	c #F6E59B",
-"I.	c #F2E093",
-"J.	c #E7D480",
-"K.	c #CCB96E",
-"L.	c #797157",
-"M.	c #949494",
-"N.	c #818181",
-"O.	c #898782",
-"P.	c #F0DC91",
-"Q.	c #F6E496",
-"R.	c #F7EAAF",
-"S.	c #FBF7EC",
-"T.	c #F9F6E7",
-"U.	c #FAF5E8",
-"V.	c #FBF7ED",
-"W.	c #FAEEBB",
-"X.	c #F8ECB8",
-"Y.	c #F4EACA",
-"Z.	c #F3E6A3",
-"`.	c #F6E593",
-" +	c #F6E493",
-".+	c #F2E090",
-"++	c #E4D17E",
-"@+	c #C4B269",
-"#+	c #6D664D",
-"$+	c #A5A5A5",
-"%+	c #BFBFBF",
-"&+	c #464646",
-"*+	c #EDD990",
-"=+	c #F2DC8A",
-"-+	c #F7E8A6",
-";+	c #FAF4D9",
-">+	c #F8F1DB",
-",+	c #F9F4E7",
-"'+	c #F9EFCB",
-")+	c #FAECAF",
-"!+	c #F5E7B2",
-"~+	c #EDE7BA",
-"{+	c #F2E29A",
-"]+	c #F6E591",
-"^+	c #F5E393",
-"/+	c #EFDC8B",
-"(+	c #D9C677",
-"_+	c #AB9B5B",
-":+	c #201D13",
-"<+	c #D5D5D5",
-"[+	c #FCFCFC",
-"}+	c #FDFDFC",
-"|+	c #6F6F6F",
-"1+	c #9B9584",
-"2+	c #F1DC86",
-"3+	c #F6E59D",
-"4+	c #FAF2D3",
-"5+	c #FBF7EA",
-"6+	c #F9F4E5",
-"7+	c #FAF3E5",
-"8+	c #F8ECB9",
-"9+	c #F6E7A7",
-"0+	c #F3E7AD",
-"a+	c #F1E3A4",
-"b+	c #F4E395",
-"c+	c #EADA91",
-"d+	c #E4D07F",
-"e+	c #CDBC70",
-"f+	c #817959",
-"g+	c #4E4E4E",
-"h+	c #DEDEDD",
-"i+	c #3E3E3E",
-"j+	c #EEDA8D",
-"k+	c #F7E8A7",
-"l+	c #FAF2D2",
-"m+	c #FAF7EA",
-"n+	c #F9F4E6",
-"o+	c #F7EED9",
-"p+	c #F1E6AD",
-"q+	c #F4E49D",
-"r+	c #F2E4A1",
-"s+	c #F1E19B",
-"t+	c #F0DF92",
-"u+	c #E5D48D",
-"v+	c #DBC97E",
-"w+	c #D9C577",
-"x+	c #B9A964",
-"y+	c #4F4938",
-"z+	c #A7A7A7",
-"A+	c #FDFDFD",
-"B+	c #262626",
-"C+	c #F2E097",
-"D+	c #F9EBB1",
-"E+	c #FAF3DB",
-"F+	c #F8F1DC",
-"G+	c #F7EFD8",
-"H+	c #F4E9C4",
-"I+	c #F3E4A1",
-"J+	c #F3E296",
-"K+	c #F1E195",
-"L+	c #E9DA96",
-"M+	c #E6D68C",
-"N+	c #DAC87E",
-"O+	c #DAC777",
-"P+	c #C4B36B",
-"Q+	c #958857",
-"R+	c #353535",
-"S+	c #F4F4F4",
-"T+	c #E4E4E4",
-"U+	c #434032",
-"V+	c #F3DE87",
-"W+	c #F8EBB1",
-"X+	c #F9F2DB",
-"Y+	c #F3EAC1",
-"Z+	c #F4E9C1",
-"`+	c #F3E6AD",
-" @	c #EEDB8B",
-".@	c #DCCB84",
-"+@	c #D1C076",
-"@@	c #D1BF73",
-"#@	c #C9B76D",
-"$@	c #9D9164",
-"%@	c #43433D",
-"&@	c #C2C2C1",
-"*@	c #4D493C",
-"=@	c #EFD782",
-"-@	c #F4E9BB",
-";@	c #F4E7BB",
-">@	c #F1DFA1",
-",@	c #F3E3A7",
-"'@	c #E3D186",
-")@	c #D9C679",
-"!@	c #CAB871",
-"~@	c #C1B372",
-"{@	c #AEA475",
-"]@	c #7F7A64",
-"^@	c #0B0B0B",
-"/@	c #7D7D7D",
-"(@	c #6D6D64",
-"_@	c #121211",
-":@	c #383526",
-"<@	c #5F5E59",
-"[@	c #5A594C",
-"}@	c #A9A077",
-"|@	c #E8D48D",
-"1@	c #E7D180",
-"2@	c #DBC77C",
-"3@	c #DBC97C",
-"4@	c #BAA864",
-"5@	c #8F8255",
-"6@	c #3B3724",
-"7@	c #0F0E0C",
-"8@	c #494949",
-"9@	c #BBBBBB",
-"0@	c #35352E",
-"a@	c #9D9D99",
-"b@	c #B4B4B2",
-"c@	c #EFEFEE",
-"d@	c #DADAD8",
-"e@	c #696964",
-"f@	c #1D1D16",
-"g@	c #928963",
-"h@	c #C2B071",
-"i@	c #B3A05E",
-"j@	c #A99959",
-"k@	c #474439",
-"l@	c #DCDCDC",
-"m@	c #F5F5F5",
-"n@	c #050504",
-"o@	c #161614",
-"p@	c #55554E",
-"q@	c #8D8D85",
-"r@	c #D4D4D1",
-"s@	c #F6F6F6",
-"t@	c #CACAC4",
-"u@	c #585851",
-"v@	c #4D4C47",
-"w@	c #80795F",
-"x@	c #716D5B",
-"y@	c #2A2A2A",
-"z@	c #D9D9D9",
-"A@	c #585858",
-"B@	c #23231F",
-"C@	c #C7C7C5",
-"D@	c #A9A9A4",
-"E@	c #3D3D35",
-"F@	c #131311",
-"G@	c #8D8D87",
-"H@	c #C3C3C1",
-"I@	c #7B7B7A",
-"J@	c #5C5C5B",
-"K@	c #0D0D0A",
-"L@	c #3B3B3B",
-"M@	c #BABABA",
-"N@	c #191919",
-"O@	c #525248",
-"P@	c #D7D7D3",
-"Q@	c #F7F7F7",
-"R@	c #CFCFC8",
-"S@	c #2F2F29",
-"T@	c #474742",
-"U@	c #71716F",
-"V@	c #757571",
-"W@	c #0F0F0F",
-"X@	c #ECECEC",
-"Y@	c #000000",
-"Z@	c #080807",
-"`@	c #96968E",
-" #	c #DFDFDE",
-".#	c #FBFBFB",
-"+#	c #B3B3B1",
-"@#	c #70706B",
-"##	c #4F4F4E",
-"$#	c #42423A",
-"%#	c #434343",
-"&#	c #BCBCB9",
-"*#	c #AEAEA9",
-"=#	c #4B4B44",
-"-#	c #0F0F0E",
-";#	c #92928D",
-">#	c #929292",
-",#	c #696968",
-"'#	c #141412",
-")#	c #878787",
-"!#	c #75756C",
-"~#	c #C3C3C2",
-"{#	c #F0F0F0",
-"]#	c #B9B9B1",
-"^#	c #525249",
-"/#	c #464644",
-"(#	c #7F7F7B",
-"_#	c #6D6D6D",
-":#	c #050505",
-"<#	c #44443B",
-"[#	c #333331",
-"}#	c #B3B3B0",
-"|#	c #EFEFEF",
-"1#	c #CFCFCE",
-"2#	c #434342",
-"3#	c #56564F",
-"4#	c #272727",
-"5#	c #161613",
-"6#	c #12120F",
-"7#	c #2C2C2A",
-"8#	c #9E9E9A",
-"9#	c #6B6B6A",
-"0#	c #10100E",
-"a#	c #21211D",
-"b#	c #20201C",
-"c#	c #383837",
-"d#	c #737373",
-"e#	c #141411",
-"f#	c #090908",
-"g#	c #0B0B09",
-"h#	c #31312B",
-"i#	c #33332F",
-"j#	c #30302F",
-"k#	c #101010",
-"l#	c #4E4E45",
-"m#	c #010101",
-"n#	c #1A1A17",
-"o#	c #0C0C0B",
-"p#	c #020202",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                  . . + + . . .                                 ",
-"                                              . . . . . . . . . . . .                           ",
-"                                          + . . . . . . . . . . . . . . .                       ",
-"                                        . . . . . . @ # $ $ % . . . . . . .                     ",
-"                                      . . . . % & * = - ; > , ' ) ! ~ . . . .                   ",
-"                                    . . . . ! { ] ^ / ( _ : < [ } | 1 2 . . . .                 ",
-"                                  3 . . . 4 5 6 7 8 9 0 a b c d e f g h i j . . +               ",
-"                                  . . . ! 5 k l m n o p q r s t u v w x y z . . . .             ",
-"                                  . . ~ A B C D E F G H I J K L M N O P Q R S . . .             ",
-"                                . . . T U V W X Y Z `  ...+.G @.#.$.%.&.*.=.-.. . .             ",
-"                                . . . ;.>.,.'.).!.~.` {.` ]...^./.(._.:.<.[.}.|.. . .           ",
-"                                . . . 1.2.3.4.5.6.Z 7.8.9.0.a.b.c.$.$.d.e.f.g.h.. . .           ",
-"                                . . . 1.2.i.j.5.{.k.k.l.` m.n.o.p.q.q.r.s.t.u.v.. . +           ",
-"                                . . . w.x.i.'.5...y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.. + +           ",
-"                                . . . N.O.P.Q.R.Z S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+. . +           ",
-"                                  . . %+&+*+=+-+;+y.>+,+'+)+!+~+{+]+^+/+(+_+:+<+. . .           ",
-"                                  [+}+j |+1+2+3+4+5+6+7+8+9+0+a+b+%.c+d+e+f+g+j . .             ",
-"                                  [+}+}+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+. . .             ",
-"                                    }+}+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+. . .             ",
-"                                    [+}+T+U+V+W+X+Y+Z+`+s+/  @.@+@@@#@$@%@4 . . .               ",
-"                                      [+&@*@=@-@;@>@,@C+/ '@)@!@~@{@]@^@/@~ . . .               ",
-"                                        (@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@. . + +                 ",
-"                                        0@a@b@c@d@e@f@g@h@i@j@k@) l@m@. . . +                   ",
-"                                        n@o@p@q@r@s@t@u@v@w@x@y@z@}+}+. . .                     ",
-"                                      A@B@C@D@E@F@G@H@I@J@K@L@M@}+}+}+.                         ",
-"                                      N@O@P@A+Q@R@S@T@U@V@W@X@[+[+[+                            ",
-"                                      Y@Z@S@`@ #.#+#@###$#%#                                    ",
-"                                    N@Y@&#*#=#-#;#>#|+,#'#)#                                    ",
-"                                    Y@!#~#{#{#]#^#/#(#_#:#                                      ",
-"                                    Y@Y@<#[#}#|#1#,#2#3#4#                                      ",
-"                                      Y@5#6#S@7#8#|+9#Y@                                        ",
-"                                      Y@Y@0#a#b#c#,#d#Y@                                        ",
-"                                      e#f#5#F@g#h#i#j#k#                                        ",
-"                                      l#m#e#n#o#0#Y@                                            ",
-"                                            m#p#                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                "};

art/gtk/question.xpm

@@ -1,125 +1,75 @@
 /* XPM */
-static char * question_xpm[] = {
+static char *question_xpm[] = {
-"48 48 74 1",
+/* columns rows colors chars-per-pixel */
-" 	c None",
+"48 48 21 1",
-".	c #000000",
+". c Black",
-"+	c #A27F3B",
+"> c #696969",
-"@	c #B89243",
+"O c #1F1F00",
-"#	c #D8AB4E",
+"+ c #181818",
-"$	c #9D7D3A",
+"o c #F6F900",
-"%	c #A6823C",
+"; c #3F3F00",
-"&	c #7C622D",
+"$ c #111111",
-"*	c #F7D899",
+"  c None",
-"=	c #F7E2B8",
+"& c #202020",
-"-	c #D8BA7B",
+"X c #AAAA00",
-";	c #BE9B53",
+"@ c #949400",
-">	c #F7C35A",
+": c #303030",
-",	c #F7DFAF",
+"1 c #383838",
-"'	c #F7E5C0",
+"% c #2A2A00",
-")	c #F7D48C",
+", c #404040",
-"!	c #F7CF7E",
+"= c #B4B400",
-"~	c #D8B15F",
+"- c #484848",
-"{	c #6E5526",
+"# c #151500",
-"]	c #F7DCA5",
+"< c #9F9F00",
-"^	c #A8843D",
+"2 c #6A6A00",
-"/	c #937435",
+"* c #353500",
-"(	c #AA863E",
+/* pixels */
-"_	c #D8B66E",
-":	c #BEA363",
-"<	c #947536",
-"[	c #927335",
-"}	c #F7C96D",
-"|	c #80632D",
-"1	c #C39F57",
-"2	c #A38E55",
-"3	c #A48B5A",
-"4	c #D2A64D",
-"5	c #82662F",
-"6	c #654F24",
-"7	c #DCB463",
-"8	c #BE9544",
-"9	c #C3A466",
-"0	c #8C6D31",
-"a	c #D2B06C",
-"b	c #D8BE86",
-"c	c #715929",
-"d	c #B99344",
-"e	c #B38D40",
-"f	c #D8B56E",
-"g	c #D8AC58",
-"h	c #997A3B",
-"i	c #000001",
-"j	c #6B5527",
-"k	c #C39F55",
-"l	c #DCC494",
-"m	c #DAB872",
-"n	c #C9AC73",
-"o	c #BFA16A",
-"p	c #19150D",
-"q	c #876A31",
-"r	c #C9A45B",
-"s	c #C6A76A",
-"t	c #7F6941",
-"u	c #977737",
-"v	c #D8B165",
-"w	c #D8AC5B",
-"x	c #BEA272",
-"y	c #C09745",
-"z	c #D8B163",
-"A	c #927C52",
-"B	c #735F3B",
-"C	c #A68748",
-"D	c #1A1A1A",
-"E	c #393939",
-"F	c #221C12",
-"G	c #DDBC74",
-"H	c #D2A64C",
-"I	c #705627",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
 "                                                ",
 "                                                ",
 "                                                ",
 "                                                ",
+"                   .........                    ",
+"                 ...XXXXXXX..                   ",
+"               ..XXXXoooooXXXO+                 ",
+"             ..XXooooooooooooX@..               ",
+"            ..XoooooooooooooooXX#.              ",
+"           $%XoooooooooooooooooXX#.             ",
+"          &.XoooooooXXXXXXooooooXX..            ",
+"          .XooooooXX.$...$XXoooooX*.            ",
+"         $.XoooooX%.$     .*oooooo=..           ",
+"         .XooooooX..      -.XoooooX..           ",
+"         .XoooooX..+       .XoooooX;.           ",
+"         ...XXXX..:        .XoooooX;.           ",
+"          ........        >.XoooooX;.           ",
+"                          +.XoooooX..           ",
+"                         ,.Xoooooo<..           ",
+"                        1#XooooooXO..           ",
+"                       &#XooooooX2..            ",
+"                      $%XooooooXX..             ",
+"                     $%XooooooXX..              ",
+"                    $%XooooooXX..               ",
+"                   &.XooooooXX..                ",
+"                   .XooooooXX..                 ",
+"                  &.XoooooXX..                  ",
+"                  ..XooooXX..                   ",
+"                  ..XooooX...                   ",
+"                  ..XXooXX..&                   ",
+"                  ...XXXXX..                    ",
 "                   ........                     ",
-"                 ...+@#$%&...                   ",
-"                ..#**=*---;%...                 ",
-"               ..>,'*)>>>!-~%{..                ",
-"               .>,]>^//(>>!_~%..                ",
-"              .:*=><....[>>}~~|..               ",
-"              .}'!<..   .1>!#~%..               ",
-"             .2),#..    .3>}~#%..               ",
-"             .4!>%..    .3}}_#5..               ",
-"             .>!>%..    .3>__#6..               ",
-"             .7~85..    .9}-#%...               ",
-"             .......    0ab~#c..                ",
-"              .....    .d)b#8...                ",
-"                      .e}b##...                 ",
-"                     ..>)fgh..i                 ",
-"                     jklmnop..                  ",
-"                    .qafrst..                   ",
-"                    .u-vwx..                    ",
-"                    .y-zwA..                    ",
-"                    .#b~#B..                    ",
-"                    .;-#8..                     ",
-"                    .CC%|..                     ",
-"                    .DE...                      ",
-"                     ....                       ",
 "                                                ",
-"                     F....                      ",
+"                                                ",
-"                    .G!)8..                     ",
+"                   .......                      ",
-"                    .!**#..                     ",
+"                  ..XXXXX..                     ",
-"                    .))~8..                     ",
+"                 ..XXoooXX..                    ",
-"                    .)_#8..                     ",
+"                 ..XoooooX..                    ",
-"                    .H~8I..                     ",
+"                 ..XoooooX..                    ",
-"                     ......                     ",
+"                 ..XXoooXX..                    ",
-"                      ....                      ",
+"                  ..XXXXX..                     ",
+"                   .......                      ",
 "                                                ",
 "                                                ",
 "                                                ",
 "                                                ",
 "                                                ",
-"                                                ",
+"                                                "
-"                                                "};
+};

art/gtk/warning.xpm

@@ -1,291 +1,63 @@
 /* XPM */
-static char * warning_xpm[] = {
+static char *warning_xpm[] = {
-"48 48 240 2",
+/* columns rows colors chars-per-pixel */
-"  	c None",
+"48 48 9 1",
-". 	c #F42A14",
+"@ c Black",
-"+ 	c #C62210",
+"o c #A6A800",
-"@ 	c #F62B14",
+"+ c #8A8C00",
-"# 	c #D22411",
+"$ c #B8BA00",
-"$ 	c #A91D0F",
+"  c None",
-"% 	c #85170C",
+"O c #6E7000",
-"& 	c #F62913",
+"X c #DCDF00",
-"* 	c #D52511",
+". c #C00000",
-"= 	c #A71D0E",
+"# c #373800",
-"- 	c #A11C0E",
+/* pixels */
-"; 	c #9B1B0E",
+"                                                ",
-"> 	c #641209",
+"                                                ",
-", 	c #F72913",
+"                                                ",
-"' 	c #E02712",
+"                                                ",
-") 	c #B31F0F",
+"                                                ",
-"! 	c #A41C0E",
+"                                                ",
-"~ 	c #8A180C",
+"                                                ",
-"{ 	c #EC2913",
+"                      .                         ",
-"] 	c #B9200F",
+"                     ...                        ",
-"^ 	c #B14010",
+"                     ...                        ",
-"/ 	c #9A1C0F",
+"                    .....                       ",
-"( 	c #631109",
+"                   ...X..                       ",
-"_ 	c #F52A13",
+"                   ..XXX..                      ",
-": 	c #CA2310",
+"                  ...XXX...                     ",
-"< 	c #BB5B11",
+"                  ..XXXXX..                     ",
-"[ 	c #C26F12",
+"                 ..XXXXXX...                    ",
-"} 	c #A31D0F",
+"                ...XXoO+XX..                    ",
-"| 	c #A01D0F",
+"                ..XXXO@#XXX..                   ",
-"1 	c #921A0E",
+"               ..XXXXO@#XXX...                  ",
-"2 	c #F52913",
+"              ...XXXXO@#XXXX..                  ",
-"3 	c #DB2612",
+"              ..XXXXXO@#XXXX...                 ",
-"4 	c #A61D0F",
+"             ...XXXXXo@OXXXXX..                 ",
-"5 	c #E0AD11",
+"            ...XXXXXXo@OXXXXXX..                ",
-"6 	c #DFB112",
+"            ..XXXXXXX$@OXXXXXX...               ",
-"7 	c #77150C",
+"           ...XXXXXXXX@XXXXXXXX..               ",
-"8 	c #B72010",
+"          ...XXXXXXXXXXXXXXXXXX...              ",
-"9 	c #A31C0E",
+"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"0 	c #E1AE12",
+"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"a 	c #D28814",
+"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"b 	c #9F1D10",
+"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"c 	c #911A0F",
+"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"d 	c #4D0D07",
+"       ..............................           ",
-"e 	c #C56B12",
+"       ..............................           ",
-"f 	c #A11D10",
+"                                                ",
-"g 	c #A21D10",
+"                                                ",
-"h 	c #73150C",
+"                                                ",
-"i 	c #DE2612",
+"                                                ",
-"j 	c #DCAE11",
+"                                                ",
-"k 	c #B9930E",
+"                                                ",
-"l 	c #DEAC13",
+"                                                ",
-"m 	c #CF8812",
+"                                                ",
-"n 	c #901A0F",
+"                                                ",
-"o 	c #490D07",
+"                                                ",
-"p 	c #EF2914",
+"                                                ",
-"q 	c #BA2010",
+"                                                ",
-"r 	c #D18912",
+"                                                ",
-"s 	c #C39B0F",
+"                                                ",
-"t 	c #010100",
+"                                                "
-"u 	c #0E0B00",
+};
-"v 	c #403105",
-"w 	c #A11D11",
-"x 	c #9E1D11",
-"y 	c #F32912",
-"z 	c #D12412",
-"A 	c #7A6109",
-"B 	c #070400",
-"C 	c #130F00",
-"D 	c #020200",
-"E 	c #CD8713",
-"F 	c #490E09",
-"G 	c #E82814",
-"H 	c #B21F10",
-"I 	c #E0B213",
-"J 	c #2C2303",
-"K 	c #030100",
-"L 	c #010000",
-"M 	c #191300",
-"N 	c #DCAB15",
-"O 	c #9D1E12",
-"P 	c #72150D",
-"Q 	c #C82312",
-"R 	c #251D02",
-"S 	c #000000",
-"T 	c #040300",
-"U 	c #292003",
-"V 	c #A01E12",
-"W 	c #8F1B10",
-"X 	c #DC2613",
-"Y 	c #271E02",
-"Z 	c #1D1602",
-"` 	c #423305",
-" .	c #71150D",
-"..	c #ED2914",
-"+.	c #BD2111",
-"@.	c #D08C13",
-"#.	c #4E3D06",
-"$.	c #403104",
-"%.	c #453506",
-"&.	c #DBAA16",
-"*.	c #CC8614",
-"=.	c #891A11",
-"-.	c #470E09",
-";.	c #F42914",
-">.	c #D92613",
-",.	c #1E1702",
-"'.	c #251D03",
-").	c #413206",
-"!.	c #9F1E13",
-"~.	c #991D13",
-"{.	c #5E110A",
-"].	c #EA2915",
-"^.	c #A21D0F",
-"/.	c #090700",
-"(.	c #0B0900",
-"_.	c #CC8615",
-":.	c #9C1E13",
-"<.	c #861910",
-"[.	c #2C0805",
-"}.	c #D42513",
-"|.	c #050400",
-"1.	c #100D01",
-"2.	c #0A0800",
-"3.	c #332704",
-"4.	c #DAAA17",
-"5.	c #981D14",
-"6.	c #5E120C",
-"7.	c #130F01",
-"8.	c #524007",
-"9.	c #9E1E14",
-"0.	c #9B1E14",
-"a.	c #7A1710",
-"b.	c #382C05",
-"c.	c #513F07",
-"d.	c #151001",
-"e.	c #71570A",
-"f.	c #D8A919",
-"g.	c #8D1B12",
-"h.	c #490E0A",
-"i.	c #BD9312",
-"j.	c #675009",
-"k.	c #312604",
-"l.	c #C79A14",
-"m.	c #CB8617",
-"n.	c #9A1F15",
-"o.	c #6D160E",
-"p.	c #9D1F15",
-"q.	c #871B12",
-"r.	c #440E09",
-"s.	c #B62111",
-"t.	c #CB9E13",
-"u.	c #241C03",
-"v.	c #C49813",
-"w.	c #D7A81A",
-"x.	c #C16916",
-"y.	c #971E15",
-"z.	c #5C120D",
-"A.	c #D22614",
-"B.	c #CF8C12",
-"C.	c #4B3A07",
-"D.	c #020100",
-"E.	c #69520A",
-"F.	c #C98517",
-"G.	c #991F16",
-"H.	c #7B1912",
-"I.	c #2B0A07",
-"J.	c #EC2A16",
-"K.	c #3C2E05",
-"L.	c #090701",
-"M.	c #745A0C",
-"N.	c #9C1F16",
-"O.	c #8C1C14",
-"P.	c #460E0A",
-"Q.	c #D82715",
-"R.	c #C87E14",
-"S.	c #E0AE14",
-"T.	c #DFAD13",
-"U.	c #312605",
-"V.	c #7C610C",
-"W.	c #D7A816",
-"X.	c #BF6F16",
-"Y.	c #61130E",
-"Z.	c #EA2A16",
-"`.	c #BF2212",
-" +	c #B95B13",
-".+	c #C16F14",
-"++	c #C77E14",
-"@+	c #CB8914",
-"#+	c #DAAA16",
-"$+	c #DBAB17",
-"%+	c #D9AA19",
-"&+	c #D8A91A",
-"*+	c #D8A51C",
-"=+	c #C57E16",
-"-+	c #AB4216",
-";+	c #781812",
-">+	c #260806",
-",+	c #CD2513",
-"'+	c #9B1F17",
-")+	c #8B1C15",
-"!+	c #440E0A",
-"~+	c #78150B",
-"{+	c #520E07",
-"]+	c #6A130B",
-"^+	c #6F140B",
-"/+	c #78150C",
-"(+	c #86180D",
-"_+	c #8A190F",
-":+	c #931B10",
-"<+	c #981F17",
-"[+	c #5A120D",
-"}+	c #020202",
-"|+	c #0E0302",
-"1+	c #230704",
-"2+	c #2E0906",
-"3+	c #410C07",
-"4+	c #420C07",
-"5+	c #571109",
-"6+	c #5D110B",
-"7+	c #60120B",
-"8+	c #6E150C",
-"9+	c #73160E",
-"0+	c #801810",
-"a+	c #881A11",
-"b+	c #861B13",
-"c+	c #851B14",
-"d+	c #801A13",
-"e+	c #731711",
-"f+	c #4D100C",
-"g+	c #0D0403",
-"h+	c #220705",
-"i+	c #210705",
-"j+	c #230705",
-"k+	c #420D08",
-"l+	c #3E0C08",
-"m+	c #3D0C09",
-"n+	c #3C0C09",
-"o+	c #3B0C09",
-"p+	c #2E0A08",
-"q+	c #1C0705",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                  . +                                           ",
-"                                                @ # $ %                                         ",
-"                                              & * = - ; >                                       ",
-"                                            , ' ) ! ! - ~                                       ",
-"                                            { ] ! ! ^ ! / (                                     ",
-"                                          _ : ! ! < [ } | 1                                     ",
-"                                        2 3 4 ! ! 5 6 } } | 7                                   ",
-"                                        { 8 ! 9 0 6 6 a } b c d                                 ",
-"                                      _ : ! ! e 6 6 6 6 f g b h                                 ",
-"                                      i 4 ! ! 5 j k j l m g b n o                               ",
-"                                    p q ! ! r s t u v l l g w x h                               ",
-"                                  y z ! ! ! 6 A B C D l l E w x n F                             ",
-"                                  G H ! ! I 6 J K L M l l N w w O P                             ",
-"                                _ Q ! ! a 6 6 R S T U l N N E V O W F                           ",
-"                                X 4 ! } 6 6 6 Y S Z ` N N N N V V O  .                          ",
-"                              ..+.! ! @.6 6 l #.S $.%.N N N &.*.V O =.-.                        ",
-"                            ;.>.4 ! } 6 6 6 l ,.t '.).N N &.&.&.V !.~.{.                        ",
-"                            ].8 ! ^.I 6 6 l l /.t (.'.N &.&.&.&._.!.:.<.[.                      ",
-"                          p }.! } a 6 6 l l l |.1.2.3.&.&.&.&.4.4.!.!.5.6.                      ",
-"                          ].8 } } 6 6 l l l l |.7.T 8.&.&.&.4.4.4._.9.0.a.                      ",
-"                        p }.} } @.6 l l l l N b.c.d.e.&.&.4.4.4.4.f.9.9.g.h.                    ",
-"                        ].8 } } 6 l l l l N N i.j.k.l.&.&.4.4.4.f.f.m.9.n.o.                    ",
-"                      p }.} } @.6 l l l N N N N &.&.&.&.4.4.4.4.f.f.f.p.n.q.r.                  ",
-"                      ].s.} } 6 l l l N N N N t.'.u.v.4.4.4.4.f.f.f.w.x.p.y.z.                  ",
-"                    p A.} } B.l l l l N N N &.C.D.D.E.4.4.4.f.f.f.f.w.F.p.G.H.I.                ",
-"                    J.s.} } l l l l N N N N &.K.T L.M.4.4.f.f.f.f.w.w.w.p.N.O.P.                ",
-"                    Q.} } R.S.T.l N N N N &.&.i.U.V.W.4.f.f.f.f.w.w.w.w.X.N.G.Y.                ",
-"                  Z.`.} g g g g w w w  +.+++@+#+$+$+$+%+%+%+%+&+&+&+&+*+=+-+G.;+>+              ",
-"                  ,+} | g g g w w w w V V V V !.!.!.!.9.9.9.p.p.p.p.N.N.N.N.'+)+!+              ",
-"                  ~+{+]+^+/+(+_+:+x O V V V !.!.!.!.9.9.9.p.p.p.p.N.N.N.N.'+'+<+[+              ",
-"                    }+}+|+1+2+3+4+5+6+7+8+9+9+9+0+a+a+a+a+q.q.q.b+b+b+b+c+c+d+e+f+}+            ",
-"                      }+}+}+}+}+}+}+}+}+g+h+i+i+j+k+l+l+l+l+l+l+m+m+m+n+n+n+o+p+q+}+            ",
-"                                }+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+S             ",
-"                                                    }+}+}+}+}+}+}+}+}+}+}+}+}+}+                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                "};

art/home.xpm

@@ -1,26 +1,24 @@
 /* XPM */
-static char * home_xpm[] = {
+static char *home_xpm[] = {
-"20 20 3 1",
+/* columns rows colors chars-per-pixel */
-" 	c None",
+"16 15 3 1",
-".	c #000000000000",
+". c Black",
-"X	c #FFFFFFFFFFFF",
+"X c #FFFFFF",
-"                    ",
+"  c None",
-"                    ",
+/* pixels */
-"         ..         ",
+"      ....      ",
-"    .   ....        ",
+"     .XXXX.     ",
-"    .  .XX  .       ",
+"    .XXXXXX.    ",
-"    . .XXXX  .      ",
+"   .XXXXXXXX.   ",
-"    ..XXXXXX  .     ",
+"  .XXXXXXXXXX.  ",
-"    .XXXXXXXX  .    ",
+" .............. ",
-"   .XXXXXXXXX   .   ",
+" .XXXXXXXXXXXX. ",
-"  ...XXXXXXXX  ...  ",
+" .XXXXXXXXXXXX. ",
-"    .XXXXXXXX  .    ",
+" .XXXXXXXXXXXX. ",
-"    .XXX...XX  .    ",
+" .X.....X....X. ",
-"    .XXX. .XX  .    ",
+" .X.   .X.  .X. ",
-"    .XXX. .XX  .    ",
+" .X.   .X.  .X. ",
-"    .XXX. .XX  .    ",
+" .X.....X.  .X. ",
-"    .XXX. .XX  .    ",
+" .XXXXXXX.  .X. ",
-"    ..... ......    ",
+" .........  ... "
-"                    ",
+};
-"                    ",
-"                    "};

art/htmbook.xpm

@@ -1,40 +1,25 @@
-/* XPM */
+/* XPM */
-static char * htmbook_xpm[] = {
+static char * htmbook_xpm[] = {
-"16 16 21 1",
+"16 16 6 1",
-" 	c None",
+" 	c None",
-".	c #007F7F",
+".	c Black",
-"+	c #660000",
+"X	c #000080",
-"@	c #CC0000",
+"o	c #c0c0c0",
-"#	c #E50000",
+"O	c #808080",
-"$	c #FF0000",
+"+	c Gray100",
-"%	c #F20000",
+"                ",
-"&	c #D80000",
+"       ..       ",
-"*	c #720000",
+"     ..XX.      ",
-"=	c #7F0000",
+"   ..XXXXX.     ",
-"-	c #BFBFBF",
+" ..XXXXXXXX.    ",
-";	c #E57F7F",
+".oXXXXXXXXXX.   ",
-">	c #7F7F7F",
+".XoXXXXXXXXXX.  ",
-",	c #FFFFFF",
+".XXoXXXXXXXXXX. ",
-"'	c #F2BFBF",
+".XXXoXXXXXXXXX..",
-")	c #723F3F",
+".XXXXoXXXXXX..O ",
-"!	c #A5A5A5",
+" .XXXXoXXX..O+O ",
-"~	c #E5E5E5",
+"  .XXXXo..O++o..",
-"{	c #B2B2B2",
+"   .XXX.O+++o.. ",
-"]	c #003F3F",
+"    .XX.o+o..   ",
-"^	c #000000",
+"     .X.o..     ",
-"                ",
+"      ...       "};
-"  .........     ",
-" +@#$$$$$%&+    ",
-" +##$$$$$$$*    ",
-" +##$$$$$$$=-   ",
-" +##$$$$$$$=;>  ",
-" +##$$$$$$$=;,. ",
-" +##$$$$$$$=;,. ",
-" +##$$$$$$$=''. ",
-" +##$$$$$$$=,;. ",
-" +##$$$$$$%+,;. ",
-" +&++++++++),;. ",
-" ++!~~~~~~~~~,. ",
-" ++!~~~~~~~~~{. ",
-"  ]^^^^^^^^^^^  ",
-"                "};

art/htmfoldr.xpm

@@ -1,28 +1,25 @@
-/* XPM */
+/* XPM */
-static char * htmfoldr_xpm[] = {
+static char * htmfoldr_xpm[] = {
-/* width height ncolors chars_per_pixel */
+"16 16 6 1",
-"16 16 6 1",
+" 	c None",
-/* colors */
+".	c Black",
-"         s None        c None",
+"X	c #000080",
-".        c #000000",
+"o	c #c0c0c0",
-"+        c #c0c0c0",
+"O	c #808080",
-"@        c #808080",
+"+	c Gray100",
-"#        c #ffff00",
+"                ",
-"$        c #ffffff",
+"       ..       ",
-/* pixels */
+"     ..XX.      ",
-"                ",
+"   ..XXXXX.     ",
-"   @@@@@        ",
+" ..XXXXXXXX.    ",
-"  @#+#+#@       ",
+".oXXXXXXXXXX.   ",
-" @#+#+#+#@@@@@@ ",
+".XoXXXXXXXXXX.  ",
-" @$$$$$$$$$$$$@.",
+".XXoXXXXXXXXXX. ",
-" @$#+#+#+#+#+#@.",
+".XXXoXXXXXXXXX..",
-" @$+#+#+#+#+#+@.",
+".XXXXoXXXXXX..O ",
-" @$#+#+#+#+#+#@.",
+" .XXXXoXXX..O+O ",
-" @$+#+#+#+#+#+@.",
+"  .XXXXo..O++o..",
-" @$#+#+#+#+#+#@.",
+"   .XXX.O+++o.. ",
-" @$+#+#+#+#+#+@.",
+"    .XX.o+o..   ",
-" @$#+#+#+#+#+#@.",
+"     .X.o..     ",
-" @@@@@@@@@@@@@@.",
+"      ...       "};
-"  ..............",
-"                ",
-"                "};

art/htmoptns.xpm

@@ -1,21 +1,20 @@
-/* XPM */
+/* XPM */
-static char * htmoptns_xpm[] = {
+static char * htmoptns_xpm[] = {
-"16 16 2 1",
+"16 15 2 1",
-" 	c None",
+" 	c None",
-".	c #000000",
+".	c #000000",
-"                ",
+"                ",
-"      ..        ",
+"      ..        ",
-"      ...       ",
+"      ...       ",
-"     ....       ",
+"     ....       ",
-"     . ...      ",
+"     . ...      ",
-"    .. ...      ",
+"    .. ...      ",
-"    .   ..      ",
+"    .   ..      ",
-"   ..   ...     ",
+"   ..   ...     ",
-"   .     ..     ",
+"   .     ..     ",
-"   .........    ",
+"   .........    ",
-"  ..     ...    ",
+"  ..     ...    ",
-"  .       ...   ",
+"  .       ...   ",
-" ..       ...   ",
+" ..       ...   ",
-" ....   ....... ",
+" ....   ....... ",
-"                ",
+"                "};
-"                "};

art/htmpage.xpm

@@ -1,25 +1,23 @@
-/* XPM */
+/* XPM */
-static char * htmpage_xpm[] = {
+static char * htmpage_xpm[] = {
-/* width height ncolors chars_per_pixel */
+"16 16 4 1",
-"16 16 3 1",
+" 	c None",
-/* colors */
+".	c #808080",
-" 	s None	c None",
+"X	c Gray100",
-".	c #000000",
+"o	c Black",
-"+	c #ffffff",
+"                ",
-/* pixels */
+"  ..........    ",
-"                ",
+"  .XXXXXXXX..   ",
-"  ........      ",
+"  .XXXXXXXXooo  ",
-"  .++++++..     ",
+"  .X......XXXo  ",
-"  .+.+.++.+.    ",
+"  .XXXXXXXXXXo  ",
-"  .++++++....   ",
+"  .X........Xo  ",
-"  .+.+.+++++.   ",
+"  .XXXXXXXXXXo  ",
-"  .+++++++++.   ",
+"  .X........Xo  ",
-"  .+.+.+.+.+.   ",
+"  .XXXXXXXXXXo  ",
-"  .+++++++++.   ",
+"  .X........Xo  ",
-"  .+.+.+.+.+.   ",
+"  .XXXXXXXXXXo  ",
-"  .+++++++++.   ",
+"  .X........Xo  ",
-"  .+.+.+.+.+.   ",
+"  .XXXXXXXXXXo  ",
-"  .+++++++++.   ",
+"  .XXXXXXXXXXo  ",
-"  ...........   ",
+"  oooooooooooo  "};
-"                ",
-"                "};

art/htmsidep.xpm

@@ -1,35 +1,28 @@
 /* XPM */
-static char * htmsidep_xpm[] = {
+static char *htmsidep_xpm[] = {
-"16 15 17 1",
+/* columns rows colors chars-per-pixel */
-" 	c None",
+"16 16 6 1",
-".	c #000000",
+". c Black",
-"+	c #800000",
+"X c #FFFFFF",
-"@	c #008000",
+"+ c #808080",
-"#	c #808000",
+"  c None",
-"$	c #000080",
+"O c #0000C0",
-"%	c #800080",
+"o c #C0C0C0",
-"&	c #008080",
+/* pixels */
-"*	c #C0C0C0",
+"                ",
-"=	c #808080",
+" .............. ",
-"-	c #FF0000",
+" .XXXX.ooooooo. ",
-";	c #00FF00",
+" .XOXX.oo...oo. ",
-">	c #FFFF00",
+" .XXOX.ooooooo. ",
-",	c #0000FF",
+" .OOOO.o...+.o. ",
-"'	c #FF00FF",
+" .XXOX.ooooooo. ",
-")	c #00FFFF",
+" .XOXX.ooooooo. ",
-"!	c #FFFFFF",
+" .XXXX.o..+ooo. ",
-"****************",
+" .XXOX.ooooooo. ",
-"*..............*",
+" .XOXX.o...+.o. ",
-"*.************.*",
+" .OOOO.ooooooo. ",
-"*..............*",
+" .XOXX.o.+...o. ",
-"*.****.!!!!!!!.*",
+" .XXOX.ooooooo. ",
-"*.****.!====*!.*",
+" .............. ",
-"*.****.!!!!!!!.*",
+"                "
-"*.****.!===*!!.*",
+};
-"*.****.!!!!!!!.*",
-"*.****.!====*!.*",
-"*.****.!!!!!!!.*",
-"*.****.!===*!!.*",
-"*.****.!!!!!!!.*",
-"*..............*",
-"****************"};

art/listview.xpm

@@ -1,28 +1,26 @@
 /* XPM */
-static char * listview_xpm[] = {
+static char *listview_xpm[] = {
-"20 20 5 1",
+/* columns rows colors chars-per-pixel */
-" 	c None",
+"16 16 4 1",
-".	c #000000",
+"  c Black",
-"+	c #FFFFFF",
+". c #FFFFFF",
-"@	c #000083",
+"X c #000084",
-"#	c #838183",
+"o c #848484",
-"                    ",
+/* pixels */
-"                    ",
+"                ",
-"  ................  ",
+" .............. ",
-"  .++++++++++++++.  ",
+" .XXX.......... ",
-"  .+@@+++++@@++++.  ",
+" .XXX.  o   o . ",
-"  .+@+@+.#+@+@+.+.  ",
+" .XXX.......... ",
-"  .+@@@++++@@@+++.  ",
+" .............. ",
-"  .++++++++++++++.  ",
+" .............. ",
-"  .++++++++++++++.  ",
+" .XXX.......... ",
-"  .+@@+++++@@++++.  ",
+" .XXX.   o    . ",
-"  .+@+@+.#+@+@+.+.  ",
+" .XXX.......... ",
-"  .+@@@++++@@@+++.  ",
+" .............. ",
-"  .++++++++++++++.  ",
+" .............. ",
-"  .++++++++++++++.  ",
+" .XXX.......... ",
-"  .+@@+++++@@++++.  ",
+" .XXX. o    o . ",
-"  .+@+@+.#+@+@+.+.  ",
+" .XXX.......... ",
-"  .+@@@++++@@@+++.  ",
+"                "
-"  ................  ",
+};
-"                    ",
-"                    "};

art/motif/error.xpm

@@ -1,129 +1,58 @@
 /* XPM */
-static char * error_xpm[] = {
+static char *error_xpm[] = {
-"48 48 78 1",
+/* columns rows colors chars-per-pixel */
-" 	c None",
+"48 48 4 1",
-".	c #000000",
+"  c None",
-"+	c #200000",
+"X c #242424",
-"@	c #4A0000",
+"o c #DCDF00",
-"#	c #6B0000",
+". c #C00000",
-"$	c #8F0000",
+/* pixels */
-"%	c #890000",
-"&	c #5F0000",
-"*	c #380000",
-"=	c #0E0000",
-"-	c #030000",
-";	c #480000",
-">	c #9C0000",
-",	c #E40000",
-"'	c #FE0000",
-")	c #FF0000",
-"!	c #C90000",
-"~	c #7E0000",
-"{	c #250000",
-"]	c #090000",
-"^	c #700000",
-"/	c #DE0000",
-"(	c #FB0000",
-"_	c #BB0000",
-":	c #410000",
-"<	c #500000",
-"[	c #DF0000",
-"}	c #B00000",
-"|	c #0D0000",
-"1	c #AB0000",
-"2	c #F60000",
-"3	c #600000",
-"4	c #010000",
-"5	c #220000",
-"6	c #DA0000",
-"7	c #950000",
-"8	c #070000",
-"9	c #350000",
-"0	c #F00000",
-"a	c #BD0000",
-"b	c #080000",
-"c	c #B10000",
-"d	c #880000",
-"e	c #FD0000",
-"f	c #4D0000",
-"g	c #0B0000",
-"h	c #F50000",
-"i	c #1A0000",
-"j	c #820000",
-"k	c #E30000",
-"l	c #040000",
-"m	c #3C0000",
-"n	c #FEAFAF",
-"o	c #FFFEFE",
-"p	c #FEFEFE",
-"q	c #FF7F7F",
-"r	c #840000",
-"s	c #FFAFAF",
-"t	c #FFFFFF",
-"u	c #C00000",
-"v	c #EA0000",
-"w	c #2F0000",
-"x	c #290000",
-"y	c #D80000",
-"z	c #AE0000",
-"A	c #FE6D6D",
-"B	c #FF9F9F",
-"C	c #FE9F9F",
-"D	c #FF4F4F",
-"E	c #690000",
-"F	c #C10000",
-"G	c #5B0000",
-"H	c #050000",
-"I	c #B70000",
-"J	c #E50000",
-"K	c #F40000",
-"L	c #420000",
-"M	c #650000",
 "                                                ",
 "                                                ",
-"                 ..+@#$$$%&*=.                  ",
-"               -;>,''''''))))!~{.               ",
-"             ]^/'''''''''))))))(_:.             ",
-"           .<['''''''''''))))))))'}+.           ",
-"          |1'''''''''''''))))))))))234          ",
-"         56)'''''''''''''))))))))))))78         ",
-"        90))''''''''''''')))))))))))))ab        ",
-"       50)))'''''''''''''))))))))))))))c4       ",
-"      |6))))''''''''''''')))))))))))))))d.      ",
-"     .1'))))''''''''''''')))))))))))))))ef      ",
-"     <''))))''''''''''''')))))))))))))))),g     ",
-"    ][')))))''''''''''''')))))))))))))))))%.    ",
-"    ^'''))))''''''''''''')))))))))))))))))hi    ",
-"   -/'''))))'''''''''''''))))))))))))))))))j    ",
-"   ;)'')))))'''''''''''''))))))))))))))))))kl   ",
-"   >''''))))''''''''''''')))))))))))))))))))m   ",
-"  .,'''noooopppppppppppppoooooooooooooooq)))r   ",
-"  +))')sttttppppppppppppptttttttttttttttq)))u.  ",
-"  @''''nttttppppppppppppptttttttttttttttq)))v.  ",
-"  #))''nttttppppppppppppptttttttttttttttq))))g  ",
-"  $)'''nttttppppppppppppptttttttttttttttq))))w  ",
-"  $''''nttttppppppppppppptttttttttttttttq))))w  ",
-"  $)'''nttttppppppppppppptttttttttttttttq))))w  ",
-"  %)'''nttttppppppppppppptttttttttttttttq))))x  ",
-"  &''''nttttppppppppppppptttttttttttttttq)))).  ",
-"  *)'''nttttppppppppppppptttttttttttttttq)))y.  ",
-"  =))''sttttppppppppppppptttttttttttttttq)))z   ",
-"  .!'''ABBBBCCCCCCCCCCCCCBBBBBBBBBBBBBBBD)))E   ",
-"   ~''''))))'''''''''''''))))))))))))))))))e+   ",
-"   {('))))))'''''''''''''))))))))))))))))))F.   ",
-"   ._'''))))'''''''''''''))))))))))))))))))G    ",
-"    :'''))))''''''''''''')))))))))))))))))6H    ",
-"    .}))))))''''''''''''')))))))))))))))))<     ",
-"     +2'))))'''''''''''''))))))))))))))))I.     ",
-"     .3)))))''''''''''''')))))))))))))))Ji      ",
-"      47))))'''''''''''''))))))))))))))KL       ",
-"       8a)))'''''''''''''))))))))))))))M.       ",
-"        bc))'''''''''''''))))))))))))KM.        ",
-"         4de''''''''''''')))))))))))JL.         ",
-"          .f,''''''''''''))))))))))Ii           ",
-"            g%h''''''''''))))))))6<.            ",
-"             .ijk'''''''')))))eFGH              ",
-"               .lmruv''''))yzE+.                ",
-"                   ..gwwwx...                   ",
 "                                                ",
-"                                                "};
+"                                                ",
+"                                                ",
+"                    .....                       ",
+"                .............                   ",
+"              .................                 ",
+"             ...................                ",
+"           .......................              ",
+"          .........................             ",
+"         ...........................            ",
+"         ...........................X           ",
+"        .............................X          ",
+"       ...............................          ",
+"       ...............................X         ",
+"      .................................X        ",
+"      .................................X        ",
+"      .................................XX       ",
+"      ...ooooooooooooooooooooooooooo...XX       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      .................................XX       ",
+"      .................................XX       ",
+"       ...............................XXX       ",
+"       ...............................XXX       ",
+"        .............................XXX        ",
+"         ...........................XXXX        ",
+"         ...........................XXX         ",
+"          .........................XXX          ",
+"           .......................XXXX          ",
+"            X...................XXXXX           ",
+"             X.................XXXXX            ",
+"               X.............XXXXX              ",
+"                XXXX.....XXXXXXXX               ",
+"                  XXXXXXXXXXXXX                 ",
+"                      XXXXX                     ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "
+};

art/motif/info.xpm

@@ -1,210 +1,63 @@
 /* XPM */
-static char * info_xpm[] = {
+static char *info_xpm[] = {
-"48 48 159 2",
+/* columns rows colors chars-per-pixel */
-"  	c None",
+"48 48 9 1",
-". 	c #12165C",
+"$ c Black",
-"+ 	c #9E9EC4",
+"O c #FFFFFF",
-"@ 	c #565294",
+"@ c #808080",
-"# 	c #2E3274",
+"+ c #000080",
-"$ 	c #1A227C",
+"o c #E8EB01",
-"% 	c #16229C",
+"  c None",
-"& 	c #262274",
+"X c #FFFF40",
-"* 	c #362E8C",
+"# c #C0C0C0",
-"= 	c #262A9C",
+". c #ABAD01",
-"- 	c #121E7C",
+/* pixels */
-"; 	c #1A2AAC",
+"                                                ",
-"> 	c #162284",
+"                                                ",
-", 	c #262EA4",
+"                                                ",
-"' 	c #2A2A84",
+"                                                ",
-") 	c #1E1E6C",
+"                                                ",
-"! 	c #3E3A84",
+"                                                ",
-"~ 	c #7A72B4",
+"                                                ",
-"{ 	c #121E74",
+"                                                ",
-"] 	c #1E2284",
+"                                                ",
-"^ 	c #2A2E9C",
+"                     .....                      ",
-"/ 	c #362E9C",
+"                   ..XXXXX..                    ",
-"( 	c #D2D2E4",
+"                 ..XXXXXXXXo..                  ",
-"_ 	c #62669C",
+"                .XXXOXXXXXXXoo.                 ",
-": 	c #1E269C",
+"                .XOOXXX+XXXXXo.                 ",
-"< 	c #1A2AB4",
+"               .XOOOXX+++XXXXoo.                ",
-"[ 	c #6A6EAC",
+"               .XOOXXX+++XXXXXo.                ",
-"} 	c #121A6C",
+"              .XOOOXXX+++XXXXXXo.               ",
-"| 	c #2E2A84",
+"              .XOOXXXX+++XXXXXXo.               ",
-"1 	c #26268C",
+"              .XXXXXXX+++XXXXXXX.               ",
-"2 	c #3E328C",
+"              .XXXXXXX+++XXXXXXo.               ",
-"3 	c #322E9C",
+"              .XXXXXXX+++XXXXXoo.               ",
-"4 	c #B6B6CC",
+"               .XXXXXX+++XXXXXo.                ",
-"5 	c #1626AC",
+"               .XXXXXXX+XXXXXXo.                ",
-"6 	c #1E268C",
+"                .XXXXXXXXXXXXo.                 ",
-"7 	c #2E267C",
+"                .XXXXX+++XXXoo.                 ",
-"8 	c #363294",
+"                 .XXXX+++XXoo.                  ",
-"9 	c #1A2694",
+"                  .XXXXXXXXo.                   ",
-"0 	c #22226C",
+"                  ..XXXXXXo..                   ",
-"a 	c #26267C",
+"                   .XXXXXo..                    ",
-"b 	c #2E2A9C",
+"                   @#######@                    ",
-"c 	c #1A1E7C",
+"                   @@@@@@@@@                    ",
-"d 	c #222A9C",
+"                   @#######@                    ",
-"e 	c #162294",
+"                   @@@@@@@@@                    ",
-"f 	c #1E2EBC",
+"                   @#######@                    ",
-"g 	c #2A2EAC",
+"                    @@@@@@@                     ",
-"h 	c #6A6A9C",
+"                      ###                       ",
-"i 	c #2E2A94",
+"                      $$$                       ",
-"j 	c #CACADC",
+"                                                ",
-"k 	c #1A1A64",
+"                                                ",
-"l 	c #16269C",
+"                                                ",
-"m 	c #262AAC",
+"                                                ",
-"n 	c #161E8C",
+"                                                ",
-"o 	c #464294",
+"                                                ",
-"p 	c #8286C4",
+"                                                ",
-"q 	c #1A1E64",
+"                                                ",
-"r 	c #222AB4",
+"                                                ",
-"s 	c #6A6EB4",
+"                                                ",
-"t 	c #1A1A6C",
+"                                                "
-"u 	c #BABAD4",
+};
-"v 	c #1E2694",
-"w 	c #121A64",
-"x 	c #2E2E94",
-"y 	c #3A2E8C",
-"z 	c #2A2A9C",
-"A 	c #161E7C",
-"B 	c #1A2284",
-"C 	c #262A94",
-"D 	c #2E2E9C",
-"E 	c #36329C",
-"F 	c #FEFEFC",
-"G 	c #666AA4",
-"H 	c #1E2AB4",
-"I 	c #161A6C",
-"J 	c #322A84",
-"K 	c #2A267C",
-"L 	c #262EB4",
-"M 	c #1A269C",
-"N 	c #1E2274",
-"O 	c #1E2AA4",
-"P 	c #221E6C",
-"Q 	c #423E8C",
-"R 	c #222284",
-"S 	c #E6E6EC",
-"T 	c #22269C",
-"U 	c #6E6EA4",
-"V 	c #3232A4",
-"W 	c #BAB6D4",
-"X 	c #1A26AC",
-"Y 	c #222684",
-"Z 	c #3A328C",
-"` 	c #22227C",
-" .	c #222AAC",
-"..	c #222EB4",
-"+.	c #8A86BC",
-"@.	c #1A1E74",
-"#.	c #161A5C",
-"$.	c #322E8C",
-"%.	c #3A329C",
-"&.	c #A29ECC",
-"*.	c #26227C",
-"=.	c #362E94",
-"-.	c #262AA4",
-";.	c #121E84",
-">.	c #16228C",
-",.	c #262EAC",
-"'.	c #2A2A8C",
-").	c #1E1E74",
-"!.	c #7A76B4",
-"~.	c #161E74",
-"{.	c #1E228C",
-"].	c #2A2EA4",
-"^.	c #6266A4",
-"/.	c #1E26A4",
-"(.	c #1A2ABC",
-"_.	c #121A74",
-":.	c #2E2A8C",
-"<.	c #262694",
-"[.	c #3E3294",
-"}.	c #322EA4",
-"|.	c #B6B6D4",
-"1.	c #222274",
-"2.	c #262684",
-"3.	c #222AA4",
-"4.	c #1A2294",
-"5.	c #2E2EAC",
-"6.	c #6E6AA4",
-"7.	c #322A94",
-"8.	c #1626A4",
-"9.	c #8E8ABC",
-"0.	c #4A429C",
-"a.	c #6E6EBC",
-"b.	c #222694",
-"c.	c #2A2A94",
-"d.	c #1A1E6C",
-"e.	c #BABADC",
-"f.	c #3A2E94",
-"g.	c #2A2AA4",
-"h.	c #161E84",
-"i.	c #1A228C",
-"j.	c #2E2EA4",
-"k.	c #3632A4",
-"l.	c #666AAC",
-"m.	c #1E2ABC",
-"n.	c #161A74",
-"o.	c #322A8C",
-"p.	c #2A2684",
-"q.	c #1A26A4",
-"r.	c #1E227C",
-"s.	c #1E2AAC",
-"t.	c #423E94",
-"u.	c #E6E6F4",
-"v.	c #6E6EAC",
-"w.	c #1A26B4",
-"x.	c #22268C",
-"y.	c #3A3294",
-"z.	c #222EBC",
-"A.	c #161A64",
-"B.	c #322E94",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                      7 7 7 7 7 7 7 7 &                                         ",
-"                                2 2 2 2 2 2 y y y f.f.[.y 7 *.                                  ",
-"                            J y 2 2 2 2 2 [.[.[.[.y.=.=.f.=./ B.p.                              ",
-"                        2 2 2 2 [.2 [.[.f.y y y * * =.=.B./ B.3 o.*.*.                          ",
-"                      y 2 2 [.2 [.2 2 y [.[.f.f.o.* $.$.B.B.7.D 3 D }.D                         ",
-"                    2 2 [.[.2 [.2 [.f.[.y ~ ( F F W 0.$.:.i x 7.3 D D <.R                       ",
-"                  y 2 [.[.[.2 [.2 2 y y ~ F F F F F u.o :.:.c.c.b b D }.}.g.                    ",
-"                2 [.[.2 [.2 [.2 [.y 2 Z ( F F F F F F +.7 '.:.:.i D b ].].z R                   ",
-"              y 2 2 [.[.[.[.[.2 f.y y y F F F F F F F |.p.p.'.'.<.z z g.].].5.m                 ",
-"            2 2 [.t.[.[.2 2 2 f.2 f.* * u.F F F F F F + *.2.2.C '.c.z ^ ].g m = n               ",
-"            y 2 [.2 [.[.[.[.2 f.2 f.* * &.F F F F F F @ a *.2.2.C C z = g.].,.g. .              ",
-"          2 2 [.[.[.[.[.2 [.[.[.f.* o.J $.u F F F u.U 1.0 Y *.2.1 <.C ^ -.m g.L = n             ",
-"          2 2 2 [.2 t.[.[.f.[.Z y.* $.J 7 | Q U 6.P 1.P P ` ` 2.1 <.= = , ,.,.m m  .            ",
-"        2 [.[.[.[.[.[.2 f.2 f.f.* =.o.:.| K & & 0 0 P N 1.1.` R 2.d <.= -.-.m ..../.n           ",
-"        2 2 [.2 [.2 [.[.[.[.y.=.=.* o.:.p.K ! 6.h 4 4 ) ) ).r.6 Y b.= = , ,.,.m ..r r           ",
-"        [.2 t.[.[.[.[.[.f.y.8 y.* B.9.W S F F F F F F ) ) N 1.R R x.b.= 3.m m ..m ..s.          ",
-"      7 [.2 [.2 [.[.[.[.[.f.=.=.=.o.e.F F F F F F F F ) ) ).N R x.b.T 3.3. .m ..r H m.H         ",
-"      2 [.[.[.[.[.[.[.[.f.%.=.=.$.B.:.o W F F F F F F k q N r.] R b.d T ,  . .r ....s.n         ",
-"      y 2 2 [.[.[.[.[.%.f.%.=.=.B.$.:.'.v.F F F F F F t k ) N ] 6 x.d T 3... .H r H m.<         ",
-"      2 [.[.[.[.[.[.%.y.%.=.E / 7.7.p.p.v.F F F F F F q d.t @.r.R v T O  . .....f r X n         ",
-"      y 2 2 [.[.[.[.%.=.%.=.B.B.x B.:.| v.F F F F F F k d.d.c $ {.6 T d O  .r r f f m.(.        ",
-"      2 [.[.[.[.[.%.%.%./ E / 3 7.i '.2.v.F F F F F F A.A.t @.r.] b.: /. .s.H H H m.5 ;.        ",
-"      J 2 [.[.[.[.f.%.8 / E 8 3 i i :.p.v.F F F F F F k A.d.~.$ B 6 : : /.s.H m.m.f (.(.        ",
-"      [.[.[.%.[.%.%./ f.E / 3 3 B.i p.1 v.F F F F F F . A.I @.c {.{.: O s. .H H m.(.w.;.        ",
-"      7 [.[.%.f.%.%.E / V =.3 D D ^ '.1 v.F F F F F F #.A.I @.A i.9 : O s.s.H f m.(.(.w.        ",
-"      [.[.[.[.%.%.E E E / 3 3 7.i i c.2.v.F F F F F F . . A.~.c B {.M /.X H H (.(.(.w.;.        ",
-"        [.%.%./ %.f./ V 3 3 D D c.c.<.Y v.F F F F F F #.A.A.~.A B 4.9 /.X ; < f f (.(.          ",
-"        %.f.E %./ k.k./ V }.}.D D c.'.1 [ F F F F F F . . } I c >.i.M q.; H < (.(.(.5           ",
-"        J f.k.E E E / / 3 V 3 D b z 1 x.v.F F F F F F #.. A.} c B 4.M /.X < (.(.(.(.(.          ",
-"          %.%.%.E / V }.V D j.z z c.C 1 [ F F F F F F . A.} ~.A h.4.4.q.; w.(.(.(.5             ",
-"          7 k./ V / V D }.j.j.^ z z <.x.[ F F F F F F . . . _.A h.4.% q.; 5 w.w.(.(.            ",
-"            / k./ V }.}.j.j.j.b z C C R l.F F F F F F . } I ~.A >.e M 5 5 (.(.(.5               ",
-"            7 V 3 V V V }.j.].].g.= C <.s F F F F F F # w } n.A >.e 4.X 5 < (.w.(.              ",
-"              / k.}.}.j.j.j.j.g.z = a.p u.F F F F F F j _ _ - - n e 8.5 5 w.w.5                 ",
-"                V V j.j.j.].].].z = F F F F F F F F F F F F n.;.n e % X 5 (.(.                  ",
-"                  j.V j.j.j.].-.-.<.a.a.s [ l.G G _ _ _ ^.^.- h.e % 8.5 < 5                     ",
-"                    5.].g j.]., , d T b.{.{.c A ~._.} } _.n.;.;.e % % 5 5                       ",
-"                      5.j.].g g.-.-.d : v i.> A A ~._.- - - >.e e % 5 %                         ",
-"                        g g.g -., 3.d : v v i.B h.A n.h.;.;.;.n % 8.%                           ",
-"                            -.,. .-.3.T : 4.{.>.>.>.>.;.>.n % % %                               ",
-"                                3.-.3.3.O M 4.4.i.n e n e e e                                   ",
-"                                      : : : /.4.% e n ;.                                        ",
-"                                                                                                ",
-"                                                                                                "};

art/motif/question.xpm

@@ -1,216 +1,75 @@
 /* XPM */
-static char * question_xpm[] = {
+static char *question_xpm[] = {
-"48 48 165 2",
+/* columns rows colors chars-per-pixel */
-"  	c None",
+"48 48 21 1",
-". 	c #000000",
+". c Black",
-"+ 	c #080808",
+"> c #696969",
-"@ 	c #2A2A2A",
+"O c #1F1F00",
-"# 	c #434343",
+"+ c #181818",
-"$ 	c #545454",
+"o c #F6F900",
-"% 	c #626262",
+"; c #3F3F00",
-"& 	c #6A6A6A",
+"$ c #111111",
-"* 	c #6E6E6E",
+"  c None",
-"= 	c #424242",
+"& c #202020",
-"- 	c #525252",
+"X c #AAAA00",
-"; 	c #898989",
+"@ c #949400",
-"> 	c #DCDCDC",
+": c #303030",
-", 	c #E5E5E5",
+"1 c #383838",
-"' 	c #EDEDED",
+"% c #2A2A00",
-") 	c #F4F4F4",
+", c #404040",
-"! 	c #F9F9F9",
+"= c #B4B400",
-"~ 	c #FCFCFC",
+"- c #484848",
-"{ 	c #FFFFFF",
+"# c #151500",
-"] 	c #888888",
+"< c #9F9F00",
-"^ 	c #4F4F4F",
+"2 c #6A6A00",
-"/ 	c #050505",
+"* c #353500",
-"( 	c #0F0F0F",
+/* pixels */
-"_ 	c #9C9C9C",
+"                                                ",
-": 	c #E6E6E6",
+"                                                ",
-"< 	c #9B9B9B",
+"                                                ",
-"[ 	c #1F1F1F",
+"                                                ",
-"} 	c #A1A1A1",
+"                   .........                    ",
-"| 	c #E3E3E3",
+"                 ...XXXXXXX..                   ",
-"1 	c #4D4D4D",
+"               ..XXXXoooooXXXO+                 ",
-"2 	c #D6D6D6",
+"             ..XXooooooooooooX@..               ",
-"3 	c #ECECEC",
+"            ..XoooooooooooooooXX#.              ",
-"4 	c #D9D9D9",
+"           $%XoooooooooooooooooXX#.             ",
-"5 	c #C6C6C6",
+"          &.XoooooooXXXXXXooooooXX..            ",
-"6 	c #B0B0B0",
+"          .XooooooXX.$...$XXoooooX*.            ",
-"7 	c #848484",
+"         $.XoooooX%.$     .*oooooo=..           ",
-"8 	c #D3D3D3",
+"         .XooooooX..      -.XoooooX..           ",
-"9 	c #010101",
+"         .XoooooX..+       .XoooooX;.           ",
-"0 	c #8B8B8B",
+"         ...XXXX..:        .XoooooX;.           ",
-"a 	c #F2F2F2",
+"          ........        >.XoooooX;.           ",
-"b 	c #F3F3F3",
+"                          +.XoooooX..           ",
-"c 	c #A6A6A6",
+"                         ,.Xoooooo<..           ",
-"d 	c #5E5E5E",
+"                        1#XooooooXO..           ",
-"e 	c #2F2F2F",
+"                       &#XooooooX2..            ",
-"f 	c #272727",
+"                      $%XooooooXX..             ",
-"g 	c #202020",
+"                     $%XooooooXX..              ",
-"h 	c #4E4E4E",
+"                    $%XooooooXX..               ",
-"i 	c #8A8A8A",
+"                   &.XooooooXX..                ",
-"j 	c #0B0B0B",
+"                   .XooooooXX..                 ",
-"k 	c #B6B6B6",
+"                  &.XoooooXX..                  ",
-"l 	c #5D5D5D",
+"                  ..XooooXX..                   ",
-"m 	c #131313",
+"                  ..XooooX...                   ",
-"n 	c #9A9A9A",
+"                  ..XXooXX..&                   ",
-"o 	c #C9C9C9",
+"                  ...XXXXX..                    ",
-"p 	c #878787",
+"                   ........                     ",
-"q 	c #0A0A0A",
+"                                                ",
-"r 	c #373737",
+"                                                ",
-"s 	c #DADADA",
+"                   .......                      ",
-"t 	c #B4B4B4",
+"                  ..XXXXX..                     ",
-"u 	c #B1B1B1",
+"                 ..XXoooXX..                    ",
-"v 	c #030303",
+"                 ..XoooooX..                    ",
-"w 	c #767676",
+"                 ..XoooooX..                    ",
-"x 	c #FDFDFD",
+"                 ..XXoooXX..                    ",
-"y 	c #FAFAFA",
+"                  ..XXXXX..                     ",
-"z 	c #383838",
+"                   .......                      ",
-"A 	c #F8F8F8",
+"                                                ",
-"B 	c #AFAFAF",
+"                                                ",
-"C 	c #070707",
+"                                                ",
-"D 	c #818181",
+"                                                ",
-"E 	c #555555",
+"                                                ",
-"F 	c #BDBDBD",
+"                                                "
-"G 	c #7D7D7D",
+};
-"H 	c #3C3C3C",
-"I 	c #F6F6F6",
-"J 	c #535353",
-"K 	c #242424",
-"L 	c #ABABAB",
-"M 	c #393939",
-"N 	c #BBBBBB",
-"O 	c #EAEAEA",
-"P 	c #A3A3A3",
-"Q 	c #4B4B4B",
-"R 	c #616161",
-"S 	c #CFCFCF",
-"T 	c #060606",
-"U 	c #EFEFEF",
-"V 	c #B9B9B9",
-"W 	c #303030",
-"X 	c #161616",
-"Y 	c #2C2C2C",
-"Z 	c #C0C0C0",
-"` 	c #2E2E2E",
-" .	c #858585",
-"..	c #E4E4E4",
-"+.	c #1C1C1C",
-"@.	c #D4D4D4",
-"#.	c #828282",
-"$.	c #C7C7C7",
-"%.	c #3A3A3A",
-"&.	c #090909",
-"*.	c #151515",
-"=.	c #8E8E8E",
-"-.	c #F7F7F7",
-";.	c #C4C4C4",
-">.	c #EBEBEB",
-",.	c #CECECE",
-"'.	c #3D3D3D",
-").	c #676767",
-"!.	c #F1F1F1",
-"~.	c #FBFBFB",
-"{.	c #353535",
-"].	c #212121",
-"^.	c #EEEEEE",
-"/.	c #444444",
-"(.	c #DEDEDE",
-"_.	c #020202",
-":.	c #6B6B6B",
-"<.	c #E1E1E1",
-"[.	c #575757",
-"}.	c #111111",
-"|.	c #939393",
-"1.	c #ADADAD",
-"2.	c #6C6C6C",
-"3.	c #929292",
-"4.	c #4A4A4A",
-"5.	c #1E1E1E",
-"6.	c #3B3B3B",
-"7.	c #A0A0A0",
-"8.	c #696969",
-"9.	c #FEFEFE",
-"0.	c #CBCBCB",
-"a.	c #F0F0F0",
-"b.	c #0E0E0E",
-"c.	c #DFDFDF",
-"d.	c #808080",
-"e.	c #D0D0D0",
-"f.	c #636363",
-"g.	c #323232",
-"h.	c #D2D2D2",
-"i.	c #333333",
-"j.	c #292929",
-"k.	c #484848",
-"l.	c #646464",
-"m.	c #F5F5F5",
-"n.	c #B2B2B2",
-"o.	c #494949",
-"p.	c #E2E2E2",
-"q.	c #3F3F3F",
-"r.	c #0D0D0D",
-"s.	c #E0E0E0",
-"t.	c #2D2D2D",
-"u.	c #3E3E3E",
-"v.	c #C8C8C8",
-"w.	c #D1D1D1",
-"x.	c #7C7C7C",
-"y.	c #141414",
-"z.	c #A4A4A4",
-"A.	c #C2C2C2",
-"B.	c #262626",
-"C.	c #191919",
-"D.	c #999999",
-"E.	c #0C0C0C",
-"F.	c #101010",
-"G.	c #787878",
-"H.	c #797979",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                . . . . . . . . . . . . . . . .                                 ",
-"                          . . . . + @ # $ % & * * & % $ = @ + . . . .                           ",
-"                      . . . . - ; > , ' ) ! ~ { { ~ ! ) ' , > ] ^ . . . .                       ",
-"                  . . / ( _ : { { { { { { { { { { { { { { { { { { : < ( / . .                   ",
-"                . . [ } | { { { { { { { { { { { { { { { { { { { { { { | } [ . .                 ",
-"              . . 1 2 { { { { { { { { 3 4 5 6 7 7 7 < 5 8 : ! { { { { { { 2 1 . . .             ",
-"          . . 9 0 a { { { { { { { b c d e 9 9 9 f 9 9 9 g h i 4 { { { { { { a ; 9 . .           ",
-"        . . j k { { { { { { { { ' l m 9 9 9 9 n o p 9 9 9 9 q r s { { { { { { { t q . .         ",
-"      . . + u { { { { { { { { { # v 9 9 9 9 w x { y z 9 9 9 9 9 @ A { { { { { { { B C . .       ",
-"    . . . D y { { { { { { { { { 9 9 9 9 9 j ' { { { E 9 9 9 9 9 9 F { { { { { { { y G . . .     ",
-"    . . H I { { { { { { { { { { J 9 9 9 9 ^ { { { { K 9 9 9 9 9 9 L { { { { { { { { I M . . .   ",
-"  . . . N { { { { { { { { { { { O P Q Q R S { { { } 9 9 9 9 9 9 T U { { { { { { { { { V . . .   ",
-"  . . W ! { { { { { { { { { { { { { { { { { { A 6 X 9 9 9 9 9 Y Z { { { { { { { { { { ! ` . .   ",
-"  . .  .{ { { { { { { { { { { { { { { { { { ..7 ( 9 9 9 9 +.* @.{ { { { { { { { { { { { #.. . . ",
-". . . $.{ { { { { { { { { { { { { { { { { < %.&.9 9 9 *.=.5 -.{ { { { { { { { { { { { { ;.. . . ",
-". . . >.{ { { { { { { { { { { { { { { ,.'.+ . . . . ).!.~ { { { { { { { { { { { { { { { O . . . ",
-". . . ~.{ { { { { { { { { { { { { { O {.. . . . . ].^.{ { { { { { { { { { { { { { { { { ~.. . . ",
-". . . A { { { { { { { { { { { { { { k 9 9 9 9 9 9 /.{ { { { { { { { { { { { { { { { { { A . . . ",
-". . . (.{ { { { { { { { { { { { { { 5 _.. . . . . q :.4 U U <.{ { { { { { { { { { { { { > . . . ",
-". . . 6 { { { { { { { { { { { { { { { [.&.. . . . . . . . }.|.{ { { { { { { { { { { { { 1.. . . ",
-". . . 2.{ { { { { { { { { { { { { { { a 3.4.5.9 9 9 5.6.).7.a { { { { { { { { { { { { { 8.. . . ",
-"  . . ( !.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.<.0.F F F 0.s a.9.9.9.9.9.9.9.9.9.9.9.9.9.9.!.b.. . . ",
-"  . . . D { { { { { { { { { { { { { { { { { U c.c.c.U { { { { { { { { { { { { { { { { d.. . .   ",
-"  . . . ( 8 { { { { { { { { { { { { { { { e.f.g.g.g.f.;.{ { { { { { { { { { { { { { h.b.. . .   ",
-"    . . . 4.) { { { { { { { { { { { { { ' i.9 9 9 9 9 j.' { { { { { { { { { { { { ) k.. . .     ",
-"      . . . l.m.{ { { { { { { { { { { { n.. . . . . . . n.{ { { { { { { { { { { m.f.. . . .     ",
-"        . . . o.p.{ { { { { { { { { { { F 9 9 9 9 9 9 9 5 { { { { { { { { { { p.k.. . . .       ",
-"          . . . @ 0.{ { { { { { { { { { b q.. . . . . d { { { { { { { { { { b j.. . . .         ",
-"            . . . r.7.{ { { { { { { { { { s.* = t.= < 3 { { { { { { { { { { A e . . .           ",
-"              . . . . u._ >.y { { { { { { { { { { { { { { { { { { { { { { { { a - . .           ",
-"                . . . . . W % v., { { { { { { { { { { { { { { , w.e.>.{ { { { { U x.T           ",
-"                    . . . . . y.f D z.A.4 >.-.x x -.>.4 A.z.d.B.C.C.Y i c h.{ { { ) D..         ",
-"                        . . . . . . / &.E.( F.}.}.F.b.E.&./ . . . . . 9 T E.}.] 5 ' ) G..       ",
-"                            . . . . . . . . . . . . . . . . . . . . . . . . . . . . M H.H..     ",
-"                                  . . . . . . . . . . . . . .           . . . . . . . . . .     ",
-"                                                                                    . . . .     ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                "};

art/motif/warning.xpm

@@ -1,202 +1,63 @@
 /* XPM */
-static char * warning_xpm[] = {
+static char *warning_xpm[] = {
-"48 48 151 2",
+/* columns rows colors chars-per-pixel */
-"  	c None",
+"48 48 9 1",
-". 	c #C70707",
+"@ c Black",
-"+ 	c #F80808",
+"o c #A6A800",
-"@ 	c #EA0808",
+"+ c #8A8C00",
-"# 	c #A50505",
+"$ c #B8BA00",
-"$ 	c #E10808",
+"  c None",
-"% 	c #F70808",
+"O c #6E7000",
-"& 	c #E85959",
+"X c #DCDF00",
-"* 	c #F80909",
+". c #C00000",
-"= 	c #F90909",
+"# c #373800",
-"- 	c #CD0707",
+/* pixels */
-"; 	c #EE0808",
+"                                                ",
-"> 	c #F12B2B",
+"                                                ",
-", 	c #F5F4F4",
+"                                                ",
-"' 	c #DE5F5F",
+"                                                ",
-") 	c #AE0606",
+"                                                ",
-"! 	c #D2ACAC",
+"                                                ",
-"~ 	c #FEFEFE",
+"                                                ",
-"{ 	c #E5DFDF",
+"                      .                         ",
-"] 	c #F91717",
+"                     ...                        ",
-"^ 	c #E30808",
+"                     ...                        ",
-"/ 	c #DC4C4C",
+"                    .....                       ",
-"( 	c #FCFCFC",
+"                   ...X..                       ",
-"_ 	c #D68585",
+"                   ..XXX..                      ",
-": 	c #DB0707",
+"                  ...XXX...                     ",
-"< 	c #F80C0C",
+"                  ..XXXXX..                     ",
-"[ 	c #DECDCD",
+"                 ..XXXXXX...                    ",
-"} 	c #F6F5F5",
+"                ...XXoO+XX..                    ",
-"| 	c #ED2B2B",
+"                ..XXXO@#XXX..                   ",
-"1 	c #F50808",
+"               ..XXXXO@#XXX...                  ",
-"2 	c #D66D6D",
+"              ...XXXXO@#XXXX..                  ",
-"3 	c #FFFFFF",
+"              ..XXXXXO@#XXXX...                 ",
-"4 	c #D2A9A9",
+"             ...XXXXXo@OXXXXX..                 ",
-"5 	c #BB0606",
+"            ...XXXXXXo@OXXXXXX..                ",
-"6 	c #E70808",
+"            ..XXXXXXX$@OXXXXXX...               ",
-"7 	c #F11A1A",
+"           ...XXXXXXXX@XXXXXXXX..               ",
-"8 	c #EDE9E9",
+"          ...XXXXXXXXXXXXXXXXXX...              ",
-"9 	c #E84646",
+"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"0 	c #D59696",
+"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"a 	c #DDCCCC",
+"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"b 	c #F90E0E",
+"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"c 	c #CE0707",
+"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"d 	c #EA3030",
+"       ..............................           ",
-"e 	c #F8F8F8",
+"       ..............................           ",
-"f 	c #383838",
+"                                                ",
-"g 	c #000000",
+"                                                ",
-"h 	c #555555",
+"                                                ",
-"i 	c #DE6D6D",
+"                                                ",
-"j 	c #B20606",
+"                                                ",
-"k 	c #DAB9B9",
+"                                                ",
-"l 	c #A9A9A9",
+"                                                ",
-"m 	c #AAAAAA",
+"                                                ",
-"n 	c #EAE6E6",
+"                                                ",
-"o 	c #F81919",
+"                                                ",
-"p 	c #F30808",
+"                                                ",
-"q 	c #E05252",
+"                                                ",
-"r 	c #D58D8D",
+"                                                ",
-"s 	c #E00808",
+"                                                ",
-"t 	c #F81111",
+"                                                "
-"u 	c #E1D5D5",
+};
-"v 	c #C6C6C6",
-"w 	c #C7C7C7",
-"x 	c #F22F2F",
-"y 	c #CF7979",
-"z 	c #D4B4B4",
-"A 	c #F90A0A",
-"B 	c #C60707",
-"C 	c #EF0808",
-"D 	c #EF2222",
-"E 	c #EEEBEB",
-"F 	c #E14E4E",
-"G 	c #D69E9E",
-"H 	c #E0D2D2",
-"I 	c #F91111",
-"J 	c #D40707",
-"K 	c #E93A3A",
-"L 	c #545454",
-"M 	c #D97373",
-"N 	c #C80707",
-"O 	c #F80A0A",
-"P 	c #DAC3C3",
-"Q 	c #717171",
-"R 	c #727272",
-"S 	c #EFEDED",
-"T 	c #F91F1F",
-"U 	c #E45757",
-"V 	c #CE9999",
-"W 	c #E40808",
-"X 	c #F81313",
-"Y 	c #E3DADA",
-"Z 	c #F9F9F9",
-"` 	c #F13737",
-" .	c #F60808",
-"..	c #D37979",
-"+.	c #D8BDBD",
-"@.	c #F90B0B",
-"#.	c #C90707",
-"$.	c #F12424",
-"%.	c #F0EFEF",
-"&.	c #DB5656",
-"*.	c #D39F9F",
-"=.	c #1C1C1C",
-"-.	c #E7E0E0",
-";.	c #D50707",
-">.	c #F40808",
-",.	c #E93F3F",
-"'.	c #FBFBFB",
-").	c #D77575",
-"!.	c #F90C0C",
-"~.	c #D9C5C5",
-"{.	c #F1EEEE",
-"].	c #F42121",
-"^.	c #E60808",
-"/.	c #F90808",
-"(.	c #DC5F5F",
-"_.	c #E2E2E2",
-":.	c #D19D9D",
-"<.	c #F91616",
-"[.	c #E9E3E3",
-"}.	c #FAFAFA",
-"|.	c #E33D3D",
-"1.	c #D58383",
-"2.	c #8D8D8D",
-"3.	c #E3E3E3",
-"4.	c #D9C0C0",
-"5.	c #F70909",
-"6.	c #F02C2C",
-"7.	c #DA5D5D",
-"8.	c #BC0606",
-"9.	c #D0A9A9",
-"0.	c #E8DFDF",
-"a.	c #F51414",
-"b.	c #DF0808",
-"c.	c #E34646",
-"d.	c #FDFDFD",
-"e.	c #393939",
-"f.	c #D57E7E",
-"g.	c #F80B0B",
-"h.	c #DDCDCD",
-"i.	c #F4F3F3",
-"j.	c #F12626",
-"k.	c #ED0808",
-"l.	c #E35D5D",
-"m.	c #EBE9E9",
-"n.	c #ECEAEA",
-"o.	c #D99292",
-"p.	c #A10505",
-"q.	c #F80E0E",
-"r.	c #F80D0D",
-"s.	c #F90F0F",
-"t.	c #F20808",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                            . + @                                               ",
-"                                            + + + #                                             ",
-"                                          $ + + + %                                             ",
-"                                          + % & * = -                                           ",
-"                                        ; % > , ' = =                                           ",
-"                                      ) + + ! ~ { ] = ^                                         ",
-"                                      + + / ( ~ ~ _ * =                                         ",
-"                                    : + < [ ~ ~ ~ } | = 1                                       ",
-"                                    + % 2 ~ ~ ~ ~ 3 4 = = 5                                     ",
-"                                  6 + 7 8 ~ ~ ~ ~ 3 3 9 = =                                     ",
-"                                  + % 0 ~ ~ ~ ~ ~ 3 3 a b = c                                   ",
-"                                % % d e ~ f g g g h 3 3 i = =                                   ",
-"                              j + * k ~ l g g g g g m 3 n o = p                                 ",
-"                              + + q ~ ~ l g g g g g m 3 3 r = =                                 ",
-"                            s + t u ~ ~ v g g g g g w 3 3 e x = =                               ",
-"                            + + y ~ ~ ~ ~ g g g g g 3 3 3 3 z A = B                             ",
-"                          C + D E ~ ~ ~ ~ g g g g g 3 3 3 3 ~ F = %                             ",
-"                          + % G ~ ~ ~ ~ ~ f g g g h 3 3 3 3 3 H I = J                           ",
-"                        + % K ( ~ ~ ~ ~ ~ L g g g h 3 3 3 3 3 3 M = =                           ",
-"                      N + O P ~ ~ ~ ~ ~ ~ Q g g g R 3 3 3 3 3 3 S T = @                         ",
-"                      = % U ~ ~ ~ ~ ~ ~ ~ l g g g m 3 3 3 3 3 3 3 V * =                         ",
-"                    W = X Y ~ ~ ~ ~ ~ ~ ~ l g g g m 3 3 3 3 3 3 3 Z ` =  .                      ",
-"                    = = ..~ ~ ~ ~ ~ ~ ~ ~ ~ g g g 3 3 3 3 3 3 3 3 3 +.@.= #.                    ",
-"                   .= $.%.~ ~ ~ ~ ~ ~ ~ ~ ~ g g g 3 3 3 3 3 3 3 3 3 3 &.= =                     ",
-"                  = * *.~ ~ ~ ~ ~ ~ ~ ~ ~ ~ =.g f 3 3 3 3 3 3 3 3 3 3 -.I = ;.                  ",
-"                >.= ,.'.~ ~ ~ ~ ~ ~ ~ ~ ~ ~ L g L 3 3 3 3 3 3 3 3 3 3 3 ).= =                   ",
-"              N = !.~.3 ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ v l v 3 3 3 3 3 3 3 3 3 3 3 {.].= ^.                ",
-"              /.= (.3 3 ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ v l _.3 3 3 3 3 3 3 3 3 3 3 3 :.= =                 ",
-"            : + <.[.3 3 ~ ~ ~ ~ ~ ~ ~ ~ ~ L g g g m 3 3 3 3 3 3 3 3 3 3 3 }.|.= =               ",
-"            = + 1.3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ 2.g g g g g 3.3 3 3 3 3 3 3 3 3 3 3 4.A = -             ",
-"          p 5.6.} 3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ L g g g g g m 3 3 3 3 3 3 3 3 3 3 3 3 7.= =             ",
-"        8.+ * 9.3 3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ Q g g g g g w 3 3 3 3 3 3 3 3 3 3 3 3 0.a.= b.          ",
-"        % % c.d.3 3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ _.=.g g g e.3 3 3 3 3 3 3 3 3 3 3 3 3 3 f.= =           ",
-"      - * g.h.~ 3 3 3 3 ~ ~ ~ ~ ~ ~ ~ ~ ~ _.Q L Q 3.3 3 3 3 3 3 3 3 3 3 3 3 3 3 i.j.= k.        ",
-"      = = l.m.m.n.n.n.n.m.m.m.m.m.m.m.m.m.m.m.m.m.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.o.* = p.      ",
-"    ^.* + g.q.r.b s.b s.r.< r.< r.r.< r.< r.< r.r.b s.b s.s.b s.b s.s.b s.b s.s.b b A = =       ",
-"    t.= * + * + = = = = + + + + + + + + + + + + + = = = = = = = = = = = = = = = = = = = =       ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                "};

art/tick.xpm

@@ -1,32 +1,18 @@
 /* XPM */
 static char *tick_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"10 10 16 1",
+"10 10 2 1",
-"  c Gray0",
+". c Gray0",
-". c #bf0000",
+"  c None",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c None",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
 /* pixels */
-"##########",
+"          ",
-"######## #",
+"        ..",
-"#######   ",
+"       ...",
-"######    ",
+"      ... ",
-"#####    #",
+"..   ...  ",
-"  ##    ##",
+"... ...   ",
-"       ###",
+" .....    ",
-"#     ####",
+"  ...     ",
-"##   #####",
+"   .      ",
-"### ######"
+"          ",
 };

art/toparent.xpm

@@ -1,24 +1,21 @@
-/* XPM */
+/* XPM */
-static char * toparent_xpm[] = {
+static char * toparent_xpm[] = {
-"16 16 5 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c #000000",
+".	c Black",
-"+	c #C0E4CB",
+"X	c Gray100",
-"@	c #808080",
+"                ",
-"#	c #77C490",
+"      ..        ",
-"                ",
+"     .XX.       ",
-"                ",
+"    .XXXX.      ",
-"      .         ",
+"   .XXXXXX.     ",
-"     .+.@       ",
+"  .XXXXXXXX.    ",
-"    .+++.@      ",
+" ....XXXX....   ",
-"   .++##+.@     ",
+"    .XXXX.      ",
-"  .++####+.@    ",
+"    .XXXX.....  ",
-" ....+##....@   ",
+"    .XXXXXXXX.  ",
-"    .+##.@@@@@  ",
+"    .XXXXXXXX.  ",
-"    .+##......  ",
+"    .XXXXXXXX.  ",
-"    .+#######.@ ",
+"    .XXXXXXXX.  ",
-"    .+#######.@ ",
+"    ..........  ",
-"    .+#######.@ ",
+"                "};
-"    ..........@ ",
-"                ",
-"                "};

art/up.xpm

@@ -1,24 +1,21 @@
-/* XPM */
+/* XPM */
-static char * up_xpm[] = {
+static char * up_xpm[] = {
-"16 16 5 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c #000000",
+".	c Black",
-"+	c #C0E4CB",
+"X	c Gray100",
-"@	c #808080",
+"                ",
-"#	c #77C490",
+"       ..       ",
-"                ",
+"      .XX.      ",
-"       .        ",
+"     .XXXX.     ",
-"      .+.@      ",
+"    .XXXXXX.    ",
-"     .+++.@     ",
+"   .XXXXXXXX.   ",
-"    .++##+.@    ",
+"  ....XXXX....  ",
-"   .++####+.@   ",
+"     .XXXX.     ",
-"  ....+##....@  ",
+"     .XXXX.     ",
-"     .+##.@@@@@ ",
+"     .XXXX.     ",
-"     .+##.@     ",
+"     .XXXX.     ",
-"     .+##.@     ",
+"     .XXXX.     ",
-"     .+##.@     ",
+"     .XXXX.     ",
-"     .+##.@     ",
+"     ......     ",
-"     .+##.@     ",
+"                "};
-"     .....@     ",
-"                ",
-"                "};

config.guess

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2002-11-30'
+timestamp='2004-03-12'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -98,14 +98,18 @@ trap 'exit 1' 1 2 15
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# This shell variable is my proudest work .. or something. --bje
+# Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
+set_cc_for_build='
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-dummy=$tmpdir/dummy ;
+: ${TMPDIR=/tmp} ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
  ,,)    echo "int x;" > $dummy.c ;
 	for c in cc gcc c89 c99 ; do
@@ -113,15 +117,13 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $files ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;
+esac ;'
-unset files'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -195,12 +197,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -219,6 +227,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -234,71 +245,70 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	eval $set_cc_for_build
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	cat <<EOF >$dummy.s
+	exit 0 ;;
-	.data
+    Alpha*:OpenVMS:*:*)
-\$Lformat:
+	echo alpha-hp-vms
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
-	if test "$?" = 0 ; then
-		case `$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -321,6 +331,9 @@ EOF
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -338,6 +351,9 @@ EOF
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -410,6 +426,9 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -450,8 +469,7 @@ EOF
 EOF
 	$CC_FOR_BUILD -o $dummy $dummy.c \
 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+	  && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
@@ -535,8 +553,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		rm -f $dummy.c $dummy && rmdir $tmpdir
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -635,10 +652,20 @@ EOF
               }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		    rm -f $dummy.c $dummy && rmdir $tmpdir
 		fi ;;
 	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)
@@ -672,8 +699,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -731,21 +757,26 @@ EOF
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -767,8 +798,10 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -779,8 +812,8 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
+    x86:Interix*:[34]*)
-	echo i586-pc-interix3
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -801,17 +834,28 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -832,7 +876,6 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     mips64:Linux:*:*)
@@ -852,7 +895,6 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
@@ -889,6 +931,9 @@ EOF
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -946,9 +991,11 @@ EOF
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -977,6 +1024,9 @@ EOF
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1048,7 +1098,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1146,7 +1196,11 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
@@ -1159,7 +1213,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1200,6 +1254,12 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1320,8 +1380,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
 
 # Apollos put the system type in the environment.
 

config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2001-09-07'
+timestamp='2004-03-12'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-09-07'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -226,32 +228,46 @@ case $basic_machine in
 	1750a | 580 \
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
+	| d10v | d30v | dlx | dsp16xx \
-	| fr30 \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mips16 \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mips64 | mips64el \
-	| mipsisa32 \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| msp430 \
 	| ns16k | ns32k \
-	| openrisc \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sh64 | sh64le \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-	| stormy16 | strongarm \
+	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xscale \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -278,38 +294,56 @@ case $basic_machine in
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cray2-* | cydra-* \
+	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
+	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips16-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mips64-* | mips64el-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| mips64vr-* | mips64vrel-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| tahoe-* | thumb-* \
-	| v850-* | vax-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -329,6 +363,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -343,6 +380,12 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -374,6 +417,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -394,17 +441,13 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
+	cray | j90)
-		basic_machine=ymp-cray
+		basic_machine=j90-cray
 		os=-unicos
 		;;
-	cray2)
+	cr16c)
-		basic_machine=cray2-cray
+		basic_machine=cr16c-unknown
-		os=-unicos
+		os=-elf
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
-		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
@@ -412,12 +455,24 @@ case $basic_machine in
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -598,14 +653,6 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -620,6 +667,10 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -692,6 +743,10 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -699,6 +754,14 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -721,49 +784,55 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-	        ;;
+		;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-	        ;;
+		;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
+		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-	        ;;
+		;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -784,10 +853,26 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -795,7 +880,10 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -862,22 +950,42 @@ case $basic_machine in
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=t3e-cray
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -899,8 +1007,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
+		basic_machine=f301-fujitsu
-               ;;
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -921,17 +1029,13 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
+	xps | xps100)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -952,13 +1056,6 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -978,13 +1075,16 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -999,10 +1099,6 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1058,17 +1154,20 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1080,8 +1179,10 @@ case $os in
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1090,6 +1191,9 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1102,6 +1206,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1120,14 +1227,23 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1139,6 +1255,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1166,8 +1285,14 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
 		;;
 	-none)
 		;;
@@ -1200,10 +1325,14 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1230,6 +1359,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1293,19 +1425,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1374,10 +1506,16 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)

configure.in

@@ -26,29 +26,29 @@ dnl
 dnl WX_RELEASE_NUMBER += 1
 dnl
 dnl ..and update WX_CURRENT, WX_RELEASE and WX_AGE according to the
-dnl following rules:
+dnl following (libtool derived) rules:
 dnl
-dnl    If any changes have been made to the public interface, that is if any
+dnl    If any changes have been made to the public interface -- ie. if any
-dnl    exported class, method, global or global type has been added, removed
+dnl    exported class, method, global or global type has been added (to),
-dnl    or changed in any way, then do:  WX_CURRENT += 1
+dnl    removed (from) 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    If WX_CURRENT was incremented (as above) do:  WX_REVISION = 0
-dnl    interface then do:  WX_REVISION += 1
+dnl    Otherwise (if source changes have been made that do not _alter_ the
-dnl    If WX_CURRENT was incremented (as above) instead do:  WX_REVISION = 0
+dnl    existing public interfaces) do:  WX_REVISION += 1
 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 variables should be reset to 0 once again.
 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=4
-WX_RELEASE_NUMBER=0
+WX_RELEASE_NUMBER=3
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -56,7 +56,7 @@ WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
 
 WX_CURRENT=0
-WX_REVISION=0
+WX_REVISION=2
 WX_AGE=0
 
 
@@ -64,32 +64,44 @@ dnl ------------------------------------------------------------------------
 dnl Check platform (host system)
 dnl ------------------------------------------------------------------------
 
-dnl assume Unix
+dnl OS (assume Unix)
 USE_UNIX=1
+USE_OS2=0
 USE_WIN32=0
 USE_DOS=0
 USE_BEOS=0
 USE_MAC=0
 
-USE_LINUX=
+dnl Unix kind
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=
 USE_AIX=
-USE_SUN=
+dnl any BSD
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=
 USE_BSD=
+dnl a.k.a. Mac OS X
 USE_DARWIN=
 USE_FREEBSD=
-USE_OPENBSD=
+dnl GNU/Hurd
+USE_GNU=
+USE_HPUX=
+USE_LINUX=
 USE_NETBSD=
+USE_OPENBSD=
+dnl OSF/1 (obsolete?)
+USE_OSF=
+USE_SGI=
+dnl Solaris ("SunOS" >= 5)
+USE_SOLARIS=
+dnl SunOS or Solaris
+USE_SUN=
+dnl old/real SunOS (obsolete)
+USE_SUNOS=
+dnl SysV R4
+USE_SVR4=
+dnl any System V
+USE_SYSV=
 USE_VMS=
 USE_ULTRIX=
 USE_DATA_GENERAL=
+USE_ALPHA=
 
 dnl on some platforms xxx_r() functions are declared inside "#ifdef
 dnl _REENTRANT" and it's easier to just define this symbol for these platforms
@@ -151,6 +163,15 @@ case "${host}" in
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
+  *-*-gnu* | *-*-k*bsd*-gnu )
+    USE_GNU=1
+    TMP=`uname -m`
+    if test "x$TMP" = "xalpha"; then
+      USE_ALPHA=1
+      AC_DEFINE(__ALPHA__)
+    fi
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
   *-*-irix5* | *-*-irix6* )
     USE_SGI=1
     USE_SVR4=1
@@ -228,7 +249,7 @@ case "${host}" in
     dnl
     dnl     Both archive libraries and shared libraries on AIX have an .a
     dnl     extension. This will explain why you can't link with an .so and
-    dnl     why it works with the name changed to .a. 
+    dnl     why it works with the name changed to .a.
     SO_SUFFIX=a
     AC_DEFINE(__AIX__)
     AC_DEFINE(__SYSV__)
@@ -257,9 +278,14 @@ case "${host}" in
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
+    USE_OS2=1
+    dnl Now both USE_OS2 and USE_UNIX should be set to 1 !!
     AC_DEFINE(__EMX__)
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
+    dnl "c++" wrapper is not always available, so always use plain gcc.
+    CXX=gcc
+    LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals"
   ;;
 
   powerpc-*-darwin* )
@@ -474,6 +500,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_IFF=no
   DEFAULT_wxUSE_XPM=no
   DEFAULT_wxUSE_ICO_CUR=no
+  DEFAULT_wxUSE_IMAGE_LOADING_IN_MSW=no
+  DEFAULT_wxUSE_RESOURCE_LOADING_IN_MSW=no
 else
   DEFAULT_wxUSE_UNIVERSAL=no
 
@@ -649,6 +677,8 @@ else
   DEFAULT_wxUSE_PNM=yes
   DEFAULT_wxUSE_XPM=yes
   DEFAULT_wxUSE_ICO_CUR=yes
+  DEFAULT_wxUSE_IMAGE_LOADING_IN_MSW=yes
+  DEFAULT_wxUSE_RESOURCE_LOADING_IN_MSW=yes
 fi
 
 dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -745,7 +775,7 @@ WX_ARG_ENABLE(compat22,      [  --disable-compat22      disable wxWindows 2.2 co
 
 AC_ARG_ENABLE(rpath,         [  --enable-rpath=DIR      output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])
 
-if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then
+if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable" -a "$wxRPATH_DIR" != "no"; then
    WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
 fi
 
@@ -1035,6 +1065,8 @@ WX_ARG_ENABLE(iff,         [  --enable-iff            use iff images (IFF file f
 WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
 WX_ARG_ENABLE(xpm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
 WX_ARG_ENABLE(ico_cur,     [  --enable-icocur         use Windows ICO and CUR formats], wxUSE_ICO_CUR)
+WX_ARG_ENABLE(dynamic_dib, [  --disable-dynamic_dib   don't use dynamic DIB loading/saving code under MSW], wxUSE_IMAGE_LOADING_IN_MSW, disable)
+WX_ARG_ENABLE(dynamic_ico_cur, [  --disable-dynamic_ico_cur   don't use dynamic icon/cursor loading/saving code under MSW], wxUSE_RESOURCE_LOADING_IN_MSW, disable)
 
 fi
 
@@ -1121,7 +1153,7 @@ if test "$wxUSE_GUI" = "yes"; then
           echo "$var=$value" >> ${wx_arg_cache_file}
         fi
         if test "$value" = 1; then
-          toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]`
+          toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`
           AC_MSG_RESULT($toolkit_echo)
         fi
       fi
@@ -1241,10 +1273,13 @@ dnl install checks
 dnl   defines INSTALL with the appropriate command
 AC_PROG_INSTALL
 
-dnl   make install path absolute (if not already); will fail with MSDOS paths
+dnl   make install path absolute (if not already);
+dnl   will fail with (some) MSDOS paths
 case ${INSTALL} in
   /* ) # Absolute
      ;;
+  ?:* ) # Drive letter, considered as absolute.
+     ;;
   *)
      INSTALL=`pwd`/${INSTALL} ;;
 esac
@@ -1280,11 +1315,14 @@ AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
 
 if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
     IF_GNU_MAKE=""
+    IF_NOT_GNU_MAKE="#"
 else
     IF_GNU_MAKE="#"
+    IF_NOT_GNU_MAKE=""
 fi
 
 AC_SUBST(IF_GNU_MAKE)
+AC_SUBST(IF_NOT_GNU_MAKE)
 
 dnl we don't need to check for VPATH support in GNU make - it does have it
 if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
@@ -1342,12 +1380,12 @@ AC_PROG_LN_S
 dnl ---------------------------------------------------------------------------
 dnl When we are using gcc on OS/2, we want to be either using resources (PM)
 dnl or a more complete POSIX emulation for Motif/GTK+/X11
+dnl Moreover we need to link explicitly against either stdcpp.a or stdcxx.a
+dnl (depending on compiler version), since we are using "gcc", not "g++/c++".
 dnl ---------------------------------------------------------------------------
 dnl (OS/2-only piece)
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
-      dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
-      LIBS="$LIBS -lstdcpp"
       if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
           dnl More complete Unix emulation for unix-like ports
           dnl by linking in POSIX/2's cExt (if available).
@@ -1355,6 +1393,27 @@ case "${host}" in
       else
           dnl Include resources for the "native" port (wxPM).
           RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
+	  CLEANRESPROGRAMOBJ=""
+      fi
+      AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[
+          AC_TRY_COMPILE([],
+              [
+                  #if (__GNUC__ < 3)
+                      #error old gcc
+                  #endif
+              ],
+              [
+                  wx_cv_gcc3=yes
+              ],
+              [
+                  wx_cv_gcc3=no
+              ]
+          )
+      ])
+      if test "$wx_cv_gcc3" = "no"; then
+          LIBS="$LIBS -lstdcpp"
+      else
+          LIBS="$LIBS -lstdcxx"
       fi
   ;;
 esac
@@ -1397,10 +1456,25 @@ fi
 dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
 AC_CHECK_HEADERS(langinfo.h)
 
+case "${host}" in
+  *-pc-os2_emx | *-pc-os2-emx )
+      dnl Explicitly link -lintl if langinfo.h is available.
+      if test $ac_cv_header_langinfo_h = "yes"; then
+          LIBS="$LIBS -lintl"
+      fi
+  ;;
+esac
+
 if test "$wxUSE_GUI" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
         dnl defines HAVE_X11_XKBLIB_H
-        AC_CHECK_HEADERS(X11/XKBlib.h)
+        AC_CHECK_HEADERS(X11/Xlib.h)
+        AC_CHECK_HEADERS([X11/XKBlib.h], [], [], 
+                         [
+                          #if HAVE_X11_XLIB_H
+                            #include <X11/Xlib.h>
+                          #endif
+                         ])
     fi
 fi
 
@@ -1421,6 +1495,7 @@ AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(void *, 4)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(size_t, 4)
 
 case "${host}" in
     arm-*-linux* )
@@ -1601,7 +1676,7 @@ dnl check for glibc version
 dnl
 dnl VZ: I have no idea why had this check been there originally, but now
 dnl     we could probably do without it by just always adding _GNU_SOURCE
-if test "$USE_LINUX" = 1; then
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
     AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
         AC_TRY_COMPILE([#include <features.h>],
             [
@@ -1667,7 +1742,7 @@ if test "$wxUSE_REGEX" != "no"; then
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
         dnl according to Unix 98 specs, regcomp() is in libc but I believe that
         dnl on some old systems it may be in libregex - check for it too?
-        AC_CHECK_HEADER(regex.h, AC_CHECK_FUNCS(regcomp))
+        AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp)])
 
         if test "x$ac_cv_func_regcomp" != "xyes"; then
             if test "$wxUSE_REGEX" = "sys" ; then
@@ -1712,14 +1787,12 @@ if test "$wxUSE_ZLIB" != "no" ; then
             dnl has anything more ancient (1.1.3 was released in July 1998)
             dnl anyhow
             AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
-                AC_TRY_RUN(
+                [AC_TRY_RUN(
+                    dnl zlib.h defines ZLIB_VERSION="x.y.z"
                     [
-                        dnl zlib.h defines ZLIB_VERSION="x.y.z"
                         #include <zlib.h>
                         #include <stdio.h>
 
-                        dnl don't use the brackets as quotes, we need them
-                        changequote(,)
                         int main()
                         {
                             FILE *f=fopen("conftestval", "w");
@@ -1731,14 +1804,16 @@ if test "$wxUSE_ZLIB" != "no" ; then
                                      ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
                             exit(0);
                         }
-                        changequote([,])
                     ],
                     ac_cv_header_zlib_h=`cat conftestval`,
                     ac_cv_header_zlib_h=no,
-                    dnl cross-compiling: test if we have any zlib.h
+                    dnl cross-compiling: don't have an answer, try later
-                    AC_CHECK_HEADER(zlib.h)
+                    unset ac_cv_header_zlib_h
-                )
+                )]
             )
+            dnl If the test above did not come up with a value (e.g. cross
+            dnl compiling) then this should give a definitive answer
+            AC_CHECK_HEADER(zlib.h)
 
             system_zlib_h_ok=$ac_cv_header_zlib_h
         fi
@@ -1793,9 +1868,9 @@ if test "$wxUSE_LIBPNG" != "no" ; then
             dnl libpng version 0.9 is known to not work, if an even newer
             dnl version is required, just bump it up in the test below
             AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
-                AC_TRY_RUN(
+                [AC_TRY_RUN(
+                    dnl png.h defines PNG_LIBPNG_VER=number
                     [
-                        dnl png.h defines PNG_LIBPNG_VER=number
                         #include <png.h>
                         #include <stdio.h>
 
@@ -1810,10 +1885,11 @@ if test "$wxUSE_LIBPNG" != "no" ; then
                     ],
                     ac_cv_header_png_h=`cat conftestval`,
                     ac_cv_header_png_h=no,
-                    dnl cross-compiling: test if we have any png.h
+                    dnl cross-compiling: test (later) if we have any png.h
-                    AC_CHECK_HEADER(png.h)
+                    unset ac_cv_header_png_h
-                )
+                )]
             )
+            AC_CHECK_HEADER(png.h)
 
             if test "$ac_cv_header_png_h" = "yes"; then
                 AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng", , [-lz -lm])
@@ -1919,11 +1995,13 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
             TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
         fi
         AC_CHECK_HEADER(tiffio.h,
-                        AC_CHECK_LIB(tiff, TIFFError,
+            [
-                                     TIFF_LINK=" -ltiff",
+                AC_CHECK_LIB(tiff, TIFFError,
-                                     ,
+                             TIFF_LINK=" -ltiff",
-                                     $TIFF_PREREQ_LINKS)
+                             ,
-                       )
+                             $TIFF_PREREQ_LINKS)
+            ]
+        )
 
         if test "x$TIFF_LINK" = "x" ; then
             if test "$wxUSE_LIBTIFF" = "sys" ; then
@@ -1947,7 +2025,6 @@ dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------
 
-AFMINSTALL=
 WIN32INSTALL=
 
 TOOLKIT=
@@ -2004,6 +2081,7 @@ if test "$USE_WIN32" = 1 ; then
 
     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
+    CLEANRESPROGRAMOBJ=${RESPROGRAMOBJ}
 
     dnl install Win32-specific files in "make install"
     WIN32INSTALL=win32install
@@ -2137,7 +2215,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
         GUI_TK_LIBRARY="$wx_cv_libs_gtk"
 
-        AFMINSTALL=afminstall
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
 
@@ -2154,42 +2231,57 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             AC_MSG_RESULT($MGL_ROOT)
         fi
 
+        AC_MSG_CHECKING(for libmgl location)
         dnl Find MGL library that we want
         dnl FIXME_MGL - test for MGL variants for freebsd etc.
         case "${host}" in
             *-*-linux* )
-              mgl_os="linux/gcc/glibc*"
+              if test "x$wxUSE_SHARED" = xyes ; then
+                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
+              else
+                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
+              fi
               ;;
             *-pc-msdosdjgpp )
-              mgl_os=dos32/dj2
+              mgl_os_candidates="dos32/dj2"
               ;;
             *)
               AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
         esac
 
         mgl_lib_type=""
+        mgl_os=""
 
-        if test "$wxUSE_DEBUG_FLAG" = yes ; then
+        for mgl_os_i in $mgl_os_candidates ; do
-            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
+            if test "x$mgl_os" = x ; then
-                    -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
+                if test "$wxUSE_DEBUG_FLAG" = yes ; then
-                mgl_lib_type=debug
+                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
-            fi
+                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
-        fi
+                        mgl_lib_type=debug
-        if test "x$mgl_lib_type" = x ; then
+                        mgl_os=$mgl_os_i
-            if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
+                    fi
-                    -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then
+                fi
-                mgl_lib_type=release
+                if test "x$mgl_lib_type" = x ; then
-            else
+                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
-                AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
+                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
+                        mgl_lib_type=release
+                        mgl_os=$mgl_os_i
+                    fi
+                fi
             fi
+        done
+
+        if test "x$mgl_os" = x ; then
+            AC_MSG_RESULT(not found)
+            AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
         fi
+        AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
 
         wxUSE_UNIVERSAL="yes"
 
         TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
         GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
 
-        AFMINSTALL=afminstall
         TOOLKIT=MGL
         GUIDIST=MGL_DIST
     fi
@@ -2214,7 +2306,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
 
         wxUSE_UNIVERSAL="yes"
 
-        AFMINSTALL=afminstall
         TOOLKIT=MICROWIN
         GUIDIST=MICROWIN_DIST
 
@@ -2232,7 +2323,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
 
         GUI_TK_LIBRARY="$X_LIBS"
         TOOLKIT_INCLUDE="$X_CFLAGS"
-        AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         if test "$wxUSE_NANOX" = "yes"; then
@@ -2312,7 +2402,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
 
         if test "$wxUSE_NANOX" = "yes"; then
             TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
-            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
         else
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
@@ -2374,7 +2464,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         dnl X_LIBS and X_CFLAGS respectively -- what for??
         GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
         TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
-        AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         AC_MSG_CHECKING(for Motif/Lesstif headers)
@@ -2483,7 +2572,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         libs_found=0
         for libp in "" " -lXp"; do
             if test "$libs_found" = "0"; then
-                for libsm_ice in " -lSM -lICE"; do
+                for libsm_ice in "" " -lSM -lICE"; do
                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
@@ -2543,8 +2632,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         AC_MSG_WARN([OS/2 PM requires old resource format, re-enabled])
         wxUSE_PROLOGIO="yes"
         wxUSE_RESOURCES="yes"
-        AC_MSG_WARN([OS/2 threads are not yet supported... disabled])
-        wxUSE_THREADS="no"
     fi
 
     dnl the name of the directory where the files for this toolkit live
@@ -2769,7 +2856,7 @@ case "${host}" in
     *-*-darwin* )
         dnl Under Mac OS X, the naming conventions for shared libraries
         dnl are different: the number precedes the suffix.
-        
+
         WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
         WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
 
@@ -2781,9 +2868,10 @@ case "${host}" in
         dnl Under Mac OS X, we should build real frameworks instead of simple
         dnl dynamic shared libraries (in order to embed the resources)
         if test "$wxUSE_MAC" = 1; then
-            dnl the name of the resources file for wxMac
+            dnl base name of the resource file for wxMac must be the same
-            WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
+            dnl as library installation base name (-install_name)
-            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
+            WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
+            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
         fi
         ;;
 esac
@@ -2862,7 +2950,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         fi
       ;;
 
-      *-*-linux* )
+      *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu )
         if test "$GCC" != "yes"; then
             AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc,
             [
@@ -2881,9 +2969,14 @@ if test "$wxUSE_SHARED" = "yes"; then
             fi
         fi
 
+        dnl Building ELF shared libraries without an soname by default and
+        dnl including /usr/lib explicitly in the linker path causes all sorts
+        dnl of grief.  We try to undo at least some of the wrongness that has
+        dnl propagated from that here when sonames are enabled by reinserting
+        dnl the arguments to declare the dependency on symbols in the main lib.
         if test "$wxUSE_SONAME" = "yes" ; then
             SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
-            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
+            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL} -L\$(build_libdir) $WXCONFIG_LIBS"
             dnl substitute this in makelib.env for the contrib libs
             WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
         fi
@@ -2914,6 +3007,9 @@ if test "$wxUSE_SHARED" = "yes"; then
         dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
         SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
         PIC_FLAG="-dynamic -fPIC"
+        dnl library installation base name and wxMac resources file base name
+        dnl must be identical in order for the resource file to be found at
+        dnl run time in src/mac/app.cpp
         SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
         SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
       ;;
@@ -2926,7 +3022,7 @@ if test "$wxUSE_SHARED" = "yes"; then
             AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
                           makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
 
-            SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+            SHARED_LD="$AIX_CXX_LD -p 0 -o"
         fi
       ;;
 
@@ -3031,6 +3127,8 @@ if test "$wxUSE_MAC" = 1; then
 else
     if test "$wxUSE_PM" = 1; then
         LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
+    else
+        LIBWXMACRESCOMP="#"
     fi
 fi
 
@@ -3050,11 +3148,12 @@ dnl   defines uid_t and gid_t if not already defined
 AC_TYPE_UID_T
 
 dnl check what exactly size_t is on this machine - this is necessary to avoid
-dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h
+dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 AC_CACHE_CHECK([if size_t is unsigned int],
     wx_cv_size_t_is_uint,
+    [
     dnl an obvious check like AC_TRY_COMPILE[struct Foo { ... };] doesn't work
     dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate
     dnl methods in a local class (i.e. class inside a function) declaration
@@ -3072,6 +3171,7 @@ AC_CACHE_CHECK([if size_t is unsigned int],
         wx_cv_size_t_is_uint=no,
         wx_cv_size_t_is_uint=yes
     )
+    ]
 )
 
 if test "$wx_cv_size_t_is_uint" = "yes"; then
@@ -3266,20 +3366,17 @@ AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
 )
 
 if test "$wx_cv_func_statfs" = "yes"; then
+    wx_cv_type_statvfs_t="struct statfs"
     AC_DEFINE(HAVE_STATFS)
 else
     AC_CACHE_CHECK(for statvfs, wx_cv_func_statvfs,
         AC_TRY_COMPILE(
             [
-                 #include <sys/statvfs.h>
+                #include <stddef.h>
+                #include <sys/statvfs.h>
             ],
             [
-                 long l;
+                statvfs("/", NULL);
-                 struct statvfs fs;
-                 statvfs("/", &fs);
-                 l = fs.f_bsize;
-                 l += fs.f_blocks;
-                 l += fs.f_bavail;
             ],
             [
                  wx_cv_func_statvfs=yes
@@ -3291,12 +3388,73 @@ else
     )
 
     if test "$wx_cv_func_statvfs" = "yes"; then
-        AC_DEFINE(HAVE_STATVFS)
+        dnl we also have to check whether we should use statvfs_t (works under
+        dnl Solaris 8, doesn't work under Solaris 7) or "struct statvfs" (vice
+        dnl versa) as the argument for statvfs in 64 bit off_t mode (in 32 bit
+        dnl mode both work fine)
+        dnl
+        dnl for this check C++ compiler has to be used as passing incompatible
+        dnl pointers is just a warning and not an error in C
+        AC_LANG_SAVE
+        AC_LANG_CPLUSPLUS
+
+        AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t,
+            AC_TRY_COMPILE(
+                [
+                    #include <sys/statvfs.h>
+                ],
+                [
+                    long l;
+                    statvfs_t fs;
+                    statvfs("/", &fs);
+                    l = fs.f_bsize;
+                    l += fs.f_blocks;
+                    l += fs.f_bavail;
+                ],
+                [
+                    wx_cv_type_statvfs_t=statvfs_t
+                ],
+                [
+                    AC_TRY_COMPILE(
+                        [
+                            #include <sys/statvfs.h>
+                        ],
+                        [
+                            long l;
+                            struct statvfs fs;
+                            statvfs("/", &fs);
+                            l = fs.f_bsize;
+                            l += fs.f_blocks;
+                            l += fs.f_bavail;
+                        ],
+                        [
+                            wx_cv_type_statvfs_t="struct statvfs"
+                        ],
+                        [
+                            wx_cv_type_statvfs_t="unknown"
+                        ]
+                    )
+                ]
+            )
+        )
+
+        AC_LANG_RESTORE
+
+        if test "$wx_cv_type_statvfs_t" != "unknown"; then
+            AC_DEFINE(HAVE_STATVFS)
+        fi
     else
-        AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
+        dnl set it for the test below
+        wx_cv_type_statvfs_t="unknown"
     fi
 fi
 
+if test "$wx_cv_type_statvfs_t" != "unknown"; then
+    AC_DEFINE_UNQUOTED(WX_STATFS_T, $wx_cv_type_statvfs_t)
+else
+    AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
+fi
+
 dnl check for fcntl() or at least flock() needed by Unix implementation of
 dnl wxSingleInstanceChecker
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
@@ -3371,12 +3529,16 @@ AC_CHECK_FUNCS(inet_addr,
     [
         AC_CHECK_LIB(nsl, inet_addr,
             INET_LINK="nsl",
-            AC_CHECK_LIB(resolv, inet_addr,
+            [
-                INET_LINK="resolv",
+                AC_CHECK_LIB(resolv, inet_addr,
-                AC_CHECK_LIB(socket, inet_addr,
+                    INET_LINK="resolv",
-                    INET_LINK="socket"
+                    [
+                        AC_CHECK_LIB(socket, inet_addr,
+                            INET_LINK="socket"
+                        )
+                    ]
                 )
-            )
+            ]
         )
     ]
 )
@@ -3409,7 +3571,7 @@ dnl ---------------------------------------------------------------------------
 
 dnl under MSW (except mingw32) we always have thread support
 CPP_MT_FLAG=
-if test "$TOOLKIT" != "MSW"; then
+if test "$TOOLKIT" != "MSW" -a "$TOOLKIT" != "PM"; then
 
     dnl the code below:
     dnl
@@ -3588,17 +3750,17 @@ if test "$TOOLKIT" != "MSW"; then
       dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
       HAVE_PRIOR_FUNCS=0
       AC_CHECK_FUNC(pthread_attr_getschedpolicy,
-                     AC_CHECK_FUNC(pthread_attr_setschedparam,
+                     [AC_CHECK_FUNC(pthread_attr_setschedparam,
-                       AC_CHECK_FUNC(sched_get_priority_max,
+                       [AC_CHECK_FUNC(sched_get_priority_max,
                            HAVE_PRIOR_FUNCS=1,
-                           AC_CHECK_LIB([posix4], sched_get_priority_max,
+                           [AC_CHECK_LIB([posix4], sched_get_priority_max,
                              [
                                 HAVE_PRIOR_FUNCS=1
                                 POSIX4_LINK=" -lposix4"
                              ],
-                           )
+                           )]
-                       )
+                       )]
-                     )
+                     )]
                    )
 
       if test "$HAVE_PRIOR_FUNCS" = 1; then
@@ -3705,6 +3867,11 @@ else
                 CFLAGS="$CFLAGS_OLD"
             fi
         ;;
+        *-pc-os2*emx )
+	    CFLAGS="$CFLAGS -Zmt -D__ST_MT_ERRNO__"	
+	    CXXFLAGS="$CXXFLAGS -Zmt -D__ST_MT_ERRNO__"	
+	    LDFLAGS="$LDFLAGS -Zmt"	
+        ;;
       esac
     fi
 fi
@@ -4168,15 +4335,17 @@ if test "$wxUSE_SOCKETS" = "yes"; then
     if test "$TOOLKIT" != "MSW"; then
         dnl under Solaris and OS/2, socket functions live in -lsocket
         AC_CHECK_FUNC(socket,,
-            AC_CHECK_LIB(socket, socket,
+            [
-                if test "$INET_LINK" != " -lsocket"; then
+                AC_CHECK_LIB(socket, socket,
-                    INET_LINK="$INET_LINK -lsocket"
+                    if test "$INET_LINK" != " -lsocket"; then
-                fi,
+                        INET_LINK="$INET_LINK -lsocket"
-                [
+                    fi,
-                    AC_MSG_WARN([socket library not found - sockets will be disabled])
+                    [
-                    wxUSE_SOCKETS=no
+                        AC_MSG_WARN([socket library not found - sockets will be disabled])
-                ]
+                        wxUSE_SOCKETS=no
-            )
+                    ]
+                )
+            ]
         )
     fi
 fi
@@ -4286,8 +4455,9 @@ dnl ------------------------------------------------------------------------
 dnl DLL support
 dnl ------------------------------------------------------------------------
 
-dnl under MSW we always have LoadLibrary/GetProcAddress
+dnl under MSW we always have LoadLibrary/GetProcAddress and
-if test "$TOOLKIT" != "MSW"; then
+dnl under OS/2 we always have DosLoadModule/DosQueryProcAddr
+if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
 
     HAVE_DL_FUNCS=0
     HAVE_SHL_FUNCS=0
@@ -4330,8 +4500,11 @@ if test "$TOOLKIT" != "MSW"; then
         dnl check also for dlerror()
         if test "$HAVE_DL_FUNCS" = 1; then
             AC_CHECK_FUNCS(dlerror,
-                           AC_DEFINE(HAVE_DLERROR),
+                AC_DEFINE(HAVE_DLERROR),
-                           AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)))
+                [
+                    AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
+                ]
+            )
         fi
         fi
 
@@ -4835,6 +5008,11 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
         AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
         wxUSE_TOGGLEBTN=no
+    else
+        if test "$wxUSE_PM" = 1; then
+            AC_MSG_WARN([Toggle button not yet supported under PM... disabled])
+            wxUSE_TOGGLEBTN=no
+        fi
     fi
     if test "$wxUSE_UNIVERSAL" = "yes"; then
         AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
@@ -5039,6 +5217,14 @@ if test "$wxUSE_ICO_CUR" = "yes" ; then
   AC_DEFINE(wxUSE_ICO_CUR)
 fi
 
+if test "$wxUSE_IMAGE_LOADING_IN_MSW" = "yes"; then
+  AC_DEFINE(wxUSE_IMAGE_LOADING_IN_MSW)
+fi
+
+if test "$wxUSE_RESOURCE_LOADING_IN_MSW" = "yes"; then
+  AC_DEFINE(wxUSE_RESOURCE_LOADING_IN_MSW)
+fi
+
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
   dnl Must be done this late because -lunicows must be before all the other libs
   LIBS=" -lunicows $LIBS"
@@ -5211,7 +5397,7 @@ if test "$wxUSE_GUI" = "yes"; then
     dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                      drawing dynamic erase event exec font image \
-                     minimal propsize rotate widgets"
+                     minimal propsize rotate shaped widgets"
 
     dnl this is needed to be able to find AFM files
     CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
@@ -5319,7 +5505,6 @@ AC_SUBST(WXDEBUG_DEFINE)
 
 dnl toolkit options
 AC_SUBST(USE_GUI)
-AC_SUBST(AFMINSTALL)
 AC_SUBST(WIN32INSTALL)
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DIR)
@@ -5366,6 +5551,7 @@ dnl additional resurces settings
 AC_SUBST(RESCOMP)
 AC_SUBST(RESFLAGS)
 AC_SUBST(RESPROGRAMOBJ)
+AC_SUBST(CLEANRESPROGRAMOBJ)
 AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
 AC_SUBST(WX_RESOURCES_MACOSX_DATA)
 
@@ -5403,6 +5589,7 @@ dnl idea could have been to use the cache but this wouldn't work when
 dnl configure doesn't use cache at all which is the default with autoconf 2.50)
 wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
 wx_cv_if_gnu_make=$IF_GNU_MAKE
+wx_cv_if_not_gnu_make=$IF_NOT_GNU_MAKE
 wx_cv_path_ifs=$PATH_IFS
 wx_cv_program_ext=$PROGRAM_EXT
 wx_cv_target_library=$WX_TARGET_LIBRARY
@@ -5413,7 +5600,7 @@ wx_cv_release=${WX_RELEASE}
 wx_cv_current=${WX_CURRENT}
 wx_cv_revision=${WX_REVISION}
 wx_cv_age=${WX_AGE}
-export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
+export wx_cv_path_samplesubdirs wx_cv_if_gnu_make wx_cv_if_not_gnu_make \
        wx_cv_path_ifs wx_cv_program_ext \
        wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
        wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age

contrib/configure.in

@@ -59,7 +59,9 @@ AC_OUTPUT([
             src/applet/Makefile
             src/fl/Makefile
             src/net/Makefile
+            src/animate/Makefile
             samples/Makefile
+            samples/animate/Makefile
             samples/mmedia/Makefile
             samples/ogl/Makefile
             samples/ogl/ogledit/Makefile

contrib/docs/latex/fl/tex2rtf.ini

@@ -29,9 +29,6 @@ htmlFaceName = "Arial, Lucida, Helvetica"
 htmlWorkshopFiles = true
 htmlIndex = true
 
-;\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
-;\htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
-;\sethotspotcolour{on}\sethotspotunderline{on}}
 \overview [2] {\helpref{#1}{#2}}
 \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
 %\wxheading [1]{{\bf \fcol{blue}{#1}}}

contrib/docs/latex/gizmos/tex2rtf.ini

@@ -29,9 +29,6 @@ htmlFaceName = "Arial, Lucida, Helvetica"
 htmlWorkshopFiles = true
 htmlIndex = true
 
-;\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
-;\htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
-;\sethotspotcolour{on}\sethotspotunderline{on}}
 \overview [2] {\helpref{#1}{#2}}
 \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
 %\wxheading [1]{{\bf \fcol{blue}{#1}}}

contrib/docs/latex/mmedia/tex2rtf.ini

@@ -16,7 +16,7 @@ winHelpContents = yes
 winHelpTitle = "MMedia Manual"
 truncateFilenames = no
 combineSubSections = yes
-\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
+\overview [2] {\helpref{#1}{#2}}
 \htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
 \sethotspotcolour{on}\sethotspotunderline{on}}
 \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}

contrib/docs/latex/ogl/tex2rtf.ini

@@ -16,7 +16,7 @@ winHelpContents = yes
 winHelpTitle = "OGL Manual"
 truncateFilenames = yes
 combineSubSections = yes
-\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
+\overview [2] {\helpref{#1}{#2}}
 \htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
 \sethotspotcolour{on}\sethotspotunderline{on}}
 \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}

contrib/docs/latex/svg/tex2rtf.ini

@@ -16,7 +16,7 @@ winHelpContents = yes
 winHelpTitle = "SVG Manual"
 truncateFilenames = yes
 combineSubSections = yes
-\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
+\overview [2] {\helpref{#1}{#2}}
 \htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
 \sethotspotcolour{on}\sethotspotunderline{on}}
 \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}

contrib/include/wx/animate/animate.h

@@ -21,6 +21,7 @@
 #include <wx/gdicmn.h>
 #include <wx/list.h>
 #include <wx/timer.h>
+#include <wx/control.h>
 
 //#define ANIMDLLEXPORT WXDLLEXPORT
 #define ANIMDLLEXPORT
@@ -138,7 +139,7 @@ public:
 //// Implementation
 
     // Play the frame
-    virtual bool PlayFrame(int frame, wxWindow& window, wxPoint& pos);
+    virtual bool PlayFrame(int frame, wxWindow& window, const wxPoint& pos);
     virtual bool PlayFrame();
     virtual void DrawFrame(int frame, wxDC& dc, const wxPoint& pos);
     virtual void DrawBackground(wxDC& dc, const wxPoint& pos, const wxColour& colour);

contrib/include/wx/fl/controlbar.h

@@ -239,7 +239,7 @@ public:
                          int alignment    = FL_ALIGN_TOP,
                          int rowNo        = 0,
                          int columnPos    = 0,
-                         const wxString& name="bar",
+                         const wxString& name = wxT("bar"),
                          bool spyEvents    = FALSE,
                          int state        = wxCBAR_DOCKED_HORIZONTALLY
                        );

contrib/include/wx/fl/dyntbar.h

@@ -148,12 +148,12 @@ public:
     virtual void AddTool( int toolIndex,
                               const wxString& imageFileName,
                               wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
-                              const wxString& labelText = "", bool alignTextRight = FALSE,
+                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
                               bool isFlat = TRUE );
         // Adds a tool. See the documentation for wxToolBar for details.
 
     virtual void AddTool( int toolIndex, wxBitmap labelBmp,
-                              const wxString& labelText = "", bool alignTextRight = FALSE,
+                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
                               bool isFlat = TRUE );
 
     // Method from wxToolBarBase (for compatibility), only
@@ -162,7 +162,7 @@ public:
 
     virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
                const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
-               const wxString& helpString1 = "", const wxString& helpString2 = "");
+               const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
 
         // Adds a separator. See the documentation for wxToolBar for details.
 

contrib/include/wx/fl/newbmpbtn.h

@@ -110,7 +110,7 @@ public:
 
         // Constructor.
     wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
-                       const wxString& labelText   = "",
+                       const wxString& labelText   = wxT(""),
                        int   alignText             = NB_ALIGN_TEXT_BOTTOM,
                        bool  isFlat                = TRUE,
                        // this is the default type of fired events
@@ -124,7 +124,7 @@ public:
         // Use this constructor if buttons have to be persistant
     wxNewBitmapButton( const wxString& bitmapFileName,
                            const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,
-                           const wxString& labelText      = "",
+                           const wxString& labelText      = wxT(""),
                            int alignText                  = NB_ALIGN_TEXT_BOTTOM,
                            bool  isFlat                   = TRUE,
                            // this is the default type of fired events
@@ -143,7 +143,7 @@ public:
     virtual void Reshape();
 
         // Sets the label and optionally label text.
-    virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = "" );
+    virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = wxT("") );
 
         // Sets the text alignment and margins.
     virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,

contrib/include/wx/mmedia/sndaiff.h

@@ -3,7 +3,9 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
+// License:    wxWindows license
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDAIFF_H
 #define _WX_SNDAIFF_H

contrib/include/wx/mmedia/sndbase.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDBASE_H
 #define _WX_SNDBASE_H

contrib/include/wx/mmedia/sndcodec.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDCODEC_H
 #define _WX_SNDCODEC_H

contrib/include/wx/mmedia/sndcpcm.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDCPCM_H
 #define _WX_SNDCPCM_H

contrib/include/wx/mmedia/sndesd.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDESD_H
 #define _WX_SNDESD_H

contrib/include/wx/mmedia/sndfile.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDFILE_H
 #define _WX_SNDFILE_H

contrib/include/wx/mmedia/sndg72x.h

@@ -4,6 +4,7 @@
 // Date: 08/26/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDG72X_H
 #define _WX_SNDG72X_H

contrib/include/wx/mmedia/sndmsad.h

@@ -4,6 +4,7 @@
 // Date: 25/02/2000
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 2000
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDMSAD_H
 #define _WX_SNDMSAD_H

contrib/include/wx/mmedia/sndoss.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDOSS_H
 #define _WX_SNDOSS_H

contrib/include/wx/mmedia/sndpcm.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDPCM_H
 #define _WX_SNDPCM_H

contrib/include/wx/mmedia/sndulaw.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDULAW_H
 #define _WX_SNDULAW_H

contrib/include/wx/mmedia/sndwav.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDWAV_H
 #define _WX_SNDWAV_H

contrib/include/wx/mmedia/sndwin.h

@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDWIN_H
 #define _WX_SNDWIN_H

contrib/include/wx/stc/stc.h

@@ -24,10 +24,37 @@
 #include <wx/wx.h>
 #include <wx/dnd.h>
 
-#ifdef STCISDLL
+#ifndef SWIG
-#define STCDLLEXPORT WXDLLEXPORT
+/*
+ * If we're using wx in Dynamic Library format do we
+ * want wxStyledTextCtrl to be in DLL form as well?
+ */
+#if defined(WXUSINGDLL) && \
+    (defined(WXMAKING_STC_DLL) || defined(WXUSING_STC_DLL))
+
+#if defined(WXMAKING_STC_DLL)
+    // When building the DLL WXSTC_DECLSPEC exports classes
+#   define WXSTC_DECLSPEC            WXEXPORT
+#elif defined(WXUSING_STC_DLL)
+    // When using the DLL WXSTC_DECLSPEC imports classes
+#   define WXSTC_DECLSPEC            WXIMPORT
+#endif // defined(WXBUILD_STC_DLL)
+
 #else
-#define STCDLLEXPORT
+// When building the static library nullify the effect of WXSTC_DECLSPEC
+#define WXSTC_DECLSPEC
+#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL)
+
+#endif // SWIG
+
+
+// SWIG can't handle "#if" type of conditionals, only "#ifdef"
+#ifdef SWIG
+#define STC_USE_DND 1
+#else
+#if wxUSE_DRAG_AND_DROP
+#define STC_USE_DND 1
+#endif
 #endif
 
 //----------------------------------------------------------------------
@@ -59,6 +86,9 @@
 // The SC_CP_UTF8 value can be used to enter Unicode mode.
 // This is the same value as CP_UTF8 in Windows
 #define wxSTC_CP_UTF8 65001
+
+// The SC_CP_DBCS value can be used to indicate a DBCS mode for GTK+.
+#define wxSTC_CP_DBCS 1
 #define wxSTC_MARKER_MAX 31
 #define wxSTC_MARK_CIRCLE 0
 #define wxSTC_MARK_ROUNDRECT 1
@@ -89,6 +119,7 @@
 #define wxSTC_MARK_BACKGROUND 22
 #define wxSTC_MARK_DOTDOTDOT 23
 #define wxSTC_MARK_ARROWS 24
+#define wxSTC_MARK_PIXMAP 25
 #define wxSTC_MARK_CHARACTER 10000
 
 // Markers used for outlining column.
@@ -144,6 +175,7 @@
 #define wxSTC_INDIC_TT 2
 #define wxSTC_INDIC_DIAGONAL 3
 #define wxSTC_INDIC_STRIKE 4
+#define wxSTC_INDIC_HIDDEN 5
 #define wxSTC_INDIC0_MASK 0x20
 #define wxSTC_INDIC1_MASK 0x40
 #define wxSTC_INDIC2_MASK 0x80
@@ -167,10 +199,21 @@
 #define wxSTC_FIND_MATCHCASE 4
 #define wxSTC_FIND_WORDSTART 0x00100000
 #define wxSTC_FIND_REGEXP 0x00200000
+#define wxSTC_FIND_POSIX 0x00400000
 #define wxSTC_FOLDLEVELBASE 0x400
 #define wxSTC_FOLDLEVELWHITEFLAG 0x1000
 #define wxSTC_FOLDLEVELHEADERFLAG 0x2000
+#define wxSTC_FOLDLEVELBOXHEADERFLAG 0x4000
+#define wxSTC_FOLDLEVELBOXFOOTERFLAG 0x8000
+#define wxSTC_FOLDLEVELCONTRACTED 0x10000
+#define wxSTC_FOLDLEVELUNINDENT 0x20000
 #define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
+#define wxSTC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
+#define wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
+#define wxSTC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
+#define wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
+#define wxSTC_FOLDFLAG_LEVELNUMBERS 0x0040
+#define wxSTC_FOLDFLAG_BOX 0x0001
 #define wxSTC_TIME_FOREVER 10000000
 #define wxSTC_WRAP_NONE 0
 #define wxSTC_WRAP_WORD 1
@@ -182,7 +225,7 @@
 #define wxSTC_EDGE_LINE 1
 #define wxSTC_EDGE_BACKGROUND 2
 #define wxSTC_CURSORNORMAL -1
-#define wxSTC_CURSORWAIT 3
+#define wxSTC_CURSORWAIT 4
 
 // Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.
 #define wxSTC_VISIBLE_SLOP 0x01
@@ -214,6 +257,9 @@
 // where most code reside, and the lines after the caret, eg. the body of a function.
 #define wxSTC_CARET_EVEN 0x08
 
+// Maximum value of keywordSet parameter of SetKeyWords.
+#define wxSTC_KEYWORDSET_MAX 8
+
 // Notifications
 // Type of modification and the action which caused the modification.
 // These are defined as a bit mask to make it easy to specify which notifications are wanted.
@@ -290,6 +336,17 @@
 #define wxSTC_LEX_BAAN 31
 #define wxSTC_LEX_MATLAB 32
 #define wxSTC_LEX_SCRIPTOL 33
+#define wxSTC_LEX_ASM 34
+#define wxSTC_LEX_CPPNOCASE 35
+#define wxSTC_LEX_FORTRAN 36
+#define wxSTC_LEX_F77 37
+#define wxSTC_LEX_CSS 38
+#define wxSTC_LEX_POV 39
+#define wxSTC_LEX_LOUT 40
+#define wxSTC_LEX_ESCRIPT 41
+#define wxSTC_LEX_PS 42
+#define wxSTC_LEX_NSIS 43
+#define wxSTC_LEX_MMIXAL 44
 
 // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 // value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -331,6 +388,7 @@
 #define wxSTC_C_WORD2 16
 #define wxSTC_C_COMMENTDOCKEYWORD 17
 #define wxSTC_C_COMMENTDOCKEYWORDERROR 18
+#define wxSTC_C_GLOBALCLASS 19
 
 // Lexical states for SCLEX_HTML, SCLEX_XML
 #define wxSTC_H_DEFAULT 0
@@ -542,6 +600,8 @@
 #define wxSTC_LUA_WORD4 15
 #define wxSTC_LUA_WORD5 16
 #define wxSTC_LUA_WORD6 17
+#define wxSTC_LUA_WORD7 18
+#define wxSTC_LUA_WORD8 19
 
 // Lexical states for SCLEX_ERRORLIST
 #define wxSTC_ERR_DEFAULT 0
@@ -558,6 +618,9 @@
 #define wxSTC_ERR_DIFF_ADDITION 11
 #define wxSTC_ERR_DIFF_DELETION 12
 #define wxSTC_ERR_DIFF_MESSAGE 13
+#define wxSTC_ERR_PHP 14
+#define wxSTC_ERR_ELF 15
+#define wxSTC_ERR_IFC 16
 
 // Lexical states for SCLEX_BATCH
 #define wxSTC_BAT_DEFAULT 0
@@ -604,24 +667,31 @@
 #define wxSTC_AVE_COMMENT 1
 #define wxSTC_AVE_NUMBER 2
 #define wxSTC_AVE_WORD 3
-#define wxSTC_AVE_KEYWORD 4
-#define wxSTC_AVE_STATEMENT 5
 #define wxSTC_AVE_STRING 6
 #define wxSTC_AVE_ENUM 7
 #define wxSTC_AVE_STRINGEOL 8
 #define wxSTC_AVE_IDENTIFIER 9
 #define wxSTC_AVE_OPERATOR 10
+#define wxSTC_AVE_WORD1 11
+#define wxSTC_AVE_WORD2 12
+#define wxSTC_AVE_WORD3 13
+#define wxSTC_AVE_WORD4 14
+#define wxSTC_AVE_WORD5 15
+#define wxSTC_AVE_WORD6 16
 
 // Lexical states for SCLEX_ADA
 #define wxSTC_ADA_DEFAULT 0
-#define wxSTC_ADA_COMMENT 1
+#define wxSTC_ADA_WORD 1
-#define wxSTC_ADA_NUMBER 2
+#define wxSTC_ADA_IDENTIFIER 2
-#define wxSTC_ADA_WORD 3
+#define wxSTC_ADA_NUMBER 3
-#define wxSTC_ADA_STRING 4
+#define wxSTC_ADA_DELIMITER 4
 #define wxSTC_ADA_CHARACTER 5
-#define wxSTC_ADA_OPERATOR 6
+#define wxSTC_ADA_CHARACTEREOL 6
-#define wxSTC_ADA_IDENTIFIER 7
+#define wxSTC_ADA_STRING 7
 #define wxSTC_ADA_STRINGEOL 8
+#define wxSTC_ADA_LABEL 9
+#define wxSTC_ADA_COMMENTLINE 10
+#define wxSTC_ADA_ILLEGAL 11
 
 // Lexical states for SCLEX_BAAN
 #define wxSTC_BAAN_DEFAULT 0
@@ -702,10 +772,158 @@
 #define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR 18
 #define wxSTC_SCRIPTOL_COMMENTBASIC 19
 
+// Lexical states for SCLEX_ASM
+#define wxSTC_ASM_DEFAULT 0
+#define wxSTC_ASM_COMMENT 1
+#define wxSTC_ASM_NUMBER 2
+#define wxSTC_ASM_STRING 3
+#define wxSTC_ASM_OPERATOR 4
+#define wxSTC_ASM_IDENTIFIER 5
+#define wxSTC_ASM_CPUINSTRUCTION 6
+#define wxSTC_ASM_MATHINSTRUCTION 7
+#define wxSTC_ASM_REGISTER 8
+#define wxSTC_ASM_DIRECTIVE 9
+#define wxSTC_ASM_DIRECTIVEOPERAND 10
+
+// Lexical states for SCLEX_FORTRAN
+#define wxSTC_F_DEFAULT 0
+#define wxSTC_F_COMMENT 1
+#define wxSTC_F_NUMBER 2
+#define wxSTC_F_STRING1 3
+#define wxSTC_F_STRING2 4
+#define wxSTC_F_STRINGEOL 5
+#define wxSTC_F_OPERATOR 6
+#define wxSTC_F_IDENTIFIER 7
+#define wxSTC_F_WORD 8
+#define wxSTC_F_WORD2 9
+#define wxSTC_F_WORD3 10
+#define wxSTC_F_PREPROCESSOR 11
+#define wxSTC_F_OPERATOR2 12
+#define wxSTC_F_LABEL 13
+#define wxSTC_F_CONTINUATION 14
+
+// Lexical states for SCLEX_CSS
+#define wxSTC_CSS_DEFAULT 0
+#define wxSTC_CSS_TAG 1
+#define wxSTC_CSS_CLASS 2
+#define wxSTC_CSS_PSEUDOCLASS 3
+#define wxSTC_CSS_UNKNOWN_PSEUDOCLASS 4
+#define wxSTC_CSS_OPERATOR 5
+#define wxSTC_CSS_IDENTIFIER 6
+#define wxSTC_CSS_UNKNOWN_IDENTIFIER 7
+#define wxSTC_CSS_VALUE 8
+#define wxSTC_CSS_COMMENT 9
+#define wxSTC_CSS_ID 10
+#define wxSTC_CSS_IMPORTANT 11
+#define wxSTC_CSS_DIRECTIVE 12
+#define wxSTC_CSS_DOUBLESTRING 13
+#define wxSTC_CSS_SINGLESTRING 14
+
+// Lexical states for SCLEX_POV
+#define wxSTC_POV_DEFAULT 0
+#define wxSTC_POV_COMMENT 1
+#define wxSTC_POV_COMMENTLINE 2
+#define wxSTC_POV_NUMBER 3
+#define wxSTC_POV_OPERATOR 4
+#define wxSTC_POV_IDENTIFIER 5
+#define wxSTC_POV_STRING 6
+#define wxSTC_POV_STRINGEOL 7
+#define wxSTC_POV_DIRECTIVE 8
+#define wxSTC_POV_BADDIRECTIVE 9
+#define wxSTC_POV_WORD2 10
+#define wxSTC_POV_WORD3 11
+#define wxSTC_POV_WORD4 12
+#define wxSTC_POV_WORD5 13
+#define wxSTC_POV_WORD6 14
+#define wxSTC_POV_WORD7 15
+#define wxSTC_POV_WORD8 16
+
+// Lexical states for SCLEX_LOUT
+#define wxSTC_LOUT_DEFAULT 0
+#define wxSTC_LOUT_COMMENT 1
+#define wxSTC_LOUT_NUMBER 2
+#define wxSTC_LOUT_WORD 3
+#define wxSTC_LOUT_WORD2 4
+#define wxSTC_LOUT_WORD3 5
+#define wxSTC_LOUT_WORD4 6
+#define wxSTC_LOUT_STRING 7
+#define wxSTC_LOUT_OPERATOR 8
+#define wxSTC_LOUT_IDENTIFIER 9
+#define wxSTC_LOUT_STRINGEOL 10
+
+// Lexical states for SCLEX_ESCRIPT
+#define wxSTC_ESCRIPT_DEFAULT 0
+#define wxSTC_ESCRIPT_COMMENT 1
+#define wxSTC_ESCRIPT_COMMENTLINE 2
+#define wxSTC_ESCRIPT_COMMENTDOC 3
+#define wxSTC_ESCRIPT_NUMBER 4
+#define wxSTC_ESCRIPT_WORD 5
+#define wxSTC_ESCRIPT_STRING 6
+#define wxSTC_ESCRIPT_OPERATOR 7
+#define wxSTC_ESCRIPT_IDENTIFIER 8
+#define wxSTC_ESCRIPT_BRACE 9
+#define wxSTC_ESCRIPT_WORD2 10
+#define wxSTC_ESCRIPT_WORD3 11
+
+// Lexical states for SCLEX_PS
+#define wxSTC_PS_DEFAULT 0
+#define wxSTC_PS_COMMENT 1
+#define wxSTC_PS_DSC_COMMENT 2
+#define wxSTC_PS_DSC_VALUE 3
+#define wxSTC_PS_NUMBER 4
+#define wxSTC_PS_NAME 5
+#define wxSTC_PS_KEYWORD 6
+#define wxSTC_PS_LITERAL 7
+#define wxSTC_PS_IMMEVAL 8
+#define wxSTC_PS_PAREN_ARRAY 9
+#define wxSTC_PS_PAREN_DICT 10
+#define wxSTC_PS_PAREN_PROC 11
+#define wxSTC_PS_TEXT 12
+#define wxSTC_PS_HEXSTRING 13
+#define wxSTC_PS_BASE85STRING 14
+#define wxSTC_PS_BADSTRINGCHAR 15
+
+// Lexical states for SCLEX_NSIS
+#define wxSTC_NSIS_DEFAULT 0
+#define wxSTC_NSIS_COMMENT 1
+#define wxSTC_NSIS_STRINGDQ 2
+#define wxSTC_NSIS_STRINGLQ 3
+#define wxSTC_NSIS_STRINGRQ 4
+#define wxSTC_NSIS_FUNCTION 5
+#define wxSTC_NSIS_VARIABLE 6
+#define wxSTC_NSIS_LABEL 7
+#define wxSTC_NSIS_USERDEFINED 8
+#define wxSTC_NSIS_SECTIONDEF 9
+#define wxSTC_NSIS_SUBSECTIONDEF 10
+#define wxSTC_NSIS_IFDEFINEDEF 11
+#define wxSTC_NSIS_MACRODEF 12
+#define wxSTC_NSIS_STRINGVAR 13
+
+// Lexical states for SCLEX_MMIXAL
+#define wxSTC_MMIXAL_LEADWS 0
+#define wxSTC_MMIXAL_COMMENT 1
+#define wxSTC_MMIXAL_LABEL 2
+#define wxSTC_MMIXAL_OPCODE 3
+#define wxSTC_MMIXAL_OPCODE_PRE 4
+#define wxSTC_MMIXAL_OPCODE_VALID 5
+#define wxSTC_MMIXAL_OPCODE_UNKNOWN 6
+#define wxSTC_MMIXAL_OPCODE_POST 7
+#define wxSTC_MMIXAL_OPERANDS 8
+#define wxSTC_MMIXAL_NUMBER 9
+#define wxSTC_MMIXAL_REF 10
+#define wxSTC_MMIXAL_CHAR 11
+#define wxSTC_MMIXAL_STRING 12
+#define wxSTC_MMIXAL_REGISTER 13
+#define wxSTC_MMIXAL_HEX 14
+#define wxSTC_MMIXAL_OPERATOR 15
+#define wxSTC_MMIXAL_SYMBOL 16
+#define wxSTC_MMIXAL_INCLUDE 17
+
 
 //-----------------------------------------
 // Commands that can be bound to keystrokes
 
+
 // Redoes the next action on the undo history.
 #define wxSTC_CMD_REDO 2011
 
@@ -849,6 +1067,9 @@
 // Switch the current line with the previous.
 #define wxSTC_CMD_LINETRANSPOSE 2339
 
+// Duplicate the current line.
+#define wxSTC_CMD_LINEDUPLICATE 2404
+
 // Transform the selection to lower case.
 #define wxSTC_CMD_LOWERCASE 2340
 
@@ -879,6 +1100,18 @@
 // caret position.
 #define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
 
+// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
+// except they behave differently when word-wrap is enabled:
+// They go first to the start / end of the display line, like (Home|LineEnd)Display
+// The difference is that, the cursor is already at the point, it goes on to the start
+// or end of the document line, as appropriate for (Home|LineEnd|VCHome)Extend.
+#define wxSTC_CMD_HOMEWRAP 2349
+#define wxSTC_CMD_HOMEWRAPEXTEND 2450
+#define wxSTC_CMD_LINEENDWRAP 2451
+#define wxSTC_CMD_LINEENDWRAPEXTEND 2452
+#define wxSTC_CMD_VCHOMEWRAP 2453
+#define wxSTC_CMD_VCHOMEWRAPEXTEND 2454
+
 // Move to the previous change in capitalisation.
 #define wxSTC_CMD_WORDPARTLEFT 2390
 
@@ -899,6 +1132,12 @@
 // Delete forwards from the current position to the end of the line.
 #define wxSTC_CMD_DELLINERIGHT 2396
 
+// Move caret between paragraphs (delimited by empty lines)
+#define wxSTC_CMD_PARADOWN 2413
+#define wxSTC_CMD_PARADOWNEXTEND 2414
+#define wxSTC_CMD_PARAUP 2415
+#define wxSTC_CMD_PARAUPEXTEND 2416
+
 
 // END of generated section
 //----------------------------------------------------------------------
@@ -908,9 +1147,9 @@ class  WordList;
 struct SCNotification;
 
 #ifndef SWIG
-extern STCDLLEXPORT const wxChar* wxSTCNameStr;
+extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr;
-class STCDLLEXPORT wxStyledTextCtrl;
+class WXSTC_DECLSPEC wxStyledTextCtrl;
-class STCDLLEXPORT wxStyledTextEvent;
+class WXSTC_DECLSPEC wxStyledTextEvent;
 #endif
 
 //----------------------------------------------------------------------
@@ -1073,8 +1312,8 @@ public:
     // Set the symbol used for a particular marker number,
     // and optionally the fore and background colours.
     void MarkerDefine(int markerNumber, int markerSymbol,
-                         const wxColour& foreground = wxNullColour,
+                const wxColour& foreground = wxNullColour,
-                         const wxColour& background = wxNullColour);
+                const wxColour& background = wxNullColour);
 
     // Set the foreground colour used for a particular marker number.
     void MarkerSetForeground(int markerNumber, const wxColour& fore);
@@ -1100,6 +1339,9 @@ public:
     // Find the previous line before lineStart that includes a marker in mask.
     int MarkerPrevious(int lineStart, int markerMask);
 
+    // Define a marker from a bitmap
+    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
+
     // Set a margin to be either numeric or symbolic.
     void SetMarginType(int margin, int marginType);
 
@@ -1160,6 +1402,9 @@ public:
     // Set the character set of the font in a style.
     void StyleSetCharacterSet(int style, int characterSet);
 
+    // Set a style to be a hotspot or not.
+    void StyleSetHotSpot(int style, bool hotspot);
+
     // Set the foreground colour of the selection and whether to use this setting.
     void SetSelForeground(bool useSetting, const wxColour& fore);
 
@@ -1321,6 +1566,19 @@ public:
     // after the inserted text upon completion.
     bool AutoCompGetDropRestOfWord();
 
+    // Register an image for use in autocompletion lists.
+    void RegisterImage(int type, const wxBitmap& bmp);
+
+    // Clear all the registered images.
+    void ClearRegisteredImages();
+
+    // Retrieve the auto-completion list type-separator character.
+    int AutoCompGetTypeSeparator();
+
+    // Change the type-separator character in the string setting up an auto-completion list.
+    // Default is '?' but can be changed if items contain '?'.
+    void AutoCompSetTypeSeparator(int separatorCharacter);
+
     // Set the number of spaces used for one level of indentation.
     void SetIndent(int indentSize);
 
@@ -1409,14 +1667,14 @@ public:
 
     // On Windows, will draw the document into a display context such as a printer.
     int FormatRange(bool   doDraw,
-                               int    startPos,
+               int    startPos,
-                               int    endPos,
+               int    endPos,
-                               wxDC*  draw,
+               wxDC*  draw,
-                               wxDC*  target,  // Why does it use two? Can they be the same?
+               wxDC*  target,  // Why does it use two? Can they be the same?
-                               wxRect renderRect,
+               wxRect renderRect,
-                               wxRect pageRect);
+               wxRect pageRect);
 
-    // Retrieve the line at the top of the display.
+    // Retrieve the display line at the top of the display.
     int GetFirstVisibleLine();
 
     // Retrieve the contents of a line.
@@ -1571,6 +1829,12 @@ public:
     // Set the background colour for the call tip.
     void CallTipSetBackground(const wxColour& back);
 
+    // Set the foreground colour for the call tip.
+    void CallTipSetForeground(const wxColour& fore);
+
+    // Set the foreground colour for the highlighted part of the call tip.
+    void CallTipSetForegroundHighlight(const wxColour& fore);
+
     // Find the display line of a document line taking hidden lines into account.
     int VisibleFromDocLine(int line);
 
@@ -1612,7 +1876,7 @@ public:
     // Ensure a particular line is visible by expanding any header line hiding it.
     void EnsureVisible(int line);
 
-    // Set some debugging options for folding.
+    // Set some style options for folding.
     void SetFoldFlags(int flags);
 
     // Ensure a particular line is visible by expanding any header line hiding it.
@@ -1678,6 +1942,39 @@ public:
     // Retrieve the height of a particular line of text in pixels.
     int TextHeight(int line);
 
+    // Show or hide the vertical scroll bar.
+    void SetUseVerticalScrollBar(bool show);
+
+    // Is the vertical scroll bar visible?
+    bool GetUseVerticalScrollBar();
+
+    // Append a string to the end of the document without changing the selection.
+    void AppendText(int length, const wxString& text);
+
+    // Is drawing done in two phases with backgrounds drawn before foregrounds?
+    bool GetTwoPhaseDraw();
+
+    // In twoPhaseDraw mode, drawing is performed in two phases, first the background
+    // and then the foreground. This avoids chopping off characters that overlap the next run.
+    void SetTwoPhaseDraw(bool twoPhase);
+
+    // Make the target range start and end be the same as the selection range start and end.
+    void TargetFromSelection();
+
+    // Join the lines in the target.
+    void LinesJoin();
+
+    // Split the lines in the target into lines that are less wide than pixelWidth
+    // where possible.
+    void LinesSplit(int pixelWidth);
+
+    // Set the colours used as a chequerboard pattern in the fold margin
+    void SetFoldMarginColour(bool useSetting, const wxColour& back);
+    void SetFoldMarginHiColour(bool useSetting, const wxColour& fore);
+
+    // Duplicate the current line.
+    void LineDuplicate();
+
     // Move caret to first position on display line.
     void HomeDisplay();
 
@@ -1692,6 +1989,9 @@ public:
     // caret position.
     void LineEndDisplayExtend();
 
+    // Copy the line containing the caret.
+    void LineCopy();
+
     // Move the caret inside current view if it's not there already.
     void MoveCaretInsideView();
 
@@ -1802,10 +2102,10 @@ public:
     bool GetMouseDownCaptures();
 
     // Sets the cursor to one of the SC_CURSOR* values.
-    void SetCursor(int cursorType);
+    void SetSTCCursor(int cursorType);
 
     // Get cursor type.
-    int GetCursor();
+    int GetSTCCursor();
 
     // Change the way control characters are displayed:
     // If symbol is < 32, keep the drawn way, else, use the given character.
@@ -1842,6 +2142,9 @@ public:
     void SetXOffset(int newOffset);
     int GetXOffset();
 
+    // Set the last x chosen value to be the caret x position
+    void ChooseCaretX();
+
     // Set the way the caret is kept visible when going sideway.
     // The exclusion zone is given in pixels.
     void SetXCaretPolicy(int caretPolicy, int caretSlop);
@@ -1850,6 +2153,35 @@ public:
     // The exclusion zone is given in lines.
     void SetYCaretPolicy(int caretPolicy, int caretSlop);
 
+    // Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
+    void SetPrintWrapMode(int mode);
+
+    // Is printing line wrapped.
+    int GetPrintWrapMode();
+
+    // Set a fore colour for active hotspots.
+    void SetHotspotActiveForeground(bool useSetting, const wxColour& fore);
+
+    // Set a back colour for active hotspots.
+    void SetHotspotActiveBackground(bool useSetting, const wxColour& back);
+
+    // Enable / Disable underlining active hotspots.
+    void SetHotspotActiveUnderline(bool underline);
+
+    // Given a valid document position, return the previous position taking code
+    // page into account. Returns 0 if passed 0.
+    int PositionBefore(int pos);
+
+    // Given a valid document position, return the next position taking code
+    // page into account. Maximum value returned is the last position in the document.
+    int PositionAfter(int pos);
+
+    // Copy a range of text to the clipboard. Positions are clipped into the document.
+    void CopyRange(int start, int end);
+
+    // Copy argument text to the clipboard.
+    void CopyText(int length, const wxString& text);
+
     // Start notifying the container of all key presses and commands.
     void StartRecord();
 
@@ -1955,6 +2287,19 @@ public:
     bool GetLastKeydownProcessed() { return m_lastKeyDownConsumed; }
     void SetLastKeydownProcessed(bool val) { m_lastKeyDownConsumed = val; }
 
+    // Write the contents of the editor to filename
+    bool SaveFile(const wxString& filename);
+
+    // Load the contents of filename into the editor
+    bool LoadFile(const wxString& filename);
+
+#ifdef STC_USE_DND
+    // Allow for simulating a DnD DragOver
+    wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
+
+    // Allow for simulating a DnD DropText
+    bool DoDropText(long x, long y, const wxString& data);
+#endif
 
 //----------------------------------------------------------------------
 
@@ -1987,11 +2332,11 @@ private:
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 
-
-private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxStyledTextCtrl)
 
+protected:
+
     ScintillaWX*        m_swx;
     wxStopWatch         m_stopWatch;
     wxScrollBar*        m_vScrollBar;
@@ -2006,15 +2351,6 @@ private:
 
 //----------------------------------------------------------------------
 
-// SWIG can't handle "#if" type of conditionals, only "#ifdef"
-#ifdef SWIG
-#define STC_USE_DND 1
-#else
-#if wxUSE_DRAG_AND_DROP
-#define STC_USE_DND 1
-#endif
-#endif
-
 class wxStyledTextEvent : public wxCommandEvent {
 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
@@ -2110,31 +2446,36 @@ private:
 #endif
 };
 
+
+
 #ifndef SWIG
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHANGE,                  1650)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_CHANGE,                  1650)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_STYLENEEDED,             1651)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_STYLENEEDED,             1651)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHARADDED,               1652)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_CHARADDED,               1652)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTREACHED,        1653)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_SAVEPOINTREACHED,        1653)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTLEFT,           1654)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_SAVEPOINTLEFT,           1654)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ROMODIFYATTEMPT,         1655)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_ROMODIFYATTEMPT,         1655)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_KEY,                     1656)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_KEY,                     1656)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DOUBLECLICK,             1657)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DOUBLECLICK,             1657)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_UPDATEUI,                1658)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_UPDATEUI,                1658)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MODIFIED,                1659)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_MODIFIED,                1659)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MACRORECORD,             1660)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_MACRORECORD,             1660)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MARGINCLICK,             1661)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_MARGINCLICK,             1661)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_NEEDSHOWN,               1662)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_NEEDSHOWN,               1662)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_POSCHANGED,              1663)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_POSCHANGED,              1663)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_PAINTED,                 1664)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_PAINTED,                 1664)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_USERLISTSELECTION,       1665)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_USERLISTSELECTION,       1665)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED,              1666)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_URIDROPPED,              1666)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART,              1667)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DWELLSTART,              1667)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND,                1668)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DWELLEND,                1668)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG,              1669)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_START_DRAG,              1669)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER,               1670)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DRAG_OVER,               1670)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP,                 1671)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DO_DROP,                 1671)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ZOOM,                    1672)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_ZOOM,                    1672)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_HOTSPOT_CLICK,           1673)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_HOTSPOT_DCLICK,          1674)
+    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_CALLTIP_CLICK,           1675)
 END_DECLARE_EVENT_TYPES()
 #else
     enum {
@@ -2161,6 +2502,9 @@ END_DECLARE_EVENT_TYPES()
         wxEVT_STC_DRAG_OVER,
         wxEVT_STC_DO_DROP,
         wxEVT_STC_ZOOM,
+        wxEVT_STC_HOTSPOT_CLICK,
+        wxEVT_STC_HOTSPOT_DCLICK,
+        wxEVT_STC_CALLTIP_CLICK
     };
 #endif
 
@@ -2192,6 +2536,10 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_DRAG_OVER(id, fn)               DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER,             id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_DO_DROP(id, fn)                 DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_ZOOM(id, fn)                    DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM,                  id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_HOTSPOT_CLICK(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK,         id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_HOTSPOT_DCLICK(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK,        id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_STC_CALLTIP_CLICK(id, fn))          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK          id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
+
 #endif
 
 //----------------------------------------------------------------------
@@ -2207,13 +2555,14 @@ inline wxString stc2wx(const char* str) {
 #endif
 }
 
-inline wxString stc2wx(const char* str, size_t len) {
 #if wxUSE_UNICODE
-    return wxString(str, wxConvUTF8, len);
+wxString stc2wx(const char* str, size_t len);
 #else
+inline wxString stc2wx(const char* str, size_t len) {
     return wxString(str, len);
-#endif
 }
+#endif
+
 
 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {

contrib/include/wx/xrc/xh_all.h

@@ -19,6 +19,7 @@
 #include "wx/xrc/xh_dlg.h"
 #include "wx/xrc/xh_bttn.h"
 #include "wx/xrc/xh_chckb.h"
+#include "wx/xrc/xh_tglbtn.h"
 #include "wx/xrc/xh_gauge.h"
 #include "wx/xrc/xh_html.h"
 #include "wx/xrc/xh_spin.h"
@@ -47,5 +48,8 @@
 #include "wx/xrc/xh_gdctl.h"
 #include "wx/xrc/xh_frame.h"
 #include "wx/xrc/xh_scwin.h"
+#include "wx/xrc/xh_split.h"
+#include "wx/xrc/xh_wizrd.h"
+#include "wx/xrc/xh_statbar.h"
 
 #endif // _WX_XMLRES_H_

contrib/include/wx/xrc/xh_chckl.h

@@ -17,10 +17,10 @@
 
 #include "wx/xrc/xmlres.h"
 
-class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
+class WXXMLDLLEXPORT wxCheckListBoxXmlHandler : public wxXmlResourceHandler
 {
 public:
-    wxCheckListXmlHandler();
+    wxCheckListBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 private:

contrib/include/wx/xrc/xh_split.h

@@ -0,0 +1,28 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        xh_split.h
+// Purpose:     XRC resource for wxSplitterWindow
+// Author:      panga@freemail.hu, Vaclav Slavik
+// Created:     2003/01/26
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 panga@freemail.hu, Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XH_SPLIT_H_
+#define _WX_XH_SPLIT_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "xh_split.h"
+#endif
+
+#include "wx/xrc/xmlres.h"
+
+class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxSplitterWindowXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+#endif // _WX_XH_SPLIT_H_

contrib/include/wx/xrc/xh_statbar.h

@@ -0,0 +1,29 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        xh_statbar.h
+// Purpose:     XML resource handler for wxStatusBar
+// Author:      Brian Ravnsgaard Riis
+// Created:     2004/01/21
+// RCS-ID:
+// Copyright:   (c) 2004 Brian Ravnsgaard Riis
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XH_STATBAR_H_
+#define _WX_XH_STATBAR_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "xh_statbar.h"
+#endif
+
+#include "wx/xrc/xmlres.h"
+
+class WXXMLDLLEXPORT wxStatusBarXmlHandler : public wxXmlResourceHandler
+{
+    public:
+        wxStatusBarXmlHandler();
+        virtual wxObject *DoCreateResource();
+        virtual bool CanHandle(wxXmlNode *node);
+};
+
+#endif // _WX_XH_STATBAR_H_
+

contrib/include/wx/xrc/xh_tglbtn.h

@@ -0,0 +1,36 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        xh_tglbtn.h
+// Purpose:     XML resource handler for wxToggleButton
+// Author:      Julian Smart
+// Created:     2004-08-30
+// RCS-ID:      $Id$
+// Copyright:   (c) 2004 Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XH_TGLBTN_H_
+#define _WX_XH_TGLBTN_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "xh_tglbtn.h"
+#endif
+
+#include "wx/xrc/xmlres.h"
+#include "wx/defs.h"
+
+#if wxUSE_TOGGLEBTN
+
+class WXDLLEXPORT wxToggleButtonXmlHandler : public wxXmlResourceHandler
+{
+DECLARE_DYNAMIC_CLASS(wxToggleButtonXmlHandler)
+public:
+    wxToggleButtonXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+#endif
+
+
+#endif // _WX_XH_TGLBTN_H_
+

contrib/include/wx/xrc/xh_wizrd.h

@@ -0,0 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        xh_wizrd.h
+// Purpose:     XML resource handler for wxWizard
+// Author:      Vaclav Slavik
+// Created:     2003/03/02
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000 Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XH_WIZRD_H_
+#define _WX_XH_WIZRDL_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "xh_wizrd.h"
+#endif
+
+#include "wx/xrc/xmlres.h"
+
+#if wxUSE_WIZARDDLG
+
+#include "wx/wizard.h"
+
+class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxWizardXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+
+private:
+    wxWizard *m_wizard;
+    wxWizardPageSimple *m_lastSimplePage;
+};
+
+#endif
+
+#endif // _WX_XH_PANEL_H_

contrib/include/wx/xrc/xmlres.h

@@ -240,8 +240,18 @@ protected:
     wxXmlNode *DoFindResource(wxXmlNode *parent, const wxString& name, const wxString& classname, bool recursive);
 
     // Creates a resource from information in the given node.
-    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
+    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent,
+                                wxObject *instance = NULL);
 
+    // Creates a resource from information in the given node
+    // (Uses only 'handlerToUse' if != NULL)
+    //
+    // ATTENTION: Do *NOT* use this function, it will disappear in
+    //            wxWindows 2.5.0! It exists *only* as a hack to preserve
+    //            binary compatibility in 2.4.x branch.
+    wxObject *CreateResFromNode2(wxXmlNode *node, wxObject *parent,
+                                 wxObject *instance = NULL,
+                                 wxXmlResourceHandler *handlerToUse = NULL);
 private:
     long m_version;
 

contrib/samples/animate/AniTestVC.dsp

@@ -111,7 +111,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 wxmsw240d.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/anitest.exe" /pdbtype:sept /libpath:"../../../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 wxmsw24d.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/anitest.exe" /pdbtype:sept /libpath:"../../../lib"
 
 !ELSEIF  "$(CFG)" == "AniTestVC - Win32 Release DLL"
 
@@ -138,7 +138,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 wxmsw240.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../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 wxmsw24.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../lib"
 
 !ELSEIF  "$(CFG)" == "AniTestVC - Win32 UnivRelease"
 

contrib/samples/animate/makefile.va

@@ -4,6 +4,7 @@
 # Created:  1999
 # Updated:
 # Copyright:    (c) David Webster
+# Licence:  wxWindows license
 #
 # Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM)
 # Use FINAL=1 argument to nmake to build final version with no debug info.

contrib/samples/animate/makefile.wat

@@ -6,9 +6,11 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 
 PROGRAM = anitest
-OBJECTS = $(PROGRAM).obj animate.obj
+EXTRALIBS = $(WXDIR)\lib\anim_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 

contrib/samples/canvas/simple/SimpleVC.dsp

@@ -109,7 +109,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 wxmsw240d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/simple.exe" /pdbtype:sept /libpath:"../../../../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 wxmsw24d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "SimpleVC - Win32 Release DLL"
 
@@ -136,7 +136,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 wxmsw240.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../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 wxmsw24.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/canvas/test/TestVC.dsp

@@ -109,7 +109,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 wxmsw240d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/test.exe" /pdbtype:sept /libpath:"../../../../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 wxmsw24d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/test.exe" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "TestVC - Win32 Release DLL"
 
@@ -136,7 +136,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 wxmsw240.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/test.exe" /libpath:"../../../../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 wxmsw24.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/test.exe" /libpath:"../../../../lib"
 
 !ENDIF