2.8.6 release

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

.cvsignore

@@ -0,0 +1,12 @@
+.gdb_history
+config.cache
+configarg.cache
+config.status
+wx-config
+config.log
+stamp-h.in
+Makefile
+setup.h
+*tags
+.DS_Store
+autom4te.cache

BuildCVS.txt

@@ -0,0 +1,262 @@
+------------------------------------------------------------------------
+                How to build the sources from CVS
+------------------------------------------------------------------------
+
+Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
+etc. alongside these instructions.
+
+I) Windows using plain makefiles
+----------------------------------------
+
+a) If using Microsoft Visual C++ 5.0 or 6.0
+
+Ensure that the command-line compiler and tools (including
+nmake) are installed and ready to run.  Depending on your
+installation there may be a batch file (commonly named VCVARS32.BAT)
+that needs to be run to set correct environment variables and PATH entries.
+
+Continue with item c) below.
+
+
+b) If using the MinGW or Cygwin compilers
+
+You can get MinGW from  http://www.mingw.org/
+
+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
+MinGW. Using Cygwin together with Windows makefile is no longer supported.
+
+If building with MinGW without configure:
+
+-> Set your path so that it includes the directory
+   where your compiler and tools reside
+
+-> Make sure you have GNU Make installed. It must be Windows native version.
+   Download it from http://www.mingw.org, the executable will be called
+   mingw32-make.exe.
+
+-> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
+   but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
+   have to change variable GCC_VERSION in config.gcc (see msw/install.txt
+   for details).
+
+If using configure, Unix instructions apply.
+
+
+c) Build instructions
+
+Assumming that you installed the wxWidgets sources
+into c:\wxWidgets:
+
+-> 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].
+
+   and std iostreams are disabled with
+   #define wxUSE_STD_IOSTREAM   0
+ 
+-> type: cd c:\wxWidgets\build\msw
+-> type: make -f makefile.gcc  (if using GNU tools)
+or type: nmake -f makefile.vc   (if using MS VC++)
+etc.
+
+   See also docs/msw/install.txt for additional compilation options.
+
+d) Borland (including free command line tools)
+   Download tools from http://www.borland.com/downloads/
+   
+   See docs/msw/install.txt for details; in brief:
+
+-> type cd c:\wxWidgets\build\msw
+-> type make -f makefile.bcc
+
+You can customize many things in the build process, detailed description is
+in docs/msw/install.txt.
+
+
+II) Unix ports
+--------------
+
+Building wxGTK or wxMotif completely without configure
+won't ever work, but there is now a new makefile system
+that works without libtool and automake, using only
+configure to create what is needed.
+
+In order to create configure, you need to have the
+GNU autoconf package (version > 2.54) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf). 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).
+
+-> type: export WXWIN=~/wxWidgets
+-> type: md mybuild
+-> type: cd mybuild
+-> type: ../configure --with-motif
+or type: ../configure --with-gtk
+-> type: make
+-> type: su <type root password>
+-> type: make install
+-> type: ldconfig
+-> type: exit
+
+Call configure with --disable-shared to create a static
+library. Calling "make uninstall" will remove the installed
+library and "make dist" will create a distribution (not
+yet complete).
+
+III) Windows using configure
+----------------------------------------
+
+wxWidgets 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).
+
+Of course, you can also build the library using plain makefiles (see
+section I).
+
+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.
+
+If you are checking out the CVS sources using cvs under Mac OS X and
+compiling under Classic Mac OS:
+
+- make sure that all text files have a Mac OS type of 'TEXT' otherwise
+  CodeWarrior may ignore them. Checking out the CVS sources using cvs
+  under Mac OS X creates untyped files which can lead to compilation
+  errors under CodeWarrior which are hard to track down.
+
+- convert the xml files to CodeWarrior binary projects using the supplied
+  AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
+
+V) MacOS X using configure and the Developer Tools
+----------------------------------------
+
+You need to have the Developer Tools installed. If this is not the case,
+you will need to register at the Apple Developer web site (this is a free
+registration) in order to download the Developer Tools installer.
+
+In order to create configure, you need to have the
+GNU autoconf package (version >= 2.54) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf).
+
+-> type: mkdir macbuild
+-> type: cd macbuild
+-> type: ../configure --with-mac
+or type: ../configure
+-> type: make
+
+VI) OS/2
+----------------------------------------
+No notes.
+
+VII) Unix->Windows cross-compiling using configure
+--------------------------------------------------
+
+First you'll need a cross-compiler; linux glibc binaries of MinGW and
+Cygwin (both based on egcs) can be found at
+ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
+based on the latest MinGW release can be found at
+http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
+Otherwise you can compile one yourself.
+
+[ A Note about Cygwin and MinGW: the main difference is that Cygwin
+binaries are always linked against cygwin.dll. This dll encapsulates most
+standard Unix C extensions, which is very handy if you're porting unix
+software to windows. However, wxMSW doesn't need this, so MinGW is
+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,
+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
+library; cross-compiling errors can be pretty obscure and you'll want to be
+sure that your configure setup is basically sound.)
+
+To cross compile the windows library, do
+-> cd win32
+(or whatever you called it)
+Now run configure. There are two ways to do this
+-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
+where --build= should read whatever platform you're building on. Configure
+will notice that build and host platforms differ, and automatically prepend
+i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
+The other way to run configure is by specifying the names of the binaries
+yourself:
+-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
+   DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
+   ../configure --host=i586-mingw32 --with-mingw
+
+(all assuming you're using MinGW)
+By default this will compile a DLL, if you want a static library,
+specify --disable-shared.
+
+Type
+-> make
+and wait, wait, wait. Don't leave the room, because the minute you do there
+will be a compile error :-)
+
+NB: if you are using a very old compiler you risk to get quite a few warnings
+    about "ANSI C++ forbids implicit conversion from 'void *'" in all places
+    where va_arg macro is used. This is due to a bug in (some versions of)
+    MinGW headers which may be corrected by upgrading your compier,
+    otherwise you might edit the file
+
+    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
+
+    (instead of egcs-2.91.57 you may have something different), searching for
+    the lines
+
+/* Define __gnuc_va_list.  */
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
+typedef char *__gnuc_va_list;
+#else
+typedef void *__gnuc_va_list;
+#endif
+#endif
+
+    and adding "|| defined(_WIN32)" to the list of platforms on which
+    __gnuc_va_list is char *.
+
+If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
+(or just libwx_msw.a if you opted for a static build).
+Now try building the minimal sample:
+
+-> cd samples/minimal
+-> make
+
+and run it with wine, for example (or copy to a Windows box)
+-> wine minimal.exe
+
+If all is well, do an install; from win32
+-> make install
+
+Native and cross-compiled installations can co-exist peacefully
+(as long as their widget sets differ), except for wx-config. You might
+want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
+
+Cross-compiling TODO:
+---------------------
+- resource compiling must be done manually for now (should/can we link the
+default wx resources into libwx_msw.a?) [ No we can't; the linker won't
+link it in... you have to supply an object file ]
+- static executables are HUGE -- there must be room for improvement.
+

BuildSVN.txt

@@ -1,244 +0,0 @@
-------------------------------------------------------------------------
-                How to build the sources from SVN
-------------------------------------------------------------------------
-
-Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
-etc. alongside these instructions.
-
-I) Windows using plain makefiles
-----------------------------------------
-
-a) If using Microsoft Visual C++ 5.0 or 6.0
-
-Ensure that the command-line compiler and tools (including
-nmake) are installed and ready to run.  Depending on your
-installation there may be a batch file (commonly named VCVARS32.BAT)
-that needs to be run to set correct environment variables and PATH entries.
-
-Continue with item c) below.
-
-
-b) If using the MinGW or Cygwin compilers
-
-You can get MinGW from  http://www.mingw.org/
-
-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
-MinGW. Using Cygwin together with Windows makefile is no longer supported.
-
-If building with MinGW without configure:
-
--> Set your path so that it includes the directory
-   where your compiler and tools reside
-
--> Make sure you have GNU Make installed. It must be Windows native version.
-   Download it from http://www.mingw.org, the executable will be called
-   mingw32-make.exe.
-
--> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
-   but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
-   have to change variable GCC_VERSION in config.gcc (see msw/install.txt
-   for details).
-
-If using configure, Unix instructions apply.
-
-
-c) Build instructions
-
-Assuming that you installed the wxWidgets sources into c:\wxWidgets:
-
--> 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].
-
-   and std iostreams are disabled with
-   #define wxUSE_STD_IOSTREAM   0
-
--> type: cd c:\wxWidgets\build\msw
--> type: make -f makefile.gcc  (if using GNU tools)
-or type: nmake -f makefile.vc   (if using MS VC++)
-etc.
-
-   See also docs/msw/install.txt for additional compilation options.
-
-d) Borland (including free command line tools)
-   Download tools from http://www.borland.com/downloads/
-
-   See docs/msw/install.txt for details; in brief:
-
--> type cd c:\wxWidgets\build\msw
--> type make -f makefile.bcc
-
-You can customize many things in the build process, detailed description is
-in docs/msw/install.txt.
-
-
-II) Unix ports
---------------
-
-Building wxGTK or wxMotif completely without configure
-won't ever work, but there is now a new makefile system
-that works without libtool and automake, using only
-configure to create what is needed.
-
-In order to create configure, you need to have the
-GNU autoconf package (version > 2.54) installed
-on your system and type run "autoconf" in the base
-directory (or run the autogen.sh script in the same
-directory, which just calls autoconf). Note that you usually don't
-need to do this because configure is included in SVN.
-
-Set WXWIN environment variable to the base directory such
-as ~/wxWidgets (this is actually not really needed).
-
--> type: export WXWIN=~/wxWidgets
--> type: md mybuild
--> type: cd mybuild
--> type: ../configure --with-motif
-or type: ../configure --with-gtk
--> type: make
--> type: su <type root password>
--> type: make install
--> type: ldconfig
--> type: exit
-
-Call configure with --disable-shared to create a static
-library. Calling "make uninstall" will remove the installed
-library and "make dist" will create a distribution (not
-yet complete).
-
-III) Windows using configure
-----------------------------------------
-
-wxWidgets 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).
-
-Of course, you can also build the library using plain makefiles (see
-section I).
-
-V) MacOS X using configure and the Developer Tools
-----------------------------------------
-
-You need to have the Developer Tools installed. If this is not the case,
-you will need to register at the Apple Developer web site (this is a free
-registration) in order to download the Developer Tools installer.
-
-In order to create configure, you need to have the
-GNU autoconf package (version >= 2.54) installed
-on your system and type run "autoconf" in the base
-directory (or run the autogen.sh script in the same
-directory, which just calls autoconf).
-
--> type: mkdir macbuild
--> type: cd macbuild
--> type: ../configure --with-mac
-or type: ../configure
--> type: make
-
-VI) OS/2
-----------------------------------------
-No notes.
-
-VII) Unix->Windows cross-compiling using configure
---------------------------------------------------
-
-First you'll need a cross-compiler; linux glibc binaries of MinGW and
-Cygwin (both based on egcs) can be found at
-ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
-based on the latest MinGW release can be found at
-http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
-Otherwise you can compile one yourself.
-
-[ A Note about Cygwin and MinGW: the main difference is that Cygwin
-binaries are always linked against cygwin.dll. This dll encapsulates most
-standard Unix C extensions, which is very handy if you're porting unix
-software to windows. However, wxMSW doesn't need this, so MinGW is
-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,
-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
-library; cross-compiling errors can be pretty obscure and you'll want to be
-sure that your configure setup is basically sound.)
-
-To cross compile the windows library, do
--> cd win32
-(or whatever you called it)
-Now run configure. There are two ways to do this
--> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
-where --build= should read whatever platform you're building on. Configure
-will notice that build and host platforms differ, and automatically prepend
-i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
-The other way to run configure is by specifying the names of the binaries
-yourself:
--> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
-   DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
-   ../configure --host=i586-mingw32 --with-mingw
-
-(all assuming you're using MinGW)
-By default this will compile a DLL, if you want a static library,
-specify --disable-shared.
-
-Type
--> make
-and wait, wait, wait. Don't leave the room, because the minute you do there
-will be a compile error :-)
-
-NB: if you are using a very old compiler you risk to get quite a few warnings
-    about "ANSI C++ forbids implicit conversion from 'void *'" in all places
-    where va_arg macro is used. This is due to a bug in (some versions of)
-    MinGW headers which may be corrected by upgrading your compier,
-    otherwise you might edit the file
-
-    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
-
-    (instead of egcs-2.91.57 you may have something different), searching for
-    the lines
-
-/* Define __gnuc_va_list.  */
-
-#ifndef __GNUC_VA_LIST
-#define __GNUC_VA_LIST
-#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
-typedef char *__gnuc_va_list;
-#else
-typedef void *__gnuc_va_list;
-#endif
-#endif
-
-    and adding "|| defined(_WIN32)" to the list of platforms on which
-    __gnuc_va_list is char *.
-
-If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
-(or just libwx_msw.a if you opted for a static build).
-Now try building the minimal sample:
-
--> cd samples/minimal
--> make
-
-and run it with wine, for example (or copy to a Windows box)
--> wine minimal.exe
-
-If all is well, do an install; from win32
--> make install
-
-Native and cross-compiled installations can co-exist peacefully
-(as long as their widget sets differ), except for wx-config. You might
-want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
-
-Cross-compiling TODO:
----------------------
-- resource compiling must be done manually for now (should/can we link the
-default wx resources into libwx_msw.a?) [ No we can't; the linker won't
-link it in... you have to supply an object file ]
-- static executables are HUGE -- there must be room for improvement.
-

acinclude.m4

@@ -132,7 +132,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])
@@ -143,6 +143,43 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
     AC_LANG_RESTORE
 ])
 
+dnl ---------------------------------------------------------------------------
+dnl WX_CPP_BOOL checks whether the C++ compiler has a built in bool type
+dnl
+dnl call WX_CPP_BOOL - will define HAVE_BOOL if the compiler supports bool
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([WX_CPP_BOOL],
+[
+  AC_CACHE_CHECK([if C++ compiler supports bool], wx_cv_cpp_bool,
+  [
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+
+    AC_TRY_COMPILE(
+      [
+      ],
+      [
+        bool b = true;
+
+        return 0;
+      ],
+      [
+        wx_cv_cpp_bool=yes
+      ],
+      [
+        wx_cv_cpp_bool=no
+      ]
+    )
+
+    AC_LANG_RESTORE
+  ])
+
+  if test "$wx_cv_cpp_bool" = "yes"; then
+    AC_DEFINE(HAVE_BOOL)
+  fi
+])
+
 dnl ---------------------------------------------------------------------------
 dnl WX_CPP_EXPLICIT checks whether the C++ compiler support the explicit
 dnl keyword and defines HAVE_EXPLICIT if this is the case
@@ -295,19 +332,35 @@ fi
 ])
 
 dnl ---------------------------------------------------------------------------
-dnl override AC_ARG_ENABLE/WITH to handle options defaults
+dnl override AC_ARG_ENABLE/WITH to cache the results in .cache file
 dnl ---------------------------------------------------------------------------
 
