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

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

.cvsignore

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

Makefile.in

@@ -321,18 +321,10 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
 	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
 # NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line
-#     but this seems to result in problems with libwx_gtk being linked in twice.
+#     but this seems to result in problems with libwx_gtk being linked in twice
-# RL: This is another example of why sonames exist, and what happens when you
-#     ignore them.  Broken linking like this is now an rc bug in Debian, so we
-#     add them back again (to SONAME_FLAGS_GL) in configure if --enable-soname
-#     is used.  Removing the explicit -L /usr/lib from LDFLAGS would probably
-#     help with the above problem, but building without the soname is broken in
-#     so many other ways that I'm not going to touch that case in 2.4 anymore
-#     if I can help it.
-#
 $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
 	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) $@ glcanvas.o $(SONAME_FLAGS_GL) $(LDFLAGS_GL) $(OPENGLLIBS) $(EXTRALIBS)
+	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
 	@$(INSTALL) -d $(build_libdir)
@@ -391,17 +383,30 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
 
+afminstall: preinstall
+	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
+	$(INSTALL) -d $(datadir)/wx
+	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
+	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
+	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+
 m4datainstall: preinstall
 	$(INSTALL) -d $(datadir)/aclocal
 	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
 
 win32install: preinstall
 	$(INSTALL) -d $(includedir)/wx/msw
