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

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

Makefile.in

@@ -232,6 +232,7 @@ ALL_BASE_HEADERS =  \
 	wx/config.h \
 	wx/containr.h \
 	wx/datetime.h \
+	wx/datetime.inl \
 	wx/datstrm.h \
 	wx/dde.h \
 	wx/debug.h \
@@ -436,9 +437,6 @@ ALL_BASE_SOURCES =  \
 	src/os2/thread.cpp \
 	src/os2/utils.cpp \
 	src/os2/utilsexc.cpp \
-	src/msdos/dir.cpp \
-	src/msdos/mimetype.cpp \
-	src/msdos/utilsdos.cpp \
 	src/common/event.cpp \
 	src/common/fs_mem.cpp \
 	src/common/msgout.cpp \
@@ -1226,7 +1224,6 @@ COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN___wxtiff___depname = \
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= install_wxtiff
 @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_MACOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_apple.o
-@COND_PLATFORM_MSDOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_msdos.o
 @COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
@@ -1248,10 +1245,10 @@ COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname = \
 @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_RELEASE)
 @COND_PLATFORM_UNIX_0@PLUGVERDELIM = 
 @COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
-@COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = d
-@COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = ud
 @COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX = 
+@COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = d
 @COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = u
+@COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = ud
 @COND_TOOLKIT_WINCE@BASE_WINCE_SRC = src/msw/wince/time.cpp
 @COND_TOOLKIT_WINCE@BASE_WINCE_HDR = wx/msw/wince/time.h \
 @COND_TOOLKIT_WINCE@	wx/msw/wince/chkconf.h
@@ -1334,7 +1331,6 @@ COND_TOOLKIT_X11_BASE_MACOSX_HDR =  \
 	wx/mac/corefoundation/stdpaths.h
 @COND_TOOLKIT_X11@BASE_MACOSX_HDR = $(COND_TOOLKIT_X11_BASE_MACOSX_HDR)
 @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_MACOSX_HDR)
-@COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h
 COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR =  \
 	wx/unix/apptbase.h \
 	wx/unix/apptrait.h \
@@ -1354,7 +1350,6 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
 	wx/msw/gccpriv.h \
 	wx/msw/mimetype.h \
 	wx/msw/stackwalk.h \
-	wx/msw/stdpaths.h \
 	wx/msw/winundef.h \
 	wx/msw/wrapcctl.h \
 	wx/msw/wrapcdlg.h \
@@ -1440,18 +1435,12 @@ COND_TOOLKIT_MOTIF_LOWLEVEL_HDR =  \
 COND_TOOLKIT_MSW_LOWLEVEL_HDR =  \
 	wx/msw/popupwin.h \
 	wx/msw/uxtheme.h \
-	wx/msw/uxthemep.h \
-	wx/msw/htmlhelp.h \
 	wx/msw/helpchm.h \
 	wx/msw/helpwin.h
 @COND_TOOLKIT_MSW@LOWLEVEL_HDR = $(COND_TOOLKIT_MSW_LOWLEVEL_HDR)
 @COND_TOOLKIT_PM@LOWLEVEL_HDR = 
-COND_TOOLKIT_WINCE_LOWLEVEL_HDR =  \
-	wx/msw/popupwin.h \
-	wx/msw/uxtheme.h \
-	wx/msw/uxthemep.h \
-	wx/msw/htmlhelp.h
-@COND_TOOLKIT_WINCE@LOWLEVEL_HDR = $(COND_TOOLKIT_WINCE_LOWLEVEL_HDR)
+@COND_TOOLKIT_WINCE@LOWLEVEL_HDR = wx/msw/popupwin.h \
+@COND_TOOLKIT_WINCE@	    wx/msw/uxtheme.h
 COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
 	wx/generic/caret.h \
 	wx/unix/fontutil.h \
@@ -1947,27 +1936,36 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 	wx/msw/csquery.bmp \
 	wx/msw/blank.cur \
 	wx/msw/bullseye.cur \
+	wx/msw/clock.cur \
 	wx/msw/cross.cur \
 	wx/msw/hand.cur \
+	wx/msw/heart.cur \
 	wx/msw/magnif1.cur \
+	wx/msw/noentry.cur \
 	wx/msw/pbrush.cur \
 	wx/msw/pencil.cur \
 	wx/msw/pntleft.cur \
 	wx/msw/pntright.cur \
+	wx/msw/query.cur \
 	wx/msw/rightarr.cur \
 	wx/msw/roller.cur \
+	wx/msw/size.cur \
+	wx/msw/watch1.cur \
 	wx/msw/cdrom.ico \
 	wx/msw/child.ico \
 	wx/msw/computer.ico \
 	wx/msw/drive.ico \
+	wx/msw/error.ico \
 	wx/msw/file1.ico \
 	wx/msw/floppy.ico \
 	wx/msw/folder1.ico \
 	wx/msw/folder2.ico \
+	wx/msw/info.ico \
 	wx/msw/mdi.ico \
 	wx/msw/question.ico \
 	wx/msw/removble.ico \
 	wx/msw/std.ico \
+	wx/msw/warning.ico \
 	wx/msw/fdrepdlg.h \
 	wx/msw/fontdlg.h \
 	wx/msw/helpbest.h \
@@ -2143,27 +2141,36 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/msw/csquery.bmp \
 	wx/msw/blank.cur \
 	wx/msw/bullseye.cur \
+	wx/msw/clock.cur \
 	wx/msw/cross.cur \
 	wx/msw/hand.cur \
+	wx/msw/heart.cur \
 	wx/msw/magnif1.cur \
+	wx/msw/noentry.cur \
 	wx/msw/pbrush.cur \
 	wx/msw/pencil.cur \
 	wx/msw/pntleft.cur \
 	wx/msw/pntright.cur \
+	wx/msw/query.cur \
 	wx/msw/rightarr.cur \
 	wx/msw/roller.cur \
+	wx/msw/size.cur \
+	wx/msw/watch1.cur \
 	wx/msw/cdrom.ico \
 	wx/msw/child.ico \
 	wx/msw/computer.ico \
 	wx/msw/drive.ico \
+	wx/msw/error.ico \
 	wx/msw/file1.ico \
 	wx/msw/floppy.ico \
 	wx/msw/folder1.ico \
 	wx/msw/folder2.ico \
+	wx/msw/info.ico \
 	wx/msw/mdi.ico \
 	wx/msw/question.ico \
 	wx/msw/removble.ico \
 	wx/msw/std.ico \
+	wx/msw/warning.ico \
 	wx/generic/fdrepdlg.h \
 	wx/generic/fontdlgg.h \
 	wx/msw/wince/choicece.h \
@@ -2612,8 +2619,6 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS =  \
 	monodll_MoreFilesExtras.o \
 	monodll_Search.o
 @COND_PLATFORM_MACOS_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS)
-@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS = \
-@COND_PLATFORM_MSDOS_1@	monodll_dir.o monodll_mimetype.o monodll_utilsdos.o
 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS =  \
 	monodll_dir.o \
 	monodll_mimetype.o \
@@ -2732,7 +2737,6 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@	= monodll_utilsunx.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = 
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_UNIX_1@	= monodll_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
@@ -4073,9 +4077,6 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
 	monolib_MoreFilesExtras.o \
 	monolib_Search.o
 @COND_PLATFORM_MACOS_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_1)
-@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_MSDOS_1@	= monolib_dir.o monolib_mimetype.o \
-@COND_PLATFORM_MSDOS_1@	monolib_utilsdos.o
 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
 	monolib_dir.o \
 	monolib_mimetype.o \
@@ -4194,7 +4195,6 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@	= monolib_utilsunx.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = 
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_UNIX_1@	= monolib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
@@ -5573,9 +5573,6 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
 	basedll_MoreFilesExtras.o \
 	basedll_Search.o
 @COND_PLATFORM_MACOS_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_2)
-@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
-@COND_PLATFORM_MSDOS_1@	= basedll_dir.o basedll_mimetype.o \
-@COND_PLATFORM_MSDOS_1@	basedll_utilsdos.o
 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
 	basedll_dir.o \
 	basedll_mimetype.o \
@@ -5694,7 +5691,6 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@	= basedll_utilsunx.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = 
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_UNIX_1@	= basedll_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
@@ -5730,9 +5726,6 @@ COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
 	baselib_MoreFilesExtras.o \
 	baselib_Search.o
 @COND_PLATFORM_MACOS_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_3)
-@COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
-@COND_PLATFORM_MSDOS_1@	= baselib_dir.o baselib_mimetype.o \
-@COND_PLATFORM_MSDOS_1@	baselib_utilsdos.o
 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
 	baselib_dir.o \
 	baselib_mimetype.o \
@@ -5851,7 +5844,6 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@	= baselib_utilsunx.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = 
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_UNIX_1@	= baselib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
@@ -5970,7 +5962,6 @@ COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_cmd = rm -f \
 @COND_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
 @COND_PLATFORM_MACOSX_1@	= coredll_utilsunx.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = 
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
 @COND_PLATFORM_UNIX_1@	= coredll_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
@@ -7164,7 +7155,6 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
 @COND_GCC_PCH_1@	= .pch/wxprec_corelib/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
 @COND_PLATFORM_MACOSX_1@	= corelib_utilsunx.o
-@COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = 
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
 @COND_PLATFORM_UNIX_1@	= corelib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
@@ -9937,9 +9927,6 @@ wxtiff_tif_win32.o: $(srcdir)/src/tiff/tif_win32.c
 wxtiff_tif_apple.o: $(srcdir)/src/tiff/tif_apple.c
 	$(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/tif_apple.c
 
-wxtiff_tif_msdos.o: $(srcdir)/src/tiff/tif_msdos.c
-	$(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/tif_msdos.c
-
 wxtiff_tif_aux.o: $(srcdir)/src/tiff/tif_aux.c
 	$(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/tif_aux.c
 
@@ -10324,9 +10311,6 @@ monodll_MoreFilesExtras.o: $(srcdir)/src/mac/carbon/morefile/MoreFilesExtras.c $
 monodll_Search.o: $(srcdir)/src/mac/carbon/morefile/Search.c $(MONODLL_ODEP)
 	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/mac/carbon/morefile/Search.c
 
-monodll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-
 monodll_event.o: $(srcdir)/src/common/event.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
 
@@ -10825,9 +10809,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_OS2_1@monodll_dir.o: $(srcdir)/src/os2/dir.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
 
-@COND_PLATFORM_MSDOS_1@monodll_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MSDOS_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
 @COND_PLATFORM_UNIX_1@monodll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
 
@@ -10873,9 +10854,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_OS2_1@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
 
-@COND_PLATFORM_MSDOS_1@monodll_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MSDOS_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
 @COND_PLATFORM_UNIX_1@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
 
@@ -13774,9 +13752,6 @@ monolib_MoreFilesExtras.o: $(srcdir)/src/mac/carbon/morefile/MoreFilesExtras.c $
 monolib_Search.o: $(srcdir)/src/mac/carbon/morefile/Search.c $(MONOLIB_ODEP)
 	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/mac/carbon/morefile/Search.c
 
-monolib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-
 monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
 
@@ -14275,9 +14250,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_OS2_1@monolib_dir.o: $(srcdir)/src/os2/dir.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
 
-@COND_PLATFORM_MSDOS_1@monolib_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MSDOS_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
 @COND_PLATFORM_UNIX_1@monolib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
 
@@ -14323,9 +14295,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_OS2_1@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
 
-@COND_PLATFORM_MSDOS_1@monolib_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MSDOS_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
 @COND_PLATFORM_UNIX_1@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
 
@@ -17227,9 +17196,6 @@ basedll_MoreFilesExtras.o: $(srcdir)/src/mac/carbon/morefile/MoreFilesExtras.c $
 basedll_Search.o: $(srcdir)/src/mac/carbon/morefile/Search.c $(BASEDLL_ODEP)
 	$(CCC) -c -o $@ $(BASEDLL_CFLAGS) $(srcdir)/src/mac/carbon/morefile/Search.c
 
-basedll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASEDLL_ODEP)
-	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-
 basedll_event.o: $(srcdir)/src/common/event.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
 
@@ -17299,9 +17265,6 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_OS2_1@basedll_dir.o: $(srcdir)/src/os2/dir.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
 
-@COND_PLATFORM_MSDOS_1@basedll_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MSDOS_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
 @COND_PLATFORM_UNIX_1@basedll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
 
@@ -17347,9 +17310,6 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_OS2_1@basedll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
 
-@COND_PLATFORM_MSDOS_1@basedll_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MSDOS_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
 @COND_PLATFORM_UNIX_1@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
 
@@ -17779,9 +17739,6 @@ baselib_MoreFilesExtras.o: $(srcdir)/src/mac/carbon/morefile/MoreFilesExtras.c $
 baselib_Search.o: $(srcdir)/src/mac/carbon/morefile/Search.c $(BASELIB_ODEP)
 	$(CCC) -c -o $@ $(BASELIB_CFLAGS) $(srcdir)/src/mac/carbon/morefile/Search.c
 
-baselib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASELIB_ODEP)
-	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
-
 baselib_event.o: $(srcdir)/src/common/event.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
 
@@ -17851,9 +17808,6 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_OS2_1@baselib_dir.o: $(srcdir)/src/os2/dir.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
 
-@COND_PLATFORM_MSDOS_1@baselib_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MSDOS_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
 @COND_PLATFORM_UNIX_1@baselib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
 
@@ -17899,9 +17853,6 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_OS2_1@baselib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
 
-@COND_PLATFORM_MSDOS_1@baselib_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MSDOS_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
 @COND_PLATFORM_UNIX_1@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
 
@@ -24337,18 +24288,8 @@ MACX_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon
 	cp $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private
 	cp $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private
-	mkdir $(DISTDIR)/include/wx/mac/corefoundation
-	cp $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
-	mkdir $(DISTDIR)/src/mac/corefoundation
-	cp $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
-	mkdir $(DISTDIR)/src/html/htmlctrl
-	mkdir $(DISTDIR)/src/html/htmlctrl/webkit
-	cp $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit
-	mkdir $(DISTDIR)/src/mac/carbon
 	cp $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.mm $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.icns $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
+	cp $(MACDIR)/carbon/*.c $(DISTDIR)/src/mac/carbon
 	cp $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon
 	cp $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon
 	mkdir $(DISTDIR)/src/mac/carbon/morefile
@@ -24377,7 +24318,6 @@ MSW_DIST: ALL_GUI_DIST
 	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/wx.manifest $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince
 	mkdir $(DISTDIR)/src/msw/ole
@@ -24449,7 +24389,6 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
-	cp $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty
 
 	mkdir $(DISTDIR)/demos/life
 	mkdir $(DISTDIR)/demos/life/bitmaps
@@ -24856,7 +24795,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/*.png $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
 
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit

acinclude.m4

@@ -437,44 +437,7 @@ AC_DEFUN([WX_VERSIONED_SYMBOLS],
         else
           wx_cv_version_script=no
         fi
-
-        dnl There's a problem in some old linkers with --version-script that
-        dnl can cause linking to fail when you have objects with vtables in
-        dnl libs 3 deep.  This is known to happen in netbsd and openbsd with
-        dnl ld 2.11.2.
-        dnl 
-        dnl To test for this we need to make some shared libs and
-        dnl unfortunately we can't be sure of the right way to do that. If the
-        dnl first two compiles don't succeed then it looks like the test isn't
-        dnl working and the result is ignored, but if OTOH the first two
-        dnl succeed but the third does not then the bug has been detected and
-        dnl the --version-script flag is dropped.
-        if test $wx_cv_version_script = yes
-        then
-          echo "struct B { virtual ~B() { } }; \
-                struct D : public B { }; \
-                void F() { D d; }" > conftest.cpp
-
-          if AC_TRY_COMMAND([
-                $CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym >/dev/null 2>/dev/null]) &&
-             AC_TRY_COMMAND([
-                $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null])
-          then
-            if AC_TRY_COMMAND([
-                  $CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                  -Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null])
-            then
-              wx_cv_version_script=yes
-            else
-              wx_cv_version_script=no
-            fi
-          fi
-        fi
-
         rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
-        rm -f conftest1.output conftest2.output conftest3.output
       ])
       if test $wx_cv_version_script = yes ; then
         LDFLAGS_VERSIONING="-Wl,--version-script,$1"

aclocal.m4

@@ -450,44 +450,7 @@ AC_DEFUN([WX_VERSIONED_SYMBOLS],
         else
           wx_cv_version_script=no
         fi
-
-        dnl There's a problem in some old linkers with --version-script that
-        dnl can cause linking to fail when you have objects with vtables in
-        dnl libs 3 deep.  This is known to happen in netbsd and openbsd with
-        dnl ld 2.11.2.
-        dnl 
-        dnl To test for this we need to make some shared libs and
-        dnl unfortunately we can't be sure of the right way to do that. If the
-        dnl first two compiles don't succeed then it looks like the test isn't
-        dnl working and the result is ignored, but if OTOH the first two
-        dnl succeed but the third does not then the bug has been detected and
-        dnl the --version-script flag is dropped.
-        if test $wx_cv_version_script = yes
-        then
-          echo "struct B { virtual ~B() { } }; \
-                struct D : public B { }; \
-                void F() { D d; }" > conftest.cpp
-
-          if AC_TRY_COMMAND([
-                $CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym >/dev/null 2>/dev/null]) &&
-             AC_TRY_COMMAND([
-                $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null])
-          then
-            if AC_TRY_COMMAND([
-                  $CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                  -Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null])
-            then
-              wx_cv_version_script=yes
-            else
-              wx_cv_version_script=no
-            fi
-          fi
-        fi
-
         rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
-        rm -f conftest1.output conftest2.output conftest3.output
       ])
       if test $wx_cv_version_script = yes ; then
         LDFLAGS_VERSIONING="-Wl,--version-script,$1"
@@ -1897,8 +1860,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \
-      *-*-sysv5* | \
-      *-pc-msdosdjgpp )
+      *-*-sysv5* )
         dnl defaults are ok
       ;;
 
@@ -2799,7 +2761,7 @@ while test ${D}# -gt 0; do
         shift
         ;;
 
-       -l*|-L*|-Wl,*|-flat_namespace|-headerpad_max_install_names)
+       -l*|-L*|-flat_namespace|-headerpad_max_install_names)
         # collect these options
         args="${D}{args} ${D}1"
         ;;

art/addbookm.xpm

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

art/back.xpm

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

art/copy.xpm

@@ -1,26 +0,0 @@
-/* XPM */
-static char *copy_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 4 1",
-". c Black",
-"X c #FFFFFF",
-"o c #000080",
-"  c None",
-/* pixels */
-"                ",
-"......          ",
-".XXXX..         ",
-".XXXX.X.        ",
-".X..X.oooooo    ",
-".XXXXXoXXXXoo   ",
-".X....oXXXXoXo  ",
-".XXXXXoX..Xoooo ",
-".X....oXXXXXXXo ",
-".XXXXXoX.....Xo ",
-"......oXXXXXXXo ",
-"      oX.....Xo ",
-"      oXXXXXXXo ",
-"      ooooooooo ",
-"                ",
-"                "
-};