+AC_DEFUN([WX_ARG_CACHE_INIT],
+        [
+          wx_arg_cache_file="configarg.cache"
+          echo "loading argument cache $wx_arg_cache_file"
+          rm -f ${wx_arg_cache_file}.tmp
+          touch ${wx_arg_cache_file}.tmp
+          touch ${wx_arg_cache_file}
+        ])
+
+AC_DEFUN([WX_ARG_CACHE_FLUSH],
+        [
+          echo "saving argument cache $wx_arg_cache_file"
+          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)
-dnl
-dnl the default value (used if the option is not specified at all) is the value
-dnl of wxUSE_ALL_FEATURES (which is "yes" by default but can be changed by
-dnl giving configure --disable-all-features option)
 AC_DEFUN([WX_ARG_SYS_WITH],
         [
           AC_MSG_CHECKING([for --with-$1])
+          no_cache=0
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
@@ -323,10 +376,20 @@ AC_DEFUN([WX_ARG_SYS_WITH],
                         fi
                       ],
                       [
-                        AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
+                        LINE=`grep "$3" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
+          if test "$no_cache" != 1; then
+            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
+          fi
 
           if test "$$3" = yes; then
             AC_MSG_RESULT(yes)
@@ -341,20 +404,13 @@ AC_DEFUN([WX_ARG_SYS_WITH],
           fi
         ])
 
-dnl this macro simply checks for a command line argument
+dnl this macro checks for a command line argument and caches the result
 dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
 AC_DEFUN([WX_ARG_WITH],
         [
           withstring=$4
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$withstring" = xwithout; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
           AC_MSG_CHECKING([for --${withstring:-with}-$1])
+          no_cache=0
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
@@ -364,50 +420,39 @@ AC_DEFUN([WX_ARG_WITH],
                         fi
                       ],
                       [
-                        AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
+                        LINE=`grep "$3" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
-
+          if test "$no_cache" != 1; then
-          if test x"$withstring" = xwithout; then
+            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
-            if test $$3 = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$$3
           fi
 
-          AC_MSG_RESULT($result)
+          if test "$$3" = yes; then
+            AC_MSG_RESULT(yes)
+          else
+            AC_MSG_RESULT(no)
+          fi
         ])
 
-dnl same as WX_ARG_WITH but makes it clear that the option is enabled by default
-AC_DEFUN([WX_ARG_WITHOUT], [WX_ARG_WITH($1, [$2], $3, without)])
-
 dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
-dnl usage: WX_ARG_ENABLE(option, helpmessage, var, [enablestring], [default])
+dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
 dnl
-dnl enablestring can be omitted or a literal string "disable" and allows to
+dnl enablestring is a hack and allows to show "checking for --disable-foo"
-dnl show "checking for --disable-foo" message when running configure instead of
+dnl message when running configure instead of the default "checking for
-dnl the default "checking for --enable-foo" one whih is useful for the options
+dnl --enable-foo" one whih is useful for the options enabled by default
-dnl enabled by default
-dnl
-dnl the "default" argument can be omitted or contain the default value to use
-dnl for the option if it's unspecified
 AC_DEFUN([WX_ARG_ENABLE],
         [
           enablestring=$4
-          defaultval=$5
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
           AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
+          no_cache=0
           AC_ARG_ENABLE($1, [$2],
                         [
                           if test "$enableval" = yes; then
@@ -417,30 +462,28 @@ AC_DEFUN([WX_ARG_ENABLE],
                           fi
                         ],
                         [
-                          AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
+                          LINE=`grep "$3" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
                         ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
-
+          if test "$no_cache" != 1; then
-          if test x"$enablestring" = xdisable; then
+            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
-            if test $$3 = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$$3
           fi
 
-          AC_MSG_RESULT($result)
+          if test "$$3" = yes; then
+            AC_MSG_RESULT(yes)
+          else
+            AC_MSG_RESULT(no)
+          fi
         ])
 
-dnl the same as WX_ARG_ENABLE but makes it more clear that the option is
-dnl enabled by default
-AC_DEFUN([WX_ARG_DISABLE], [WX_ARG_ENABLE($1, [$2], $3, disable)])
-
-dnl same as WX_ARG_ENABLE but defaults to wxUSE_ALL_FEATURES instead of "yes"
-AC_DEFUN([WX_ARG_FEATURE], [WX_ARG_ENABLE($1, [$2], $3,, $wxUSE_ALL_FEATURES)])
 
 dnl Like WX_ARG_ENABLE but accepts a parameter.
 dnl
@@ -453,21 +496,32 @@ dnl
 dnl  --enable-foo       wxUSE_FOO=yes
 dnl  --disable-foo      wxUSE_FOO=no
 dnl  --enable-foo=bar   wxUSE_FOO=bar
-dnl  <not given>        wxUSE_FOO=$DEFAULT_wxUSE_FOO
+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'"
                         ],
                         [
-                          wx_cv_use_$1='$3='$DEFAULT_$3
+                          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])
         ])
@@ -707,3 +761,79 @@ if test "$enable_largefile" != no; then
 fi
 ])
 
+
+dnl Available from the GNU Autoconf Macro Archive at:
+dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_const_cast.html
+dnl
+AC_DEFUN([AC_CXX_CONST_CAST],
+[AC_CACHE_CHECK(whether the compiler supports const_cast<>,
+ac_cv_cxx_const_cast,
+[AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE(,[int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;],
+ ac_cv_cxx_const_cast=yes, ac_cv_cxx_const_cast=no)
+ AC_LANG_RESTORE
+])
+if test "$ac_cv_cxx_const_cast" = yes; then
+  AC_DEFINE(HAVE_CONST_CAST,,[define if the compiler supports const_cast<>])
+fi
+])
+
+dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_reinterpret_cast.html
+AC_DEFUN([AC_CXX_REINTERPRET_CAST],
+[AC_CACHE_CHECK(whether the compiler supports reinterpret_cast<>,
+ac_cv_cxx_reinterpret_cast,
+[AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <typeinfo>
+class Base { public : Base () {} virtual void f () = 0;};
+class Derived : public Base { public : Derived () {} virtual void f () {} };
+class Unrelated { public : Unrelated () {} };
+int g (Unrelated&) { return 0; }],[
+Derived d;Base& b=d;Unrelated& e=reinterpret_cast<Unrelated&>(b);return g(e);],
+ ac_cv_cxx_reinterpret_cast=yes, ac_cv_cxx_reinterpret_cast=no)
+ AC_LANG_RESTORE
+])
+if test "$ac_cv_cxx_reinterpret_cast" = yes; then
+  AC_DEFINE(HAVE_REINTERPRET_CAST,,
+            [define if the compiler supports reinterpret_cast<>])
+fi
+])
+
+dnl and http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_static_cast.html
+AC_DEFUN([AC_CXX_STATIC_CAST],
+[AC_CACHE_CHECK(whether the compiler supports static_cast<>,
+ac_cv_cxx_static_cast,
+[AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <typeinfo>
+class Base { public : Base () {} virtual void f () = 0; };
+class Derived : public Base { public : Derived () {} virtual void f () {} };
+int g (Derived&) { return 0; }],[
+Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);],
+ ac_cv_cxx_static_cast=yes, ac_cv_cxx_static_cast=no)
+ AC_LANG_RESTORE
+])
+if test "$ac_cv_cxx_static_cast" = yes; then
+  AC_DEFINE(HAVE_STATIC_CAST,, [define if the compiler supports static_cast<>])
+fi
+])
+
+dnl http://autoconf-archive.cryp.to/ac_cxx_dynamic_cast.html
+AC_DEFUN([AC_CXX_DYNAMIC_CAST],
+[AC_CACHE_CHECK(whether the compiler supports dynamic_cast<>,
+ac_cv_cxx_dynamic_cast,
+[AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <typeinfo>
+class Base { public : Base () {} virtual void f () = 0;};
+class Derived : public Base { public : Derived () {} virtual void f () {} };],[
+Derived d; Base& b=d; return dynamic_cast<Derived*>(&b) ? 0 : 1;],
+ ac_cv_cxx_dynamic_cast=yes, ac_cv_cxx_dynamic_cast=no)
+ AC_LANG_RESTORE
+])
+if test "$ac_cv_cxx_dynamic_cast" = yes; then
+  AC_DEFINE(HAVE_DYNAMIC_CAST,,[define if the compiler supports dynamic_cast<>])
+fi
+])
+

aclocal.m4

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,11 +12,7 @@
 # PARTICULAR PURPOSE.
 
 m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
-m4_include([build/aclocal/atomic_builtins.m4])
-m4_include([build/aclocal/ax_cflags_gcc_option.m4])
 m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
-m4_include([build/aclocal/ax_gcc_option.m4])
-m4_include([build/aclocal/ax_gxx_version.m4])
 m4_include([build/aclocal/bakefile-dllar.m4])
 m4_include([build/aclocal/bakefile-lang.m4])
 m4_include([build/aclocal/bakefile.m4])
@@ -25,5 +21,4 @@ m4_include([build/aclocal/gtk-2.0.m4])
 m4_include([build/aclocal/gtk.m4])
 m4_include([build/aclocal/pkg.m4])
 m4_include([build/aclocal/sdl.m4])
-m4_include([build/aclocal/visibility.m4])
 m4_include([acinclude.m4])

art/addbookm.xpm

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

art/back.xpm

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

art/cdrom.xpm

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

art/copy.xpm

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

art/cross.xpm

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

art/cut.xpm

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

art/deffile.xpm

@@ -1,54 +1,54 @@
-/* XPM */
+/* XPM */
-static const char *const deffile_xpm[] = {
+static char *deffile_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 16 32 1",
+"16 16 32 1",
-"= c #97C4E7",
+"= c #97C4E7",
-": c #72A8D2",
+": c #72A8D2",
-"1 c #FFFFFF",
+"1 c #FFFFFF",
-"w c #839CB5",
+"w c #839CB5",
-"X c #6B98B8",
+"X c #6B98B8",
-". c #5A89A6",
+". c #5A89A6",
-"@ c #3A749C",
+"@ c #3A749C",
-", c #D1E5F5",
+", c #D1E5F5",
-"< c #67A1CF",
+"< c #67A1CF",
-"> c #F1F4F7",
+"> c #F1F4F7",
-"e c #85A7BC",
+"e c #85A7BC",
-"% c #C3DDF1",
+"% c #C3DDF1",
-"0 c #749BB4",
+"0 c #749BB4",
-"2 c #7EA6C0",
+"2 c #7EA6C0",
-"; c #5F9BC8",
+"; c #5F9BC8",
-"  c None",
+"  c None",
-"O c #538DB3",
+"O c #538DB3",
-"- c #85BBE2",
+"- c #85BBE2",
-"$ c #D6DFE7",
+"$ c #D6DFE7",
-"9 c #EFF6FC",
+"9 c #EFF6FC",
-"o c #6591AE",
+"o c #6591AE",
-"4 c #F7FBFD",
+"4 c #F7FBFD",
-"8 c #FAFCFE",
+"8 c #FAFCFE",
-"6 c #DAEAF7",
+"6 c #DAEAF7",
-"7 c #E9F3FA",
+"7 c #E9F3FA",
-"q c #FDFDFE",
+"q c #FDFDFE",
-"3 c #E2EFF8",
+"3 c #E2EFF8",
-"# c #8EA9BC",
+"# c #8EA9BC",
-"& c #B6D5EE",
+"& c #B6D5EE",
-"* c #A5CCEA",
+"* c #A5CCEA",
-"5 c #F4F9FD",
+"5 c #F4F9FD",
-"+ c #4581AA",
+"+ c #4581AA",
-/* pixels */
+/* pixels */
-"  ..XooO+@#$    ",
+"  ..XooO+@#$    ",
-"  .%%&*=-;:;>   ",
+"  .%%&*=-;:;>   ",
-"  .,,%&*=<1=X>  ",
+"  .,,%&*=<1=X>  ",
-"  #%%%%&*211=X  ",
+"  #%%%%&*211=X  ",
-"  #3-----<oXoO  ",
+"  #3-----<oXoO  ",
-"  #3456,%&*=-O  ",
+"  #3456,%&*=-O  ",
-"  #3--------=O  ",
+"  #3--------=O  ",
-"  #355736,%&*o  ",
+"  #355736,%&*o  ",
-"  #3--------&o  ",
+"  #3--------&o  ",
-"  #38459736,%X  ",
+"  #38459736,%X  ",
-"  #3--------,0  ",
+"  #3--------,0  ",
-"  #31q84597360  ",
+"  #31q84597360  ",
-"  #3--------3w  ",
+"  #3--------3w  ",
-"  #3111q84597e  ",
+"  #3111q84597e  ",
-"  ##########e#  ",
+"  ##########e#  ",
-"                "
+"                "
-};
+};

art/delbookm.xpm

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

art/delete.xpm

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

art/dir_up.xpm

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

art/down.xpm

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

art/exefile.xpm

@@ -1,73 +1,73 @@
-/* XPM */
+/* XPM */
-static const char *const exefile_xpm[] = {
+static char *exefile_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 16 51 1",
+"16 16 51 1",
-"% c #E8E8EC",
+"% c #E8E8EC",
-"= c #E8E8ED",
+"= c #E8E8ED",
-"z c #CACAD4",
+"z c #CACAD4",
-"8 c #D9D9E1",
+"8 c #D9D9E1",
-"p c #D2D2DA",
+"p c #D2D2DA",
-"u c #E1E1E7",
+"u c #E1E1E7",
-"a c #D2D2DB",
+"a c #D2D2DB",
-"< c #E9E9ED",
+"< c #E9E9ED",
-"q c #DADAE1",
+"q c #DADAE1",
-"+ c #F1F1F4",
+"+ c #F1F1F4",
-"g c #D3D3DB",
+"g c #D3D3DB",
-"1 c #E2E2E8",
+"1 c #E2E2E8",
-"x c #D3D3DC",
+"x c #D3D3DC",
-"5 c #00A5FF",
+"5 c #00A5FF",
-"$ c #EAEAEE",
+"$ c #EAEAEE",
-"4 c #DBDBE2",
+"4 c #DBDBE2",
-"h c #CCCCD6",
+"h c #CCCCD6",
-"y c #D4D4DC",
+"y c #D4D4DC",
-"r c #E3E3E9",
+"r c #E3E3E9",
-"d c #D4D4DD",
+"d c #D4D4DD",
-"7 c #DCDCE2",
+"7 c #DCDCE2",
-": c #EBEBEF",
+": c #EBEBEF",
-"0 c #DCDCE3",
+"0 c #DCDCE3",
-"  c None",
+"  c None",
-"O c #F3F3F5",
+"O c #F3F3F5",
-"> c #E4E4E9",
+"> c #E4E4E9",
-"& c #F3F3F6",
+"& c #F3F3F6",
-"j c #D5D5DD",
+"j c #D5D5DD",
-"6 c #E4E4EA",
+"6 c #E4E4EA",
-". c #C6C6D5",
+". c #C6C6D5",
-"# c #ECECF0",
+"# c #ECECF0",
-"f c #CECED7",
+"f c #CECED7",
-"l c #CECED8",
+"l c #CECED8",
-"e c #D6D6DE",
+"e c #D6D6DE",
-"; c #EDEDF0",
+"; c #EDEDF0",
-"3 c #DEDEE4",
+"3 c #DEDEE4",
-", c #EDEDF1",
+", c #EDEDF1",
-"c c #CFCFD8",
+"c c #CFCFD8",
-"o c #F5F5F7",
+"o c #F5F5F7",
-"- c #E6E6EB",
+"- c #E6E6EB",
-"w c #D7D7DF",
+"w c #D7D7DF",
-"v c #C8C8D3",
+"v c #C8C8D3",
-"i c #DFDFE5",
+"i c #DFDFE5",
-"@ c #EEEEF2",
+"@ c #EEEEF2",
-"s c #D0D0D9",
+"s c #D0D0D9",
-"X c #9494AD",
+"X c #9494AD",
-"9 c #D8D8DF",
+"9 c #D8D8DF",
-"t c #D8D8E0",
+"t c #D8D8E0",
-"* c #EFEFF2",
+"* c #EFEFF2",
-"2 c #E0E0E6",
+"2 c #E0E0E6",
-"k c #D1D1DA",
+"k c #D1D1DA",
-/* pixels */
+/* pixels */
-"  ........X     ",
+"  ........X     ",
-"  .oO+@#$%XX    ",
+"  .oO+@#$%XX    ",
-"  .&+*#$=-XXX   ",
+"  .&+*#$=-XXX   ",
-"  .+*;:=->XXXX  ",
+"  .+*;:=->XXXX  ",
-"  .*,:<->1234X  ",
+"  .*,:<->1234X  ",
-"  .,5:5612378X  ",
+"  .,5:5612378X  ",
-"  5,5559530qwX  ",
+"  5,5559530qwX  ",
-"  55555550q9eX  ",
+"  55555550q9eX  ",
-" 5555r5555teyX  ",
+" 5555r5555teyX  ",
-"  55rui559eypX  ",
+"  55rui559eypX  ",
-" 5555i5555yasX  ",
+" 5555i5555yasX  ",
-"  5555555dasfX  ",
+"  5555555dasfX  ",
-"  5355595gsfhX  ",
+"  5355595gsfhX  ",
-"  .3595jgklhzX  ",
+"  .3595jgklhzX  ",
-"  .0qwjxkchzvX  ",
+"  .0qwjxkchzvX  ",
-"  XXXXXXXXXXXX  "
+"  XXXXXXXXXXXX  "
-};
+};

art/fileopen.xpm

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

art/filesave.xpm

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

art/filesaveas.xpm

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

art/find.xpm

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

art/findrepl.xpm

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

art/floppy.xpm

@@ -1,39 +1,39 @@
-/* XPM */
+/* XPM */
-static const char *const floppy_xpm[] = {
+static char *floppy_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 18 1",
+"16 15 18 1",
-"& c #E3E4E6",
+"& c #E3E4E6",
-"+ c #FFFFFF",
+"+ c #FFFFFF",
-". c #446A8C",
+". c #446A8C",
-"o c #697787",
+"o c #697787",
-"> c #5F666D",
+"> c #5F666D",
-"* c #B2B3B3",
+"* c #B2B3B3",
-"  c None",
+"  c None",
-", c #4B4C4D",
+", c #4B4C4D",
-"= c #DCDBDA",
+"= c #DCDBDA",
-"$ c #1B4467",
+"$ c #1B4467",
-": c #E4E9ED",
+": c #E4E9ED",
-"@ c #979BA0",
+"@ c #979BA0",
-"X c #203646",
+"X c #203646",
-"O c #215579",
+"O c #215579",
-"- c #545B63",
+"- c #545B63",
-"; c #636465",
+"; c #636465",
-"# c #CAD6E1",
+"# c #CAD6E1",
-"% c #7F8286",
+"% c #7F8286",
-/* pixels */
+/* pixels */
-"  .XoooooooXO   ",
+"  .XoooooooXO   ",
-"  .o+++++++.O   ",
+"  .o+++++++.O   ",
-"  .o+OOOOO+.O   ",
+"  .o+OOOOO+.O   ",
-"  .o+++++++.O   ",
+"  .o+++++++.O   ",
-"  .o@@@@@@@.O   ",
+"  .o@@@@@@@.O   ",
-"  ..........O   ",
+"  ..........O   ",
-"  ..#+++++#.O   ",
+"  ..#+++++#.O   ",
-"  ..+$O+++#.O   ",
+"  ..+$O+++#.O   ",
-"  ..+$O+++#.O   ",
+"  ..+$O+++#.O   ",
-" %&.........*%  ",
+" %&.........*%  ",
-"%=+++++++++++&% ",
+"%=+++++++++++&% ",
-"--------------; ",
+"--------------; ",
-"-:::::::::::::- ",
+"-:::::::::::::- ",
-"-:X:XXXXXXXXX:> ",
+"-:X:XXXXXXXXX:> ",
-"-*************, "
+"-*************, "
-};
+};

art/folder.xpm

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

art/folder_open.xpm

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

art/forward.xpm

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

art/gtk/error.xpm

@@ -1,58 +1,58 @@
-/* XPM */
+/* XPM */
-static const char *const error_xpm[] = {
+static char *error_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 4 1",
+"48 48 4 1",
-"  c None",
+"  c None",
-"X c #242424",
+"X c #242424",
-"o c #DCDF00",
+"o c #DCDF00",
-". c #C00000",
+". c #C00000",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                    .....                       ",
+"                    .....                       ",
-"                .............                   ",
+"                .............                   ",
-"              .................                 ",
+"              .................                 ",
-"             ...................                ",
+"             ...................                ",
-"           .......................              ",
+"           .......................              ",
-"          .........................             ",
+"          .........................             ",
-"         ...........................            ",
+"         ...........................            ",
-"         ...........................X           ",
+"         ...........................X           ",
-"        .............................X          ",
+"        .............................X          ",
-"       ...............................          ",
+"       ...............................          ",
-"       ...............................X         ",
+"       ...............................X         ",
-"      .................................X        ",
+"      .................................X        ",
-"      .................................X        ",
+"      .................................X        ",
-"      .................................XX       ",
+"      .................................XX       ",
-"      ...ooooooooooooooooooooooooooo...XX       ",
+"      ...ooooooooooooooooooooooooooo...XX       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      .................................XX       ",
+"      .................................XX       ",
-"      .................................XX       ",
+"      .................................XX       ",
-"       ...............................XXX       ",
+"       ...............................XXX       ",
-"       ...............................XXX       ",
+"       ...............................XXX       ",
-"        .............................XXX        ",
+"        .............................XXX        ",
-"         ...........................XXXX        ",
+"         ...........................XXXX        ",
-"         ...........................XXX         ",
+"         ...........................XXX         ",
-"          .........................XXX          ",
+"          .........................XXX          ",
-"           .......................XXXX          ",
+"           .......................XXXX          ",
-"            X...................XXXXX           ",
+"            X...................XXXXX           ",
-"             X.................XXXXX            ",
+"             X.................XXXXX            ",
-"               X.............XXXXX              ",
+"               X.............XXXXX              ",
-"                XXXX.....XXXXXXXX               ",
+"                XXXX.....XXXXXXXX               ",
-"                  XXXXXXXXXXXXX                 ",
+"                  XXXXXXXXXXXXX                 ",
-"                      XXXXX                     ",
+"                      XXXXX                     ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/gtk/info.xpm

@@ -1,63 +1,63 @@
-/* XPM */
+/* XPM */
-static const char *const info_xpm[] = {
+static char *info_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 9 1",
+"48 48 9 1",
-"$ c Black",
+"$ c Black",
-"O c #FFFFFF",
+"O c #FFFFFF",
-"@ c #808080",
+"@ c #808080",
-"+ c #000080",
+"+ c #000080",
-"o c #E8EB01",
+"o c #E8EB01",
-"  c None",
+"  c None",
-"X c #FFFF40",
+"X c #FFFF40",
-"# c #C0C0C0",
+"# c #C0C0C0",
-". c #ABAD01",
+". c #ABAD01",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                     .....                      ",
+"                     .....                      ",
-"                   ..XXXXX..                    ",
+"                   ..XXXXX..                    ",
-"                 ..XXXXXXXXo..                  ",
+"                 ..XXXXXXXXo..                  ",
-"                .XXXOXXXXXXXoo.                 ",
+"                .XXXOXXXXXXXoo.                 ",
-"                .XOOXXX+XXXXXo.                 ",
+"                .XOOXXX+XXXXXo.                 ",
-"               .XOOOXX+++XXXXoo.                ",
+"               .XOOOXX+++XXXXoo.                ",
-"               .XOOXXX+++XXXXXo.                ",
+"               .XOOXXX+++XXXXXo.                ",
-"              .XOOOXXX+++XXXXXXo.               ",
+"              .XOOOXXX+++XXXXXXo.               ",
-"              .XOOXXXX+++XXXXXXo.               ",
+"              .XOOXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXXX.               ",
+"              .XXXXXXX+++XXXXXXX.               ",
-"              .XXXXXXX+++XXXXXXo.               ",
+"              .XXXXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXoo.               ",
+"              .XXXXXXX+++XXXXXoo.               ",
-"               .XXXXXX+++XXXXXo.                ",
+"               .XXXXXX+++XXXXXo.                ",
-"               .XXXXXXX+XXXXXXo.                ",
+"               .XXXXXXX+XXXXXXo.                ",
-"                .XXXXXXXXXXXXo.                 ",
+"                .XXXXXXXXXXXXo.                 ",
-"                .XXXXX+++XXXoo.                 ",
+"                .XXXXX+++XXXoo.                 ",
-"                 .XXXX+++XXoo.                  ",
+"                 .XXXX+++XXoo.                  ",
-"                  .XXXXXXXXo.                   ",
+"                  .XXXXXXXXo.                   ",
-"                  ..XXXXXXo..                   ",
+"                  ..XXXXXXo..                   ",
-"                   .XXXXXo..                    ",
+"                   .XXXXXo..                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
+"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
+"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                    @@@@@@@                     ",
+"                    @@@@@@@                     ",
-"                      ###                       ",
+"                      ###                       ",
-"                      $$$                       ",
+"                      $$$                       ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/gtk/question.xpm

@@ -1,75 +1,75 @@
-/* XPM */
+/* XPM */
-static const char *const question_xpm[] = {
+static char *question_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 21 1",
+"48 48 21 1",
-". c Black",
+". c Black",
-"> c #696969",
+"> c #696969",
-"O c #1F1F00",
+"O c #1F1F00",
-"+ c #181818",
+"+ c #181818",
-"o c #F6F900",
+"o c #F6F900",
-"; c #3F3F00",
+"; c #3F3F00",
-"$ c #111111",
+"$ c #111111",
-"  c None",
+"  c None",
-"& c #202020",
+"& c #202020",
-"X c #AAAA00",
+"X c #AAAA00",
-"@ c #949400",
+"@ c #949400",
-": c #303030",
+": c #303030",
-"1 c #383838",
+"1 c #383838",
-"% c #2A2A00",
+"% c #2A2A00",
-", c #404040",
+", c #404040",
-"= c #B4B400",
+"= c #B4B400",
-"- c #484848",
+"- c #484848",
-"# c #151500",
+"# c #151500",
-"< c #9F9F00",
+"< c #9F9F00",
-"2 c #6A6A00",
+"2 c #6A6A00",
-"* c #353500",
+"* c #353500",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                   .........                    ",
+"                   .........                    ",
-"                 ...XXXXXXX..                   ",
+"                 ...XXXXXXX..                   ",
-"               ..XXXXoooooXXXO+                 ",
+"               ..XXXXoooooXXXO+                 ",
-"             ..XXooooooooooooX@..               ",
+"             ..XXooooooooooooX@..               ",
-"            ..XoooooooooooooooXX#.              ",
+"            ..XoooooooooooooooXX#.              ",
-"           $%XoooooooooooooooooXX#.             ",
+"           $%XoooooooooooooooooXX#.             ",
-"          &.XoooooooXXXXXXooooooXX..            ",
+"          &.XoooooooXXXXXXooooooXX..            ",
-"          .XooooooXX.$...$XXoooooX*.            ",
+"          .XooooooXX.$...$XXoooooX*.            ",
-"         $.XoooooX%.$     .*oooooo=..           ",
+"         $.XoooooX%.$     .*oooooo=..           ",
-"         .XooooooX..      -.XoooooX..           ",
+"         .XooooooX..      -.XoooooX..           ",
-"         .XoooooX..+       .XoooooX;.           ",
+"         .XoooooX..+       .XoooooX;.           ",
-"         ...XXXX..:        .XoooooX;.           ",
+"         ...XXXX..:        .XoooooX;.           ",
-"          ........        >.XoooooX;.           ",
+"          ........        >.XoooooX;.           ",
-"                          +.XoooooX..           ",
+"                          +.XoooooX..           ",
-"                         ,.Xoooooo<..           ",
+"                         ,.Xoooooo<..           ",
-"                        1#XooooooXO..           ",
+"                        1#XooooooXO..           ",
-"                       &#XooooooX2..            ",
+"                       &#XooooooX2..            ",
-"                      $%XooooooXX..             ",
+"                      $%XooooooXX..             ",
-"                     $%XooooooXX..              ",
+"                     $%XooooooXX..              ",
-"                    $%XooooooXX..               ",
+"                    $%XooooooXX..               ",
-"                   &.XooooooXX..                ",
+"                   &.XooooooXX..                ",
-"                   .XooooooXX..                 ",
+"                   .XooooooXX..                 ",
-"                  &.XoooooXX..                  ",
+"                  &.XoooooXX..                  ",
-"                  ..XooooXX..                   ",
+"                  ..XooooXX..                   ",
-"                  ..XooooX...                   ",
+"                  ..XooooX...                   ",
-"                  ..XXooXX..&                   ",
+"                  ..XXooXX..&                   ",
-"                  ...XXXXX..                    ",
+"                  ...XXXXX..                    ",
-"                   ........                     ",
+"                   ........                     ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                   .......                      ",
+"                   .......                      ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                 ..XXoooXX..                    ",
+"                 ..XXoooXX..                    ",
-"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
-"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
-"                 ..XXoooXX..                    ",
+"                 ..XXoooXX..                    ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                   .......                      ",
+"                   .......                      ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/gtk/warning.xpm

@@ -1,63 +1,63 @@
-/* XPM */
+/* XPM */
-static const char *const warning_xpm[] = {
+static char *warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 9 1",
+"48 48 9 1",
-"@ c Black",
+"@ c Black",
-"o c #A6A800",
+"o c #A6A800",
-"+ c #8A8C00",
+"+ c #8A8C00",
-"$ c #B8BA00",
+"$ c #B8BA00",
-"  c None",
+"  c None",
-"O c #6E7000",
+"O c #6E7000",
-"X c #DCDF00",
+"X c #DCDF00",
-". c #C00000",
+". c #C00000",
-"# c #373800",
+"# c #373800",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                      .                         ",
+"                      .                         ",
-"                     ...                        ",
+"                     ...                        ",
-"                     ...                        ",
+"                     ...                        ",
-"                    .....                       ",
+"                    .....                       ",
-"                   ...X..                       ",
+"                   ...X..                       ",
-"                   ..XXX..                      ",
+"                   ..XXX..                      ",
-"                  ...XXX...                     ",
+"                  ...XXX...                     ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                 ..XXXXXX...                    ",
+"                 ..XXXXXX...                    ",
-"                ...XXoO+XX..                    ",
+"                ...XXoO+XX..                    ",
-"                ..XXXO@#XXX..                   ",
+"                ..XXXO@#XXX..                   ",
-"               ..XXXXO@#XXX...                  ",
+"               ..XXXXO@#XXX...                  ",
-"              ...XXXXO@#XXXX..                  ",
+"              ...XXXXO@#XXXX..                  ",
-"              ..XXXXXO@#XXXX...                 ",
+"              ..XXXXXO@#XXXX...                 ",
-"             ...XXXXXo@OXXXXX..                 ",
+"             ...XXXXXo@OXXXXX..                 ",
-"            ...XXXXXXo@OXXXXXX..                ",
+"            ...XXXXXXo@OXXXXXX..                ",
-"            ..XXXXXXX$@OXXXXXX...               ",
+"            ..XXXXXXX$@OXXXXXX...               ",
-"           ...XXXXXXXX@XXXXXXXX..               ",
+"           ...XXXXXXXX@XXXXXXXX..               ",
-"          ...XXXXXXXXXXXXXXXXXX...              ",
+"          ...XXXXXXXXXXXXXXXXXX...              ",
-"          ..XXXXXXXXXXOXXXXXXXXX..              ",
+"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
+"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
+"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
+"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
+"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"       ..............................           ",
+"       ..............................           ",
-"       ..............................           ",
+"       ..............................           ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/harddisk.xpm

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

art/helpicon.xpm

@@ -1,44 +1,44 @@
-/* XPM */
+/* XPM */
-static const char *const helpicon_xpm[] = {
+static char *helpicon_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"32 32 6 1",
+"32 32 6 1",
-"  c Gray0",
+"  c Gray0",
-". c Blue",
+". c Blue",
-"X c #808080808080",
+"X c #808080808080",
-"o c #c0c0c0c0c0c0",
+"o c #c0c0c0c0c0c0",
-"O c Gray100",
+"O c Gray100",
-"+ c None",
+"+ c None",
-/* pixels */
+/* pixels */
-"+++++++++++XXXXXXXX+++++++++++++",
+"+++++++++++XXXXXXXX+++++++++++++",
-"++++++++XXXoOOOOOOoXXX++++++++++",
+"++++++++XXXoOOOOOOoXXX++++++++++",
-"++++++XXoOOOOOOOOOOOOoXX++++++++",
+"++++++XXoOOOOOOOOOOOOoXX++++++++",
-"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
+"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
-"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
+"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
-"+++XOOOOOOOo......oOOOOOOO +++++",
+"+++XOOOOOOOo......oOOOOOOO +++++",
-"++XOOOOOOOo.oOO....oOOOOOOO ++++",
+"++XOOOOOOOo.oOO....oOOOOOOO ++++",
-"+XoOOOOOOO..OOOO....OOOOOOOo +++",
+"+XoOOOOOOO..OOOO....OOOOOOOo +++",
-"+XOOOOOOOO....OO....OOOOOOOO X++",
+"+XOOOOOOOO....OO....OOOOOOOO X++",
-"XoOOOOOOOO....Oo....OOOOOOOOo X+",
+"XoOOOOOOOO....Oo....OOOOOOOOo X+",
-"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
+"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
-"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
+"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
-"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
+"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
-"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
+"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
-"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
+"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
-"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
+"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
-"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
+"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
-"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
+"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
-"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
+"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
-"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
+"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
-"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
+"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
-"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
+"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
-"++++++  oOOOOOOOOOOOOo  XXXX++++",
+"++++++  oOOOOOOOOOOOOo  XXXX++++",
-"+++++++X   oOOOOOOo   XXXXX+++++",
+"+++++++X   oOOOOOOo   XXXXX+++++",
-"++++++++XXX   oOOO XXXXXXX++++++",
+"++++++++XXX   oOOO XXXXXXX++++++",
-"++++++++++XXXX OOO XXXXX++++++++",
+"++++++++++XXXX OOO XXXXX++++++++",
-"+++++++++++++X OOO XX+++++++++++",
+"+++++++++++++X OOO XX+++++++++++",
-"+++++++++++++++ OO XX+++++++++++",
+"+++++++++++++++ OO XX+++++++++++",
-"++++++++++++++++ O XX+++++++++++",
+"++++++++++++++++ O XX+++++++++++",
-"+++++++++++++++++  XX+++++++++++",
+"+++++++++++++++++  XX+++++++++++",
-"++++++++++++++++++XXX+++++++++++",
+"++++++++++++++++++XXX+++++++++++",
-"+++++++++++++++++++XX+++++++++++"
+"+++++++++++++++++++XX+++++++++++"
-};
+};

art/home.xpm

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

art/htmbook.xpm

@@ -1,25 +1,25 @@
-/* XPM */
+/* XPM */
-static const char *const htmbook_xpm[] = {
+static char * htmbook_xpm[] = {
-"16 16 6 1",
+"16 16 6 1",
-" 	c None",
+" 	c None",
-".	c Black",
+".	c Black",
-"X	c #000080",
+"X	c #000080",
-"o	c #c0c0c0",
+"o	c #c0c0c0",
-"O	c #808080",
+"O	c #808080",
-"+	c Gray100",
+"+	c Gray100",
-"                ",
+"                ",
-"       ..       ",
+"       ..       ",
-"     ..XX.      ",
+"     ..XX.      ",
-"   ..XXXXX.     ",
+"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
+" ..XXXXXXXX.    ",
-".oXXXXXXXXXX.   ",
+".oXXXXXXXXXX.   ",
-".XoXXXXXXXXXX.  ",
+".XoXXXXXXXXXX.  ",
-".XXoXXXXXXXXXX. ",
+".XXoXXXXXXXXXX. ",
-".XXXoXXXXXXXXX..",
+".XXXoXXXXXXXXX..",
-".XXXXoXXXXXX..O ",
+".XXXXoXXXXXX..O ",
-" .XXXXoXXX..O+O ",
+" .XXXXoXXX..O+O ",
-"  .XXXXo..O++o..",
+"  .XXXXo..O++o..",
-"   .XXX.O+++o.. ",
+"   .XXX.O+++o.. ",
-"    .XX.o+o..   ",
+"    .XX.o+o..   ",
-"     .X.o..     ",
+"     .X.o..     ",
-"      ...       "};
+"      ...       "};

art/htmfoldr.xpm

@@ -1,25 +1,25 @@
-/* XPM */
+/* XPM */
-static const char *const htmfoldr_xpm[] = {
+static char * htmfoldr_xpm[] = {
-"16 16 6 1",
+"16 16 6 1",
-" 	c None",
+" 	c None",
-".	c Black",
+".	c Black",
-"X	c #000080",
+"X	c #000080",
-"o	c #c0c0c0",
+"o	c #c0c0c0",
-"O	c #808080",
+"O	c #808080",
-"+	c Gray100",
+"+	c Gray100",
-"                ",
+"                ",
-"       ..       ",
+"       ..       ",
-"     ..XX.      ",
+"     ..XX.      ",
-"   ..XXXXX.     ",
+"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
+" ..XXXXXXXX.    ",
-".oXXXXXXXXXX.   ",
+".oXXXXXXXXXX.   ",
-".XoXXXXXXXXXX.  ",
+".XoXXXXXXXXXX.  ",
-".XXoXXXXXXXXXX. ",
+".XXoXXXXXXXXXX. ",
-".XXXoXXXXXXXXX..",
+".XXXoXXXXXXXXX..",
-".XXXXoXXXXXX..O ",
+".XXXXoXXXXXX..O ",
-" .XXXXoXXX..O+O ",
+" .XXXXoXXX..O+O ",
-"  .XXXXo..O++o..",
+"  .XXXXo..O++o..",
-"   .XXX.O+++o.. ",
+"   .XXX.O+++o.. ",
-"    .XX.o+o..   ",
+"    .XX.o+o..   ",
-"     .X.o..     ",
+"     .X.o..     ",
-"      ...       "};
+"      ...       "};

art/htmoptns.xpm

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

art/htmpage.xpm

@@ -1,23 +1,23 @@
-/* XPM */
+/* XPM */
-static const char *const htmpage_xpm[] = {
+static char * htmpage_xpm[] = {
-"16 16 4 1",
+"16 16 4 1",
-" 	c None",
+" 	c None",
-".	c #808080",
+".	c #808080",
-"X	c Gray100",
+"X	c Gray100",
-"o	c Black",
+"o	c Black",
-"                ",
+"                ",
-"  ..........    ",
+"  ..........    ",
-"  .XXXXXXXX..   ",
+"  .XXXXXXXX..   ",
-"  .XXXXXXXXooo  ",
+"  .XXXXXXXXooo  ",
-"  .X......XXXo  ",
+"  .X......XXXo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
+"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
+"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
+"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
+"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  oooooooooooo  "};
+"  oooooooooooo  "};

art/htmsidep.xpm

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

art/listview.xpm

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

art/missimg.xpm

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

art/motif/error.xpm

@@ -1,58 +1,58 @@
-/* XPM */
+/* XPM */
-static const char *const error_xpm[] = {
+static char *error_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 4 1",
+"48 48 4 1",
-"  c None",
+"  c None",
-"X c #242424",
+"X c #242424",
-"o c #DCDF00",
+"o c #DCDF00",
-". c #C00000",
+". c #C00000",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                    .....                       ",
+"                    .....                       ",
-"                .............                   ",
+"                .............                   ",
-"              .................                 ",
+"              .................                 ",
-"             ...................                ",
+"             ...................                ",
-"           .......................              ",
+"           .......................              ",
-"          .........................             ",
+"          .........................             ",
-"         ...........................            ",
+"         ...........................            ",
-"         ...........................X           ",
+"         ...........................X           ",
-"        .............................X          ",
+"        .............................X          ",
-"       ...............................          ",
+"       ...............................          ",
-"       ...............................X         ",
+"       ...............................X         ",
-"      .................................X        ",
+"      .................................X        ",
-"      .................................X        ",
+"      .................................X        ",
-"      .................................XX       ",
+"      .................................XX       ",
-"      ...ooooooooooooooooooooooooooo...XX       ",
+"      ...ooooooooooooooooooooooooooo...XX       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      .................................XX       ",
+"      .................................XX       ",
-"      .................................XX       ",
+"      .................................XX       ",
-"       ...............................XXX       ",
+"       ...............................XXX       ",
-"       ...............................XXX       ",
+"       ...............................XXX       ",
-"        .............................XXX        ",
+"        .............................XXX        ",
-"         ...........................XXXX        ",
+"         ...........................XXXX        ",
-"         ...........................XXX         ",
+"         ...........................XXX         ",
-"          .........................XXX          ",
+"          .........................XXX          ",
-"           .......................XXXX          ",
+"           .......................XXXX          ",
-"            X...................XXXXX           ",
+"            X...................XXXXX           ",
-"             X.................XXXXX            ",
+"             X.................XXXXX            ",
-"               X.............XXXXX              ",
+"               X.............XXXXX              ",
-"                XXXX.....XXXXXXXX               ",
+"                XXXX.....XXXXXXXX               ",
-"                  XXXXXXXXXXXXX                 ",
+"                  XXXXXXXXXXXXX                 ",
-"                      XXXXX                     ",
+"                      XXXXX                     ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/motif/info.xpm

@@ -1,63 +1,63 @@
-/* XPM */
+/* XPM */
-static const char *const info_xpm[] = {
+static char *info_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 9 1",
+"48 48 9 1",
-"$ c Black",
+"$ c Black",
-"O c #FFFFFF",
+"O c #FFFFFF",
-"@ c #808080",
+"@ c #808080",
-"+ c #000080",
+"+ c #000080",
-"o c #E8EB01",
+"o c #E8EB01",
-"  c None",
+"  c None",
-"X c #FFFF40",
+"X c #FFFF40",
-"# c #C0C0C0",
+"# c #C0C0C0",
-". c #ABAD01",
+". c #ABAD01",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                     .....                      ",
+"                     .....                      ",
-"                   ..XXXXX..                    ",
+"                   ..XXXXX..                    ",
-"                 ..XXXXXXXXo..                  ",
+"                 ..XXXXXXXXo..                  ",
-"                .XXXOXXXXXXXoo.                 ",
+"                .XXXOXXXXXXXoo.                 ",
-"                .XOOXXX+XXXXXo.                 ",
+"                .XOOXXX+XXXXXo.                 ",
-"               .XOOOXX+++XXXXoo.                ",
+"               .XOOOXX+++XXXXoo.                ",
-"               .XOOXXX+++XXXXXo.                ",
+"               .XOOXXX+++XXXXXo.                ",
-"              .XOOOXXX+++XXXXXXo.               ",
+"              .XOOOXXX+++XXXXXXo.               ",
-"              .XOOXXXX+++XXXXXXo.               ",
+"              .XOOXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXXX.               ",
+"              .XXXXXXX+++XXXXXXX.               ",
-"              .XXXXXXX+++XXXXXXo.               ",
+"              .XXXXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXoo.               ",
+"              .XXXXXXX+++XXXXXoo.               ",
-"               .XXXXXX+++XXXXXo.                ",
+"               .XXXXXX+++XXXXXo.                ",
-"               .XXXXXXX+XXXXXXo.                ",
+"               .XXXXXXX+XXXXXXo.                ",
-"                .XXXXXXXXXXXXo.                 ",
+"                .XXXXXXXXXXXXo.                 ",
-"                .XXXXX+++XXXoo.                 ",
+"                .XXXXX+++XXXoo.                 ",
-"                 .XXXX+++XXoo.                  ",
+"                 .XXXX+++XXoo.                  ",
-"                  .XXXXXXXXo.                   ",
+"                  .XXXXXXXXo.                   ",
-"                  ..XXXXXXo..                   ",
+"                  ..XXXXXXo..                   ",
-"                   .XXXXXo..                    ",
+"                   .XXXXXo..                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
+"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
+"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                    @@@@@@@                     ",
+"                    @@@@@@@                     ",
-"                      ###                       ",
+"                      ###                       ",
-"                      $$$                       ",
+"                      $$$                       ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/motif/question.xpm

@@ -1,75 +1,75 @@
-/* XPM */
+/* XPM */
-static const char *const question_xpm[] = {
+static char *question_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 21 1",
+"48 48 21 1",
-". c Black",
+". c Black",
-"> c #696969",
+"> c #696969",
-"O c #1F1F00",
+"O c #1F1F00",
-"+ c #181818",
+"+ c #181818",
-"o c #F6F900",
+"o c #F6F900",
-"; c #3F3F00",
+"; c #3F3F00",
-"$ c #111111",
+"$ c #111111",
-"  c None",
+"  c None",
-"& c #202020",
+"& c #202020",
-"X c #AAAA00",
+"X c #AAAA00",
-"@ c #949400",
+"@ c #949400",
-": c #303030",
+": c #303030",
-"1 c #383838",
+"1 c #383838",
-"% c #2A2A00",
+"% c #2A2A00",
-", c #404040",
+", c #404040",
-"= c #B4B400",
+"= c #B4B400",
-"- c #484848",
+"- c #484848",
-"# c #151500",
+"# c #151500",
-"< c #9F9F00",
+"< c #9F9F00",
-"2 c #6A6A00",
+"2 c #6A6A00",
-"* c #353500",
+"* c #353500",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                   .........                    ",
+"                   .........                    ",
-"                 ...XXXXXXX..                   ",
+"                 ...XXXXXXX..                   ",
-"               ..XXXXoooooXXXO+                 ",
+"               ..XXXXoooooXXXO+                 ",
-"             ..XXooooooooooooX@..               ",
+"             ..XXooooooooooooX@..               ",
-"            ..XoooooooooooooooXX#.              ",
+"            ..XoooooooooooooooXX#.              ",
-"           $%XoooooooooooooooooXX#.             ",
+"           $%XoooooooooooooooooXX#.             ",
-"          &.XoooooooXXXXXXooooooXX..            ",
+"          &.XoooooooXXXXXXooooooXX..            ",
-"          .XooooooXX.$...$XXoooooX*.            ",
+"          .XooooooXX.$...$XXoooooX*.            ",
-"         $.XoooooX%.$     .*oooooo=..           ",
+"         $.XoooooX%.$     .*oooooo=..           ",
-"         .XooooooX..      -.XoooooX..           ",
+"         .XooooooX..      -.XoooooX..           ",
-"         .XoooooX..+       .XoooooX;.           ",
+"         .XoooooX..+       .XoooooX;.           ",
-"         ...XXXX..:        .XoooooX;.           ",
+"         ...XXXX..:        .XoooooX;.           ",
-"          ........        >.XoooooX;.           ",
+"          ........        >.XoooooX;.           ",
-"                          +.XoooooX..           ",
+"                          +.XoooooX..           ",
-"                         ,.Xoooooo<..           ",
+"                         ,.Xoooooo<..           ",
-"                        1#XooooooXO..           ",
+"                        1#XooooooXO..           ",
-"                       &#XooooooX2..            ",
+"                       &#XooooooX2..            ",
-"                      $%XooooooXX..             ",
+"                      $%XooooooXX..             ",
-"                     $%XooooooXX..              ",
+"                     $%XooooooXX..              ",
-"                    $%XooooooXX..               ",
+"                    $%XooooooXX..               ",
-"                   &.XooooooXX..                ",
+"                   &.XooooooXX..                ",
-"                   .XooooooXX..                 ",
+"                   .XooooooXX..                 ",
-"                  &.XoooooXX..                  ",
+"                  &.XoooooXX..                  ",
-"                  ..XooooXX..                   ",
+"                  ..XooooXX..                   ",
-"                  ..XooooX...                   ",
+"                  ..XooooX...                   ",
-"                  ..XXooXX..&                   ",
+"                  ..XXooXX..&                   ",
-"                  ...XXXXX..                    ",
+"                  ...XXXXX..                    ",
-"                   ........                     ",
+"                   ........                     ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                   .......                      ",
+"                   .......                      ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                 ..XXoooXX..                    ",
+"                 ..XXoooXX..                    ",
-"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
-"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
-"                 ..XXoooXX..                    ",
+"                 ..XXoooXX..                    ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                   .......                      ",
+"                   .......                      ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/motif/warning.xpm

@@ -1,63 +1,63 @@
-/* XPM */
+/* XPM */
-static const char *const warning_xpm[] = {
+static char *warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 9 1",
+"48 48 9 1",
-"@ c Black",
+"@ c Black",
-"o c #A6A800",
+"o c #A6A800",
-"+ c #8A8C00",
+"+ c #8A8C00",
-"$ c #B8BA00",
+"$ c #B8BA00",
-"  c None",
+"  c None",
-"O c #6E7000",
+"O c #6E7000",
-"X c #DCDF00",
+"X c #DCDF00",
-". c #C00000",
+". c #C00000",
-"# c #373800",
+"# c #373800",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                      .                         ",
+"                      .                         ",
-"                     ...                        ",
+"                     ...                        ",
-"                     ...                        ",
+"                     ...                        ",
-"                    .....                       ",
+"                    .....                       ",
-"                   ...X..                       ",
+"                   ...X..                       ",
-"                   ..XXX..                      ",
+"                   ..XXX..                      ",
-"                  ...XXX...                     ",
+"                  ...XXX...                     ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                 ..XXXXXX...                    ",
+"                 ..XXXXXX...                    ",
-"                ...XXoO+XX..                    ",
+"                ...XXoO+XX..                    ",
-"                ..XXXO@#XXX..                   ",
+"                ..XXXO@#XXX..                   ",
-"               ..XXXXO@#XXX...                  ",
+"               ..XXXXO@#XXX...                  ",
-"              ...XXXXO@#XXXX..                  ",
+"              ...XXXXO@#XXXX..                  ",
-"              ..XXXXXO@#XXXX...                 ",
+"              ..XXXXXO@#XXXX...                 ",
-"             ...XXXXXo@OXXXXX..                 ",
+"             ...XXXXXo@OXXXXX..                 ",
-"            ...XXXXXXo@OXXXXXX..                ",
+"            ...XXXXXXo@OXXXXXX..                ",
-"            ..XXXXXXX$@OXXXXXX...               ",
+"            ..XXXXXXX$@OXXXXXX...               ",
-"           ...XXXXXXXX@XXXXXXXX..               ",
+"           ...XXXXXXXX@XXXXXXXX..               ",
-"          ...XXXXXXXXXXXXXXXXXX...              ",
+"          ...XXXXXXXXXXXXXXXXXX...              ",
-"          ..XXXXXXXXXXOXXXXXXXXX..              ",
+"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
+"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
+"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
+"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
+"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"       ..............................           ",
+"       ..............................           ",
-"       ..............................           ",
+"       ..............................           ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/new.xpm

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

art/new_dir.xpm

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

art/paste.xpm

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

art/print.xpm

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

art/quit.xpm

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

art/redo.xpm

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

art/removable.xpm

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

art/repview.xpm

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

art/tick.xpm

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

art/tipicon.xpm

@@ -1,47 +1,47 @@
-/* XPM */
+/* XPM */
-static const char *const tipicon_xpm[] = {
+static char *tipicon_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"32 32 9 1",
+"32 32 9 1",
-"$ c Black",
+"$ c Black",
-"O c #FFFFFF",
+"O c #FFFFFF",
-"@ c #808080",
+"@ c #808080",
-"+ c #000080",
+"+ c #000080",
-"o c #E8EB01",
+"o c #E8EB01",
-"  c None",
+"  c None",
-"X c #FFFF40",
+"X c #FFFF40",
-"# c #C0C0C0",
+"# c #C0C0C0",
-". c #ABAD01",
+". c #ABAD01",
-/* pixels */
+/* pixels */
-"                                ",
+"                                ",
-"             .....              ",
+"             .....              ",
-"           ..XXXXX..            ",
+"           ..XXXXX..            ",
-"         ..XXXXXXXXo..          ",
+"         ..XXXXXXXXo..          ",
-"        .XXXOXXXXXXXoo.         ",
+"        .XXXOXXXXXXXoo.         ",
-"        .XOOXXX+XXXXXo.         ",
+"        .XOOXXX+XXXXXo.         ",
-"       .XOOOXX+++XXXXoo.        ",
+"       .XOOOXX+++XXXXoo.        ",
-"       .XOOXXX+++XXXXXo.        ",
+"       .XOOXXX+++XXXXXo.        ",
-"      .XOOOXXX+++XXXXXXo.       ",
+"      .XOOOXXX+++XXXXXXo.       ",
-"      .XOOXXXX+++XXXXXXo.       ",
+"      .XOOXXXX+++XXXXXXo.       ",
-"      .XXXXXXX+++XXXXXXX.       ",
+"      .XXXXXXX+++XXXXXXX.       ",
-"      .XXXXXXX+++XXXXXXo.       ",
+"      .XXXXXXX+++XXXXXXo.       ",
-"      .XXXXXXX+++XXXXXoo.       ",
+"      .XXXXXXX+++XXXXXoo.       ",
-"       .XXXXXX+++XXXXXo.        ",
+"       .XXXXXX+++XXXXXo.        ",
-"       .XXXXXXX+XXXXXXo.        ",
+"       .XXXXXXX+XXXXXXo.        ",
-"        .XXXXXXXXXXXXo.         ",
+"        .XXXXXXXXXXXXo.         ",
-"        .XXXXX+++XXXoo.         ",
+"        .XXXXX+++XXXoo.         ",
-"         .XXXX+++XXoo.          ",
+"         .XXXX+++XXoo.          ",
-"          .XXXXXXXXo.           ",
+"          .XXXXXXXXo.           ",
-"          ..XXXXXXo..           ",
+"          ..XXXXXXo..           ",
-"           .XXXXXo..            ",
+"           .XXXXXo..            ",
-"           @#######@            ",
+"           @#######@            ",
-"           @@@@@@@@@            ",
+"           @@@@@@@@@            ",
-"           @#######@            ",
+"           @#######@            ",
-"           @@@@@@@@@            ",
+"           @@@@@@@@@            ",
-"           @#######@            ",
+"           @#######@            ",
-"            @@@@@@@             ",
+"            @@@@@@@             ",
-"              ###               ",
+"              ###               ",
-"              $$$               ",
+"              $$$               ",
-"                                ",
+"                                ",
-"                                ",
+"                                ",
-"                                "
+"                                "
-};
+};

art/toparent.xpm

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

art/undo.xpm

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

art/up.xpm

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

art/wxwin16x16.xpm

@@ -1,161 +1,25 @@
-/* XPM */
+/* XPM */
-static const char *const wxwin16x16_xpm[] = {
+static char *wxwin16x16_xpm[] = {
-"16 16 142 2",
+"16 16 6 1",
-"  	c None",
+" 	c None",
-". 	c #7171C0",
+".	c #000000",
-"+ 	c #7D7DC7",
+"X	c #000084",
-"@ 	c #8181CE",
+"o	c #FFFFFF",
-"# 	c #7979CE",
+"O	c #FFFF00",
-"$ 	c #7171CE",
+"+	c #FF0000",
-"% 	c #6868CD",
+"                ",
-"& 	c #5050C0",
+"                ",
-"* 	c #7C7CCB",
+"    .......     ",
-"= 	c #D3D3FC",
+"    .XXXXX.     ",
-"- 	c #C0C0FF",
+"    .oXXXX.     ",
-"; 	c #B1B1FF",
+"    .oXXX.......",
-"> 	c #A4A4FF",
+".....oXXX.OOOOO.",
-", 	c #9696FF",
+".+++.XXXX.oOOOO.",
-"' 	c #6B6BE3",
+".o++......oOOOO.",
-") 	c #3E3EC0",
+".o++++.  .oOOOO.",
-"! 	c #7B7BD3",
+".o++++.  .OOOOO.",
-"~ 	c #CFCFFF",
+".+++++.  .......",
-"{ 	c #A7A7FF",
+".......         ",
-"] 	c #8989FF",
+"                ",
-"^ 	c #7B7BFF",
+"                ",
-"/ 	c #5E5EEB",
+"                "};
-"( 	c #3333BF",
-"_ 	c #6969D3",
-": 	c #BEBEFF",
-"< 	c #8E8EFF",
-"[ 	c #5E5EFF",
-"} 	c #4C4CFD",
-"| 	c #6464C6",
-"1 	c #A4A478",
-"2 	c #BFBF63",
-"3 	c #BFBF5C",
-"4 	c #BFBF56",
-"5 	c #BFBF51",
-"6 	c #C17474",
-"7 	c #BF7070",
-"8 	c #BF6969",
-"9 	c #BF6363",
-"0 	c #544AC7",
-"a 	c #A8A8FF",
-"b 	c #7070FF",
-"c 	c #5050FF",
-"d 	c #3F3FFF",
-"e 	c #8C8CBA",
-"f 	c #F6F6C8",
-"g 	c #FBFBBB",
-"h 	c #FBFBAE",
-"i 	c #FBFBA1",
-"j 	c #F9F993",
-"k 	c #D7D760",
-"l 	c #D28D8D",
-"m 	c #EEB8B8",
-"n 	c #EFAAAA",
-"o 	c #EF9E9E",
-"p 	c #7C5ABC",
-"q 	c #8D8DFF",
-"r 	c #4747FF",
-"s 	c #3535FF",
-"t 	c #2B2BFF",
-"u 	c #AAAAA7",
-"v 	c #FFFFD2",
-"w 	c #FFFFA9",
-"x 	c #FFFF9A",
-"y 	c #FFFF8D",
-"z 	c #FFFF80",
-"A 	c #E4E45B",
-"B 	c #E39F9F",
-"C 	c #FFCCCC",
-"D 	c #FFA9A9",
-"E 	c #FF9C9C",
-"F 	c #B469A0",
-"G 	c #3E3DE7",
-"H 	c #2828EF",
-"I 	c #1E1EEF",
-"J 	c #1515EF",
-"K 	c #A5A595",
-"L 	c #FFFFC2",
-"M 	c #FFFF8F",
-"N 	c #F7F765",
-"O 	c #F2F251",
-"P 	c #DBDB3A",
-"Q 	c #E48E8E",
-"R 	c #FFBABA",
-"S 	c #FF8E8E",
-"T 	c #FF8181",
-"U 	c #FF6868",
-"V 	c #E54D60",
-"W 	c #AC2E56",
-"X 	c #0B0BBF",
-"Y 	c #0606BF",
-"Z 	c #C8C85D",
-"` 	c #FEFEB1",
-" .	c #FEFE74",
-"..	c #F4F456",
-"+.	c #EFEF42",
-"@.	c #EFEF38",
-"#.	c #D7D725",
-"$.	c #E47676",
-"%.	c #FFA8A8",
-"&.	c #FF7373",
-"*.	c #FF5555",
-"=.	c #FF4343",
-"-.	c #FF3939",
-";.	c #DA2323",
-">.	c #CFCF3C",
-",.	c #F6F694",
-"'.	c #F0F047",
-").	c #EFEF2E",
-"!.	c #EFEF24",
-"~.	c #D7D715",
-"{.	c #E45757",
-"].	c #FF8888",
-"^.	c #FF4646",
-"/.	c #FF2F2F",
-"(.	c #FF2525",
-"_.	c #DA1414",
-":.	c #C3C328",
-"<.	c #EBEB55",
-"[.	c #ECEC2F",
-"}.	c #ECEC24",
-"|.	c #ECEC1A",
-"1.	c #EBEB10",
-"2.	c #CDCD06",
-"3.	c #DD3A3A",
-"4.	c #FF6060",
-"5.	c #FF1B1B",
-"6.	c #FE1111",
-"7.	c #D10707",
-"8.	c #B8B819",
-"9.	c #B7B715",
-"0.	c #B7B710",
-"a.	c #B7B70B",
-"b.	c #B7B706",
-"c.	c #B7B701",
-"d.	c #B7B700",
-"e.	c #BF1A1A",
-"f.	c #CC1919",
-"g.	c #CE1414",
-"h.	c #CE0E0E",
-"i.	c #CE0808",
-"j.	c #C90202",
-"k.	c #C00000",
-"                                ",
-"                                ",
-"        . + @ # $ % &           ",
-"        * = - ; > , ' )         ",
-"        ! ~ { , ] ^ / (         ",
-"        _ : < ^ [ } | 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 z N O P ",
-"Q R S T U V W X Y Z `  ...+.@.#.",
-"$.%.&.*.=.-.;.    >.,.'.@.).!.~.",
-"{.].^.-./.(._.    :.<.[.}.|.1.2.",
-"3.4./.(.5.6.7.    8.9.0.a.b.c.d.",
-"e.f.g.h.i.j.k.                  ",
-"                                ",
-"                                "};

art/wxwin32x32.xpm

@@ -1,442 +1,41 @@
-/* XPM */
+/* XPM */
-static const char *const wxwin32x32_xpm[] = {
+static char *wxwin32x32_xpm[] = {
-"32 32 407 2",
+"32 32 6 1",
-"  	c None",
+" 	c None",
-". 	c #7373C1",
+".	c #000000",
-"+ 	c #6E6EBF",
+"X	c #000084",
-"@ 	c #6B6BBF",
+"o	c #FFFFFF",
-"# 	c #6868BF",
+"O	c #FFFF00",
-"$ 	c #6464BF",
+"+	c #FF0000",
-"% 	c #6161BF",
+"                                ",
-"& 	c #5E5EBF",
+"                                ",
-"* 	c #5A5ABF",
+"                                ",
-"= 	c #5959C0",
+"                                ",
-"- 	c #7171C0",
+"                                ",
-"; 	c #7272C1",
+"        ..............          ",
-"> 	c #8686CE",
+"        .XXXXXXXXXXXX.          ",
-", 	c #8686D0",
+"        .XXXXXXXXXXXX.          ",
-"' 	c #8282D0",
+"        .XooXXXXXXXXX.          ",
-") 	c #7D7DD0",
+"        .XooXXXXXXXXX.          ",
-"! 	c #7979D0",
+"        .XooXXXXXXXXX.          ",
-"~ 	c #7575D0",
+"        .XooXXXXXX..............",
-"{ 	c #7171D0",
+"        .XooXXXXXX.OOOOOOOOOOOO.",
-"] 	c #6D6DD0",
+".........XooXXXXXX.OOOOOOOOOOOO.",
-"^ 	c #6666CD",
+".+++++++.XooXXXXXX.OooOOOOOOOOO.",
-"/ 	c #5151C1",
+".+++++++.XooXXXXXX.OooOOOOOOOOO.",
-"( 	c #4C4CBF",
+".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
-"_ 	c #7171C1",
+".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
-": 	c #7272C2",
+".+oo++++...........OooOOOOOOOOO.",
-"< 	c #C1C1F2",
+".+oo+++++++++.    .OooOOOOOOOOO.",
-"[ 	c #D7D7FF",
+".+oo+++++++++.    .OooOOOOOOOOO.",
-"} 	c #C9C9FF",
+".+oo+++++++++.    .OooOOOOOOOOO.",
-"| 	c #C2C2FF",
+".+oo+++++++++.    .OOOOOOOOOOOO.",
-"1 	c #BBBBFF",
+".+oo+++++++++.    .OOOOOOOOOOOO.",
-"2 	c #B4B4FF",
+".++++++++++++.    ..............",
-"3 	c #AEAEFF",
+".++++++++++++.                  ",
-"4 	c #A7A7FF",
+"..............                  ",
-"5 	c #A0A0FF",
+"                                ",
-"6 	c #9A9AFF",
+"                                ",
-"7 	c #8484F2",
+"                                ",
-"8 	c #4949C2",
+"                                ",
-"9 	c #4444C1",
+"                                "};
-"0 	c #6A6AC0",
-"a 	c #8989D4",
-"b 	c #DADAFF",
-"c 	c #C0C0FF",
-"d 	c #9393FF",
-"e 	c #8C8CFF",
-"f 	c #8686FF",
-"g 	c #5454D4",
-"h 	c #3E3EC0",
-"i 	c #6363BF",
-"j 	c #8686D8",
-"k 	c #D4D4FF",
-"l 	c #D2D2FF",
-"m 	c #7F7FFF",
-"n 	c #7878FF",
-"o 	c #4F4FD7",
-"p 	c #3737BF",
-"q 	c #5C5CBF",
-"r 	c #7D7DD8",
-"s 	c #CCCCFF",
-"t 	c #CACAFF",
-"u 	c #A8A8FF",
-"v 	c #7070FF",
-"w 	c #6B6BFF",
-"x 	c #4545D7",
-"y 	c #3030BF",
-"z 	c #5555BF",
-"A 	c #7373D8",
-"B 	c #C3C3FF",
-"C 	c #9C9CFF",
-"D 	c #8D8DFF",
-"E 	c #7777FF",
-"F 	c #6262FF",
-"G 	c #5252FF",
-"H 	c #4B4BFF",
-"I 	c #4848FF",
-"J 	c #3232D7",
-"K 	c #2626BF",
-"L 	c #4E4EBF",
-"M 	c #6A6AD8",
-"N 	c #B9B9FF",
-"O 	c #9090FF",
-"P 	c #6F6FFF",
-"Q 	c #5555FF",
-"R 	c #4646FF",
-"S 	c #4B4BF5",
-"T 	c #8282B4",
-"U 	c #93938E",
-"V 	c #B1B173",
-"W 	c #BFBF68",
-"X 	c #BFBF65",
-"Y 	c #BFBF62",
-"Z 	c #BFBF5E",
-"` 	c #BFBF5B",
-" .	c #BFBF57",
-"..	c #BFBF54",
-"+.	c #BFBF51",
-"@.	c #5858D8",
-"#.	c #B2B2FF",
-"$.	c #B1B1FF",
-"%.	c #8484FF",
-"&.	c #7272FF",
-"*.	c #6767FF",
-"=.	c #4F4FFF",
-"-.	c #4747FF",
-";.	c #4242FF",
-">.	c #4141FA",
-",.	c #ABAB8A",
-"'.	c #E4E4AA",
-").	c #F5F5C3",
-"!.	c #F6F6BE",
-"~.	c #F6F6B7",
-"{.	c #F6F6B1",
-"].	c #F6F6AB",
-"^.	c #F6F6A5",
-"/.	c #F6F69E",
-"(.	c #F6F698",
-"_.	c #F1F18C",
-":.	c #D0D05F",
-"<.	c #BFBF48",
-"[.	c #C17474",
-"}.	c #C07171",
-"|.	c #BF6E6E",
-"1.	c #BF6B6B",
-"2.	c #BF6868",
-"3.	c #BF6464",
-"4.	c #BF6161",
-"5.	c #7C498C",
-"6.	c #4242D8",
-"7.	c #A4A4FF",
-"8.	c #5959FF",
-"9.	c #3D3DFF",
-"0.	c #3838FF",
-"a.	c #6666CA",
-"b.	c #DCDC98",
-"c.	c #FFFFDD",
-"d.	c #FFFFD7",
-"e.	c #FFFFC0",
-"f.	c #FFFFB8",
-"g.	c #FFFFB2",
-"h.	c #FFFFAB",
-"i.	c #FFFFA4",
-"j.	c #FFFF9D",
-"k.	c #FFFF97",
-"l.	c #FFFF90",
-"m.	c #FBFB85",
-"n.	c #C2C244",
-"o.	c #C37676",
-"p.	c #DA9B9B",
-"q.	c #DF9F9F",
-"r.	c #DF9A9A",
-"s.	c #DF9494",
-"t.	c #DF8F8F",
-"u.	c #DF8A8A",
-"v.	c #B47094",
-"w.	c #3B3BD8",
-"x.	c #9292FF",
-"y.	c #5656FF",
-"z.	c #3333FF",
-"A.	c #2E2EFF",
-"B.	c #7070B6",
-"C.	c #E7E79F",
-"D.	c #FFFFDE",
-"E.	c #FFFFCF",
-"F.	c #FFFFB5",
-"G.	c #FFFF9E",
-"H.	c #FFFF8A",
-"I.	c #FFFF83",
-"J.	c #FFFF7C",
-"K.	c #C8C843",
-"L.	c #C06D6D",
-"M.	c #F1BEBE",
-"N.	c #FFDBDB",
-"O.	c #FFCBCB",
-"P.	c #FFC0C0",
-"Q.	c #FFBABA",
-"R.	c #FFB3B3",
-"S.	c #FFACAC",
-"T.	c #CE89AC",
-"U.	c #3333D7",
-"V.	c #8787FF",
-"W.	c #4D4DFF",
-"X.	c #2929FF",
-"Y.	c #2424FF",
-"Z.	c #6B6BB3",
-"`.	c #E7E795",
-" +	c #FFFFC6",
-".+	c #FFFFA8",
-"++	c #FFFF76",
-"@+	c #FFFF6F",
-"#+	c #C8C83C",
-"$+	c #C77474",
-"%+	c #FFD3D3",
-"&+	c #FFDEDE",
-"*+	c #FFC4C4",
-"=+	c #FFA6A6",
-"-+	c #FF9F9F",
-";+	c #F3929A",
-">+	c #2F29C3",
-",+	c #4C4CFB",
-"'+	c #6868FF",
-")+	c #3939FF",
-"!+	c #1F1FFF",
-"~+	c #1A1AFF",
-"{+	c #6666B0",
-"]+	c #E7E78A",
-"^+	c #FFFFD0",
-"/+	c #FFFFBD",
-"(+	c #FFFF9B",
-"_+	c #FFFF91",
-":+	c #FAFA6E",
-"<+	c #F5F55F",
-"[+	c #F5F558",
-"}+	c #F7F756",
-"|+	c #C7C732",
-"1+	c #C86E6E",
-"2+	c #FFC9C9",
-"3+	c #FFD7D7",
-"4+	c #FFB8B8",
-"5+	c #FF9898",
-"6+	c #FF9292",
-"7+	c #FF8B8B",
-"8+	c #B16098",
-"9+	c #2420C6",
-"0+	c #2222DD",
-"a+	c #1F1FDF",
-"b+	c #1B1BDF",
-"c+	c #1818DF",
-"d+	c #1414DF",
-"e+	c #1010DF",
-"f+	c #0C0CDF",
-"g+	c #5F5F9C",
-"h+	c #E7E77F",
-"i+	c #FFFFC9",
-"j+	c #FFFFB4",
-"k+	c #FFFF8E",
-"l+	c #FFFF7D",
-"m+	c #FEFE75",
-"n+	c #F4F45D",
-"o+	c #EFEF4F",
-"p+	c #EFEF4A",
-"q+	c #EFEF44",
-"r+	c #EFEF3F",
-"s+	c #BFBF22",
-"t+	c #C86666",
-"u+	c #FFBFBF",
-"v+	c #FFD0D0",
-"w+	c #FFADAD",
-"x+	c #FF8484",
-"y+	c #FF7E7E",
-"z+	c #FF7373",
-"A+	c #E75F70",
-"B+	c #B0457F",
-"C+	c #9A3776",
-"D+	c #5F1D7C",
-"E+	c #0C0CBF",
-"F+	c #0909BF",
-"G+	c #0707BF",
-"H+	c #0404BF",
-"I+	c #878766",
-"J+	c #E6E674",
-"K+	c #FFFFC2",
-"L+	c #FFFF82",
-"M+	c #FEFE6E",
-"N+	c #F3F355",
-"O+	c #EFEF45",
-"P+	c #EFEF40",
-"Q+	c #EFEF3B",
-"R+	c #EFEF36",
-"S+	c #BFBF1C",
-"T+	c #C85F5F",
-"U+	c #FFB4B4",
-"V+	c #FFA2A2",
-"W+	c #FF7575",
-"X+	c #FF5E5E",
-"Y+	c #FF5050",
-"Z+	c #FF4A4A",
-"`+	c #FF4545",
-" @	c #E73535",
-".@	c #BF2121",
-"+@	c #B7B733",
-"@@	c #DCDC55",
-"#@	c #FDFDB7",
-"$@	c #FFFFA2",
-"%@	c #FFFF75",
-"&@	c #FCFC64",
-"*@	c #F2F24E",
-"=@	c #EFEF31",
-"-@	c #EFEF2C",
-";@	c #BFBF16",
-">@	c #C85656",
-",@	c #FFAAAA",
-"'@	c #FFC2C2",
-")@	c #FF9797",
-"!@	c #FF7777",
-"~@	c #FF6E6E",
-"{@	c #FF5454",
-"]@	c #FF4040",
-"^@	c #FF3B3B",
-"/@	c #E72C2C",
-"(@	c #BF1919",
-"_@	c #B7B72E",
-":@	c #DADA48",
-"<@	c #F7F7A6",
-"[@	c #F6F689",
-"}@	c #F2F254",
-"|@	c #EFEF27",
-"1@	c #EFEF22",
-"2@	c #BFBF10",
-"3@	c #C84040",
-"4@	c #FF9A9A",
-"5@	c #FFBBBB",
-"6@	c #FF7171",
-"7@	c #FF6666",
-"8@	c #FF4E4E",
-"9@	c #FF4646",
-"0@	c #FF4141",
-"a@	c #FF3C3C",
-"b@	c #FF3737",
-"c@	c #FF3232",
-"d@	c #E72424",
-"e@	c #BF1414",
-"f@	c #B7B729",
-"g@	c #DADA3F",
-"h@	c #F7F7A1",
-"i@	c #F4F480",
-"j@	c #F0F047",
-"k@	c #EFEF1D",
-"l@	c #EFEF18",
-"m@	c #BFBF0B",
-"n@	c #C83636",
-"o@	c #FFABAB",
-"p@	c #FF7676",
-"q@	c #FF2D2D",
-"r@	c #FF2828",
-"s@	c #E71C1C",
-"t@	c #BF0F0F",
-"u@	c #B7B724",
-"v@	c #D1D132",
-"w@	c #F4F478",
-"x@	c #EFEF13",
-"y@	c #ECEC0E",
-"z@	c #BABA05",
-"A@	c #C83030",
-"B@	c #FF6161",
-"C@	c #FF2323",
-"D@	c #FF1E1E",
-"E@	c #E71414",
-"F@	c #BF0A0A",
-"G@	c #B8B820",
-"H@	c #B9B91F",
-"I@	c #DADA2C",
-"J@	c #E9E931",
-"K@	c #EAEA2A",
-"L@	c #EAEA25",
-"M@	c #EAEA20",
-"N@	c #EAEA1C",
-"O@	c #EAEA17",
-"P@	c #EAEA12",
-"Q@	c #EAEA0D",
-"R@	c #E5E508",
-"S@	c #C7C703",
-"T@	c #B7B701",
-"U@	c #C52929",
-"V@	c #FF5858",
-"W@	c #FF1919",
-"X@	c #FF1414",
-"Y@	c #E30C0C",
-"Z@	c #BF0606",
-"`@	c #B8B819",
-" #	c #B7B717",
-".#	c #B7B714",
-"+#	c #B7B711",
-"@#	c #B7B70F",
-"##	c #B7B70C",
-"$#	c #B7B70A",
-"%#	c #B7B707",
-"&#	c #B7B705",
-"*#	c #B7B702",
-"=#	c #B7B700",
-"-#	c #BF2020",
-";#	c #E63131",
-">#	c #FF5555",
-",#	c #FF3A3A",
-"'#	c #FF0F0F",
-")#	c #FA0A0A",
-"!#	c #C90303",
-"~#	c #C00202",
-"{#	c #C01C1C",
-"]#	c #CB1B1B",
-"^#	c #D01A1A",
-"/#	c #D01616",
-"(#	c #D01313",
-"_#	c #D01010",
-":#	c #D00D0D",
-"<#	c #D00A0A",
-"[#	c #D00707",
-"}#	c #CF0303",
-"|#	c #C30101",
-"1#	c #C00000",
-"2#	c #C21414",
-"3#	c #BF1111",
-"4#	c #BF0E0E",
-"5#	c #BF0C0C",
-"6#	c #BF0909",
-"7#	c #BF0707",
-"8#	c #BF0404",
-"9#	c #BF0202",
-"0#	c #C50000",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                      . + @ # $ % & * =                         ",
-"                  - ; > , ' ) ! ~ { ] ^ / (                     ",
-"                _ : < [ } | 1 2 3 4 5 6 7 8 9                   ",
-"                0 a b b c 2 3 4 5 6 d e f g h                   ",
-"                i j k l 2 4 5 6 d e f m n o p                   ",
-"                q r s t u 6 d e f m n v w x y                   ",
-"                z A B | C D f m E F G H I J K                   ",
-"                L M 1 N O m n P Q H R S T U V W X Y Z `  ...+.  ",
-"                p @.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.",
-"  [.}.|.1.2.3.4.5.6.6 7.&.8.I ;.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.O x.y.;.9.0.z.A.B.C.D.E.F.h.i.G.k.l.H.I.J.K.",
-"L.M.N.O.P.Q.R.S.T.U.V.e W.0.z.A.X.Y.Z.`.d. +.+G.k.l.H.I.J.++@+#+",
-"$+%+&+*+R.S.=+-+;+>+,+'+)+A.X.Y.!+~+{+]+^+/+(+_+H.I.J.:+<+[+}+|+",
-"1+2+3+4+=+-+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+I.l+m+n+o+p+q+r+s+",
-"t+u+v+w+5+6+7+x+y+z+A+B+C+D+E+F+G+H+I+J+K+h.L+++M+N+p+O+P+Q+R+S+",
-"T+U+2+V+7+x+y+W+X+Y+Z+`+ @.@        +@@@#@$@%@&@*@O+P+Q+R+=@-@;@",
-">@,@'@)@y+!@~@{@Z+`+]@^@/@(@        _@:@<@[@}@O+P+Q+R+=@-@|@1@2@",
-"3@4@5@7+6@7@8@9@0@a@b@c@d@e@        f@g@h@i@j@Q+R+=@-@|@1@k@l@m@",
-"n@y+o@p@{@9@0@a@b@c@q@r@s@t@        u@v@i@w@Q+=@-@|@1@k@l@x@y@z@",
-"A@p@-+B@0@a@b@c@q@r@C@D@E@F@        G@H@I@J@K@L@M@N@O@P@Q@R@S@T@",
-"U@7@4@V@b@c@q@r@C@D@W@X@Y@Z@          `@ #.#+#@###$#%#&#*#=#=#  ",
-"-#;#>#,#q@r@C@D@W@X@'#)#!#~#                                    ",
-"{#(@]#^#/#(#_#:#<#[#}#|#1#                                      ",
-"    2#3#4#5#6#7#8#9#1#0#                                        ",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                                                                "};

autogen.sh

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

build/.cvsignore

@@ -0,0 +1 @@
+wince

build/aclocal/atomic_builtins.m4

@@ -1,29 +0,0 @@
-
-dnl Checks for availability of GCC's atomic operations builtins.
-dnl Defines HAVE_GCC_ATOMIC_BUILTINS if available.
-
-AC_DEFUN([WX_ATOMIC_BUILTINS],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  if test -n "$GCC"; then
-    AC_MSG_CHECKING([for __sync_fetch_and_add and __sync_sub_and_fetch builtins])
-    AC_CACHE_VAL(wx_cv_cc_gcc_atomic_builtins, [
-      AC_TRY_LINK(
-        [],
-        [
-          unsigned int value=0;
-          /* wxAtomicInc doesn't use return value here */
-          __sync_fetch_and_add(&value, 2);
-          __sync_sub_and_fetch(&value, 1);
-          /* but wxAtomicDec does, so mimic that: */
-          unsigned int r2 = __sync_sub_and_fetch(&value, 1);
-        ],
-        wx_cv_cc_gcc_atomic_builtins=yes,
-        wx_cv_cc_gcc_atomic_builtins=no)
-      ])
-    AC_MSG_RESULT([$wx_cv_cc_gcc_atomic_builtins])
-    if test $wx_cv_cc_gcc_atomic_builtins = yes; then
-      AC_DEFINE([HAVE_GCC_ATOMIC_BUILTINS])
-    fi
-  fi
-])

build/aclocal/ax_cflags_gcc_option.m4

@@ -1,223 +0,0 @@
-# ===========================================================================
-#          http://autoconf-archive.cryp.to/ax_cflags_gcc_option.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CFLAGS_GCC_OPTION (optionflag [,[shellvar][,[A][,[NA]]])
-#
-# DESCRIPTION
-#
-#   AX_CFLAGS_GCC_OPTION(-fvomit-frame) would show a message as like
-#   "checking CFLAGS for gcc -fvomit-frame ... yes" and adds the optionflag
-#   to CFLAGS if it is understood. You can override the shellvar-default of
-#   CFLAGS of course. The order of arguments stems from the explicit macros
-#   like AX_CFLAGS_WARN_ALL.
-#
-#   The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add to
-#   CXXFLAGS - and it uses the autoconf setup for C++ instead of C (since it
-#   is possible to use different compilers for C and C++).
-#
-#   The macro is a lot simpler than any special AX_CFLAGS_* macro (or
-#   ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
-#   However, if you use this macro in a few places, it would be great if you
-#   would make up a new function-macro and submit it to the ac-archive.
-#
-#     - $1 option-to-check-for : required ("-option" as non-value)
-#     - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case)
-#     - $3 action-if-found : add value to shellvariable
-#     - $4 action-if-not-found : nothing
-#
-#   Note: in earlier versions, $1-$2 were swapped. We try to detect the
-#   situation and accept a $2=~/-/ as being the old option-to-check-for.
-#
-#   There are other variants that emerged from the original macro variant
-#   which did just test an option to be possibly added. However, some
-#   compilers accept an option silently, or possibly for just another option
-#   that was not intended. Therefore, we have to do a generic test for a
-#   compiler family. For gcc we check "-pedantic" being accepted which is
-#   also understood by compilers who just want to be compatible with gcc
-#   even when not being made from gcc sources.
-#
-#   See also: AX_CFLAGS_SUN_OPTION, AX_CFLAGS_HPUX_OPTION,
-#   AX_CFLAGS_AIX_OPTION, and AX_CFLAGS_IRIX_OPTION.
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#
-#   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, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. 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 the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Macro Archive. When you make and
-#   distribute a modified version of the Autoconf Macro, you may extend this
-#   special exception to the GPL to apply to your modified version as well.
-
-AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
-   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
-   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-dnl -------------------------------------------------------------------------
-
-AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
-   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
-   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-AC_DEFUN([AX_CFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
-[AX_CFLAGS_GCC_OPTION_NEW($@)],[AX_CFLAGS_GCC_OPTION_OLD($@)])])
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
-[AX_CXXFLAGS_GCC_OPTION_NEW($@)],[AX_CXXFLAGS_GCC_OPTION_OLD($@)])])

build/aclocal/ax_gcc_option.m4

@@ -1,130 +0,0 @@
-# ===========================================================================
-#             http://autoconf-archive.cryp.to/ax_gcc_option.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_GCC_OPTION(OPTION,EXTRA-OPTIONS,TEST-PROGRAM,ACTION-IF-SUCCESSFUL,ACTION-IF-NOT-SUCCESFUL)
-#
-# DESCRIPTION
-#
-#   AX_GCC_OPTION checks wheter gcc accepts the passed OPTION. If it accepts
-#   the OPTION then ACTION-IF-SUCCESSFUL will be executed, otherwise
-#   ACTION-IF-UNSUCCESSFUL.
-#
-#   NOTE: This macro will be obsoleted by AX_C_CHECK_FLAG AX_CXX_CHECK_FLAG,
-#   AX_CPP_CHECK_FLAG, AX_CXXCPP_CHECK_FLAG and AX_LD_CHECK_FLAG.
-#
-#   A typical usage should be the following one:
-#
-#     AX_GCC_OPTION([-fomit-frame-pointer],[],[],[
-#       AC_MSG_NOTICE([The option is supported])],[
-#       AC_MSG_NOTICE([No luck this time])
-#     ])
-#
-#   The macro doesn't discriminate between languages so, if you are testing
-#   for an option that works for C++ but not for C you should use '-x c++'
-#   as EXTRA-OPTIONS:
-#
-#     AX_GCC_OPTION([-fno-rtti],[-x c++],[],[ ... ],[ ... ])
-#
-#   OPTION is tested against the following code:
-#
-#     int main()
-#     {
-#             return 0;
-#     }
-#
-#   The optional TEST-PROGRAM comes handy when the default main() is not
-#   suited for the option being checked
-#
-#   So, if you need to test for -fstrict-prototypes option you should
-#   probably use the macro as follows:
-#
-#     AX_GCC_OPTION([-fstrict-prototypes],[-x c++],[
-#       int main(int argc, char ** argv)
-#       {
-#       	(void) argc;
-#       	(void) argv;
-#
-#       	return 0;
-#       }
-#     ],[ ... ],[ ... ])
-#
-#   Note that the macro compiles but doesn't link the test program so it is
-#   not suited for checking options that are passed to the linker, like:
-#
-#     -Wl,-L<a-library-path>
-#
-#   In order to avoid such kind of problems you should think about usinguse
-#   the AX_*_CHECK_FLAG family macros
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net>
-#   Copyright (c) 2008 Bogdan Drozdowski <bogdandr@op.pl>
-#
-#   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, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. 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 the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Macro Archive. When you make and
-#   distribute a modified version of the Autoconf Macro, you may extend this
-#   special exception to the GPL to apply to your modified version as well.
-
-AC_DEFUN([AX_GCC_OPTION], [
-  AC_REQUIRE([AC_PROG_CC])
-
-  AC_MSG_CHECKING([if gcc accepts $1 option])
-
-  AS_IF([ test "x$GCC" = "xyes" ],[
-    AS_IF([ test -z "$3" ],[
-      ax_gcc_option_test="int main()
-{
-	return 0;
-}"
-    ],[
-      ax_gcc_option_test="$3"
-    ])
-
-    # Dump the test program to file
-    cat <<EOF > conftest.c
-$ax_gcc_option_test
-EOF
-
-    # Dump back the file to the log, useful for debugging purposes
-    AC_TRY_COMMAND(cat conftest.c 1>&AS_MESSAGE_LOG_FD)
-
-    AS_IF([ AC_TRY_COMMAND($CC $2 $1 -c conftest.c 1>&AS_MESSAGE_LOG_FD) ],[
-   	        AC_MSG_RESULT([yes])
-    	$4
-    ],[
-   		AC_MSG_RESULT([no])
-    	$5
-    ])
-  ],[
-    AC_MSG_RESULT([no gcc available])
-  ])
-])

build/aclocal/ax_gxx_version.m4

@@ -1,67 +0,0 @@
-# ===========================================================================
-#             http://autoconf-archive.cryp.to/ax_gxx_version.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_GXX_VERSION
-#
-# DESCRIPTION
-#
-#   This macro retrieves the g++ version and returns it in the GXX_VERSION
-#   variable if available, an empty string otherwise.
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net>
-#
-#   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, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. 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 the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Macro Archive. When you make and
-#   distribute a modified version of the Autoconf Macro, you may extend this
-#   special exception to the GPL to apply to your modified version as well.
-
-AC_DEFUN([AX_GXX_VERSION], [
-  GXX_VERSION=""
-  AX_GCC_OPTION([-dumpversion],[],[],[
-    ax_gcc_version_option=yes
-  ],[
-    ax_gcc_version_option=no
-  ])
-  AS_IF([test "x$GXX" = "xyes"],[
-    AS_IF([test "x$ax_gxx_version_option" != "no"],[
-      AC_CACHE_CHECK([gxx version],[ax_cv_gxx_version],[
-        ax_cv_gxx_version="`$CXX -dumpversion`"
-        AS_IF([test "x$ax_cv_gxx_version" = "x"],[
-          ax_cv_gxx_version=""
-        ])
-      ])
-      GXX_VERSION=$ax_cv_gxx_version
-    ])
-  ])
-  AC_SUBST([GXX_VERSION])
-])

build/aclocal/bakefile-lang.m4

@@ -1,5 +1,5 @@
 dnl
-dnl  This file is part of Bakefile (http://www.bakefile.org)
+dnl  This file is part of Bakefile (http://bakefile.sourceforge.net)
 dnl
 dnl  Copyright (C) 2003-2007 Vaclav Slavik, David Elliott and others
 dnl
@@ -23,14 +23,76 @@ dnl  DEALINGS IN THE SOFTWARE.
 dnl
 dnl  $Id$
 dnl
-dnl  Compiler detection macros by David Elliott and Vadim Zeitlin
+dnl  Compiler detection macros by David Elliott
 dnl
 
 
 dnl ===========================================================================
-dnl Macros to detect different C/C++ compilers
+dnl Macros to detect non-GNU compilers (MetroWerks, XLC)
 dnl ===========================================================================
 
+dnl Based on autoconf _AC_LANG_COMPILER_GNU
+AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_MWERKS],
+[AC_CACHE_CHECK([whether we are using the Metrowerks _AC_LANG compiler],
+    [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks],
+    [AC_TRY_COMPILE([],[#ifndef __MWERKS__
+       choke me
+#endif
+],
+        [bakefile_compiler_mwerks=yes],
+        [bakefile_compiler_mwerks=no])
+    bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks=$bakefile_compiler_mwerks
+    ])
+])
+
+dnl Loosely based on autoconf AC_PROG_CC
+dnl TODO: Maybe this should wrap the call to AC_PROG_CC and be used instead.
+AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
+[AC_LANG_PUSH(C)
+_AC_BAKEFILE_LANG_COMPILER_MWERKS
+MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
+AC_LANG_POP(C)
+])
+
+dnl Loosely based on autoconf AC_PROG_CXX
+dnl TODO: Maybe this should wrap the call to AC_PROG_CXX and be used instead.
+AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
+[AC_LANG_PUSH(C++)
+_AC_BAKEFILE_LANG_COMPILER_MWERKS
+MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
+AC_LANG_POP(C++)
+])
+
+dnl Based on autoconf _AC_LANG_COMPILER_GNU
+AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_XLC],
+[AC_CACHE_CHECK([whether we are using the IBM xlC _AC_LANG compiler],
+    [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc],
+    [AC_TRY_COMPILE([],[#ifndef __xlC__
+       choke me
+#endif
+],
+        [bakefile_compiler_xlc=yes],
+        [bakefile_compiler_xlc=no])
+    bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$bakefile_compiler_xlc
+    ])
+])
+
+dnl Loosely based on autoconf AC_PROG_CC
+AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
+[AC_LANG_PUSH(C)
+_AC_BAKEFILE_LANG_COMPILER_XLC
+XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes`
+AC_LANG_POP(C)
+])
+
+dnl Loosely based on autoconf AC_PROG_CXX
+AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
+[AC_LANG_PUSH(C++)
+_AC_BAKEFILE_LANG_COMPILER_XLC
+XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes`
+AC_LANG_POP(C++)
+])
+
 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],
