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

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

.cvsignore

@@ -1,12 +1,78 @@
+system.list
+bin
 .gdb_history
+Test
 config.cache
 configarg.cache
 config.status
+system.list
+linux.system.cache
 wx-config
 config.log
+linux-gnu.system.cache
+*.dsp
+*.dsw
+*.plg
+*.opt
+*.aps
+*.ncb
+*.pro
+*.opt
+*.d
+*.swp
+*.swo
+*.vcp
+*.vcw
+Release
+Debug
+ReleaseUnicode
+DebugUnicode
+ReleaseUnicodeARM
+DebugUnicodeARM
+ReleaseUnicodeMIPS
+DebugUnicodeMIPS
+ReleaseUnicodeSH3
+DebugUnicodeSH3
+ReleaseUnicodeX86
+DebugUnicodeX86
+ReleaseUnicodeX86EM
+DebugUnicodeX86EM
+ReleaseDLL
+DebugDLL
+ReleaseUnicodeDLL
+DebugUnicodeDLL
+UnivRelease
+UnivDebug
+BaseRelease
+BaseDebug
+BaseReleaseDLL
+BaseDebugDLL
+build-debug
+robert
 stamp-h.in
 Makefile
 setup.h
+stamp-h
+libtool
+base
+gtk
+gtk2
+motif
+win32
+x11
+univ
+univ-debug
+univ-release
+base-debug
+gtk-debug
+motif-debug
+win32-debug
+base-release
+gtk-release
+motif-release
+win32-release
 *tags
+log
+univtags.cmd
 .DS_Store
 autom4te.cache

BuildCVS.txt

@@ -27,7 +27,7 @@ Cygwin is available at  http://www.cygwin.com/
 If you are using Cygwin or MinGW together with the MSYS environment, you
 can build the library using configure (see "Unix ports" and
 "Windows using configure" below). You can also
-build wxWidgets without configure using native makefile, but only with
+build wxWindows without configure using native makefile, but only with
 MinGW. Using Cygwin together with Windows makefile is no longer supported.
 
 If building with MinGW without configure:
@@ -49,18 +49,18 @@ If using configure, Unix instructions apply.
 
 c) Build instructions
 
-Assumming that you installed the wxWidgets sources
-into c:\wxWidgets:
+Assumming that you installed the wxWindows sources
+into c:\wxWindows:
 
--> Copy c:\wxWidgets\include\wx\msw\setup0.h
-   to   c:\wxWidgets\include\wx\msw\setup.h
--> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
-   the features you would like to compile wxWidgets with[out].
+-> Copy c:\wxWindows\include\wx\msw\setup0.h
+   to   c:\wxWindows\include\wx\msw\setup.h
+-> Edit c:\wxWindows\include\wx\msw\setup.h to choose
+   the features you would like to compile wxWindows with[out].
 
    and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
  
--> type: cd c:\wxWidgets\build\msw
+-> type: cd c:\wxWindows\build\msw
 -> type: make -f makefile.gcc  (if using GNU tools)
 or type: nmake -f makefile.vc   (if using MS VC++)
 etc.
@@ -72,7 +72,7 @@ d) Borland (including free command line tools)
    
    See docs/msw/install.txt for details; in brief:
 
--> type cd c:\wxWidgets\build\msw
+-> type cd c:\wxWindows\build\msw
 -> type make -f makefile.bcc
 
 You can customize many things in the build process, detailed description is
@@ -95,9 +95,9 @@ directory, which just calls autoconf). Note that you usually don't
 need to do this because configure is included in CVS.
 
 Set WXWIN environment variable to the base directory such
-as ~/wxWidgets (this is actually not really needed).
+as ~/wxWindows (this is actually not really needed).
 
--> type: export WXWIN=~/wxWidgets
+-> type: export WXWIN=~/wxWindows
 -> type: md mybuild
 -> type: cd mybuild
 -> type: ../configure --with-motif
@@ -116,7 +116,7 @@ yet complete).
 III) Windows using configure
 ----------------------------------------
 
-wxWidgets can be built on Windows using MSYS (see
+wxWindows can be built on Windows using MSYS (see
 http://www.mingw.org/), which is a POSIX build environment
 for Windows. With MSYS you can just ./configure && make (see also VII,
 Unix->Windows cross-compiling using configure).
@@ -128,7 +128,7 @@ IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
 ----------------------------------------
 
 Refer to the readme.txt and install.txt files in docs/mac to build
-wxWidgets under Classic Mac OS using CodeWarrior.
+wxWindows under Classic Mac OS using CodeWarrior.
 
 If you are checking out the CVS sources using cvs under Mac OS X and
 compiling under Classic Mac OS:
@@ -182,9 +182,9 @@ preferable if you write portable C(++). ]
 
 You might want to build both Unix and Windows binaries in the same source
 tree; to do this make subdirs for each e.g. unix and win32. If you've
-already build wxWidgets in the main dir, do a 'make distclean' there,
+already build wxWindows in the main dir, do a 'make distclean' there,
 otherwise configure will get confused. (In any case, read the section 'Unix
-using configure' and make sure you're able to build a native wxWidgets
+using configure' and make sure you're able to build a native wxWindows
 library; cross-compiling errors can be pretty obscure and you'll want to be
 sure that your configure setup is basically sound.)
 

acinclude.m4

@@ -43,15 +43,15 @@ for ac_dir in $1 /usr/include;
 ])
 
 dnl ---------------------------------------------------------------------------
-dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
+dnl call WX_PATH_FIND_LIBRARIES(search path, header name), sets ac_find_libraries
 dnl to the full name of the file that was found or leaves it empty if not found
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_LIBRARIES],
 [
-  ac_find_libraries=
-  for ac_dir in $1;
+ac_find_libraries=
+for ac_dir in $1 /usr/lib;
   do
-    for ac_extension in a so sl dylib dll.a; do
+    for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/lib$2.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
@@ -60,19 +60,6 @@ AC_DEFUN([WX_PATH_FIND_LIBRARIES],
   done
 ])
 
-dnl ---------------------------------------------------------------------------
-dnl return list of standard library paths
-dnl ---------------------------------------------------------------------------
-dnl return all default locations:
-dnl   - /usr/lib: standard
-dnl   - /usr/lib32: n32 ABI on IRIX
-dnl   - /usr/lib64: n64 ABI on IRIX
-dnl   - /usr/lib/64: 64 bit ABI on Solaris and Linux x86-64
-dnl
-dnl NB: if any of directories in the list is not a subdir of /usr, code setting
-dnl     wx_cv_std_libpath needs to be updated
-AC_DEFUN([WX_STD_LIBPATH], [/usr/lib /usr/lib32 /usr/lib/64 /usr/lib64])
-
 dnl ---------------------------------------------------------------------------
 dnl Path to include, already defined
 dnl ---------------------------------------------------------------------------
@@ -93,25 +80,16 @@ AC_DEFUN([WX_INCLUDE_PATH_EXIST],
 ])
 
 dnl ---------------------------------------------------------------------------
-dnl Usage: WX_LINK_PATH_EXIST(path, libpath)
-dnl
-dnl Set ac_path_to_link to nothing if path is already in libpath of to -Lpath
-dnl if it is not, so that libpath can be set to "$libpath$ac_path_to_link"
-dnl after calling this function
+dnl Path to link, already defined
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_LINK_PATH_EXIST],
 [
-  dnl never add -L/usr/libXXX explicitely to libpath
-  if test "$1" = "default location"; then
+  echo "$2" | grep "\-L$1" > /dev/null
+  result=$?
+  if test $result = 0; then
     ac_path_to_link=""
   else
-    echo "$2" | grep "\-L$1" > /dev/null
-    result=$?
-    if test $result = 0; then
-      ac_path_to_link=""
-    else
-      ac_path_to_link=" -L$1"
-    fi
+    ac_path_to_link=" -L$1"
   fi
 ])
 
@@ -132,7 +110,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
 
-    AC_CHECK_HEADERS(iostream,,, [ ])
+    AC_CHECK_HEADERS(iostream)
 
     if test "$ac_cv_header_iostream" = "yes" ; then
       ifelse([$1], , :, [$1])
@@ -227,72 +205,6 @@ AC_DEFUN([WX_CPP_EXPLICIT],
   fi
 ])
 
-dnl ---------------------------------------------------------------------------
-dnl WX_CHECK_FUNCS(FUNCTIONS...,
-dnl                [ACTION-IF-FOUND],
-dnl                [ACTION-IF-NOT-FOUND],
-dnl                [EXTRA-DEFINES-AND-INCLUDES],
-dnl                [EXTRA-TEST-CODE])
-dnl
-dnl Checks that the functions listed in FUNCTIONS exist in the headers and the
-dnl libs. For each function, if it is found then defines 'HAVE_FUNCTION' and
-dnl executes ACTION-IF-FOUND, otherwise executes ACTION-IF-NOT-FOUND.
-dnl
-dnl The code from EXTRA-DEFINES-AND-INCLUDES is inserted into the test before
-dnl the default headers are included, and EXTRA-TEST-CODE is inserted into
-dnl the main() function after the default test for existence.
-dnl
-dnl Examples:
-dnl   # the simple case
-dnl   WX_CHECK_FUNCS(stat)
-dnl   # use break to finish the loop early
-dnl   WX_CHECK_FUNCS(mkstemp mktemp, break)
-dnl   # extra defines
-dnl   WX_CHECK_FUNCS(strtok_r, [], [], [#define _RREENTRANT])
-dnl   # extra includes
-dnl   WX_CHECK_FUNCS(swprintf, [], [], [#include <wchar.h>])
-dnl   # checking the signature with extra test code
-dnl   WX_CHECK_FUNCS(gettimeofday, [], [], [#include <sys/time.h>]
-dnl     [struct timeval tv; struct timezone tz; gettimeofday(&tv, &tz)])
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([WX_CHECK_FUNCS],
-[
-  for wx_func in $1
-  do
-    AC_CACHE_CHECK(
-      [for $wx_func],
-      [wx_cv_func_$wx_func],
-      [
-        AC_LINK_IFELSE(
-          [
-            AC_LANG_PROGRAM(
-              [
-                $4
-                AC_INCLUDES_DEFAULT
-              ],
-              [
-                #ifndef $wx_func
-                  &$wx_func;
-                #endif
-                $5
-              ])
-          ],
-          [eval wx_cv_func_$wx_func=yes],
-          [eval wx_cv_func_$wx_func=no])
-      ])
-
-    if eval test \$wx_cv_func_$wx_func = yes
-    then
-      AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$wx_func])])
-      $2
-    else
-      :
-      $3
-    fi
-  done
-])
-
 dnl ---------------------------------------------------------------------------
 dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
 dnl ---------------------------------------------------------------------------
@@ -350,10 +262,6 @@ AC_DEFUN([WX_ARG_CACHE_FLUSH],
           mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
         ])
 
-dnl return the name of the variable to store the value of the given
-dnl WX_ARG_WITH/ENABLE option
-AC_DEFUN([WX_ARG_CACHE_NAME],)
-
 dnl this macro checks for a three-valued command line --with argument:
 dnl   possible arguments are 'yes', 'no', 'sys', or 'builtin'
 dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
@@ -364,13 +272,13 @@ AC_DEFUN([WX_ARG_SYS_WITH],
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
-                          AS_TR_SH(wx_cv_use_$1)='$3=yes'
+                          ac_cv_use_$1='$3=yes'
                         elif test "$withval" = no; then
-                          AS_TR_SH(wx_cv_use_$1)='$3=no'
+                          ac_cv_use_$1='$3=no'
                         elif test "$withval" = sys; then
-                          AS_TR_SH(wx_cv_use_$1)='$3=sys'
+                          ac_cv_use_$1='$3=sys'
                         elif test "$withval" = builtin; then
-                          AS_TR_SH(wx_cv_use_$1)='$3=builtin'
+                          ac_cv_use_$1='$3=builtin'
                         else
                           AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
                         fi
@@ -383,12 +291,12 @@ AC_DEFUN([WX_ARG_SYS_WITH],
                           no_cache=1
                         fi
 
-                        AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
+                        ac_cv_use_$1='$3='$DEFAULT_$3
                       ])
 
-          eval "$AS_TR_SH(wx_cv_use_$1)"
+          eval "$ac_cv_use_$1"
           if test "$no_cache" != 1; then
-            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$$3" = yes; then
@@ -405,18 +313,17 @@ AC_DEFUN([WX_ARG_SYS_WITH],
         ])
 
 dnl this macro checks for a command line argument and caches the result
-dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
+dnl usage: WX_ARG_WITH(option, helpmessage, variable-name)
 AC_DEFUN([WX_ARG_WITH],
         [
-          withstring=$4
-          AC_MSG_CHECKING([for --${withstring:-with}-$1])
+          AC_MSG_CHECKING([for --with-$1])
           no_cache=0
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
-                          AS_TR_SH(wx_cv_use_$1)='$3=yes'
+                          ac_cv_use_$1='$3=yes'
                         else
-                          AS_TR_SH(wx_cv_use_$1)='$3=no'
+                          ac_cv_use_$1='$3=no'
                         fi
                       ],
                       [
@@ -427,12 +334,12 @@ AC_DEFUN([WX_ARG_WITH],
                           no_cache=1
                         fi
 
-                        AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
+                        ac_cv_use_$1='$3='$DEFAULT_$3
                       ])
 
-          eval "$AS_TR_SH(wx_cv_use_$1)"
+          eval "$ac_cv_use_$1"
           if test "$no_cache" != 1; then
-            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$$3" = yes; then
@@ -450,15 +357,15 @@ dnl message when running configure instead of the default "checking for
 dnl --enable-foo" one whih is useful for the options enabled by default
 AC_DEFUN([WX_ARG_ENABLE],
         [
-          enablestring=$4
+	  enablestring=$4
           AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
           no_cache=0
           AC_ARG_ENABLE($1, [$2],
                         [
                           if test "$enableval" = yes; then
-                            AS_TR_SH(wx_cv_use_$1)='$3=yes'
+                            ac_cv_use_$1='$3=yes'
                           else
-                            AS_TR_SH(wx_cv_use_$1)='$3=no'
+                            ac_cv_use_$1='$3=no'
                           fi
                         ],
                         [
@@ -469,12 +376,12 @@ AC_DEFUN([WX_ARG_ENABLE],
                             no_cache=1
                           fi
 
-                          AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
+                          ac_cv_use_$1='$3='$DEFAULT_$3
                         ])
 
-          eval "$AS_TR_SH(wx_cv_use_$1)"
+          eval "$ac_cv_use_$1"
           if test "$no_cache" != 1; then
-            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$$3" = yes; then
@@ -485,47 +392,6 @@ AC_DEFUN([WX_ARG_ENABLE],
         ])
 
 
-dnl Like WX_ARG_ENABLE but accepts a parameter.
-dnl
-dnl Usage:
-dnl   WX_ARG_ENABLE_PARAM(option, helpmessage, variable-name, enablestring)
-dnl
-dnl Example:
-dnl   WX_ARG_ENABLE_PARAM(foo, [[  --enable-foo[=bar] use foo]], wxUSE_FOO)
-dnl
-dnl  --enable-foo       wxUSE_FOO=yes
-dnl  --disable-foo      wxUSE_FOO=no
-dnl  --enable-foo=bar   wxUSE_FOO=bar
-dnl  <not given>        value from configarg.cache or wxUSE_FOO=no
-dnl
-AC_DEFUN([WX_ARG_ENABLE_PARAM],
-        [
-          enablestring=$4
-          AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
-          no_cache=0
-          AC_ARG_ENABLE($1, [$2],
-                        [
-                          wx_cv_use_$1="$3='$enableval'"
-                        ],
-                        [
-                          LINE=`grep "$3" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            wx_cv_use_$1='$3='$DEFAULT_$3
-                          else
-                            no_cache=1
-                            wx_cv_use_$1="$3=no"
-                          fi
-                        ])
-
-          eval "$wx_cv_use_$1"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_$1 >> ${wx_arg_cache_file}.tmp
-          fi
-
-          AC_MSG_RESULT([$$3])
-        ])
-
 dnl ===========================================================================
 dnl Linker features test
 dnl ===========================================================================
@@ -539,80 +405,44 @@ dnl call WX_VERSIONED_SYMBOLS(versionfile)
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_VERSIONED_SYMBOLS],
 [
-    case "${host}" in
-        *-*-cygwin* | *-*-mingw* )
-            dnl although ld does support version script option on these
-            dnl platforms, it doesn't make much sense to use it under Win32
-            dnl and, moreover, this breaks linking because of a bug in handling
-            dnl paths in -Wl,--version-script,path option (if we ever do need
-            dnl to use it for cygwin/mingw32, keep in mind that replacing last
-            dnl comma with the equal sign works) so
-            dnl simply disable it
-            wx_cv_version_script=no
-            ;;
+  found_versioning=no
 
-        *)
-            AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
-            [
-                echo "VER_1 { *; };" >conftest.sym
-                echo "int main() { return 0; }" >conftest.cpp
-
-                if AC_TRY_COMMAND([
-                        $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                        -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
-                  if test -s conftest.stderr ; then
-                      wx_cv_version_script=no
-                  else
-                      wx_cv_version_script=yes
-                  fi
-                else
-                  wx_cv_version_script=no
-                fi
-
-                dnl There's a problem in some old linkers with --version-script that
-                dnl can cause linking to fail when you have objects with vtables in
-                dnl libs 3 deep.  This is known to happen in netbsd and openbsd with
-                dnl ld 2.11.2.
-                dnl
-                dnl To test for this we need to make some shared libs and
-                dnl unfortunately we can't be sure of the right way to do that. If the
-                dnl first two compiles don't succeed then it looks like the test isn't
-                dnl working and the result is ignored, but if OTOH the first two
-                dnl succeed but the third does not then the bug has been detected and
-                dnl the --version-script flag is dropped.
-                if test $wx_cv_version_script = yes
-                then
-                  echo "struct B { virtual ~B() { } }; \
-                        struct D : public B { }; \
-                        void F() { D d; }" > conftest.cpp
-
-                  if AC_TRY_COMMAND([
-                        $CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                        -Wl,--version-script,conftest.sym >/dev/null 2>/dev/null]) &&
-                     AC_TRY_COMMAND([
-                        $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                        -Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null])
-                  then
-                    if AC_TRY_COMMAND([
-                          $CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                          -Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null])
-                    then
-                      wx_cv_version_script=yes
-                    else
-                      wx_cv_version_script=no
-                    fi
-                  fi
-                fi
-
-                rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
-                rm -f conftest1.output conftest2.output conftest3.output
-            ])
-
-            if test $wx_cv_version_script = yes ; then
-                LDFLAGS_VERSIONING="-Wl,--version-script,$1"
-            fi
-            ;;
-    esac
+  dnl FIXME - doesn't work, Solaris linker doesn't accept wildcards
+  dnl         in the script.
+  dnl dnl Check for known non-gcc cases:
+  dnl case "${host}" in
+  dnl   *-*-solaris2* )
+  dnl     if test "x$GCC" != "xyes" ; then
+  dnl         LDFLAGS_VERSIONING="-M $1"
+  dnl         found_versioning=yes
+  dnl     fi
+  dnl   ;;
+  dnl esac
+  
+  dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
+  if test $found_versioning = no ; then
+      AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
+      [
+        echo "VER_1 { *; };" >conftest.sym
+        echo "int main() { return 0; }" >conftest.cpp
+  
+        if AC_TRY_COMMAND([
+                $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
+                -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
+          if test -s conftest.stderr ; then
+              wx_cv_version_script=no
+          else
+              wx_cv_version_script=yes
+          fi
+        else
+          wx_cv_version_script=no
+        fi
+        rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
+      ])
+      if test $wx_cv_version_script = yes ; then
+        LDFLAGS_VERSIONING="-Wl,--version-script,$1"
+      fi
+  fi
 ])
 
 

art/addbookm.xpm

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

art/back.xpm

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

art/cdrom.xpm

@@ -1,57 +1,29 @@
-/* XPM */
-static const char * cdrom_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 36 1",
-"= c #9BACC2",
-"y c #547B99",
-"$ c #FFFFFF",
-"@ c #839CB5",
-"o c #547897",
-"4 c #4D7492",
-"% c #F1F4F7",
-"X c #5A809C",
-"< c #8497A5",
-"0 c #7898AD",
-"+ c #CAD2DC",
-"r c #ACAEB2",
-"2 c #BECAD9",
-"* c #65839D",
-"e c #DCE2EA",
-"- c #ADBED2",
-"t c #597B9A",
-"  c None",
-"1 c #467291",
-"9 c #D6DFE7",
-"O c #7393AB",
-"u c #49708B",
-"5 c #A0BACB",
-"& c #AABFCD",
-"8 c #B9CBD5",
-"; c #B4C4D3",
-": c #6F90A6",
-"3 c #A8B6CA",
-"# c #ADBACE",
-"w c #E4E9ED",
-". c #8EA9BC",
-"> c #B3BFD1",
-", c #C2CBDB",
-"6 c #C0D1DC",
-"7 c #A2B3C5",
-"q c #5D7C93",
-/* pixels */
-"     .XooOo+    ",
-"    X@#$$$%o&   ",
-"   *=-;$$$$$o+  ",
-"  +O#;-$$$$$$:  ",
-"  o=>,-<1<$2-o  ",
-"  o3>--1$122-*  ",
-"  o=--$<4<22-X  ",
-"  o5$$$$$26;7*  ",
-"   X%$$$$2;-X8  ",
-"  90*9$$$-7Xqo  ",
-" wXwe@O44X4<r<o ",
-" X8628>22222<<*4",
-" ttyyyoo4441uuuo",
-" t>$$$$$$$$$$$>o",
-" XXXtyyyoo44411u"
-};
+/* XPM */
+static char *cdrom_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 10 1",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Yellow",
+"O    c Blue",
+"+    c Black",
+"@    c Gray100",
+"#    c #008080",
+"$    c Green",
+"%    c #008000",
+"        ...     ",
+"      ..XoX..   ",
+"     .O.XoXXX+  ",
+"    ...O.oXXXX+ ",
+"    .O..X.XXXX+ ",
+"   ....X.+..XXX+",
+"   .XXX.+@+.XXX+",
+"   .X@XX.+.X@@X+",
+" .....X...#XX@+ ",
+".@@@...XXo.O@X+ ",
+".@XXX..XXoXOO+  ",
+".@++++..XoX+++  ",
+".@$%@@XX+++X.+  ",
+".............+  ",
+" ++++++++++++   "};

art/copy.xpm

@@ -1,44 +0,0 @@
-/* XPM */
-static const char * copy_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 23 1",
-"o c #97C4E7",
-"* c #FFFFFF",
-"@ c #60A9DA",
-"= c #D1E5F5",
-"& c #C3DDF1",
-". c #7EA6C0",
-"  c None",
-"X c #2F93CD",
-"O c #85BBE2",
-", c #EFF6FC",
-"; c #DEEDF8",
-"+ c #72B2DD",
-"3 c #F7FBFD",
-"4 c #FAFCFE",
-": c #DAEAF7",
-"< c #E9F3FA",
-"1 c #E2EFF8",
-"- c #FDFDFE",
-"% c #B6D5EE",
-"$ c #A5CCEA",
-"> c #E5F0F9",
-"# c #AFD1EC",
-"2 c #F4F9FD",
-/* pixels */
-" .....XX        ",
-" .oO+@X#X       ",
-" .$oO+X##X      ",
-" .%$o........   ",
-" .&%$.*=&#o.-.  ",
-" .=&%.*;=&#.--. ",
-" .:=&.*>;=&.... ",
-" .>:=.*,>;=&#o. ",
-" .<1:.*2,>:=&#. ",
-" .2<1.*32,>:=&. ",
-" .32<.*432,>:=. ",
-" .32<.*-432,>:. ",
-" .....**-432,>. ",
-"     .***-432,. ",
-"     .......... "
-};

art/cross.xpm

@@ -1,17 +1,17 @@
-/* XPM */
-static const char * cross_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"10 10 2 1",
-"  c Gray0",
-"# c None",
-/* pixels */
-" ######## ",
-"   ####   ",
-"#   ##   #",
-"##      ##",
-"###    ###",
-"###    ###",
-"##      ##",
-"#   ##   #",
-"   ####   ",
-"  ######  "};
+/* XPM */
+static char *cross_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"10 10 2 1",
+"  c Gray0",
+"# c None",
+/* pixels */
+" ######## ",
+"   ####   ",
+"#   ##   #",
+"##      ##",
+"###    ###",
+"###    ###",
+"##      ##",
+"#   ##   #",
+"   ####   ",
+"  ######  "};

art/cut.xpm

@@ -1,46 +0,0 @@
-/* XPM */
-static const char * cut_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 25 1",
-"6 c #D8BDC0",
-": c #C3C3C4",
-"- c #FFFFFF",
-". c #6C6D70",
-"2 c #AD3A45",
-"o c #DBDBDB",
-"# c #939495",
-"< c #E42234",
-"& c #C3C5C8",
-"; c #C6CCD3",
-"% c #B7B7B8",
-"  c None",
-"* c #DFE0E2",
-"5 c #B69596",
-"3 c #9C2A35",
-"1 c #CFCFD0",
-", c #AB5C64",
-"+ c #D2D3D4",
-"$ c #BCBDBE",
-"@ c #C6C8CA",
-"> c #CDC0C1",
-"O c #826F72",
-"X c #979BA0",
-"4 c #9B8687",
-"= c #9FA0A0",
-/* pixels */
-"   .X     .o    ",
-"   O.+   @.     ",
-"    O.   ..     ",
-"    O#$ %.&     ",
-"     O.*..      ",
-"     #%#..      ",
-"     O=-..      ",
-"     #%#;.      ",
-"     OO:=O      ",
-"  >,,<, ,<,,1   ",
-" ><23<1 1<32<1  ",
-" ,2 4<   <5 2,  ",
-" <, ,2   2, ,<  ",
-" 23,<5   5<,32  ",
-" 6225     522>  "
-};

art/deffile.xpm

@@ -1,54 +1,75 @@
 /* XPM */
-static const char * deffile_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 32 1",
-"= c #97C4E7",
-": c #72A8D2",
-"1 c #FFFFFF",
-"w c #839CB5",
-"X c #6B98B8",
-". c #5A89A6",
-"@ c #3A749C",
-", c #D1E5F5",
-"< c #67A1CF",
-"> c #F1F4F7",
-"e c #85A7BC",
-"% c #C3DDF1",
-"0 c #749BB4",
-"2 c #7EA6C0",
-"; c #5F9BC8",
-"  c None",
-"O c #538DB3",
-"- c #85BBE2",
-"$ c #D6DFE7",
-"9 c #EFF6FC",
-"o c #6591AE",
-"4 c #F7FBFD",
-"8 c #FAFCFE",
-"6 c #DAEAF7",
-"7 c #E9F3FA",
-"q c #FDFDFE",
-"3 c #E2EFF8",
-"# c #8EA9BC",
-"& c #B6D5EE",
-"* c #A5CCEA",
-"5 c #F4F9FD",
-"+ c #4581AA",
-/* pixels */
-"  ..XooO+@#$    ",
-"  .%%&*=-;:;>   ",
-"  .,,%&*=<1=X>  ",
-"  #%%%%&*211=X  ",
-"  #3-----<oXoO  ",
-"  #3456,%&*=-O  ",
-"  #3--------=O  ",
-"  #355736,%&*o  ",
-"  #3--------&o  ",
-"  #38459736,%X  ",
-"  #3--------,0  ",
-"  #31q84597360  ",
-"  #3--------3w  ",
-"  #3111q84597e  ",
-"  ##########e#  ",
-"                "
-};
+static char * deffile_xpm[] = {
+"16 16 56 1",
+" 	c None",
+".	c #C6C6D5",
+"+	c #9494AD",
+"@	c #FBFBFC",
+"#	c #F8F8FA",
+"$	c #F4F4F7",
+"%	c #EEEEF2",
+"&	c #EAEAF0",
+"*	c #DEDEE7",
+"=	c #E0E0E9",
+"-	c #F5F5F8",
+";	c #F0F0F4",
+">	c #EDEDF2",
+",	c #E1E1E9",
+"'	c #B8B8C4",
+")	c #A6A6BB",
+"!	c #E4E4EB",
+"~	c #8E8EA2",
+"{	c #AFAFC2",
+"]	c #F7F7F9",
+"^	c #F1F1F5",
+"/	c #E6E6ED",
+"(	c #DBDBE5",
+"_	c #C0C0CC",
+":	c #F2F2F6",
+"<	c #E7E7EE",
+"[	c #E3E3EA",
+"}	c #D0D0DC",
+"|	c #9898A0",
+"1	c #E7E7ED",
+"2	c #FAFAFB",
+"3	c #F3F3F6",
+"4	c #E8E8EE",
+"5	c #CBCBD9",
+"6	c #B3B3BD",
+"7	c #D6D6E1",
+"8	c #F9F9FA",
+"9	c #DCDCE5",
+"0	c #D2D2DE",
+"a	c #95959C",
+"b	c #EAEAEF",
+"c	c #EBEBF1",
+"d	c #DADAE4",
+"e	c #B0B0B3",
+"f	c #E5E5EC",
+"g	c #DFDFE8",
+"h	c #DDDDE6",
+"i	c #B0B0B8",
+"j	c #E9E9EF",
+"k	c #868688",
+"l	c #FFFFFF",
+"m	c #EFEFF3",
+"n	c #BBBBC0",
+"o	c #85858A",
+"p	c #BEBEC0",
+"q	c #D7D7E2",
+"  ........+     ",
+"  .@#$%&*=.+    ",
+"  .@#-;>,=.')   ",
+"  .@#-;%!=+~{+  ",
+"  .@]-^%/=(_.+  ",
+"  .@]-:;<[}|1+  ",
+"  .2]-3;4=567+  ",
+"  .8$:%&970ab+  ",
+"  .-:^c[(d7e]+  ",
+"  .-$%f[ghdi!+  ",
+"  .]^j/!=g(kl+  ",
+"  .]m4/!=g9nj+  ",
+"  .$&4/f[g9o$+  ",
+"  .34<f!,g(p@+  ",
+"  .;44/!=g9dq+  ",
+"  ++++++++++++  "};

art/delbookm.xpm

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

art/delete.xpm

@@ -1,42 +0,0 @@
-/* XPM */
-static const char * delete_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 21 1",
-"2 c #A5AEBD",
-"* c #5478B4",
-"< c #95A3BB",
-"O c #9AA7BC",
-"; c #758EB7",
-"$ c #6986B6",
-"# c #4971B2",
-"& c #8A9CBA",
-"X c #8598B9",
-"  c None",
-"o c #ABB2BE",
-"- c #7F95B9",
-"= c #4E74B3",
-"1 c #A0ABBC",
-"+ c #6F8AB7",
-". c #B5B9BF",
-"@ c #3E69B1",
-", c #90A0BA",
-": c #6483B5",
-"> c #5A7BB4",
-"% c #5F7FB5",
-/* pixels */
-"                ",
-"    .Xo      OO ",
-"    +@#.    $@% ",
-"    &@@X  .*@*o ",
-"     =@= .*@*.  ",
-"     -@@X*@*.   ",
-"     .#@@@$.    ",
-"      ;@@:      ",
-"     ;@@@+      ",
-"   .>@#%@@.     ",
-"  o*@*oO@@,     ",
-" <#@*. .@@=     ",
-"&@@$    :@@1    ",
-";#&     2#>.    ",
-"                "
-};

art/dir_up.xpm

@@ -1,52 +1,24 @@
-/* XPM */
-static const char * dir_up_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 31 1",
-"6 c #9BACC2",
-"o c #9AEA53",
-"7 c #94A5BD",
-"8 c #547897",
-"5 c #839CB5",
-"@ c #376485",
-"$ c #5A809C",
-"# c #7F99B4",
-": c #D1D9E5",
-"< c #EAEDF3",
-"& c #446A8C",
-"q c #65839D",
-"> c #DCE2EA",
-", c #E1E6EE",
-"2 c #F5F6F7",
-"O c #8DA0B9",
-"  c None",
-"% c #467291",
-". c #305F81",
-"X c #7393AB",
-"+ c #6A89A2",
-"4 c #A8B6CA",
-"1 c #EEF1F3",
-"3 c #F8F9FA",
-"0 c #215579",
-"9 c #7F97B0",
-"* c #B3BFD1",
-"w c #7A90AC",
-"- c #C2CBDB",
-"; c #CAD6E1",
-"= c #BBC4D6",
-/* pixels */
-"         ..     ",
-"        X.o.    ",
-"....   X.ooo.   ",
-".OO+....ooooo.  ",
-".OOOOOO@@ooo..  ",
-".OOOO#OO@ooo.$  ",
-".OOOOOOO@ooo.$  ",
-".O%............&",
-".O&*=-;:>,<1231.",
-".+.4*=-;:>,<12$.",
-"..564*=-;:>,<1. ",
-".@O764*=-;:>,<. ",
-".89O764*=-;:>$$ ",
-"0qw9O764*=-;:.  ",
-"0.............  "
-};
+/* XPM */
+static char *dir_up_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 4 1",
+"@ c #000000",
+"  c None",
+"* c Yellow",
+": c Gray100",
+/* pixels */
+"                ",
+"   @@@@@        ",
+"  @*:*:*@       ",
+" @@@@@@@@@@@@@@ ",
+" @:*:*:*:*:*:*:@",
+" @*:*:@:*:*:*:*@",
+" @:*:@@@:*:*:*:@",
+" @*:@@@@@:*:*:*@",
+" @:*:*@*:*:*:*:@",
+" @*:*:@:*:*:*:*@",
+" @:*:*@@@@@@:*:@",
+" @*:*:*:*:*:*:*@",
+" @:*:*:*:*:*:*:@",
+" @@@@@@@@@@@@@@@",
+"                "};

art/down.xpm

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

art/exefile.xpm

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

art/fileopen.xpm

@@ -1,57 +1,25 @@
-/* XPM */
-static const char * fileopen_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 36 1",
-"6 c #9BACC2",
-"< c #9AEA53",
-"9 c #94A5BD",
-"5 c #839CB5",
-"; c #4D7492",
-". c #376485",
-"$ c #7F99B4",
-"r c #D1D9E5",
-"7 c #EAEDF3",
-"@ c #CAD2DC",
-"% c #718BA7",
-"t c #BECAD9",
-"& c #65839D",
-"0 c #DCE2EA",
-"4 c #F5F6F7",
-"w c #597B9A",
-"O c #8DA0B9",
-"  c None",
-"+ c #467291",
-"u c #305F81",
-"= c #B4C4D3",
-"# c #CAE2AA",
-"1 c #FAFCFE",
-"3 c #A8B6CA",
-"q c #E4E9ED",
-"8 c #EEF1F3",
-"X c #215579",
-"2 c #7F97B0",
-": c #B3BFD1",
-"y c #7A90AC",
-", c #C2CBDB",
-"- c #ADD668",
-"* c #B6D791",
-"e c #CAD6E1",
-"o c #DFF0D0",
-"> c #BBC4D6",
-/* pixels */
-"                ",
-"     ....       ",
-"XXXXX .oo.      ",
-"XOOOO+@.#o.     ",
-"XOOOO$%&.*oXXX  ",
-"XOOOOOOO.*oX=X  ",
-"XOXXXX...-oXXXX;",
-"XOX:>,.<<<<<oX1;",
-"X2X3:>,.<<<oX4=;",
-"XX563:>>.<oX78; ",
-"XXO963:>>.X0q7; ",
-"Xw2O963:>>er0t; ",
-"X&y2O963:>,er;  ",
-"uXXXXXXXXXXXX;  ",
-"                "
-};
+/* XPM */
+static char *fileopen_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 5 1",
+"  c None",
+". c Black",
+"X c Yellow",
+"o c Gray100",
+"O c #bfbf00",
+/* pixels */
+"                ",
+"          ...   ",
+"         .   . .",
+"              ..",
+"  ...        ...",
+" .XoX.......    ",
+" .oXoXoXoXo.    ",
+" .XoXoXoXoX.    ",
+" .oXoX..........",
+" .XoX.OOOOOOOOO.",
+" .oo.OOOOOOOOO. ",
+" .X.OOOOOOOOO.  ",
+" ..OOOOOOOOO.   ",
+" ...........    ",
+"                "};

art/filesave.xpm

@@ -1,42 +0,0 @@
-/* XPM */
-static const char * filesave_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 21 1",
-"O c #FFFFFF",
-"> c #D5D6D8",
-"; c #446A8C",
-"1 c #CAD2DC",
-": c #C0C7D1",
-"  c #5F666D",
-"% c #A5B0BA",
-"o c #65839D",
-", c #DCE2EA",
-"< c #C3C5C8",
-"- c #E1E6EE",
-"* c #C6CCD3",
-". c None",
-"$ c #305F81",
-"2 c #D6DFE7",
-"= c #D2D9E0",
-"& c #B7BFC7",
-"X c #1B4467",
-"# c #BCBDBE",
-"@ c #7A90AC",
-"+ c #5D7C93",
-/* pixels */
-"               .",
-" XoOOOOOOOOO+X .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @@+++++++++@@ .",
-" @@@@@@@@@@@@@ .",
-" @@@$$$$$$$$@@ .",
-" @@$%%%&*=-O$@ .",
-" @@$%X;;*=-O$@ .",
-" @@$%X;;:>,O$@ .",
-" @@$%X;;<12O$@ .",
-" @@$<<2OOOOO$@ .",
-".             .."
-};

art/filesaveas.xpm

@@ -1,44 +0,0 @@
-/* XPM */
-static const char * filesaveas_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 23 1",
-"X c Black",
-"+ c #FFFFFF",
-"< c #D5D6D8",
-"> c #446A8C",
-"3 c #CAD2DC",
-", c #C0C7D1",
-"  c #5F666D",
-"* c #A5B0BA",
-"O c #65839D",
-"1 c #DCE2EA",
-"2 c #C3C5C8",
-": c #E1E6EE",
-". c #FFFF00",
-"- c #C6CCD3",
-"@ c None",
-"& c #305F81",
-"4 c #D6DFE7",
-"; c #D2D9E0",
-"= c #B7BFC7",
-"o c #1B4467",
-"$ c #BCBDBE",
-"# c #7A90AC",
-"% c #5D7C93",
-/* pixels */
-"         .X .XX.",
-" oO+++++++.X.X.@",
-" #O+$$$$$XX...XX",
-" #O++++++.......",
-" #O+$$$$$XX...XX",
-" #O+++++++.X.X.@",
-" ##%%%%%%.X%.X .",
-" ############# @",
-" ###&&&&&&&&## @",
-" ##&***=-;:+&# @",
-" ##&*o>>-;:+&# @",
-" ##&*o>>,<1+&# @",
-" ##&*o>>234+&# @",
-" ##&224+++++&# @",
-"@             @@"
-};

art/find.xpm

@@ -1,62 +0,0 @@
-/* XPM */
-static const char * find_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 41 1",
-"y c #A06959",
-"9 c #A7DAF2",
-"$ c #B5CAD7",
-"> c #35B4E1",
-"t c #6B98B8",
-"w c #B6E0F4",
-"q c #AEC9D7",
-"1 c #5A89A6",
-"+ c #98B3C6",
-"4 c #EAF6FC",
-"3 c #DEF1FA",
-"= c #4CBCE3",
-"d c #DB916B",
-"X c #85A7BC",
-"s c #D8BCA4",
-"o c #749BB4",
-"e c #BCD9EF",
-"* c #62B4DD",
-"< c #91D2EF",
-"a c #E6DED2",
-"0 c #E9F4FB",
-"  c None",
-"@ c #A0BACB",
-"O c #AABFCD",
-"i c #6591AE",
-": c #B9CBD5",
-"- c #71C5E7",
-"5 c #D3ECF8",
-"% c #81A3B9",
-"6 c #8AD0EE",
-"8 c #FDFDFE",
-"p c #8EA9BC",
-"r c #B6D5EE",
-", c #81CCEB",
-". c #ACC4D3",
-"; c #AFD1DE",
-"7 c #EFF8FC",
-"u c #C2CBDB",
-"# c #C0D1DC",
-"2 c #CAD6E1",
-"& c #8FB0C3",
-/* pixels */
-"       .XooXO   ",
-"      +@###$+%  ",
-"     .&#*==-;@@ ",
-"     o:*>,<--:X ",
-"     12>-345-#% ",
-"     12>678392% ",
-"     %$*,3059q& ",
-"     @Oq,wwer@@ ",
-"      t@q22q&+  ",
-"    yyui+%o%p   ",
-"   yasy         ",
-"  yasdy         ",
-" yasdy          ",
-" ysdy           ",
-"  yy            "
-};

art/findrepl.xpm

@@ -1,63 +0,0 @@
-/* XPM */
-static const char * findrepl_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 42 1",
-"y c #A06959",
-"9 c #A7DAF2",
-"$ c #B5CAD7",
-"> c #35B4E1",
-"t c #6B98B8",
-"w c #B6E0F4",
-"q c #AEC9D7",
-"1 c #5A89A6",
-"+ c #98B3C6",
-"4 c #EAF6FC",
-"d c #008000",
-"3 c #DEF1FA",
-"= c #4CBCE3",
-"f c #DB916B",
-"X c #85A7BC",
-"s c #D8BCA4",
-"o c #749BB4",
-"e c #BCD9EF",
-"* c #62B4DD",
-"< c #91D2EF",
-"a c #E6DED2",
-"0 c #E9F4FB",
-"  c None",
-"@ c #A0BACB",
-"O c #AABFCD",
-"i c #6591AE",
-": c #B9CBD5",
-"- c #71C5E7",
-"5 c #D3ECF8",
-"% c #81A3B9",
-"6 c #8AD0EE",
-"8 c #FDFDFE",
-"p c #8EA9BC",
-"r c #B6D5EE",
-", c #81CCEB",
-". c #ACC4D3",
-"; c #AFD1DE",
-"7 c #EFF8FC",
-"u c #C2CBDB",
-"# c #C0D1DC",
-"2 c #CAD6E1",
-"& c #8FB0C3",
-/* pixels */
-"      .XooXO    ",
-"     +@###$+%   ",
-"    .&#*==-;@@  ",
-"    o:*>,<--:X  ",
-"    12>-345-#%  ",
-"    12>678392%  ",
-"    %$*,3059q&  ",
-"    @Oq,wwer@@  ",
-"     t@q22q&+   ",
-"   yyui+%o%p    ",
-"  yasy   d   d  ",
-" yasfy  dd   dd ",
-"yasfy  ddddddddd",
-"ysfy    dd   dd ",
-" yy      d   d  "
-};

art/floppy.xpm

@@ -1,39 +1,26 @@
-/* XPM */
-static const char * floppy_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 18 1",
-"& c #E3E4E6",
-"+ c #FFFFFF",
-". c #446A8C",
-"o c #697787",
-"> c #5F666D",
-"* c #B2B3B3",
-"  c None",
-", c #4B4C4D",
-"= c #DCDBDA",
-"$ c #1B4467",
-": c #E4E9ED",
-"@ c #979BA0",
-"X c #203646",
-"O c #215579",
-"- c #545B63",
-"; c #636465",
-"# c #CAD6E1",
-"% c #7F8286",
-/* pixels */
-"  .XoooooooXO   ",
-"  .o+++++++.O   ",
-"  .o+OOOOO+.O   ",
-"  .o+++++++.O   ",
-"  .o@@@@@@@.O   ",
-"  ..........O   ",
-"  ..#+++++#.O   ",
-"  ..+$O+++#.O   ",
-"  ..+$O+++#.O   ",
-" %&.........*%  ",
-"%=+++++++++++&% ",
-"--------------; ",
-"-:::::::::::::- ",
-"-:X:XXXXXXXXX:> ",
-"-*************, "
-};
+/* XPM */
+static char *floppy_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 7 1",
+"     s None    c None",
+".    c #808080",
+"X    c Gray100",
+"o    c #c0c0c0",
+"O    c Black",
+"+    c Cyan",
+"@    c Red",
+"         ......X",
+"        .ooooooO",
+"        .+++++OO",
+"        .++++++O",
+"        .++++++O",
+"        .ooooooO",
+"  .......o....oO",
+" .oooooo.o.O.XoO",
+".XXXXXXXXOOOOOO ",
+".ooooooooo@o..O ",
+".ooo....oooo..O ",
+".o..OOOO...o..O ",
+".oooXXXXoooo..O ",
+".............O  ",
+" OOOOOOOOOOOO   "};

art/folder.xpm

@@ -1,43 +1,27 @@
-/* XPM */
-static const char * folder_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 22 1",
-"> c #9BACC2",
-". c #547897",
-"1 c #7F99B4",
-"X c #D1D9E5",
-"< c #EAEDF3",
-"+ c #CAD2DC",
-"3 c #718BA7",
-"O c #BECAD9",
-"$ c #E1E6EE",
-"* c #F5F6F7",
-", c #8DA0B9",
-"  c None",
-"# c #D6DFE7",
-"@ c #D2D9E0",
-"- c #FAFCFE",
-"; c #ADBACE",
-"& c #EEF1F3",
-"= c #F8F9FA",
-"o c #B3BFD1",
-"2 c #7A90AC",
-": c #A2B3C5",
-"% c #E5EAF1",
-/* pixels */
-"                ",
-" .....          ",
-" .XXXX.         ",
-" .............  ",
-" .oO+@#$%&*=-.  ",
-" .oO+@#$%&*=-.  ",
-" .;oO+X#$%&*=.  ",
-" .:;oO+X#$%&*.  ",
-" .>:;oO+X#$%&.  ",
-" .,>:;oO+X#$<.  ",
-" .1,>:;oO+X#$.  ",
-" .21,>:;oO+X#.  ",
-" .321,>:;oO+X.  ",
-" .............  ",
-"                "
-};
+/* XPM */
+static char * folder_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 15 6 1",
+/* colors */
+"  s None   c None",
+". c #000000",
+"+ c #c0c0c0",
+"@ c #808080",
+"# c #ffff00",
+"$ c #ffffff",
+/* pixels */
+"                ",
+"   @@@@@        ",
+"  @#+#+#@       ",
+" @#+#+#+#@@@@@@ ",
+" @$$$$$$$$$$$$@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @@@@@@@@@@@@@@.",
+"  ..............",
+"                "};

art/folder_open.xpm

@@ -1,52 +1,27 @@
-/* XPM */
-static const char * folder_open_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 31 1",
-"6 c #9BACC2",
-"w c #547B99",
-"5 c #94A5BD",
-". c #376485",
-"; c #F1F4F7",
-"o c #7F99B4",
-"2 c #D1D9E5",
-"- c #EAEDF3",
-"O c #718BA7",
-"0 c #65839D",
-"* c #DCE2EA",
-": c #F5F6F7",
-"7 c #597B9A",
-"X c #8DA0B9",
-"  c None",
-"+ c #467291",
-"q c #305F81",
-"& c #D6DFE7",
-"3 c #6A89A2",
-"1 c #A8B6CA",
-"= c #E4E9ED",
-"> c #F8F9FA",
-", c #FDFDFE",
-"9 c #215579",
-"8 c #7F97B0",
-"@ c #B3BFD1",
-"< c #7A90AC",
-"$ c #C2CBDB",
-"4 c #A2B3C5",
-"% c #CAD6E1",
-"# c #BBC4D6",
-/* pixels */
-"                ",
-".....           ",
-".XXXo.          ",
-".XXXXO........  ",
-".XXXXXXXXXXXX.  ",
-".XXXXXXXXXXXX.  ",
-".X++++++++++++++",
-".X+@#$%&*=-;:>,+",
-".<.1@#$%2*=-;:23",
-"..X41@#$%2*=-;3 ",
-"..X561@#$%2*=-3 ",
-".78X561@#$%2*%3 ",
-"90<8X561@#$%23  ",
-"q++++++++++++w  ",
-"                "
-};
+/* XPM */
+static char * folder_open_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 15 6 1",
+/* colors */
+"   s None  c None",
+".  c #000000",
+"+  c #c0c0c0",
+"@  c #808080",
+"#  c #ffff00",
+"$  c #ffffff",
+/* pixels */
+"                ",
+"   @@@@@        ",
+"  @$$$$$@       ",
+" @$#+#+#$@@@@@@ ",
+" @$+#+#+$$$$$$@.",
+" @$#+#+#+#+#+#@.",
+"@@@@@@@@@@@@@#@.",
+"@$$$$$$$$$$@@+@.",
+"@$#+#+#+#+##.@@.",
+" @$#+#+#+#+#+.@.",
+" @$+#+#+#+#+#.@.",
+"  @$+#+#+#+##@..",
+"  @@@@@@@@@@@@@.",
+"   .............",
+"                "};

art/forward.xpm

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

art/gtk/error.xpm

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

art/gtk/info.xpm

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

art/gtk/question.xpm

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

art/gtk/warning.xpm

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

art/harddisk.xpm

@@ -1,60 +1,26 @@
-/* XPM */
-static const char * harddisk_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 39 1",
-"7 c #E3E4E6",
-"4 c #FFFFFF",
-"5 c #839CB5",
-". c #547897",
-"1 c #4D7492",
-"@ c #376485",
-"o c #7A92A3",
-"u c #D1D9E5",
-"y c #446A8C",
-"i c #51B03D",
-"> c #CAD2DC",
-"O c #718BA7",
-"2 c #65839D",
-"6 c #DCE2EA",
-"0 c #C3C5C8",
-"9 c #F5F6F7",
-": c #EBEBEC",
-"< c #597B9A",
-"t c #C6CCD3",
-"  c None",
-"* c #DFE0E2",
-"e c #467291",
-"a c #526E8B",
-", c #7393AB",
-"p c #130A0B",
-"# c #AABFCD",
-"r c #B4C4D3",
-"; c #CFCFD0",
-"X c #6F90A6",
-"+ c #6A89A2",
-"- c #D2D3D4",
-"= c #DCDBDA",
-"w c #E4E9ED",
-"q c #C6C8CA",
-"% c #215579",
-"$ c #E7E7E7",
-"3 c #7F97B0",
-"8 c #C0D1DC",
-"& c #5D7C93",
-/* pixels */
-"                ",
-"   .XoooXO+@    ",
-"  #$$%%%%$$$X   ",
-"  &$*==-;$$$&   ",
-"  &:>+,<1234o5  ",
-" ###+67;;78242  ",
-" &4,49*0q*9we4. ",
-" &4+49*,,*9wo4. ",
-"&4%r,67;;782t%4.",
-"&44468rrrr84444,",
-"y11111111111111e",
-"1uu1:::::::::::1",
-"1uu1::::::::ip:1",
-"auu&:::::::::::1",
-"1111111111111111"
-};
+/* XPM */
+static char *harddisk_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 7 1",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Black",
+"O    c Gray100",
+"+    c Green",
+"@    c #008000",
+"                ",
+"                ",
+"                ",
+"  ............. ",
+" .XXXXXXXXXXXX.o",
+".OOOOOOOOOOOO..o",
+".XXXXXXXXX+@X..o",
+".XXXXXXXXXXXX..o",
+".X..........X..o",
+".XOOOOOOOOOOX..o",
+"..............o ",
+" ooooooooooooo  ",
+"                ",
+"                ",
+"                "};

art/helpicon.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static const char * helpicon_xpm[] = {
+static char *helpicon_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Gray0",

art/home.xpm

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

art/htmbook.xpm

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

art/htmfoldr.xpm

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

art/htmoptns.xpm

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

art/htmpage.xpm

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

art/htmsidep.xpm

@@ -1,27 +1,23 @@
-/* XPM */
-static const char * htmsidep_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 6 1",
-". c Black",
-"X c #FFFFFF",
-"+ c #808080",
-"  c None",
-"O c #0000C0",
-"o c #C0C0C0",
-/* pixels */
-"                ",
-" .............. ",
-" .XXXX.ooooooo. ",
-" .XOXX.oo...oo. ",
-" .XXOX.ooooooo. ",
-" .OOOO.o...+.o. ",
-" .XXOX.ooooooo. ",
-" .XOXX.ooooooo. ",
-" .XXXX.o..+ooo. ",
-" .XXOX.ooooooo. ",
-" .XOXX.o...+.o. ",
-" .OOOO.ooooooo. ",
-" .XOXX.o.+...o. ",
-" .XXOX.ooooooo. ",
-" .............. "
-};
+/* XPM */
+static char * htmsidep_xpm[] = {
+"16 15 5 1",
+" 	c None",
+".	c #000000",
+"*	c #C0C0C0",
+"=	c #808080",
+"!	c #FFFFFF",
+"                ",
+" .............. ",
+" .************. ",
+" .............. ",
+" .****.!!!!!!!. ",
+" .****.!====*!. ",
+" .****.!!!!!!!. ",
+" .****.!===*!!. ",
+" .****.!!!!!!!. ",
+" .****.!====*!. ",
+" .****.!!!!!!!. ",
+" .****.!===*!!. ",
+" .****.!!!!!!!. ",
+" .............. ",
+"                "};

art/listview.xpm

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

art/missimg.xpm

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

art/motif/error.xpm

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

art/motif/info.xpm

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

art/motif/question.xpm

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

art/motif/warning.xpm

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

art/new.xpm

@@ -1,50 +0,0 @@
-/* XPM */
-static const char * new_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 29 1",
-"* c #97C4E7",
-"- c #72A8D2",
-": c #FFFFFF",
-"9 c #839CB5",
-"o c #6B98B8",
-"X c #5A89A6",
-"# c #3A749C",
-", c #D1E5F5",
-"0 c #85A7BC",
-"$ c #C3DDF1",
-"8 c #749BB4",
-"; c #5F9BC8",
-"  c None",
-"+ c #538DB3",
-"= c #85BBE2",
-"3 c #EFF6FC",
-"O c #6591AE",
-"5 c #F7FBFD",
-"7 c #FAFCFE",
-"< c #DAEAF7",
-"4 c #E9F3FA",
-"6 c #FDFDFE",
-"1 c #E2EFF8",
-". c #8EA9BC",
-"% c #B6D5EE",
-"& c #A5CCEA",
-"> c #ACE95B",
-"2 c #F4F9FD",
-"@ c #4581AA",
-/* pixels */
-"   .XoOO+@#.    ",
-"   .$$%&*=O-;   ",
-"  @@@@$%&*O:*o  ",
-"  @>>@$$%&O::*o ",
-"@@@>>@@@$%OOoO+ ",
-"@>>>>>>@,$%&*=+ ",
-"@>>>>>>@<,$%&*+ ",
-"@@@>>@@@1<,$%&O ",
-"  @>>@2341<,$%O ",
-"  @@@@52341<,$o ",
-"   .:6752341<,8 ",
-"   .::6752341<8 ",
-"   .:::67523419 ",
-"   .::::6752340 ",
-"   ............ "
-};

art/new_dir.xpm

@@ -1,43 +1,24 @@
-/* XPM */
-static const char * new_dir_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 22 1",
-"X c Black",
-"> c #9BACC2",
-"o c #547897",
-"1 c #7F99B4",
-"O c #D1D9E5",
-"< c #EAEDF3",
-"# c #CAD2DC",
-"3 c #718BA7",
-"@ c #BECAD9",
-"& c #E1E6EE",
-"; c #F5F6F7",
-". c #FFFF00",
-", c #8DA0B9",
-"  c None",
-"% c #D6DFE7",
-"$ c #D2D9E0",
-"- c #ADBACE",
-"= c #EEF1F3",
-"+ c #B3BFD1",
-"2 c #7A90AC",
-": c #A2B3C5",
-"* c #E5EAF1",
-/* pixels */
-"         .X .XX.",
-" ooooo    .X.X. ",
-" oOOOOo  XX...XX",
-" oooooooo.......",
-" o+@#$%&*XX...XX",
-" o+@#$%&*=.X.X. ",
-" o-+@#O%&.X;.X .",
-" o:-+@#O%&*=;o  ",
-" o>:-+@#O%&*=o  ",
-" o,>:-+@#O%&<o  ",
-" o1,>:-+@#O%&o  ",
-" o21,>:-+@#O%o  ",
-" o321,>:-+@#Oo  ",
-" ooooooooooooo  ",
-"                "
-};
+/* XPM */
+static char *new_dir_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 4 1",
+"@ c Gray0",
+"  c None",
+"* c Yellow",
+": c Gray100",
+/* pixels */
+"           @    ",
+"                ",
+"           @    ",
+"        @     @ ",
+"   @@@@  @ @ @  ",
+"  @*:*:@  @ @   ",
+" @@@@@@@@@@  @ @",
+" @:*:*:*:*:@@   ",
+" @*:*:*:*:*@ @  ",
+" @:*:*:*:*:@  @ ",
+" @*:*:*:*:*@    ",
+" @:*:*:*:*:@    ",
+" @*:*:*:*:*@    ",
+" @@@@@@@@@@@    ",
+"                "};

art/paste.xpm

@@ -1,46 +0,0 @@
-/* XPM */
-static const char * paste_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 25 1",
-"< c #FEECE4",
-"> c #FEE3D7",
-"O c #FFFFFF",
-"o c #7B767D",
-"% c #F79586",
-"& c #CAE1F3",
-"@ c #F08B62",
-"# c #FCCBB8",
-"- c #FDD8C9",
-"4 c #FFF8F4",
-"5 c #FFF5F0",
-"  c None",
-"$ c #F8AA8F",
-", c #EFF6FC",
-"1 c #F7FBFD",
-"2 c #FAFCFE",
-"; c #DAEAF7",
-": c #E9F3FA",
-"6 c #FFFAF8",
-". c #3C78A6",
-"3 c #FFF1ED",
-"X c #9B8687",
-"+ c #FBBCA4",
-"* c #B6D5EE",
-"= c #F4F9FD",
-/* pixels */
-"   ......       ",
-" .XoOOOOoo.     ",
-".+XOOOOOOX@.    ",
-".+XXXXXXXX@.    ",
-".#++$$%@.....   ",
-".##++$$%.&*.=.  ",
-".-##++$$.;&.==. ",
-".--##++$.:;.... ",
-".>--##++.,:;&*. ",
-".<>--##+.1,:;&. ",
-".<<>--##.21,:;. ",
-".3<<>--#.O21=:. ",
-".45<<>--....... ",
-".6453<>----.    ",
-"............    "
-};

art/print.xpm

@@ -1,60 +1,25 @@
-/* XPM */
-static const char * print_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 39 1",
-"< c #E3E4E6",
-"+ c #C3C3C4",
-"i c #FFFFFF",
-": c #74879B",
-"# c #5A89A6",
-"a c #F1F4F7",
-"r c #5A809C",
-"@ c #BDCCD9",
-"e c #7A92A4",
-"% c #3F6F93",
-"t c #9FA2A6",
-"3 c #939495",
-"w c #5F666D",
-"9 c #65839E",
-"5 c #4A7291",
-"$ c #4B7F9E",
-"  c None",
-"O c #DFE0E2",
-"o c #F3F3F3",
-"; c #84A5BB",
-"& c #467291",
-". c #7897AD",
-"* c #407598",
-"4 c #CFCFD0",
-"7 c #6F90A6",
-"y c #6A89A2",
-"0 c #AAADB2",
-"1 c #D2D3D4",
-"u c #4F7592",
-", c #BCBDBE",
-"p c #57778E",
-"q c #979BA0",
-"2 c #ABABAC",
-"- c #E7E7E7",
-"= c #D6DEE6",
-"> c #9FA0A0",
-"8 c #829EB5",
-"X c #8FB0C3",
-"6 c #5D7C93",
-/* pixels */
-"   .XXXXXXXX    ",
-"   .oooooooX    ",
-"   .OOOOOOOX    ",
-"   .+++++++X    ",
-"@##$%&&&&&%*##@ ",
-"$=-;:>,<123$-=$ ",
-".44.5678.96$44. ",
-"7,,,,,,,,,,,,,7 ",
-"900qwwwwwwwe009 ",
-"rtt9ryyyyyyuttr ",
-"6qq6iiiiiii%qq6 ",
-"633paiiiiii%336 ",
-"XXX*iiiiiii%XXX ",
-"   6iiiiiii%    ",
-"   $XXXXXXX#    "
-};
+/* XPM */
+static char *print_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 5 1",
+"  c None",
+". c Black",
+"X c Gray100",
+"o c #808000",
+"O c Yellow",
+/* pixels */
+"     .........  ",
+"    .XXXXXXXX.  ",
+"    .X.....X.   ",
+"   .XXXXXXXX.   ",
+"   .X.....X.... ",
+"  .XXXXXXXX. . .",
+" .......... . ..",
+".          . . .",
+".............  .",
+".      ooo  . . ",
+".      OOO  ... ",
+"............. . ",
+" .         . .  ",
+"  ...........   ",
+"                "};

art/quit.xpm

@@ -1,90 +0,0 @@
-/* XPM */
-static const char * quit_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 69 1",
-"@ c Black",
-"i c #9AEA53",
-"D c #7E9BB1",
-"H c #839FB4",
-", c #B7C7D3",
-"8 c #BCCBD6",
-"7 c #C1CFDA",
-"v c #92ABBD",
-"- c #D0DBE2",
-"O c #547897",
-"+ c #376485",
-"L c #7090A8",
-"t c #AEC0CE",
-"g c #B3C4D1",
-"S c #84A0B4",
-"G c #89A4B8",
-"> c #BDCCD7",
-"F c #5A809C",
-"2 c #C2D0DA",
-"k c #93ACBE",
-"= c #D6E0E6",
-"* c #446A8C",
-"z c #A5B9C8",
-"# c #DEE5EB",
-"0 c #AFC1CE",
-"r c #B4C5D2",
-"p c #B9C9D5",
-"A c #8AA5B8",
-"M c #92AABD",
-"j c #A6BAC9",
-"K c #7796AC",
-"l c #ABBECC",
-"o c #E4EAEF",
-"9 c #B5C6D2",
-"  c None",
-"; c #C9D6DF",
-"X c #305F81",
-"m c #98AFC0",
-"V c #9DB3C3",
-"% c #D1DBE3",
-"u c #A2B7C6",
-"y c #A7BBCA",
-"h c #ACBFCD",
-"4 c #B6C7D3",
-"w c #C0CFD9",
-"d c #982106",
-"B c #85A0B5",
-"6 c #C8D4DE",
-"c c #99B0C1",
-"x c #9EB4C4",
-"$ c #D7E0E7",
-"q c #A8BCCA",
-"s c #ADC0CD",
-"3 c #BCCCD7",
-"N c #8BA5B9",
-": c #C4D1DB",
-"1 c #C9D5DE",
-"f c #9AB1C2",
-"n c #A4B9C8",
-"a c #B3C5D1",
-". c #215579",
-"J c #7D9AB0",
-"& c #829EB5",
-"e c #BBCAD6",
-"b c #8CA6B9",
-"Z c #91AABC",
-"C c #96AEC0",
-"< c #CFDAE2",
-"5 c #AFC2CF",
-/* pixels */
-" ..XXXXXXXXXX   ",
-" XoO+X@@@@@@X   ",
-" X#$%&X*@@@@X   ",
-" X=-;:>,X@@@X   ",
-" X<12345X@@@X   ",
-" X67890qX@XXX   ",
-" XwertyuX@XiX   ",
-" XpasddfX++iiX  ",
-" XghjddkXiiiiiX ",
-" XlzxcvbXiiiiiiX",
-" XnxmMNBXiiiiiX ",
-" XVCZASDXXXiiX  ",
-" XXFGHJKX XiX   ",
-"   FXXFLX XX    ",
-"      XX*       "
-};

art/redo.xpm

@@ -1,58 +0,0 @@
-/* XPM */
-static const char * redo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 37 1",
-"4 c #9BACC2",
-"; c #4C7398",
-"3 c #547B99",
-"* c #547897",
-"# c #5A89A6",
-"8 c #3A749C",
-"5 c #5A809C",
-", c #7F99B4",
-"& c #3F6F93",
-"9 c #85A7BC",
-"+ c #749BB4",
-"> c #718BA7",
-"e c #A5B3C8",
-"w c #BECAD9",
-": c #65839D",
-"u c #E1E6EE",
-"o c #236289",
-"r c #ADBED2",
-"= c #597B9A",
-"2 c #8DA0B9",
-"  c None",
-"% c #467291",
-"1 c #7393AB",
-"i c #4C809F",
-"- c #A0BACB",
-"O c #6591AE",
-"X c #407598",
-"6 c #6F90A6",
-"t c #D2D9E0",
-"7 c #ADBACE",
-"@ c #326A8F",
-"0 c #467A9C",
-". c #ACC4D3",
-"< c #7F97B0",
-"y c #B3BFD1",
-"q c #A2B3C5",
-"$ c #8FB0C3",
-/* pixels */
-"   .XoooO       ",
-"  +o@@@@@o#    +",
-" $@%%&@&%%&@  +o",
-" X*=@+-+@*=;@#&@",
-" @:=+    @=:=*:@",
-" &>:$     @:>>>@",
-" &,<X     X>,,,&",
-" +123    @<2222&",
-"  X44X  #@56<44X",
-"  O1748    .9#&o",
-"   0qwe8        ",
-"    8rty8       ",
-"     8wu+       ",
-"      i##       ",
-"                "
-};

art/removable.xpm

@@ -1,44 +1,26 @@
-/* XPM */
-static const char * removable_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 23 1",
-"@ c #C3C3C4",
-"4 c #FFFFFF",
-"o c #D5D6D8",
-"> c #7A92A3",
-". c #8497A5",
-"% c #ACAEB2",
-"2 c #4A7898",
-": c #DCE2EA",
-", c #F5F6F7",
-"= c #EBEBEC",
-"$ c #B7B7B8",
-"  c None",
-"X c #DFE0E2",
-"* c #A6A8AD",
-"1 c #4C809F",
-"3 c #407598",
-"O c #CFCFD0",
-"; c #9EA2A8",
-"# c #BCBDBE",
-"+ c #C6C8CA",
-"- c #979BA0",
-"& c #E7E7E7",
-"< c #8FB0C3",
-/* pixels */
-"   .........    ",
-"   .XoO+@#$%.   ",
-"   .XoO+@#$%.   ",
-"  .&XoO+@#$%*.  ",
-"  .&XoO+@#$%*.  ",
-" .=&XoO+@#$%*-. ",
-" .=&XoO+@#$%*;. ",
-".:=&XoO+@#$%*;>.",
-".,=&XoO+@#$%*;-.",
-"<..............<",
-"<,=&XoO+@#$%%%%.",
-"<O1111122233*4*.",
-"<OOOOOOOOOOO***.",
-" <<<<<<<<<<<<<< ",
-"                "
-};
+/* XPM */
+static char *removable_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 7 1",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Black",
+"O    c Gray100",
+"+    c Red",
+"@    c #800000",
+"                ",
+"                ",
+"  ............. ",
+" .XXXXXXXXXXXX.o",
+".OOOOOOOOOOOO..o",
+".OXXXXXXXXXXX..o",
+".O+@.oooooo.X..o",
+".OXXOooooooOX..o",
+".OXXXOOOOOOXX..o",
+".OXXXXXXXXXXX..o",
+".O............o ",
+" ooooooooooooo  ",
+"                ",
+"                ",
+"                "};

art/repview.xpm

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

art/tick.xpm

@@ -1,17 +1,17 @@
-/* XPM */
-static const char * tick_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"10 10 2 1",
-". c Gray0",
-"  c None",
-/* pixels */
-"          ",
-"        ..",
-"       ...",
-"      ... ",
-"..   ...  ",
-"... ...   ",
-" .....    ",
-"  ...     ",
-"   .      ",
-"          "};
+/* XPM */
+static char *tick_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"10 10 2 1",
+". c Gray0",
+"  c None",
+/* pixels */
+"          ",
+"        ..",
+"       ...",
+"      ... ",
+"..   ...  ",
+"... ...   ",
+" .....    ",
+"  ...     ",
+"   .      ",
+"          "};

art/tipicon.xpm

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

art/toparent.xpm

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

art/undo.xpm

@@ -1,58 +0,0 @@
-/* XPM */
-static const char * undo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 37 1",
-"4 c #9BACC2",
-"* c #4C7398",
-"2 c #547B99",
-"- c #547897",
-"@ c #5A89A6",
-"8 c #3A749C",
-"6 c #5A809C",
-", c #7F99B4",
-"$ c #3F6F93",
-"7 c #85A7BC",
-"+ c #749BB4",
-"> c #718BA7",
-"0 c #A5B3C8",
-"q c #BECAD9",
-": c #65839D",
-"u c #E1E6EE",
-"X c #236289",
-"y c #ADBED2",
-"= c #597B9A",
-"1 c #8DA0B9",
-"  c None",
-"% c #467291",
-"3 c #7393AB",
-"i c #4C809F",
-"; c #A0BACB",
-". c #6591AE",
-"o c #407598",
-"5 c #6F90A6",
-"t c #D2D9E0",
-"9 c #ADBACE",
-"# c #326A8F",
-"e c #467A9C",
-"O c #ACC4D3",
-"< c #7F97B0",
-"r c #B3BFD1",
-"w c #A2B3C5",
-"& c #8FB0C3",
-/* pixels */
-"       .XXXoO   ",
-"+    @X#####X+  ",
-"X+  #$%%$#$%%#& ",
-"#$@#*=-#+;+#=-o ",
-"#:-=:=#    +=:# ",
-"#>>>:#     &:>$ ",
-"$,,,>o     o<,$ ",
-"$1111<#    213+ ",
-"o44<56#@  o44o  ",
-"X$@7O    8493.  ",
-"        80qwe   ",
-"       8rty8    ",
-"       +uq8     ",
-"       @@i      ",
-"                "
-};

art/up.xpm

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

art/wxwin16x16.xpm

@@ -1,25 +1,25 @@
-/* XPM */
-static const char * wxwin16x16_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #000000",
-"X	c #000084",
-"o	c #FFFFFF",
-"O	c #FFFF00",
-"+	c #FF0000",
-"                ",
-"                ",
-"    .......     ",
-"    .XXXXX.     ",
-"    .oXXXX.     ",
-"    .oXXX.......",
-".....oXXX.OOOOO.",
-".+++.XXXX.oOOOO.",
-".o++......oOOOO.",
-".o++++.  .oOOOO.",
-".o++++.  .OOOOO.",
-".+++++.  .......",
-".......         ",
-"                ",
-"                ",
-"                "};
+/* XPM */
+static char *wxwin16x16_xpm[] = {
+"16 16 6 1",
+" 	c None",
+".	c #000000",
+"X	c #000084",
+"o	c #FFFFFF",
+"O	c #FFFF00",
+"+	c #FF0000",
+"                ",
+"                ",
+"    .......     ",
+"    .XXXXX.     ",
+"    .oXXXX.     ",
+"    .oXXX.......",
+".....oXXX.OOOOO.",
+".+++.XXXX.oOOOO.",
+".o++......oOOOO.",
+".o++++.  .oOOOO.",
+".o++++.  .OOOOO.",
+".+++++.  .......",
+".......         ",
+"                ",
+"                ",
+"                "};

art/wxwin32x32.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static const char * wxwin32x32_xpm[] = {
+static char *wxwin32x32_xpm[] = {
 "32 32 6 1",
 " 	c None",
 ".	c #000000",

autogen.sh

@@ -1,3 +1,2 @@
 #!/bin/sh
-#autoconf
-make -f build/autogen.mk
+autoconf

build/README.txt

@@ -1,27 +0,0 @@
-autogen.mk
-
-autogen.mk is a makefile provided to automatically update the GNU autotools
-build system.  It will run Bakefile, aclocal, and autoconf as appropriate.
-
-The .m4 files required for running aclocal are located in build/aclocal.
-When upgrading software that wxWidgets depends on (for example, Bakefile,
-cppunit, GTK, SDL, or others) it is advisable to upgrade the .m4 files
-located in the build/aclocal directory.
-
-It is particularly important that if you use a newer version of Bakefile
-to generate the Makefile.in files that you use the newer bakefile*.m4.
-Because build/autogen.mk is a Makefile it will automatically rerun
-aclocal and autoconf as necessary whenever any m4 in build/aclocal is
-newer than the generated aclocal.m4.
-
-You can achieve this simply by copying the new bakefile*.m4 files from 
-PREFIX/share/aclocal/ into the build/aclocal/ directory and
-rerunning make -f build/autogen.mk.  Note that you should _not_ preserve
-source file times (don't use cp -p) or else it's possible your .m4 files
-will be older than the generated aclocal.m4).
-Example:
-cp /usr/share/aclocal/bakefile*.m4 build/aclocal/
-make -f build/autogen.mk
-
-Please don't forget to commit updated .m4 files as well as updated aclocal.m4,
-configure, and Makefile.in files to wxWidgets.

build/aclocal/ac_raf_func_which_getservbyname_r.m4

@@ -1,78 +0,0 @@
-dnl @synopsis AC_raf_FUNC_WHICH_GETSERVBYNAME_R
-dnl
-dnl Provides a test to determine the correct way to call
-dnl getservbyname_r:
-dnl
-dnl  - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux)
-dnl  - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris)
-dnl  - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1)
-dnl
-dnl An example use can be found at
-dnl http://raf.org/autoconf/net_getservbyname.c
-dnl
-dnl Based on Caolan McNamara's gethostbyname_r macro. Based on David
-dnl Arnold's autoconf suggestion in the threads faq.
-dnl
-dnl @category Misc
-dnl @author raf <raf@raf.org>
-dnl @version 2001-08-20
-dnl @license GPLWithACException
-
-AC_DEFUN([AC_raf_FUNC_WHICH_GETSERVBYNAME_R],
-[
-AC_CACHE_CHECK(how many arguments getservbyname_r() takes,
-    ac_cv_func_which_getservbyname_r,
-    [
-        dnl we need to use C++ to detect missing prototypes
-        AC_LANG_PUSH(C++)
-
-        AC_TRY_COMPILE([#include <netdb.h>],
-            [
-                char *name;
-                char *proto;
-                struct servent *se, *res;
-                char buffer[2048];
-                int buflen = 2048;
-                (void) getservbyname_r(name, proto, se, buffer, buflen, &res)
-            ],
-            ac_cv_func_which_getservbyname_r=six,
-            [
-                AC_TRY_COMPILE([#include <netdb.h>],
-                    [
-                        char *name;
-                        char *proto;
-                        struct servent *se;
-                        char buffer[2048];
-                        int buflen = 2048;
-                        (void) getservbyname_r(name, proto, se, buffer, buflen)
-                    ],
-                    ac_cv_func_which_getservbyname_r=five,
-                    [
-                        AC_TRY_COMPILE([#include <netdb.h>],
-                            [
-                                char *name;
-                                char *proto;
-                                struct servent *se;
-                                struct servent_data data;
-                                (void) getservbyname_r(name, proto, se, &data);
-                            ],
-                            ac_cv_func_which_getservbyname_r=four,
-                            ac_cv_func_which_getservbyname_r=no
-                        )
-                    ]
-                )
-            ]
-        )
-        AC_LANG_POP()
-    ]
-)
-
-if test $ac_cv_func_which_getservbyname_r = six; then
-  AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_6)
-elif test $ac_cv_func_which_getservbyname_r = five; then
-  AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_5)
-elif test $ac_cv_func_which_getservbyname_r = four; then
-  AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_4)
-fi
-
-])

build/aclocal/ax_func_which_gethostbyname_r.m4

@@ -1,155 +0,0 @@
-dnl @synopsis AX_FUNC_WHICH_GETHOSTBYNAME_R
-dnl
-dnl Determines which historical variant of the gethostbyname_r() call
-dnl (taking three, five, or six arguments) is available on the system
-dnl and defines one of the following macros accordingly:
-dnl
-dnl   HAVE_FUNC_GETHOSTBYNAME_R_6
-dnl   HAVE_FUNC_GETHOSTBYNAME_R_5
-dnl   HAVE_FUNC_GETHOSTBYNAME_R_3
-dnl
-dnl If used in conjunction with gethostname.c, the API demonstrated in
-dnl test.c can be used regardless of which gethostbyname_r() is
-dnl available. These example files can be found at
-dnl http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
-dnl
-dnl based on David Arnold's autoconf suggestion in the threads faq
-dnl
-dnl Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
-dnl for Autoconf 2.5x by Daniel Richard G.
-dnl
-dnl @category InstalledPackages
-dnl @author Caolan McNamara <caolan@skynet.ie>
-dnl @author Daniel Richard G. <skunk@iskunk.org>
-dnl @version 2005-01-21
-dnl @license GPLWithACException
-
-AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [
-
-    AC_LANG_PUSH(C)
-    AC_MSG_CHECKING([how many arguments gethostbyname_r() takes])
-
-    AC_CACHE_VAL(ac_cv_func_which_gethostbyname_r, [
-
-################################################################
-
-ac_cv_func_which_gethostbyname_r=unknown
-
-#
-# ONE ARGUMENT (sanity check)
-#
-
-# This should fail, as there is no variant of gethostbyname_r() that takes
-# a single argument. If it actually compiles, then we can assume that
-# netdb.h is not declaring the function, and the compiler is thereby
-# assuming an implicit prototype. In which case, we're out of luck.
-#
-AC_COMPILE_IFELSE(
-    AC_LANG_PROGRAM(
-	[[#include <netdb.h>]],
-	[[
-	    char *name = "www.gnu.org";
-	    (void)gethostbyname_r(name) /* ; */
-	]]),
-    ac_cv_func_which_gethostbyname_r=no)
-
-#
-# SIX ARGUMENTS
-# (e.g. Linux)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE(
-    AC_LANG_PROGRAM(
-	[[#include <netdb.h>]],
-	[[
-	    char *name = "www.gnu.org";
-	    struct hostent ret, *retp;
-	    char buf@<:@1024@:>@;
-	    int buflen = 1024;
-	    int my_h_errno;
-	    (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
-	]]),
-    ac_cv_func_which_gethostbyname_r=six)
-
-fi
-
-#
-# FIVE ARGUMENTS
-# (e.g. Solaris)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE(
-    AC_LANG_PROGRAM(
-	[[#include <netdb.h>]],
-	[[
-	    char *name = "www.gnu.org";
-	    struct hostent ret;
-	    char buf@<:@1024@:>@;
-	    int buflen = 1024;
-	    int my_h_errno;
-	    (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
-	]]),
-    ac_cv_func_which_gethostbyname_r=five)
-
-fi
-
-#
-# THREE ARGUMENTS
-# (e.g. AIX, HP-UX, Tru64)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE(
-    AC_LANG_PROGRAM(
-	[[#include <netdb.h>]],
-	[[
-	    char *name = "www.gnu.org";
-	    struct hostent ret;
-	    struct hostent_data data;
-	    (void)gethostbyname_r(name, &ret, &data) /* ; */
-	]]),
-    ac_cv_func_which_gethostbyname_r=three)
-
-fi
-
-################################################################
-
-]) dnl end AC_CACHE_VAL
-
-case "$ac_cv_func_which_gethostbyname_r" in
-    three)
-    AC_MSG_RESULT([three])
-    AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_3)
-    ;;
-
-    five)
-    AC_MSG_RESULT([five])
-    AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_5)
-    ;;
-
-    six)
-    AC_MSG_RESULT([six])
-    AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_6)
-    ;;
-
-    no)
-    AC_MSG_RESULT([cannot find function declaration in netdb.h])
-    ;;
-
-    unknown)
-    AC_MSG_RESULT([can't tell])
-    ;;
-
-    *)
-    AC_MSG_ERROR([internal error])
-    ;;
-esac
-
-AC_LANG_POP(C)
-
-]) dnl end AC_DEFUN

build/aclocal/bakefile-dllar.m4

@@ -1,483 +0,0 @@
-AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH],
-[
-dnl ===================== dllar.sh begins here =====================
-dnl    (Created by merge-scripts.py from dllar.sh
-dnl     file do not edit here!)
-D='$'
-cat <<EOF >dllar.sh
-#!/bin/sh
-#
-# dllar - a tool to build both a .dll and an .a file
-# from a set of object (.o) files for EMX/OS2.
-#
-#  Written by Andrew Zabolotny, bit@freya.etu.ru
-#  Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de
-#
-#  This script will accept a set of files on the command line.
-#  All the public symbols from the .o files will be exported into
-#  a .DEF file, then linker will be run (through gcc) against them to
-#  build a shared library consisting of all given .o files. All libraries
-#  (.a) will be first decompressed into component .o files then act as
-#  described above. You can optionally give a description (-d "description")
-#  which will be put into .DLL. To see the list of accepted options (as well
-#  as command-line format) simply run this program without options. The .DLL
-#  is built to be imported by name (there is no guarantee that new versions
-#  of the library you build will have same ordinals for same symbols).
-#
-#  dllar is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  dllar is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with dllar; see the file COPYING.  If not, write to the Free
-#  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-#  02111-1307, USA.
-
-# To successfuly run this program you will need:
-#  - Current drive should have LFN support (HPFS, ext2, network, etc)
-#    (Sometimes dllar generates filenames which won't fit 8.3 scheme)
-#  - gcc
-#    (used to build the .dll)
-#  - emxexp
-#    (used to create .def file from .o files)
-#  - emximp
-#    (used to create .a file from .def file)
-#  - GNU text utilites (cat, sort, uniq)
-#    used to process emxexp output
-#  - GNU file utilities (mv, rm)
-#  - GNU sed
-#  - lxlite (optional, see flag below)
-#    (used for general .dll cleanup)
-#
-
-flag_USE_LXLITE=1;
-
-#
-# helper functions
-# basnam, variant of basename, which does _not_ remove the path, _iff_
-#                              second argument (suffix to remove) is given
-basnam(){
-    case ${D}# in
-    1)
-        echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//'
-        ;;
-    2)
-        echo ${D}1 | sed 's/'${D}2'${D}//'
-        ;;
-    *)
-        echo "error in basnam ${D}*"
-        exit 8
-        ;;
-    esac
-}
-
-# Cleanup temporary files and output
-CleanUp() {
-    cd ${D}curDir
-    for i in ${D}inputFiles ; do
-        case ${D}i in
-        *!)
-            rm -rf \`basnam ${D}i !\`
-            ;;
-        *)
-            ;;
-        esac
-    done
-
-    # Kill result in case of failure as there is just to many stupid make/nmake
-    # things out there which doesn't do this.
-    if @<:@ ${D}# -eq 0 @:>@; then
-        rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile
-    fi
-}
-
-# Print usage and exit script with rc=1.
-PrintHelp() {
- echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@'
- echo '       @<:@-name-mangler-script script.sh@:>@'
- echo '       @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@'
- echo '       @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"'
- echo '       @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@'
- echo '       @<:@*.o@:>@ @<:@*.a@:>@'
- echo '*> "output_file" should have no extension.'
- echo '   If it has the .o, .a or .dll extension, it is automatically removed.'
- echo '   The import library name is derived from this and is set to "name".a,'
- echo '   unless overridden by -import'
- echo '*> "importlib_name" should have no extension.'
- echo '   If it has the .o, or .a extension, it is automatically removed.'
- echo '   This name is used as the import library name and may be longer and'
- echo '   more descriptive than the DLL name which has to follow the old '
- echo '   8.3 convention of FAT.'
- echo '*> "script.sh may be given to override the output_file name by a'
- echo '   different name. It is mainly useful if the regular make process'
- echo '   of some package does not take into account OS/2 restriction of'
- echo '   DLL name lengths. It takes the importlib name as input and is'
- echo '   supposed to procude a shorter name as output. The script should'
- echo '   expect to get importlib_name without extension and should produce'
- echo '   a (max.) 8 letter name without extension.'
- echo '*> "cc" is used to use another GCC executable.   (default: gcc.exe)'
- echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
- echo '   These flags will be put at the start of GCC command line.'
- echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.'
- echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define'
- echo '   multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
- echo '   If the last character of a symbol is "*", all symbols beginning'
- echo '   with the prefix before "*" will be exclude, (see _GLOBAL* above).'
- echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or'
- echo '   TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
- echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s'
- echo '   C runtime DLLs.'
- echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.'
- echo '*> All other switches (for example -L./ or -lmylib) will be passed'
- echo '   unchanged to GCC at the end of command line.'
- echo '*> If you create a DLL from a library and you do not specify -o,'
- echo '   the basename for DLL and import library will be set to library name,'
- echo '   the initial library will be renamed to 'name'_s.a (_s for static)'
- echo '   i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
- echo '   library will be renamed into gcc_s.a.'
- echo '--------'
- echo 'Example:'
- echo '   dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord'
- echo '    -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"'
- CleanUp
- exit 1
-}
-
-# Execute a command.
-# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script.
-# @Uses    Whatever CleanUp() uses.
-doCommand() {
-    echo "${D}*"
-    eval ${D}*
-    rcCmd=${D}?
-
-    if @<:@ ${D}rcCmd -ne 0 @:>@; then
-        echo "command failed, exit code="${D}rcCmd
-        CleanUp
-        exit ${D}rcCmd
-    fi
-}
-
-# main routine
-# setup globals
-cmdLine=${D}*
-outFile=""
-outimpFile=""
-inputFiles=""
-renameScript=""
-description=""
-CC=gcc.exe
-CFLAGS="-s -Zcrtdll"
-EXTRA_CFLAGS=""
-EXPORT_BY_ORDINALS=0
-exclude_symbols=""
-library_flags=""
-curDir=\`pwd\`
-curDirS=curDir
-case ${D}curDirS in
-*/)
-  ;;
-*)
-  curDirS=${D}{curDirS}"/"
-  ;;
-esac
-# Parse commandline
-libsToLink=0
-omfLinking=0
-while @<:@ ${D}1 @:>@; do
-    case ${D}1 in
-    -ord*)
-        EXPORT_BY_ORDINALS=1;
-        ;;
-    -o*)
-	shift
-        outFile=${D}1
-	;;
-    -i*)
-        shift
-        outimpFile=${D}1
-        ;;
-    -name-mangler-script)
-        shift
-        renameScript=${D}1
-        ;;
-    -d*)
-        shift
-        description=${D}1
-        ;;
-    -f*)
-        shift
-        CFLAGS=${D}1
-        ;;
-    -c*)
-        shift
-        CC=${D}1
-        ;;
-    -h*)
-        PrintHelp
-        ;;
-    -ex*)
-        shift
-        exclude_symbols=${D}{exclude_symbols}${D}1" "
-        ;;
-    -libf*)
-        shift
-        library_flags=${D}{library_flags}${D}1" "
-        ;;
-    -nocrt*)
-        CFLAGS="-s"
-        ;;
-    -nolxl*)
-        flag_USE_LXLITE=0
-        ;;
-    -* | /*)
-        case ${D}1 in
-        -L* | -l*)
-            libsToLink=1
-            ;;
-        -Zomf)
-            omfLinking=1
-            ;;
-        *)
-            ;;
-        esac
-        EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
-        ;;
-    *.dll)
-        EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`"
-        if @<:@ ${D}omfLinking -eq 1 @:>@; then
-            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib"
-	else
-            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a"
-        fi
-        ;;
-    *)
-        found=0;
-        if @<:@ ${D}libsToLink -ne 0 @:>@; then
-            EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
-        else
-            for file in ${D}1 ; do
-                if @<:@ -f ${D}file @:>@; then
-                    inputFiles="${D}{inputFiles} ${D}file"
-                    found=1
-                fi
-            done
-            if @<:@ ${D}found -eq 0 @:>@; then
-                echo "ERROR: No file(s) found: "${D}1
-                exit 8
-            fi
-        fi
-      ;;
-    esac
-    shift
-done # iterate cmdline words
-
-#
-if @<:@ -z "${D}inputFiles" @:>@; then
-    echo "dllar: no input files"
-    PrintHelp
-fi
-
-# Now extract all .o files from .a files
-newInputFiles=""
-for file in ${D}inputFiles ; do
-    case ${D}file in
-    *.a | *.lib)
-        case ${D}file in
-        *.a)
-            suffix=".a"
-            AR="ar"
-            ;;
-        *.lib)
-            suffix=".lib"
-            AR="emxomfar"
-            EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf"
-            ;;
-        *)
-            ;;
-        esac
-        dirname=\`basnam ${D}file ${D}suffix\`"_%"
-        mkdir ${D}dirname
-        if @<:@ ${D}? -ne 0 @:>@; then
-            echo "Failed to create subdirectory ./${D}dirname"
-            CleanUp
-            exit 8;
-        fi
-        # Append '!' to indicate archive
-        newInputFiles="${D}newInputFiles ${D}{dirname}!"
-        doCommand "cd ${D}dirname; ${D}AR x ../${D}file"
-        cd ${D}curDir
-        found=0;
-        for subfile in ${D}dirname/*.o* ; do
-            if @<:@ -f ${D}subfile @:>@; then
-                found=1
-                if @<:@ -s ${D}subfile @:>@; then
-	            # FIXME: This should be: is file size > 32 byte, _not_ > 0!
-                    newInputFiles="${D}newInputFiles ${D}subfile"
-                fi
-            fi
-        done
-        if @<:@ ${D}found -eq 0 @:>@; then
-            echo "WARNING: there are no files in archive \\'${D}file\\'"
-        fi
-        ;;
-    *)
-        newInputFiles="${D}{newInputFiles} ${D}file"
-        ;;
-    esac
-done
-inputFiles="${D}newInputFiles"
-
-# Output filename(s).
-do_backup=0;
-if @<:@ -z ${D}outFile @:>@; then
-    do_backup=1;
-    set outFile ${D}inputFiles; outFile=${D}2
-fi
-
-# If it is an archive, remove the '!' and the '_%' suffixes
-case ${D}outFile in
-*_%!)
-    outFile=\`basnam ${D}outFile _%!\`
-    ;;
-*)
-    ;;
-esac
-case ${D}outFile in
-*.dll)
-    outFile=\`basnam ${D}outFile .dll\`
-    ;;
-*.DLL)
-    outFile=\`basnam ${D}outFile .DLL\`
-    ;;
-*.o)
-    outFile=\`basnam ${D}outFile .o\`
-    ;;
-*.obj)
-    outFile=\`basnam ${D}outFile .obj\`
-    ;;
-*.a)
-    outFile=\`basnam ${D}outFile .a\`
-    ;;
-*.lib)
-    outFile=\`basnam ${D}outFile .lib\`
-    ;;
-*)
-    ;;
-esac
-case ${D}outimpFile in
-*.a)
-    outimpFile=\`basnam ${D}outimpFile .a\`
-    ;;
-*.lib)
-    outimpFile=\`basnam ${D}outimpFile .lib\`
-    ;;
-*)
-    ;;
-esac
-if @<:@ -z ${D}outimpFile @:>@; then
-    outimpFile=${D}outFile
-fi
-defFile="${D}{outFile}.def"
-arcFile="${D}{outimpFile}.a"
-arcFile2="${D}{outimpFile}.lib"
-
-#create ${D}dllFile as something matching 8.3 restrictions,
-if @<:@ -z ${D}renameScript @:>@ ; then
-    dllFile="${D}outFile"
-else
-    dllFile=\`${D}renameScript ${D}outimpFile\`
-fi
-
-if @<:@ ${D}do_backup -ne 0 @:>@ ; then
-    if @<:@ -f ${D}arcFile @:>@ ; then
-        doCommand "mv ${D}arcFile ${D}{outFile}_s.a"
-    fi
-    if @<:@ -f ${D}arcFile2 @:>@ ; then
-        doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib"
-    fi
-fi
-
-# Extract public symbols from all the object files.
-tmpdefFile=${D}{defFile}_%
-rm -f ${D}tmpdefFile
-for file in ${D}inputFiles ; do
-    case ${D}file in
-    *!)
-        ;;
-    *)
-        doCommand "emxexp -u ${D}file >> ${D}tmpdefFile"
-        ;;
-    esac
-done
-
-# Create the def file.
-rm -f ${D}defFile
-echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile
-dllFile="${D}{dllFile}.dll"
-if @<:@ ! -z ${D}description @:>@; then
-    echo "DESCRIPTION  \\"${D}{description}\\"" >> ${D}defFile
-fi
-echo "EXPORTS" >> ${D}defFile
-
-doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%"
-grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile
-
-# Checks if the export is ok or not.
-for word in ${D}exclude_symbols; do
-    grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}%
-    mv ${D}{tmpdefFile}% ${D}tmpdefFile
-done
-
-
-if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
-    sed "=" < ${D}tmpdefFile | \\
-    sed '
-      N
-      : loop
-      s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/
-      t loop
-    ' > ${D}{tmpdefFile}%
-    grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile
-else
-    rm -f ${D}{tmpdefFile}%
-fi
-cat ${D}tmpdefFile >> ${D}defFile
-rm -f ${D}tmpdefFile
-
-# Do linking, create implib, and apply lxlite.
-gccCmdl="";
-for file in ${D}inputFiles ; do
-    case ${D}file in
-    *!)
-        ;;
-    *)
-        gccCmdl="${D}gccCmdl ${D}file"
-        ;;
-    esac
-done
-doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS"
-touch "${D}{outFile}.dll"
-
-doCommand "emximp -o ${D}arcFile ${D}defFile"
-if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then
-    add_flags="";
-    if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
-        add_flags="-ynd"
-    fi
-    doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile"
-fi
-doCommand "emxomf -s -l ${D}arcFile"
-
-# Successful exit.
-CleanUp 1
-exit 0
-EOF
-dnl ===================== dllar.sh ends here =====================
-])

build/aclocal/bakefile-lang.m4

@@ -1,316 +0,0 @@
-dnl
-dnl  This file is part of Bakefile (http://www.bakefile.org)
-dnl
-dnl  Copyright (C) 2003-2007 Vaclav Slavik, David Elliott and others
-dnl
-dnl  Permission is hereby granted, free of charge, to any person obtaining a
-dnl  copy of this software and associated documentation files (the "Software"),
-dnl  to deal in the Software without restriction, including without limitation
-dnl  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-dnl  and/or sell copies of the Software, and to permit persons to whom the
-dnl  Software is furnished to do so, subject to the following conditions:
-dnl
-dnl  The above copyright notice and this permission notice shall be included in
-dnl  all copies or substantial portions of the Software.
-dnl
-dnl  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-dnl  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-dnl  DEALINGS IN THE SOFTWARE.
-dnl
-dnl  $Id$
-dnl
-dnl  Compiler detection macros by David Elliott and Vadim Zeitlin
-dnl
-
-
-dnl ===========================================================================
-dnl Macros to detect different C/C++ compilers
-dnl ===========================================================================
-
-dnl Based on autoconf _AC_LANG_COMPILER_GNU
-dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO)
-AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
-[
-    AC_LANG_PUSH($2)
-    AC_CACHE_CHECK(
-        [whether we are using the $1 $2 compiler],
-        [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3],
-        [AC_TRY_COMPILE(
-            [],
-            [
-             #ifndef $3
-                choke me
-             #endif
-            ],
-            [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes],
-            [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no]
-         )
-        ]
-    )
-    if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
-        :; $4
-    else
-        :; $5
-    fi
-    AC_LANG_POP($2)
-])
-
-dnl More specific version of the above macro checking whether the compiler
-dnl version is at least the given one (assumes that we do use this compiler)
-dnl
-dnl _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(NAME, LANG, SYMBOL, VER, VERMSG, IF-YES, IF-NO)
-AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_LATER_THAN],
-[
-    AC_LANG_PUSH($2)
-    AC_CACHE_CHECK(
-        [whether we are using $1 $2 compiler v$5 or later],
-        [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4],
-        [AC_TRY_COMPILE(
-            [],
-            [
-             #ifndef $3 || $3 < $4
-                choke me
-             #endif
-            ],
-            [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=yes],
-            [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=no]
-         )
-        ]
-    )
-    if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4" = "xyes"; then
-        :; $6
-    else
-        :; $7
-    fi
-    AC_LANG_POP($2)
-])
-
-dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++
-AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C, __MWERKS__, MWCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C++, __MWERKS__, MWCXX=yes)
-])
-
-dnl IBM xlC compiler defines __xlC__ for both C and C++
-AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
-[
-    _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C, __xlC__, XLCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
-[
-    _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C++, __xlC__, XLCXX=yes)
-])
-
-dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
-dnl
-dnl NB: old versions define _COMPILER_VERSION but this could probably be
-dnl     defined by other compilers too so don't test for it to be safe
-AC_DEFUN([AC_BAKEFILE_PROG_SGICC],
-[
-    _AC_BAKEFILE_LANG_COMPILER(SGI, C, _SGI_COMPILER_VERSION, SGICC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_SGICXX],
-[
-    _AC_BAKEFILE_LANG_COMPILER(SGI, C++, _SGI_COMPILER_VERSION, SGICXX=yes)
-])
-
-dnl Sun compiler defines __SUNPRO_C/__SUNPRO_CC
-AC_DEFUN([AC_BAKEFILE_PROG_SUNCC],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Sun, C, __SUNPRO_C, SUNCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_SUNCXX],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Sun, C++, __SUNPRO_CC, SUNCXX=yes)
-])
-
-dnl Intel icc compiler defines __INTEL_COMPILER for both C and C++
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCC],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Intel, C, __INTEL_COMPILER, INTELCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
-])
-
-dnl Intel compiler command line options changed in incompatible ways sometimes
-dnl before v8 (-KPIC was replaced with gcc-compatible -fPIC) and again in v10
-dnl (-create-pch deprecated in favour of -pch-create) so we need to test for
-dnl its exact version too
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_8],
-[
-    _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 800, 8, INTELCC8=yes)
-])
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_8],
-[
-    _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 800, 8, INTELCXX8=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_10],
-[
-    _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 1000, 10, INTELCC10=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_10],
-[
-    _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 1000, 10, INTELCXX10=yes)
-])
-
-dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
-AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
-[
-    _AC_BAKEFILE_LANG_COMPILER(HP, C, __HP_cc, HPCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_HPCXX],
-[
-    _AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes)
-])
-
-dnl Tru64 cc and cxx
-AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCC],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Compaq, C, __DECC, COMPAQCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX],
-[
-    _AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes)
-])
-
-dnl ===========================================================================
-dnl macros to detect specialty compiler options
-dnl ===========================================================================
-
-dnl Figure out if we need to pass -ext o to compiler (MetroWerks)
-AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO],
-[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto,
-dnl First create an empty conf test
-[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
-dnl Now remove .o and .c.o or .cc.o
-rm -f conftest.$ac_objext conftest.$ac_ext.o
-dnl Now compile the test
-AS_IF([AC_TRY_EVAL(ac_compile)],
-dnl If the test succeeded look for conftest.c.o or conftest.cc.o
-[for ac_file in `(ls conftest.* 2>/dev/null)`; do
-    case $ac_file in
-        conftest.$ac_ext.o)
-            bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
-            ;;
-        *)
-            ;;
-    esac
-done],
-[AC_MSG_FAILURE([cannot figure out if compiler needs -ext o: cannot compile])
-]) dnl AS_IF
-
-rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
-]) dnl AC_CACHE_CHECK
-
-if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
-    if test "[]_AC_LANG_ABBREV[]" = "c"; then
-        CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
-    fi
-    if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
-        CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
-    fi
-fi
-]) dnl AC_DEFUN
-
-
-dnl ===========================================================================
-dnl Macros to do all of the compiler detections as one macro
-dnl ===========================================================================
-
-dnl check for different proprietary compilers depending on target platform
-dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
-AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
-[
-    AC_PROG_$1
-
-    dnl Intel compiler can be used under several different OS and even
-    dnl different architectures (x86, amd64 and Itanium) so it's easier to just
-    dnl always test for it
-    AC_BAKEFILE_PROG_INTEL$1
-
-    dnl If we use Intel compiler we also need to know its version
-    if test "$INTEL$1" = "yes"; then
-        AC_BAKEFILE_PROG_INTEL$1_8
-        AC_BAKEFILE_PROG_INTEL$1_10
-    fi
-
-    dnl if we're using gcc, we can't be using any of incompatible compilers
-    if test "x$G$1" != "xyes"; then
-        if test "x$1" = "xC"; then
-            AC_BAKEFILE_METROWERKS_EXTO
-            if test "x$bakefile_cv_c_exto" '!=' "x"; then
-                unset ac_cv_prog_cc_g
-                _AC_PROG_CC_G
-            fi
-        fi
-
-        dnl most of these compilers are only used under well-defined OS so
-        dnl don't waste time checking for them on other ones
-        case `uname -s` in
-            AIX*)
-                AC_BAKEFILE_PROG_XL$1
-                ;;
-
-            Darwin)
-                AC_BAKEFILE_PROG_MW$1
-                if test "$MW$1" != "yes"; then
-                    AC_BAKEFILE_PROG_XL$1
-                fi
-                ;;
-
-            IRIX*)
-                AC_BAKEFILE_PROG_SGI$1
-                ;;
-
-            Linux*)
-                dnl Sun CC is now available under Linux too, test for it unless
-                dnl we already found that we were using a different compiler
-                if test "$INTEL$1" != "yes"; then
-                    AC_BAKEFILE_PROG_SUN$1
-                fi
-                ;;
-
-            HP-UX*)
-                AC_BAKEFILE_PROG_HP$1
-                ;;
-
-            OSF1)
-                AC_BAKEFILE_PROG_COMPAQ$1
-                ;;
-
-            SunOS)
-                AC_BAKEFILE_PROG_SUN$1
-                ;;
-        esac
-    fi
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_CC],
-[
-    _AC_BAKEFILE_PROG_COMPILER(CC)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_CXX],
-[
-    _AC_BAKEFILE_PROG_COMPILER(CXX)
-])
-

build/aclocal/cppunit.m4

@@ -1,81 +0,0 @@
-dnl
-dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([AM_PATH_CPPUNIT],
-[
-
-AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
-            cppunit_config_prefix="$withval", cppunit_config_prefix="")
-AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
-            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
-
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-     fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-     fi
-  fi
-
-  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-  cppunit_version_min=$1
-
-  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    AC_MSG_RESULT(no)
-    no_cppunit=yes
-  else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      no_cppunit=yes
-    fi
-  fi
-
-  if test "x$no_cppunit" = x ; then
-     ifelse([$2], , :, [$2])     
-  else
-     CPPUNIT_CFLAGS=""
-     CPPUNIT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(CPPUNIT_CFLAGS)
-  AC_SUBST(CPPUNIT_LIBS)
-])
-
-
-

build/aclocal/gst-element-check.m4

@@ -1,23 +0,0 @@
-dnl Perform a check for a GStreamer element using gst-inspect
-dnl Thomas Vander Stichele <thomas at apestaart dot org>
-dnl Last modification: 25/01/2005
-
-dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-
-AC_DEFUN([AM_GST_ELEMENT_CHECK],
-[
-  if test "x$GST_INSPECT" == "x"; then
-    AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
-  fi
-
-  if test "x$GST_INSPECT" != "x"; then
-    AC_MSG_CHECKING(GStreamer element $1)
-    if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
-      AC_MSG_RESULT(found.)
-      $2
-    else
-      AC_MSG_RESULT(not found.)
-      $3
-    fi
-  fi
-])

build/aclocal/gtk-2.0.m4

@@ -1,196 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-
-  pkg_config_args=gtk+-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])

build/aclocal/gtk.m4

@@ -1,194 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-dnl
-AC_DEFUN([AM_PATH_GTK],
-[dnl 
-dnl Get the cflags and libraries from the gtk-config script
-dnl
-AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-            gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
-		    , enable_gtktest=yes)
-
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             gtk_config_args="$gtk_config_args gthread"
-         ;;
-      esac
-  done
-
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  min_gtk_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-  no_gtk=""
-  if test "$GTK_CONFIG" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
-dnl checks the results of gtk-config to some extent
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GTK_CONFIG" = "no" ; then
-       echo "*** The gtk-config script installed by GTK could not be found"
-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-       echo "*** full path to gtk-config."
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])

build/aclocal/pkg.m4

@@ -1,156 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[$4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES

build/aclocal/sdl.m4

@@ -1,181 +0,0 @@
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_SDL],
-[dnl 
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
-            sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
-		    , enable_sdltest=yes)
-
-  if test x$sdl_exec_prefix != x ; then
-    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-    if test x${SDL_CONFIG+set} != xset ; then
-      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-    fi
-  fi
-  if test x$sdl_prefix != x ; then
-    sdl_args="$sdl_args --prefix=$sdl_prefix"
-    if test x${SDL_CONFIG+set} != xset ; then
-      SDL_CONFIG=$sdl_prefix/bin/sdl-config
-    fi
-  fi
-
-  if test "x$prefix" != xNONE; then
-    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-  fi
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-  no_sdl=""
-  if test "$SDL_CONFIG" = "no" ; then
-    no_sdl=yes
-  else
-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-
-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_sdltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $SDL_CFLAGS"
-      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-      LIBS="$LIBS $SDL_LIBS"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
-      rm -f conf.sdltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.sdltest");
-  */
-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_sdl_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_sdl_version");
-     exit(1);
-   }
-
-   if (($sdl_major_version > major) ||
-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       CXXFLAGS="$ac_save_CXXFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_sdl" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$SDL_CONFIG" = "no" ; then
-       echo "*** The sdl-config script installed by SDL could not be found"
-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
-       echo "*** full path to sdl-config."
-     else
-       if test -f conf.sdltest ; then
-        :
-       else
-          echo "*** Could not run SDL test program, checking why..."
-          CFLAGS="$CFLAGS $SDL_CFLAGS"
-          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-          LIBS="$LIBS $SDL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          CXXFLAGS="$ac_save_CXXFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     SDL_CFLAGS=""
-     SDL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(SDL_CFLAGS)
-  AC_SUBST(SDL_LIBS)
-  rm -f conf.sdltest
-])

build/autoconf_prepend-include/Makefile

@@ -1,26 +0,0 @@
-# Created: 2005/03/12
-# Author: David Elliott
-
-# For autoconf: Debian in their infinite wisdom decided to improve upon
-# the standard autoconf 2.59 macros. Thus Debian's autoconf generates
-# a totally different configure script.  This fixes it to look
-# mostly like Debian's.  There are also some fixes pulled in from the OS/2
-# fork of autoconf.
-
-# Rule to freeze the m4 so autoconf will actually use it.
-# NOTE: VERY important to cd to somewhere there are no .m4 files.
-# or at least no aclocal.m4 or else autom4te helpfully picks it up.
-.PHONY: all
-all: autoconf/autoconf.m4f
-
-AUTOCONF_SOURCES = \
-  autoconf/c.m4 \
-  autoconf/general.m4 \
-  autoconf/libs.m4 \
-  autoconf/status.m4
-
-AUTOM4TE=autom4te
-
-autoconf/autoconf.m4f: $(AUTOCONF_SOURCES)
-	$(AUTOM4TE) -B . --language=Autoconf --freeze --output=autoconf/autoconf.m4f
-

build/autoconf_prepend-include/README.txt

@@ -1,22 +0,0 @@
-wxAutohacks
-
-wxAutohacks is a way of ensuring the configure script remains consistent
-between developer commits.  Previous releases include a build/aclocal_include
-which has now been moved into the wxWidgets build/aclocal directory.
-
-At the moment, it is intended to be copied and or symlinked into a wxWidgets
-source tree.  For example, assume you have wxWidgets checked out in the
-/home/myname/wxCVS/wxWidgets/ path.  Then from /home/myname/wxCVS do this:
-cvs -d :pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxAutohacks
-
-You will now have wxAutohacks in /home/myname/wxCVS/wxAutohacks/.  Now go into
-the wxWidgets build (/home/myname/wxCVS/wxWidgets/build/) and do this:
-ln -s ../../wxAutohacks/build/autoconf_prepend-include .
-
-From now on from the root of your wxWidgets source tree when you do this:
-make -f build/autogen.mk
-you will also build an autoconf.m4f file which will ensure the configure
-script stays consistent.
-
-Alternatively you can do this:
-make -f build/autogen.mk AUTOHACKS_PREPEND_INCLUDE_DIR=../wxAutohacks/build/autoconf_prepend-include

build/autoconf_prepend-include/autoconf/libs.m4

@@ -1,498 +0,0 @@
-# This file is part of Autoconf.                       -*- Autoconf -*-
-# Checking for libraries.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception, the Free Software Foundation gives unlimited
-# permission to copy, distribute and modify the configure scripts that
-# are the output of Autoconf.  You need not follow the terms of the GNU
-# General Public License when using or distributing such scripts, even
-# though portions of the text of Autoconf appear in them.  The GNU
-# General Public License (GPL) does govern all other use of the material
-# that constitutes the Autoconf program.
-#
-# Certain portions of the Autoconf source text are designed to be copied
-# (in certain cases, depending on the input) into the output of
-# Autoconf.  We call these the "data" portions.  The rest of the Autoconf
-# source text consists of comments plus executable code that decides which
-# of the data portions to output in any given case.  We call these
-# comments and executable code the "non-data" portions.  Autoconf never
-# copies any of the non-data portions into its output.
-#
-# This special exception to the GPL applies to versions of Autoconf
-# released by the Free Software Foundation.  When you make and
-# distribute a modified version of Autoconf, you may extend this special
-# exception to the GPL to apply to your modified version as well, *unless*
-# your modified version has the potential to copy into its output some
-# of the text that was the non-data portion of the version that you started
-# with.  (In other words, unless your change moves or copies text from
-# the non-data portions to the data portions.)  If your modification has
-# such potential, you must delete any notice of this special exception
-# to the GPL from your modified version.
-#
-# Written by David MacKenzie, with help from
-# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
-# Roland McGrath, Noah Friedman, david d zuhn, and many others.
-
-# Table of contents
-#
-# 1. Generic tests for libraries
-# 2. Tests for specific libraries
-
-
-## --------------------------------- ##
-## 1. Generic tests for libraries.## ##
-## --------------------------------- ##
-
-
-
-# AC_SEARCH_LIBS(FUNCTION, SEARCH-LIBS,
-#                [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-#                [OTHER-LIBRARIES])
-# --------------------------------------------------------
-# Search for a library defining FUNC, if it's not already available.
-AC_DEFUN([AC_SEARCH_LIBS],
-[AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
-[ac_func_search_save_LIBS=$LIBS
-ac_cv_search_$1=no
-AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
-	       [ac_cv_search_$1="none required"])
-if test "$ac_cv_search_$1" = no; then
-  for ac_lib in $2; do
-    LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
-    AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
-		   [ac_cv_search_$1="-l$ac_lib"
-break])
-  done
-fi
-LIBS=$ac_func_search_save_LIBS])
-AS_IF([test "$ac_cv_search_$1" != no],
-  [test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
-  $3],
-      [$4])dnl
-])
-
-
-
-# AC_CHECK_LIB(LIBRARY, FUNCTION,
-#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-#              [OTHER-LIBRARIES])
-# ------------------------------------------------------
-#
-# Use a cache variable name containing both the library and function name,
-# because the test really is for library $1 defining function $2, not
-# just for library $1.  Separate tests with the same $1 and different $2s
-# may have different results.
-#
-# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])
-# is asking for troubles, since AC_CHECK_LIB($lib, fun) would give
-# ac_cv_lib_$lib_fun, which is definitely not what was meant.  Hence
-# the AS_LITERAL_IF indirection.
-#
-# FIXME: This macro is extremely suspicious.  It DEFINEs unconditionally,
-# whatever the FUNCTION, in addition to not being a *S macro.  Note
-# that the cache does depend upon the function we are looking for.
-#
-# It is on purpose we used `ac_check_lib_save_LIBS' and not just
-# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
-# changed but still want to use AC_CHECK_LIB, so they save `LIBS'.
-# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
-# freedom.
-AC_DEFUN([AC_CHECK_LIB],
-[m4_ifval([$3], , [AH_CHECK_LIB([$1])])dnl
-AS_LITERAL_IF([$1],
-	      [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])],
-	      [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl
-AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
-[ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$1 $5 $LIBS"
-AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
-	       [AS_VAR_SET(ac_Lib, yes)],
-	       [AS_VAR_SET(ac_Lib, no)])
-LIBS=$ac_check_lib_save_LIBS])
-AS_IF([test AS_VAR_GET(ac_Lib) = yes],
-      [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-  LIBS="-l$1 $LIBS"
-])],
-      [$4])dnl
-AS_VAR_POPDEF([ac_Lib])dnl
-])# AC_CHECK_LIB
-
-
-# AH_CHECK_LIB(LIBNAME)
-# ---------------------
-m4_define([AH_CHECK_LIB],
-[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
-	     [Define to 1 if you have the `]$1[' library (-l]$1[).])])
-
-
-# AC_HAVE_LIBRARY(LIBRARY,
-#                 [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-#                 [OTHER-LIBRARIES])
-# ---------------------------------------------------------
-#
-# This macro is equivalent to calling `AC_CHECK_LIB' with a FUNCTION
-# argument of `main'.  In addition, LIBRARY can be written as any of
-# `foo', `-lfoo', or `libfoo.a'.  In all of those cases, the compiler
-# is passed `-lfoo'.  However, LIBRARY cannot be a shell variable;
-# it must be a literal name.
-AU_DEFUN([AC_HAVE_LIBRARY],
-[m4_pushdef([AC_Lib_Name],
-	    m4_bpatsubst(m4_bpatsubst([[$1]],
-				    [lib\([^\.]*\)\.a], [\1]),
-			[-l], []))dnl
-AC_CHECK_LIB(AC_Lib_Name, main, [$2], [$3], [$4])dnl
-ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main
-m4_popdef([AC_Lib_Name])dnl
-])
-
-
-
-
-## --------------------------------- ##
-## 2. Tests for specific libraries.  ##
-## --------------------------------- ##
-
-
-
-# --------------------- #
-# Checks for X window.  #
-# --------------------- #
-
-
-# _AC_PATH_X_XMKMF
-# ----------------
-# Internal subroutine of _AC_PATH_X.
-# Set ac_x_includes and/or ac_x_libraries.
-m4_define([_AC_PATH_X_XMKMF],
-[rm -fr conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f $ac_im_libdir/libX11.$ac_extension; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftest.dir
-fi
-])# _AC_PATH_X_XMKMF
-
-
-# _AC_PATH_X_DIRECT
-# -----------------
-# Internal subroutine of _AC_PATH_X.
-# Set ac_x_includes and/or ac_x_libraries.
-m4_define([_AC_PATH_X_DIRECT],
-[# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for a specified header file.
-  # First, try using that file with no special directory specified.
-  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
-[# We can compile using X headers with no special include directory.
-ac_x_includes=],
-[for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done])
-fi # $ac_x_includes = no
-
-if test "$ac_x_libraries" = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS="-lX11 $LIBS"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
-				  [XrmInitialize ()])],
-		 [LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=],
-		 [LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-do
-  # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/libX11.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done])
-fi # $ac_x_libraries = no
-])# _AC_PATH_X_DIRECT
-
-
-# _AC_PATH_X
-# ----------
-# Compute ac_cv_have_x.
-AC_DEFUN([_AC_PATH_X],
-[AC_CACHE_VAL(ac_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-_AC_PATH_X_XMKMF
-_AC_PATH_X_DIRECT
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi])dnl
-])
-
-
-# AC_PATH_X
-# ---------
-# If we find X, set shell vars x_includes and x_libraries to the
-# paths, otherwise set no_x=yes.
-# Uses ac_ vars as temps to allow command line to override cache and checks.
-# --without-x overrides everything else, but does not touch the cache.
-AN_HEADER([X11/Xlib.h],  [AC_PATH_X])
-AC_DEFUN([AC_PATH_X],
-[dnl Document the X abnormal options inherited from history.
-m4_divert_once([HELP_BEGIN], [
-X features:
-  --x-includes=DIR    X include files are in DIR
-  --x-libraries=DIR   X library files are in DIR])dnl
-
-if test "x$ac_path_x_has_been_run" != xyes; then
-  AC_MSG_CHECKING([for X])
-
-ac_path_x_has_been_run=yes
-AC_ARG_WITH(x, [  --with-x                use the X Window System])
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-    _AC_PATH_X
-  fi
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  AC_MSG_RESULT([$have_x])
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  # It might be that x_includes is empty (headers are found in the
-  # standard search path. Then output the corresponding message
-  ac_out_x_includes=$x_includes
-  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
-  AC_MSG_RESULT([libraries $x_libraries, headers $ac_out_x_includes])
-fi
-
-fi])# AC_PATH_X
-
-
-
-# AC_PATH_XTRA
-# ------------
-# Find additional X libraries, magic flags, etc.
-AC_DEFUN([AC_PATH_XTRA],
-[AC_REQUIRE([AC_PATH_X])dnl
-if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-  AC_DEFINE([X_DISPLAY_MISSING], 1,
-	    [Define to 1 if the X Window System is missing or not being used.])
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
-
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-dnl FIXME: banish uname from this macro!
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    case `(uname -sr) 2>/dev/null` in
-    "SunOS 5"*)
-      AC_MSG_CHECKING([whether -R must be followed by a space])
-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_nospace=yes, ac_R_nospace=no)
-      if test $ac_R_nospace = yes; then
-	AC_MSG_RESULT([no])
-	X_LIBS="$X_LIBS -R$x_libraries"
-      else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_space=yes, ac_R_space=no)
-	if test $ac_R_space = yes; then
-	  AC_MSG_RESULT([yes])
-	  X_LIBS="$X_LIBS -R $x_libraries"
-	else
-	  AC_MSG_RESULT([neither works])
-	fi
-      fi
-      LIBS=$ac_xsave_LIBS
-    esac
-  fi
-
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
-
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn Johnson says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    AC_LINK_IFELSE([AC_LANG_CALL([], [XOpenDisplay])],
-		   [],
-    [AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
-	[X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-    fi])
-    LIBS="$ac_xsave_LIBS"
-
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to T.E. Dickey.
-    # The functions gethostbyname, getservbyname, and inet_addr are
-    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    AC_CHECK_FUNC(gethostbyname)
-    if test $ac_cv_func_gethostbyname = no; then
-      AC_CHECK_LIB(nsl, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
-      if test $ac_cv_lib_nsl_gethostbyname = no; then
-	AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd")
-      fi
-    fi
-
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says Simon Leinen: it contains gethostby*
-    # variants that don't use the name server (or something).  -lsocket
-    # must be given before -lnsl if both are needed.  We assume that
-    # if connect needs -lnsl, so does gethostbyname.
-    AC_CHECK_FUNC(connect)
-    if test $ac_cv_func_connect = no; then
-      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
-	$X_EXTRA_LIBS)
-    fi
-
-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    AC_CHECK_FUNC(remove)
-    if test $ac_cv_func_remove = no; then
-      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
-    fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    AC_CHECK_FUNC(shmat)
-    if test $ac_cv_func_shmat = no; then
-      AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS=$LDFLAGS
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  # John Interrante, Karl Berry
-  AC_CHECK_LIB(ICE, IceConnectionNumber,
-    [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], , $X_EXTRA_LIBS)
-  LDFLAGS=$ac_save_LDFLAGS
-
-fi
-AC_SUBST(X_CFLAGS)dnl
-AC_SUBST(X_PRE_LIBS)dnl
-AC_SUBST(X_LIBS)dnl
-AC_SUBST(X_EXTRA_LIBS)dnl
-])# AC_PATH_XTRA