art/cut.xpm

@@ -1,25 +0,0 @@
-/* XPM */
-static char *cut_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 3 1",
-". c Black",
-"X c #000080",
-"  c None",
-/* pixels */
-"                ",
-"     .   .      ",
-"     .   .      ",
-"     .   .      ",
-"     .. ..      ",
-"      . .       ",
-"      ...       ",
-"       .        ",
-"      X.X       ",
-"      X XXX     ",
-"    XXX X  X    ",
-"   X  X X  X    ",
-"   X  X X  X    ",
-"   X  X  XX     ",
-"    XX          ",
-"                "
-};

art/deffile.xpm

@@ -1,83 +1,75 @@
 /* XPM */
-static char *deffile_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 61 1",
-"% c #E8E8EC",
-"k c #D9D9E0",
-"= c #E8E8ED",
-"V c #CACAD4",
-"8 c #D9D9E1",
-"h c #D2D2DA",
-"y c #E1E1E7",
-"l c #D2D2DB",
-"< c #E9E9ED",
-"t c #E9E9EE",
-"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  "
-};
+static char * deffile_xpm[] = {
+"16 16 56 1",
+" 	c None",
+".	c #C6C6D5",
+"+	c #9494AD",
+"@	c #FBFBFC",
+"#	c #F8F8FA",
+"$	c #F4F4F7",
+"%	c #EEEEF2",
+"&	c #EAEAF0",
+"*	c #DEDEE7",
+"=	c #E0E0E9",
+"-	c #F5F5F8",
+";	c #F0F0F4",
+">	c #EDEDF2",
+",	c #E1E1E9",
+"'	c #B8B8C4",
+")	c #A6A6BB",
+"!	c #E4E4EB",
+"~	c #8E8EA2",
+"{	c #AFAFC2",
+"]	c #F7F7F9",
+"^	c #F1F1F5",
+"/	c #E6E6ED",
+"(	c #DBDBE5",
+"_	c #C0C0CC",
+":	c #F2F2F6",
+"<	c #E7E7EE",
+"[	c #E3E3EA",
+"}	c #D0D0DC",
+"|	c #9898A0",
+"1	c #E7E7ED",
+"2	c #FAFAFB",
+"3	c #F3F3F6",
+"4	c #E8E8EE",
+"5	c #CBCBD9",
+"6	c #B3B3BD",
+"7	c #D6D6E1",
+"8	c #F9F9FA",
+"9	c #DCDCE5",
+"0	c #D2D2DE",
+"a	c #95959C",
+"b	c #EAEAEF",
+"c	c #EBEBF1",
+"d	c #DADAE4",
+"e	c #B0B0B3",
+"f	c #E5E5EC",
+"g	c #DFDFE8",
+"h	c #DDDDE6",
+"i	c #B0B0B8",
+"j	c #E9E9EF",
+"k	c #868688",
+"l	c #FFFFFF",
+"m	c #EFEFF3",
+"n	c #BBBBC0",
+"o	c #85858A",
+"p	c #BEBEC0",
+"q	c #D7D7E2",
+"  ........+     ",
+"  .@#$%&*=.+    ",
+"  .@#-;>,=.')   ",
+"  .@#-;%!=+~{+  ",
+"  .@]-^%/=(_.+  ",
+"  .@]-:;<[}|1+  ",
+"  .2]-3;4=567+  ",
+"  .8$:%&970ab+  ",
+"  .-:^c[(d7e]+  ",
+"  .-$%f[ghdi!+  ",
+"  .]^j/!=g(kl+  ",
+"  .]m4/!=g9nj+  ",
+"  .$&4/f[g9o$+  ",
+"  .34<f!,g(p@+  ",
+"  .;44/!=g9dq+  ",
+"  ++++++++++++  "};

art/delbookm.xpm

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

art/delete.xpm

@@ -1,24 +0,0 @@
-/* XPM */
-static char *delete_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 2 1",
-". c Black",
-"  c None",
-/* pixels */
-"                ",
-"  ...         . ",
-"  ....      ..  ",
-"   ....    ..   ",
-"     ...  ..    ",
-"      .....     ",
-"       ...      ",
-"      .....     ",
-"     ...  ..    ",
-"    ...    ..   ",
-"   ...      .   ",
-"  ....       .  ",
-"  ...           ",
-"   .          . ",
-"                ",
-"                "
-};

art/down.xpm

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

art/exefile.xpm

@@ -1,73 +1,150 @@
 /* XPM */
-static char *exefile_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 51 1",
-"% c #E8E8EC",
-"= c #E8E8ED",
-"z c #CACAD4",
-"8 c #D9D9E1",
-"p c #D2D2DA",
-"u c #E1E1E7",
-"a c #D2D2DB",
-"< c #E9E9ED",
-"q c #DADAE1",
-"+ c #F1F1F4",
-"g c #D3D3DB",
-"1 c #E2E2E8",
-"x c #D3D3DC",
-"5 c #00A5FF",
-"$ c #EAEAEE",
-"4 c #DBDBE2",
-"h c #CCCCD6",
-"y c #D4D4DC",
-"r c #E3E3E9",
-"d c #D4D4DD",
-"7 c #DCDCE2",
-": c #EBEBEF",
-"0 c #DCDCE3",
-"  c None",
-"O c #F3F3F5",
-"> c #E4E4E9",
-"& c #F3F3F6",
-"j c #D5D5DD",
-"6 c #E4E4EA",
-". c #C6C6D5",
-"# c #ECECF0",
-"f c #CECED7",
-"l c #CECED8",
-"e c #D6D6DE",
-"; c #EDEDF0",
-"3 c #DEDEE4",
-", c #EDEDF1",
-"c c #CFCFD8",
-"o c #F5F5F7",
-"- c #E6E6EB",
-"w c #D7D7DF",
-"v c #C8C8D3",
-"i c #DFDFE5",
-"@ c #EEEEF2",
-"s c #D0D0D9",
-"X c #9494AD",
-"9 c #D8D8DF",
-"t c #D8D8E0",
-"* c #EFEFF2",
-"2 c #E0E0E6",
-"k c #D1D1DA",
-/* pixels */
-"  ........X     ",
-"  .oO+@#$%XX    ",
-"  .&+*#$=-XXX   ",
-"  .+*;:=->XXXX  ",
-"  .*,:<->1234X  ",
-"  .,5:5612378X  ",
-"  5,5559530qwX  ",
-"  55555550q9eX  ",
-" 5555r5555teyX  ",
-"  55rui559eypX  ",
-" 5555i5555yasX  ",
-"  5555555dasfX  ",
-"  5355595gsfhX  ",
-"  .3595jgklhzX  ",
-"  .0qwjxkchzvX  ",
-"  XXXXXXXXXXXX  "
-};
+static char * exefile_xpm[] = {
+"16 16 131 2",
+"  	c None",
+". 	c #D0D0DF",
+"+ 	c #9C9CB6",
+"@ 	c #FFFFFF",
+"# 	c #F9F9FE",
+"$ 	c #F5F5FC",
+"% 	c #E9E9F2",
+"& 	c #EBEBF4",
+"* 	c #5BB5F6",
+"= 	c #AAC6E6",
+"- 	c #D3E9FB",
+"; 	c #D2E8FB",
+"> 	c #FCFCFF",
+", 	c #F8F8FE",
+"' 	c #ECECF4",
+") 	c #D3D3E1",
+"! 	c #60BBF8",
+"~ 	c #11D8FD",
+"{ 	c #24C9F9",
+"] 	c #31BBF5",
+"^ 	c #24BFF6",
+"/ 	c #B9D8F7",
+"( 	c #EFEFF6",
+"_ 	c #1DC9FD",
+": 	c #16CFFC",
+"< 	c #0DB1F1",
+"[ 	c #237EDC",
+"} 	c #2C75D7",
+"| 	c #2A93E5",
+"1 	c #349EEC",
+"2 	c #2C9EEC",
+"3 	c #B0CDF4",
+"4 	c #F1F1F8",
+"5 	c #E6E6F0",
+"6 	c #D7D7E5",
+"7 	c #C9C9DA",
+"8 	c #26A4FA",
+"9 	c #04C3FA",
+"0 	c #2E7FDB",
+"a 	c #5B9BDA",
+"b 	c #4E9ADE",
+"c 	c #368EDA",
+"d 	c #3D96E2",
+"e 	c #3BA7F0",
+"f 	c #7EAEEC",
+"g 	c #F2F2F9",
+"h 	c #EEEEF5",
+"i 	c #DADAE7",
+"j 	c #CECEDD",
+"k 	c #CCCCDB",
+"l 	c #37B8F8",
+"m 	c #10BEFD",
+"n 	c #0AB0F6",
+"o 	c #C3E5F7",
+"p 	c #51BAEB",
+"q 	c #4EB6EF",
+"r 	c #28A4F1",
+"s 	c #62A3E9",
+"t 	c #D5D5E4",
+"u 	c #D2D2E0",
+"v 	c #2AA5F9",
+"w 	c #00ACFF",
+"x 	c #03B4FD",
+"y 	c #3189E5",
+"z 	c #C8F2FD",
+"A 	c #55DBFB",
+"B 	c #32BDFD",
+"C 	c #0E96EE",
+"D 	c #B0C1E7",
+"E 	c #DCDCE9",
+"F 	c #DBDBE8",
+"G 	c #D8D8E6",
+"H 	c #3A9AF3",
+"I 	c #1F8AF7",
+"J 	c #00A6FF",
+"K 	c #18A1F6",
+"L 	c #94B9E4",
+"M 	c #FEFEFF",
+"N 	c #FDFDFF",
+"O 	c #6FE4FF",
+"P 	c #2FBAFF",
+"Q 	c #2579DF",
+"R 	c #D8DDED",
+"S 	c #E0E0EC",
+"T 	c #DEDEEB",
+"U 	c #4396EA",
+"V 	c #08A0FC",
+"W 	c #00A2FF",
+"X 	c #18A2FA",
+"Y 	c #61B7F6",
+"Z 	c #B0DEFC",
+"` 	c #B0E0FD",
+" .	c #5AC3FE",
+"..	c #07A5FF",
+"+.	c #0399FA",
+"@.	c #7EA0E1",
+"#.	c #E5E5EF",
+"$.	c #E1E1ED",
+"%.	c #2F9BEE",
+"&.	c #00A0FF",
+"*.	c #00A5FF",
+"=.	c #00A3FF",
+"-.	c #0098FF",
+";.	c #009FFF",
+">.	c #078FEE",
+",.	c #8BA8E4",
+"'.	c #E4E4EE",
+").	c #3A8AE5",
+"!.	c #1AA8F0",
+"~.	c #2A89E5",
+"{.	c #0EB5F5",
+"].	c #0095FF",
+"^.	c #00B9FF",
+"/.	c #087AEB",
+"(.	c #5583DB",
+"_.	c #EAEAF3",
+":.	c #E7E7F0",
+"<.	c #4782DC",
+"[.	c #00ADFF",
+"}.	c #0C83ED",
+"|.	c #2C99E6",
+"1.	c #01CAFC",
+"2.	c #1779E3",
+"3.	c #C4D0EE",
+"4.	c #598ADA",
+"5.	c #0EA2EA",
+"6.	c #6A9FE5",
+"7.	c #C8D5F1",
+"8.	c #568CDF",
+"9.	c #C4D1EE",
+"0.	c #F3F3F9",
+"        . . . . . . . . +       ",
+"        . @ @ @ # $ % & . +     ",
+"      * = - ; @ > , ' & . ) +   ",
+"  ! * ~ { ] ^ / > # ( & + + + + ",
+"  _ : < [ } | 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 Q R S T E + ",
+"  U V W X Y Z `  ...+.@.#.$.S + ",
+"  %.&.*.=.-.-.-.-.;.>.,.5 '.S + ",
+"  ).!.~.{.].].^.=./.(._.:.#.$.+ ",
+"        <.[.}.|.1.2.3._.:.#.$.+ ",
+"        4.5.6.7.8.9.' _.5 #.$.+ ",
+"        . > 0.0.4 ( & _.:.#.$.+ ",
+"        + + + + + + + + + + + + "};