+	$(INSTALL) -d $(includedir)/wx/msw/gnuwin32
+	$(INSTALL) -d $(includedir)/wx/msw/gnuwin32/gl
 	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/*.cur \
 			$(top_srcdir)/include/wx/msw/*.ico \
 			$(top_srcdir)/include/wx/msw/*.bmp \
 			$(top_srcdir)/include/wx/msw/wx.rc \
 				$(includedir)/wx/msw
+	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/*.h $(includedir)/wx/msw/gnuwin32
+	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/gl/*.h $(includedir)/wx/msw/gnuwin32/gl
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
@@ -469,7 +474,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
 	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
 
-install: @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
 	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@@ -498,7 +503,11 @@ uninstall:
 	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 	@$(RM) $(bindir)/wx-config
 	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
+	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
+	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*
 	# FIXME: wxBase doesnt install these next 3 dirs.
+	@-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+	@-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm
 	@-rmdir $(datadir)/wx/$(VER_MAJMIN)
 	@-rmdir $(datadir)/wx
 	@echo " Removing headers..."
@@ -738,12 +747,19 @@ MACX_DIST: ALL_GUI_DIST
 
 MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
+	mkdir $(DISTDIR)/include/wx/msw/ctl3d
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	mkdir $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
+	cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
+	cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw
@@ -755,9 +771,16 @@ MSW_DIST: ALL_GUI_DIST
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
 	mkdir $(DISTDIR)/include/wx/msw
+	mkdir $(DISTDIR)/include/wx/msw/ctl3d
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	mkdir $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
+	cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
+	cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/msw/ole
@@ -1182,6 +1205,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
 
 	mkdir $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
@@ -1194,7 +1218,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
@@ -1382,6 +1406,11 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
 
 MISC_DIST: ALL_GUI_DIST
+	mkdir $(DISTDIR)/misc
+	mkdir $(DISTDIR)/misc/afm
+	cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
+	mkdir $(DISTDIR)/misc/gs_afm
+	cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 
 INTL_DIST:
 	mkdir $(DISTDIR)/locale
@@ -1463,7 +1492,7 @@ PYTHON_DIST:
 		wxPython/wxPython/py/wxd \
 		; do \
 			echo "Copying dir: $$dir..."; \
-			mkdir -p $(DISTDIR)/$$dir; \
+			mkdir $(DISTDIR)/$$dir; \
 			cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
 		done; \
 		\
@@ -1567,20 +1596,14 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	@# in other dist targets.  Ugly and hardly portable but it
 	@# will run on any Debian box and that's enough for now.
 
-
+	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
-	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
+			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
+			-print0 | xargs -0 rm -rf
-			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
-			   -o -name "*.bkl" -o -name "*.pro" -o -name "*.def"    \
-			   -o -name "*.vpj" -o -name "*.sc"                      \
-			   -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
-			\) -print0 | xargs -0 rm -rf
 
 	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 
-
+debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
-@IF_GNU_MAKE@debian-native-dist: $(filter-out DEMOS_DIST,@GUIDIST@) MANUAL_DIST PYTHON_DIST
 	cp $(SRCDIR)/files.lst $(DISTDIR)/src
 
 debian-msw-dirs:
@@ -1588,11 +1611,6 @@ debian-msw-dirs:
 	mkdir $(DISTDIR)/src/msw
 
 
-# This is to keep non-gnu make's happy.
-# ... but is of course stupid and useless here, so make it a noop at least.
-@IF_NOT_GNU_MAKE@debian-native-dist: 
-
-
 clean:
 	$(RM) *.o
 	$(RM) *.d

art/addbookm.xpm

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

art/back.xpm

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

art/deffile.xpm

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

art/delbookm.xpm

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

art/down.xpm

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

art/exefile.xpm

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

art/forward.xpm

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

art/gtk/warning.xpm

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

art/htmbook.xpm

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

art/htmfoldr.xpm

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

art/htmoptns.xpm

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

art/htmpage.xpm

@@ -1,23 +1,25 @@
-/* XPM */
+/* XPM */
-static char * htmpage_xpm[] = {
+static char * htmpage_xpm[] = {
-"16 16 4 1",
+/* width height ncolors chars_per_pixel */
-" 	c None",
+"16 16 3 1",
-".	c #808080",
+/* colors */
-"X	c Gray100",
+" 	s None	c None",
-"o	c Black",
+".	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,35 @@
 /* XPM */
-static char *htmsidep_xpm[] = {
+static char * htmsidep_xpm[] = {
-/* columns rows colors chars-per-pixel */
+"16 15 17 1",
-"16 16 6 1",
+" 	c None",
-". c Black",
+".	c #000000",
-"X c #FFFFFF",
+"+	c #800000",
-"+ c #808080",
+"@	c #008000",
-"  c None",
+"#	c #808000",
-"O c #0000C0",
+"$	c #000080",
-"o c #C0C0C0",
+"%	c #800080",
-/* pixels */
+"&	c #008080",
-"                ",
+"*	c #C0C0C0",
-" .............. ",
+"=	c #808080",
-" .XXXX.ooooooo. ",
+"-	c #FF0000",
-" .XOXX.oo...oo. ",
+";	c #00FF00",
-" .XXOX.ooooooo. ",
+">	c #FFFF00",
-" .OOOO.o...+.o. ",
+",	c #0000FF",
-" .XXOX.ooooooo. ",
+"'	c #FF00FF",
-" .XOXX.ooooooo. ",
+")	c #00FFFF",
-" .XXXX.o..+ooo. ",
+"!	c #FFFFFF",
-" .XXOX.ooooooo. ",
+"****************",
-" .XOXX.o...+.o. ",
+"*..............*",
-" .OOOO.ooooooo. ",
+"*.************.*",
-" .XOXX.o.+...o. ",
+"*..............*",
-" .XXOX.ooooooo. ",
+"*.****.!!!!!!!.*",
-" .............. ",
+"*.****.!====*!.*",
-"                "
+"*.****.!!!!!!!.*",
-};
+"*.****.!===*!!.*",
+"*.****.!!!!!!!.*",
+"*.****.!====*!.*",
+"*.****.!!!!!!!.*",
+"*.****.!===*!!.*",
+"*.****.!!!!!!!.*",
+"*..............*",
+"****************"};

art/listview.xpm

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

art/motif/error.xpm

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

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

art/toparent.xpm

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

art/up.xpm

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

config.guess

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

config.sub

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-03-12'
+timestamp='2003-01-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,8 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -229,15 +228,14 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
+	| clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
+	| ip2k \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -249,7 +247,6 @@ case $basic_machine in
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@@ -260,11 +257,11 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -299,7 +296,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
 	| clipper-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -307,8 +304,8 @@ case $basic_machine in
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
+	| ip2k-* \
-	| m32r-* | m32rle-* \
+	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -322,7 +319,6 @@ case $basic_machine in
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
@@ -333,13 +329,11 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -363,9 +357,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -380,12 +371,6 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -445,20 +430,12 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -758,10 +735,6 @@ case $basic_machine in
 		basic_machine=or32-unknown
 		os=-coff
 		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -793,24 +766,18 @@ case $basic_machine in
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -869,10 +836,6 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -880,9 +843,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -957,18 +917,14 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
+        tic4x | c4x*)
+		basic_machine=tic4x-unknown
+		os=-coff
+		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -982,10 +938,6 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1075,13 +1027,13 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
 		basic_machine=sh-unknown
 		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1154,20 +1106,19 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -microbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1191,9 +1142,6 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1206,9 +1154,6 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1230,9 +1175,6 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1255,9 +1197,6 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1288,12 +1227,6 @@ case $os in
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-none)
 		;;
 	*)