build/autogen.mk

@@ -1,66 +0,0 @@
-# Created: 2005/03/12
-# Author: David Elliott
-
-# Usage Example:
-#  make -f build/autogen.mk ACLOCAL=aclocal-1.9
-
-# This is a simple Makefile to update the UNIX build system in such a
-# way that doing a cvs diff on its output files should reveal only the
-# true changes, not meaningless differences due to slightly different
-# autoconf or aclocal m4 files.
-
-# For aclocal: All necessary m4 files are located in the build/aclocal
-# directory.  Running aclocal -I build/aclocal when using aclocal 1.9
-# will result in an aclocal.m4 which uses m4_include for these files.
-
-ACLOCAL=aclocal
-AUTOCONF=autoconf
-BAKEFILE_GEN=bakefile_gen
-AUTOHACKS_PREPEND_INCLUDE_DIR=build/autoconf_prepend-include
-
-# configure depends on everything else so this will build everything.
-.PHONY: all
-all: configure
-
-.PHONY: autoconf_m4f
-
-# Invoke make on wxAutohacks dir, but don't fail if it's not present
-autoconf_m4f:
-	-make -C $(AUTOHACKS_PREPEND_INCLUDE_DIR)
-
-BAKEFILES=\
-  build/bakefiles/wx.bkl \
-  build/bakefiles/common.bkl \
-  build/bakefiles/files.bkl \
-  build/bakefiles/monolithic.bkl \
-  build/bakefiles/multilib.bkl \
-  build/bakefiles/opengl.bkl \
-  build/bakefiles/plugins.bkl \
-  build/bakefiles/build_cfg.bkl
-
-# Run bakefile-gen (which generates everything) whenever a bakefile is newer
-# than Makefile.in or autoconf_inc.m4.
-# This dep is obviously wrong but probably close enough
-autoconf_inc.m4 Makefile.in: $(BAKEFILES)
-	cd build/bakefiles && \
-	$(BAKEFILE_GEN) -f autoconf
-
-# Run configure whenever configure.in, aclocal.m4 or autoconf_inc.m4 is updated
-# Depend on our custom autoconf.m4f
-configure: configure.in aclocal.m4 autoconf_inc.m4 autoconf_m4f
-	$(AUTOCONF) -B $(AUTOHACKS_PREPEND_INCLUDE_DIR)
-
-ACLOCAL_SOURCES = \
-  build/aclocal/bakefile.m4 \
-  build/aclocal/bakefile-lang.m4 \
-  build/aclocal/cppunit.m4 \
-  build/aclocal/gst-element-check.m4 \
-  build/aclocal/gtk-2.0.m4 \
-  build/aclocal/gtk.m4 \
-  build/aclocal/pkg.m4 \
-  build/aclocal/sdl.m4
-
-# Run aclocal whenever acinclude or one of our local m4s is updated.
-aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)
-	$(ACLOCAL) -I build/aclocal
-