art/filesave.xpm

@@ -1,25 +0,0 @@
-/* XPM */
-static char *filesave_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 3 1",
-". c Black",
-"X c #808000",
-"  c None",
-/* pixels */
-"                ",
-" .............. ",
-" .X.        . . ",
-" .X.        ... ",
-" .X.        .X. ",
-" .X.        .X. ",
-" .X.        .X. ",
-" .X.        .X. ",
-" .XX........XX. ",
-" .XXXXXXXXXXXX. ",
-" .XX.........X. ",
-" .XX......  .X. ",
-" .XX......  .X. ",
-" .XX......  .X. ",
-"  ............. ",
-"                "
-};

art/filesaveas.xpm

@@ -1,25 +0,0 @@
-/* XPM */
-static char *filesaveas_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 3 1",
-". c Black",
-"X c #808000",
-"  c None",
-/* pixels */
-"                ",
-" .............. ",
-" .X.        . . ",
-" .X.        ... ",
-" .X.        .X. ",
-" .X.        .X. ",
-" .X.        .X. ",
-" .X.        .X. ",
-" .XX........XX. ",
-" .XXXXXXXXXXXX. ",
-" .XX.........X. ",
-" .XX......  .X. ",
-" .XX......  .X. ",
-" .XX......  .X. ",
-"  ............. ",
-"                "
-};

art/find.xpm

@@ -1,25 +0,0 @@
-/* XPM */
-static char *find_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 3 1",
-". c Black",
-"X c #FFFFFF",
-"  c None",
-/* pixels */
-"                ",
-"   ...   ...    ",
-"   .X.   .X.    ",
-"   ...   ...    ",
-"  ..... .....   ",
-"  .X... .X...   ",
-" .............  ",
-"..X... ..X..... ",
-"..X... ..X..... ",
-"..X......X..... ",
-"....... ....... ",
-".X...     .X... ",
-".X...     .X... ",
-".....     ..... ",
-"                ",
-"                "
-};

art/findrepl.xpm

@@ -1,40 +0,0 @@
-/* XPM */
-static char *findrepl_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 2 1",
-". c Black",
-"  c None",
-/* pixels */
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"           ....   ...           ",
-"           .   . .   .          ",
-"           .   . .   .          ",
-"           .   . .   .          ",
-"           .   . .   .          ",
-"           .   .  ...           ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"       .                        ",
-"                                ",
-"       .  ...  ...  ....        ",
-"       . .    .   . .   .       ",
-"       . .    .   . .   .       ",
-"       . .    .   . .   .       ",
-"       . .    .   . .   .       ",
-"       .  ...  ...  .   .       ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "
-};

art/forward.xpm

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

art/gtk/error.xpm

@@ -1,58 +1,522 @@
 /* XPM */
-static char *error_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 4 1",
-"  c None",
-"X c #242424",
-"o c #DCDF00",
-". c #C00000",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                    .....                       ",
-"                .............                   ",
-"              .................                 ",
-"             ...................                ",
-"           .......................              ",
-"          .........................             ",
-"         ...........................            ",
-"         ...........................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                     ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+static char * error_xpm[] = {
+"48 48 471 2",
+"  	c None",
+". 	c #FD3819",
+"+ 	c #FD3319",
+"@ 	c #FA3019",
+"# 	c #F33119",
+"$ 	c #EE301A",
+"% 	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",
+"] 	c #B42717",
+"^ 	c #BC2A18",
+"/ 	c #C62C1A",
+"( 	c #CD2E1C",
+"_ 	c #CF2F1C",
+": 	c #FF3216",
+"< 	c #DD2A14",
+"[ 	c #C32613",
+"} 	c #B32311",
+"| 	c #AE2312",
+"1 	c #AB2313",
+"2 	c #A82212",
+"3 	c #A52212",
+"4 	c #961F11",
+"5 	c #952011",
+"6 	c #A22314",
+"7 	c #A72516",
+"8 	c #A92718",
+"9 	c #AB2719",
+"0 	c #B32A1A",
+"a 	c #BD2C1D",
+"b 	c #B52A1C",
+"c 	c #FD3518",
+"d 	c #EB2D14",
+"e 	c #C32512",
+"f 	c #B12311",
+"g 	c #AC2211",
+"h 	c #A92211",
+"i 	c #A82312",
+"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,63 +1,474 @@
 /* XPM */
-static char *info_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"$ c Black",
-"O c #FFFFFF",
-"@ c #808080",
-"+ c #000080",
-"o c #E8EB01",
-"  c None",
-"X c #FFFF40",
-"# c #C0C0C0",
-". c #ABAD01",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                     .....                      ",
-"                   ..XXXXX..                    ",
-"                 ..XXXXXXXXo..                  ",
-"                .XXXOXXXXXXXoo.                 ",
-"                .XOOXXX+XXXXXo.                 ",
-"               .XOOOXX+++XXXXoo.                ",
-"               .XOOXXX+++XXXXXo.                ",
-"              .XOOOXXX+++XXXXXXo.               ",
-"              .XOOXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXXX.               ",
-"              .XXXXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXoo.               ",
-"               .XXXXXX+++XXXXXo.                ",
-"               .XXXXXXX+XXXXXXo.                ",
-"                .XXXXXXXXXXXXo.                 ",
-"                .XXXXX+++XXXoo.                 ",
-"                 .XXXX+++XXoo.                  ",
-"                  .XXXXXXXXo.                   ",
-"                  ..XXXXXXo..                   ",
-"                   .XXXXXo..                    ",
-"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
-"                    @@@@@@@                     ",
-"                      ###                       ",
-"                      $$$                       ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+static char * info_xpm[] = {
+"48 48 423 2",
+"  	c None",
+". 	c #FEFEFE",
+"+ 	c #FFFFFF",
+"@ 	c #F1F1F1",
+"# 	c #CACACA",
+"$ 	c #CBCBCB",
+"% 	c #EDEDED",
+"& 	c #999999",
+"* 	c #4B4B4B",
+"= 	c #131313",
+"- 	c #2E2E2E",
+"; 	c #393732",
+"> 	c #423F36",
+", 	c #242119",
+"' 	c #282828",
+") 	c #626262",
+"! 	c #C2C2C2",
+"~ 	c #FAFAFA",
+"{ 	c #2D2D2D",
+"] 	c #736F61",
+"^ 	c #E0CE8A",
+"/ 	c #EFDD8F",
+"( 	c #F4E298",
+"_ 	c #F4E191",
+": 	c #F3E093",
+"< 	c #ECD78C",
+"[ 	c #D8C78E",
+"} 	c #B7AA7C",
+"| 	c #9B8C5A",
+"1 	c #5F5C4F",
+"2 	c #B6B6B6",
+"3 	c #FEFEFD",
+"4 	c #A1A1A1",
+"5 	c #1E1E1E",
+"6 	c #C2BEAF",
+"7 	c #F1DC92",
+"8 	c #F5E190",
+"9 	c #F7E7A5",
+"0 	c #F8EAAE",
+"a 	c #F9E9A7",
+"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,75 +1,125 @@
 /* XPM */
-static char *question_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 21 1",
-". c Black",
-"> c #696969",
-"O c #1F1F00",
-"+ c #181818",
-"o c #F6F900",
-"; c #3F3F00",
-"$ c #111111",
-"  c None",
-"& c #202020",
-"X c #AAAA00",
-"@ c #949400",
-": c #303030",
-"1 c #383838",
-"% c #2A2A00",
-", c #404040",
-"= c #B4B400",
-"- c #484848",
-"# c #151500",
-"< c #9F9F00",
-"2 c #6A6A00",
-"* c #353500",
-/* pixels */
+static char * question_xpm[] = {
+"48 48 74 1",
+" 	c None",
+".	c #000000",
+"+	c #A27F3B",
+"@	c #B89243",
+"#	c #D8AB4E",
+"$	c #9D7D3A",
+"%	c #A6823C",
+"&	c #7C622D",
+"*	c #F7D899",
+"=	c #F7E2B8",
+"-	c #D8BA7B",
+";	c #BE9B53",
+">	c #F7C35A",
+",	c #F7DFAF",
+"'	c #F7E5C0",
+")	c #F7D48C",
+"!	c #F7CF7E",
+"~	c #D8B15F",
+"{	c #6E5526",
+"]	c #F7DCA5",
+"^	c #A8843D",
+"/	c #937435",
+"(	c #AA863E",
+"_	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...                      ",
+"                     ....                       ",
 "                                                ",
-"                                                ",
-"                   .......                      ",
-"                  ..XXXXX..                     ",
-"                 ..XXoooXX..                    ",
-"                 ..XoooooX..                    ",
-"                 ..XoooooX..                    ",
-"                 ..XXoooXX..                    ",
-"                  ..XXXXX..                     ",
-"                   .......                      ",
+"                     F....                      ",
+"                    .G!)8..                     ",
+"                    .!**#..                     ",
+"                    .))~8..                     ",
+"                    .)_#8..                     ",
+"                    .H~8I..                     ",
+"                     ......                     ",
+"                      ....                      ",
 "                                                ",
 "                                                ",
 "                                                ",
 "                                                ",
 "                                                ",
-"                                                "
-};
+"                                                ",
+"                                                "};

art/gtk/warning.xpm

@@ -1,63 +1,291 @@
 /* XPM */
-static char *warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"@ c Black",
-"o c #A6A800",
-"+ c #8A8C00",
-"$ c #B8BA00",
-"  c None",
-"O c #6E7000",
-"X c #DCDF00",
-". c #C00000",
-"# c #373800",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                      .                         ",
-"                     ...                        ",
-"                     ...                        ",
-"                    .....                       ",
-"                   ...X..                       ",
-"                   ..XXX..                      ",
-"                  ...XXX...                     ",
-"                  ..XXXXX..                     ",
-"                 ..XXXXXX...                    ",
-"                ...XXoO+XX..                    ",
-"                ..XXXO@#XXX..                   ",
-"               ..XXXXO@#XXX...                  ",
-"              ...XXXXO@#XXXX..                  ",
-"              ..XXXXXO@#XXXX...                 ",
-"             ...XXXXXo@OXXXXX..                 ",
-"            ...XXXXXXo@OXXXXXX..                ",
-"            ..XXXXXXX$@OXXXXXX...               ",
-"           ...XXXXXXXX@XXXXXXXX..               ",
-"          ...XXXXXXXXXXXXXXXXXX...              ",
-"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"       ..............................           ",
-"       ..............................           ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+static char * warning_xpm[] = {
+"48 48 240 2",
+"  	c None",
+". 	c #F42A14",
+"+ 	c #C62210",
+"@ 	c #F62B14",
+"# 	c #D22411",
+"$ 	c #A91D0F",
+"% 	c #85170C",
+"& 	c #F62913",
+"* 	c #D52511",
+"= 	c #A71D0E",
+"- 	c #A11C0E",
+"; 	c #9B1B0E",
+"> 	c #641209",
+", 	c #F72913",
+"' 	c #E02712",
+") 	c #B31F0F",
+"! 	c #A41C0E",
+"~ 	c #8A180C",
+"{ 	c #EC2913",
+"] 	c #B9200F",
+"^ 	c #B14010",
+"/ 	c #9A1C0F",
+"( 	c #631109",
+"_ 	c #F52A13",
+": 	c #CA2310",
+"< 	c #BB5B11",
+"[ 	c #C26F12",
+"} 	c #A31D0F",
+"| 	c #A01D0F",
+"1 	c #921A0E",
+"2 	c #F52913",
+"3 	c #DB2612",
+"4 	c #A61D0F",
+"5 	c #E0AD11",
+"6 	c #DFB112",
+"7 	c #77150C",
+"8 	c #B72010",
+"9 	c #A31C0E",
+"0 	c #E1AE12",
+"a 	c #D28814",
+"b 	c #9F1D10",
+"c 	c #911A0F",
+"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,24 +1,21 @@
 /* XPM */