@@ -51,64 +113,12 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
          )
         ]
     )
+    AC_LANG_POP($2)
     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
@@ -147,29 +157,6 @@ 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],
 [
@@ -241,18 +228,7 @@ 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
@@ -272,23 +248,13 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
 
             Darwin)
                 AC_BAKEFILE_PROG_MW$1
-                if test "$MW$1" != "yes"; then
+                AC_BAKEFILE_PROG_XL$1
-                    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
                 ;;

build/aclocal/bakefile.m4

@@ -1,5 +1,5 @@
 dnl
-dnl  This file is part of Bakefile (http://www.bakefile.org)
+dnl  This file is part of Bakefile (http://bakefile.sourceforge.net)
 dnl
 dnl  Copyright (C) 2003-2007 Vaclav Slavik and others
 dnl
@@ -208,10 +208,6 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
     dlldir="$libdir"
 
     case "${BAKEFILE_HOST}" in
-        dnl PA-RISC HP systems used .sl but IA64 use ELF-64 and so use the
-        dnl standard .so extension
-        ia64-hp-hpux* )
-        ;;
         *-hp-hpux* )
             SO_SUFFIX="sl"
             SO_SUFFIX_MODULE="sl"
@@ -313,19 +309,27 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       ;;
 
       *-*-linux* )