@@ -1325,9 +1258,6 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1506,15 +1436,9 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;

configure.in

@@ -25,30 +25,22 @@ dnl When making releases do:
 dnl
 dnl WX_RELEASE_NUMBER += 1
 dnl
-dnl ..and update WX_CURRENT, WX_RELEASE and WX_AGE according to the
+dnl In case of backwards incompatible change (shouldn't happen
-dnl following (libtool derived) rules:
+dnl but if it does, do change the soname here to avoid run-time
-dnl
+dnl problems!), do WX_CURRENT++; WX_REVISION = WX_AGE = 0. Otherwise
-dnl    If any changes have been made to the public interface -- ie. if any
+dnl (i.e. normal case), WX_CURRENT should be left unchanged, but you
-dnl    exported class, method, global or global type has been added (to),
+dnl should do WX_REVISION++ and, if any public methods were added to
-dnl    removed (from) or changed in any way -- then do:  WX_CURRENT += 1
+dnl the library, also WX_AGE++.
-dnl
-dnl    If WX_CURRENT was incremented (as above) do:  WX_REVISION = 0
-dnl    Otherwise (if source changes have been made that do not _alter_ the
-dnl    existing public interfaces) do:  WX_REVISION += 1
-dnl
-dnl    If any public interface was added, do:  WX_AGE += 1
-dnl    If any public interface was removed (or altered in a way effectively
-dnl    removing the previous definition), instead do:  WX_AGE = 0
 dnl
 dnl When the major or minor version numbers are incremented, all the above
-dnl variables should be reset to 0 once again.
+dnl variables should be reset to 0.
 dnl
 dnl The resulting library name will be of the form:
 dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=4
-WX_RELEASE_NUMBER=3
+WX_RELEASE_NUMBER=2
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -56,15 +48,15 @@ WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
 
 WX_CURRENT=0
-WX_REVISION=2
+WX_REVISION=1
-WX_AGE=0
+WX_AGE=1
 
 
 dnl ------------------------------------------------------------------------
 dnl Check platform (host system)
 dnl ------------------------------------------------------------------------
 
-dnl OS (assume Unix)
+dnl assume Unix
 USE_UNIX=1
 USE_OS2=0
 USE_WIN32=0
@@ -72,36 +64,26 @@ USE_DOS=0
 USE_BEOS=0
 USE_MAC=0
 
-dnl Unix kind
+USE_LINUX=
+USE_GNU=
+USE_SGI=
+USE_HPUX=
+USE_SYSV=
+USE_SVR4=
 USE_AIX=