-static char *home_xpm[] = {
-/* columns rows colors chars-per-pixel */
+static char * home_xpm[] = {
 "16 15 3 1",
-". c Black",
-"X c #FFFFFF",
-"  c None",
-/* pixels */
-"      ....      ",
-"     .XXXX.     ",
-"    .XXXXXX.    ",
-"   .XXXXXXXX.   ",
+" 	c None",
+".	c #000000000000",
+"X	c #FFFFFFFFFFFF",
+"       ..       ",
+"  .   .XX.      ",
+"  .  .XXXX.     ",
+"  . .XXXXXX.    ",
+"  ..XXXXXXXX.   ",
 "  .XXXXXXXXXX.  ",
-" .............. ",
 " .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .X.....X....X. ",
-" .X.   .X.  .X. ",
-" .X.   .X.  .X. ",
-" .X.....X.  .X. ",
-" .XXXXXXX.  .X. ",
-" .........  ... "
-};
+"...XXXXXXXXXX...",
+"  .XXXXXXXXXX.  ",
+"  .XXX...XXXX.  ",
+"  .XXX. .XXXX.  ",
+"  .XXX. .XXXX.  ",
+"  .XXX. .XXXX.  ",
+"  .XXX. .XXXX.  ",
+"  ..... ......  "};

art/htmbook.xpm

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

art/htmfoldr.xpm

@@ -1,25 +1,27 @@
 /* XPM */
 static char * htmfoldr_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c Black",
-"X	c #000080",
-"o	c #c0c0c0",
-"O	c #808080",
-"+	c Gray100",
+/* width height ncolors chars_per_pixel */
+"16 15 6 1",
+/* colors */
+"  s None   c None",
+". c #000000",
+"+ c #c0c0c0",
+"@ c #808080",
+"# 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/htmpage.xpm

@@ -1,23 +1,24 @@
 /* XPM */
 static char * htmpage_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #808080",
-"X	c Gray100",
-"o	c Black",
+/* width height ncolors chars_per_pixel */
+"16 15 3 1",
+/* colors */
+" 	s None	c None",
+".	c #000000",
+"+	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,28 +1,23 @@
 /* XPM */
-static char *htmsidep_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 6 1",
-". c Black",
-"X c #FFFFFF",
-"+ c #808080",
-"  c None",
-"O c #0000C0",
-"o c #C0C0C0",
-/* pixels */
+static char * htmsidep_xpm[] = {
+"16 15 5 1",
+" 	c None",
+".	c #000000",
+"*	c #C0C0C0",
+"=	c #808080",
+"!	c #FFFFFF",
 "                ",
 " .............. ",
-" .XXXX.ooooooo. ",
-" .XOXX.oo...oo. ",
-" .XXOX.ooooooo. ",
-" .OOOO.o...+.o. ",
-" .XXOX.ooooooo. ",
-" .XOXX.ooooooo. ",
-" .XXXX.o..+ooo. ",
-" .XXOX.ooooooo. ",
-" .XOXX.o...+.o. ",
-" .OOOO.ooooooo. ",
-" .XOXX.o.+...o. ",
-" .XXOX.ooooooo. ",
+" .************. ",
 " .............. ",
-"                "
-};
+" .****.!!!!!!!. ",
+" .****.!====*!. ",
+" .****.!!!!!!!. ",
+" .****.!===*!!. ",
+" .****.!!!!!!!. ",
+" .****.!====*!. ",
+" .****.!!!!!!!. ",
+" .****.!===*!!. ",
+" .****.!!!!!!!. ",
+" .............. ",
+"                "};

art/listview.xpm

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

art/missimg.xpm

@@ -1,43 +1,41 @@
 /* XPM */
-static char *missimg_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 5 1",
-"X c Black",
-"o c #FFFFFF",
-"  c None",
-". c #C0C0C0",
-"O c #E0E0E0",
-/* pixels */
-" .............................X ",
-" .ooooooooooooooooooooooooooooX ",
-" .ooooooooooooooooooooooooooooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
-" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
-"    XXXXX    XOOOOOOOOOOOOOOooX ",
-"              XOOOXXXOOOOOOOooX ",
-"               XXX   XXOOOOOooX ",
-"                       XOOOOooX ",
-" .                      XOOOooX ",
-" ..                      XXOooX ",
-" .o..                      XooX ",
-" .ooO...                    XXX ",
-" .ooOOOO..........              ",
-" .ooOOOOOOOOOOOOOO..            ",
-" .ooOOOOOOOOOOOOOOOO..          ",
-" .ooOOOOOOOOOOOOOOOOOO......... ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooooooooooooooooooooooooooooX ",
-" .ooooooooooooooooooooooooooooX ",
-" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
-};
+static char * missimg_xpm[] = {
+"29 31 7 1",
+"   c None",
+".  c #808080",
+"+  c #FFFFFF",
+"@  c #C0C0C0",
+"#  c #000000",
+"$  c #333366",
+"%  c #B2B2B2",
+".....................        ",
+".+++++++++++++++++++..       ",
+".+++++++++++++++++++.@.      ",
+".++@@@@@@@@@@@@@@@@@.+@.     ",
+".++@@@@@@@@@@@@@@@@@.++@.    ",
+".++@@@@@.@@@@.@@@@@@.+++@.   ",
+".++@@@@@@@@@@@@@@@@@.++++@.  ",
+".++@@@@@@@@@@@@@@@@@.+++++@. ",
+".++@@.@@@@@@@@@@.@@@######## ",
+".++@@@@@@@@@@@@@@@@@@$$$$$$#.",
+".######@@@@@@@@@@@@@@@.....#.",
+"       ###@@@@@@@@@@@@@@@++#.",
+"          #####@@@@@@@@@@++#.",
+"              #@.@@@@@@@@++#.",
+"..             ###@@@@@@@++#.",
+".+....            #@@@@@@++#.",
+".++@@@...          ####@@++#.",
+".++@@@@@@..            #####.",
+".++@@@@@@@@...               ",
+".++@@@@@@%%%%@.              ",
+".++@@@@@@%%%%@@....          ",
+".++@@@@@@%%%%@@@@@@....      ",
+".++@@@@@@%%%%@@@@@@@@@@....  ",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++++++++++++++++++++++++++#.",
+".++++++++++++++++++++++++++#.",
+"############################."};

art/motif/error.xpm

@@ -1,58 +1,129 @@
 /* XPM */
-static char *error_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 4 1",
-"  c None",
-"X c #242424",
-"o c #DCDF00",
-". c #C00000",
-/* pixels */
+static char * error_xpm[] = {
+"48 48 78 1",
+" 	c None",
+".	c #000000",
+"+	c #200000",
+"@	c #4A0000",
+"#	c #6B0000",
+"$	c #8F0000",
+"%	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,63 +1,210 @@
 /* XPM */
-static char *info_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"$ c Black",
-"O c #FFFFFF",
-"@ c #808080",
-"+ c #000080",
-"o c #E8EB01",
-"  c None",
-"X c #FFFF40",
-"# c #C0C0C0",
-". c #ABAD01",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                     .....                      ",
-"                   ..XXXXX..                    ",
-"                 ..XXXXXXXXo..                  ",
-"                .XXXOXXXXXXXoo.                 ",
-"                .XOOXXX+XXXXXo.                 ",
-"               .XOOOXX+++XXXXoo.                ",
-"               .XOOXXX+++XXXXXo.                ",
-"              .XOOOXXX+++XXXXXXo.               ",
-"              .XOOXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXXX.               ",
-"              .XXXXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXoo.               ",
-"               .XXXXXX+++XXXXXo.                ",
-"               .XXXXXXX+XXXXXXo.                ",
-"                .XXXXXXXXXXXXo.                 ",
-"                .XXXXX+++XXXoo.                 ",
-"                 .XXXX+++XXoo.                  ",
-"                  .XXXXXXXXo.                   ",
-"                  ..XXXXXXo..                   ",
-"                   .XXXXXo..                    ",
-"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
-"                    @@@@@@@                     ",
-"                      ###                       ",
-"                      $$$                       ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+static char * info_xpm[] = {
+"48 48 159 2",
+"  	c None",
+". 	c #12165C",
+"+ 	c #9E9EC4",
+"@ 	c #565294",
+"# 	c #2E3274",
+"$ 	c #1A227C",
+"% 	c #16229C",
+"& 	c #262274",
+"* 	c #362E8C",
+"= 	c #262A9C",
+"- 	c #121E7C",
+"; 	c #1A2AAC",
+"> 	c #162284",
+", 	c #262EA4",
+"' 	c #2A2A84",
+") 	c #1E1E6C",
+"! 	c #3E3A84",
+"~ 	c #7A72B4",
+"{ 	c #121E74",
+"] 	c #1E2284",
+"^ 	c #2A2E9C",
+"/ 	c #362E9C",
+"( 	c #D2D2E4",
+"_ 	c #62669C",
+": 	c #1E269C",
+"< 	c #1A2AB4",
+"[ 	c #6A6EAC",
+"} 	c #121A6C",
+"| 	c #2E2A84",
+"1 	c #26268C",
+"2 	c #3E328C",
+"3 	c #322E9C",
+"4 	c #B6B6CC",
+"5 	c #1626AC",
+"6 	c #1E268C",
+"7 	c #2E267C",
+"8 	c #363294",
+"9 	c #1A2694",
+"0 	c #22226C",
+"a 	c #26267C",
+"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,75 +1,216 @@
 /* XPM */
-static char *question_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 21 1",
-". c Black",
-"> c #696969",
-"O c #1F1F00",
-"+ c #181818",
-"o c #F6F900",
-"; c #3F3F00",
-"$ c #111111",
-"  c None",
-"& c #202020",
-"X c #AAAA00",
-"@ c #949400",
-": c #303030",
-"1 c #383838",
-"% c #2A2A00",
-", c #404040",
-"= c #B4B400",
-"- c #484848",
-"# c #151500",
-"< c #9F9F00",
-"2 c #6A6A00",
-"* c #353500",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                   .........                    ",
-"                 ...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..                    ",
-"                   ........                     ",
-"                                                ",
-"                                                ",
-"                   .......                      ",
-"                  ..XXXXX..                     ",
-"                 ..XXoooXX..                    ",
-"                 ..XoooooX..                    ",
-"                 ..XoooooX..                    ",
-"                 ..XXoooXX..                    ",
-"                  ..XXXXX..                     ",
-"                   .......                      ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+static char * question_xpm[] = {
+"48 48 165 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #080808",
+"@ 	c #2A2A2A",
+"# 	c #434343",
+"$ 	c #545454",
+"% 	c #626262",
+"& 	c #6A6A6A",
+"* 	c #6E6E6E",
+"= 	c #424242",
+"- 	c #525252",
+"; 	c #898989",
+"> 	c #DCDCDC",
+", 	c #E5E5E5",
+"' 	c #EDEDED",
+") 	c #F4F4F4",
+"! 	c #F9F9F9",
+"~ 	c #FCFCFC",
+"{ 	c #FFFFFF",
+"] 	c #888888",
+"^ 	c #4F4F4F",
+"/ 	c #050505",
+"( 	c #0F0F0F",
+"_ 	c #9C9C9C",
+": 	c #E6E6E6",
+"< 	c #9B9B9B",
+"[ 	c #1F1F1F",
+"} 	c #A1A1A1",
+"| 	c #E3E3E3",
+"1 	c #4D4D4D",
+"2 	c #D6D6D6",
+"3 	c #ECECEC",
+"4 	c #D9D9D9",
+"5 	c #C6C6C6",
+"6 	c #B0B0B0",
+"7 	c #848484",
+"8 	c #D3D3D3",
+"9 	c #010101",
+"0 	c #8B8B8B",
+"a 	c #F2F2F2",
+"b 	c #F3F3F3",
+"c 	c #A6A6A6",
+"d 	c #5E5E5E",
+"e 	c #2F2F2F",
+"f 	c #272727",
+"g 	c #202020",
+"h 	c #4E4E4E",
+"i 	c #8A8A8A",
+"j 	c #0B0B0B",
+"k 	c #B6B6B6",
+"l 	c #5D5D5D",
+"m 	c #131313",
+"n 	c #9A9A9A",
+"o 	c #C9C9C9",
+"p 	c #878787",
+"q 	c #0A0A0A",
+"r 	c #373737",
+"s 	c #DADADA",
+"t 	c #B4B4B4",
+"u 	c #B1B1B1",
+"v 	c #030303",
+"w 	c #767676",
+"x 	c #FDFDFD",
+"y 	c #FAFAFA",
+"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,63 +1,202 @@
 /* XPM */
-static char *warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"@ c Black",
-"o c #A6A800",
-"+ c #8A8C00",
-"$ c #B8BA00",
-"  c None",
-"O c #6E7000",
-"X c #DCDF00",
-". c #C00000",
-"# c #373800",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                      .                         ",
-"                     ...                        ",
-"                     ...                        ",
-"                    .....                       ",
-"                   ...X..                       ",
-"                   ..XXX..                      ",
-"                  ...XXX...                     ",
-"                  ..XXXXX..                     ",
-"                 ..XXXXXX...                    ",
-"                ...XXoO+XX..                    ",
-"                ..XXXO@#XXX..                   ",
-"               ..XXXXO@#XXX...                  ",
-"              ...XXXXO@#XXXX..                  ",
-"              ..XXXXXO@#XXXX...                 ",
-"             ...XXXXXo@OXXXXX..                 ",
-"            ...XXXXXXo@OXXXXXX..                ",
-"            ..XXXXXXX$@OXXXXXX...               ",
-"           ...XXXXXXXX@XXXXXXXX..               ",
-"          ...XXXXXXXXXXXXXXXXXX...              ",
-"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"       ..............................           ",
-"       ..............................           ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+static char * warning_xpm[] = {
+"48 48 151 2",
+"  	c None",
+". 	c #C70707",
+"+ 	c #F80808",
+"@ 	c #EA0808",
+"# 	c #A50505",
+"$ 	c #E10808",
+"% 	c #F70808",
+"& 	c #E85959",
+"* 	c #F80909",
+"= 	c #F90909",
+"- 	c #CD0707",
+"; 	c #EE0808",
+"> 	c #F12B2B",
+", 	c #F5F4F4",
+"' 	c #DE5F5F",
+") 	c #AE0606",
+"! 	c #D2ACAC",
+"~ 	c #FEFEFE",
+"{ 	c #E5DFDF",
+"] 	c #F91717",
+"^ 	c #E30808",
+"/ 	c #DC4C4C",
+"( 	c #FCFCFC",
+"_ 	c #D68585",
+": 	c #DB0707",
+"< 	c #F80C0C",
+"[ 	c #DECDCD",
+"} 	c #F6F5F5",
+"| 	c #ED2B2B",
+"1 	c #F50808",
+"2 	c #D66D6D",
+"3 	c #FFFFFF",
+"4 	c #D2A9A9",
+"5 	c #BB0606",
+"6 	c #E70808",
+"7 	c #F11A1A",
+"8 	c #EDE9E9",
+"9 	c #E84646",
+"0 	c #D59696",
+"a 	c #DDCCCC",
+"b 	c #F90E0E",
+"c 	c #CE0707",
+"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/new.xpm

@@ -1,25 +0,0 @@
-/* XPM */
-static char *new_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 3 1",
-". c Black",
-"X c #FFFFFF",
-"  c None",
-/* pixels */
-"                ",
-"  ........      ",
-"  .XXXXXX..     ",
-"  .XXXXXX.X.    ",
-"  .XXXXXX....   ",
-"  .XXXXXXXXX.   ",
-"  .XXXXXXXXX.   ",
-"  .XXXXXXXXX.   ",
-"  .XXXXXXXXX.   ",
-"  .XXXXXXXXX.   ",
-"  .XXXXXXXXX.   ",
-"  .XXXXXXXXX.   ",
-"  .XXXXXXXXX.   ",
-"  ...........   ",
-"                ",
-"                "
-};