-        dnl newer icc versions use -fPIC just as gcc does and, in fact, the
+        if test "x$GCC" != "xyes"; then
-        dnl newest (v10+) ones don't even understand -KPIC any longer
+            AC_CACHE_CHECK([for Intel compiler], bakefile_cv_prog_icc,
-        if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then
+            [
-            PIC_FLAG="-KPIC"
+                AC_TRY_COMPILE([],
-        elif test "x$SUNCXX" = "xyes"; then
+                    [
-            SHARED_LD_CC="${CC} -G -o"
+                        #ifndef __INTEL_COMPILER
-            SHARED_LD_CXX="${CXX} -G -o"
+                        This is not ICC
-            PIC_FLAG="-KPIC"
+                        #endif
+                    ],
+                    bakefile_cv_prog_icc=yes,
+                    bakefile_cv_prog_icc=no
+                )
+            ])
+            if test "$bakefile_cv_prog_icc" = "yes"; then
+                PIC_FLAG="-KPIC"
+            fi
         fi
       ;;
 
       *-*-solaris2* )
-        if test "x$SUNCXX" = xyes ; then
+        if test "x$GCC" != xyes ; then
             SHARED_LD_CC="${CC} -G -o"
             SHARED_LD_CXX="${CXX} -G -o"
             PIC_FLAG="-KPIC"
