tagging soures before removing of ODBC library

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

BuildSVN.txt

@@ -123,6 +123,23 @@ 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 SVN sources using svn 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 SVN sources using svn
+  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
 ----------------------------------------
 

acinclude.m4

@@ -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,9 +332,28 @@ 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)
@@ -321,12 +377,24 @@ AC_DEFUN([WX_ARG_SYS_WITH],
                         else
                           AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
                         fi
+                        cache=yes
                       ],
                       [
+                        LINE=`grep "^$3=" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
+                        fi
+
                         AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
+          if test "x$cache" = xyes; then
+            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+          fi
 
           if test "$$3" = yes; then
             AC_MSG_RESULT(yes)
@@ -341,7 +409,7 @@ 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],
         [
@@ -362,12 +430,24 @@ AC_DEFUN([WX_ARG_WITH],
                         else
                           AS_TR_SH(wx_cv_use_$1)='$3=no'
                         fi
+                        cache=yes
                       ],
                       [
+                        LINE=`grep "^$3=" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
+                        fi
+
                         AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
+          if test "x$cache" = xyes; then
+            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+          fi
 
           if test x"$withstring" = xwithout; then
             if test $$3 = yes; then
@@ -415,12 +495,24 @@ AC_DEFUN([WX_ARG_ENABLE],
                           else
                             AS_TR_SH(wx_cv_use_$1)='$3=no'
                           fi
+                          cache=yes
                         ],
                         [
+                          LINE=`grep "^$3=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
+                          fi
+
                           AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
                         ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
+          if test "x$cache" = xyes; then
+            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+          fi
 
           if test x"$enablestring" = xdisable; then
             if test $$3 = yes; then
@@ -453,7 +545,8 @@ 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
+dnl                     wxUSE_FOO=$DEFAULT_wxUSE_FOO
 dnl
 AC_DEFUN([WX_ARG_ENABLE_PARAM],
         [
@@ -462,12 +555,24 @@ AC_DEFUN([WX_ARG_ENABLE_PARAM],
           AC_ARG_ENABLE($1, [$2],
                         [
                           wx_cv_use_$1="$3='$enableval'"
+                          cache=yes
                         ],
                         [
+                          LINE=`grep "^$3=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                          else
+                            cache=no
+                          fi
+
                           wx_cv_use_$1='$3='$DEFAULT_$3
                         ])
 
           eval "$wx_cv_use_$1"
+          if test "x$cache" = xyes; then
+            echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
+          fi
 
           AC_MSG_RESULT([$$3])
         ])
@@ -707,3 +812,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

@@ -13,10 +13,7 @@
 
 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])

art/addbookm.xpm

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

art/back.xpm

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

art/cdrom.xpm

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

art/copy.xpm

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

art/cross.xpm

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

art/cut.xpm

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

art/deffile.xpm

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

art/delbookm.xpm

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

art/delete.xpm

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

art/dir_up.xpm

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

art/down.xpm

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

art/exefile.xpm

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

art/fileopen.xpm

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

art/filesave.xpm

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

art/filesaveas.xpm

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

art/find.xpm

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

art/findrepl.xpm

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

art/floppy.xpm

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

art/folder.xpm

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

art/folder_open.xpm

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

art/forward.xpm

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

art/gtk/error.xpm

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

art/gtk/info.xpm

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

art/gtk/question.xpm

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

art/gtk/warning.xpm

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

art/harddisk.xpm

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

art/helpicon.xpm

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

art/home.xpm

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

art/htmbook.xpm

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

art/htmfoldr.xpm

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

art/htmoptns.xpm

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

art/htmpage.xpm

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

art/htmsidep.xpm

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

art/listview.xpm

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

art/missimg.xpm

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

art/motif/error.xpm

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

art/motif/info.xpm

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

art/motif/question.xpm

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

art/motif/warning.xpm

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

art/new.xpm

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

art/new_dir.xpm

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

art/paste.xpm

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

art/print.xpm

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

art/quit.xpm

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

art/redo.xpm

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

art/removable.xpm

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

art/repview.xpm

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

art/tick.xpm

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

art/tipicon.xpm

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

art/toparent.xpm

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

art/undo.xpm

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

art/up.xpm

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

art/wxwin16x16.xpm

@@ -1,161 +1,25 @@
-/* XPM */
-static const char *const wxwin16x16_xpm[] = {
-"16 16 142 2",
-"  	c None",
-". 	c #7171C0",
-"+ 	c #7D7DC7",
-"@ 	c #8181CE",
-"# 	c #7979CE",
-"$ 	c #7171CE",
-"% 	c #6868CD",
-"& 	c #5050C0",
-"* 	c #7C7CCB",
-"= 	c #D3D3FC",
-"- 	c #C0C0FF",
-"; 	c #B1B1FF",
-"> 	c #A4A4FF",
-", 	c #9696FF",
-"' 	c #6B6BE3",
-") 	c #3E3EC0",
-"! 	c #7B7BD3",
-"~ 	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.                  ",
-"                                ",
-"                                "};
+/* XPM */
+static char *wxwin16x16_xpm[] = {
+"16 16 6 1",
+" 	c None",
+".	c #000000",
+"X	c #000084",
+"o	c #FFFFFF",
+"O	c #FFFF00",
+"+	c #FF0000",
+"                ",
+"                ",
+"    .......     ",
+"    .XXXXX.     ",
+"    .oXXXX.     ",
+"    .oXXX.......",
+".....oXXX.OOOOO.",
+".+++.XXXX.oOOOO.",
+".o++......oOOOO.",
+".o++++.  .oOOOO.",
+".o++++.  .OOOOO.",
+".+++++.  .......",
+".......         ",
+"                ",
+"                ",
+"                "};

art/wxwin32x32.xpm

@@ -1,442 +1,41 @@
-/* XPM */
-static const char *const wxwin32x32_xpm[] = {
-"32 32 407 2",
-"  	c None",
-". 	c #7373C1",
-"+ 	c #6E6EBF",
-"@ 	c #6B6BBF",
-"# 	c #6868BF",
-"$ 	c #6464BF",
-"% 	c #6161BF",
-"& 	c #5E5EBF",
-"* 	c #5A5ABF",
-"= 	c #5959C0",
-"- 	c #7171C0",
-"; 	c #7272C1",
-"> 	c #8686CE",
-", 	c #8686D0",
-"' 	c #8282D0",
-") 	c #7D7DD0",
-"! 	c #7979D0",
-"~ 	c #7575D0",
-"{ 	c #7171D0",
-"] 	c #6D6DD0",
-"^ 	c #6666CD",
-"/ 	c #5151C1",
-"( 	c #4C4CBF",
-"_ 	c #7171C1",
-": 	c #7272C2",
-"< 	c #C1C1F2",
-"[ 	c #D7D7FF",
-"} 	c #C9C9FF",
-"| 	c #C2C2FF",
-"1 	c #BBBBFF",
-"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#                                        ",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                                                                "};
+/* XPM */
+static char *wxwin32x32_xpm[] = {
+"32 32 6 1",
+" 	c None",
+".	c #000000",
+"X	c #000084",
+"o	c #FFFFFF",
+"O	c #FFFF00",
+"+	c #FF0000",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"        ..............          ",
+"        .XXXXXXXXXXXX.          ",
+"        .XXXXXXXXXXXX.          ",
+"        .XooXXXXXXXXX.          ",
+"        .XooXXXXXXXXX.          ",
+"        .XooXXXXXXXXX.          ",
+"        .XooXXXXXX..............",
+"        .XooXXXXXX.OOOOOOOOOOOO.",
+".........XooXXXXXX.OOOOOOOOOOOO.",
+".+++++++.XooXXXXXX.OooOOOOOOOOO.",
+".+++++++.XooXXXXXX.OooOOOOOOOOO.",
+".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
+".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
+".+oo++++...........OooOOOOOOOOO.",
+".+oo+++++++++.    .OooOOOOOOOOO.",
+".+oo+++++++++.    .OooOOOOOOOOO.",
+".+oo+++++++++.    .OooOOOOOOOOO.",
+".+oo+++++++++.    .OOOOOOOOOOOO.",
+".+oo+++++++++.    .OOOOOOOOOOOO.",
+".++++++++++++.    ..............",
+".++++++++++++.                  ",
+"..............                  ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "};

autogen.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-autoconf -B build/autoconf_prepend-include
+autoconf

build/aclocal/atomic_builtins.m4

@@ -6,17 +6,14 @@ 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_MSG_CHECKING([for __sync_fetch_* builtins])
     AC_CACHE_VAL(wx_cv_cc_gcc_atomic_builtins, [
-      AC_TRY_LINK(
+      AC_TRY_COMPILE(
         [],
         [
-          unsigned int value=0;
-          /* wxAtomicInc doesn't use return value here */
-          __sync_fetch_and_add(&value, 2);
+          int value=0;
+          __sync_fetch_and_add(&value, 1);
           __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)

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

@@ -59,36 +59,6 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
     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],
 [
@@ -147,29 +117,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],
 [
@@ -247,12 +194,6 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
     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,9 +213,7 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
 
             Darwin)
                 AC_BAKEFILE_PROG_MW$1
-                if test "$MW$1" != "yes"; then
-                    AC_BAKEFILE_PROG_XL$1
-                fi
+                AC_BAKEFILE_PROG_XL$1
                 ;;
 
             IRIX*)
@@ -282,11 +221,8 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
                 ;;
 
             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
+                dnl Sun CC is now available under Linux too
+                AC_BAKEFILE_PROG_SUN$1
                 ;;
 
             HP-UX*)

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,9 +309,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       ;;
 
       *-*-linux* )
-        dnl newer icc versions use -fPIC just as gcc does and, in fact, the
-        dnl newest (v10+) ones don't even understand -KPIC any longer
-        if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then
+        if test "$INTELCC" = "yes"; then
             PIC_FLAG="-KPIC"
         elif test "x$SUNCXX" = "xyes"; then
             SHARED_LD_CC="${CC} -G -o"
@@ -337,7 +331,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,8 +489,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
-      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
-      *-*-k*bsd*-gnu | *-*-mirbsd* )
+      *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
         if test "x$SUNCXX" = "xyes"; then
             SONAME_FLAG="-h "
         else