build/bakefiles/Bakefiles.bkgen

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 
-<bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
+<bakefile-gen>
 
     <!--
     Formats listed here are not generated by default. To enable them, either
@@ -14,19 +14,20 @@
          </bakefile-gen>
 
     Reasons why these formats are disabled (and so not in CVS):
-
+    
+    dmars     - In beta testing, will be added when it stabilizes.
+    dmars_smake     - ditto
+    msevc4prj - ditto
     cbuilderx - Generated projects are too bad to be included in CVS. Please
                 *do not* enable this format until FIXMEs in .bkl files related
                 to cbuilderx are addressed. In particular, the project must
                 be placed into build/msw(?) directory and store object files
                 in its subdirectory and it must copy setup.h as others do.
     cbx_unix  - Doesn't integrate well and won't be used by most Unix people.
-    dmars, dmars_smake, msevc4prj - These are generated at release time and
-                we don't want to clutter the source tree with these files.
     -->
-
-    <disable-formats>dmars,dmars_smake,msevc4prj,cbx_unix,cbuilderx</disable-formats>
-
+    
+    <disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
+    
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
@@ -52,24 +53,24 @@
     <add-formats>
         autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
     </add-formats>
-
+    
     <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/mobile/mobile_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,cbuilderx,cbx_unix
     </del-formats>
 
     <!-- WinCE can't have console apps: -->