@@ -337,7 +341,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
         chmod +x shared-ld-sh
 
         SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
+        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
 
         dnl Most apps benefit from being fully binded (its faster and static
         dnl variables initialized at startup work).
@@ -495,13 +499,8 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
-      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
-      *-*-k*bsd*-gnu | *-*-mirbsd* )
+        SONAME_FLAG="-Wl,-soname,"
-        if test "x$SUNCXX" = "xyes"; then
-            SONAME_FLAG="-h "
-        else
-            SONAME_FLAG="-Wl,-soname,"
-        fi
         USE_SOVERSION=1
         USE_SOVERLINUX=1
         USE_SOSYMLINKS=1
@@ -646,21 +645,18 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
     AC_CHECK_TOOL(STRIP, strip, :)
     AC_CHECK_TOOL(NM, nm, :)
 
-    dnl This check is necessary because "install -d" doesn't exist on
+    case ${BAKEFILE_HOST} in
-    dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80
+        *-hp-hpux* )
-    AC_MSG_CHECKING([for command to install directories])
+            dnl HP-UX install doesn't handle the "-d" switch so don't
-    INSTALL_TEST_DIR=acbftest$$
+            dnl use it there
-    $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
+            INSTALL_DIR="mkdir -p"
-    if test $? = 0 -a -d $INSTALL_TEST_DIR; then
+            ;;
-        rmdir $INSTALL_TEST_DIR
+        * )
-        dnl we must refer to makefile's $(INSTALL) variable and not
+            dnl we must refer to makefile's $(INSTALL) variable and not
-        dnl current value of shell variable, hence the single quoting:
+            dnl current value of shell variable, hence the single quoting:
-        INSTALL_DIR='$(INSTALL) -d'
+            INSTALL_DIR='$(INSTALL) -d'
-        AC_MSG_RESULT([$INSTALL -d])
+            ;;
-    else
+    esac
-        INSTALL_DIR="mkdir -p"
-        AC_MSG_RESULT([mkdir -p])
-    fi
     AC_SUBST(INSTALL_DIR)
 
     LDFLAGS_GUI=
@@ -749,19 +745,20 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
                     GCC_PCH=1
                 ],
                 [
-                    if test "$INTELCXX8" = "yes"; then
+                    AC_TRY_COMPILE([],
-                        AC_MSG_RESULT([yes])
+                        [
-                        ICC_PCH=1
+                            #if !defined(__INTEL_COMPILER) || \
-                        if test "$INTELCXX10" = "yes"; then
+                                (__INTEL_COMPILER < 800)
-                            ICC_PCH_CREATE_SWITCH="-pch-create"
+                                There is no PCH support
-                            ICC_PCH_USE_SWITCH="-pch-use"
+                            #endif
-                        else
+                        ],
-                            ICC_PCH_CREATE_SWITCH="-create-pch"
+                        [
-                            ICC_PCH_USE_SWITCH="-use-pch"
+                            AC_MSG_RESULT([yes])
-                        fi
+                            ICC_PCH=1
-                    else
+                        ],
-                        AC_MSG_RESULT([no])
+                        [
-                    fi
+                            AC_MSG_RESULT([no])
+                        ])
                 ])
             if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
                 USE_PCH=1
@@ -777,8 +774,6 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
 
     AC_SUBST(GCC_PCH)
     AC_SUBST(ICC_PCH)
-    AC_SUBST(ICC_PCH_CREATE_SWITCH)
-    AC_SUBST(ICC_PCH_USE_SWITCH)
     AC_SUBST(BK_MAKE_PCH)
 ])
 