-dnl any BSD
+USE_SUN=
+USE_SOLARIS=
+USE_SUNOS=
+USE_ALPHA=
+USE_OSF=
 USE_BSD=
-dnl a.k.a. Mac OS X
 USE_DARWIN=
 USE_FREEBSD=
-dnl GNU/Hurd
-USE_GNU=
-USE_HPUX=
-USE_LINUX=
-USE_NETBSD=
 USE_OPENBSD=
-dnl OSF/1 (obsolete?)
+USE_NETBSD=
-USE_OSF=
-USE_SGI=
-dnl Solaris ("SunOS" >= 5)
-USE_SOLARIS=
-dnl SunOS or Solaris
-USE_SUN=
-dnl old/real SunOS (obsolete)
-USE_SUNOS=
-dnl SysV R4
-USE_SVR4=
-dnl any System V
-USE_SYSV=
 USE_VMS=
 USE_ULTRIX=
 USE_DATA_GENERAL=
-USE_ALPHA=
 
 dnl on some platforms xxx_r() functions are declared inside "#ifdef
 dnl _REENTRANT" and it's easier to just define this symbol for these platforms
@@ -163,8 +145,9 @@ case "${host}" in
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
-  *-*-gnu* | *-*-k*bsd*-gnu )
+  *-*-gnu* )
     USE_GNU=1
+    AC_DEFINE(__GNU__)
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1
@@ -775,7 +758,7 @@ WX_ARG_ENABLE(compat22,      [  --disable-compat22      disable wxWindows 2.2 co
 
 AC_ARG_ENABLE(rpath,         [  --enable-rpath=DIR      output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])
 
-if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable" -a "$wxRPATH_DIR" != "no"; then
+if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then
    WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
 fi
 
@@ -1153,7 +1136,7 @@ if test "$wxUSE_GUI" = "yes"; then
           echo "$var=$value" >> ${wx_arg_cache_file}
         fi
         if test "$value" = 1; then
-          toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`
+          toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]`
           AC_MSG_RESULT($toolkit_echo)
         fi
       fi
@@ -1315,14 +1298,11 @@ AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
 
 if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
     IF_GNU_MAKE=""
-    IF_NOT_GNU_MAKE="#"
 else
     IF_GNU_MAKE="#"
-    IF_NOT_GNU_MAKE=""
 fi
 
 AC_SUBST(IF_GNU_MAKE)
-AC_SUBST(IF_NOT_GNU_MAKE)
 
 dnl we don't need to check for VPATH support in GNU make - it does have it
 if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
@@ -1386,6 +1366,8 @@ dnl ---------------------------------------------------------------------------
 dnl (OS/2-only piece)
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
+      dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
+      LIBS="$LIBS -lstdcpp"
       if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
           dnl More complete Unix emulation for unix-like ports
           dnl by linking in POSIX/2's cExt (if available).
@@ -1393,10 +1375,9 @@ case "${host}" in
       else
           dnl Include resources for the "native" port (wxPM).
           RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
-	  CLEANRESPROGRAMOBJ=""
       fi
       AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[
-          AC_TRY_COMPILE([],
+          AC_TRY_COMPILE([#include <features.h>],
               [
                   #if (__GNUC__ < 3)
                       #error old gcc
@@ -1468,13 +1449,7 @@ esac
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
         dnl defines HAVE_X11_XKBLIB_H
-        AC_CHECK_HEADERS(X11/Xlib.h)
+        AC_CHECK_HEADERS(X11/XKBlib.h)
-        AC_CHECK_HEADERS([X11/XKBlib.h], [], [], 
-                         [
-                          #if HAVE_X11_XLIB_H
-                            #include <X11/Xlib.h>
-                          #endif
-                         ])
     fi
 fi
 
@@ -1495,7 +1470,6 @@ AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(void *, 4)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(size_t, 4)
 
 case "${host}" in
     arm-*-linux* )
@@ -1676,7 +1650,7 @@ dnl check for glibc version
 dnl
 dnl VZ: I have no idea why had this check been there originally, but now
 dnl     we could probably do without it by just always adding _GNU_SOURCE
-if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
+if test "$USE_LINUX" = 1 || test "$USE_GNU" = 1 ; then
     AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
         AC_TRY_COMPILE([#include <features.h>],
             [
@@ -1807,13 +1781,10 @@ if test "$wxUSE_ZLIB" != "no" ; then
                     ],
                     ac_cv_header_zlib_h=`cat conftestval`,
                     ac_cv_header_zlib_h=no,
-                    dnl cross-compiling: don't have an answer, try later
+                    dnl cross-compiling: test if we have any zlib.h
-                    unset ac_cv_header_zlib_h
+                    [AC_CHECK_HEADER(zlib.h)]
                 )]
             )
-            dnl If the test above did not come up with a value (e.g. cross
-            dnl compiling) then this should give a definitive answer
-            AC_CHECK_HEADER(zlib.h)
 
             system_zlib_h_ok=$ac_cv_header_zlib_h
         fi
@@ -1885,11 +1856,10 @@ if test "$wxUSE_LIBPNG" != "no" ; then
                     ],
                     ac_cv_header_png_h=`cat conftestval`,
                     ac_cv_header_png_h=no,
-                    dnl cross-compiling: test (later) if we have any png.h
+                    dnl cross-compiling: test if we have any png.h
-                    unset ac_cv_header_png_h
+                    [AC_CHECK_HEADER(png.h)]
                 )]
             )
-            AC_CHECK_HEADER(png.h)
 
             if test "$ac_cv_header_png_h" = "yes"; then
                 AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng", , [-lz -lm])
@@ -2025,6 +1995,7 @@ dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------
 
+AFMINSTALL=
 WIN32INSTALL=
 
 TOOLKIT=
@@ -2081,7 +2052,6 @@ if test "$USE_WIN32" = 1 ; then
 
     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
-    CLEANRESPROGRAMOBJ=${RESPROGRAMOBJ}
 
     dnl install Win32-specific files in "make install"
     WIN32INSTALL=win32install
@@ -2215,6 +2185,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
         GUI_TK_LIBRARY="$wx_cv_libs_gtk"
 
+        AFMINSTALL=afminstall
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
 
@@ -2237,9 +2208,9 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         case "${host}" in
             *-*-linux* )
               if test "x$wxUSE_SHARED" = xyes ; then