@@ -79,16 +80,11 @@
     <del-formats files="../../contrib/utils/wxrc/*">msevc4prj</del-formats>
     <del-formats files="../../tests/*">msevc4prj</del-formats>
 
-    <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
-    <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
-        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom,cbuilderx,cbx_unix
-    </del-formats>
-
-
+    
     <!-- Default flags (for all formats and bakefiles): -->
     <add-flags>-Iformats</add-flags>
-
-
+    
+    
     <!-- Directories where the files go: -->
     <add-flags files="wx.bkl" formats="autoconf">
         -o../../Makefile.in
@@ -114,9 +110,6 @@
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>
-    <add-flags files="wx.bkl" formats="msvs2005prj">
-        -o../msw/wx.sln
-    </add-flags>
     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </add-flags>
@@ -134,17 +127,22 @@
         -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
     </add-flags>
     <add-flags files="../../contrib/build/*/*.bkl"
-               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
+               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
         -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
     </add-flags>
 
-
+    
 
     <!-- Format specific settings: -->
     <add-flags formats="autoconf">
         -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
     </add-flags>
 
+    <add-formats files="wx.bkl">wx24dsp</add-formats>
+    <add-flags formats="wx24dsp">
+        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
+    </add-flags>
+    
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 
@@ -153,11 +151,10 @@
     <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
         -DWRITE_OPTIONS_FILE=0
     </add-flags>