@@ -646,21 +639,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
-    dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80
-    AC_MSG_CHECKING([for command to install directories])
-    INSTALL_TEST_DIR=acbftest$$
-    $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
-    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 current value of shell variable, hence the single quoting:
-        INSTALL_DIR='$(INSTALL) -d'
-        AC_MSG_RESULT([$INSTALL -d])
-    else
-        INSTALL_DIR="mkdir -p"
-        AC_MSG_RESULT([mkdir -p])
-    fi
+    case ${BAKEFILE_HOST} in
+        *-hp-hpux* )
+            dnl HP-UX install doesn't handle the "-d" switch so don't
+            dnl use it there
+            INSTALL_DIR="mkdir -p"
+            ;;
+        * )
+            dnl we must refer to makefile's $(INSTALL) variable and not
+            dnl current value of shell variable, hence the single quoting:
+            INSTALL_DIR='$(INSTALL) -d'
+            ;;
+    esac
     AC_SUBST(INSTALL_DIR)
 
     LDFLAGS_GUI=
@@ -749,19 +739,20 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
                     GCC_PCH=1
                 ],
                 [
-                    if test "$INTELCXX8" = "yes"; then
-                        AC_MSG_RESULT([yes])
-                        ICC_PCH=1
-                        if test "$INTELCXX10" = "yes"; then
-                            ICC_PCH_CREATE_SWITCH="-pch-create"
-                            ICC_PCH_USE_SWITCH="-pch-use"
-                        else
-                            ICC_PCH_CREATE_SWITCH="-create-pch"
-                            ICC_PCH_USE_SWITCH="-use-pch"
-                        fi
-                    else
-                        AC_MSG_RESULT([no])
-                    fi
+                    AC_TRY_COMPILE([],
+                        [
+                            #if !defined(__INTEL_COMPILER) || \
+                                (__INTEL_COMPILER < 800)
+                                There is no PCH support
+                            #endif
+                        ],
+                        [
+                            AC_MSG_RESULT([yes])
+                            ICC_PCH=1
+                        ],
+                        [
+                            AC_MSG_RESULT([no])
+                        ])
                 ])
             if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
                 USE_PCH=1
@@ -777,8 +768,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 +798,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 +818,7 @@ AC_DEFUN([AC_BAKEFILE],
     AC_BAKEFILE_DEPS
     AC_BAKEFILE_RES_COMPILERS
 
-    dnl OBJCFLAGS is set by Autoconf, but OBJCXXFLAGS is not:
-    AC_SUBST(OBJCXXFLAGS)
-
-
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.6"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.2"
 
     dnl includes autoconf_inc.m4:
     $1
@@ -867,20 +846,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}?
-
-    # determine location of created files:
+    if test ${D}{status} != 0 ; then
+        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 +878,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 +915,8 @@ elif test ${D}DEPSMODE = mwcc ; then
         fi
         prevarg="${D}arg"
     done
-
-    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
+    ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.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 +937,8 @@ elif test ${D}DEPSMODE = unixcc; then
         esac
         shift
     done
-
-    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
+    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
     exit 0
-
 else
     ${D}*
     exit ${D}?
@@ -1013,10 +969,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 +981,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 +1021,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 +1032,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 +1057,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 +1067,6 @@ header="${D}{2}"
 shift
 shift
 
-builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\`
-
 compiler=""
 headerfile=""
 
@@ -1135,7 +1079,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 +1098,8 @@ else
     else
         mkdir -p \`dirname ${D}{outfile}\`
     fi
-    depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
-    mkdir -p ${D}{builddir}/.deps
+    depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
+    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 +1111,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/autogen.mk

@@ -51,12 +51,8 @@ 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/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
@@ -25,6 +25,7 @@
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
         wx.bkl
+        ../../contrib/build/*/*.bkl
         ../../samples/*.bkl
         ../../samples/*/*.bkl
         ../../samples/*/*/*.bkl
@@ -34,48 +35,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
     </add-formats>
 
     <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        autoconf,msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
     <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2005prj
+    </del-formats>
+    <del-formats files="../../samples/mobile/mobile_samples.bkl">
+        msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2005prj
     </del-formats>
     <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2005prj
     </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
     </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 +108,19 @@
     <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
-    </add-flags>
-    <add-flags files="wx.bkl" formats="msvs2008prj">
-        -o../msw/wx_vc9.sln
+        -o../msw/wx.sln
     </add-flags>
     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </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="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
+        -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
+    </add-flags>
 
 
 
@@ -129,20 +132,6 @@
     <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">
@@ -250,20 +239,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'] 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,12 +141,17 @@
     <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>
@@ -267,7 +271,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 +288,10 @@
     <if cond="FORMAT!='autoconf'">
         <set var="GDIPLUS_LIB">
             <if cond="USE_GDIPLUS=='1'">gdiplus</if>
-        </set>
-        <set var="GFXCTX_DEFINE">
+	</set>
+	<set var="GFXCTX_DEFINE">
             <if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
-        </set>
+	</set>
     </if>
 
     <set var="LINK_TARGET_CPU">
@@ -311,6 +314,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 +350,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,6 +447,7 @@ $(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"/>
 
@@ -497,6 +512,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 +562,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>
 
@@ -637,10 +653,8 @@ $(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'">
@@ -654,6 +668,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
               template="wx_3rdparty_dependencies_gui">
         <depends>wxexpat</depends>
         <depends>wxzlib</depends>
+        <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
 
@@ -670,6 +685,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 +761,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="FORMAT in ['msvc6prj','msevc4prj'] and MONOLITHIC=='0'">
+        <if cond="IS_MSVC_PRJ=='1' 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>
-            </if>
+            <define>NOPCH</define>
         </if>
     </template>
-
+    
     <template id="wx_util_console" template="wx_util_b">
         <app-type>console</app-type>
         <define>wxUSE_GUI=0</define>
     </template>
-
+    
     <template id="wx_sample" template="wx_util">
         <if cond="FORMAT=='autoconf'">
             <wx-mac-app-bundle/>
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
+            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
         </if>
     </template>
     <template id="wx_sample_console" template="wx_util_console">
         <if cond="FORMAT=='autoconf'">
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
+            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
         </if>
     </template>
-
-
+    
+    
     <!-- =============================================================== -->
     <!--                    Support for samples data files:              -->
     <!-- =============================================================== -->
 
-    <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
-        <define-rule name="wx-data" extends="copy-files">
-            <template>
-                <dependency-of>all</dependency-of>
-                <dstdir>$(BUILDDIR)</dstdir>
-                <srcdir>$(SRCDIR)</srcdir>
-            </template>
-
-            <!--
-            VS - FIXME:
-            Don't clean the files because it would wipe out sources files if
-            BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
-            but it would be better to delete the files during "make clean" if
-            BUILDDIR!=SRCDIR.
-
-            <define-tag name="files">
-                <clean-files>
-                    $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
-                </clean-files>
-            </define-tag>
-            -->
-        </define-rule>
-    </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>
-
+    <define-rule name="wx-data" extends="copy-files">
+        <template>
+            <dependency-of>all</dependency-of>
+            <dstdir>$(BUILDDIR)</dstdir>
+            <srcdir>$(SRCDIR)</srcdir>
+        </template>
 
+        <!--
+        VS - FIXME:
+        Don't clean the files because it would wipe out sources files if
+        BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
+        but it would be better to delete the files during "make clean" if
+        BUILDDIR!=SRCDIR.
+        
+        <define-tag name="files">
+            <clean-files>
+                $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
+            </clean-files>
+        </define-tag>
+        -->
+    </define-rule>
+    
+    
     <!-- =============================================================== -->
     <!--                    Misc platform specialities:                  -->
     <!-- =============================================================== -->
@@ -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
-         eventually removed anyway and it only doubles the number of build
-         configs in projects: -->
-    <if cond="IS_MSVC_PRJ=='1'">
-        <set var="UNICODE">1</set>
-    </if>
-    <if cond="IS_MSVC_PRJ=='0'">
-        <option name="UNICODE">
-            <values>0,1</values>
-            <values-description>,Unicode</values-description>
-            <default-value>1</default-value>
-            <description>
-                Compile Unicode build of wxWidgets?
-            </description>
-        </option>
-    </if>
+    <option name="UNICODE">
+        <values>0,1</values>
+        <values-description>,Unicode</values-description>
+        <default-value>1</default-value>
+        <description>
+            Compile Unicode build of wxWidgets?
+        </description>
+    </option>
 
     <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="IS_MSVC_PRJ=='0'">default</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</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>
@@ -245,10 +229,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 not in ['msvc','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">0</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
     </set>
     <option name="USE_QA">
         <values>0,1</values>
@@ -355,19 +347,15 @@ 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"/>
-
-        <!-- see configure.in; it's required by some samples on Mac OS X -->
-        <option name="HEADER_PAD_OPTION"/>
+        <option name="SAMPLES_RPATH_POSTLINK"/>
 
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
@@ -400,11 +388,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=='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="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
             <if cond="PLATFORM_MSDOS=='1'">MGL</if>
             <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>
@@ -415,7 +399,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 +411,10 @@ it if SHARED=1 unless you know what you are doing.
 
         <set var="WITH_PLUGIN_SDL">0</set>
 
-        <if cond="BUILDING_LIB=='1'">
-            <set-srcdir>../..</set-srcdir>
-        </if>
+        <set var="SRCDIR">
+            <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
+            <if cond="BUILDING_LIB=='0'">.</if>
+        </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
     </if>
 
@@ -458,13 +443,13 @@ 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>
@@ -492,17 +477,15 @@ Set the version of your Mingw installation here.
     </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_EXCEPTIONS">0</set>
-        </if>
+        <set var="USE_RTTI">0</set>
+        <set var="USE_EXCEPTIONS">0</set>
     </if>
 
     <!-- Need for wxUniv within wxMGL: -->

build/bakefiles/formats/FORMATS.bkmanifest

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

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">
-        $(TOP_SRCDIR)src/osx/carbon/Info.plist.in
+    <set var="BUNDLE_PLIST">
+        $(TOP_SRCDIR)src/mac/carbon/Info.plist.in
     </set>
-    <set var="BUNDLE_ICON" overwrite="0">
-        $(TOP_SRCDIR)src/osx/carbon/wxmac.icns
+    <set var="BUNDLE_ICONS">
+        $(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"
-                    cond="target and PLATFORM_MACOSX=='1'"/>
+        
+        <add-target target="$(BUNDLE_TGT)" type="action"/>
         <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_RESOURCES)</depends-on-file>
+            <depends-on-file>$(BUNDLE_ICONS)</depends-on-file>
 
             <command>
                 <!-- create the directories: -->
@@ -61,24 +54,17 @@
                 <!-- PkgInfo: -->
                 echo -n "APPL????" >$(BUNDLE)/PkgInfo
 
-                <!-- move the binary: -->
-                cp $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
+                <!-- make a hardlink to the binary: -->
+                ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
 
-                <!-- copy the application icon: -->
-                cp -f $(BUNDLE_ICON) $(BUNDLE)/Resources/wxmac.icns
-	        </command>            
-            <if cond="BUNDLE_RESOURCES!=''">
-                <command>
-                    <!-- copy all other bundle resources: -->
-                    cp -f $(BUNDLE_RESOURCES) $(BUNDLE)/Resources
-                </command>
-            </if>
- 
+                <!-- ditto wxWidgets resources and icons: -->
+                cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
+            </command>            
         </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,7 +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
@@ -33,11 +32,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 +121,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 +138,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/libsample/*.* $(DISTDIR)/build/bakefiles/wxpresets/libsample
+	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
 	mkdir $(DISTDIR)/build/aclocal
 	$(CP_P) $(WXDIR)/build/aclocal/*.m4 $(DISTDIR)/build/aclocal
 
@@ -160,112 +163,65 @@ 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/stc
 	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
-
-	mkdir $(DISTDIR)/src/propgrid
-	$(CP_P) $(PROPGRIDDIR)/*.cpp $(DISTDIR)/src/propgrid
-
-	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) $(STCDIR)/*.cpp $(DISTDIR)/src/stc
+	$(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
+	$(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
+	$(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
 	$(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
-
-	mkdir $(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)/*.h $(DISTDIR)/src/tiff
+	$(CP_P) $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
 	$(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,17 +240,17 @@ 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/stc
-	mkdir $(DISTDIR)/include/wx/osx
-	mkdir $(DISTDIR)/include/wx/osx/carbon
-	mkdir $(DISTDIR)/include/wx/osx/core
+	mkdir $(DISTDIR)/include/wx/mac
+	mkdir $(DISTDIR)/include/wx/mac/carbon
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
 	mkdir $(DISTDIR)/include/wx/os2
 	mkdir $(DISTDIR)/include/wx/palmos
 	mkdir $(DISTDIR)/src/unix
-	mkdir $(DISTDIR)/src/osx
-	mkdir $(DISTDIR)/src/osx/core
-	mkdir $(DISTDIR)/src/osx/carbon
+	mkdir $(DISTDIR)/src/mac
+	mkdir $(DISTDIR)/src/mac/corefoundation
+	mkdir $(DISTDIR)/src/mac/carbon
+	mkdir $(DISTDIR)/src/mac/carbon/morefilex
 	mkdir $(DISTDIR)/src/msdos
 	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/os2
@@ -310,10 +266,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 +274,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 +317,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/gtk/hildon
-	$(CP_P) $(INCDIR)/wx/gtk/hildon/*.h $(DISTDIR)/include/wx/gtk/hildon
-	$(CP_P) $(GTKDIR)/hildon/*.cpp $(DISTDIR)/src/gtk/hildon
+	mkdir $(DISTDIR)/src/mac
+	mkdir $(DISTDIR)/src/mac/corefoundation
+	$(CP_P) $(WXDIR)/src/mac/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
+	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
-	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
+	$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 X11_DIST: UNIV_DIST
 	$(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
@@ -366,12 +334,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/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
+	mkdir $(DISTDIR)/src/mac
+	mkdir $(DISTDIR)/src/mac/corefoundation
+	$(CP_P) $(WXDIR)/src/mac/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
+	mkdir $(DISTDIR)/include/wx/mac
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
+	$(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 +359,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/osx/carbon/private
-	mkdir $(DISTDIR)/include/wx/osx/cocoa
-	mkdir $(DISTDIR)/include/wx/osx/iphone
-	$(CP_P) $(INCDIR)/wx/osx/*.h $(DISTDIR)/include/wx/osx
-	$(CP_P) $(INCDIR)/wx/osx/carbon/*.h $(DISTDIR)/include/wx/osx/carbon
-	$(CP_P) $(INCDIR)/wx/osx/carbon/private/*.h $(DISTDIR)/include/wx/osx/carbon/private
-	$(CP_P) $(INCDIR)/wx/osx/private/*.h $(DISTDIR)/include/wx/osx/private
-	$(CP_P) $(INCDIR)/wx/osx/cocoa/*.h $(DISTDIR)/include/wx/osx/cocoa
-	$(CP_P) $(INCDIR)/wx/osx/iphone/*.h $(DISTDIR)/include/wx/osx/iphone
-	mkdir $(DISTDIR)/include/wx/osx/core
-	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)/include/wx/mac/carbon
+	mkdir $(DISTDIR)/include/wx/mac/private
+	mkdir $(DISTDIR)/include/wx/mac/carbon/private
+	$(CP_P) $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
+	$(CP_P) $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon
+	$(CP_P) $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private
+	$(CP_P) $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
+	$(CP_P) $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
+	mkdir $(DISTDIR)/src/mac/corefoundation
+	$(CP_P) $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
 	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
-	$(CP_P) $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/osx/carbon
-	$(CP_P) $(MACDIR)/carbon/*.mm $(DISTDIR)/src/osx/carbon
-	$(CP_P) $(MACDIR)/carbon/*.icns $(DISTDIR)/src/osx/carbon
-	$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/osx/carbon
-	$(CP_P) $(MACDIR)/carbon/*.h $(DISTDIR)/src/osx/carbon
-	$(CP_P) $(MACDIR)/carbon/*.r $(DISTDIR)/src/osx/carbon
-	mkdir $(DISTDIR)/src/wxWindows.xcodeproj
-	$(CP_P) $(WXDIR)/src/wxWindows.xcodeproj/* $(DISTDIR)/src/wxWindows.xcodeproj
+	mkdir $(DISTDIR)/src/mac/carbon
+	$(CP_P) $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon
+	$(CP_P) $(MACDIR)/carbon/*.mm $(DISTDIR)/src/mac/carbon
+	$(CP_P) $(MACDIR)/carbon/*.icns $(DISTDIR)/src/mac/carbon
+	$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
+	$(CP_P) $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon
+	$(CP_P) $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon
+	mkdir $(DISTDIR)/src/mac/carbon/morefile
+	$(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
-	$(CP_P) $(INCDIR)/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
-	mkdir $(DISTDIR)/src/osx/core
-	$(CP_P) $(MACDIR)/core/*.cpp $(DISTDIR)/src/osx/core
-	mkdir $(DISTDIR)/src/osx/carbon
-	$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/osx/carbon
-	$(CP_P) $(MACDIR)/carbon/wxmac.icns $(DISTDIR)/src/osx/carbon
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
+	$(CP_P) $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
+	mkdir $(DISTDIR)/src/mac/corefoundation
+	$(CP_P) $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
+	mkdir $(DISTDIR)/src/mac/carbon
+	$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/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 +424,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
-	$(CP_P) $(WXDIR)/build/msw/* $(DISTDIR)/build/msw
-	$(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
+	mkdir $(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 +435,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 +464,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 +480,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 +528,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 \
-		    -mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
+	for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
+		    -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 +550,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 +595,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 +618,13 @@ UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
 	$(CP_P) $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
 
-	mkdir $(DISTDIR)/utils/screenshotgen
-	mkdir $(DISTDIR)/utils/screenshotgen/src
-	mkdir $(DISTDIR)/utils/screenshotgen/src/bitmaps
-	$(CP_P) $(UTILSDIR)/screenshotgen/README.txt $(DISTDIR)/utils/screenshotgen
-	$(CP_P) $(UTILSDIR)/screenshotgen/*.in $(DISTDIR)/utils/screenshotgen
-	$(CP_P) $(UTILSDIR)/screenshotgen/src/*.* $(DISTDIR)/utils/screenshotgen/src
-	$(CP_P) $(UTILSDIR)/screenshotgen/src/bitmaps/*.* $(DISTDIR)/utils/screenshotgen/src/bitmaps
-
-	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/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.* $(DISTDIR)/utils/tex2rtf/src
 
 	mkdir $(DISTDIR)/utils/emulator
 	mkdir $(DISTDIR)/utils/emulator/src
@@ -681,6 +644,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 +684,14 @@ INTL_DIST:
 
 MANUAL_DIST:
 	mkdir $(DISTDIR)/docs
-	mkdir $(DISTDIR)/docs/doxygen
-	mkdir $(DISTDIR)/docs/doxygen/groups
-	mkdir $(DISTDIR)/docs/doxygen/images
-	mkdir $(DISTDIR)/docs/doxygen/images/stock
-	mkdir $(DISTDIR)/docs/doxygen/images/wxgtk
-	mkdir $(DISTDIR)/docs/doxygen/images/wxmac
-	mkdir $(DISTDIR)/docs/doxygen/images/wxmsw
-	mkdir $(DISTDIR)/docs/doxygen/mainpages
-	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
+	mkdir $(DISTDIR)/docs/latex
+	mkdir $(DISTDIR)/docs/latex/wx
+	$(CP_P) $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
+	$(CP_P) $(DOCDIR)/latex/wx/*.inc $(DISTDIR)/docs/latex/wx
+	$(CP_P) $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
+	$(CP_P) $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
+	$(CP_P) $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
+	$(CP_P) $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
 
 
 # Copy all the files from wxPython needed for the Debian source package,
@@ -804,8 +739,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" \) \) \
-			-print | egrep -v '/samples/.*\.hh.$$' | xargs rm -rf
+			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
+			-print | egrep -v '/(samples|dbbrowse)/.*\.hh.$$' | xargs rm -rf
 
 dist: distdir
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
@@ -849,14 +784,8 @@ bzip-dist: @GUIDIST@
 	mv wxDemos demos; \
 	fi
 
-win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DIST
-	for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
-		    -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
+# RR: Copy text and binary data separatly
+win-dist: MSW_ZIP_TEXT_DIST
 	@echo "*** Creating wxWidgets ZIP distribution in $(DISTDIR)..."
 	@cd _dist_dir && mv $(DISTDIRNAME) wxMSW
 	@cd _dist_dir && zip -r -l  ../$(WXARCHIVE_ZIP) *
@@ -880,6 +809,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)
-            $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RICHTEXT_SRC) $(STC_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
+            $(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC) $(STC_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
@@ -19,10 +19,10 @@
         <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? -->
+	<!-- 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>
@@ -39,7 +39,7 @@
         <if cond="FORMAT=='watcom'">
             <set var="LIB_PAGESIZE" overwrite="1">8192</set>
         </if>
-        <!-- STC stuff, should this be conditionalized? -->
+	<!-- 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>

build/bakefiles/multilib.bkl

@@ -129,7 +129,6 @@
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
         <library>coredll</library>
         <library>basedll</library>
-        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
     </dll>
 
     <lib id="medialib" template="wx_lib"
@@ -143,6 +142,51 @@
     <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>
+
+    <!-- <wxshortcut id="wxodbc" cond="MONOLITHIC=='0' and USE_ODBC=='1'"/> -->
+    <wxshortcut id="wxdbgrid" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_ODBC=='1'"/>
+
+    <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                             -->
     <!-- ================================================================ -->
@@ -283,31 +327,6 @@
 
     <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                              -->
     <!-- ================================================================ -->

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>

build/bakefiles/opengl.bkl

@@ -28,7 +28,6 @@
         <depends>coredll</depends>
         <!-- link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
-        <depends>monodll</depends>
 
         <ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
     </dll>

build/bakefiles/scintilla.bkl

@@ -15,20 +15,6 @@
         $(TOP_SRCDIR)src/stc/scintilla/include
     </set>
 
-    <!-- automatically update generated files when building the library -->
-    <if cond="BUILDING_LIB=='1'">
-        <fragment format='autoconf'>
-@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
-@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
-@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
-@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
-@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
-@COND_PYTHON@@COND_USE_STC_1@	cd $(srcdir)/src/stc &amp;&amp; ./gen_iface.py
-@COND_PYTHON@@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
-@COND_PYTHON@@COND_USE_STC_1@    $(srcdir)/include/wx/stc/stc.h
-        </fragment>
-    </if>
-
     <lib id="wxscintilla" template="3rdparty_lib"
          cond="USE_STC=='1' and BUILDING_LIB=='1'">
         <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
@@ -38,101 +24,90 @@
         <define>LINK_LEXERS</define>
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
-            src/stc/scintilla/src/AutoComplete.cxx
-            src/stc/scintilla/src/CallTip.cxx
-            src/stc/scintilla/src/CellBuffer.cxx
-            src/stc/scintilla/src/CharClassify.cxx
-            src/stc/scintilla/src/ContractionState.cxx
-            src/stc/scintilla/src/Decoration.cxx
-            src/stc/scintilla/src/Document.cxx
-            src/stc/scintilla/src/DocumentAccessor.cxx
-            src/stc/scintilla/src/Editor.cxx
-            src/stc/scintilla/src/ExternalLexer.cxx
-            src/stc/scintilla/src/Indicator.cxx
-            src/stc/scintilla/src/KeyMap.cxx
-            src/stc/scintilla/src/KeyWords.cxx
-            src/stc/scintilla/src/LexAPDL.cxx
-            src/stc/scintilla/src/LexAU3.cxx
-            src/stc/scintilla/src/LexASY.cxx
-            src/stc/scintilla/src/LexAVE.cxx
-            src/stc/scintilla/src/LexAbaqus.cxx
-            src/stc/scintilla/src/LexAda.cxx
-            src/stc/scintilla/src/LexAsm.cxx
-            src/stc/scintilla/src/LexAsn1.cxx
-            src/stc/scintilla/src/LexBaan.cxx
-            src/stc/scintilla/src/LexBash.cxx
-            src/stc/scintilla/src/LexBasic.cxx
-            src/stc/scintilla/src/LexBullant.cxx
-            src/stc/scintilla/src/LexCLW.cxx
-            src/stc/scintilla/src/LexCmake.cxx
-            src/stc/scintilla/src/LexCPP.cxx
-            src/stc/scintilla/src/LexCSS.cxx
-            src/stc/scintilla/src/LexCaml.cxx
-            src/stc/scintilla/src/LexCsound.cxx
-            src/stc/scintilla/src/LexConf.cxx
-            src/stc/scintilla/src/LexCrontab.cxx
-            src/stc/scintilla/src/LexD.cxx
-            src/stc/scintilla/src/LexEScript.cxx
-            src/stc/scintilla/src/LexEiffel.cxx
-            src/stc/scintilla/src/LexErlang.cxx
-            src/stc/scintilla/src/LexFlagship.cxx
-            src/stc/scintilla/src/LexForth.cxx
-            src/stc/scintilla/src/LexFortran.cxx
-            src/stc/scintilla/src/LexGAP.cxx
-            src/stc/scintilla/src/LexGui4Cli.cxx
-            src/stc/scintilla/src/LexHTML.cxx
-            src/stc/scintilla/src/LexHaskell.cxx
-            src/stc/scintilla/src/LexInno.cxx
-            src/stc/scintilla/src/LexKix.cxx
-            src/stc/scintilla/src/LexLisp.cxx
-            src/stc/scintilla/src/LexLout.cxx
-            src/stc/scintilla/src/LexLua.cxx
-            src/stc/scintilla/src/LexMMIXAL.cxx
-            src/stc/scintilla/src/LexMPT.cxx
-            src/stc/scintilla/src/LexMSSQL.cxx
-            src/stc/scintilla/src/LexMatlab.cxx
-            src/stc/scintilla/src/LexMetapost.cxx
-            src/stc/scintilla/src/LexNsis.cxx
-            src/stc/scintilla/src/LexOpal.cxx
-            src/stc/scintilla/src/LexOthers.cxx
-            src/stc/scintilla/src/LexPB.cxx
-            src/stc/scintilla/src/LexPLM.cxx
-            src/stc/scintilla/src/LexPOV.cxx
-            src/stc/scintilla/src/LexProgress.cxx
-            src/stc/scintilla/src/LexPS.cxx
-            src/stc/scintilla/src/LexPascal.cxx
-            src/stc/scintilla/src/LexPerl.cxx
-            src/stc/scintilla/src/LexPython.cxx
-            src/stc/scintilla/src/LexR.cxx
-            src/stc/scintilla/src/LexRebol.cxx
-            src/stc/scintilla/src/LexRuby.cxx
-            src/stc/scintilla/src/LexSQL.cxx
-            src/stc/scintilla/src/LexSmalltalk.cxx
-            src/stc/scintilla/src/LexTADS3.cxx
-            src/stc/scintilla/src/LexScriptol.cxx
-            src/stc/scintilla/src/LexSpecman.cxx
-            src/stc/scintilla/src/LexSpice.cxx
-            src/stc/scintilla/src/LexTCL.cxx
-            src/stc/scintilla/src/LexTeX.cxx
-            src/stc/scintilla/src/LexVB.cxx
-            src/stc/scintilla/src/LexVHDL.cxx
-            src/stc/scintilla/src/LexVerilog.cxx
-            src/stc/scintilla/src/LexYAML.cxx
-            src/stc/scintilla/src/LineMarker.cxx
-            src/stc/scintilla/src/PositionCache.cxx
-            src/stc/scintilla/src/PropSet.cxx
-            src/stc/scintilla/src/RESearch.cxx
-            src/stc/scintilla/src/RunStyles.cxx
-            src/stc/scintilla/src/ScintillaBase.cxx
-            src/stc/scintilla/src/Style.cxx
-            src/stc/scintilla/src/StyleContext.cxx
-            src/stc/scintilla/src/UniConversion.cxx
-            src/stc/scintilla/src/ViewStyle.cxx
-            src/stc/scintilla/src/WindowAccessor.cxx
-            src/stc/scintilla/src/XPM.cxx
+	    src/stc/scintilla/src/AutoComplete.cxx
+	    src/stc/scintilla/src/CallTip.cxx
+	    src/stc/scintilla/src/CellBuffer.cxx
+	    src/stc/scintilla/src/CharClassify.cxx
+	    src/stc/scintilla/src/ContractionState.cxx
+	    src/stc/scintilla/src/Document.cxx
+	    src/stc/scintilla/src/DocumentAccessor.cxx
+	    src/stc/scintilla/src/Editor.cxx
+	    src/stc/scintilla/src/ExternalLexer.cxx
+	    src/stc/scintilla/src/Indicator.cxx
+	    src/stc/scintilla/src/KeyMap.cxx
+	    src/stc/scintilla/src/KeyWords.cxx
+	    src/stc/scintilla/src/LexAPDL.cxx
+	    src/stc/scintilla/src/LexAU3.cxx
+	    src/stc/scintilla/src/LexAVE.cxx
+	    src/stc/scintilla/src/LexAda.cxx
+	    src/stc/scintilla/src/LexAsm.cxx
+	    src/stc/scintilla/src/LexAsn1.cxx
+	    src/stc/scintilla/src/LexBaan.cxx
+	    src/stc/scintilla/src/LexBash.cxx
+	    src/stc/scintilla/src/LexBasic.cxx
+	    src/stc/scintilla/src/LexBullant.cxx
+	    src/stc/scintilla/src/LexCLW.cxx
+	    src/stc/scintilla/src/LexCPP.cxx
+	    src/stc/scintilla/src/LexCSS.cxx
+	    src/stc/scintilla/src/LexCaml.cxx
+	    src/stc/scintilla/src/LexCsound.cxx
+	    src/stc/scintilla/src/LexConf.cxx
+	    src/stc/scintilla/src/LexCrontab.cxx
+	    src/stc/scintilla/src/LexEScript.cxx
+	    src/stc/scintilla/src/LexEiffel.cxx
+	    src/stc/scintilla/src/LexErlang.cxx
+	    src/stc/scintilla/src/LexFlagship.cxx
+	    src/stc/scintilla/src/LexForth.cxx
+	    src/stc/scintilla/src/LexFortran.cxx
+	    src/stc/scintilla/src/LexGui4Cli.cxx
+	    src/stc/scintilla/src/LexHTML.cxx
+	    src/stc/scintilla/src/LexHaskell.cxx
+	    src/stc/scintilla/src/LexInno.cxx
+	    src/stc/scintilla/src/LexKix.cxx
+	    src/stc/scintilla/src/LexLisp.cxx
+	    src/stc/scintilla/src/LexLout.cxx
+	    src/stc/scintilla/src/LexLua.cxx
+	    src/stc/scintilla/src/LexMMIXAL.cxx
+	    src/stc/scintilla/src/LexMPT.cxx
+	    src/stc/scintilla/src/LexMSSQL.cxx
+	    src/stc/scintilla/src/LexMatlab.cxx
+	    src/stc/scintilla/src/LexMetapost.cxx
+	    src/stc/scintilla/src/LexNsis.cxx
+	    src/stc/scintilla/src/LexOpal.cxx
+	    src/stc/scintilla/src/LexOthers.cxx
+	    src/stc/scintilla/src/LexPB.cxx
+	    src/stc/scintilla/src/LexPOV.cxx
+	    src/stc/scintilla/src/LexPS.cxx
+	    src/stc/scintilla/src/LexPascal.cxx
+	    src/stc/scintilla/src/LexPerl.cxx
+	    src/stc/scintilla/src/LexPython.cxx
+	    src/stc/scintilla/src/LexRebol.cxx
+	    src/stc/scintilla/src/LexRuby.cxx
+	    src/stc/scintilla/src/LexSQL.cxx
+	    src/stc/scintilla/src/LexSmalltalk.cxx
+	    src/stc/scintilla/src/LexTADS3.cxx
+	    src/stc/scintilla/src/LexScriptol.cxx
+	    src/stc/scintilla/src/LexSpecman.cxx
+	    src/stc/scintilla/src/LexSpice.cxx
+	    src/stc/scintilla/src/LexTCL.cxx
+	    src/stc/scintilla/src/LexTeX.cxx
+	    src/stc/scintilla/src/LexVB.cxx
+	    src/stc/scintilla/src/LexVHDL.cxx
+	    src/stc/scintilla/src/LexVerilog.cxx
+	    src/stc/scintilla/src/LexYAML.cxx
+	    src/stc/scintilla/src/LineMarker.cxx
+	    src/stc/scintilla/src/PropSet.cxx
+	    src/stc/scintilla/src/RESearch.cxx
+	    src/stc/scintilla/src/ScintillaBase.cxx
+	    src/stc/scintilla/src/Style.cxx
+	    src/stc/scintilla/src/StyleContext.cxx
+	    src/stc/scintilla/src/UniConversion.cxx
+	    src/stc/scintilla/src/ViewStyle.cxx
+	    src/stc/scintilla/src/WindowAccessor.cxx
+	    src/stc/scintilla/src/XPM.cxx
         </sources>
     </lib>
-
+    
     <!-- use this to conditonally link against wxscintilla with <library>: -->
     <set var="wxscintilla_library_link">
         <if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>

build/bakefiles/wx.bkl

@@ -24,7 +24,7 @@
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
 
-    <if cond="IS_MSVC_PRJ">
+    <if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2005prj']">
         <set var="MSVC6PRJ_MERGED_TARGETS">
             <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
             <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
@@ -61,20 +61,20 @@
             <depends>xmllib</depends>
 
             <command>
-                (if test -f utils/wxrc/Makefile ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all ; fi)
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all ; fi)
             </command>
         </action>
         <action id="clean-wxrc" cond="USE_XRC=='1'">
             <dependency-of>clean</dependency-of>
             <command>
-                (if test -f utils/wxrc/Makefile ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean ; fi)
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean ; fi)
             </command>
         </action>
         <action id="install-wxrc" cond="USE_XRC=='1'">
             <dependency-of>install</dependency-of>
             <depends>wxrc</depends>
             <command>
-                (if test -f utils/wxrc/Makefile ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install ; fi)
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install ; fi)
             </command>
         </action>
 
@@ -87,7 +87,7 @@
 
         <data-files>
             <srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>
-            <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl</files>
+            <files>wx.bkl wx_unix.bkl wx_win32.bkl</files>
             <install-to>$(DATADIR)/bakefile/presets</install-to>
         </data-files>
 
@@ -101,18 +101,10 @@
             </command>
         </action>
 
-        <modify-target target="install">
-            <command>
-                $(DYLIB_RPATH_INSTALL)
-            </command>
-        </modify-target>
-
         <set var="RCDEFS_H">
             <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
         </set>
-
-
-        <data-files-tree>
+        <headers>
             <srcdir>
                 $(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx
             </srcdir>
@@ -122,17 +114,15 @@
             <install-to>
                 $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
             </install-to>
-        </data-files-tree>
+        </headers>
 
-        <!-- FIXME: make this use per-target <headers> once it supports
-                    prefix removal -->
-        <data-files-tree>
+        <headers>
             <srcdir>$(SRCDIR)/include</srcdir>
             <files>$(ALL_HEADERS)</files>
             <install-to>
                 $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
             </install-to>
-        </data-files-tree>
+        </headers>
 
         <!-- Locales: -->
         <using module="gettext"/>
@@ -151,7 +141,7 @@
             <linguas>it</linguas>
             <install-to>$(LOCALEDIR)</install-to>
         </gettext-catalogs>
-
+                
 
         <!-- Mac OS X resources: -->
         <set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>
@@ -177,8 +167,8 @@
     </if>
 
 
-    <!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
-    <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+    <!-- copy setup.h on DOS/OS2/Windows: -->
+    <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
@@ -208,6 +198,7 @@
             <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
             <dst>$(SETUPHDIR)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>
+
     </if>
 
 
@@ -230,7 +221,7 @@
             <depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
 
             <command>
-                $(DOLLAR)(CPP) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
+                $(DOLLAR)(CPP) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </command>
 
         </action>

build/bakefiles/wxpresets/bakefile_quickstart.txt

@@ -19,7 +19,7 @@ all the native project files for wxWidgets. So now, even though wxWidgets
 supports all these formats, wxWidgets developers need only update one file -
 the Bakefile, and it handles the rest. But Bakefile isn't specific to
 wxWidgets in any way - you can use Bakefile for your own projects, too. This
-brief tutorial will take a look at how to do that.
+brief tutorial will take a look at how to do that. 
 
 Note that this tutorial assumes that you are familiar with how to build
 software using one of the supported Bakefile makefile systems, that you have
@@ -31,11 +31,10 @@ including FreeBSD, Linux, Mac OS X, and various other operating systems.
 -- Getting Started --
 
 First, you'll need to install Bakefile. You can always find the latest version
-for download online at http://www.bakefile.org. A binary installer is provided
+for download online at http://bakefile.sf.net. A binary installer is provided
 for Windows users, while users of Unix-based operating systems (OS) will need
-to unpack the tarball and run configure && make && make install. (binary
-packages for some Linux distributions are also available, check
-http://www.bakefile.org/download.html for details).
+to unpack the tarball and run configure && make && make install. (Packages for
+some distros are also available, check http://bakefile.sf.net for details.)
 
 -- Setting Up Your wx Build Environment --
 
@@ -76,12 +75,13 @@ minimal.bkl
 
     <include file="presets/wx.bkl"/>
 
-    <exe id="minimal" template="wxgui">
+    <exe id="minimal" template="wx">
+        <app-type>gui</app-type>
         <debug-info>on</debug-info>
         <runtime-libs>dynamic</runtime-libs>
-
+        
         <sources>minimal.cpp</sources>
-
+        
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
     </exe>
@@ -90,7 +90,7 @@ minimal.bkl
 ---------------------------------------------------------------
 
 It's a complete sample ready to be baked, so go into the directory mentioned
-above and run the following command:
+above and run the following command: 
 
 On Windows:
 bakefile -f msvc -I.. minimal.bkl
@@ -138,7 +138,7 @@ how to use autoconf. Unfortunately, this topic deserves a book all its own and
 is beyond the scope of this tutorial, but a book on the subject can be found
 online at: http://sources.redhat.com/autobook/. Note that you do not need to
 use automake when you are using Bakefile, just autoconf, as Bakefile
-essentially does the same thing as automake.
+essentially does the same thing as automake. 
 ----------------------------
 
 -- Targets --
@@ -195,7 +195,7 @@ their makefiles. (i.e. DEBUG or static/dynamic library options) Also, it is
 common to have to use settings from another project; for example, any project
 that uses wxWidgets will need to build using the same flags and options that
 wxWidgets was built with. Bakefile makes these things easier by allowing users
-to create Bakefile templates, where you can store common settings.
+to create Bakefile templates, where you can store common settings. 
 
 Bakefile ships with a couple of templates, found in the 'presets' subfolder of
 your Bakefile installation. The "simple.bkl" template adds a DEBUG option to
@@ -213,19 +213,15 @@ make -f GNUmakefile DEBUG=1
 
 In order to build the software in debug mode.
 
-To simplify the building of wxWidgets-based projects, wxWidgets contains a
+To simplify the building of wxWidgets-based projects, wxWidgets contains a a
 set of Bakefiles that automatically configure your build system to be
 compatible with wxWidgets. As you'll notice in the sample above, the sample
-project uses the "wxgui" template. Once you've included the template, your software
-will now build as a GUI application with wxWidgets support.
-
-There's also "wxconsole" template for building console-based wxWidgets applications
-and "wx" template that doesn't specify application type (GUI or console) and can be
-used e.g. for building libraries that use wxWidgets.
+project uses the wx template. Once you've included the template, your software
+will now build with wxWidgets support. 
 
 But since the wx presets don't exist in the Bakefile presets subfolder,
 Bakefile needs to know where to find these presets. The "-I" command adds the
-wxpresets folder to Bakefile's search path.
+wxpresets folder to Bakefile's search path. 
 
 If you regularly include Bakefile presets in places other than the Bakefile
 presets folder, then you can set the BAKEFILE_PATHS environment variable so
@@ -234,19 +230,19 @@ way you no longer need to specify the -I flag each time you build.
 
 Lastly, it's important to note that the Win 32 wx project Bakefiles come with
 some common build options that users can use when building the software. These
-options are:
+options are: 
 
     Option              Values              Description
     ------              ------              -------------
-    WX_MONOLITHIC       0(default),1        Set this to 1 if you built wx
+    WX_MONOLITHIC       0(default),1        Set this to 1 if you built wx 
                                             as a monolithic library
     WX_SHARED           0(default),1        Specify static or dynamic wx libs
-    WX_UNICODE          0(default),1        Use ANSI or UNICODE wx libs
+    WX_UNICODE          0(defualt),1        Use ANSI or UNICODE wx libs
     WX_DEBUG            0,1(default)        Use release or debug wx libs
     *WX_VERSION         25,26(default)      Specify version of wx libs
 
 *Note: Any version of wx past 2.5 will be allowed here, so 25/26 is not a
-complete list of values.
+complete list of values. 
 
 These options are not needed under Unix as wx-config can be used to specify
 these options.
@@ -254,7 +250,7 @@ these options.
 -- bakefile_gen - Automated Bakefile Scripts --
 
 If you have a large project, you can imagine that the calls to Bakefile would
-get more and more complex and unwieldy to manage. For this reason, a script
+get more and more complex and unwieldly to manage. For this reason, a script
 called bakefile_gen was created, which reads in a .bkgen file that provides
 all the commands needed to build all the makefiles your project supports. A
 discussion of how to use bakefile_gen is beyond the scope of this tutorial,

build/bakefiles/wxpresets/presets/wx.bkl

@@ -24,13 +24,10 @@
 
     - wx, wx-lib: templates to be used respectively for <dll>/<exe> and <lib>
                   targets; they add all the wxWidgets-related settings (e.g. the
-                  include and library search paths, the __WXDEBUG__ symbol, etc).
+                  include and library search paths, the __WXDEBUG__ symbol, etc)
 
-    - wxgui: to be used when building GUI-mode applications.
-
-    - wxconsole: to be used when building console-only applications
-                 (NOTE: it doesn't add the wxUSE_GUI=0 define since you don't
-                 need it when compiling wxBase-only code).
+    - wxconsole: to be used when building console-only libraries or apps
+                 (adds the wxUSE_GUI=0 define).
 
     - wxlike: this template should be combined with "wx" or "wx-lib" and will
               make your project build with the same Unicode, debug & shared
@@ -66,7 +63,7 @@
     - <wxlike-dirname>: sets the output directory for the current target to $(value)
                         when on Unix and to e.g. $(value)/vc_lib when on Windows,
                         i.e. acts like <dirname> just following wxWidgets naming rules.
-                        Useful to allow multiple builds of the
+                        Useful to allow multiple builds of the 
 
     - <wxlike-paths>: if your library/application needs to compile & link with both
                       wxWidgets and some other wx-based library, which in turn
@@ -90,10 +87,11 @@
 
         <wx-lib>richtext</wx-lib>
         <wx-lib>aui</wx-lib>
-        <wx-lib>propgrid</wx-lib>
         <wx-lib>stc</wx-lib>
         <wx-lib>qa</wx-lib>
+        <wx-lib>dbgrid</wx-lib>
         <wx-lib>gl</wx-lib>
+        <wx-lib>odbc</wx-lib>
         <wx-lib>xrc</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>media</wx-lib>
@@ -112,7 +110,7 @@
 
 
     <!-- this variable identifies the version of the wx presets.
-         this is changed only when major changes to wxpresets take place.
+         this is changed only when major changes to wxpresets take place. 
     -->
     <set var="WX_PRESETS_VERSION">4</set>
 
@@ -121,11 +119,11 @@
                          tag definitions.
     -->
     <set var="WX_LIB_LIST">
-        base core net xml xrc html adv media gl qa aui propgrid richtext stc
+        base core net xml odbc xrc html adv media gl dbgrid qa aui richtext stc
     </set>
 
     <!-- if you define this variable to 0 before including wx presets, the
-         "test_for_selected_wxbuild" target which is added by default in win32 and GNU
+         "test_for_selected_wxbuild" target which is added by default in win32 and GNU 
          makefiles, won't be added.
          This is useful when e.g. you want to have wxWidgets as an optional
          dependency and thus you don't want to perform that check unconditionally.
@@ -168,7 +166,7 @@
 
     <!-- Presets for limited dmars make.exe format: -->
     <if cond="FORMAT=='dmars'">
-        <set var="WX_UNICODE">1</set>
+        <set var="WX_UNICODE">0</set>
         <set var="WX_DEBUG">1</set>
         <set var="WX_SHARED">0</set>
     </if>
@@ -201,7 +199,7 @@
     <!-- Configuration for building the bakefile with               -->
     <!-- unicode strings or not (unicode or ansi).                  -->
     <if cond="not isdefined('WX_UNICODE')">
-        <set var="WX_UNICODE_DEFAULT" overwrite="0">1</set>
+        <set var="WX_UNICODE_DEFAULT" overwrite="0">0</set>
         <option name="WX_UNICODE">
             <values>0,1</values>
             <values-description>ANSI,Unicode</values-description>
@@ -249,7 +247,7 @@
     <!-- The directory where wxWidgets is installed: -->
     <if cond="not isdefined('WX_DIR')">
         <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
-        <option name="WX_DIR" category="path" never_empty="1">
+        <option name="WX_DIR" category="path">
             <default-value>$(WX_DIR_DEFAULT)</default-value>
             <description>
                 The directory where wxWidgets library is installed
@@ -274,8 +272,7 @@
 
 
 
-    <!--                    REAL IMPLEMENTATION                     -->
-    <!--                                                            -->
+    <!-- this is just a wrapper that includes the real implementation: -->
 
     <set var="__wx_included_impl">0</set>
 
@@ -289,13 +286,6 @@
         <set var="__wx_included_impl">1</set>
     </if>
 
-    <if cond="FORMAT=='xcode2'">
-        <!-- xCode2 is an IDE and thus reuses almost nothing from unix part of wxpresets;
-             better use the win32 part! -->
-        <include file="wx_win32.bkl"/>
-        <set var="__wx_included_impl">1</set>
-    </if>
-
     <if cond="__wx_included_impl=='0'">
         <error>This format is not (yet) supported by wx preset.</error>
     </if>
@@ -326,13 +316,9 @@
         </if>
     </template>
 
-    <!-- Template for building wx-based GUI applications -->
-    <template id="wxgui" template="wx">
-        <app-type>gui</app-type>
-    </template>
-
     <!-- Template for building wx-based console applications -->
     <template id="wxconsole" template="wx">
+        <define>wxUSE_GUI=0</define>
         <app-type>console</app-type>
     </template>
 
@@ -411,7 +397,7 @@
                     <command cond="TOOLSET in ['win32','os2','dos']">
                         if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
                     </command>
-                </modify-target>
+            </modify-target>
 
                 <!-- the following code is mostly equivalent to a:
                           <dependency-of>$(id)</dependency-of>
@@ -437,7 +423,7 @@
     </define-tag>
 
     <!-- Adds to the compiler & linker flags the path for the "include" and the
-         "lib" folders of a library following wxWidgets conventions which is
+         "lib" folders of a library following wxWidgets conventions which is 
          located in $(value).
     -->
     <define-tag name="wxlike-paths" rules="exe,lib,dll,module">
@@ -539,7 +525,4 @@
         </if>
     </define-global-tag>
 
-
-    <include file="wx_xrc.bkl"/>
-
 </makefile>

build/bakefiles/wxpresets/presets/wx_unix.bkl

@@ -8,14 +8,12 @@ See wx.bkl for platform-independent notes.
 Format-specific notes:
 
 * autoconf:
-        Beware that you have to use WX_CONFIG_OPTIONS and
-        WX_CONFIG_CHECK in your configure.in to get at least the
+        Beware that you have to use AM_OPTIONS_WXCONFIG and
+        AM_PATH_WXCONFIG in your configure.in to get at least the
         WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS option values defined.
-
         To detect the WX_* option values typically you also want to use
-        the WX_STANDARD_OPTIONS, WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS,
-        WX_CONFIG_CHECK and finally WX_DETECT_STANDARD_OPTION_VALUES macros
-        (see wxwin.m4 for more info).
+        the AM_WXPRESETS_OPTIONS and AM_WXPRESETS_CHECKS macros
+        (see wxpresets.m4 for more info).
 
 -->
 
@@ -196,7 +194,7 @@ Format-specific notes:
             </action>
         </if>
 
-        <!-- we need these vars but the trick used in the default values above
+        <!-- we need this but the trick used in default-values above
              prevents bakefile from detecting it: -->
         <set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG WX_VERSION</set>
 
@@ -207,7 +205,7 @@ Format-specific notes:
         <define-tag name="wx-lib" rules="exe,dll,module">
             <if cond="value=='base'">
                 <!-- all wx libraries should have been already specified, thus
-                    $(__liblist) should contain the full list of required wxlibs... -->
+                    $(__liblist) should contain the full list... -->
                 <set var="__liblist" append="1">base</set>
                 <ldlibs>`$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs $(','.join(__liblist.split()))`</ldlibs>
             </if>

build/bakefiles/wxpresets/presets/wx_win32.bkl

@@ -82,7 +82,10 @@
 
     <!--    All the possible mixes for the wx library names          -->
     <set var="WXLIB_BASE_NAME">
-        <if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u</if>
+        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud</if>
 
         <!--
             the trick used to support monolithic builds is here: when the
@@ -90,28 +93,50 @@
             WX_MONOLITHIC=1, then the base library is translated to the
             monolithic library
         -->
-        <if cond="WX_MONOLITHIC=='1'">wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)d</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)u</if>
+        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)ud</if>
     </set>
 
 
     <!--   Libraries whose name is prefixed with 'wxbase'            -->
     <define-global-tag name="define-wxbase-lib-name">
         <set var="WXLIB_$(value.upper())_NAME">
-            <if cond="WX_MONOLITHIC=='0'">
-                wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
+            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
+                wxbase$(WX_VERSION)_$(value)
+            </if>
+            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
+                wxbase$(WX_VERSION)d_$(value)
+            </if>
+            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
+                wxbase$(WX_VERSION)u_$(value)
+            </if>
+            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
+                wxbase$(WX_VERSION)ud_$(value)
             </if>
     </set>
     </define-global-tag>
 
     <define-wxbase-lib-name>net</define-wxbase-lib-name>
     <define-wxbase-lib-name>xml</define-wxbase-lib-name>
+    <define-wxbase-lib-name>odbc</define-wxbase-lib-name>
 
 
     <!--   Libraries whose name is prefixed with 'wx' only          -->
     <define-global-tag name="define-wxlib-name">
         <set var="WXLIB_$(value.upper())_NAME">
-            <if cond="WX_MONOLITHIC=='0'">
-                wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
+            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
+                wx$(WX_PORT)$(WX_VERSION)_$(value)
+            </if>
+            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
+                wx$(WX_PORT)$(WX_VERSION)d_$(value)
+            </if>
+            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
+                wx$(WX_PORT)$(WX_VERSION)u_$(value)
+            </if>
+            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
+                wx$(WX_PORT)$(WX_VERSION)ud_$(value)
             </if>
         </set>
     </define-global-tag>
@@ -122,12 +147,13 @@
     <define-wxlib-name>html</define-wxlib-name>
     <define-wxlib-name>adv</define-wxlib-name>
     <define-wxlib-name>qa</define-wxlib-name>
+    <define-wxlib-name>dbgrid</define-wxlib-name>
+    <define-wxlib-name>gl</define-wxlib-name>
     <define-wxlib-name>aui</define-wxlib-name>
-    <define-wxlib-name>propgrid</define-wxlib-name>
     <define-wxlib-name>stc</define-wxlib-name>
     <define-wxlib-name>richtext</define-wxlib-name>
 
-    <!-- NOTE: The GL lib is not part of the monolithic build; treat it as a contrib! -->
+
 
 
 
@@ -156,21 +182,18 @@
 
         <if cond="value=='net'"><sys-lib>$(WXLIB_NET_NAME)</sys-lib></if>
         <if cond="value=='xml'"><sys-lib>$(WXLIB_XML_NAME)</sys-lib></if>
+        <if cond="value=='odbc'"><sys-lib>$(WXLIB_ODBC_NAME)</sys-lib></if>
 
         <if cond="value=='media'"><sys-lib>$(WXLIB_MEDIA_NAME)</sys-lib></if>
         <if cond="value=='xrc'"><sys-lib>$(WXLIB_XRC_NAME)</sys-lib></if>
         <if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
         <if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
+        <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
+        <if cond="value=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if>
         <if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
         <if cond="value=='aui'"><sys-lib>$(WXLIB_AUI_NAME)</sys-lib></if>
-        <if cond="value=='propgrid'"><sys-lib>$(WXLIB_PROPGRID_NAME)</sys-lib></if>
         <if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
 
-        <!-- The GL lib isn't part of the monolithic build, treat it as a contrib: -->
-        <if cond="value=='gl'">
-            <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
-        </if>
-
         <if cond="value=='stc'">
             <!-- wxSTC requires also the basic scintilla library
                  which is built as a separate 3rd party library -->
@@ -206,10 +229,8 @@
         <define>$(WXDEBUG_DEFINE)</define>
         <define>__WXMSW__</define>
 
-        <if cond="FORMAT!='xcode2'">
-            <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
-            <include>$(WX_DIR)/include</include>
-        </if>
+        <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
+        <include>$(WX_DIR)/include</include>
     </template>
 
 
@@ -232,6 +253,7 @@
         <!-- If on borland, we don't need to do much            -->
         <if cond="FORMAT=='borland'">
             <sys-lib>ole2w32</sys-lib>
+            <sys-lib>odbc32</sys-lib>
         </if>
 
         <!-- Non-borland, on the other hand...                  -->
@@ -250,6 +272,7 @@
             <sys-lib>rpcrt4</sys-lib>
             <sys-lib>advapi32</sys-lib>
             <sys-lib>wsock32</sys-lib>
+            <sys-lib>odbc32</sys-lib>
         </if>
 
         <!-- Libs common to both borland and MSVC               -->
@@ -260,9 +283,7 @@
 
     <!-- template for wx executables/dlls: -->
     <template id="wx" template="wx-lib">
-        <if cond="FORMAT!='xcode2'">
-            <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
-        </if>
+        <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
 
         <!-- wx libs must come before 3rd party and sys libs, this is
              the place where the hack explained above is carried on: -->

build/bakefiles/wxpresets/presets/wx_xrc.bkl

@@ -1,72 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<!--
-
-Bakefile XRC support; included by wx.bkl, do not include directly.
-
-Usage:
-
-<exe id="myapp" template="wxgui,simple">
-    ...
-    <sources>...</sources>
-    ...
-    <xrc-file>myapp.xrc</xrc-file>
-    <xrc-file>file2.xrc</xrc-file>
-</exe>
-
-Then in application code, you have to call initialization for every XRC
-file:
-
-    InitXMLResource_myapp();
-    InitXMLResource_file2();
-
--->
-
-<makefile>
-
-    <!-- XRC section -->
-    <option name="WXRC" category="path">
-        <description>Path to find the wxrc executable.</description>
-        <default-value>wxrc</default-value>
-    </option>
-
-
-    <define-tag name="xrc-file" rules="exe,dll,lib">
-        <set var="_xrc_file">$(value)</set>
-        <set var="_xrc_cpp">$(value.replace('.xrc', '_xrc.cpp'))</set>
-        <set var="_xrc_base">$(value[value.rfind('/')+1:value.rfind('.')])</set>
-        <set var="_wxrc_options">-c -n InitXMLResource_$(_xrc_base)</set>
-
-        <sources>$(_xrc_cpp)</sources>
-        <if cond="FORMAT not in ['msvc6prj','msvs2003prj','msvs2005prj']">
-            <clean-files>$(_xrc_cpp)</clean-files>
-            <add-target target="$(_xrc_cpp)" type="action"/>
-            <modify-target target="$(_xrc_cpp)">
-                <set var="_xrc">$(_xrc_file)</set>
-                <depends-on-file>$(SRCDIR)/$(_xrc)</depends-on-file>
-                <command>
-                    $(WXRC) $(_wxrc_options) -o $(_xrc_cpp) $(_xrc)
-                </command>
-            </modify-target>
-        </if>
-        <if cond="FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj']">
-            <sources>$(_xrc_file)</sources>
-            <!--
-                A hack to add XRC compilation step to MSVC projects.
-
-                NB: it's important to use backslashes and not slashes here.
-             -->
-             <set var="_custom_build_files" append="1">$(_xrc_file.replace('/','\\'))</set>
-            <set var="_custom_build_$(_xrc_file.replace('/','_').replace('.','_'))">
-Compiling XRC resources: $(_xrc_file)...
-InputPath=$(_xrc_file)
-
-"$(_xrc_cpp.replace('/','\\'))" : "$(DOLLAR)(INTDIR)"
-$(TAB)$(WXRC) $(_wxrc_options) -o $(_xrc_cpp) $(_xrc_file)
-            </set>
-        </if>
-
-    </define-tag>
-
-</makefile>

build/bakefiles/wxpresets/sample/minimal.bkl

@@ -5,7 +5,8 @@
 
     <include file="presets/wx.bkl"/>
 
-    <exe id="minimal" template="wxgui">
+    <exe id="minimal" template="wx">
+        <app-type>gui</app-type>
 
         <!-- this sample builds always in debug mode; if you have
              compiled wxWidgets in release mode, you'll get link errors! -->

build/bakefiles/wxwin.py

@@ -38,20 +38,20 @@ def mk_wxid(id):
     return wxid
 
 
-# All libs that are part of the main library:
+# All libs that are part of the main library (i.e. non-contrib):
 MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
-             'media', 'qa', 'xrc', 'aui', 'propgrid', 'richtext', 'stc']
+             'media', 'odbc', 'qa', 'dbgrid', 'xrc', 'aui', 'richtext', 'stc']
 # List of library names/ids for categories with different names:
-LIBS_NOGUI = ['xml', 'net']
-LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',
-              'aui', 'propgrid', 'richtext', 'stc']
+LIBS_NOGUI = ['xml', 'net', 'odbc']
+LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media',
+              'aui', 'richtext', 'stc']
 # Additional libraries that must be linked in:
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',
     'xml' : '$(EXTRALIBS_XML)',
     'html' : '$(EXTRALIBS_HTML)',
+    'odbc' : '$(EXTRALIBS_ODBC)',
     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
-    'media' : '$(EXTRALIBS_MEDIA)',
 }
 
 def mkLibName(wxid):
@@ -84,13 +84,13 @@ def libToLink(wxlibname):
        For one of main libraries, libToLink('foo') returns '$(WXLIB_FOO)' which
        must be defined in common.bkl as either nothing (in monolithic build) or
        mkLibName('foo') (otherwise).
+       For contrib libraries, it returns mkDllName(wxlibname).       
        """
     if wxlibname in MAIN_LIBS:
         return '$(WXLIB_%s)' % wxlibname.upper()
     else:
         return mkLibName(wxlibname)
 
-
 def extraLdflags(wxlibname):
     if wxlibname in EXTRALIBS:
         return EXTRALIBS[wxlibname]
@@ -152,3 +152,7 @@ def headersOnly(files):
 def makeDspDependency(lib):
     """Returns suitable entry for <depends-on-dsp> for main libs."""
     return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)
+
+def makeContribDspDependency(lib):
+    """Returns suitable entry for <depends-on-dsp> for contrib libs."""
+    return '%s:$(nativePaths(WXTOPDIR))contrib\\build\\%s\\%s.dsp' % (lib,lib,lib)

build/buildbot/config/buildbot.css

@@ -1,45 +0,0 @@
-a:visited {
-	color: #800080;
-}
-
-td.Event, td.BuildStep, td.Activity, td.Change, td.Time, td.Builder {
-    border-top: 1px solid;
-    border-right: 1px solid;
-}
-
-td {
-    border-top: 1px solid;
-    border-right: 1px solid;
-    border-color: silver;
-}
-
-/* Activity states */
-.offline {
-        background-color: red;
-}
-.idle {
-	background-color: white;
-}
-.waiting {
-        background-color: yellow;
-}
-.building {
-        background-color: yellow;
-}
-
-/* LastBuild, BuildStep states */
-.success {
-	background-color: #72ff75;
-}
-.failure {
-	background-color: red;
-}
-.warnings {
-	background-color: #ff8000;
-}
-.exception {
-	background-color: #c000c0;
-}
-.start,.running {
-	background-color: yellow;
-}

build/buildbot/config/common.xml

@@ -9,9 +9,12 @@
     Licence:    wxWidgets licence
 -->
 
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
+<bot xmlns:xi="http://www.w3.org/2001/XInclude"
+     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+     xmlns:exsl="http://exslt.org/common"
+     xsl:version="1.0">
 
-<xi:include href="include/defs.xml"/>
+<xi:include href="include.xml" xpointer="xpointer(*/*)"/>
 
 <!--
     Quick schedulers. Builds using these are triggered after each change to
@@ -28,14 +31,14 @@
     <name>trunk_quick</name>
     <branch>trunk</branch>
     <treeStableTimer>900</treeStableTimer>
-    <fileNotImportant>docs/* interface/*</fileNotImportant>
+    <fileNotImportant>doc/*</fileNotImportant>
 </scheduler>
 
 <scheduler>
     <name>stable_quick</name>
     <branch><STABLE_BRANCH/></branch>
     <treeStableTimer>900</treeStableTimer>
-    <fileNotImportant>docs/*</fileNotImportant>
+    <fileNotImportant>doc/*</fileNotImportant>
 </scheduler>
 
 <!--
@@ -45,60 +48,56 @@
     one if it should run several times a week on particular days.
 -->
 
-<nightly-schedulers name="sunday"/>
-<nightly-schedulers name="monday"/>
-<nightly-schedulers name="tuesday"/>
-<nightly-schedulers name="wednesday"/>
-<nightly-schedulers name="thursday"/>
-<nightly-schedulers name="friday"/>
-<nightly-schedulers name="saturday"/>
+<nightly>
+    <name>sunday_6am</name>
+    <hour>6</hour>
+    <dayOfWeek>0</dayOfWeek>
+</nightly>
+
+<nightly>
+    <name>monday_6am</name>
+    <hour>6</hour>
+    <dayOfWeek>1</dayOfWeek>
+</nightly>
+
+<nightly>
+    <name>tuesday_6am</name>
+    <hour>6</hour>
+    <dayOfWeek>2</dayOfWeek>
+</nightly>
+
+<nightly>
+    <name>wednesday_6am</name>
+    <hour>6</hour>
+    <dayOfWeek>3</dayOfWeek>
+</nightly>
+
+<nightly>
+    <name>thursday_6am</name>
+    <hour>6</hour>
+    <dayOfWeek>4</dayOfWeek>
+</nightly>
+
+<nightly>
+    <name>friday_6am</name>
+    <hour>6</hour>
+    <dayOfWeek>5</dayOfWeek>
+</nightly>
+
+<nightly>
+    <name>saturday_6am</name>
+    <hour>6</hour>
+    <dayOfWeek>6</dayOfWeek>
+</nightly>
 
 <!--
     Schedulers for daily builds.
 -->
 
-<nightly-schedulers name="daily"/>
-
-<!--
-    A general purpose slave lock and ones for the trunk and stable branches.
--->
-
-<slavelock>
-    <name>slave</name>
-</slavelock>
-
-<slavelock>
-    <name>trunk</name>
-</slavelock>
-
-<slavelock>
-    <name><STABLE_BRANCH/></name>
-</slavelock>
-
-<!--
-    Map SVN user ids to email addresses.
--->
-
-<emaillookup name="wx-devs">
-    <xi:include href="include/wx-devs.xml"/>
-</emaillookup>
-
-<!--
-    Notify people on the blame list when a build goes from good to bad.
--->
-
-<mailnotifier>
-    <mode>problem</mode>
-    <lookup>wx-devs</lookup>
-</mailnotifier>
-
-<!--
-    Log every build to a mailing list.
--->
-
-<mailnotifier>
-    <extraRecipient>wx-buildbot -at- lists.wxwidgets.org</extraRecipient>
-</mailnotifier>
+<nightly>
+    <name>daily_6am</name>
+    <hour>6</hour>
+</nightly>
 
 <!--
     Track SVN changes using the wx-cvs mailing list.

build/buildbot/config/csleobuild.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       csleobuild.xml
-    Purpose:
-    Author:
-    RCS-ID:     $Id$
-    Copyright:
-    Licence:
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/csleobuild.xml"/>
-
-<build>
-    <name>OSX 10.5 Intel wxOSX Carbon trunk</name>
-    <builddir>csleo</builddir>
-    <scheduler>trunk_quick</scheduler>
-    
-    <steps>
-        <checkout/>
-        <configure/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-  <build>
-    <name>OSX 10.5 Intel wxOSX Cocoa trunk</name>
-    <builddir>csleo_cocoa</builddir>
-    <scheduler>trunk_quick</scheduler>
-
-    <steps>
-        <checkout/>
-        <configure options="--with-osx_cocoa"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-  </build>
-<build>
-    <name>OSX 10.5 Intel wxMac Stable</name>
-    <builddir>csleo_stable</builddir>
-    <scheduler>stable_quick</scheduler>
-
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-</bot>

build/buildbot/config/example.xml

@@ -16,12 +16,15 @@
     http://www.wxwidgets.org/wiki/index.php/Development:_Buildbot
 -->
 
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
+<bot xmlns:xi="http://www.w3.org/2001/XInclude"
+     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+     xmlns:exsl="http://exslt.org/common"
+     xsl:version="1.0">
 
 <!--
     Common declarations.
 -->
-<xi:include href="include/defs.xml"/>
+<xi:include href="include.xml" xpointer="xpointer(*/*)"/>
 
 <!--
     Notes:
@@ -41,39 +44,28 @@
     <name>Linux x86_64 wxGTK Stable</name>
 
     <!--
-        Unique. The name of a directory for the bulid.
+        Unique. The name of a directory for the bulid. On most slaves must
+        be a single name, on the Testdrive builds it must be a path such as
+        '/tmp/wx/td_gtk'.
     -->
     <builddir>example_gtk</builddir>
 
     <!--
-        The name of a scheduler that will trigger this build. common.xml
-        currently defines:
+        The name of a scheduler that will trigger this build. The schedulers
+        are usually defined in common.xml, look in there to see if there is
+        already one you can use, and add a new one if not.
 
-        * 'trunk_quick' and 'stable_quick'. These trigger a build after
-          every source change on the trunk and stable branches respectively.
-
-        * Weekly schedulers that fire once a week. There is one of these
-          for every half hour of the week, e.g. you have monday_0600,
-          monday_0630, etc..
-
-        * Daily schedulers that fire once a day. There is also one of these
-          for every half hour, e.g. daily_0600, daily_0630, etc..
-
-        An empty <scheduler/> element takes its value from the previous build
-        incremented in the following way:
-
-        * Weekly schedulers are incremented by a day, monday_0600 becomes
-          tuesday_0600, and at the end of the week the time is also bumped by
-          an hour, saturday_0600 becomes sunday_0700.
-
-        * Daily scheduler are incremented by an hour.
+        The 'trunk_quick' and 'stable_quick' schedulers currently in
+        common.xml trigger a build after every source change on the trunk
+        and stable branches respectively. There are also daily and weekly
+        schedulers 'daily_6am', 'monday_6am', 'tuesday_6am' and so on.
 
         The <scheduler> element can be omitted, in which case the build
         never runs automatically, but can still be triggered manually.
         Or you can use several, e.g. you could use two weekly schedulers
         that fire on different days to have a build run twice a week.
     -->
-    <scheduler>monday_0600</scheduler>
+    <scheduler>trunk_quick</scheduler>
 
     <!--
         The meaning of <sandbox> is specific to the build slave. There
@@ -125,25 +117,29 @@
         <configure/>
 
         <!--
-            Compile the wxWidgets library, subdirectories and tests.
-
-            Takes the following attributes which can all be either 'true' or
-            'false':
-                wx          - build the library
-                samples     - build the samples
-                utils       - build the utils
-                demos       - build the demos
-                contrib     - build the contrib
-                tests       - build the tests
-                msw         - the library makefile is under build\msw
-                gui         - if 'false' builds only a subset of the above
-
-            The attributes usually default to the right values.
+            Compile the library. For Windows builds use <compile-msw/>
+            instead which runs the make command in the 'build\msw'
+            subdirectory instead of the wxWidgets root.
         -->
-        <compile-all/>
+        <compile/>
 
         <!--
-            Run the test suites.
+            Compile subdirectories. There is also <compile-contrib/> for
+            branches that have contrib.
+        -->
+        <compile-samples/>
+        <compile-utils/>
+        <compile-tests/>
+
+        <!--
+            Run the test suites. For Windows builds the command to run the
+            test suite must be overridden, e.g.:
+                <run-tests>
+                    <command>PATH=..\lib\vc_dll;%PATH%</command>
+                    <command>cd tests</command>
+                    <command>vc_msw\test</command>
+                    <command>vc_msw\test_gui</command>
+                </run-tests>
         -->
         <run-tests/>
     </steps>