-                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
+                  mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc"
               else
-                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
+                  mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so"
               fi
               ;;
             *-pc-msdosdjgpp )
@@ -2282,6 +2253,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
         GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
 
+        AFMINSTALL=afminstall
         TOOLKIT=MGL
         GUIDIST=MGL_DIST
     fi
@@ -2306,6 +2278,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
 
         wxUSE_UNIVERSAL="yes"
 
+        AFMINSTALL=afminstall
         TOOLKIT=MICROWIN
         GUIDIST=MICROWIN_DIST
 
@@ -2323,6 +2296,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
 
         GUI_TK_LIBRARY="$X_LIBS"
         TOOLKIT_INCLUDE="$X_CFLAGS"
+        AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         if test "$wxUSE_NANOX" = "yes"; then
@@ -2464,6 +2438,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         dnl X_LIBS and X_CFLAGS respectively -- what for??
         GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
         TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
+        AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         AC_MSG_CHECKING(for Motif/Lesstif headers)
@@ -2572,7 +2547,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         libs_found=0
         for libp in "" " -lXp"; do
             if test "$libs_found" = "0"; then
-                for libsm_ice in "" " -lSM -lICE"; do
+                for libsm_ice in " -lSM -lICE"; do
                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
@@ -2950,7 +2925,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         fi
       ;;
 