-    <del-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom"
-               files="wx.bkl">
+    <del-flags files="wx.bkl">
         -DWRITE_OPTIONS_FILE=0
     </del-flags>
-
+    
     <add-flags files="wx.bkl" formats="borland">
         -DOPTIONS_FILE=config.bcc
     </add-flags>
@@ -181,7 +178,7 @@
     <add-flags files="../../*/*/*">-DWXTOPDIR=../../</add-flags>
     <add-flags files="../../*/*/*/*">-DWXTOPDIR=../../../</add-flags>
     <add-flags files="../../*/*/*/*/*">-DWXTOPDIR=../../../../</add-flags>
-
+    
     <add-flags files="../../*/*" formats="borland">
         -DOPTIONS_FILE=../build/msw/config.bcc
     </add-flags>
@@ -255,15 +252,6 @@
         -DOPTIONS_FILE=../../../../build/msw/config.wat
     </add-flags>
 
-    
-    <!-- Makefiles for out-of-tree building of samples on Unix: -->
-    <add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
-        gnu
-    </add-formats>
-    <add-flags files="../../samples/*/*.bkl,../../samples/*/*/*.bkl"
-               formats="gnu">
-        -DOUT_OF_TREE_MAKEFILES=1 -o$(INPUT_FILE_DIR)/makefile.unx
-    </add-flags>
 
     <!-- Personal customizations (not in CVS): -->
     <include file="Bakefiles.local.bkgen" ignore_missing="1"/>