art/paste.xpm

@@ -1,29 +0,0 @@
-/* XPM */
-static char *paste_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 7 1",
-". c Black",
-"@ c #FFFFFF",
-"O c #808080",
-"+ c #000080",
-"X c #FFFF00",
-"o c #808000",
-"  c None",
-/* pixels */
-"                ",
-"     ....       ",
-" .....XX.....   ",
-".oOo.X..X.OoO.  ",
-".OO.      .Oo.  ",
-".oO........OO.  ",
-".OoOoOoOoOoOo.  ",
-".oOoOo+++++++.  ",
-".OoOoO+@@@@@++  ",
-".oOoOo+@@@@@+@+ ",
-".OoOoO+@+++@++++",
-".oOoOo+@@@@@@@@+",
-".OoOoO+@++++++@+",
-" .....+@@@@@@@@+",
-"      ++++++++++",
-"                "
-};

art/quit.xpm

@@ -1,40 +0,0 @@
-/* XPM */
-static char *quit_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 2 1",
-". c Black",
-"  c None",
-/* pixels */
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"           ....   ...           ",
-"           .   . .   .          ",
-"           .   . .   .          ",
-"           .   . .   .          ",
-"           .   . .   .          ",
-"           .   .  ...           ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"       .                        ",
-"                                ",
-"       .  ...  ...  ....        ",
-"       . .    .   . .   .       ",
-"       . .    .   . .   .       ",
-"       . .    .   . .   .       ",
-"       . .    .   . .   .       ",
-"       .  ...  ...  .   .       ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "
-};

art/redo.xpm

@@ -1,25 +0,0 @@
-/* XPM */
-static char *redo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 3 1",
-". c #808080",
-"X c #000080",
-"  c None",
-/* pixels */
-"                ",
-"                ",
-"                ",
-"                ",
-"   .XXXX        ",
-"  .X    XX   X  ",
-"  X       X XX  ",
-"  X        XXX  ",
-"  X       XXXX  ",
-"  .X     XXXXX  ",
-"   X.           ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "
-};

art/repview.xpm

@@ -1,25 +1,23 @@
 /* XPM */
-static char *repview_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 3 1",
-"  c Black",
-"X c #FFFFFF",
-". c #C0C0C0",
-/* pixels */
-"                ",
-" .............. ",
-" .  .    .    . ",
-" .............. ",
-" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
-"                "
-};
+static char * repview_xpm[] = {
+"16 16 4 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"@	c #000083",
+"................",
+".++++++++++++++.",
+".++++++++++++++.",
+".+++....+...+.+.",
+".++++++++++++++.",
+".+@@@@@@@@@@@.+.",
+".++++++++++++++.",
+".+@+....+...+.+.",
+".++++++++++++++.",
+".+@+....+...+.+.",
+".++++++++++++++.",
+".+@+....+...+.+.",
+".++++++++++++++.",
+".+@+....+...+.+.",
+".++++++++++++++.",
+"................"};

art/tipicon.xpm

@@ -1,47 +1,45 @@
 /* XPM */
 static char *tipicon_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"32 32 9 1",
-"$ c Black",
-"O c #FFFFFF",
-"@ c #808080",
-"+ c #000080",
-"o c #E8EB01",
-"  c None",
-"X c #FFFF40",
-"# c #C0C0C0",
-". c #ABAD01",
+"32 32 7 1",
+"  c Gray0",
+". c Cyan",
+"X c Yellow",
+"o c #808080808080",
+"O c #c0c0c0c0c0c0",
+"+ c Gray100",
+"@ c None",
 /* pixels */
-"                                ",
-"             .....              ",
-"           ..XXXXX..            ",
-"         ..XXXXXXXXo..          ",
-"        .XXXOXXXXXXXoo.         ",
-"        .XOOXXX+XXXXXo.         ",
-"       .XOOOXX+++XXXXoo.        ",
-"       .XOOXXX+++XXXXXo.        ",
-"      .XOOOXXX+++XXXXXXo.       ",
-"      .XOOXXXX+++XXXXXXo.       ",
-"      .XXXXXXX+++XXXXXXX.       ",
-"      .XXXXXXX+++XXXXXXo.       ",
-"      .XXXXXXX+++XXXXXoo.       ",
-"       .XXXXXX+++XXXXXo.        ",
-"       .XXXXXXX+XXXXXXo.        ",
-"        .XXXXXXXXXXXXo.         ",
-"        .XXXXX+++XXXoo.         ",
-"         .XXXX+++XXoo.          ",
-"          .XXXXXXXXo.           ",
-"          ..XXXXXXo..           ",
-"           .XXXXXo..            ",
-"           @#######@            ",
-"           @@@@@@@@@            ",
-"           @#######@            ",
-"           @@@@@@@@@            ",
-"           @#######@            ",
-"            @@@@@@@             ",
-"              ###               ",
-"              $$$               ",
-"                                ",
-"                                ",
-"                                "
+"@@@@@@@@@@@@      @@@@@@@@@@@@@@",
+"@@@@@@@@@@  XXXXXX  @@@@@@@@@@@@",
+"@@@@@@@@@ XXXXXXXXXX @@@@@@@@@@@",
+"@@@@@@@@@ XXXXXXXXXX @@@@@@@@@@@",
+"@@@@@@@@ XXXXX  XXXXX @@@@@@@@@@",
+"@@@@@@@ XXXXXX  XXXXXX @@@@@@@@@",
+"@@@@@@@ XXXXXX  XXXXXX @@@@@@@@@",
+"@@@@@@@ XXXXXX  XXXXXX @@@@@@@@@",
+"@@@@@@@ XXXXXX  XXXXXX @@@@@@@@@",
+"@@@@@@@ XXXXXX  XXXXXX @@@@@@@@@",
+"@@@@@@@@ XXXXX  XXXXX  @@@@@@@@@",
+"@@@@@@@@oXXXXXXXXXXXX @@@@@@@@@@",
+"@@@@@@@o+ XXXX  XXXX o@@@@@@@@@@",
+"@@@@@@o++ XXXX  XXXX +o@@@@@@@@@",
+"@@@@@o++++ XXX  XXX +++o@@@@@@@@",
+"@@@@o++.+.+ XXXXXX .+..+o@@@@@@@",
+"@@@o++++++++ XXXX +++++++o@@@@@@",
+"@@ +..+.+.+. oooo +.+..+.+ @@@@@",
+"@@@ ++++++++ OOOO +++++++ @@@@@@",
+"@@@@ ++.+.+. oooo +.+..+ @@@@@@@",
+"@@@oo ++++++  OO  +++++ oo@@@@@@",
+"@@@ooo ++.+.+    ++.++ ooo@@@@@@",
+"@@@@ooo +.+.+    ++.+ ooo@@@@@@@",
+"@@@@@ooo +++++++++++ ooo@@@@@@@@",
+"@@@@@@ooo +.+.+.+.+ ooo@@@@@@@@@",
+"@@@@@@@ooo +++++++ ooo@@@@@@@@@@",
+"@@@@@@@@ooo +.+.+ ooo@@@@@@@@@@@",
+"@@@@@@@@@ooo +++ ooo@@@@@@@@@@@@",
+"@@@@@@@@@@ooo + ooo@@@@@@@@@@@@@",
+"@@@@@@@@@@@ooo ooo@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@ooooo@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@ooo@@@@@@@@@@@@@@@@"
 };

art/toparent.xpm

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

art/undo.xpm

@@ -1,25 +0,0 @@
-/* XPM */
-static char *undo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 3 1",
-"X c #808080",
-". c #000080",
-"  c None",
-/* pixels */
-"                ",
-"                ",
-"                ",
-"                ",
-"        ....X   ",
-"  .   ..    .X  ",
-"  .. .       .  ",
-"  ...        .  ",
-"  ....       .  ",
-"  .....     .X  ",
-"           X.   ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "
-};

art/up.xpm

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

build/bakefiles/common.bkl

@@ -337,17 +337,9 @@
 
     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