-      *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu )
+      *-*-linux* | *-*-gnu* )
         if test "$GCC" != "yes"; then
             AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc,
             [
@@ -2969,14 +2944,9 @@ if test "$wxUSE_SHARED" = "yes"; then
             fi
         fi
 
-        dnl Building ELF shared libraries without an soname by default and
-        dnl including /usr/lib explicitly in the linker path causes all sorts
-        dnl of grief.  We try to undo at least some of the wrongness that has
-        dnl propagated from that here when sonames are enabled by reinserting
-        dnl the arguments to declare the dependency on symbols in the main lib.
         if test "$wxUSE_SONAME" = "yes" ; then
             SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
-            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL} -L\$(build_libdir) $WXCONFIG_LIBS"
+            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
             dnl substitute this in makelib.env for the contrib libs
             WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
         fi
@@ -3022,7 +2992,7 @@ if test "$wxUSE_SHARED" = "yes"; then
             AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
                           makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
 
-            SHARED_LD="$AIX_CXX_LD -p 0 -o"
+            SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
         fi
       ;;
 
@@ -5008,11 +4978,6 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
         AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
         wxUSE_TOGGLEBTN=no
-    else
-        if test "$wxUSE_PM" = 1; then
-            AC_MSG_WARN([Toggle button not yet supported under PM... disabled])
-            wxUSE_TOGGLEBTN=no
-        fi
     fi
     if test "$wxUSE_UNIVERSAL" = "yes"; then
         AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
@@ -5505,6 +5470,7 @@ AC_SUBST(WXDEBUG_DEFINE)
 
 dnl toolkit options
 AC_SUBST(USE_GUI)
+AC_SUBST(AFMINSTALL)
 AC_SUBST(WIN32INSTALL)
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DIR)
@@ -5551,7 +5517,6 @@ dnl additional resurces settings
 AC_SUBST(RESCOMP)
 AC_SUBST(RESFLAGS)
 AC_SUBST(RESPROGRAMOBJ)
-AC_SUBST(CLEANRESPROGRAMOBJ)
 AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
 AC_SUBST(WX_RESOURCES_MACOSX_DATA)
 
@@ -5589,7 +5554,6 @@ dnl idea could have been to use the cache but this wouldn't work when
 dnl configure doesn't use cache at all which is the default with autoconf 2.50)
 wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
 wx_cv_if_gnu_make=$IF_GNU_MAKE
-wx_cv_if_not_gnu_make=$IF_NOT_GNU_MAKE
 wx_cv_path_ifs=$PATH_IFS
 wx_cv_program_ext=$PROGRAM_EXT
 wx_cv_target_library=$WX_TARGET_LIBRARY
@@ -5600,7 +5564,7 @@ wx_cv_release=${WX_RELEASE}
 wx_cv_current=${WX_CURRENT}
 wx_cv_revision=${WX_REVISION}
 wx_cv_age=${WX_AGE}
-export wx_cv_path_samplesubdirs wx_cv_if_gnu_make wx_cv_if_not_gnu_make \
+export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
        wx_cv_path_ifs wx_cv_program_ext \
        wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
        wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age

contrib/configure.in

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

contrib/docs/latex/fl/tex2rtf.ini

@@ -29,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/animate/animate.h

@@ -21,7 +21,6 @@
 #include <wx/gdicmn.h>
 #include <wx/list.h>
 #include <wx/timer.h>
-#include <wx/control.h>
 
 //#define ANIMDLLEXPORT WXDLLEXPORT
 #define ANIMDLLEXPORT

contrib/include/wx/mmedia/sndaiff.h

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

contrib/include/wx/mmedia/sndbase.h

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

contrib/include/wx/mmedia/sndcodec.h

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

contrib/include/wx/mmedia/sndcpcm.h

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

contrib/include/wx/mmedia/sndesd.h

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

contrib/include/wx/mmedia/sndfile.h

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

contrib/include/wx/mmedia/sndg72x.h

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