build/bakefiles/build_cfg.bkl

@@ -8,8 +8,7 @@
     the library.
     -->
 
-    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj','cbuilderx'] and
-              TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+    <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL'] and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
 
         <set var="BUILD_CFG_FILE" make_var="1">
             $(SETUPHDIR)$(DIRSEP)build.cfg
@@ -39,11 +38,9 @@
                 @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
                 @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
                 @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
-                @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
                 @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
                 @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
                 @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
-		@echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
                 @echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
                 @echo CC=$(CC) >>$(BUILD_CFG_FILE)
                 @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)

build/bakefiles/common.bkl

@@ -3,7 +3,7 @@
 
 <makefile>
 
-    <requires version="0.2.3"/>
+    <requires version="0.1.7"/>
 
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
@@ -29,9 +29,37 @@
 
     <include file="plugins_deps.bkl"/>
 
+    <!-- ================================================================== -->
+    <!--                     wxWidgets version numbers:                     -->
+    <!-- ================================================================== -->
 
-    <!-- wxWidgets version numbers logic: -->
-    <include file="version.bkl"/>
+    <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
+    <set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
+    <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
+    <set var="WX_RELEASE" make_var="1">
+        $(WXVER_MAJOR).$(WXVER_MINOR)
+    </set>
+    <set var="WX_RELEASE_NODOT" make_var="1">
+        $(WXVER_MAJOR)$(WXVER_MINOR)
+    </set>
+    <set var="WX_VERSION" make_var="1">
+        $(WX_RELEASE).$(WXVER_RELEASE)
+    </set>
+    <set var="WX_VERSION_NODOT" make_var="1">
+        $(WX_RELEASE_NODOT)$(WXVER_RELEASE)
+    </set>
+
+    <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
+
+    <set var="WXSOVERSION">
+        <if cond="WX_STABLE_BRANCH=='1'">0.0.0</if>
+        <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
+    </set>
+    <set var="WXMACVERSION">$(WX_VERSION)</set>
+    <set var="WXWIN32DLLVERSION">
+        <if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
+        <if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
+    </set>
 
 
     <!-- ================================================================== -->
@@ -130,7 +158,7 @@
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
     </set>
     <set var="WXLIB_MEDIA">
-        <if cond="MONOLITHIC=='0' and USE_MEDIA=='1'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
     </set>
     <set var="WXLIB_HTML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
@@ -149,12 +177,6 @@
     <set var="WXLIB_DBGRID">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
     </set>
-    <set var="WXLIB_AUI">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
-    </set>
-    <set var="WXLIB_RICHTEXT">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
-    </set>
 
     <set var="WXLIB_MONO">
         <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
@@ -167,10 +189,6 @@
 
     <set var="DIR_SUFFIX_CPU">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
-        <if cond="TARGET_CPU=='amd64'">_amd64</if>
-        <if cond="TARGET_CPU=='AMD64'">_amd64</if>
-        <if cond="TARGET_CPU=='ia64'">_ia64</if>
-        <if cond="TARGET_CPU=='IA64'">_ia64</if>
     </set>
 
     <if cond="FORMAT!='autoconf'">
@@ -193,14 +211,12 @@
     </if>
 
     <set var="LIBTYPE_SUFFIX" make_var="1">
-        <if cond="FORMAT!='autoconf' and SHARED=='0' and PLATFORM_WIN32=='1'">lib</if>
-        <if cond="FORMAT!='autoconf' and SHARED=='1' and PLATFORM_WIN32=='1'">dll</if>
-        <if cond="FORMAT=='watcom' and SHARED=='0' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_lib</if>
-        <if cond="FORMAT=='watcom' and SHARED=='1' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_dll</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
     </set>
 
     <set var="LIBDIRNAME" make_var="1">
-        <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
+        <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
         <if cond="FORMAT!='autoconf'">
             $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
         </if>
@@ -248,24 +264,19 @@
     </set>
 
     <set var="RTTI_DEFINE">
-        <if cond="USE_RTTI=='0'">wxNO_RTTI</if>
+    	<if cond="USE_RTTI=='0'">wxNO_RTTI</if>
     </set>
     <set var="EXCEPTIONS_DEFINE">
-        <if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
+    	<if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
     </set>
     <set var="THREAD_DEFINE">
-        <if cond="USE_THREADS=='0'">wxNO_THREADS</if>
+    	<if cond="USE_THREADS=='0'">wxNO_THREADS</if>
     </set>
 
     <set var="DEBUG_DEFINE">
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
         <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>
-    <set var="NDEBUG_DEFINE">
-        <if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">NDEBUG</if>
-        <if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='0'">NDEBUG</if>
-    </set>
-
     <!-- does not cover all cases, but better than nothing -->
     <set var="NO_VC_CRTDBG">
         <if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
@@ -274,9 +285,6 @@
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
     </set>
-    <set var="MSLU_DEFINE">
-        <if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>
-    </set>
 
     <!-- fill for the specific case of the format/compiler -->
     <set var="WIN32_WINNT">
@@ -286,30 +294,6 @@
     <set var="UNICOWS_LIB">
         <if cond="MSLU=='1'">unicows</if>
     </set>
-    <set var="CAIRO_LIB">
-        <if cond="USE_CAIRO=='1'">cairo</if>
-    </set>
-    <set var="CAIRO_LIBDIR">
-        <if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/lib</if>
-    </set>
-    <set var="CAIRO_INCLUDEDIR">
-        <if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/include/cairo</if>
-    </set>
-    <if cond="FORMAT!='autoconf'">
-        <set var="GDIPLUS_LIB">
-            <if cond="USE_GDIPLUS=='1'">gdiplus</if>
-	</set>
-	<set var="GFXCTX_DEFINE">
-            <if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
-	</set>
-    </if>
-
-    <set var="LINK_TARGET_CPU">
-        <if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if>
-        <if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
-        <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
-        <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
-    </set>
 
     <template id="common_settings">
         <debug-info>$(DEBUGINFO)</debug-info>
@@ -324,17 +308,6 @@
         </if>
         <define>$(NO_VC_CRTDBG)</define>
         <define>$(WIN32_WINNT)</define>
-        <if cond="FORMAT=='msevc4prj' and
-                  BAKEFILE_VERSION in ['0.1.9'] and
-                  USE_RTTI=='0'">
-            <!-- hack to make eVC4 2.6.2 project files compatible with what we had in 2.6.1 -->
-            <set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
-            <set var="_cppflags">$(_cppflags.replace('/GR', ''))</set>
-        </if>
-        <if cond="FORMAT=='msvc'">
-            <ldflags>$(LINK_TARGET_CPU)</ldflags>
-        </if>
-        <include cond="FORMAT=='msevc4prj'">$(TOP_SRCDIR)build/wince/missing</include>
     </template>
 
     <template id="anylib">
@@ -360,91 +333,43 @@
 
     <!-- deal with the need to copy setup.h here: -->
 