-            <!-- FIXME: remove this once we require >=bkl-0.1.9 -->
-            <if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
-                <msvc-project-files>
-                    $(addPrefixToList('include\', wxwin.headersOnly(value)))
-                </msvc-project-files>
-            </if>
-            <if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
-                <msvc-project-files>
-                    $(addPrefixToList('include\\', wxwin.headersOnly(value)))
-                </msvc-project-files>
-            </if>
+            <msvc-project-files>
+                $(addPrefixToList('include\', wxwin.headersOnly(value)))
+            </msvc-project-files>
         </if>
     </define-tag>
 

build/bakefiles/files.bkl

@@ -114,7 +114,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/gccpriv.h
     wx/msw/mimetype.h
     wx/msw/stackwalk.h
-    wx/msw/stdpaths.h
     wx/msw/winundef.h
     wx/msw/wrapcctl.h
     wx/msw/wrapcdlg.h
@@ -258,21 +257,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/palmos/stdpaths.h
 </set>
 
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<!--                               MSDOS                                    -->
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-
-<set var="BASE_MSDOS_SRC" hints="files">
-    src/msdos/dir.cpp
-    src/msdos/mimetype.cpp
-    src/msdos/utilsdos.cpp
-</set>
-<set var="BASE_AND_GUI_MSDOS_SRC" hints="files">
-</set>
-<set var="BASE_MSDOS_HDR" hints="files">
-    wx/msdos/mimetype.h
-</set>
-
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <!--                              Common                                    -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -356,6 +340,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/config.h
     wx/containr.h
     wx/datetime.h
+    wx/datetime.inl
     wx/datstrm.h
     wx/dde.h
     wx/debug.h
@@ -1273,8 +1258,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MSW_LOWLEVEL_HDR" hints="files">
     wx/msw/popupwin.h
     wx/msw/uxtheme.h
-    wx/msw/uxthemep.h
-    wx/msw/htmlhelp.h
 </set>
 
 <set var="MSW_DESKTOP_LOWLEVEL_SRC" hints="files">
@@ -1433,28 +1416,37 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- cursors -->
     wx/msw/blank.cur
     wx/msw/bullseye.cur
+    wx/msw/clock.cur
     wx/msw/cross.cur
     wx/msw/hand.cur
+    wx/msw/heart.cur
     wx/msw/magnif1.cur
+    wx/msw/noentry.cur
     wx/msw/pbrush.cur
     wx/msw/pencil.cur
     wx/msw/pntleft.cur
     wx/msw/pntright.cur
+    wx/msw/query.cur
     wx/msw/rightarr.cur
     wx/msw/roller.cur
+    wx/msw/size.cur
+    wx/msw/watch1.cur
     <!-- icons -->
     wx/msw/cdrom.ico
     wx/msw/child.ico
     wx/msw/computer.ico
     wx/msw/drive.ico
+    wx/msw/error.ico
     wx/msw/file1.ico
     wx/msw/floppy.ico
     wx/msw/folder1.ico
     wx/msw/folder2.ico
+    wx/msw/info.ico
     wx/msw/mdi.ico
     wx/msw/question.ico
     wx/msw/removble.ico
     wx/msw/std.ico
+    wx/msw/warning.ico
 </set>
 
 <!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
@@ -2756,7 +2748,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_MACOS=='1'">$(BASE_MAC_SRC) $(BASE_MAC_CARBONLIB_SRC)</if>
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
-        <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
@@ -2766,7 +2757,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_AND_GUI_PALMOS_SRC)</if>
-        <if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
         <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
         <!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
     </set>
@@ -2790,7 +2780,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
-        <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
     </set>
 
     <set var="BASE_SRC" hints="files">
@@ -2971,7 +2960,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
         $(BASE_MAC_SRC)
         $(BASE_OS2_SRC)
-        $(BASE_MSDOS_SRC)
         $(BASE_AND_GUI_CMN_SRC)
         $(BASE_AND_GUI_UNIX_SRC)
         $(BASE_AND_GUI_MAC_SRC)

build/bakefiles/make_dist.mk

@@ -273,18 +273,8 @@ MACX_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon
 	cp $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private
 	cp $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private
-	mkdir $(DISTDIR)/include/wx/mac/corefoundation
-	cp $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
-	mkdir $(DISTDIR)/src/mac/corefoundation
-	cp $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
-	mkdir $(DISTDIR)/src/html/htmlctrl
-	mkdir $(DISTDIR)/src/html/htmlctrl/webkit
-	cp $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit
-	mkdir $(DISTDIR)/src/mac/carbon
 	cp $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.mm $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.icns $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
+	cp $(MACDIR)/carbon/*.c $(DISTDIR)/src/mac/carbon
 	cp $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon
 	cp $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon
 	mkdir $(DISTDIR)/src/mac/carbon/morefile
@@ -313,7 +303,6 @@ MSW_DIST: ALL_GUI_DIST
 	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/wx.manifest $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince
 	mkdir $(DISTDIR)/src/msw/ole
@@ -321,6 +310,7 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.rc $(DISTDIR)/src/msw
+	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
@@ -338,6 +328,7 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/msw/wince
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
+	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
 	cp $(SRCDIR)/*.??? $(DISTDIR)/src
@@ -383,7 +374,6 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
-	cp $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty
 
 	mkdir $(DISTDIR)/demos/life
 	mkdir $(DISTDIR)/demos/life/bitmaps
@@ -457,9 +447,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
-	cp $(SAMPDIR)/controls/*.bmp $(DISTDIR)/samples/controls
-	cp $(SAMPDIR)/controls/*.ico $(DISTDIR)/samples/controls
-	cp $(SAMPDIR)/controls/*.rc $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
 
@@ -793,7 +780,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/*.png $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
 
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
@@ -1129,7 +1116,7 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
 			   -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 "*.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

build/bakefiles/tiff.bkl

@@ -31,7 +31,6 @@
         <if cond="PLATFORM_OS2=='1'">src/tiff/tif_unix.c</if>
         <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
         <if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if>
-        <if cond="PLATFORM_MSDOS=='1'">src/tiff/tif_msdos.c</if>
     </set>
 
     <lib id="wxtiff" template="3rdparty_lib"

build/bakefiles/wxpresets/bakefile_quickstart.txt

@@ -8,63 +8,29 @@ Date: 2/13/04
 License: wxWidgets License
 -----------------------------------------------------------------------
 
-Supporting many different platforms can be a difficult challenge. The
-challenge for wxWidgets is especially great, because it supports a variety of
-different compilers and development environments, including MSVC, Borland C++,
-MinGW, DevCPP, GNU make/automake, among others. Maintaining such a large
-number of different project files and formats can quickly become overwhelming.
-To simplify the maintenance of these formats, one of the wxWidgets developers,
-Vaclav Slavik, created Bakefile, a XML-based makefile wrapper that generates
-all the native project files for wxWidgets. So now, even though wxWidgets
-supports all these formats, wxWidgets developers need only update one file -
-the Bakefile, and it handles the rest. But Bakefile isn't specific to
-wxWidgets in any way - you can use Bakefile for your own projects, too. This
-brief tutorial will take a look at how to do that. 
+Supporting many different platforms can be a difficult challenge. The challenge for wxWidgets is especially great, because it supports a variety of different compilers and development environments, including MSVC, Borland C++, MinGW, DevCPP, GNU make/automake, among others. Maintaining such a large number of different project files and formats can quickly become overwhelming. To simplify the maintenance of these formats, one of the wxWidgets developers, Vaclav Slavik, created Bakefile, a XML-based makefile wrapper that generates all the native project files for wxWidgets. So now, even though wxWidgets supports all these formats, wxWidgets developers need only update one file - the Bakefile, and it handles the rest. But Bakefile isn't specific to wxWidgets in any way - you can use Bakefile for your own projects, too. This brief tutorial will take a look at how to do that. 
 
-Note that this tutorial assumes that you are familiar with how to build
-software using one of the supported Bakefile makefile systems, that you have
-some basic familiarity with how makefiles work, and that you are capable of
-setting environment variables on your platform. Also note that the terms Unix
-and Unix-based refers to all operating systems that share a Unix heritage,
-including FreeBSD, Linux, Mac OS X, and various other operating systems.
+Note that this tutorial assumes that you are familiar with how to build software using one of the supported Bakefile makefile systems, that you have some basic familiarity with how makefiles work, and that you are capable of setting environment variables on your platform. Also note that the terms Unix and Unix-based refers to all operating systems that share a Unix heritage, including FreeBSD, Linux, Mac OS X, and various other operating systems.
 
 -- Getting Started --
 
-First, you'll need to install Bakefile. You can always find the latest version
-for download online at http://bakefile.sf.net. A binary installer is provided
-for Windows users, while users of Unix-based operating systems (OS) will need
-to unpack the tarball and run configure && make && make install. (Packages for
-some distros are also available, check http://bakefile.sf.net for details.)
+First, you'll need to install Bakefile. You can always find the latest version for download online at http://bakefile.sf.net. A binary installer is provided for Windows users, while users of Unix-based operating systems (OS) will need to unpack the tarball and run configure && make && make install. (Packages for some distros are also available, check http://bakefile.sf.net for details.)
 
 -- Setting Up Your wx Build Environment --
 
-Before you can build wxWidgets software using Bakefile or any other build
-system, you need to make sure that wxWidgets is built and that wxWidgets
-projects can find the wxWidgets includes and library files. wxWidgets build
-instructions can be found by going to the docs subfolder, then looking for the
-subfolder that corresponds to your platform (i.e. msw, gtk, mac) and reading
-"install.txt" there. Once you've done that, here are some extra steps you
-should take to make sure your Bakefile projects work with wxWidgets:
+Before you can build wxWidgets software using Bakefile or any other build system, you need to make sure that wxWidgets is built and that wxWidgets projects can find the wxWidgets includes and library files. wxWidgets build instructions can be found by going to the docs subfolder, then looking for the subfolder that corresponds to your platform (i.e. msw, gtk, mac) and reading "install.txt" there. Once you've done that, here are some extra steps you should take to make sure your Bakefile projects work with wxWidgets:
 
 On Windows
 ----------
-Once you've built wxWidgets, you should create an environment variable named
-WXWIN and set it to the home folder of your wxWidgets source tree. (If you use
-the command line to build, you can also set or override WXWIN at build time by
-passing it in as an option to your makefile.)
+Once you've built wxWidgets, you should create an environment variable named WXWIN and set it to the home folder of your wxWidgets source tree. (If you use the command line to build, you can also set or override WXWIN at build time by passing it in as an option to your makefile.)
 
 On Unix
 -------
-In a standard install, you need not do anything so long as wx-config is on
-your PATH. wx-config is all you need. (See the section of the book on using
-wx-config for more information.)
+In a standard install, you need not do anything so long as wx-config is on your PATH. wx-config is all you need. (See the section of the book on using wx-config for more information.)
 
 -- A Sample wx Project Bakefile --
 
-Now that everything is setup, it's time to take Bakefile for a test run. I
-recommend that you use the wx sample Bakefile to get you started. It can be
-found in the 'build/bakefiles/wxpresets/sample' directory in the wxWidgets
-source tree. Here is the minimal.bkl Bakefile used in the sample:
+Now that everything is setup, it's time to take Bakefile for a test run. I recommend that you use the wx sample Bakefile to get you started. It can be found in the 'build/bakefiles/wxpresets/sample' directory in the wxWidgets source tree. Here is the minimal.bkl Bakefile used in the sample:
 
 minimal.bkl
 -------------------------------------------------------------
@@ -89,8 +55,7 @@ minimal.bkl
 </makefile>
 ---------------------------------------------------------------
 
-It's a complete sample ready to be baked, so go into the directory mentioned
-above and run the following command: 
+It's a complete sample ready to be baked, so go into the directory mentioned above and run the following command: 
 
 On Windows:
 bakefile -f msvc -I.. minimal.bkl
@@ -98,17 +63,11 @@ bakefile -f msvc -I.. minimal.bkl
 On Unix:
 bakefile -f gnu -I.. minimal.bkl
 
-It should generate a makefile (makefile.vc or GNUmakefile, respectively) which
-you can use to build the software. Just build the software using the command
-"nmake -f makefile.vc" or "make -f GNUmakefile" respectively. Now let's take a
-look at some of the basic Bakefile concepts that you'll need to know to move
-on from here.
+It should generate a makefile (makefile.vc or GNUmakefile, respectively) which you can use to build the software. Just build the software using the command "nmake -f makefile.vc" or "make -f GNUmakefile" respectively. Now let's take a look at some of the basic Bakefile concepts that you'll need to know to move on from here.
 
 -- Project Types --
 
-As mentioned earlier, Bakefile builds makefiles for many different
-development environments. The -f option accepts a list of formats that you
-would like to build, separated by commas. Valid values are:
+As mentioned earilier, Bakefile builds makefiles for many different development environments. The -f option accepts a list of formats that you would like to build, separated by commas. Valid values are:
 
     autoconf      GNU autoconf Makefile.in files
     borland       Borland C/C++ makefiles
@@ -124,87 +83,46 @@ would like to build, separated by commas. Valid values are:
 
 TIP: autoconf Project Type
 ---------------------------
-You may notice that in the sample folder, there is also a file called
-configure.in. That file is the input for autoconf, which creates the configure
-scripts that you often see when you build software from source on Unix-based
-platforms. People use configure scripts because they make your Unix makefiles
-more portable by automatically detecting the right libraries and commands to
-use on the user's machine and OS. This is necessary because there are many
-Unix-based operating systems and they all are slightly different in various
-small ways.
+You may notice that in the sample folder, there is also a file called configure.in. That file is the input for autoconf, which creates the configure scripts that you often see when you build software from source on Unix-based platforms. People use configure scripts because they make your Unix makefiles more portable by automatically detecting the right libraries and commands to use on the user's machine and OS. This is necessary because there are many Unix-based operating systems and they all are slightly different in various small ways.
 
-Bakefile does not generate a configure or configure.in script, so if you want
-to use configure scripts with your Unix-based software, you will need to learn
-how to use autoconf. Unfortunately, this topic deserves a book all its own and
-is beyond the scope of this tutorial, but a book on the subject can be found
-online at: http://sources.redhat.com/autobook/. Note that you do not need to
-use automake when you are using Bakefile, just autoconf, as Bakefile
-essentially does the same thing as automake. 
+Bakefile does not generate a configure or configure.in script, so if you want to use configure scripts with your Unix-based software, you will need to learn how to use autoconf. Unfortunately, this topic deserves a book all its own and is beyond the scope of this tutorial, but a book on the subject can be found online at: http://sources.redhat.com/autobook/. Note that you do not need to use automake when you are using Bakefile, just autoconf, as Bakefile essentially does the same thing as automake. 
 ----------------------------
 
 -- Targets --
 
-Every project needs to have a target or targets, specifying what is to be
-built. In Bakefile, you specify the target by creating a tag named with the
-target type. The possible names for targets are:
+Every project needs to have a target or targets, specifying what is to be built. In Bakefile, you specify the target by creating a tag named with the target type. The possible names for targets are:
 
-    exe         create an executable file
-    dll         create a shared libary
-    lib         create a static library
-    module      create a library that is loaded at runtime (i.e. a plugin)
+    exe 		create an executable file
+    dll			create a shared libary
+    lib			create a static library
+    module		create a library that is loaded at runtime (i.e. a plugin)
 
-Note the sample above is an "exe" target. Once you create the target, all the
-build settings, including flags and linker options, should be placed inside
-the target tag, as they are in the sample above.
+Note the sample above is an "exe" target. Once you create the target, all the build settings, including flags and linker options, should be placed inside the target tag, as they are in the sample above.
 
 -- Adding Sources and Includes --
 
-Obviously, you need to be able to add source and include files to your
-project. You add sources using the "<sources>" tag (as shown above), and add
-include directories using the "<include>" tag. You can add multiple <sources>
-and <include> tags to add multiple source files, or you can also add multiple
-sources and includes into one tag by separating them with a space, like so:
+Obviously, you need to be able to add source and include files to your project. You add sources using the "<sources>" tag (as shown above), and add include directories using the "<include>" tag. You can add multiple <sources> and <include> tags to add multiple source files, or you can also add multiple sources and includes into one tag by separating them with a space, like so:
 
 <sources>minimal.cpp minimal2.cpp minimal3.cpp</sources>
 
-If your sources are in a subfolder of your Bakefile, you use the slash "/"
-character to denote directories, even on Windows. (i.e. src/minimal.cpp) For
-more options and flags, please consult the Bakefile documentation in the 'doc'
-subfolder of Bakefile, or you can also find it on the Bakefile web site.
+If your sources are in a subfolder of your Bakefile, you use the slash "/" character to denote directories, even on Windows. (i.e. src/minimal.cpp) For more options and flags, please consult the Bakefile documentation in the 'doc' subfolder of Bakefile, or you can also find it on the Bakefile web site.
 
 -- Build Options --
 
-What if you want to offer a DEBUG and a RELEASE build? Or a UNICODE/ANSI
-build? You can do this in Bakefile by creating options. To create an option,
-use the "<option>" tag. A typical option has three important parts: a name, a
-default value, and a comma-separated list of values. For example, here is how
-to create a DEBUG option which builds debug by default:
+What if you want to offer a DEBUG and a RELEASE build? Or a UNICODE/ANSI build? You can do this in Bakefile by creating options. To create an option, use the "<option>" tag. A typical option has three important parts: a name, a default value, and a comma-separated list of values. For example, here is how to create a DEBUG option which builds debug by default:
 
 <option name="DEBUG">
-    <default-value>1</default-value>
-    <values>0 1</values>
+	<default-value>1</default-value>
+	<values>0 1</values>
 </option>
 
-You can then test the value of this option and conditionally set build
-settings, flags, etc. For more information on both options and conditional
-statements, please refer to the Bakefile documentation.
+You can then test the value of this option and conditionally set build settings, flags, etc. For more information on both options and conditional statements, please refer to the Bakefile documentation.
 
 -- Bakefile Presets/Templates and Includes --
 
-It is common that most projects will reuse certain settings, or options, in
-their makefiles. (i.e. DEBUG or static/dynamic library options) Also, it is
-common to have to use settings from another project; for example, any project
-that uses wxWidgets will need to build using the same flags and options that
-wxWidgets was built with. Bakefile makes these things easier by allowing users
-to create Bakefile templates, where you can store common settings. 
+It is common that most projects will reuse certain settings, or options, in their makefiles. (i.e. DEBUG or static/dynamic library options) Also, it is common to have to use settings from another project; for example, any project that uses wxWidgets will need to build using the same flags and options that wxWidgets was built with. Bakefile makes these things easier by allowing users to create Bakefile templates, where you can store common settings. 
 
-Bakefile ships with a couple of templates, found in the 'presets' subfolder of
-your Bakefile installation. The "simple.bkl" template adds a DEBUG option to
-makefiles so you can build in release or debug mode. To add this template to
-your project, simply add the tag "<include file="presets/simple.bkl"/>" to the
-top of your Bakefile. Then, when creating your target, add the
-"template="simple"" attribute to it. Now, once you build the makefile, your
-users can write commands like:
+Bakefile ships with a couple of templates, found in the 'presets' subfolder of your Bakefile installation. The "simple.bkl" template adds a DEBUG option to makefiles so you can build in release or debug mode. To add this template to your project, simply add the tag "<include file="presets/simple.bkl"/>" to the top of your Bakefile. Then, when creating your target, add the "template="simple"" attribute to it. Now, once you build the makefile, your users can write commands like:
 
 nmake -f makefile.vc DEBUG=1
 
@@ -214,54 +132,31 @@ make -f GNUmakefile DEBUG=1
 
 In order to build the software in debug mode.
 
-To simplify the building of wxWidgets-based projects, wxWidgets contains a a
-set of Bakefiles that automatically configure your build system to be
-compatible with wxWidgets. As you'll notice in the sample above, the sample
-project uses the wx template. Once you've included the template, your software
-will now build with wxWidgets support. 
+To simplify the building of wxWidgets-based projects, wxWidgets contains a a set of Bakefiles that automatically configure your build system to be compatible with wxWidgets. As you'll notice in the sample above, the sample project uses the wx template. Once you've included the template, your software will now build with wxWidgets support. 
 
-But since the wx presets don't exist in the Bakefile presets subfolder,
-Bakefile needs to know where to find these presets. The "-I" command adds the
-wxpresets folder to Bakefile's search path. 
+But since the wx presets don't exist in the Bakefile presets subfolder, Bakefile needs to know where to find these presets. The "-I" command adds the wxpresets folder to Bakefile's search path. 
 
-If you regularly include Bakefile presets in places other than the Bakefile
-presets folder, then you can set the BAKEFILE_PATHS environment variable so
-that Bakefile can find these Bakefiles and include them in your project. This
-way you no longer need to specify the -I flag each time you build.
+If you regularly include Bakefile presets in places other than the Bakefile presets folder, then you can set the BAKEFILE_PATHS environment variable so that Bakefile can find these Bakefiles and include them in your project. This way you no longer need to specify the -I flag each time you build.
 
-Lastly, it's important to note that the Win 32 wx project Bakefiles come with
-some common build options that users can use when building the software. These
-options are: 
+Lastly, it's important to note that the Win 32 wx project Bakefiles come with some common build options that users can use when building the software. These options are: 
 
-    Option              Values              Description
-    ------              ------              -------------
-    WX_SHARED           0(default),1        Specify static or dynamic wx libs
-    WX_UNICODE          0(defualt),1        Use ANSI or UNICODE wx libs
-    WX_DEBUG            0,1(default)        Use release or debug wx libs
-    *WX_VERSION         25,26(default)      Specify version of wx libs
+	Option				Values				Description
+	------				------				-------------
+	WX_SHARED			0(default),1		Specify static or dynamic wx libs
+	WX_UNICODE			0(defualt),1		Use ANSI or UNICODE wx libs
+	WX_DEBUG			0,1(default)		Use release or debug wx libs
+	*WX_VERSION			25,26(default)		Specify version of wx libs
 
-*Note: Any version of wx past 2.5 will be allowed here, so 25/26 is not a
-complete list of values. 
+*Note: Any version of wx past 2.5 will be allowed here, so 25/26 is not a complete list of values. 
 
-These options are not needed under Unix as wx-config can be used to specify
-these options.
+These options are not needed under Unix as wx-config can be used to specify these options.
 
 -- bakefile_gen - Automated Bakefile Scripts --
 
-If you have a large project, you can imagine that the calls to Bakefile would
-get more and more complex and unwieldly to manage. For this reason, a script
-called bakefile_gen was created, which reads in a .bkgen file that provides
-all the commands needed to build all the makefiles your project supports. A
-discussion of how to use bakefile_gen is beyond the scope of this tutorial,
-but it deserves mention because it can be invaluable to large projects.
-Documentation on bakefile_gen can be found in the Bakefile documentation.
+If you have a large project, you can imagine that the calls to Bakefile would get more and more complex and unwieldly to manage. For this reason, a script called bakefile_gen was created, which reads in a .bkgen file that provides all the commands needed to build all the makefiles your project supports. A discussion of how to use bakefile_gen is beyond the scope of this tutorial, but it deserves mention because it can be invaluable to large projects. Documentation on bakefile_gen can be found in the Bakefile documentation.
 
 -- Conclusion --
 
-This concludes our basic tutorial of the cross-platform Bakefile build system
-management tool. From here, please be sure to take a good look at the Bakefile
-documentation to see what else it is capable of. Please post questions to the
-bakefile-devel@lists.sourceforge.net list, or if you have questions specific
-to the wx template Bakefile, send an email to wx-users@lists.wxwidgets.org.
+This concludes our basic tutorial of the cross-platform Bakefile build system management tool. From here, please be sure to take a good look at the Bakefile documentation to see what else it is capable of. Please post questions to the bakefile-devel@lists.sourceforge.net list, or if you have questions specific to the wx template Bakefile, send an email to wx-users@lists.wxwidgets.org.
 
 Enjoy using Bakefile!

build/bakefiles/wxpresets/presets/wx_win32.bkl

@@ -94,7 +94,7 @@ FIXME: this template has (at least) the following bugs:
         </description>
     </option>
 
-    <set var="WX_VERSION_DEFAULT" overwrite="0">26</set>
+    <set var="WX_VERSION_DEFAULT" overwrite="0">25</set>
     <option name="WX_VERSION">
         <default-value>$(WX_VERSION_DEFAULT)</default-value>
         <description>
@@ -165,7 +165,7 @@ FIXME: this template has (at least) the following bugs:
         <if cond="value=='base'">
             <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</sys-lib>
         </if>
-        <if cond="value in ['net','xml', 'odbc']">
+        <if cond="value in ['net','xml']">
             <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
         </if>
         <if cond="value not in ['base','net','xml']">

build/msw/wx_dll.dsw

@@ -35,6 +35,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name wxzlib
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xrc
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -323,18 +326,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name xml
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name adv
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name html
-    End Project Dependency
 }}}
 
 ###############################################################################

configure.in

@@ -57,7 +57,7 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=0
-wx_subrelease_number=1
+wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -288,6 +288,8 @@ case "${host}" in
     AC_DEFINE(__DOS__)
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_MGL=1
+    dnl DJGPP needs explicit -lstdc++ for some reason (VS: mayb some versions only?)
+    LIBS="$LIBS -lstdc++"
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
@@ -437,6 +439,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_TEXTFILE=no
   DEFAULT_wxUSE_SOUND=no
   DEFAULT_wxUSE_MEDIACTRL=no  
+  DEFAULT_wxUSE_DIRECTSHOW=no  
   DEFAULT_wxUSE_INTL=no
   DEFAULT_wxUSE_CONFIG=no
   DEFAULT_wxUSE_FONTMAP=no
@@ -633,6 +636,7 @@ else
   DEFAULT_wxUSE_TEXTFILE=yes
   DEFAULT_wxUSE_SOUND=yes
   DEFAULT_wxUSE_MEDIACTRL=no
+  DEFAULT_wxUSE_DIRECTSHOW=no
   DEFAULT_wxUSE_INTL=yes
   DEFAULT_wxUSE_CONFIG=yes
   DEFAULT_wxUSE_FONTMAP=yes
@@ -1793,8 +1797,8 @@ dnl SGI/Irix's stdio.h does not include wchar_t. Mac OS X does not provide
 dnl wchar.h and wchar_t is defined by stdlib.h (GD)
 AC_CHECK_SIZEOF(wchar_t, 0,
     [
-        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
-        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
+        /* DJGPP only has fake wchar_t: */
+        #ifdef __DJGPP__
         #  error "fake wchar_t"
         #endif
         #ifdef HAVE_WCHAR_H
@@ -1809,11 +1813,6 @@ AC_CHECK_SIZEOF(wchar_t, 0,
         #include <stdio.h>
     ]
 )
-if test "$ac_cv_sizeof_wchar_t" != "0"; then
-    wxUSE_WCHAR_T=yes
-else
-    wxUSE_WCHAR_T=no
-fi
 
 dnl checks needed to define wxVaCopy
 AC_CACHE_CHECK([for va_copy],
@@ -1920,26 +1919,19 @@ AC_CXX_STATIC_CAST
 dnl we don't use HAVE_DYNAMIC_CAST anywhere right now...
 dnl AC_CXX_DYNAMIC_CAST
 
-dnl check for std::string or std::wstring
-if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
+dnl check various STL features
+if test "$wxUSE_UNICODE" = "yes" -a \
+        \( "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes" \); then
     AC_LANG_PUSH(C++)
 
-    if test "$wxUSE_UNICODE" = "yes"; then
-        std_string="std::wstring"
-        char_type="wchar_t"
-    else
-        std_string="std::string"
-        char_type="char"
-    fi
-
     dnl check if <string> declares std::wstring
-    AC_MSG_CHECKING([for $std_string in <string>])
+    AC_MSG_CHECKING([for std::wstring in <string>])
     AC_TRY_COMPILE([#include <string>],
-                   [$std_string foo;],
+                   [std::wstring foo;],
                    [AC_MSG_RESULT(yes)
                     AC_DEFINE(HAVE_STD_WSTRING)],
                    [AC_MSG_RESULT(no)
-                    AC_MSG_CHECKING([if std::basic_string<$char_type> works])
+                    AC_MSG_CHECKING([if std::basic_string<wchar_t> works])
                     AC_TRY_COMPILE([
                         #ifdef HAVE_WCHAR_H
                         #  ifdef __CYGWIN__
@@ -1953,43 +1945,17 @@ if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
                         #include <stdio.h>
                         #include <string>
                         ],
-                        [std::basic_string<$char_type> foo;
-                         const $char_type* dummy = foo.c_str();],
+                        [std::basic_string<wchar_t> foo;
+                         const wchar_t* dummy = foo.c_str();],
                         [AC_MSG_RESULT(yes)],
                         [AC_MSG_RESULT([no])
-                         if test "$wxUSE_STL" = "yes"; then
-                             AC_MSG_ERROR([Can't use --enable-stl without $std_string or std::basic_string<$char_type>])
-                         elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
-                             AC_MSG_ERROR([Can't use --enable-std_string without $std_string or std::basic_string<$char_type>])
-                         else
-                             AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
-                             wxUSE_STD_STRING=no
-                         fi
-                        ]
+                         AC_MSG_ERROR([Can't compile without unicode string class])]
                     )
                     ])
 
     AC_LANG_POP
 fi
 
-if test "$wxUSE_STD_IOSTREAM" = "yes"; then
-    AC_LANG_PUSH(C++)
-
-    AC_CHECK_TYPES([std::istream, std::ostream],,
-                   [wxUSE_STD_IOSTREAM=no],
-                   [#include <iostream>])
-
-    if test "$wxUSE_STD_IOSTREAM" != "yes"; then
-        if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
-            AC_MSG_ERROR([Can't use --enable-std_iostreams without std::istream and std::ostream])
-        else
-            AC_MSG_WARN([No std::iostreams, switching to --disable-std_iostreams])
-        fi
-    fi
-    
-    AC_LANG_POP
-fi
-
 if test "$wxUSE_STL" = "yes"; then
     AC_LANG_PUSH(C++)
 
@@ -2481,17 +2447,6 @@ dnl ------------------------------------------------------------------------
 dnl Check for expat libraries
 dnl ------------------------------------------------------------------------
 
-if test "$wxUSE_WCHAR_T" != "yes"; then
-    if test "$wxUSE_EXPAT" != "no"; then
-        AC_MSG_WARN([wxWidgets requires wchar_t to use expat, disabling])
-        wxUSE_EXPAT=no
-    fi
-    if test "$wxUSE_XML" != "no"; then
-        AC_MSG_WARN([wxWidgets requires wchar_t to use xml, disabling])
-        wxUSE_XML=no
-    fi
-fi
-
 if test "$wxUSE_EXPAT" != "no"; then
     wxUSE_XML=yes
     AC_DEFINE(wxUSE_EXPAT)
@@ -3551,10 +3506,8 @@ if test "$wxUSE_SHARED" = "yes"; then
       ;;
       
       powerpc-*-darwin* )
-        install_name_tool=`which install_name_tool`
-        if test "$install_name_tool" -a -x "$install_name_tool"; then
-            SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
-            cat <<EOF >change-install-names
+        SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+        cat <<EOF >change-install-names
 #!/bin/sh
 libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
 inst_cmd="install_name_tool "
@@ -3563,8 +3516,7 @@ for i in \${libnames} ; do
 done
 \${inst_cmd} \${3}
 EOF
-            chmod +x change-install-names
-        fi
+        chmod +x change-install-names
       ;;
       
       *-*-cygwin* | *-*-mingw32* )
@@ -3812,7 +3764,7 @@ dnl Check for functions
 dnl ---------------------------------------------------------------------------
 
 dnl don't check for wchar_t functions if we haven't got wchar_t itself
-if test "$wxUSE_WCHAR_T" = "yes"; then
+if test "$ac_cv_sizeof_wchar_t" != "0"; then
     AC_DEFINE(wxUSE_WCHAR_T)
 
     dnl check for wcslen in all possible places
@@ -4660,9 +4612,7 @@ fi
 
 if test "$wxUSE_DEBUG_GDB" = "yes" ; then
     wxUSE_DEBUG_INFO=yes
-    if test "$GCC" = yes; then
-        WXDEBUG="-ggdb"
-    fi
+    WXDEBUG="-ggdb"
 fi
 
 if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
@@ -4682,7 +4632,7 @@ if test "$wxUSE_MEM_TRACING" = "yes" ; then
 fi
 
 if test "$wxUSE_DMALLOC" = "yes" ; then
-    DMALLOC_LIBS="-ldmallocthcxx"
+    DMALLOC_LIBS="-ldmalloc"
 fi
 
 PROFILE=
@@ -4801,8 +4751,6 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
         if test "$USE_DARWIN" = 1; then
             dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
             HAVE_DL_FUNCS=1
-        elif test "$USE_DOS" = 1; then
-            HAVE_DL_FUNCS=0
         else
             dnl the test is a bit complicated because we check for dlopen() both with
             dnl and without -ldl and we also try to find shl_load() if there is no
@@ -4848,7 +4796,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
 
         if test "$HAVE_DL_FUNCS" = 0; then
             if test "$HAVE_SHL_FUNCS" = 0; then
-              if test "$USE_UNIX" = 1 -o "$USE_DOS" = 1; then
+              if test "$USE_UNIX" = 1; then
                   AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
                   wxUSE_DYNAMIC_LOADER=no
                   wxUSE_DYNLIB_CLASS=no
@@ -4906,15 +4854,13 @@ if test "$wxUSE_TIMER" = "yes"; then
   AC_DEFINE(wxUSE_TIMER)
 fi
 
-dnl Unix implementation needs additional checks because audio support
-dnl comes in many favours:
-if test "$USE_UNIX" = "1" ; then
-    AC_CHECK_HEADERS([sys/soundcard.h],,
-                     [DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"])
-fi
 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
+  dnl Unix implementation needs additional checks because audio support
+  dnl comes in many favours:
   if test "$USE_UNIX" = "1" ; then
+    AC_CHECK_HEADERS([sys/soundcard.h])
+
     if test "$wxUSE_LIBSDL" != "no"; then
       AM_PATH_SDL([1.2.0],
                   [
@@ -4997,12 +4943,7 @@ if test "$wxUSE_ZIPSTREAM" = "yes"; then
 fi
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
-  if test "$USE_UNIX" != 1; then
-    AC_MSG_WARN([Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called])
-    wxUSE_ON_FATAL_EXCEPTION=no
-  else
-    AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
-  fi
+  AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
 fi
 
 if test "$wxUSE_STACKWALKER" = "yes"; then
@@ -5010,8 +4951,8 @@ if test "$wxUSE_STACKWALKER" = "yes"; then
 fi
 
 if test "$wxUSE_DEBUGREPORT" = "yes"; then
-    if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then
-        AC_MSG_WARN([Creating debug reports not currently supported on this system, disabled])
+    if test "$USE_OS2" = "1"; then
+        AC_MSG_WARN([Creating debug reports not supported under OS/2 yet, disabled])
         wxUSE_DEBUGREPORT=no
     else
         AC_DEFINE(wxUSE_DEBUGREPORT)
@@ -6225,6 +6166,24 @@ dnl wxMediaCtrl
 dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_MEDIACTRL" = "yes"; then
+    if test "$wxUSE_MSW" = 1; then
+    dnl -----------------------------------------------------------------------
+    dnl DirectShow MSW
+    dnl -----------------------------------------------------------------------
+        wxUSE_DIRECTSHOW="yes"
+        AC_CHECK_HEADERS([dshow.h], [],
+            [
+                wxUSE_DIRECTSHOW="no"
+                AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher])
+            ],
+            [#include <windows.h>])
+
+       if test "$wxUSE_DIRECTSHOW" = "yes"; then
+            AC_DEFINE(wxUSE_DIRECTSHOW)
+            LIBS="$LIBS -lstrmiids"
+       fi
+    fi
+
     dnl -----------------------------------------------------------------------
     dnl GStreamer 
     dnl -----------------------------------------------------------------------
@@ -6389,6 +6348,8 @@ if test "$wxUSE_MAC" = 1 ; then
     else
         LDFLAGS="$LDFLAGS -lCarbonLib"
     fi
+elif test "$USE_DARWIN" = 1; then
+    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System"
 fi
 if test "$wxUSE_COCOA" = 1 ; then
     LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
@@ -6396,9 +6357,6 @@ if test "$wxUSE_COCOA" = 1 ; then
         LDFLAGS="$LDFLAGS -framework QuickTime"
     fi
 fi
-if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
-    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
-fi
 
 dnl FIXME: should this be covered by the conditional above
 dnl given the -lm comment there?  Or should that comment (and
@@ -6655,16 +6613,8 @@ case "$TOOLKIT" in
         ;;
 esac
 
-if test "$wxUSE_WINE" = "yes"; then
-    BAKEFILE_FORCE_PLATFORM=win32
-fi
-
 AC_BAKEFILE([m4_include(autoconf_inc.m4)])
 
-if test "$wxUSE_WINE" = "yes"; then
-    RESCOMP=wrc
-fi
-
 if test "$wxUSE_SHARED" = "yes"; then
 
     dnl We get the shared build linker from bakefile, since it
@@ -6903,14 +6853,8 @@ for subdir in `echo $SUBDIRS`; do
                         makefiles="samples/$sample/Makefile.in $makefiles"
                     fi
                 done
-            else
-                dnl assume that everything compiles for utils &c
-                dnl any that shouldn't be built can be added to
-                dnl DISABLED_UTILS, DISABLED_CONTRIB or DISABLED_DEMOS
-                disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
-                eval "disabled=\$$disabled_var"
-                disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
-                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`
+            else dnl assume that everything compiles for utils &c
+                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
             fi
         else dnl we build wxBase only
             dnl don't take all samples/utils, just those which build with

contrib/docs/latex/deprecated/tex2rtf.ini

@@ -36,6 +36,9 @@ htmlFaceName = "Arial, Lucida, Helvetica"
 ignoreInput = "ltx.tex"
 ; htmlStylesheet = "wx.css"
 
+;\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 \htmlignore{\fcol{blue}{#1}}\htmlonly{\fcol{red}{#1}}}}

contrib/docs/latex/fl/tex2rtf.ini

@@ -29,6 +29,9 @@ 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,6 +29,9 @@ 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] {\helpref{#1}{#2}}
+\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}}
 \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] {\helpref{#1}{#2}}
+\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}}
 \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] {\helpref{#1}{#2}}
+\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}}
 \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}

contrib/include/wx/deprecated/expr.h

@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
+// Copyright:   (c)
 // Licence:     wxWindows licence
 ////////////////////////////////////////////////////////////////////////// */
 

contrib/include/wx/deprecated/wxexpr.h

@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
+// Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

contrib/include/wx/fl/controlbar.h

@@ -1002,7 +1002,7 @@ which are usually the same for all panes in
 a frame layout.
 */
 
-class WXDLLIMPEXP_FL cbCommonPaneProperties : public wxObject
+class cbCommonPaneProperties : public wxObject
 {
     DECLARE_DYNAMIC_CLASS( cbCommonPaneProperties )
 
@@ -1461,7 +1461,7 @@ areas of frame layout that actually need to be updated. This should be extended
 to implement a custom updating strategy.
 */
 
-class WXDLLIMPEXP_FL cbUpdatesManagerBase : public wxObject
+class cbUpdatesManagerBase : public wxObject
 {
     DECLARE_ABSTRACT_CLASS( cbUpdatesManagerBase )
 

contrib/include/wx/mmedia/sndfile.h

@@ -51,7 +51,7 @@ typedef enum {
 // Base class for file coders/decoders
 //
 
-class WXDLLIMPEXP_MMEDIA wxSoundFileStream: public wxSoundStream {
+class wxSoundFileStream: public wxSoundStream {
 public:
     wxSoundFileStream(wxInputStream& stream, wxSoundStream& io_sound);
     wxSoundFileStream(wxOutputStream& stream, wxSoundStream& io_sound);

contrib/include/wx/mmedia/sndwav.h

@@ -26,7 +26,7 @@
 // WAVE codec
 //
 
-class WXDLLIMPEXP_MMEDIA wxSoundWave: public wxSoundFileStream {
+class wxSoundWave: public wxSoundFileStream {
 public:
     wxSoundWave(wxInputStream& stream, wxSoundStream& io_sound);
     wxSoundWave(wxOutputStream& stream, wxSoundStream& io_sound);

contrib/include/wx/ogl/misc.h

@@ -101,12 +101,12 @@ extern wxPen*           g_oglTransparentPen;
 extern wxBrush*         g_oglWhiteBackgroundBrush;
 extern wxPen*           g_oglBlackForegroundPen;
 
-WXDLLIMPEXP_OGL wxFont*          oglMatchFont(int point_size);
+extern wxFont*          oglMatchFont(int point_size);
 
-WXDLLIMPEXP_OGL wxString         oglColourToHex(const wxColour& colour);
-WXDLLIMPEXP_OGL wxColour         oglHexToColour(const wxString& hex);
-WXDLLIMPEXP_OGL void             oglDecToHex(unsigned int dec, char *buf);
-WXDLLIMPEXP_OGL unsigned int     oglHexToDec(char* buf);
+extern wxString         oglColourToHex(const wxColour& colour);
+extern wxColour         oglHexToColour(const wxString& hex);
+extern void             oglDecToHex(unsigned int dec, char *buf);
+extern unsigned int     oglHexToDec(char* buf);
 
 
 #endif

contrib/include/wx/plot/plot.h

@@ -326,12 +326,12 @@ public:
     // options
     // -------
 
-    void SetScrollOnThumbRelease( bool scrollOnThumbRelease = true )
+    void SetScrollOnThumbRelease( bool scrollOnThumbRelease = TRUE )
         { m_scrollOnThumbRelease = scrollOnThumbRelease; }
     bool GetScrollOnThumbRelease()
         { return m_scrollOnThumbRelease; }
 
-    void SetEnlargeAroundWindowCentre( bool enlargeAroundWindowCentre = true )
+    void SetEnlargeAroundWindowCentre( bool enlargeAroundWindowCentre = TRUE )
         { m_enlargeAroundWindowCentre = enlargeAroundWindowCentre; }
     bool GetEnlargeAroundWindowCentre()
         { return m_enlargeAroundWindowCentre; }
@@ -389,51 +389,51 @@ typedef void (wxEvtHandler::*wxPlotEventFunction)(wxPlotEvent&);
 
 #if WXWIN_COMPATIBILITY_EVENT_TYPES
 
-#define EVT_PLOT(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_SEL_CHANGING(id, fn) { wxEVT_PLOT_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_SEL_CHANGED(id, fn) { wxEVT_PLOT_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_CLICKED(id, fn) { wxEVT_PLOT_CLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_DOUBLECLICKED(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_ZOOM_IN(id, fn) { wxEVT_PLOT_ZOOM_IN, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_ZOOM_OUT(id, fn) { wxEVT_PLOT_ZOOM_OUT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_VALUE_SEL_CREATING(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_VALUE_SEL_CREATED(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_VALUE_SEL_CHANGING(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_VALUE_SEL_CHANGED(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_AREA_SEL_CREATING(id, fn) { wxEVT_PLOT_AREA_SEL_CREATING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_AREA_SEL_CREATED(id, fn) { wxEVT_PLOT_AREA_SEL_CREATED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_AREA_SEL_CHANGING(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_AREA_SEL_CHANGED(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_BEGIN_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_X_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_END_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_X_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_BEGIN_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_END_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_Y_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) { wxEVT_PLOT_BEGIN_TITLE_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_END_TITLE_EDIT(id, fn) { wxEVT_PLOT_END_TITLE_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_SEL_CHANGING(id, fn) { wxEVT_PLOT_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_SEL_CHANGED(id, fn) { wxEVT_PLOT_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_CLICKED(id, fn) { wxEVT_PLOT_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_DOUBLECLICKED(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_ZOOM_IN(id, fn) { wxEVT_PLOT_ZOOM_IN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_ZOOM_OUT(id, fn) { wxEVT_PLOT_ZOOM_OUT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_VALUE_SEL_CREATING(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_VALUE_SEL_CREATED(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_VALUE_SEL_CHANGING(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_VALUE_SEL_CHANGED(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_AREA_SEL_CREATING(id, fn) { wxEVT_PLOT_AREA_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_AREA_SEL_CREATED(id, fn) { wxEVT_PLOT_AREA_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_AREA_SEL_CHANGING(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_AREA_SEL_CHANGED(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_BEGIN_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_END_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_BEGIN_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_END_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) { wxEVT_PLOT_BEGIN_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
+#define EVT_PLOT_END_TITLE_EDIT(id, fn) { wxEVT_PLOT_END_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
 
 #else
 
-#define EVT_PLOT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_DOUBLECLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_CLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_CLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_DOUBLECLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_DOUBLECLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_ZOOM_IN(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_ZOOM_IN, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_ZOOM_OUT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_ZOOM_OUT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_VALUE_SEL_CREATING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CREATING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_VALUE_SEL_CREATED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CREATED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_VALUE_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_VALUE_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_AREA_SEL_CREATING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CREATING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_AREA_SEL_CREATED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CREATED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_AREA_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_AREA_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_BEGIN_X_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_X_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_END_X_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_X_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_BEGIN_Y_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_END_Y_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_Y_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_TITLE_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_END_TITLE_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_TITLE_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_CLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_DOUBLECLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_ZOOM_IN(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_ZOOM_IN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_ZOOM_OUT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_ZOOM_OUT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_VALUE_SEL_CREATING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_VALUE_SEL_CREATED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_VALUE_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_VALUE_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_AREA_SEL_CREATING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_AREA_SEL_CREATED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_AREA_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_AREA_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_BEGIN_X_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_END_X_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_BEGIN_Y_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_END_Y_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_PLOT_END_TITLE_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
 
 #endif
 

contrib/samples/animate/Makefile.in

@@ -175,7 +175,7 @@ anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
 
 data: 
 	@mkdir -p .
-	@for f in mondrian.ico; do \
+	@for f in bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico; do \
 	if test ! -f ./$$f ; \
 	then x=yep ; \
 	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \

contrib/samples/animate/anitest.bkl

@@ -18,7 +18,7 @@
         <dstdir>$(BUILDDIR)</dstdir>
         <srcdir>$(SRCDIR)</srcdir>
         <files>
-	    mondrian.ico
+	    bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico
         </files>
     </wx-data>
 

contrib/samples/animate/makefile.bcc

@@ -213,7 +213,7 @@ $(OBJS)\anitest.exe: $(ANITEST_OBJECTS)  $(OBJS)\anitest_anitest.res
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\anitest_anitest.obj: .\anitest.cpp
 	$(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) $**

contrib/samples/animate/makefile.gcc

@@ -204,7 +204,7 @@ $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest_rc.o
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %%f in (mondrian.ico) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+	for %%f in (bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\anitest_anitest.o: ./anitest.cpp
 	$(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $<

contrib/samples/animate/makefile.vc

@@ -264,7 +264,7 @@ $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest.res
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\anitest_anitest.obj: .\anitest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) $**

contrib/samples/animate/makefile.wat

@@ -247,7 +247,7 @@ $(OBJS)\anitest.exe :  $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest.res
 
 data : .SYMBOLIC 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\anitest_anitest.obj :  .AUTODEPEND .\anitest.cpp
 	$(CXX) -zq -fo=$^@ $(ANITEST_CXXFLAGS) $<