contrib/include/wx/mmedia/sndmsad.h

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

contrib/include/wx/mmedia/sndoss.h

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

contrib/include/wx/mmedia/sndpcm.h

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

contrib/include/wx/mmedia/sndulaw.h

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

contrib/include/wx/mmedia/sndwav.h

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

contrib/include/wx/mmedia/sndwin.h

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

contrib/include/wx/stc/stc.h

@@ -48,15 +48,6 @@
 #endif // SWIG
 
 
-// SWIG can't handle "#if" type of conditionals, only "#ifdef"
-#ifdef SWIG
-#define STC_USE_DND 1
-#else
-#if wxUSE_DRAG_AND_DROP
-#define STC_USE_DND 1
-#endif
-#endif
-
 //----------------------------------------------------------------------
 
 // Should a wxPopupWindow be used for the call tips and autocomplete windows?
@@ -2293,13 +2284,12 @@ public:
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);
 
-#ifdef STC_USE_DND
     // Allow for simulating a DnD DragOver
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
 
     // Allow for simulating a DnD DropText
     bool DoDropText(long x, long y, const wxString& data);
-#endif
+
 
 //----------------------------------------------------------------------
 
@@ -2351,6 +2341,15 @@ protected:
 
 //----------------------------------------------------------------------
 
+// SWIG can't handle "#if" type of conditionals, only "#ifdef"
+#ifdef SWIG
+#define STC_USE_DND 1
+#else
+#if wxUSE_DRAG_AND_DROP
+#define STC_USE_DND 1
+#endif
+#endif
+
 class wxStyledTextEvent : public wxCommandEvent {
 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
@@ -2450,32 +2449,32 @@ private:
 
 #ifndef SWIG
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_CHANGE,                  1650)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHANGE,                  1650)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_STYLENEEDED,             1651)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_STYLENEEDED,             1651)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_CHARADDED,               1652)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHARADDED,               1652)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_SAVEPOINTREACHED,        1653)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTREACHED,        1653)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_SAVEPOINTLEFT,           1654)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTLEFT,           1654)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_ROMODIFYATTEMPT,         1655)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ROMODIFYATTEMPT,         1655)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_KEY,                     1656)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_KEY,                     1656)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DOUBLECLICK,             1657)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DOUBLECLICK,             1657)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_UPDATEUI,                1658)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_UPDATEUI,                1658)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_MODIFIED,                1659)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MODIFIED,                1659)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_MACRORECORD,             1660)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MACRORECORD,             1660)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_MARGINCLICK,             1661)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MARGINCLICK,             1661)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_NEEDSHOWN,               1662)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_NEEDSHOWN,               1662)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_POSCHANGED,              1663)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_POSCHANGED,              1663)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_PAINTED,                 1664)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_PAINTED,                 1664)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_USERLISTSELECTION,       1665)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_USERLISTSELECTION,       1665)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_URIDROPPED,              1666)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED,              1666)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DWELLSTART,              1667)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART,              1667)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DWELLEND,                1668)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND,                1668)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_START_DRAG,              1669)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG,              1669)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DRAG_OVER,               1670)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER,               1670)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_DO_DROP,                 1671)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP,                 1671)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_ZOOM,                    1672)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ZOOM,                    1672)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_HOTSPOT_CLICK,           1673)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_HOTSPOT_CLICK,           1673)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_HOTSPOT_DCLICK,          1674)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_HOTSPOT_DCLICK,          1674)
-    DECLARE_EXPORTED_LOCAL_EVENT_TYPE(WXSTC_DECLSPEC, wxEVT_STC_CALLTIP_CLICK,           1675)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CALLTIP_CLICK,           1675)
 END_DECLARE_EVENT_TYPES()
 #else
     enum {

contrib/include/wx/xrc/xh_all.h

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

contrib/include/wx/xrc/xh_statbar.h

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

contrib/include/wx/xrc/xh_tglbtn.h

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

contrib/samples/animate/makefile.va

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

contrib/samples/gizmos/dynsash/Makefile.in

@@ -4,7 +4,6 @@
 # Created:	2001
 # Updated:
 # Copyright:	(c) 2001 Matt Kimball
-# License:  wxWindows license
 #
 # "%W% %G%"
 #

contrib/samples/gizmos/dynsash_switch/Makefile.in

@@ -4,7 +4,6 @@
 # Created:	2001
 # Updated:
 # Copyright:	(c) 2001 Matt Kimball
-# License:  wxWindows license
 #
 # "%W% %G%"
 #

contrib/samples/gizmos/multicell/mtest.cpp

@@ -4,9 +4,7 @@
  * Author:	Alex Andruschak
  * Created:	2000
  * Updated:	
- * Copyright: 
+ * Copyright:
- * Licence: wxWindows license
-
  */
 
 static const char sccsid[] = "%W% %G%";

contrib/samples/gizmos/splittree/makefile.va

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

contrib/samples/stc/stctest.cpp

@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// File:        stctest.cpp
+// File:        app.cpp
 // Purpose:     STC test application
 // Maintainer:  Otto Wyss
 // Created:     2003-09-01
@@ -191,7 +191,7 @@ IMPLEMENT_APP (App)
 bool App::OnInit () {
 
     wxInitAllImageHandlers();
-
+    
     // set application and vendor name
     SetAppName (APP_NAME);
     SetVendorName (APP_VENDOR);
@@ -378,10 +378,8 @@ void AppFrame::OnFileClose (wxCommandEvent &WXUNUSED(event)) {
                 return;
             }
         }
+        Destroy();
     }