-    <set var="IS_MSVC_PRJ">
-        $(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
-    </set>
+    <set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
 
     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
             <msvc-project-files>
-                $(addPrefixToList('include\\', wxwin.headersOnly(value)))
+                $(addPrefixToList('include\', wxwin.headersOnly(value)))
             </msvc-project-files>
         </if>
     </define-tag>
 
-    <set var="msvc_copy_setup_h_script">
+    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
+        <if cond="FORMAT=='msevc4prj'">
+            <msvc-headers>wx/msw/wince/setup.h</msvc-headers>
+            <set var="vc_setup_h">wince\setup.h</set>
+            <set var="vc_setup_h_rule">wince_setup_h</set>
+        </if>
+        <if cond="FORMAT!='msevc4prj'">
+            <msvc-headers>wx/msw/setup.h</msvc-headers>
+            <set var="vc_setup_h">setup.h</set>
+            <set var="vc_setup_h_rule">setup_h</set>
+        </if>
         <if cond="IS_MSVC_PRJ">
+            <set var="_custom_build_files" append="1">
+                include\wx\msw\$(vc_setup_h)
+            </set>
+            <set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)">
 Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\..\include\wx\%s
+InputPath=..\include\wx\msw\$(vc_setup_h)
 
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-        </if>
-    </set>
-
-    <define-tag name="msvc-headers-setup-h" rules="dll,lib">
-        <if cond="IS_MSVC_PRJ">
-            <msvc-headers>
-                $(addPrefixToList('wx/', value))
-            </msvc-headers>
-            <set var="_custom_build_files" append="1">
-                $(nativePaths(addPrefixToList('include/wx/', value)))
-            </set>
-        </if>
-    </define-tag>
-
-    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
-        <if cond="IS_MSVC_PRJ">
-            <if cond="FORMAT=='msevc4prj'">
-                <msvc-headers-setup-h>
-                    msw/wince/setup.h
-                </msvc-headers-setup-h>
-                <set var="_custom_build_include_wx_msw_wince_setup_h">
-                    $(msvc_copy_setup_h_script % 'msw\wince\setup.h')
-                </set>
-            </if>
-            <if cond="FORMAT!='msevc4prj'">
-                <msvc-headers-setup-h>
-                    msw/setup.h
-                    univ/setup.h
-                </msvc-headers-setup-h>
-                <set var="_custom_build_include_wx_msw_setup_h">
-                    <if cond="WXUNIV=='0'">
-                        $(msvc_copy_setup_h_script % 'msw\setup.h')
-                    </if>
-                </set>
-                <set var="_custom_build_include_wx_univ_setup_h">
-                    <if cond="WXUNIV=='1'">
-                        $(msvc_copy_setup_h_script % 'univ\setup.h')
-                    </if>
-                </set>
-            </if>
-        </if>
-    </define-tag>
-
-    <define-tag name="msvc-create-rcdefs-h" rules="dll,lib">
-        <if cond="IS_MSVC_PRJ">
-            <msvc-headers-setup-h>
-                msw/genrcdefs.h
-            </msvc-headers-setup-h>
-            <!-- FIXME: we need another way to get the compiler name -->
-            <set var="VC_COMPILER">
-                <if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
-                <if cond="FORMAT!='msevc4prj'">cl</if>
-            </set>
-            <set var="_custom_build_include_wx_msw_genrcdefs_h">
-Creating $(SETUPHDIR)\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
-$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>
         </if>
     </define-tag>
 
     <template id="msvc_setup_h">
         <msvc-copy-setup-h/>
-        <msvc-create-rcdefs-h/>
     </template>
 
     <!-- =============================================================== -->
@@ -478,33 +403,20 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
     </set>
 
-    <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
-        <set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
-        <set var="MGLPMLIBPATH">
-            <if cond="DOS32=='DOS4GW'">dos4gw</if>
-        </set>
-    </if>
-
     <template id="wx" template="common_settings">
         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>
         <define>$(DEBUG_DEFINE)</define>
-        <define>$(NDEBUG_DEFINE)</define>
         <define>$(EXCEPTIONS_DEFINE)</define>
         <define>$(RTTI_DEFINE)</define>
         <define>$(THREAD_DEFINE)</define>
         <define>$(UNICODE_DEFINE)</define>
-        <define>$(MSLU_DEFINE)</define>
-        <if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if>
-        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
+        <!-- this include is added by configure, we need to put other
+             includes before it: -->
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
-        <include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
         <lib-path>$(LIBDIRNAME)</lib-path>
-        <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
-            <lib-path>$(MGLLIBPATH)</lib-path>
-            <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
-        </if>
+        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <warnings>max</warnings>
         <cppflags-watcom>
             -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
@@ -520,6 +432,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <!-- for both GUI and wxBase libs/samples: -->
     <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->
+        <sys-lib>$(LIB_TIFF)</sys-lib>
+        <sys-lib>$(LIB_JPEG)</sys-lib>
+        <sys-lib>$(LIB_PNG)</sys-lib>
         <sys-lib>$(LIB_ZLIB)</sys-lib>
         <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
@@ -527,26 +442,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
 
         <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
 
-        <!-- system libraries on os2: -->
-        <if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
-            <if cond="FORMAT=='watcom'">
-                <sys-lib>upm32</sys-lib>
-            </if>
-        </if>
-
-        <!-- system libraries on mgl: -->
-        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
-            <sys-lib>mgl</sys-lib>
-            <sys-lib>mglcpp</sys-lib>
-            <sys-lib>pm</sys-lib>
-        </if>
-
         <!-- system libraries on windows: -->
-        <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
+        <if cond="FORMAT!='autoconf'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
-            <sys-lib>$(GDIPLUS_LIB)</sys-lib>
-            <sys-lib>$(CAIRO_LIB)</sys-lib>
-            <lib-path>$(CAIRO_LIBDIR)</lib-path>
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
             </if>
@@ -574,7 +472,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
             </if>
-            <if cond="FORMAT=='borland'">
+            <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
             <if cond="FORMAT!='msevc4prj'">
@@ -585,10 +483,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
 
 
     <!-- for GUI libs/samples: -->
-    <template id="wx_append_nomono" template_append="wx_append_base_nomono">
-        <sys-lib>$(LIB_TIFF)</sys-lib>
-        <sys-lib>$(LIB_JPEG)</sys-lib>
-        <sys-lib>$(LIB_PNG)</sys-lib>
+    <template id="wx_append_nomono" template="wx_append_base_nomono">
         <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
     </template>
 
@@ -609,13 +504,11 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
 
-        <define>WXBUILDING</define>
-
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
-                <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
+            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
+                <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
                 <precomp-headers-gen>
-                    $(WXTOPDIR)src/common/dummy.cpp
+                    $(WXTOPDIR)src/msw/dummy.cpp
                 </precomp-headers-gen>
             </if>
             <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
@@ -642,28 +535,19 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         </if>
     </template>
 
-    <if cond="FORMAT=='autoconf'">
-        <set var="RCDEFDIR">
-            <if cond="TOOLKIT=='MSW'">
-                $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-            </if>
-        </set>
-    </if>
-
     <template id="wx_dll_b" template="wx_lib_b">
         <set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
         <dllname>$(WXDLLNAME)</dllname>
         <version>$(WX_VERSION)</version>
         <so_version>$(WXSOVERSION)</so_version>
-
-        <!-- FIXME: until libtool scheme is implemented in bakefile -->
-        <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
+        <mac_version>$(WXMACVERSION)</mac_version>
 
         <!-- version info resources: -->
-        <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
-        <if cond="FORMAT=='autoconf'">
-            <res-include>$(RCDEFDIR)</res-include>
-            <res-include>$(TOP_SRCDIR)include</res-include>
+        <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
+            <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
+            <res-include cond="FORMAT=='autoconf'">
+                $(TOP_SRCDIR)include
+            </res-include>
         </if>
         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
     </template>
@@ -683,9 +567,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     </template>
 
     <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
-        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
-            <include>$(DOLLAR)(%SCITECH)/include</include>
-        </if>
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
         <include>$(INC_PNG)</include>

build/bakefiles/common_contrib.bkl

@@ -35,16 +35,4 @@
         <srcdir>$(CONTRIB_HDR_DIR)</srcdir>
         <install-to>$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)</install-to>
     </template>
-
-    <!-- Link against one contrib library. Value must be literal! -->
-    <define-tag name="contrib-lib" rules="exe,dll,module">
-        <sys-lib>$(wxwin.libToLink(value))</sys-lib>
-        <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
-        <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
-            <depends-on-dsp>
-                $(wxwin.makeContribDspDependency(value))
-            </depends-on-dsp>
-        </if>
-    </define-tag>
-
 </makefile>

build/bakefiles/common_samples.bkl

@@ -3,17 +3,120 @@
 
 <makefile>
     
+    <include file="common.bkl"/>
     <set var="file_common_samples_included">1</set>
     
-    <if cond="not isdefined('OUT_OF_TREE_MAKEFILES')">
-        <set var="OUT_OF_TREE_MAKEFILES">0</set>
+    <!-- =============================================================== -->
+    <!--                    Template for wxWidgets samples:              -->
+    <!-- =============================================================== -->
+
+    <if cond="FORMAT=='autoconf'">
+        <set var="MACOSX_RESOURCES">
+            <if cond="TOOLKIT=='MAC'">
+                Carbon.r sample.r
+            </if>
+        </set>
     </if>
 
-    <if cond="OUT_OF_TREE_MAKEFILES=='1'">
-        <include file="common_samples_outoftree.bkl"/>
-    </if>
-    <if cond="OUT_OF_TREE_MAKEFILES=='0'">
-        <include file="common_samples_intree.bkl"/>
+    <set var="DLLFLAG">
+        <if cond="SHARED=='1'">WXUSINGDLL</if>
+    </set>
+    
+    <template id="wx_util_b" template="wx">
+        <include>$(SRCDIR)</include>
+        <define>$(DLLFLAG)</define>
+    </template>
+    
+    <template id="wx_util" template="wx_util_b">
+        <app-type>gui</app-type>
+        <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
+        <!-- resource files includes: -->
+        <include>$(SRCDIR)/$(WXTOPDIR)samples</include>
+        <!-- this include is not added via <include> for autoconf, see
+             common.bkl: -->
+        <res-include cond="FORMAT=='autoconf'">
+            $(TOP_SRCDIR)include
+        </res-include>
+        
+        <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
+        <if cond="FORMAT=='autoconf'">
+            <wx-os2-lib-resource/>
+        </if>
+
+        <!-- FIXME: temporary, until bakefile can reuse existing pch files -->
+        <if cond="FORMAT!='autoconf'">
+            <define>NOPCH</define>
+        </if>
+    </template>
+    
+    <template id="wx_util_console" template="wx_util_b">
+        <app-type>console</app-type>
+        <define>wxUSE_GUI=0</define>
+    </template>
+    
+    <template id="wx_sample" template="wx_util">
+        <if cond="FORMAT=='autoconf'">
+            <wx-mac-app-bundle/>
+            <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
+            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
+        </if>
+    </template>
+    <template id="wx_sample_console" template="wx_util_console">
+        <if cond="FORMAT=='autoconf'">
+            <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
+            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
+        </if>
+    </template>
+    
+    
+    <!-- =============================================================== -->
+    <!--                    Support for samples data files:              -->
+    <!-- =============================================================== -->
+
+    <define-rule name="wx-data" extends="copy-files">
+        <template>
+            <dependency-of>all</dependency-of>
+            <dstdir>$(BUILDDIR)</dstdir>
+            <srcdir>$(SRCDIR)</srcdir>
+        </template>
+
+        <!--
+        VS - FIXME:
+        Don't clean the files because it would wipe out sources files if
+        BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
+        but it would be better to delete the files during "make clean" if
+        BUILDDIR!=SRCDIR.
+        
+        <define-tag name="files">
+            <clean-files>
+                $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
+            </clean-files>
+        </define-tag>
+        -->
+    </define-rule>
+    
+    
+    <!-- =============================================================== -->
+    <!--                    Misc platform specialities:                  -->
+    <!-- =============================================================== -->
+
+    <if cond="FORMAT=='autoconf'">
+        <include file="mac_bundles.bkl"/>
+
+        <!--
+        A hack to include precompiled OS/2 resource file in apps instead of
+        compiling it from .rc file (gcc on OS/2 doesn't ship with resource
+        compiler):
+        -->
+        <define-tag name="wx-os2-lib-resource" rules="exe">        
+            <set var="os2_lib_res">
+                <if cond="PLATFORM_OS2=='1'">
+                    $(TOP_SRCDIR)include/wx/os2/wx.res
+                </if>
+            </set>
+            <set var="__objects" append="1">$(os2_lib_res)</set>
+        </define-tag>
     </if>
+    
 
 </makefile>

build/bakefiles/common_samples_intree.bkl

@@ -1,121 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="common.bkl"/>
-    
-    <!-- =============================================================== -->
-    <!--                    Template for wxWidgets samples:              -->
-    <!-- =============================================================== -->
-
-    <if cond="FORMAT=='autoconf'">
-        <set var="MACOSX_RESOURCES">
-            <if cond="TOOLKIT=='MAC'">
-                Carbon.r sample.r
-            </if>
-        </set>
-    </if>
-
-    <set var="DLLFLAG">
-        <if cond="SHARED=='1'">WXUSINGDLL</if>
-    </set>
-    
-    <template id="wx_util_b" template="wx">
-        <include>$(SRCDIR)</include>
-        <define>$(DLLFLAG)</define>
-    </template>
-    
-    <template id="wx_util" template="wx_util_b">
-        <app-type>gui</app-type>
-        <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
-        <!-- resource files includes: -->
-        <include>$(SRCDIR)/$(WXTOPDIR)samples</include>
-        <!-- this include is not added via <include> for autoconf, see
-             common.bkl: -->
-        <if cond="FORMAT=='autoconf'">
-            <res-include>$(RCDEFDIR)</res-include>
-            <res-include>$(TOP_SRCDIR)include</res-include>
-        </if>
-        
-        <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
-        <if cond="FORMAT=='autoconf'">
-            <wx-os2-lib-resource/>
-        </if>
-
-        <!-- FIXME: temporary, until bakefile can reuse existing pch files -->
-        <if cond="FORMAT!='autoconf'">
-            <define>NOPCH</define>
-        </if>
-    </template>
-    
-    <template id="wx_util_console" template="wx_util_b">
-        <app-type>console</app-type>
-        <define>wxUSE_GUI=0</define>
-    </template>
-    
-    <template id="wx_sample" template="wx_util">
-        <if cond="FORMAT=='autoconf'">
-            <wx-mac-app-bundle/>
-            <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
-            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
-        </if>
-    </template>
-    <template id="wx_sample_console" template="wx_util_console">
-        <if cond="FORMAT=='autoconf'">
-            <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
-            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
-        </if>
-    </template>
-    
-    
-    <!-- =============================================================== -->
-    <!--                    Support for samples data files:              -->
-    <!-- =============================================================== -->
-
-    <define-rule name="wx-data" extends="copy-files">
-        <template>
-            <dependency-of>all</dependency-of>
-            <dstdir>$(BUILDDIR)</dstdir>
-            <srcdir>$(SRCDIR)</srcdir>
-        </template>
-
-        <!--
-        VS - FIXME:
-        Don't clean the files because it would wipe out sources files if
-        BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
-        but it would be better to delete the files during "make clean" if
-        BUILDDIR!=SRCDIR.
-        
-        <define-tag name="files">
-            <clean-files>
-                $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
-            </clean-files>
-        </define-tag>
-        -->
-    </define-rule>
-    
-    
-    <!-- =============================================================== -->
-    <!--                    Misc platform specialities:                  -->
-    <!-- =============================================================== -->
-
-    <if cond="FORMAT=='autoconf'">
-        <include file="mac_bundles.bkl"/>
-
-        <!--
-        A hack to include precompiled OS/2 resource file in apps instead of
-        compiling it from .rc file (gcc on OS/2 doesn't ship with resource
-        compiler):
-        -->
-        <define-tag name="wx-os2-lib-resource" rules="exe">        
-            <set var="os2_lib_res">
-                <if cond="PLATFORM_OS2=='1'">
-                    $(TOP_SRCDIR)include/wx/os2/wx.res
-                </if>
-            </set>
-            <set var="__objects" append="1">$(os2_lib_res)</set>
-        </define-tag>
-    </if>
-    
-</makefile>

build/bakefiles/common_samples_outoftree.bkl

@@ -1,43 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-    
-    <!-- =============================================================== -->
-    <!-- Templates for out-of-tree Unix makefiles for wxWidgets samples: -->
-    <!-- =============================================================== -->
-
-    <include file="wxpresets/presets/wx.bkl"/>
-
-    <template id="wx_app_base" template="wx">
-        <include>$(SRCDIR)</include>
-    </template>
-    
-    <template id="wx_util" template="wx_app_base">
-        <app-type>gui</app-type>
-    </template>
-    
-    <template id="wx_util_console" template="wx_app_base">
-        <app-type>console</app-type>
-    </template>
-    
-    <template id="wx_sample" template="wx_util"/>
-    <template id="wx_sample_console" template="wx_util_console"/>
-    
-
-    <define-rule name="wx-gui-plugin" extends="module">
-        <template template="wx_app_base"/>
-    </define-rule>
-
-
-    <!-- empty stubs for things that don't make sense for makefile.unx: -->
-    <template id="wx_append"/>
-    <template id="wx_append_base"/>
-
-    <define-rule name="wx-data" pseudo="1">
-        <define-tag name="files"/>
-        <define-tag name="dstdir"/>
-        <define-tag name="srcdir"/>
-    </define-rule>
-
-</makefile>

build/bakefiles/config.bkl

@@ -5,29 +5,6 @@
 
     <set var="BUILDING_LIB" overwrite="0">0</set>
 
-    <set var="CPP_DEFAULT_VALUE">
-        <if cond="FORMAT=='borland'">
-            cpp32 -Sr -oCON
-        </if>
-        <if cond="FORMAT=='mingw'">
-            $(DOLLAR)(CC) -E
-        </if>
-        <if cond="FORMAT=='msvc'">
-            $(DOLLAR)(CC) /EP /nologo
-        </if>
-        <if cond="FORMAT=='watcom'">
-            $(DOLLAR)(CC) -p
-        </if>
-    </set>
-    <option name="CPP">
-        <default-value>
-            $(CPP_DEFAULT_VALUE)
-        </default-value>
-        <description>
-            The C preprocessor
-        </description>
-    </option>
-
     <option name="SHARED">
         <values>0,1</values>
         <values-description>,DLL</values-description>
@@ -76,30 +53,12 @@
             Type of compiled binaries
         </description>
     </option>
-
-    <if cond="FORMAT=='msvc'">
-        <option name="TARGET_CPU">
-            <default-value>$(DOLLAR)(CPU)</default-value>
-            <description>
-The target processor architecture must be specified when it is not X86.
-This does not affect the compiler output, so you still need to make sure
-your environment is set up appropriately with the correct compiler in the
-PATH. Rather it affects some options passed to some of the common build
-utilities such as the resource compiler and the linker.
-
-Accepted values: AMD64, IA64.
-            </description>
-        </option>
-    </if>
-    <if cond="FORMAT!='msvc'">
-        <set var="TARGET_CPU"/>
-    </if>
-
+   
     <!-- FIXME: restore this once bakefile is fixed to not use
                 /Gm /GZ (incompatible with /O2) w/ debug-info -->
     <set var="DEBUG_INFO_DEFAULT">
-        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
     </set>
     -->
     <set var="DEBUG_INFO_DEFAULT">default</set>
@@ -181,14 +140,6 @@ Acts according to BUILD by default.
         </description>
     </option>
 
-    <option name="USE_MEDIA">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Build multimedia library (USE_GUI must be 1)?
-        </description>
-    </option>
-
     <option name="USE_XRC">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -197,22 +148,6 @@ Acts according to BUILD by default.
         </description>
     </option>
 
-    <option name="USE_AUI">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Build wxAUI library (USE_GUI must be 1)?
-        </description>
-    </option>
-
-    <option name="USE_RICHTEXT">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Build wxRichTextCtrl library (USE_GUI must be 1)?
-        </description>
-    </option>
-
     <option name="USE_OPENGL">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -229,14 +164,9 @@ Acts according to BUILD by default.
         </description>
     </option>
 
-    <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
-    <set var="USE_QA_DEFAULT">
-        <if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
-    </set>
     <option name="USE_QA">
         <values>0,1</values>
-        <default-value>$(USE_QA_DEFAULT)</default-value>
+        <default-value>0</default-value>
         <description>
             Build quality assurance classes library (USE_GUI must be 1)?
         </description>
@@ -266,24 +196,6 @@ Acts according to BUILD by default.
         </description>
     </option>
 
-    <option name="USE_CAIRO">
-        <values>0,1</values>
-        <default-value>0</default-value>
-        <description>
-            Enable wxCairoContext for platforms other than Linux/GTK.
-        </description>
-    </option>
-
-    <if cond="FORMAT!='autoconf'">
-        <option name="USE_GDIPLUS">
-            <values>0,1</values>
-            <default-value>0</default-value>
-            <description>
-                Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
-            </description>
-	</option>
-    </if>
-
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -347,7 +259,6 @@ to run the tests, include CppUnit library here.
         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_XML"/>
         <option name="EXTRALIBS_HTML"/>
-        <option name="EXTRALIBS_MEDIA"/>
         <option name="EXTRALIBS_ODBC"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
@@ -357,8 +268,6 @@ to run the tests, include CppUnit library here.
         <option name="SAMPLES_RPATH_FLAG"/>
         <option name="SAMPLES_RPATH_POSTLINK"/>
 
-        <option name="HEADER_PAD_OPTION"/>
-
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
@@ -366,13 +275,11 @@ to run the tests, include CppUnit library here.
         <option name="WITH_PLUGIN_SDL">
             <values>0,1</values>
         </option>
-
-        <option name="wx_top_builddir"/>
     </if>
 
 
     <!-- ================================================================== -->
-    <!--                     windows/dos/os2 compilers                      -->
+    <!--                         windows compilers                          -->
     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">
@@ -389,10 +296,8 @@ it if SHARED=1 unless you know what you are doing.
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
 
         <set var="TOOLKIT" overwrite="0">
+            <if cond="FORMAT!='msevc4prj'">MSW</if>
             <if cond="FORMAT=='msevc4prj'">WINCE</if>
-            <if cond="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
-            <if cond="PLATFORM_MSDOS=='1'">MGL</if>
-            <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
@@ -401,11 +306,10 @@ it if SHARED=1 unless you know what you are doing.
         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS_XML"/>
         <set var="EXTRALIBS_HTML"/>
-        <set var="EXTRALIBS_MEDIA"/>
         <set var="EXTRALIBS_ODBC"/>
         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRALIBS_OPENGL">
-            <if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
+            <if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
             <if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
         </set>
@@ -414,9 +318,10 @@ it if SHARED=1 unless you know what you are doing.
 
         <set var="WITH_PLUGIN_SDL">0</set>
 
-        <if cond="BUILDING_LIB=='1'">
-            <set-srcdir>../..</set-srcdir>
-        </if>
+        <set var="SRCDIR">
+            <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
+            <if cond="BUILDING_LIB=='0'">.</if>
+        </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
     </if>
 
@@ -450,10 +355,7 @@ Set the version of your Mingw installation here.
     <if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
-        <set var="USE_AUI">1</set>
-        <set var="USE_RICHTEXT">1</set>
         <set var="USE_HTML">1</set>
-        <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>
         <set var="USE_ODBC">1</set>
@@ -463,8 +365,6 @@ Set the version of your Mingw installation here.
         <set var="USE_EXCEPTIONS">1</set>
         <set var="USE_RTTI">1</set>
         <set var="USE_THREADS">1</set>
-        <set var="USE_CAIRO">0</set>
-        <if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
         <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>
@@ -501,19 +401,9 @@ Set the version of your Mingw installation here.
     <if cond="FORMAT=='msevc4prj'">
         <set var="WXUNIV">0</set>
         <set var="UNICODE">1</set>
-        <!-- Uploading debug reports from PDAs seems impractical -->
+	<!-- Uploading debug reports from PDAs seems impractical -->
         <set var="USE_QA">0</set>
         <set var="MONOLITHIC">1</set> <!-- sic! -->
-        <!-- RTTI and exceptions need separate cccrtti.lib with eVC4 -->
-        <set var="USE_RTTI">0</set>
-        <set var="USE_EXCEPTIONS">0</set>
-    </if>
-
-    <!-- Need for wxUniv within wxMGL: -->
-    <if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
-        <set var="WXUNIV">1</set>
-        <set var="USE_THREADS">0</set>
-        <set var="RUNTIME_LIBS">static</set>
     </if>
 
 </makefile>

build/bakefiles/expat.bkl

@@ -1,6 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
-
 <makefile>
 
     <if cond="FORMAT=='autoconf'">
@@ -31,12 +29,6 @@
         <define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             COMPILED_FROM_DSP
         </define>
-        <define cond="FORMAT=='watcom' and PLATFORM_OS2=='1'">
-            OS2_32
-        </define>
-        <define cond="FORMAT=='watcom' and PLATFORM_MSDOS=='1'">
-            __MSDOS__
-        </define>
         <cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
         <sources>
             src/expat/lib/xmlparse.c

build/bakefiles/formats/FORMATS.bkmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 
-<bakefile-manifest xmlns="http://www.bakefile.org/schema/bakefile-formats">
+<bakefile-manifest>
 
     <format id="wx24dsp">
         <description>

build/bakefiles/formats/rpmspec.bkl

@@ -4,14 +4,8 @@
 <makefile>
 
     <include file="presets/fake.bkl"/>
-
-    <set var="EOL_STYLE">unix</set>
     <set var="COMPILER">gcc</set>
 
-    <!-- fake.bkl defaults to win32 platform -->
-    <set var="PLATFORM_UNIX">1</set>
-    <set var="PLATFORM_WIN32">0</set>
-
     <set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>
 
     <output file="../../wxGTK.spec"

build/bakefiles/formats/rpmspec.empy

@@ -1,5 +1,5 @@
 # --- wxBase headers list begins here ---
-cat <<EOF >wxbase-headers.files
+cat <<EOF >wxbase-headers-list
 @('\n'.join(ALL_BASE_HEADERS.split()))
 EOF
 # --- wxBase headers list ends here ---

build/bakefiles/formats/wx24dsp.bkl

@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+
+    <include file="win32.bkl"/>
+    <set var="COMPILER">vc</set>
+    <include file="presets/fake.bkl"/>
+
+    <set var="ALL_SOURCES" eval="0">
+        $(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
+    </set>
+    
+    <output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
+    <set var="FORMAT_OUTPUT_VARIABLES">
+        ALL_SOURCES ALL_HEADERS
+    </set>
+    
+</makefile>

build/bakefiles/formats/wx24dsp.empy

@@ -0,0 +1,461 @@
+@{
+
+used = {}
+def mkgroup(lst, name, mask):
+    x = [s for s in lst if s.startswith(mask)]
+    for s in x:
+        used[s] = 1
+    x.sort()
+    return (name,x)
+    
+sources = ALL_SOURCES.split()
+SOURCES = []
+SOURCES.append(mkgroup(sources,'Common Files','src/common/'))
+SOURCES.append(mkgroup(sources,'Generic Files','src/generic/'))
+SOURCES.append(mkgroup(sources,'wxHTML Files','src/html/'))
+SOURCES.append(mkgroup(sources,'MSW Files','src/msw/'))
+otherSrcs = [x for x in sources if x not in used]
+otherSrcs.sort()
+SOURCES.append(('Other Sources', otherSrcs))
+
+headers = [x for x in ALL_HEADERS.split() if x.endswith('.h')]
+HEADERS = []
+HEADERS.append(mkgroup(headers,'MSW','wx/msw/'))
+HEADERS.append(mkgroup(headers,'Generic','wx/generic/'))
+HEADERS.append(mkgroup(headers,'HTML','wx/html/'))
+commonHdrs = [x for x in headers if x not in used]
+commonHdrs.sort()
+HEADERS.insert(0, ('Common', commonHdrs))
+
+}@
+# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=wxWindows - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseUnicode"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugUnicode"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswud.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../Release"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../Debug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info"
+# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDebug"
+# PROP Intermediate_Dir "ReleaseDebug"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
+# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "wxWindows - Win32 Release Unicode DLL"
+# Name "wxWindows - Win32 Debug Unicode DLL"
+# Name "wxWindows - Win32 Release Unicode"
+# Name "wxWindows - Win32 Debug Unicode"
+# Name "wxWindows - Win32 Release DLL"
+# Name "wxWindows - Win32 Debug DLL"
+# Name "wxWindows - Win32 Release"
+# Name "wxWindows - Win32 Debug"
+# Name "wxWindows - Win32 Release With Debug Info"
+# Begin Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File
+@[for group in SOURCES]@
+# Begin Group "@group[0]"
+
+# PROP Default_Filter ""
+@[for src in group[1]]@
+# Begin Source File
+
+SOURCE=.\@src[4:].replace('/','\\')
+@[if src=='src/msw/dummy.cpp']@
+# ADD CPP /Yc"wx/wxprec.h"
+@[end if]@
+@[if src.endswith('.c')]@
+# SUBTRACT CPP /YX /Yc /Yu
+@[end if]@
+# End Source File
+@[end for]@
+# End Group
+@[end for]@
+# Begin Group "Headers"
+
+# PROP Default_Filter ""
+# Begin Group "Setup"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\wx\msw\setup.h
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+
+# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+@[for group in HEADERS]@
+# Begin Group "@group[0]"
+
+# PROP Default_Filter ""
+@[for hdr in group[1]]@
+# Begin Source File
+
+SOURCE=..\include\@hdr.replace('/','\\')
+# End Source File
+@[end for]@
+# End Group
+@[end for]@
+# End Group
+# End Target
+# End Project

build/bakefiles/jpeg.bkl

@@ -26,53 +26,52 @@
         <dirname>$(LIBDIRNAME)</dirname>
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
-        <cflags-watcom>-wcd=136</cflags-watcom>
         <sources>
             src/jpeg/jcomapi.c
-            src/jpeg/jutils.c
-            src/jpeg/jerror.c
-            src/jpeg/jmemmgr.c
-            src/jpeg/jmemnobs.c
-            src/jpeg/jcapimin.c
-            src/jpeg/jcapistd.c
-            src/jpeg/jctrans.c
-            src/jpeg/jcparam.c
-            src/jpeg/jdatadst.c
-            src/jpeg/jcinit.c
-            src/jpeg/jcmaster.c
-            src/jpeg/jcmarker.c
-            src/jpeg/jcmainct.c
-            src/jpeg/jcprepct.c
-            src/jpeg/jccoefct.c
-            src/jpeg/jccolor.c
-            src/jpeg/jcsample.c
-            src/jpeg/jchuff.c
-            src/jpeg/jcphuff.c
-            src/jpeg/jcdctmgr.c
-            src/jpeg/jfdctfst.c
-            src/jpeg/jfdctflt.c
-            src/jpeg/jfdctint.c
-            src/jpeg/jdapimin.c
-            src/jpeg/jdapistd.c
-            src/jpeg/jdtrans.c
-            src/jpeg/jdatasrc.c
-            src/jpeg/jdmaster.c
-            src/jpeg/jdinput.c
-            src/jpeg/jdmarker.c
-            src/jpeg/jdhuff.c
-            src/jpeg/jdphuff.c
-            src/jpeg/jdmainct.c
-            src/jpeg/jdcoefct.c
-            src/jpeg/jdpostct.c
-            src/jpeg/jddctmgr.c
-            src/jpeg/jidctfst.c
-            src/jpeg/jidctflt.c
-            src/jpeg/jidctint.c
-            src/jpeg/jidctred.c
-            src/jpeg/jdsample.c
-            src/jpeg/jdcolor.c
-            src/jpeg/jquant1.c
-            src/jpeg/jquant2.c
+		    src/jpeg/jutils.c
+		    src/jpeg/jerror.c
+		    src/jpeg/jmemmgr.c
+		    src/jpeg/jmemnobs.c
+		    src/jpeg/jcapimin.c
+		    src/jpeg/jcapistd.c
+		    src/jpeg/jctrans.c
+		    src/jpeg/jcparam.c
+		    src/jpeg/jdatadst.c
+		    src/jpeg/jcinit.c
+		    src/jpeg/jcmaster.c
+		    src/jpeg/jcmarker.c
+		    src/jpeg/jcmainct.c
+		    src/jpeg/jcprepct.c
+		    src/jpeg/jccoefct.c
+		    src/jpeg/jccolor.c
+		    src/jpeg/jcsample.c
+		    src/jpeg/jchuff.c
+		    src/jpeg/jcphuff.c
+		    src/jpeg/jcdctmgr.c
+		    src/jpeg/jfdctfst.c
+		    src/jpeg/jfdctflt.c
+		    src/jpeg/jfdctint.c
+		    src/jpeg/jdapimin.c
+		    src/jpeg/jdapistd.c
+		    src/jpeg/jdtrans.c
+		    src/jpeg/jdatasrc.c
+		    src/jpeg/jdmaster.c
+		    src/jpeg/jdinput.c
+		    src/jpeg/jdmarker.c
+		    src/jpeg/jdhuff.c
+		    src/jpeg/jdphuff.c
+		    src/jpeg/jdmainct.c
+		    src/jpeg/jdcoefct.c
+		    src/jpeg/jdpostct.c
+		    src/jpeg/jddctmgr.c
+		    src/jpeg/jidctfst.c
+		    src/jpeg/jidctflt.c
+		    src/jpeg/jidctint.c
+		    src/jpeg/jidctred.c
+		    src/jpeg/jdsample.c
+		    src/jpeg/jdcolor.c
+		    src/jpeg/jquant1.c
+		    src/jpeg/jquant2.c
             src/jpeg/jdmerge.c
         </sources>
     </lib>

build/bakefiles/mac_bundles.bkl

@@ -31,9 +31,8 @@
             <if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
             <if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
         </set>
-
-        <add-target target="$(BUNDLE_TGT)" type="action"
-                    cond="target and PLATFORM_MACOSX=='1'"/>
+        
+        <add-target target="$(BUNDLE_TGT)" type="action"/>
         <modify-target target="$(BUNDLE_TGT)">
             <!-- required data: -->
             <depends>$(id)</depends>
@@ -65,7 +64,7 @@
         
         <!-- add pseudo target id_bundle: -->
         <add-target target="$(id)_bundle" type="phony"
-                    cond="target and PLATFORM_MACOSX=='1'"/>
+                    cond="PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(id)_bundle">
             <dependency-of>all</dependency-of>
             <depends>$(BUNDLE_TGT_REF)</depends>

build/bakefiles/monolithic.bkl

@@ -5,7 +5,7 @@
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
             $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
-            $(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC)
+            $(DBGRID_SRC) $(XRC_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
@@ -19,7 +19,6 @@
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
-        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
         <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
@@ -30,9 +29,6 @@
         <define>wxUSE_BASE=1</define>
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
-        <if cond="FORMAT=='watcom'">
-            <set var="LIB_PAGESIZE" overwrite="1">8192</set>
-        </if>
     </lib>