@@ -809,12 +804,6 @@ AC_DEFUN([AC_BAKEFILE],
 [
     AC_PREREQ([2.58])
 
-    dnl We need to always run C/C++ compiler tests, but it's also possible
-    dnl for the user to call these macros manually, hence this instead of
-    dnl simply calling these macros. See http://www.bakefile.org/ticket/64
-    AC_REQUIRE([AC_BAKEFILE_PROG_CC])
-    AC_REQUIRE([AC_BAKEFILE_PROG_CXX])
-
     if test "x$BAKEFILE_HOST" = "x"; then
                if test "x${host}" = "x" ; then
                        AC_MSG_ERROR([You must call the autoconf "CANONICAL_HOST" macro in your configure.ac (or .in) file.])
@@ -835,11 +824,7 @@ AC_DEFUN([AC_BAKEFILE],
     AC_BAKEFILE_DEPS
     AC_BAKEFILE_RES_COMPILERS
 
-    dnl OBJCFLAGS is set by Autoconf, but OBJCXXFLAGS is not:
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.2"
-    AC_SUBST(OBJCXXFLAGS)
-
-
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.6"
 
     dnl includes autoconf_inc.m4:
     $1
@@ -867,20 +852,24 @@ D='$'
 cat <<EOF >bk-deps
 #!/bin/sh
 
-# This script is part of Bakefile (http://www.bakefile.org) autoconf
+# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
 # script. It is used to track C/C++ files dependencies in portable way.
 #
 # Permission is given to use this file in any way.
 
 DEPSMODE=${DEPSMODE}
+DEPSDIR=.deps
 DEPSFLAG="${DEPSFLAG}"
-DEPSDIRBASE=.deps
+
+mkdir -p ${D}DEPSDIR
 
 if test ${D}DEPSMODE = gcc ; then
     ${D}* ${D}{DEPSFLAG}
     status=${D}?
-
+    if test ${D}{status} != 0 ; then
-    # determine location of created files:
+        exit ${D}{status}
+    fi
+    # move created file to the location we want it in:
     while test ${D}# -gt 0; do
         case "${D}1" in
             -o )
@@ -895,37 +884,24 @@ if test ${D}DEPSMODE = gcc ; then
         esac
         shift
     done
-    objfilebase=\`basename ${D}objfile\`
-    builddir=\`dirname ${D}objfile\`
     depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
     depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
-    depsdir=${D}builddir/${D}DEPSDIRBASE
-    mkdir -p ${D}depsdir
-
-    # if the compiler failed, we're done:
-    if test ${D}{status} != 0 ; then
-        rm -f ${D}depfile
-        exit ${D}{status}
-    fi
-
-    # move created file to the location we want it in:
     if test -f ${D}depfile ; then
-        sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
+        sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
         rm -f ${D}depfile
     else
         # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
-        depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\`
+        depfile=\`basename ${D}objfile | sed -e 's/\\..*${D}/.d/g'\`
         if test ! -f ${D}depfile ; then
             # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
             depfile="${D}objfile.d"
         fi
         if test -f ${D}depfile ; then
-            sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
+            sed -e "/^${D}objfile/!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
             rm -f ${D}depfile
         fi
     fi
     exit 0
-
 elif test ${D}DEPSMODE = mwcc ; then
     ${D}* || exit ${D}?
     # Run mwcc again with -MM and redirect into the dep file we want
@@ -945,15 +921,8 @@ elif test ${D}DEPSMODE = mwcc ; then
         fi
         prevarg="${D}arg"
     done
-
+    ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d
-    objfilebase=\`basename ${D}objfile\`
-    builddir=\`dirname ${D}objfile\`
-    depsdir=${D}builddir/${D}DEPSDIRBASE
-    mkdir -p ${D}depsdir
-
-    ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
     exit 0
-
 elif test ${D}DEPSMODE = unixcc; then
     ${D}* || exit ${D}?
     # Run compiler again with deps flag and redirect into the dep file.
@@ -974,15 +943,8 @@ elif test ${D}DEPSMODE = unixcc; then
         esac
         shift
     done
-
+    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
-    objfilebase=\`basename ${D}objfile\`
-    builddir=\`dirname ${D}objfile\`
-    depsdir=${D}builddir/${D}DEPSDIRBASE
-    mkdir -p ${D}depsdir
-
-    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d
     exit 0
-
 else
     ${D}*
     exit ${D}?
@@ -1013,10 +975,6 @@ objects=""
 linking_flag="-dynamiclib"
 ldargs="-r -keep_private_externs -nostdlib"
 
-if test "x${D}CXX" = "x"; then
-    CXX="c++"
-fi
-
 while test ${D}# -gt 0; do
     case ${D}1 in
 
@@ -1029,12 +987,6 @@ while test ${D}# -gt 0; do
         args="${D}{args} ${D}1 ${D}2"
         shift
         ;;
-       
-       -arch|-isysroot)
-        # collect these options and values
-        ldargs="${D}{ldargs} ${D}1 ${D}2"
-        shift
-        ;;
 
        -s|-Wl,*)
         # collect these load args
@@ -1075,9 +1027,9 @@ status=0
 # Link one module containing all the others
 #
 if test ${D}{verbose} = 1; then
-    echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
+    echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
 fi
-${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
+c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
 status=${D}?
 
 #
@@ -1086,9 +1038,9 @@ status=${D}?
 #
 if test ${D}{status} = 0; then
     if test ${D}{verbose} = 1; then
-        echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
+        echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
     fi
-    ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
+    c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}
     status=${D}?
 fi
 
@@ -1111,7 +1063,7 @@ D='$'
 cat <<EOF >bk-make-pch
 #!/bin/sh
 
-# This script is part of Bakefile (http://www.bakefile.org) autoconf
+# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
 # script. It is used to generated precompiled headers.
 #
 # Permission is given to use this file in any way.
@@ -1121,8 +1073,6 @@ header="${D}{2}"
 shift
 shift
 
-builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\`
-
 compiler=""
 headerfile=""
 
@@ -1135,7 +1085,7 @@ while test ${D}{#} -gt 0; do
                 headerfile="${D}{incdir}/${D}{header}"
             fi
         ;;
-        -use-pch|-use_pch|-pch-use )
+        -use-pch|-use_pch )
             shift
             add_to_cmdline=0
         ;;
@@ -1154,8 +1104,8 @@ else
     else
         mkdir -p \`dirname ${D}{outfile}\`
     fi
-    depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
+    depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
-    mkdir -p ${D}{builddir}/.deps
+    mkdir -p .deps
     if test "x${GCC_PCH}" = "x1" ; then
         # can do this because gcc is >= 3.4:
         ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
@@ -1167,7 +1117,7 @@ else
 #include "${D}header"
 EOT
         # using -MF icc complains about differing command lines in creation/use
-        ${D}compiler -c ${ICC_PCH_CREATE_SWITCH} ${D}outfile -MMD ${D}file && \\
+        ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\
           sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
           rm -f ${D}file ${D}dfile ${D}{filename}.o
     fi

build/aclocal/visibility.m4

@@ -1,132 +0,0 @@
-dnl visibility.m4 serial 1 (gettext-0.15)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Modified for use in wxWidgets by Vaclav Slavik:
-dnl    - don't define HAVE_VISIBILITY (=0) if not supported
-dnl    - use -fvisibility-inlines-hidden too
-dnl    - test in C++ mode
-
-dnl Tests whether the compiler supports the command-line option
-dnl -fvisibility=hidden and the function and variable attributes
-dnl __attribute__((__visibility__("hidden"))) and
-dnl __attribute__((__visibility__("default"))).
-dnl Does *not* test for __visibility__("protected") - which has tricky
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl MacOS X.
-dnl Does *not* test for __visibility__("internal") - which has processor
-dnl dependent semantics.
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
-dnl "really only recommended for legacy code".
-dnl Set the variable CFLAG_VISIBILITY.
-dnl Defines and sets the variable HAVE_VISIBILITY.
-
-AC_DEFUN([WX_VISIBILITY],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  if test -n "$GCC"; then
-    CFLAGS_VISIBILITY="-fvisibility=hidden"
-    CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden"
-    AC_MSG_CHECKING([for symbols visibility support])
-    AC_CACHE_VAL(wx_cv_cc_visibility, [
-      wx_save_CXXFLAGS="$CXXFLAGS"
-      CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
-      AC_LANG_PUSH(C++)
-      AC_TRY_COMPILE(
-        [
-         /* we need gcc >= 4.0, older versions with visibility support
-            didn't have class visibility: */
-         #if defined(__GNUC__) && __GNUC__ < 4
-         error this gcc is too old;
-         #endif
-
-         /* visibility only makes sense for ELF shared libs: */
-         #if !defined(__ELF__) && !defined(__APPLE__)
-         error this platform has no visibility;
-         #endif
-
-         extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-         extern __attribute__((__visibility__("default"))) int exportedvar;
-         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-         class __attribute__((__visibility__("default"))) Foo {
-           Foo() {}
-         };
-        ],
-        [],
-        wx_cv_cc_visibility=yes,
-        wx_cv_cc_visibility=no)
-      AC_LANG_POP()
-      CXXFLAGS="$wx_save_CXXFLAGS"])
-    AC_MSG_RESULT([$wx_cv_cc_visibility])
-    if test $wx_cv_cc_visibility = yes; then
-      dnl we do have basic visibility support, now check if we can use it:
-      dnl
-      dnl Debian/Ubuntu's gcc 4.1 is affected:
-      dnl https://bugs.launchpad.net/ubuntu/+source/gcc-4.1/+bug/109262
-      AC_MSG_CHECKING([for broken libstdc++ visibility])
-      AC_CACHE_VAL(wx_cv_cc_broken_libstdcxx_visibility, [
-        wx_save_CXXFLAGS="$CXXFLAGS"
-        wx_save_LDFLAGS="$LDFLAGS"
-        CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
-        LDFLAGS="$LDFLAGS -shared -fPIC"
-        AC_LANG_PUSH(C++)
-        AC_TRY_LINK(
-          [
-            #include <string>
-          ],
-          [
-            std::string s("hello");
-            return s.length();
-          ],
-          wx_cv_cc_broken_libstdcxx_visibility=no,
-          wx_cv_cc_broken_libstdcxx_visibility=yes)
-        AC_LANG_POP()
-        CXXFLAGS="$wx_save_CXXFLAGS"
-        LDFLAGS="$wx_save_LDFLAGS"])
-      AC_MSG_RESULT([$wx_cv_cc_broken_libstdcxx_visibility])
-
-      if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
-        AC_MSG_CHECKING([whether we can work around it])
-        AC_CACHE_VAL(wx_cv_cc_visibility_workaround, [
-          AC_LANG_PUSH(C++)
-          AC_TRY_LINK(
-            [
-              #pragma GCC visibility push(default)
-              #include <string>
-              #pragma GCC visibility pop
-            ],
-            [
-              std::string s("hello");
-              return s.length();
-            ],
-            wx_cv_cc_visibility_workaround=no,
-            wx_cv_cc_visibility_workaround=yes)
-          AC_LANG_POP()
-        ])
-        AC_MSG_RESULT([$wx_cv_cc_visibility_workaround])
-
-        if test $wx_cv_cc_visibility_workaround = no; then
-          dnl we can't use visibility at all then
-          wx_cv_cc_visibility=no
-        fi
-      fi
-    fi
-
-    if test $wx_cv_cc_visibility = yes; then
-      AC_DEFINE([HAVE_VISIBILITY])
-      if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
-        AC_DEFINE([HAVE_BROKEN_LIBSTDCXX_VISIBILITY])
-      fi
-    else
-      CFLAGS_VISIBILITY=""
-      CXXFLAGS_VISIBILITY=""
-    fi
-    AC_SUBST([CFLAGS_VISIBILITY])
-    AC_SUBST([CXXFLAGS_VISIBILITY])
-  fi
-])

build/autoconf_prepend-include/autoconf/libs.m4

@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Checking for libraries.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 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
@@ -15,8 +15,8 @@
 #
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02110-1301, USA.
+# 02111-1307, USA.
 
 # As a special exception, the Free Software Foundation gives unlimited
 # permission to copy, distribute and modify the configure scripts that
@@ -67,29 +67,24 @@
 # --------------------------------------------------------
 # Search for a library defining FUNC, if it's not already available.
 AC_DEFUN([AC_SEARCH_LIBS],
-[AS_VAR_PUSHDEF([ac_Search], [ac_cv_search_$1])dnl
+[AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
-AC_CACHE_CHECK([for library containing $1], [ac_Search],
 [ac_func_search_save_LIBS=$LIBS
-AC_LANG_CONFTEST([AC_LANG_CALL([], [$1])])
+ac_cv_search_$1=no
-for ac_lib in '' $2; do
+AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
-  if test -z "$ac_lib"; then
+	       [ac_cv_search_$1="none required"])
-    ac_res="none required"
+if test "$ac_cv_search_$1" = no; then
-  else
+  for ac_lib in $2; do
-    ac_res=-l$ac_lib
     LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
-  fi
+    AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
-  AC_LINK_IFELSE([], [AS_VAR_SET([ac_Search], [$ac_res])])
+		   [ac_cv_search_$1="-l$ac_lib"
-  AS_VAR_SET_IF([ac_Search], [break])dnl
+break])
-done
+  done
-AS_VAR_SET_IF([ac_Search], , [AS_VAR_SET([ac_Search], [no])])dnl
+fi
-rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS])
-ac_res=AS_VAR_GET([ac_Search])
+AS_IF([test "$ac_cv_search_$1" != no],
-AS_IF([test "$ac_res" != no],
+  [test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
-  [test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   $3],
       [$4])dnl
-AS_VAR_POPDEF([ac_Search])dnl
 ])
 
 
@@ -123,14 +118,14 @@ AC_DEFUN([AC_CHECK_LIB],
 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_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, yes)],
-	       [AS_VAR_SET([ac_Lib], [no])])
+	       [AS_VAR_SET(ac_Lib, no)])
 LIBS=$ac_check_lib_save_LIBS])
-AS_IF([test AS_VAR_GET([ac_Lib]) = yes],
+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"
 ])],
@@ -142,8 +137,8 @@ AS_VAR_POPDEF([ac_Lib])dnl
 # AH_CHECK_LIB(LIBNAME)
 # ---------------------
 m4_define([AH_CHECK_LIB],
-[AH_TEMPLATE(AS_TR_CPP([HAVE_LIB$1]),
+[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
-	     [Define to 1 if you have the `$1' library (-l$1).])])
+	     [Define to 1 if you have the `]$1[' library (-l]$1[).])])
 
 
 # AC_HAVE_LIBRARY(LIBRARY,
@@ -185,27 +180,21 @@ m4_popdef([AC_Lib_Name])dnl
 # Internal subroutine of _AC_PATH_X.
 # Set ac_x_includes and/or ac_x_libraries.
 m4_define([_AC_PATH_X_XMKMF],
-[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl
+[rm -fr conftest.dir
-rm -f -r 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'
-incroot:
+acfindx:
-	@echo incroot='${INCROOT}'
+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-usrlibdir:
-	@echo usrlibdir='${USRLIBDIR}'
-libdir:
-	@echo libdir='${LIBDIR}'
 _ACEOF
-  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    for ac_var in incroot usrlibdir libdir; do
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-    done
     # 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" &&
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
+	 test -f $ac_im_libdir/libX11.$ac_extension; then
 	ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
@@ -213,7 +202,7 @@ _ACEOF
     # 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) ac_x_includes= ;;
+	/usr/include) ;;
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
@@ -222,7 +211,7 @@ _ACEOF
     esac
   fi
   cd ..
-  rm -f -r conftest.dir
+  rm -fr conftest.dir
 fi
 ])# _AC_PATH_X_XMKMF
 
@@ -270,7 +259,7 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
+  # 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.
@@ -299,7 +288,7 @@ 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
+    if test -r $ac_dir/libX11.$ac_extension; then
       ac_x_libraries=$ac_dir
       break 2
     fi
@@ -318,16 +307,14 @@ AC_DEFUN([_AC_PATH_X],
 ac_x_includes=no ac_x_libraries=no
 _AC_PATH_X_XMKMF
 _AC_PATH_X_DIRECT
-case $ac_x_includes,$ac_x_libraries in #(
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-  no,* | *,no | *\'*)
+  # Didn't find X anywhere.  Cache the known absence of X.
-    # Didn't find X, or a directory has "'" in its name.
+  ac_cv_have_x="have_x=no"
-    ac_cv_have_x="have_x=no";; #(
+else
-  *)
+  # Record where we found X for the cache.
-    # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
-    ac_cv_have_x="have_x=yes\
+		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-	ac_x_includes='$ac_x_includes'\
+fi])dnl
-	ac_x_libraries='$ac_x_libraries'"
-esac])dnl
 ])
 
 
@@ -344,19 +331,23 @@ 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
-AC_MSG_CHECKING([for X])
 
+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
-  case $x_includes,$x_libraries in #(
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    *\'*) AC_MSG_ERROR([Cannot use X directory names containing ']);; #(
+    # Both variables are already set.
-    *,NONE | NONE,*) _AC_PATH_X;; #(
+    have_x=yes
-    *) have_x=yes;;
+  else
-  esac
+    _AC_PATH_X
+  fi
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
@@ -368,12 +359,16 @@ else
   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_cv_have_x="have_x=yes \
-	ac_x_includes='$x_includes'\
+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-	ac_x_libraries='$x_libraries'"
+  # It might be that x_includes is empty (headers are found in the
-  AC_MSG_RESULT([libraries $x_libraries, headers $x_includes])
+  # 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
-])# AC_PATH_X
+
+fi])# AC_PATH_X
 
 
 
@@ -395,22 +390,29 @@ else
   # 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 . . . .
-    AC_MSG_CHECKING([whether -R must be followed by a space])
+    case `(uname -sr) 2>/dev/null` in
-    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+    "SunOS 5"*)
-    ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag
+      AC_MSG_CHECKING([whether -R must be followed by a space])
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=yes
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+      AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_nospace=yes, ac_R_nospace=no)
-      [AC_MSG_RESULT([no])
+      if test $ac_R_nospace = yes; then
-       X_LIBS="$X_LIBS -R$x_libraries"],
+	AC_MSG_RESULT([no])
-      [LIBS="$ac_xsave_LIBS -R $x_libraries"
+	X_LIBS="$X_LIBS -R$x_libraries"
-       AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+      else
-	 [AC_MSG_RESULT([yes])
+	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	  X_LIBS="$X_LIBS -R $x_libraries"],
+	AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_space=yes, ac_R_space=no)
-	 [AC_MSG_RESULT([neither works])])])
+	if test $ac_R_space = yes; then
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=$ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag
+	  AC_MSG_RESULT([yes])
-    LIBS=$ac_xsave_LIBS
+	  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.

build/autogen.mk

@@ -51,19 +51,14 @@ configure: configure.in aclocal.m4 autoconf_inc.m4 autoconf_m4f
 	$(AUTOCONF) -B $(AUTOHACKS_PREPEND_INCLUDE_DIR)
 
 ACLOCAL_SOURCES = \
-  build/aclocal/ac_raf_func_which_getservbyname_r.m4 \
-  build/aclocal/atomic_builtins.m4 \
-  build/aclocal/ax_func_which_gethostbyname_r.m4 \
-  build/aclocal/bakefile-dllar.m4 \
-  build/aclocal/bakefile-lang.m4 \
   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 \
+  build/aclocal/sdl.m4
-  build/aclocal/visibility.m4
 
 # Run aclocal whenever acinclude or one of our local m4s is updated.
 aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)

build/bakefiles/.cvsignore

@@ -0,0 +1,2 @@
+.bakefile_gen.state
+Bakefiles.local.bkgen

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
@@ -15,16 +15,23 @@
 
     Reasons why these formats are disabled (and so not in CVS):
 
+    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</disable-formats>
+    <disable-formats>dmars,dmars_smake,msevc4prj,cbx_unix,cbuilderx</disable-formats>
 
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
         wx.bkl
+        ../../contrib/build/*/*.bkl
         ../../samples/*.bkl
         ../../samples/*/*.bkl
         ../../samples/*/*/*.bkl
@@ -34,48 +41,49 @@
         ../../utils/*.bkl
         ../../utils/*/*.bkl
         ../../utils/*/*/*.bkl
+        ../../contrib/samples/*.bkl
+        ../../contrib/samples/*/*.bkl
+        ../../contrib/samples/*/*/*.bkl
+        ../../contrib/utils/*/*.bkl
         ../../tests/*.bkl
-        ../../tests/*/*.bkl
     </input>
 
     <!-- List of output formats to generate: -->
     <add-formats>
-        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
     </add-formats>
 
     <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        autoconf,msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
+    </del-formats>
+    <del-formats files="../../samples/mobile/mobile_samples.bkl">
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
     <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
     </del-formats>
 
     <!-- WinCE can't have console apps: -->
     <del-formats files="../../samples/console/*">msevc4prj</del-formats>
-    <del-formats files="../../samples/sockets/*">msevc4prj</del-formats>
     <del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
-    <del-formats files="../../utils/ifacecheck/src/*">msevc4prj</del-formats>
     <del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
+    <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,msvs2003prj,msvs2005prj,msvs2008prj,watcom
+        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom,cbuilderx,cbx_unix
     </del-formats>
 
-    <!-- Some samples use MSVC-specific stuff -->
-    <del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl">
-        autoconf,borland,dmars_smake,dmars,mingw,msevc4prj,watcom
-    </del-formats>
 
     <!-- Default flags (for all formats and bakefiles): -->
     <add-flags>-Iformats</add-flags>
@@ -106,18 +114,29 @@
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>
-    <add-flags files="wx.bkl" formats="msvs2003prj">
-        -o../msw/wx_vc7.sln
-    </add-flags>
     <add-flags files="wx.bkl" formats="msvs2005prj">
-        -o../msw/wx_vc8.sln
+        -o../msw/wx.sln
-    </add-flags>
-    <add-flags files="wx.bkl" formats="msvs2008prj">
-        -o../msw/wx_vc9.sln
     </add-flags>
     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </add-flags>
+    <add-flags files="wx.bkl" formats="cbuilderx">
+        -o../../wx.cbx
+    </add-flags>
+    <add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
+        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
+    </add-flags>
+    <add-flags files="../../contrib/build/*/*.bkl" formats="cbx_unix">
+        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT)Unix.cbx
+    </add-flags>
+    <!-- FIXME: don't do this once it is possible (new CBX version) -->
+    <add-flags files="../../contrib/build/*/*.bkl" formats="cbuilderx">
+        -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">
+        -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
+    </add-flags>
 
 
 
@@ -129,27 +148,12 @@
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 
-    <!-- Use different names for Visual C++ 200x project files: -->
-    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"
-               formats="msvs2003prj">
-        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc7.sln
-    </add-flags>
-    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"
-               formats="msvs2005prj">
-        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc8.sln
-    </add-flags>
-    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"
-               formats="msvs2008prj">
-        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc9.sln
-    </add-flags>
-
     <!-- Makefile specific settings: -->
 
     <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"
+    <del-flags files="wx.bkl">
-               files="wx.bkl">
         -DWRITE_OPTIONS_FILE=0
     </del-flags>
 
@@ -250,20 +254,17 @@
         -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>
-    <del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl">
-        gnu
-    </del-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 VCS): -->
+    <!-- Personal customizations (not in CVS): -->
     <include file="Bakefiles.local.bkgen" ignore_missing="1"/>
 
 </bakefile-gen>

build/bakefiles/README

@@ -1,6 +1,6 @@
 
 This directory contains Bakefile (see http://bakefile.sourceforge.net)
-files needed to generate native makefiles for wxWidgets library and
+files needed to generate native makefiles for wxWidgets library, contrib and
 samples.
 
 Use the bakefile_gen utility to regenerate the makefiles (run it in this
@@ -31,9 +31,11 @@ information that speed up regeneration process.
 
 Note: the following files are generated using bakefile_gen:
   * build/msw/*
+  * contrib/build/* (except .bkl files)
   * makefiles with same names as makefiles in above dirs, Makefile.in files 
     that contain "This makefile was generated by Bakefile" banner and
-    VC++ project files in samples, demos and utils directories
+    VC++ project files in samples, demos and utils directories (inc. contrib
+    ones)
   * src/wxWindows.dsp
   * {wxGTK,wxMotif,wxX11}.spec (only wxBase headers list)
   * autoconf_inc.m4

build/bakefiles/build_cfg.bkl

@@ -8,7 +8,7 @@
     the library.
     -->
 
-    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'] and
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj','cbuilderx'] and
               TOOLKIT in ['PM','MSW','MGL','MOTIF']">
 
         <set var="BUILD_CFG_FILE" make_var="1">
@@ -40,9 +40,10 @@
                 @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 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.2.1"/>
 
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
@@ -25,7 +25,6 @@
     <!-- FIXME: PalmOS is another candidate to bakefiles -->
     <set var="PLATFORM_PALMOS">0</set>
 
-
     <include file="config.bkl"/>
 
     <include file="plugins_deps.bkl"/>
@@ -142,18 +141,20 @@
     <set var="WXLIB_XRC">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if>
     </set>
+    <set var="WXLIB_ODBC">
+        <if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
+            $(mk.evalExpr(wxwin.mkLibName('odbc')))
+        </if>
+    </set>
+    <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_PROPGRID">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('propgrid')))</if>
-    </set>
     <set var="WXLIB_RICHTEXT">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
     </set>
-    <set var="WXLIB_STC">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
-    </set>
 
     <set var="WXLIB_MONO">
         <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
@@ -179,13 +180,13 @@
         <set var="CFG_NAME_PART">
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>
-
-        <!-- NB: this is make_var so that it can be overriden on command line
-                 like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
-        <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
-
         <set var="OBJS" make_var="1">
-            $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
+            <if cond="FORMAT!='cbuilderx'">
+                $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
+            </if>
+            <!-- FIXME: waiting for removal after CBX has better ../ dirs
+                 support -->
+            <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>
@@ -201,7 +202,7 @@
     <set var="LIBDIRNAME" make_var="1">
         <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
         <if cond="FORMAT!='autoconf'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
         </if>
     </set>
 
@@ -267,7 +268,6 @@
     </set>
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
-        <if cond="FORMAT!='autoconf' and UNICODE=='0'">wxUSE_UNICODE=0</if>
     </set>
     <set var="MSLU_DEFINE">
         <if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>
@@ -285,10 +285,10 @@
     <if cond="FORMAT!='autoconf'">
         <set var="GDIPLUS_LIB">
             <if cond="USE_GDIPLUS=='1'">gdiplus</if>
-        </set>
+	</set>
-        <set var="GFXCTX_DEFINE">
+	<set var="GFXCTX_DEFINE">
             <if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
-        </set>
+	</set>
     </if>
 
     <set var="LINK_TARGET_CPU">
@@ -311,6 +311,13 @@
         </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>
@@ -340,6 +347,10 @@
 
     <!-- deal with the need to copy setup.h here: -->
 
+    <set var="IS_MSVC_PRJ">
+        $(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
+    </set>
+
     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
             <msvc-project-files>
@@ -433,8 +444,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <include file="png.bkl"/>
     <include file="jpeg.bkl"/>
     <include file="tiff.bkl"/>
+    <include file="odbc.bkl"/>
     <include file="expat.bkl"/>
-    <include file="scintilla.bkl"/>
 
 
     <!-- =============================================================== -->
@@ -479,9 +490,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             <lib-path>$(MGLLIBPATH)</lib-path>
             <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
         </if>
-
         <warnings>max</warnings>
-        <cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
         <cppflags-watcom>
             -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
             -wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
@@ -497,6 +506,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_ZLIB)</sys-lib>
+        <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
         <sys-lib>$(LIB_EXPAT)</sys-lib>
 
@@ -546,13 +556,13 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
                 <sys-lib>rpcrt4</sys-lib>
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
-                <!-- this one is only used if wxUSE_URL_NATIVE==1 but we don't
-                     know if it is here so just add it unconditionally -->
-                <sys-lib>wininet</sys-lib>
             </if>
             <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
+            <if cond="FORMAT!='msevc4prj'">
+                <sys-lib>odbc32</sys-lib>
+            </if>
         </if>
     </template>
 
@@ -582,8 +592,6 @@ $(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>
@@ -637,23 +645,21 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="FORMAT=='autoconf'">
             <res-include>$(RCDEFDIR)</res-include>
             <res-include>$(TOP_SRCDIR)include</res-include>
-            <postlink-command>$(DYLIB_RPATH_POSTLINK)</postlink-command>
         </if>
         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
-        
     </template>
 
     <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
-        <depends>wxscintilla</depends>
     </template>
 
     <template id="wx_3rdparty_dependencies"
               template="wx_3rdparty_dependencies_gui">
         <depends>wxexpat</depends>
         <depends>wxzlib</depends>
+        <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
 
@@ -661,7 +667,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
             <include>$(DOLLAR)(%SCITECH)/include</include>
         </if>
-        <include>$(INC_TIFF_BUILD)</include>
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
         <include>$(INC_PNG)</include>
@@ -670,6 +675,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <template id="wx_3rdparty_includes"
               template="wx_3rdparty_includes_gui">
         <include>$(INC_ZLIB)</include>
+        <include>$(INC_ODBC)</include>
         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>
@@ -745,15 +751,14 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     </define-rule>
 
     <!-- =============================================================== -->
-    <!--               Support for wxWidgets samples:                    -->
+    <!--               Support for wxWidgets samples and contrib:        -->
     <!-- =============================================================== -->
 
     <!-- Link against one wxWin library. Value must be literal! -->
     <define-tag name="wx-lib" rules="exe,dll,module">
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
         <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
-        <!-- msvs200?prj formats don't support external dependencies yet: -->
+        <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
-        <if cond="FORMAT in ['msvc6prj','msevc4prj'] and MONOLITHIC=='0'">
             <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>
     </define-tag>

build/bakefiles/common_contrib.bkl

@@ -0,0 +1,50 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+    
+    <if cond="not isdefined('file_common_samples_included')">
+        <include file="common.bkl"/>
+    </if>
+    
+    <set var="CONTRIB_HDR_DIR" overwrite="0">$(SRCDIR)/../../include</set>
+    
+    <!-- =============================================================== -->
+    <!--                      Contrib lib helpers:                       -->
+    <!-- =============================================================== -->
+
+    <template id="wx_contrib_lib" template="wx_lib_b">
+        <include>$(CONTRIB_HDR_DIR)</include>
+    </template>
+    
+    <if cond="isdefined('file_common_samples_included')">
+        <template id="wx_contrib_sample" template="wx_sample">
+            <include>$(CONTRIB_HDR_DIR)</include>
+        </template>
+        <template id="wx_contrib_util" template="wx_util">
+            <include>$(CONTRIB_HDR_DIR)</include>
+        </template>
+    </if>
+    
+    <template id="wx_contrib_dll"
+              template="wx_dll_b" template_append="wx_append">
+        <include>$(CONTRIB_HDR_DIR)</include>
+    </template>
+    
+    <template id="wx_contrib_headers">
+        <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,6 +3,8 @@
 
 <makefile>
     
+    <set var="file_common_samples_included">1</set>
+    
     <if cond="not isdefined('OUT_OF_TREE_MAKEFILES')">
         <set var="OUT_OF_TREE_MAKEFILES">0</set>
     </if>

build/bakefiles/common_samples_intree.bkl

@@ -4,24 +4,31 @@
 <makefile>
 
     <include file="common.bkl"/>
-
+    
     <!-- =============================================================== -->
     <!--                    Template for wxWidgets samples:              -->
     <!-- =============================================================== -->
 
-    <set var="WX_ENABLE_PRECOMP_HEADERS">0</set>
+    <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
@@ -30,7 +37,7 @@
             <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/>
@@ -38,67 +45,57 @@
 
         <!-- FIXME: temporary, until bakefile can reuse existing pch files -->
         <if cond="FORMAT!='autoconf'">
-            <if cond="WX_ENABLE_PRECOMP_HEADERS=='0'">
+            <define>NOPCH</define>
-                <define>NOPCH</define>
-            </if>
         </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:              -->
     <!-- =============================================================== -->
 
-    <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
+    <define-rule name="wx-data" extends="copy-files">
-        <define-rule name="wx-data" extends="copy-files">
+        <template>
-            <template>
+            <dependency-of>all</dependency-of>
-                <dependency-of>all</dependency-of>
+            <dstdir>$(BUILDDIR)</dstdir>
-                <dstdir>$(BUILDDIR)</dstdir>
+            <srcdir>$(SRCDIR)</srcdir>
-                <srcdir>$(SRCDIR)</srcdir>
+        </template>
-            </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>
-    </if>
-    <if cond="FORMAT_SUPPORTS_ACTIONS=='0'">
-        <!-- empty stub for project-files formats which don't support <command> -->
-        <define-rule name="wx-data" extends="action">
-            <define-tag name="dstdir"/>
-            <define-tag name="srcdir"/>
-            <define-tag name="files"/>
-        </define-rule>
-    </if>
-
 
+        <!--
+        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:                  -->
     <!-- =============================================================== -->
@@ -111,7 +108,7 @@
         compiling it from .rc file (gcc on OS/2 doesn't ship with resource
         compiler):
         -->
-        <define-tag name="wx-os2-lib-resource" rules="exe">
+        <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
@@ -120,5 +117,5 @@
             <set var="__objects" append="1">$(os2_lib_res)</set>
         </define-tag>
     </if>
-
+    
 </makefile>

build/bakefiles/config.bkl

@@ -3,10 +3,6 @@
 
 <makefile>
 
-    <set var="IS_MSVC_PRJ">
-        $(FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'])
-    </set>
-
     <set var="BUILDING_LIB" overwrite="0">0</set>
 
     <set var="CPP_DEFAULT_VALUE">
@@ -50,22 +46,14 @@
         </description>
     </option>
 
-    <!-- don't include ANSI configuration in project files, it's going to be
+    <option name="UNICODE">
-         eventually removed anyway and it only doubles the number of build
+        <values>0,1</values>
-         configs in projects: -->
+        <values-description>,Unicode</values-description>
-    <if cond="IS_MSVC_PRJ=='1'">
+        <default-value>0</default-value>
-        <set var="UNICODE">1</set>
+        <description>
-    </if>
+            Compile Unicode build of wxWidgets?
-    <if cond="IS_MSVC_PRJ=='0'">
+        </description>
-        <option name="UNICODE">
+    </option>
-            <values>0,1</values>
-            <values-description>,Unicode</values-description>
-            <default-value>1</default-value>
-            <description>
-                Compile Unicode build of wxWidgets?
-            </description>
-        </option>
-    </if>
 
     <if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
         <option name="MSLU">
@@ -107,10 +95,14 @@ Accepted values: AMD64, IA64.
         <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="IS_MSVC_PRJ=='1'">1</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</if>
-        <if cond="IS_MSVC_PRJ=='0'">default</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>
     </set>
+    -->
+    <set var="DEBUG_INFO_DEFAULT">default</set>
 
     <option name="DEBUG_INFO">
         <values>0,1,default</values>
@@ -213,14 +205,6 @@ Acts according to BUILD by default.
         </description>
     </option>
 
-    <option name="USE_PROPGRID">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Build wxPropertyGrid library (USE_GUI must be 1)?
-        </description>
-    </option>
-
     <option name="USE_RICHTEXT">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -229,14 +213,6 @@ Acts according to BUILD by default.
         </description>
     </option>
 
-    <option name="USE_STC">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Build wxStyledTextCtrl library (USE_GUI must be 1)?
-        </description>
-    </option>
-
     <option name="USE_OPENGL">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -245,10 +221,18 @@ Acts according to BUILD by default.
         </description>
     </option>
 
+    <option name="USE_ODBC">
+        <values>0,1</values>
+        <default-value>0</default-value>
+        <description>
+            Build ODBC database classes (USE_GUI must be 1)?
+        </description>
+    </option>
+
     <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
     <set var="USE_QA_DEFAULT">
-        <if cond="FORMAT in ['msvc','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">1</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">0</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
     </set>
     <option name="USE_QA">
         <values>0,1</values>
@@ -355,19 +339,14 @@ 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"/>
         <option name="EXTRALIBS_SDL"/>
         <option name="EXTRALIBS_GNOMEPRINT"/>
-        <option name="CXXWARNINGS"/>
         <option name="HOST_SUFFIX"/>
-        <option name="DYLIB_RPATH_INSTALL"/>
-        <option name="DYLIB_RPATH_POSTLINK"/>
         <option name="SAMPLES_RPATH_FLAG"/>
-
+        <option name="SAMPLES_RPATH_POSTLINK"/>
-        <!-- see configure.in; it's required by some samples on Mac OS X -->
-        <option name="HEADER_PAD_OPTION"/>
 
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
@@ -400,11 +379,7 @@ it if SHARED=1 unless you know what you are doing.
 
         <set var="TOOLKIT" overwrite="0">
             <if cond="FORMAT=='msevc4prj'">WINCE</if>
-            <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003'">WINCE</if>
+            <if cond="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
-            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='pocketpc2003'">WINCE</if>
-            <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">MSW</if>
-            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">MSW</if>
-            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">MSW</if>
             <if cond="PLATFORM_MSDOS=='1'">MGL</if>
             <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>
@@ -415,7 +390,7 @@ 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>
@@ -427,9 +402,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 var="SRCDIR">
-            <set-srcdir>../..</set-srcdir>
+            <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
-        </if>
+            <if cond="BUILDING_LIB=='0'">.</if>
+        </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
     </if>
 
@@ -449,6 +425,12 @@ Set the version of your Mingw installation here.
         <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
     </if>
 
+    <if cond="FORMAT=='cbuilderx'">
+        <set var="EXTRACFLAGS">
+            <if cond="COMPILER=='gcc'">-DHAVE_W32API_H</if>
+        </set>
+    </if>
+
 
     <!-- ================================================================== -->
     <!--            Project files - hardcode some defaults                  -->
@@ -458,13 +440,12 @@ Set the version of your Mingw installation here.
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
         <set var="USE_AUI">1</set>
-        <set var="USE_PROPGRID">1</set>
         <set var="USE_RICHTEXT">1</set>
-        <set var="USE_STC">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>
         <set var="USE_QA">1</set>
         <set var="MONOLITHIC">0</set>
         <set var="USE_GUI">1</set>
@@ -478,6 +459,19 @@ Set the version of your Mingw installation here.
     </if>
 
 
+    <!-- FIXME:
+         C++BuilderX supports only wxMSW, monolithic (sic!) static build
+         and the project can't be put into build/msw and store objects in
+         build/msw/something. This *must* be fixed! -->
+    <if cond="FORMAT=='cbuilderx'">
+        <set var="WXUNIV">0</set>
+        <set var="MONOLITHIC">1</set>
+        <set var="SRCDIR">.</set>
+        <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
+        <set var="SHARED">0</set>
+    </if>
+
+
     <!-- DigitalMars make is braindead, it doesn't have conditional
          processing: -->
     <if cond="FORMAT=='dmars'">
@@ -485,24 +479,22 @@ Set the version of your Mingw installation here.
         <set var="BUILD">debug</set>
         <set var="SHARED">0</set>
         <set var="WXUNIV">0</set>
-        <set var="UNICODE">1</set>
+        <set var="UNICODE">0</set>
         <!-- Free version does not distribute OpenGL,
              in commercial distribution better use dmars_smake format -->
         <set var="USE_OPENGL">0</set>
     </if>
 
     <!-- No need for wxUniv on embedded devices (yet): -->
-    <if cond="FORMAT=='msevc4prj' or (FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003') or (FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='pocketpc2003')">
+    <if cond="FORMAT=='msevc4prj'">
         <set var="WXUNIV">0</set>
+        <set var="UNICODE">1</set>
         <!-- Uploading debug reports from PDAs seems impractical -->
         <set var="USE_QA">0</set>
         <set var="MONOLITHIC">1</set> <!-- sic! -->
-        <set var="USE_OPENGL">0</set> <!-- need OpenGL ES support first -->
         <!-- RTTI and exceptions need separate cccrtti.lib with eVC4 -->
-        <if cond="FORMAT=='msevc4prj'">
+        <set var="USE_RTTI">0</set>
-            <set var="USE_RTTI">0</set>
+        <set var="USE_EXCEPTIONS">0</set>
-            <set var="USE_EXCEPTIONS">0</set>
-        </if>
     </if>
 
     <!-- Need for wxUniv within wxMGL: -->

build/bakefiles/formats/FORMATS.bkmanifest

@@ -1,6 +1,13 @@
 <?xml version="1.0" ?>
 
-<bakefile-manifest xmlns="http://www.bakefile.org/schema/bakefile-formats">
+<bakefile-manifest>
+
+    <format id="wx24dsp">
+        <description>
+            src/wxWindows.dsp which makes same files as 2.4 version
+        </description>
+        <default-filename>wxWindows.dsp</default-filename>
+    </format>
     
     <format id="rpmspec">
         <description>
@@ -8,5 +15,14 @@
         </description>
         <default-filename>xxx.spec</default-filename>
     </format>
+
+    <format id="cbx_unix">
+        <description>
+            C++BuilderX projects for Unix (use configure)
+        </description>
+        <default-filename>
+            $(os.path.splitext(os.path.basename(INPUT_FILE))[0])Unix.cbx
+        </default-filename>
+    </format>
     
 </bakefile-manifest>

build/bakefiles/formats/README

@@ -1,4 +1,6 @@
 
 This directory contains misc Bakefile backends that are wxWidgets-specific:
 
+wx24dsp     - generates wx2.4-compatible VC++ project file (src/wxWindows.dsp)
 rpmspec     - generates part of .spec files with list of wxBase headers
+cbx_unix    - Borland C++BuilderX project files for configure-based build

build/bakefiles/formats/cbx_unix.bkl

@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+    
+    <include file="presets/fake.bkl"/>
+    <set var="COMPILER">vc</set>
+
+
+    <define-tag name="__fake_hook" rules="__fake">
+        <set var="type" overwrite="0">fake</set>
+    </define-tag>
+    
+    <define-tag name="__fake_hook" rules="exe">
+        <set var="type">exe</set>
+    </define-tag>
+
+    <output file="$(OUTPUT_FILE)" writer="cbx_unix.empy"/>
+    <set var="FORMAT_OUTPUT_VARIABLES">type</set>
+ 
+</makefile>

build/bakefiles/formats/cbx_unix.empy

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--C++BuilderX Project-->
+<project>
+  <property category="build.config" name="active" value="0"/>
+  <property category="build.config" name="count" value="1"/>
+  <property category="build.config" name="excludedefaultforzero" value="0"/>
+  <property category="build.config.0" name="builddir" value="Debug"/>
+  <property category="build.config.0" name="key" value="Debug_Build"/>
+  <property category="build.config.0" name="name" value="Debug Build"/>
+  <property category="build.config.0" name="settings.MinGW" value="default;debug"/>
+  <property category="build.config.0" name="settings.gnuc++" value="default;debug"/>
+  <property category="build.config.0" name="settings.intellinia32" value="default;debug"/>
+  <property category="build.config.0" name="settings.mswin32" value="default;debug"/>
+  <property category="build.config.0" name="type" value="Toolset"/>
+  <property category="build.config.1" name="key" value="Release_Build"/>
+  <property category="build.config.1" name="name" value="Release Build"/>
+  <property category="build.config.1" name="settings.MinGW" value="default;release"/>
+  <property category="build.config.1" name="settings.gnuc++" value="default;release"/>
+  <property category="build.config.1" name="settings.intellinia32" value="default;release"/>
+  <property category="build.config.1" name="settings.mswin32" value="default;release"/>
+  <property category="build.config.1" name="type" value="Toolset"/>
+  <property category="build.node" name="type" value="CBMakefileProjectType"/>
+  <property category="build.platform" name="active" value="linux"/>
+  <property category="build.platform" name="linux.Debug_Build.toolset" value="gnuc++"/>
+  <property category="build.platform" name="linux.Release_Build.toolset" value="gnuc++"/>
+  <property category="build.platform" name="linux.default" value="gnuc++"/>
+  <property category="build.platform" name="linux.gnuc++.enabled" value="1"/>
+  <property category="build.platform" name="linux.mswin32.enabled" value="0"/>
+  <property category="build.platform" name="linux.win32b.enabled" value="0"/>
+  <property category="build.platform" name="solaris.default" value="gnuc++"/>
+  <property category="build.platform" name="solaris.enabled" value="0"/>
+  <property category="build.platform" name="win32.default" value="MinGW"/>
+  <property category="build.platform" name="win32.enabled" value="0"/>
+  <property category="cbproject" name="lastnodeid" value="4"/>
+  <property category="cbproject" name="version" value="X.1.0"/>
+  <property category="classbrowser" name="enable" value="0"/>
+  <property category="classbrowser" name="parser.cpp.skip_standard_directories" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.1" value="/usr/include"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.2" value="/usr/include/g++-3"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.MD.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.O0.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.c.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.arg" value="2"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.o.enabled" value="1"/>
+  <property category="linux.Debug_Build.gnuc++.g++link" name="option.o.enabled" value="1"/>
+  <property category="linux.gnuc++.Debug_Build" name="saved" value="1"/>
+  <property category="makefileproject" name="makefile.ID.1" value="1"/>
+  <property category="makefileproject" name="makefile.list.1" value="Makefile"/>
+  <property category="makefiletarget" name="makefile.1.params" value="-f Makefile"/>
+  <property category="makefiletarget" name="makefile.1.target.list.1" value="all"/>
+  <property category="makefiletarget" name="makefile.1.target.list.2" value="clean"/>
+  <property category="runtime" name="ConfigurationCount" value="@(len([t for t in targets if t.type=='exe'])-1)"/>
+@{
+ALL_EXES = [x for x in targets if x.type=='exe']
+if len(ALL_EXES) == 1:
+    DEFAULT_EXE = 0
+else:
+    DEFAULT_EXE = -1
+}@
+  <property category="runtime" name="DefaultConfiguration" value="@DEFAULT_EXE"/>
+@[for i in range(0,len(ALL_EXES))]@
+  <property category="runtime.@i" name="BuildTargetOnRun" value="com.borland.cbuilder.build.CBProjectBuilder$ProjectBuildAction;make"/>
+  <property category="runtime.@i" name="ConfigurationName" value="@ALL_EXES[i].id"/>
+  <property category="runtime.@i" name="RunnableType" value="com.borland.cbuilder.runtime.ExecutableRunner"/>
+  <property category="runtime.@i" name="native.exec.path" value="./@ALL_EXES[i].id"/>
+  <property category="runtime.@i" name="native.startdir.path" value="."/>
+  <property category="runtime.@i" name="native.target.override" value="1"/>
+@[end for]@
+  <property category="unique" name="id" value="4"/>
+  <node name="console" type="NavigationDirectory">
+    <property category="directorynode" name="showSubdirectories" value="1"/>
+    <property category="directorynode" name="url" value="."/>
+    <property category="unique" name="id" value="1"/>
+  </node>
+</project>

build/bakefiles/formats/rpmspec.bkl

@@ -4,8 +4,6 @@
 <makefile>
 
     <include file="presets/fake.bkl"/>
-
-    <set var="EOL_STYLE">unix</set>
     <set var="COMPILER">gcc</set>
 
     <!-- fake.bkl defaults to win32 platform -->

build/bakefiles/mac_bundles.bkl

@@ -15,13 +15,12 @@
         `echo $(DOLLAR)(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`
     </set>
     
-    <set var="BUNDLE_PLIST" overwrite="0">
+    <set var="BUNDLE_PLIST">
-        $(TOP_SRCDIR)src/osx/carbon/Info.plist.in
+        $(TOP_SRCDIR)src/mac/carbon/Info.plist.in
     </set>
-    <set var="BUNDLE_ICON" overwrite="0">
+    <set var="BUNDLE_ICONS">
-        $(TOP_SRCDIR)src/osx/carbon/wxmac.icns
+        $(TOP_SRCDIR)src/mac/carbon/wxmac.icns
     </set>
-    <set var="BUNDLE_RESOURCES" overwrite="0"></set>
 
     <define-tag name="wx-mac-app-bundle" rules="exe">
 
@@ -29,22 +28,16 @@
         <set var="BUNDLE">$(id).app/Contents</set>
         <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
         <set var="BUNDLE_TGT_REF">
-            <!-- TODO Remove Mac -->
             <if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
-            <if cond="TOOLKIT=='OSX_CARBON'">$(BUNDLE)/PkgInfo</if>
-            <if cond="TOOLKIT=='OSX_COCOA'">$(BUNDLE)/PkgInfo</if>
-            <if cond="TOOLKIT=='OSX_IPHONE'">$(BUNDLE)/PkgInfo</if>
             <if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
         </set>
-
+        
-        <add-target target="$(BUNDLE_TGT)" type="action"
+        <add-target target="$(BUNDLE_TGT)" type="action"/>
-                    cond="target and PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(BUNDLE_TGT)">
             <!-- required data: -->
             <depends>$(id)</depends>
             <depends-on-file>$(BUNDLE_PLIST)</depends-on-file>
-            <depends-on-file>$(BUNDLE_ICON)</depends-on-file>
+            <depends-on-file>$(BUNDLE_ICONS)</depends-on-file>
-            <depends-on-file>$(BUNDLE_RESOURCES)</depends-on-file>
 
             <command>
                 <!-- create the directories: -->
@@ -61,24 +54,17 @@
                 <!-- PkgInfo: -->
                 echo -n "APPL????" >$(BUNDLE)/PkgInfo
 
-                <!-- move the binary: -->
+                <!-- make a hardlink to the binary: -->
-                cp $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
+                ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
 
-                <!-- copy the application icon: -->
+                <!-- ditto wxWidgets resources and icons: -->
-                cp -f $(BUNDLE_ICON) $(BUNDLE)/Resources/wxmac.icns
+                cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
-	        </command>            
+            </command>            
-            <if cond="BUNDLE_RESOURCES!=''">
-                <command>
-                    <!-- copy all other bundle resources: -->
-                    cp -f $(BUNDLE_RESOURCES) $(BUNDLE)/Resources
-                </command>
-            </if>
- 
         </modify-target>
         
         <!-- 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/make_dist.mk

@@ -15,8 +15,6 @@ COMMDIR  = $(WXDIR)/src/common
 HTMLDIR  = $(WXDIR)/src/html
 RICHTEXTDIR = $(WXDIR)/src/richtext
 AUIDIR =   $(WXDIR)/src/aui
-PROPGRIDDIR = $(WXDIR)/src/propgrid
-STCDIR =   $(WXDIR)/src/stc
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
@@ -33,11 +31,11 @@ MOTIFDIR = $(WXDIR)/src/motif
 MSDOSDIR = $(WXDIR)/src/msdos
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
-MACDIR   = $(WXDIR)/src/osx
+MACDIR   = $(WXDIR)/src/mac
 COCOADIR = $(WXDIR)/src/cocoa
+ODBCDIR  = $(WXDIR)/src/iodbc
 FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
-IFACEDIR = $(WXDIR)/interface
 SAMPDIR  = $(WXDIR)/samples
 DEMODIR  = $(WXDIR)/demos
 UTILSDIR = $(WXDIR)/utils
@@ -122,6 +120,14 @@ ALL_DIST: distrib_clean
 	$(CP_P) $(REGEXDIR)/README $(DISTDIR)/src/regex
 	$(CP_PR) $(EXPATDIR) $(DISTDIR)/src/expat
 	#(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
+	mkdir $(DISTDIR)/src/iodbc
+	$(CP_P) $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
+	$(CP_P) $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
+	$(CP_P) $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
+	$(CP_P) $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
+	$(CP_P) $(ODBCDIR)/README $(DISTDIR)/src/iodbc
+	$(CP_P) $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
+	$(CP_P) $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
 	# copy some files from include/ that are not installed:
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
@@ -131,17 +137,13 @@ ALL_DIST: distrib_clean
 	# copy wxpresets
 	mkdir $(DISTDIR)/build
 	mkdir $(DISTDIR)/build/bakefiles
-	$(CP_P) $(WXDIR)/build/bakefiles/README $(DISTDIR)/build/bakefiles
-	$(CP_P) $(WXDIR)/build/bakefiles/*.* $(DISTDIR)/build/bakefiles
 	mkdir $(DISTDIR)/build/bakefiles/wxpresets
 	mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets
-	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
-	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
 	mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
+	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample
-	mkdir $(DISTDIR)/build/bakefiles/wxpresets/libsample
+	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
-	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/libsample/*.* $(DISTDIR)/build/bakefiles/wxpresets/libsample
 	mkdir $(DISTDIR)/build/aclocal
 	$(CP_P) $(WXDIR)/build/aclocal/*.m4 $(DISTDIR)/build/aclocal
 
@@ -160,112 +162,61 @@ ALL_GUI_DIST: ALL_DIST
 	    mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)/private && \
 	    $(CP_P) $(INCDIR)/wx/$(TOOLKITDIR)/private/*.h $(DISTDIR)/include/wx/$(TOOLKITDIR)/private; \
 	fi
-	mkdir $(DISTDIR)/include/wx/meta
 	mkdir $(DISTDIR)/include/wx/generic
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
 	mkdir $(DISTDIR)/include/wx/aui
-	mkdir $(DISTDIR)/include/wx/propgrid
-	mkdir $(DISTDIR)/include/wx/stc
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
-	mkdir $(DISTDIR)/include/wx/unix/private
 	mkdir $(DISTDIR)/include/wx/xml
 	mkdir $(DISTDIR)/include/wx/xrc
-	$(CP_P) $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
+	-$(CP_P) $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
 	$(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
-	$(CP_P) $(INCDIR)/wx/meta/*.h $(DISTDIR)/include/wx/meta
 	$(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
 	$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
 	$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
-	$(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid
-	$(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
 	$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
-	$(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private
 	$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
 	$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
 	$(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
-
 	mkdir $(DISTDIR)/art
 	mkdir $(DISTDIR)/art/gtk
 	mkdir $(DISTDIR)/art/motif
 	$(CP_P) $(WXDIR)/art/*.xpm $(DISTDIR)/art
 	$(CP_P) $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
 	$(CP_P) $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
-
+	mkdir $(DISTDIR)/src/generic
+	mkdir $(DISTDIR)/src/html
+	mkdir $(DISTDIR)/src/richtext
+	mkdir $(DISTDIR)/src/aui
 	mkdir $(DISTDIR)/src/$(TOOLKITDIR)
-	$(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common
+	mkdir $(DISTDIR)/src/png
+	mkdir $(DISTDIR)/src/jpeg
+	mkdir $(DISTDIR)/src/tiff
+	mkdir $(DISTDIR)/src/unix
+	mkdir $(DISTDIR)/src/xrc
+	$(CP_P) $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc
+	-$(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	$(CP_P) $(COMMDIR)/*.c $(DISTDIR)/src/common
 	$(CP_P) $(COMMDIR)/*.inc $(DISTDIR)/src/common
 	$(CP_P) $(COMMDIR)/*.mms $(DISTDIR)/src/common
-
-	mkdir $(DISTDIR)/src/xrc
-	$(CP_P) $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc
-
-	mkdir $(DISTDIR)/src/unix
 	$(CP_P) $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
 	$(CP_P) $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
-
-	mkdir $(DISTDIR)/src/generic
 	$(CP_P) $(GENDIR)/*.cpp $(DISTDIR)/src/generic
 	$(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
-
-	mkdir $(DISTDIR)/src/html
 	$(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-
-	mkdir $(DISTDIR)/src/richtext
 	$(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
-
-	mkdir $(DISTDIR)/src/aui
 	$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
-
+	$(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
-	mkdir $(DISTDIR)/src/propgrid
+	$(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
-	$(CP_P) $(PROPGRIDDIR)/*.cpp $(DISTDIR)/src/propgrid
+	$(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
-
-	mkdir $(DISTDIR)/src/stc
-	mkdir $(DISTDIR)/src/stc/scintilla
-	mkdir $(DISTDIR)/src/stc/scintilla/src
-	mkdir $(DISTDIR)/src/stc/scintilla/include
-	$(CP_P) $(STCDIR)/*.* $(DISTDIR)/src/stc
-	$(CP_P) $(STCDIR)/scintilla/src/* $(DISTDIR)/src/stc/scintilla/src
-	$(CP_P) $(STCDIR)/scintilla/include/* $(DISTDIR)/src/stc/scintilla/include
-
-	mkdir $(DISTDIR)/src/png
-	$(CP_PR) $(PNGDIR)/* $(DISTDIR)/src/png
-
-	mkdir $(DISTDIR)/src/jpeg
 	$(CP_P) $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	$(CP_P) $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
-	$(CP_P) $(JPEGDIR)/*.vc $(DISTDIR)/src/jpeg
-	$(CP_P) $(JPEGDIR)/makefile.* $(DISTDIR)/src/jpeg
 	$(CP_P) $(JPEGDIR)/README $(DISTDIR)/src/jpeg
-
+	$(CP_P) $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
-	mkdir $(DISTDIR)/src/tiff
+	$(CP_P) $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
-	mkdir $(DISTDIR)/src/tiff/config
-	mkdir $(DISTDIR)/src/tiff/contrib
-	mkdir $(DISTDIR)/src/tiff/port
-	mkdir $(DISTDIR)/src/tiff/html
-	mkdir $(DISTDIR)/src/tiff/man
-	mkdir $(DISTDIR)/src/tiff/libtiff
-	mkdir $(DISTDIR)/src/tiff/tools
-	mkdir $(DISTDIR)/src/tiff/test
-	mkdir $(DISTDIR)/src/tiff/m4
-	$(CP_P) $(TIFFDIR)/config/* $(DISTDIR)/src/tiff/config
-	$(CP_PR) $(TIFFDIR)/contrib/* $(DISTDIR)/src/tiff/contrib
-	$(CP_P) $(TIFFDIR)/port/* $(DISTDIR)/src/tiff/port
-	$(CP_PR) $(TIFFDIR)/html/* $(DISTDIR)/src/tiff/html
-	$(CP_P) $(TIFFDIR)/man/* $(DISTDIR)/src/tiff/man
-	$(CP_P) $(TIFFDIR)/tools/* $(DISTDIR)/src/tiff/tools
-	$(CP_P) $(TIFFDIR)/test/* $(DISTDIR)/src/tiff/test
-	$(CP_P) $(TIFFDIR)/libtiff/* $(DISTDIR)/src/tiff/libtiff
-	$(CP_P) $(TIFFDIR)/m4/* $(DISTDIR)/src/tiff/m4
 	$(CP_P) $(TIFFDIR)/README $(DISTDIR)/src/tiff
-	$(CP_P) $(TIFFDIR)/VERSION $(DISTDIR)/src/tiff
-	$(CP_P) $(TIFFDIR)/configure* $(DISTDIR)/src/tiff
-	$(CP_P) $(TIFFDIR)/aclocal.m4 $(DISTDIR)/src/tiff
-	$(CP_P) $(TIFFDIR)/autogen.sh $(DISTDIR)/src/tiff
-	$(CP_P) $(TIFFDIR)/Makefile* $(DISTDIR)/src/tiff
 
 BASE_DIST: ALL_DIST INTL_DIST
 	# make --disable-gui the default
@@ -284,23 +235,23 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
 	mkdir $(DISTDIR)/include/wx/aui
-	mkdir $(DISTDIR)/include/wx/propgrid
+	mkdir $(DISTDIR)/include/wx/mac
-	mkdir $(DISTDIR)/include/wx/stc
+	mkdir $(DISTDIR)/include/wx/mac/carbon
-	mkdir $(DISTDIR)/include/wx/osx
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
-	mkdir $(DISTDIR)/include/wx/osx/carbon
-	mkdir $(DISTDIR)/include/wx/osx/core
 	mkdir $(DISTDIR)/include/wx/os2
 	mkdir $(DISTDIR)/include/wx/palmos
 	mkdir $(DISTDIR)/src/unix
-	mkdir $(DISTDIR)/src/osx
+	mkdir $(DISTDIR)/src/mac
-	mkdir $(DISTDIR)/src/osx/core
+	mkdir $(DISTDIR)/src/mac/corefoundation
-	mkdir $(DISTDIR)/src/osx/carbon
+	mkdir $(DISTDIR)/src/mac/carbon
+	mkdir $(DISTDIR)/src/mac/carbon/morefilex
 	mkdir $(DISTDIR)/src/msdos
 	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/os2
 	mkdir $(DISTDIR)/src/palmos
 	$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
+	$(CP_P) $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
 	list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
 	  $(CP_P) $(WXDIR)/include/$$p $(DISTDIR)/include/$$p; \
 	done
@@ -310,10 +261,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 
 	mkdir $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
 
 	mkdir $(DISTDIR)/samples/console
 	$(CP_P) $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
@@ -322,6 +269,25 @@ BASE_DIST: ALL_DIST INTL_DIST
 	$(CP_P) $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console
 	$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
 
+	mkdir $(DISTDIR)/utils
+	mkdir $(DISTDIR)/utils/HelpGen
+	mkdir $(DISTDIR)/utils/HelpGen/src
+	$(CP_P) $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
+	$(CP_P) $(UTILSDIR)/HelpGen/src/Makefile.in $(DISTDIR)/utils/HelpGen/src
+	$(CP_P) $(UTILSDIR)/HelpGen/src/*.h $(DISTDIR)/utils/HelpGen/src
+	$(CP_P) $(UTILSDIR)/HelpGen/src/*.cpp $(DISTDIR)/utils/HelpGen/src
+
+	mkdir $(DISTDIR)/utils/tex2rtf
+	mkdir $(DISTDIR)/utils/tex2rtf/src
+	$(CP_P) $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.ico $(DISTDIR)/utils/tex2rtf/src
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.ini $(DISTDIR)/utils/tex2rtf/src
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src
+
 	mv $(DISTDIR) $(BASEDISTDIR)
 
 GTK_DIST: UNIV_DIST
@@ -346,17 +312,14 @@ GTK_DIST: UNIV_DIST
 	$(CP_P) $(INCDIR)/wx/gtk/gnome/*.h $(DISTDIR)/include/wx/gtk/gnome
 	$(CP_P) $(GTKDIR)/gnome/*.cpp $(DISTDIR)/src/gtk/gnome
 
-	mkdir $(DISTDIR)/include/wx/gtk/hildon
+	mkdir $(DISTDIR)/src/mac
-	mkdir $(DISTDIR)/src/gtk/hildon
+	mkdir $(DISTDIR)/src/mac/corefoundation
-	$(CP_P) $(INCDIR)/wx/gtk/hildon/*.h $(DISTDIR)/include/wx/gtk/hildon
+	$(CP_P) $(WXDIR)/src/mac/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
-	$(CP_P) $(GTKDIR)/hildon/*.cpp $(DISTDIR)/src/gtk/hildon
+	mkdir $(DISTDIR)/include/wx/mac
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
+	$(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
 
-	mkdir $(DISTDIR)/src/osx
+	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
-	mkdir $(DISTDIR)/src/osx/core
-	$(CP_P) $(WXDIR)/src/osx/core/*.cpp $(DISTDIR)/src/osx/core
-	mkdir $(DISTDIR)/include/wx/osx
-	mkdir $(DISTDIR)/include/wx/osx/core
-	$(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
 
 X11_DIST: UNIV_DIST
 	$(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
@@ -366,12 +329,13 @@ X11_DIST: UNIV_DIST
 	$(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
 	$(CP_P) $(X11DIR)/*.c $(DISTDIR)/src/x11
 	$(CP_P) $(X11DIR)/*.xbm $(DISTDIR)/src/x11
-	mkdir $(DISTDIR)/src/osx
+	mkdir $(DISTDIR)/src/mac
-	mkdir $(DISTDIR)/src/osx/core
+	mkdir $(DISTDIR)/src/mac/corefoundation
-	$(CP_P) $(WXDIR)/src/osx/core/*.cpp $(DISTDIR)/src/osx/core
+	$(CP_P) $(WXDIR)/src/mac/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
-	mkdir $(DISTDIR)/include/wx/osx
+	mkdir $(DISTDIR)/include/wx/mac
-	mkdir $(DISTDIR)/include/wx/osx/core
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
-	$(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
+	$(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
+	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MOTIF_DIST: ALL_GUI_DIST
 	$(CP_P) $(WXDIR)/wxMotif.spec $(DISTDIR)
@@ -390,54 +354,53 @@ MOTIF_DIST: ALL_GUI_DIST
 	$(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
 		$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
 		$(DISTDIR)/include/wx/x11
+	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
-OSX_CARBON_DIST: ALL_GUI_DIST
+MACX_DIST: ALL_GUI_DIST
 	$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
-	mkdir $(DISTDIR)/include/wx/osx/carbon
+	mkdir $(DISTDIR)/include/wx/mac/carbon
-	mkdir $(DISTDIR)/include/wx/osx/carbon/private
+	mkdir $(DISTDIR)/include/wx/mac/private
-	mkdir $(DISTDIR)/include/wx/osx/cocoa
+	mkdir $(DISTDIR)/include/wx/mac/carbon/private
-	mkdir $(DISTDIR)/include/wx/osx/iphone
+	$(CP_P) $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
-	$(CP_P) $(INCDIR)/wx/osx/*.h $(DISTDIR)/include/wx/osx
+	$(CP_P) $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon
-	$(CP_P) $(INCDIR)/wx/osx/carbon/*.h $(DISTDIR)/include/wx/osx/carbon
+	$(CP_P) $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private
-	$(CP_P) $(INCDIR)/wx/osx/carbon/private/*.h $(DISTDIR)/include/wx/osx/carbon/private
+	$(CP_P) $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private
-	$(CP_P) $(INCDIR)/wx/osx/private/*.h $(DISTDIR)/include/wx/osx/private
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
-	$(CP_P) $(INCDIR)/wx/osx/cocoa/*.h $(DISTDIR)/include/wx/osx/cocoa
+	$(CP_P) $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
-	$(CP_P) $(INCDIR)/wx/osx/iphone/*.h $(DISTDIR)/include/wx/osx/iphone
+	mkdir $(DISTDIR)/src/mac/corefoundation
-	mkdir $(DISTDIR)/include/wx/osx/core
+	$(CP_P) $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
-	mkdir $(DISTDIR)/include/wx/osx/core/private
-	$(CP_P) $(INCDIR)/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
-	$(CP_P) $(INCDIR)/wx/osx/core/private/*.h $(DISTDIR)/include/wx/osx/core/private
-	mkdir $(DISTDIR)/src/osx/core
-	$(CP_P) $(MACDIR)/core/*.cpp $(DISTDIR)/src/osx/core
-	mkdir $(DISTDIR)/src/osx/cocoa
-	$(CP_P) $(MACDIR)/cocoa/*.mm $(DISTDIR)/src/osx/cocoa
-	mkdir $(DISTDIR)/src/osx/iphone
-	$(CP_P) $(MACDIR)/iphone/*.mm $(DISTDIR)/src/osx/iphone
 	mkdir $(DISTDIR)/src/html/htmlctrl
 	mkdir $(DISTDIR)/src/html/htmlctrl/webkit
 	$(CP_P) $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit
-	mkdir $(DISTDIR)/src/osx/carbon
+	mkdir $(DISTDIR)/src/mac/carbon
-	$(CP_P) $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/osx/carbon
+	$(CP_P) $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon
-	$(CP_P) $(MACDIR)/carbon/*.mm $(DISTDIR)/src/osx/carbon
+	$(CP_P) $(MACDIR)/carbon/*.mm $(DISTDIR)/src/mac/carbon
-	$(CP_P) $(MACDIR)/carbon/*.icns $(DISTDIR)/src/osx/carbon
+	$(CP_P) $(MACDIR)/carbon/*.icns $(DISTDIR)/src/mac/carbon
-	$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/osx/carbon
+	$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
-	$(CP_P) $(MACDIR)/carbon/*.h $(DISTDIR)/src/osx/carbon
+	$(CP_P) $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon
-	$(CP_P) $(MACDIR)/carbon/*.r $(DISTDIR)/src/osx/carbon
+	$(CP_P) $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon
-	mkdir $(DISTDIR)/src/wxWindows.xcodeproj
+	mkdir $(DISTDIR)/src/mac/carbon/morefile
-	$(CP_P) $(WXDIR)/src/wxWindows.xcodeproj/* $(DISTDIR)/src/wxWindows.xcodeproj
+	$(CP_P) $(MACDIR)/carbon/morefile/*.h $(DISTDIR)/src/mac/carbon/morefile
+	$(CP_P) $(MACDIR)/carbon/morefile/*.c $(DISTDIR)/src/mac/carbon/morefile
+	mkdir $(DISTDIR)/src/mac/carbon/morefilex
+	$(CP_P) $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
+	$(CP_P) $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
+	$(CP_P) $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
+	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 COCOA_DIST: ALL_GUI_DIST
 	$(CP_P) $(INCDIR)/wx/cocoa/*.h $(DISTDIR)/include/wx/cocoa
 	$(CP_P) $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa
 	$(CP_P) $(COCOADIR)/*.cpp $(DISTDIR)/src/cocoa
 	$(CP_P) $(COCOADIR)/*.r $(DISTDIR)/src/cocoa
-	mkdir $(DISTDIR)/include/wx/osx/core
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
-	$(CP_P) $(INCDIR)/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
+	$(CP_P) $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
-	mkdir $(DISTDIR)/src/osx/core
+	mkdir $(DISTDIR)/src/mac/corefoundation
-	$(CP_P) $(MACDIR)/core/*.cpp $(DISTDIR)/src/osx/core
+	$(CP_P) $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
-	mkdir $(DISTDIR)/src/osx/carbon
+	mkdir $(DISTDIR)/src/mac/carbon
-	$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/osx/carbon
+	$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
-	$(CP_P) $(MACDIR)/carbon/wxmac.icns $(DISTDIR)/src/osx/carbon
+	$(CP_P) $(MACDIR)/carbon/wxmac.icns $(DISTDIR)/src/mac/carbon
+	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MSW_DIST: UNIV_DIST
 	mkdir $(DISTDIR)/include/wx/msw/ole
@@ -456,11 +419,10 @@ MSW_DIST: UNIV_DIST
 	$(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	$(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw
 	$(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
+	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
-	mkdir $(DISTDIR)/build/msw
+	mkdir $(DISTDIR)/include/wx/msw
-	$(CP_P) $(WXDIR)/build/msw/* $(DISTDIR)/build/msw
-	$(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/include/wx/msw/ole
 	mkdir $(DISTDIR)/include/wx/msw/wince
 	$(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
@@ -468,14 +430,16 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	$(CP_P) $(INCDIR)/wx/msw/*.manifest $(DISTDIR)/include/wx/msw
 	$(CP_P) $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	$(CP_P) $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince
+	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/msw/ole
 	mkdir $(DISTDIR)/src/msw/wince
 	$(CP_P) $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
-	$(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw
 	$(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	$(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 	$(CP_P) $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
 	$(CP_P) $(SRCDIR)/*.??? $(DISTDIR)/src
+	$(CP_P) $(SRCDIR)/*.?? $(DISTDIR)/src
+	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 UNIV_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/include/wx/univ
@@ -495,6 +459,7 @@ MGL_DIST: UNIV_DIST
 	$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
 	mkdir $(DISTDIR)/src/msdos
 	$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
+	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
@@ -510,6 +475,8 @@ DEMOS_DIST: ALL_GUI_DIST
 	$(CP_P) $(DEMODIR)/bombs/*.rc $(DISTDIR)/demos/bombs
 	$(CP_P) $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 
+	$(CP_PR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+
 	mkdir $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
 	$(CP_P) $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
@@ -556,14 +523,11 @@ DEMOS_DIST: ALL_GUI_DIST
 SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
 
 	# copy files common to all samples in a general way
-	for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
+	for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
-		    -mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
+		    -mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
 	    t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
 	    mkdir -p $$t; \
 	    $(CP_P) $$s/Makefile.in \
@@ -581,7 +545,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	done
 
 	# copy the rest, not covered by the above loop
-	$(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/animate
+	$(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/hourglass.ani
 	$(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate
 
 	$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
@@ -626,6 +590,8 @@ SAMPLES_DIST: ALL_GUI_DIST
 
 	$(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
 
+	$(CP_P) $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
+
 	$(CP_P) $(SAMPDIR)/opengl/penguin/trackball.c $(DISTDIR)/samples/opengl/penguin
 	$(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin
 	$(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
@@ -647,21 +613,13 @@ UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
 	$(CP_P) $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
 
-	mkdir $(DISTDIR)/utils/screenshotgen
+	mkdir $(DISTDIR)/utils/tex2rtf
-	mkdir $(DISTDIR)/utils/screenshotgen/src
+	mkdir $(DISTDIR)/utils/tex2rtf/src
-	mkdir $(DISTDIR)/utils/screenshotgen/src/bitmaps
+	$(CP_P) $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
-	$(CP_P) $(UTILSDIR)/screenshotgen/README.txt $(DISTDIR)/utils/screenshotgen
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
-	$(CP_P) $(UTILSDIR)/screenshotgen/*.in $(DISTDIR)/utils/screenshotgen
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
-	$(CP_P) $(UTILSDIR)/screenshotgen/src/*.* $(DISTDIR)/utils/screenshotgen/src
+	$(CP_P) $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
-	$(CP_P) $(UTILSDIR)/screenshotgen/src/bitmaps/*.* $(DISTDIR)/utils/screenshotgen/src/bitmaps
+	-$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
-
-	mkdir $(DISTDIR)/utils/ifacecheck
-	mkdir $(DISTDIR)/utils/ifacecheck/src
-	$(CP_P) $(UTILSDIR)/ifacecheck/README.txt $(DISTDIR)/utils/ifacecheck
-	$(CP_P) $(UTILSDIR)/ifacecheck/*.dtd $(DISTDIR)/utils/ifacecheck
-	$(CP_P) $(UTILSDIR)/ifacecheck/*.xsl $(DISTDIR)/utils/ifacecheck
-	$(CP_P) $(UTILSDIR)/ifacecheck/*.in $(DISTDIR)/utils/ifacecheck
-	$(CP_P) $(UTILSDIR)/ifacecheck/src/* $(DISTDIR)/utils/ifacecheck/src
 
 	mkdir $(DISTDIR)/utils/emulator
 	mkdir $(DISTDIR)/utils/emulator/src
@@ -681,6 +639,13 @@ UTILS_DIST: ALL_GUI_DIST
 	$(CP_P) $(UTILSDIR)/hhp2cached/*.cpp $(DISTDIR)/utils/hhp2cached
 	$(CP_P) $(UTILSDIR)/hhp2cached/*.rc $(DISTDIR)/utils/hhp2cached
 
+	mkdir $(DISTDIR)/utils/HelpGen
+	mkdir $(DISTDIR)/utils/HelpGen/src
+	$(CP_P) $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
+	$(CP_P) $(UTILSDIR)/HelpGen/src/Makefile.in $(DISTDIR)/utils/HelpGen/src
+	$(CP_P) $(UTILSDIR)/HelpGen/src/*.h $(DISTDIR)/utils/HelpGen/src
+	$(CP_P) $(UTILSDIR)/HelpGen/src/*.cpp $(DISTDIR)/utils/HelpGen/src
+
 	mkdir $(DISTDIR)/utils/helpview
 	mkdir $(DISTDIR)/utils/helpview/src
 	mkdir $(DISTDIR)/utils/helpview/src/bitmaps
@@ -714,49 +679,14 @@ INTL_DIST:
 
 MANUAL_DIST:
 	mkdir $(DISTDIR)/docs
-	mkdir $(DISTDIR)/docs/doxygen
+	mkdir $(DISTDIR)/docs/latex
-	mkdir $(DISTDIR)/docs/doxygen/groups
+	mkdir $(DISTDIR)/docs/latex/wx
-	mkdir $(DISTDIR)/docs/doxygen/images
+	$(CP_P) $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
-	mkdir $(DISTDIR)/docs/doxygen/images/stock
+	$(CP_P) $(DOCDIR)/latex/wx/*.inc $(DISTDIR)/docs/latex/wx
-	mkdir $(DISTDIR)/docs/doxygen/images/wxgtk
+	$(CP_P) $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
-	mkdir $(DISTDIR)/docs/doxygen/images/wxmac
+	$(CP_P) $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
-	mkdir $(DISTDIR)/docs/doxygen/images/wxmsw
+	$(CP_P) $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
-	mkdir $(DISTDIR)/docs/doxygen/mainpages
+	$(CP_P) $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
-	mkdir $(DISTDIR)/docs/doxygen/overviews
-	$(CP_P) $(DOCDIR)/doxygen/* $(DISTDIR)/docs/doxygen
-	$(CP_P) $(DOCDIR)/doxygen/groups/*.h $(DISTDIR)/docs/doxygen/groups
-	$(CP_P) $(DOCDIR)/doxygen/mainpages/*.h $(DISTDIR)/docs/doxygen/mainpages
-	$(CP_P) $(DOCDIR)/doxygen/overviews/*.h $(DISTDIR)/docs/doxygen/overviews
-	$(CP_P) $(DOCDIR)/doxygen/images/*.??? $(DISTDIR)/docs/doxygen/images
-	$(CP_P) $(DOCDIR)/doxygen/images/wxgtk/*.??? $(DISTDIR)/docs/doxygen/images/stock
-	$(CP_P) $(DOCDIR)/doxygen/images/wxgtk/*.??? $(DISTDIR)/docs/doxygen/images/wxgtk
-	$(CP_P) $(DOCDIR)/doxygen/images/wxmac/*.??? $(DISTDIR)/docs/doxygen/images/wxmac
-	$(CP_P) $(DOCDIR)/doxygen/images/wxmsw/*.??? $(DISTDIR)/docs/doxygen/images/wxmsw
-	mkdir $(DISTDIR)/interface
-	mkdir $(DISTDIR)/interface/wx
-	mkdir $(DISTDIR)/interface/wx/aui
-	mkdir $(DISTDIR)/interface/wx/generic
-	mkdir $(DISTDIR)/interface/wx/html
-	mkdir $(DISTDIR)/interface/wx/msw
-	mkdir $(DISTDIR)/interface/wx/msw/ole
-	mkdir $(DISTDIR)/interface/wx/protocol
-	mkdir $(DISTDIR)/interface/wx/propgrid
-	mkdir $(DISTDIR)/interface/wx/richtext
-	mkdir $(DISTDIR)/interface/wx/stc
-	mkdir $(DISTDIR)/interface/wx/xml
-	mkdir $(DISTDIR)/interface/wx/xrc
-	$(CP_P) $(IFACEDIR)/wx/*.h $(DISTDIR)/interface/wx
-	$(CP_P) $(IFACEDIR)/wx/aui/*.h $(DISTDIR)/interface/wx/aui
-	$(CP_P) $(IFACEDIR)/wx/generic/*.h $(DISTDIR)/interface/wx/generic
-	$(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html
-	$(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw
-	$(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole
-	$(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol
-	$(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid
-	$(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext
-	$(CP_P) $(IFACEDIR)/wx/stc/*.h $(DISTDIR)/interface/wx/stc
-	$(CP_P) $(IFACEDIR)/wx/xml/*.h $(DISTDIR)/interface/wx/xml
-	$(CP_P) $(IFACEDIR)/wx/xrc/*.h $(DISTDIR)/interface/wx/xrc
 
 
 # Copy all the files from wxPython needed for the Debian source package,
@@ -804,8 +734,8 @@ distdir: @GUIDIST@
 	@# now prune away a lot of the crap included by using cp -R
 	@# in other dist targets.
 	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
-			\( -name "makefile.*" -a ! -name "makefile.gcc" -a ! -name "makefile.unx" \) \) \
+			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-			-print | egrep -v '/samples/.*\.hh.$$' | xargs rm -rf
+			-print | egrep -v '/(samples|dbbrowse)/.*\.hh.$$' | xargs rm -rf
 
 dist: distdir
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
@@ -849,14 +779,8 @@ bzip-dist: @GUIDIST@
 	mv wxDemos demos; \
 	fi
 
-win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DIST
+# RR: Copy text and binary data separatly
-	for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
+win-dist: MSW_ZIP_TEXT_DIST
-		    -mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
-	    t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
-	    $(CP_P) \
-		    `find $$s -maxdepth 1 -name '*.dsp' -o -name '*.vcproj'` $$t; \
-	done
-# RR: Copy text and binary data separately
 	@echo "*** Creating wxWidgets ZIP distribution in $(DISTDIR)..."
 	@cd _dist_dir && mv $(DISTDIRNAME) wxMSW
 	@cd _dist_dir && zip -r -l  ../$(WXARCHIVE_ZIP) *
@@ -880,6 +804,7 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	@# in other dist targets.  Ugly and hardly portable but it
 	@# will run on any Debian box and that's enough for now.
 
+	rm -rf $(DISTDIR)/contrib/build
 	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
 			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
 			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \

build/bakefiles/monolithic.bkl

@@ -4,8 +4,8 @@
 
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
-            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(QA_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
-            $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RICHTEXT_SRC) $(STC_SRC)
+            $(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
@@ -19,16 +19,9 @@
         <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>
-        <!-- STC stuff, should this be conditionalized? -->
-        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
-        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
-        <define>__WX__</define>
-        <define>SCI_LEXER</define>
-        <define>LINK_LEXERS</define>
-        <library>$(wxscintilla_library_link)</library>
     </dll>
 
     <lib id="monolib" template="wx_lib"
@@ -39,12 +32,6 @@
         <if cond="FORMAT=='watcom'">
             <set var="LIB_PAGESIZE" overwrite="1">8192</set>
         </if>
-        <!-- STC stuff, should this be conditionalized? -->
-        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
-        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
-        <define>__WX__</define>
-        <define>SCI_LEXER</define>
-        <define>LINK_LEXERS</define>
     </lib>
 
 

build/bakefiles/multilib.bkl

@@ -3,20 +3,6 @@
 
 <makefile>
 
-    <define-rule name="wxshortcut" extends="phony">
-        <template>
-            <set var="name">$(id.replace('wx',''))</set>
-            <set var="namedll">
-                <if cond="SHARED=='1'">$(name)dll</if>
-            </set>
-            <set var="namelib">
-                <if cond="SHARED=='0'">$(name)lib</if>
-            </set>
-            <depends>$(namedll)</depends>
-            <depends>$(namelib)</depends>
-        </template>
-    </define-rule>
-
     <!-- ================================================================= -->
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->
@@ -36,8 +22,6 @@
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxbase" cond="MONOLITHIC=='0'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
 
 
@@ -60,8 +44,6 @@
         <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxnet" cond="MONOLITHIC=='0'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
 
 
@@ -86,8 +68,6 @@
         <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxcore" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
 
 
@@ -112,8 +92,6 @@
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxadv" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
 
 
@@ -129,7 +107,6 @@
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
         <library>coredll</library>
         <library>basedll</library>
-        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
     </dll>
 
     <lib id="medialib" template="wx_lib"
@@ -138,11 +115,52 @@
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxmedia" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_MEDIA=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
 
 
+    <!-- ================================================================= -->
+    <!--                        DB classes library                         -->
+    <!-- ================================================================= -->
+
+    <dll id="odbcdll" template="wx_base_dll"
+         cond="SHARED=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_ODBC</define>
+        <sources>$(ODBC_SRC)</sources>
+        <msvc-headers>$(ODBC_HDR)</msvc-headers>
+        <library>basedll</library>
+        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
+    </dll>
+
+    <lib id="odbclib" template="wx_base_lib"
+        cond="SHARED=='0' and USE_ODBC=='1' and MONOLITHIC=='0'">
+        <sources>$(ODBC_SRC)</sources>
+        <msvc-headers>$(ODBC_HDR)</msvc-headers>
+    </lib>
+
+
+    <dll id="dbgriddll" template="wx_dll"
+         cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_DBGRID</define>
+        <sources>$(DBGRID_SRC)</sources>
+        <msvc-headers>$(DBGRID_HDR)</msvc-headers>
+        <library>advdll</library>
+        <library>odbcdll</library>
+        <library>coredll</library>
+        <library>basedll</library>
+    </dll>
+
+    <lib id="dbgridlib" template="wx_lib"
+        cond="SHARED=='0' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
+        <sources>$(DBGRID_SRC)</sources>
+        <msvc-headers>$(DBGRID_HDR)</msvc-headers>
+    </lib>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
+
+
     <!-- ================================================================ -->
     <!--                               wxHTML                             -->
     <!-- ================================================================ -->
@@ -158,19 +176,12 @@
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </dll>
 
-    <!-- use this to conditonally link against htmldll with <library>: -->
-    <set var="htmldll_library_link">
-        <if cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">htmldll</if>
-    </set>
-
     <lib id="htmllib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
         <sources>$(HTML_SRC)</sources>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxhtml" cond="MONOLITHIC=='0' and USE_HTML=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
 
     <!-- ================================================================ -->
@@ -203,8 +214,6 @@
         <msvc-headers>$(QA_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxqa" cond="MONOLITHIC=='0' and USE_QA=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
 
     <!-- ================================================================ -->
@@ -227,8 +236,6 @@
         <msvc-headers>$(XML_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxxml" cond="MONOLITHIC=='0'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
 
     <!-- ================================================================ -->
@@ -240,7 +247,7 @@
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_XRC</define>
         <sources>$(XRC_SRC)</sources>
-        <library>$(htmldll_library_link)</library>
+        <library>htmldll</library>
         <library>advdll</library>
         <library>coredll</library>
         <library>xmldll</library>
@@ -254,8 +261,6 @@
         <msvc-headers>$(XRC_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxxrc" cond="MONOLITHIC=='0' and USE_XRC=='1'"/>
-
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
 
     <!-- ================================================================ -->
@@ -278,36 +283,9 @@
         <sources>$(AUI_SRC)</sources>
         <msvc-headers>$(AUI_HDR)</msvc-headers>
     </lib>
-    
-    <wxshortcut id="wxaui" cond="MONOLITHIC=='0' and USE_AUI=='1'"/>
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
 
-    <!-- ================================================================ -->
-    <!--                            PROPGRID                              -->
-    <!-- ================================================================ -->
-
-    <dll id="propgriddll" template="wx_dll"
-         cond="SHARED=='1' and USE_PROPGRID=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_PROPGRID</define>
-        <sources>$(PROPGRID_SRC)</sources>
-        <library>advdll</library>
-        <library>coredll</library>
-        <library>basedll</library>
-        <msvc-headers>$(PROPGRID_HDR)</msvc-headers>
-    </dll>
-
-    <lib id="propgridlib" template="wx_lib"
-         cond="SHARED=='0' and USE_PROPGRID=='1' and MONOLITHIC=='0'">
-        <sources>$(PROPGRID_SRC)</sources>
-        <msvc-headers>$(PROPGRID_HDR)</msvc-headers>
-    </lib>
-    
-    <wxshortcut id="wxpropgrid" cond="MONOLITHIC=='0' and USE_PROPGRID=='1'"/>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">propgrid=propgridlib+propgriddll</set>
-
     <!-- ================================================================ -->
     <!--                            RICHTEXT                              -->
     <!-- ================================================================ -->
@@ -318,7 +296,7 @@
         <define>WXMAKINGDLL_RICHTEXT</define>
         <sources>$(RICHTEXT_SRC)</sources>
         <library>advdll</library>
-        <library>$(htmldll_library_link)</library>
+        <library>htmldll</library>
         <library>xmldll</library>
         <library>coredll</library>
         <library>basedll</library>
@@ -330,43 +308,7 @@
         <sources>$(RICHTEXT_SRC)</sources>
         <msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
     </lib>
-    
-    <wxshortcut id="wxrichtext" cond="MONOLITHIC=='0' and USE_RICHTEXT=='1'"/>
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
 
-    <!-- ================================================================ -->
-    <!--                            STC                                   -->
-    <!-- ================================================================ -->
-
-    <template id="stc_base">
-        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
-        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
-        <define>__WX__</define>
-        <define>SCI_LEXER</define>
-        <define>LINK_LEXERS</define>
-        <cppflags-borland>-w-8027</cppflags-borland>
-        <library>wxscintilla</library>
-    </template>
-
-    <dll id="stcdll" template="wx_dll,stc_base"
-         cond="SHARED=='1' and USE_STC=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_STC</define>
-        <sources>$(STC_SRC)</sources>
-        <library>coredll</library>
-        <library>basedll</library>
-        <msvc-headers>$(STC_HDR)</msvc-headers>
-    </dll>
-
-    <lib id="stclib" template="wx_lib,stc_base"
-         cond="SHARED=='0' and USE_STC=='1' and MONOLITHIC=='0'">
-        <sources>$(STC_SRC)</sources>
-        <msvc-headers>$(STC_HDR)</msvc-headers>
-    </lib>
-    
-    <wxshortcut id="wxstc" cond="MONOLITHIC=='0' and USE_STC=='1'"/>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">stc=stclib+stcdll</set>
-
 </makefile>

build/bakefiles/odbc.bkl

@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <if cond="FORMAT=='autoconf'">
+        <option name="wxUSE_ODBC"/>
+        <set var="LIB_ODBC">
+            <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</if>
+        </set>
+    </if>
+    <if cond="FORMAT!='autoconf'">
+        <set var="wxUSE_ODBC">
+            <if cond="PLATFORM_UNIX=='1'">builtin</if>
+            <if cond="PLATFORM_UNIX=='0'">0</if>
+        </set>
+        <set var="LIB_ODBC">
+            <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
+        </set>
+    </if>
+    <set var="INC_ODBC">
+        <if cond="wxUSE_ODBC=='builtin'">$(TOP_SRCDIR)src/odbc</if>
+    </set>
+
+    <lib id="wxodbc" template="3rdparty_lib"
+         cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
+        <dirname>$(LIBDIRNAME)</dirname>
+        <sources>
+            src/iodbc/catalog.c
+            src/iodbc/connect.c
+            src/iodbc/dlf.c
+            src/iodbc/dlproc.c
+            src/iodbc/execute.c
+            src/iodbc/fetch.c
+            src/iodbc/hdbc.c
+            src/iodbc/henv.c
+            src/iodbc/herr.c
+            src/iodbc/hstmt.c
+            src/iodbc/info.c
+            src/iodbc/itrace.c
+            src/iodbc/misc.c
+            src/iodbc/prepare.c
+            src/iodbc/result.c
+        </sources>
+    </lib>
+
+</makefile>