-    m_edit->SetFilename (wxEmptyString);
-    m_edit->ClearAll();
-    m_edit->SetSavePoint();
 }
 
 // properties event handlers
@@ -643,7 +641,7 @@ AppAbout::AppAbout (wxWindow *parent,
 
     SetSizerAndFit (totalpane);
 
-    CenterOnScreen();
+    CenterOnScreen();    
     ShowModal();
 }
 

contrib/samples/xrc/XrcDemoVC.dsp

@@ -99,7 +99,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX- /Zi /Od /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -110,7 +110,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib wxxrc24d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Release DLL"
 
@@ -126,7 +126,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GX- /O2 /Ob1 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib wxxrc24.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ENDIF 
 

contrib/src/Makefile.in

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

contrib/src/animate/animate.cpp

@@ -22,8 +22,6 @@
 #include "wx/wfstream.h"
 #include "wx/image.h"
 #include "wx/gifdecod.h"
-#include "wx/log.h"
-#include "wx/dcmemory.h"
 #include "wx/animate/animate.h"
 
 /*
@@ -82,7 +80,7 @@ bool wxAnimationPlayer::Play(wxWindow& window, const wxPoint& pos, bool looped)
     {
         if (!Build())
         {
-            wxLogWarning(_T("wxAnimationPlayer::Play: could not build the image cache."));
+            wxLogWarning("wxAnimationPlayer::Play: could not build the image cache.");
             return FALSE;
         }
     }

contrib/src/applet/makefile

@@ -3,8 +3,7 @@
 #                   Copyright (C) 1999 SciTech Software
 #                           All rights reserved.
 #
-# Description:   Generic makefile for the SciTech wxApplet library
+# Descripton:   Generic makefile for the SciTech wxApplet library
-# Licence: wxWindows license
 #
 #############################################################################
 

contrib/src/mmedia/sndaiff.cpp

@@ -4,7 +4,6 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
-// Licence: wxWindows licence
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndaiff.cpp"

contrib/src/mmedia/sndbase.cpp

@@ -4,7 +4,6 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
 // CVSID: $Id$
-// Licence: wxWindows licence
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndbase.cpp"