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

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

.cvsignore

@@ -21,22 +21,8 @@ linux-gnu.system.cache
 *.d
 *.swp
 *.swo
-*.vcp
-*.vcw
 Release
 Debug
-ReleaseUnicode
-DebugUnicode
-ReleaseUnicodeARM
-DebugUnicodeARM
-ReleaseUnicodeMIPS
-DebugUnicodeMIPS
-ReleaseUnicodeSH3
-DebugUnicodeSH3
-ReleaseUnicodeX86
-DebugUnicodeX86
-ReleaseUnicodeX86EM
-DebugUnicodeX86EM
 ReleaseDLL
 DebugDLL
 ReleaseUnicodeDLL
@@ -47,13 +33,14 @@ BaseRelease
 BaseDebug
 BaseReleaseDLL
 BaseDebugDLL
-build-debug
 robert
 stamp-h.in
 Makefile
+configure
 setup.h
 stamp-h
 libtool
+aclocal.m4
 base
 gtk
 gtk2
@@ -75,4 +62,3 @@ win32-release
 log
 univtags.cmd
 .DS_Store
-autom4te.cache

BuildCVS.txt

@@ -12,8 +12,9 @@ a) If using Microsoft Visual C++ 5.0 or 6.0
 
 Ensure that the command-line compiler and tools (including
 nmake) are installed and ready to run.  Depending on your
-installation there may be a batch file (commonly named VCVARS32.BAT)
-that needs to be run to set correct environment variables and PATH entries.
+installation there may be a batch file (named something like
+VCVARS32.BAT) that needs to be run to set correct environment
+varaibles and PATH entries.
 
 Continue with item c) below.
 
@@ -22,7 +23,7 @@ b) If using the MinGW or Cygwin compilers
 
 You can get MinGW from  http://www.mingw.org/
 
-Cygwin is available at  http://www.cygwin.com/
+Cygwin is available at  http://sources.redhat.com/cygwin/
 
 If you are using Cygwin or MinGW together with the MSYS environment, you
 can build the library using configure (see "Unix ports" and
@@ -30,7 +31,7 @@ can build the library using configure (see "Unix ports" and
 build wxWindows without configure using native makefile, but only with
 MinGW. Using Cygwin together with Windows makefile is no longer supported.
 
-If building with MinGW without configure:
+If building with Mingw without configure:
 
 -> Set your path so that it includes the directory
    where your compiler and tools reside
@@ -49,18 +50,17 @@ If using configure, Unix instructions apply.
 
 c) Build instructions
 
-Assumming that you installed the wxWindows sources
-into c:\wxWindows:
-
--> Copy c:\wxWindows\include\wx\msw\setup0.h
-   to   c:\wxWindows\include\wx\msw\setup.h
--> Edit c:\wxWindows\include\wx\msw\setup.h to choose
+-> Assumming that you installed the wxWindows sources
+   into c:\wxWin
+-> Copy c:\wxWin\include\wx\msw\setup0.h
+   to   c:\wxWin\include\wx\msw\setup.h
+-> Edit c:\wxWin\include\wx\msw\setup.h to choose
    the features you would like to compile wxWindows with[out].
 
    and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
  
--> type: cd c:\wxWindows\build\msw
+-> type: cd c:\wxWin\build\win32
 -> type: make -f makefile.gcc  (if using GNU tools)
 or type: nmake -f makefile.vc   (if using MS VC++)
 etc.
@@ -70,9 +70,9 @@ etc.
 d) Borland (including free command line tools)
    Download tools from http://www.borland.com/downloads/
    
-   See docs/msw/install.txt for details; in brief:
+   See docs/msw/install.txt for details; in brief
 
--> type cd c:\wxWindows\build\msw
+-> type cd %WXWIN%\build\win32
 -> type make -f makefile.bcc
 
 You can customize many things in the build process, detailed description is
@@ -92,7 +92,7 @@ GNU autoconf package (version > 2.54) installed
 on your system and type run "autoconf" in the base
 directory (or run the autogen.sh script in the same
 directory, which just calls autoconf). Note that you usually don't
-need to do this because configure is included in CVS.
+need to do this because configure is included in cVS.
 
 Set WXWIN environment variable to the base directory such
 as ~/wxWindows (this is actually not really needed).
@@ -162,7 +162,6 @@ or type: ../configure
 
 VI) OS/2
 ----------------------------------------
-No notes.
 
 VII) Unix->Windows cross-compiling using configure
 --------------------------------------------------

acinclude.m4

@@ -8,20 +8,6 @@ dnl
 dnl Version: $Id$
 dnl ---------------------------------------------------------------------------
 
-
-dnl ===========================================================================
-dnl Objective-C(++) related macros
-dnl ===========================================================================
-m4_define([AC_WX_LANG_OBJECTIVEC],
-[AC_LANG(C)
-ac_ext=m
-])
-
-m4_define([AC_WX_LANG_OBJECTIVECPLUSPLUS],
-[AC_LANG(C++)
-ac_ext=mm
-])
-
 dnl ===========================================================================
 dnl macros to find the a file in the list of include/lib paths
 dnl ===========================================================================
@@ -102,11 +88,14 @@ dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
 dnl or only the old <iostream.h> one - it may be generally assumed that if
 dnl <iostream> exists, the other "new" headers (without .h) exist too.
 dnl
-dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
+dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling)
 dnl ---------------------------------------------------------------------------
 
 AC_DEFUN([WX_CPP_NEW_HEADERS],
 [
+  if test "$cross_compiling" = "yes"; then
+    ifelse([$2], , :, [$2])
+  else
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
 
@@ -119,6 +108,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
     fi
 
     AC_LANG_RESTORE
+  fi
 ])
 
 dnl ---------------------------------------------------------------------------
@@ -437,44 +427,7 @@ AC_DEFUN([WX_VERSIONED_SYMBOLS],
         else
           wx_cv_version_script=no
         fi
-
-        dnl There's a problem in some old linkers with --version-script that
-        dnl can cause linking to fail when you have objects with vtables in
-        dnl libs 3 deep.  This is known to happen in netbsd and openbsd with
-        dnl ld 2.11.2.
-        dnl 
-        dnl To test for this we need to make some shared libs and
-        dnl unfortunately we can't be sure of the right way to do that. If the
-        dnl first two compiles don't succeed then it looks like the test isn't
-        dnl working and the result is ignored, but if OTOH the first two
-        dnl succeed but the third does not then the bug has been detected and
-        dnl the --version-script flag is dropped.
-        if test $wx_cv_version_script = yes
-        then
-          echo "struct B { virtual ~B() { } }; \
-                struct D : public B { }; \
-                void F() { D d; }" > conftest.cpp
-
-          if AC_TRY_COMMAND([
-                $CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym >/dev/null 2>/dev/null]) &&
-             AC_TRY_COMMAND([
-                $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null])
-          then
-            if AC_TRY_COMMAND([
-                  $CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                  -Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null])
-            then
-              wx_cv_version_script=yes
-            else
-              wx_cv_version_script=no
-            fi
-          fi
-        fi
-
         rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
-        rm -f conftest1.output conftest2.output conftest3.output
       ])
       if test $wx_cv_version_script = yes ; then
         LDFLAGS_VERSIONING="-Wl,--version-script,$1"
@@ -645,62 +598,3 @@ 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
-])
-

art/addbookm.xpm

@@ -1,24 +1,21 @@
 /* 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. ",
-"        ..   .. "
-};
+".	c #000000",
+"+	c #C3F9BD",
+"   ..           ",
+"   ..           ",
+"   ..      .    ",
+"........  .+.   ",
+"........ .+++.  ",
+"   ..   .+++++. ",
+"   ..  .+++++.  ",
+"   .. .+++++.   ",
+"     .+++++.    ",
+"    .+++++.     ",
+"   .+++++.      ",
+"  ....++.       ",
+"     .+.        ",
+"     ..         ",
+"     .          "};

art/back.xpm

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

art/cdrom.xpm

@@ -1,57 +0,0 @@
-/* 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 +0,0 @@
-/* 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,9 +1,23 @@
 /* XPM */
 static char *cross_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"10 10 2 1",
+"10 10 16 1",
 "  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
 "# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
 /* pixels */
 " ######## ",
 "   ####   ",
@@ -14,4 +28,5 @@ static char *cross_xpm[] = {
 "##      ##",
 "#   ##   #",
 "   ####   ",
-"  ######  "};
+"  ######  "
+};

art/cut.xpm

@@ -1,46 +0,0 @@
-/* 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,31 @@
 /* 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",
+"16 16 12 1",
 " 	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#  ",
-"                "
-};
+".	c #000000",
+"+	c #808080",
+"@	c #FFFFFF",
+"#	c #282829",
+"$	c #505052",
+"%	c #78787B",
+"&	c #A0A0A4",
+"*	c #404040",
+"=	c #1F1F1F",
+"-	c #3F3F3F",
+";	c #2F2F2F",
+"                ",
+"   .......      ",
+"  .+@@@@@@#     ",
+"  .+@@@@@@$%    ",
+"  .+@@@@@@$&%   ",
+"  .+@@@@@@#$$#  ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .*++++++++++. ",
+"  .=---=;-----. ",
+"                ",
+"                "};

art/delbookm.xpm

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

art/delete.xpm

@@ -1,42 +0,0 @@
-/* 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,42 @@
 /* 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",
+"20 20 16 1",
+"  c Gray0",
+". c #800000",
+"X c #008000",
+"o c #808000",
+"O c #000080",
+"+ c #800080",
+"@ c #008080",
+"# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
 /* 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,24 @@
 /* XPM */
 static char * down_xpm[] = {
-"16 15 3 1",
+"16 16 5 1",
 " 	c None",
-".	c Black",
-"X	c Gray100",
+".	c #000000",
+"+	c #808080",
+"@	c #C0E4CB",
+"#	c #77C490",
+"                ",
+"     .....+     ",
+"     .@##.+     ",
+"     .@##.+     ",
+"     .@##.+     ",
+"     .@##.+     ",
+"     .@##.+     ",
+"     .@##.+++++ ",
+"  ....@##....+  ",
+"   .@@####@.+   ",
+"    .@@##@.+    ",
+"     .@@@.+     ",
+"      .@.+      ",
+"       .        ",
 "                ",
-"     ......     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"  ....XXXX....  ",
-"   .XXXXXXXX.   ",
-"    .XXXXXX.    ",
-"     .XXXX.     ",
-"      .XX.      ",
-"       ..       ",
 "                "};

art/exefile.xpm

@@ -1,73 +1,76 @@
 /* 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",
+"16 16 57 1",
 " 	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  "
-};
+".	c #000000",
+"+	c #808080",
+"@	c #650000",
+"#	c #CB0000",
+"$	c #700000",
+"%	c #CDCDCD",
+"&	c #D2D2D2",
+"*	c #D7D7D7",
+"=	c #282829",
+"-	c #FF0000",
+";	c #E60000",
+">	c #FFFFFF",
+",	c #505052",
+"'	c #78787B",
+")	c #CC0000",
+"!	c #F70000",
+"~	c #A0A0A4",
+"{	c #8C4848",
+"]	c #FFA0A0",
+"^	c #A95959",
+"/	c #DBDBDB",
+"(	c #F7F7F7",
+"_	c #0000C8",
+":	c #0000F4",
+"<	c #ECECEC",
+"[	c #1010BC",
+"}	c #1313E8",
+"|	c #EDEDED",
+"1	c #8B8B8B",
+"2	c #AFAFAF",
+"3	c #C4C4C4",
+"4	c #FDFDFD",
+"5	c #E8E8E8",
+"6	c #FFFF00",
+"7	c #007300",
+"8	c #00B200",
+"9	c #BFBFBF",
+"0	c #CBCBCB",
+"a	c #DEDEDE",
+"b	c #00A800",
+"c	c #00FF00",
+"d	c #BEBEBE",
+"e	c #FCFCFC",
+"f	c #7D7D7D",
+"g	c #F8F8F8",
+"h	c #888888",
+"i	c #F8F800",
+"j	c #F7F700",
+"k	c #006200",
+"l	c #00A100",
+"m	c #757575",
+"n	c #959595",
+"o	c #404040",
+"p	c #1F1F1F",
+"q	c #3F3F3F",
+"r	c #2F2F2F",
+"                ",
+"   ........     ",
+"  .+@#$%&*=     ",
+"  .+#-;>>>,'    ",
+"  .+)-!>>>,~'   ",
+"  .+{]^>>>=,,=  ",
+"  .+/>(>>>>>_:. ",
+"  .+<>>>>>>>[}. ",
+"  .+|>>>>>>>12. ",
+"  .+|>>>>>>>34. ",
+"  .+/>56667894. ",
+"  .+0>a666bcde. ",
+"  .+fghiijklmn. ",
+"  .o++++++++++. ",
+"  .pqqqpprqqqq. ",
+"                "};

art/fileopen.xpm

@@ -1,57 +1,26 @@
 /* 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",
+"16 15 5 1",
 "  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",
+". c Black",
+"X c Yellow",
+"o c Gray100",
+"O c #bfbf00",
 /* 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;  ",
+"          ...   ",
+"         .   . .",
+"              ..",
+"  ...        ...",
+" .XoX.......    ",
+" .oXoXoXoXo.    ",
+" .XoXoXoXoX.    ",
+" .oXoX..........",
+" .XoX.OOOOOOOOO.",
+" .oo.OOOOOOOOO. ",
+" .X.OOOOOOOOO.  ",
+" ..OOOOOOOOO.   ",
+" ...........    ",
 "                "
 };

art/filesave.xpm

@@ -1,42 +0,0 @@
-/* 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 +0,0 @@
-/* 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 +0,0 @@
-/* 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 +0,0 @@
-/* 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 +0,0 @@
-/* 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,28 @@
 /* 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",
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"         s None        c None",
+".        c #000000",
+"+        c #c0c0c0",
+"@        c #808080",
+"#        c #ffff00",
+"$        c #ffffff",
 /* 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 +0,0 @@
-/* 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,24 @@
 /* XPM */
 static char * forward_xpm[] = {
-"16 15 3 1",
+"16 16 5 1",
 " 	c None",
-".	c Black",
-"X	c Gray100",
+".	c #000000",
+"+	c #C0E4CB",
+"@	c #77C490",
+"#	c #808080",
 "                ",
 "                ",
 "         .      ",
 "         ..     ",
-"         .X.    ",
-"  ........XX.   ",
-"  .XXXXXXXXXX.  ",
-"  .XXXXXXXXXXX. ",
-"  .XXXXXXXXXXX. ",
-"  .XXXXXXXXXX.  ",
-"  ........XX.   ",
-"         .X.    ",
-"         ..     ",
-"         .      ",
+"         .+.    ",
+"  ........++.   ",
+"  .+++++++@++.  ",
+"  .@@@@@@@@@++. ",
+"  .@@@@@@@@@+.  ",
+"  ........@+.#  ",
+"  #######.+.#   ",
+"        #..#    ",
+"        #.#     ",
+"        ##      ",
+"        #       ",
 "                "};

art/gtk/error.xpm

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

art/gtk/info.xpm

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

art/gtk/question.xpm

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

art/gtk/warning.xpm

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

art/harddisk.xpm

@@ -1,60 +0,0 @@
-/* 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/home.xpm

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

art/htmbook.xpm

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

art/htmoptns.xpm

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

art/htmpage.xpm

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

art/htmsidep.xpm

@@ -1,27 +1,35 @@
 /* XPM */
 static char * htmsidep_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 6 1",
-". c Black",
-"X c #FFFFFF",
-"+ c #808080",
+"16 15 17 1",
 " 	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. ",
-" .............. "
-};
+".	c #000000",
+"+	c #800000",
+"@	c #008000",
+"#	c #808000",
+"$	c #000080",
+"%	c #800080",
+"&	c #008080",
+"*	c #C0C0C0",
+"=	c #808080",
+"-	c #FF0000",
+";	c #00FF00",
+">	c #FFFF00",
+",	c #0000FF",
+"'	c #FF00FF",
+")	c #00FFFF",
+"!	c #FFFFFF",
+"****************",
+"*..............*",
+"*.************.*",
+"*..............*",
+"*.****.!!!!!!!.*",
+"*.****.!====*!.*",
+"*.****.!!!!!!!.*",
+"*.****.!===*!!.*",
+"*.****.!!!!!!!.*",
+"*.****.!====*!.*",
+"*.****.!!!!!!!.*",
+"*.****.!===*!!.*",
+"*.****.!!!!!!!.*",
+"*..............*",
+"****************"};

art/listview.xpm

@@ -1,25 +1,28 @@
 /* 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 */
+"20 20 5 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"@	c #000083",
+"#	c #838183",
 "                    ",
-" .............. ",
-" .XXX.......... ",
-" .XXX.  o   o . ",
-" .XXX.......... ",
-" .............. ",
-" .XXX.......... ",
-" .XXX.   o    . ",
-" .XXX.......... ",
-" .............. ",
-" .XXX.......... ",
-" .XXX. o    o . ",
-" .XXX.......... ",
-" .............. ",
-"                "
-};
+"                    ",
+"  ................  ",
+"  .++++++++++++++.  ",
+"  .+@@+++++@@++++.  ",
+"  .+@+@+.#+@+@+.+.  ",
+"  .+@@@++++@@@+++.  ",
+"  .++++++++++++++.  ",
+"  .++++++++++++++.  ",
+"  .+@@+++++@@++++.  ",
+"  .+@+@+.#+@+@+.+.  ",
+"  .+@@@++++@@@+++.  ",
+"  .++++++++++++++.  ",
+"  .++++++++++++++.  ",
+"  .+@@+++++@@++++.  ",
+"  .+@+@+.#+@+@+.+.  ",
+"  .+@@@++++@@@+++.  ",
+"  ................  ",
+"                    ",
+"                    "};

art/missimg.xpm

@@ -1,43 +1,41 @@
 /* XPM */
 static char * missimg_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 5 1",
-"X c Black",
-"o c #FFFFFF",
+"29 31 7 1",
 "   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 "
-};
+".  c #808080",
+"+  c #FFFFFF",
+"@  c #C0C0C0",
+"#  c #000000",
+"$  c #333366",
+"%  c #B2B2B2",
+".....................        ",
+".+++++++++++++++++++..       ",
+".+++++++++++++++++++.@.      ",
+".++@@@@@@@@@@@@@@@@@.+@.     ",
+".++@@@@@@@@@@@@@@@@@.++@.    ",
+".++@@@@@.@@@@.@@@@@@.+++@.   ",
+".++@@@@@@@@@@@@@@@@@.++++@.  ",
+".++@@@@@@@@@@@@@@@@@.+++++@. ",
+".++@@.@@@@@@@@@@.@@@######## ",
+".++@@@@@@@@@@@@@@@@@@$$$$$$#.",
+".######@@@@@@@@@@@@@@@.....#.",
+"       ###@@@@@@@@@@@@@@@++#.",
+"          #####@@@@@@@@@@++#.",
+"              #@.@@@@@@@@++#.",
+"..             ###@@@@@@@++#.",
+".+....            #@@@@@@++#.",
+".++@@@...          ####@@++#.",
+".++@@@@@@..            #####.",
+".++@@@@@@@@...               ",
+".++@@@@@@%%%%@.              ",
+".++@@@@@@%%%%@@....          ",
+".++@@@@@@%%%%@@@@@@....      ",
+".++@@@@@@%%%%@@@@@@@@@@....  ",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++@@@@@@@@@@@@@@@@@@@@@@++#.",
+".++++++++++++++++++++++++++#.",
+".++++++++++++++++++++++++++#.",
+"############################."};

art/motif/error.xpm

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

art/motif/info.xpm

@@ -1,63 +1,210 @@
 /* XPM */
 static char * info_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"$ c Black",
-"O c #FFFFFF",
-"@ c #808080",
-"+ c #000080",
-"o c #E8EB01",
+"48 48 159 2",
 "  	c None",
-"X c #FFFF40",
-"# c #C0C0C0",
-". c #ABAD01",
-/* pixels */
+". 	c #12165C",
+"+ 	c #9E9EC4",
+"@ 	c #565294",
+"# 	c #2E3274",
+"$ 	c #1A227C",
+"% 	c #16229C",
+"& 	c #262274",
+"* 	c #362E8C",
+"= 	c #262A9C",
+"- 	c #121E7C",
+"; 	c #1A2AAC",
+"> 	c #162284",
+", 	c #262EA4",
+"' 	c #2A2A84",
+") 	c #1E1E6C",
+"! 	c #3E3A84",
+"~ 	c #7A72B4",
+"{ 	c #121E74",
+"] 	c #1E2284",
+"^ 	c #2A2E9C",
+"/ 	c #362E9C",
+"( 	c #D2D2E4",
+"_ 	c #62669C",
+": 	c #1E269C",
+"< 	c #1A2AB4",
+"[ 	c #6A6EAC",
+"} 	c #121A6C",
+"| 	c #2E2A84",
+"1 	c #26268C",
+"2 	c #3E328C",
+"3 	c #322E9C",
+"4 	c #B6B6CC",
+"5 	c #1626AC",
+"6 	c #1E268C",
+"7 	c #2E267C",
+"8 	c #363294",
+"9 	c #1A2694",
+"0 	c #22226C",
+"a 	c #26267C",
+"b 	c #2E2A9C",
+"c 	c #1A1E7C",
+"d 	c #222A9C",
+"e 	c #162294",
+"f 	c #1E2EBC",
+"g 	c #2A2EAC",
+"h 	c #6A6A9C",
+"i 	c #2E2A94",
+"j 	c #CACADC",
+"k 	c #1A1A64",
+"l 	c #16269C",
+"m 	c #262AAC",
+"n 	c #161E8C",
+"o 	c #464294",
+"p 	c #8286C4",
+"q 	c #1A1E64",
+"r 	c #222AB4",
+"s 	c #6A6EB4",
+"t 	c #1A1A6C",
+"u 	c #BABAD4",
+"v 	c #1E2694",
+"w 	c #121A64",
+"x 	c #2E2E94",
+"y 	c #3A2E8C",
+"z 	c #2A2A9C",
+"A 	c #161E7C",
+"B 	c #1A2284",
+"C 	c #262A94",
+"D 	c #2E2E9C",
+"E 	c #36329C",
+"F 	c #FEFEFC",
+"G 	c #666AA4",
+"H 	c #1E2AB4",
+"I 	c #161A6C",
+"J 	c #322A84",
+"K 	c #2A267C",
+"L 	c #262EB4",
+"M 	c #1A269C",
+"N 	c #1E2274",
+"O 	c #1E2AA4",
+"P 	c #221E6C",
+"Q 	c #423E8C",
+"R 	c #222284",
+"S 	c #E6E6EC",
+"T 	c #22269C",
+"U 	c #6E6EA4",
+"V 	c #3232A4",
+"W 	c #BAB6D4",
+"X 	c #1A26AC",
+"Y 	c #222684",
+"Z 	c #3A328C",
+"` 	c #22227C",
+" .	c #222AAC",
+"..	c #222EB4",
+"+.	c #8A86BC",
+"@.	c #1A1E74",
+"#.	c #161A5C",
+"$.	c #322E8C",
+"%.	c #3A329C",
+"&.	c #A29ECC",
+"*.	c #26227C",
+"=.	c #362E94",
+"-.	c #262AA4",
+";.	c #121E84",
+">.	c #16228C",
+",.	c #262EAC",
+"'.	c #2A2A8C",
+").	c #1E1E74",
+"!.	c #7A76B4",
+"~.	c #161E74",
+"{.	c #1E228C",
+"].	c #2A2EA4",
+"^.	c #6266A4",
+"/.	c #1E26A4",
+"(.	c #1A2ABC",
+"_.	c #121A74",
+":.	c #2E2A8C",
+"<.	c #262694",
+"[.	c #3E3294",
+"}.	c #322EA4",
+"|.	c #B6B6D4",
+"1.	c #222274",
+"2.	c #262684",
+"3.	c #222AA4",
+"4.	c #1A2294",
+"5.	c #2E2EAC",
+"6.	c #6E6AA4",
+"7.	c #322A94",
+"8.	c #1626A4",
+"9.	c #8E8ABC",
+"0.	c #4A429C",
+"a.	c #6E6EBC",
+"b.	c #222694",
+"c.	c #2A2A94",
+"d.	c #1A1E6C",
+"e.	c #BABADC",
+"f.	c #3A2E94",
+"g.	c #2A2AA4",
+"h.	c #161E84",
+"i.	c #1A228C",
+"j.	c #2E2EA4",
+"k.	c #3632A4",
+"l.	c #666AAC",
+"m.	c #1E2ABC",
+"n.	c #161A74",
+"o.	c #322A8C",
+"p.	c #2A2684",
+"q.	c #1A26A4",
+"r.	c #1E227C",
+"s.	c #1E2AAC",
+"t.	c #423E94",
+"u.	c #E6E6F4",
+"v.	c #6E6EAC",
+"w.	c #1A26B4",
+"x.	c #22268C",
+"y.	c #3A3294",
+"z.	c #222EBC",
+"A.	c #161A64",
+"B.	c #322E94",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
+"                                      7 7 7 7 7 7 7 7 &                                         ",
+"                                2 2 2 2 2 2 y y y f.f.[.y 7 *.                                  ",
+"                            J y 2 2 2 2 2 [.[.[.[.y.=.=.f.=./ B.p.                              ",
+"                        2 2 2 2 [.2 [.[.f.y y y * * =.=.B./ B.3 o.*.*.                          ",
+"                      y 2 2 [.2 [.2 2 y [.[.f.f.o.* $.$.B.B.7.D 3 D }.D                         ",
+"                    2 2 [.[.2 [.2 [.f.[.y ~ ( F F W 0.$.:.i x 7.3 D D <.R                       ",
+"                  y 2 [.[.[.2 [.2 2 y y ~ F F F F F u.o :.:.c.c.b b D }.}.g.                    ",
+"                2 [.[.2 [.2 [.2 [.y 2 Z ( F F F F F F +.7 '.:.:.i D b ].].z R                   ",
+"              y 2 2 [.[.[.[.[.2 f.y y y F F F F F F F |.p.p.'.'.<.z z g.].].5.m                 ",
+"            2 2 [.t.[.[.2 2 2 f.2 f.* * u.F F F F F F + *.2.2.C '.c.z ^ ].g m = n               ",
+"            y 2 [.2 [.[.[.[.2 f.2 f.* * &.F F F F F F @ a *.2.2.C C z = g.].,.g. .              ",
+"          2 2 [.[.[.[.[.2 [.[.[.f.* o.J $.u F F F u.U 1.0 Y *.2.1 <.C ^ -.m g.L = n             ",
+"          2 2 2 [.2 t.[.[.f.[.Z y.* $.J 7 | Q U 6.P 1.P P ` ` 2.1 <.= = , ,.,.m m  .            ",
+"        2 [.[.[.[.[.[.2 f.2 f.f.* =.o.:.| K & & 0 0 P N 1.1.` R 2.d <.= -.-.m ..../.n           ",
+"        2 2 [.2 [.2 [.[.[.[.y.=.=.* o.:.p.K ! 6.h 4 4 ) ) ).r.6 Y b.= = , ,.,.m ..r r           ",
+"        [.2 t.[.[.[.[.[.f.y.8 y.* B.9.W S F F F F F F ) ) N 1.R R x.b.= 3.m m ..m ..s.          ",
+"      7 [.2 [.2 [.[.[.[.[.f.=.=.=.o.e.F F F F F F F F ) ) ).N R x.b.T 3.3. .m ..r H m.H         ",
+"      2 [.[.[.[.[.[.[.[.f.%.=.=.$.B.:.o W F F F F F F k q N r.] R b.d T ,  . .r ....s.n         ",
+"      y 2 2 [.[.[.[.[.%.f.%.=.=.B.$.:.'.v.F F F F F F t k ) N ] 6 x.d T 3... .H r H m.<         ",
+"      2 [.[.[.[.[.[.%.y.%.=.E / 7.7.p.p.v.F F F F F F q d.t @.r.R v T O  . .....f r X n         ",
+"      y 2 2 [.[.[.[.%.=.%.=.B.B.x B.:.| v.F F F F F F k d.d.c $ {.6 T d O  .r r f f m.(.        ",
+"      2 [.[.[.[.[.%.%.%./ E / 3 7.i '.2.v.F F F F F F A.A.t @.r.] b.: /. .s.H H H m.5 ;.        ",
+"      J 2 [.[.[.[.f.%.8 / E 8 3 i i :.p.v.F F F F F F k A.d.~.$ B 6 : : /.s.H m.m.f (.(.        ",
+"      [.[.[.%.[.%.%./ f.E / 3 3 B.i p.1 v.F F F F F F . A.I @.c {.{.: O s. .H H m.(.w.;.        ",
+"      7 [.[.%.f.%.%.E / V =.3 D D ^ '.1 v.F F F F F F #.A.I @.A i.9 : O s.s.H f m.(.(.w.        ",
+"      [.[.[.[.%.%.E E E / 3 3 7.i i c.2.v.F F F F F F . . A.~.c B {.M /.X H H (.(.(.w.;.        ",
+"        [.%.%./ %.f./ V 3 3 D D c.c.<.Y v.F F F F F F #.A.A.~.A B 4.9 /.X ; < f f (.(.          ",
+"        %.f.E %./ k.k./ V }.}.D D c.'.1 [ F F F F F F . . } I c >.i.M q.; H < (.(.(.5           ",
+"        J f.k.E E E / / 3 V 3 D b z 1 x.v.F F F F F F #.. A.} c B 4.M /.X < (.(.(.(.(.          ",
+"          %.%.%.E / V }.V D j.z z c.C 1 [ F F F F F F . A.} ~.A h.4.4.q.; w.(.(.(.5             ",
+"          7 k./ V / V D }.j.j.^ z z <.x.[ F F F F F F . . . _.A h.4.% q.; 5 w.w.(.(.            ",
+"            / k./ V }.}.j.j.j.b z C C R l.F F F F F F . } I ~.A >.e M 5 5 (.(.(.5               ",
+"            7 V 3 V V V }.j.].].g.= C <.s F F F F F F # w } n.A >.e 4.X 5 < (.w.(.              ",
+"              / k.}.}.j.j.j.j.g.z = a.p u.F F F F F F j _ _ - - n e 8.5 5 w.w.5                 ",
+"                V V j.j.j.].].].z = F F F F F F F F F F F F n.;.n e % X 5 (.(.                  ",
+"                  j.V j.j.j.].-.-.<.a.a.s [ l.G G _ _ _ ^.^.- h.e % 8.5 < 5                     ",
+"                    5.].g j.]., , d T b.{.{.c A ~._.} } _.n.;.;.e % % 5 5                       ",
+"                      5.j.].g g.-.-.d : v i.> A A ~._.- - - >.e e % 5 %                         ",
+"                        g g.g -., 3.d : v v i.B h.A n.h.;.;.;.n % 8.%                           ",
+"                            -.,. .-.3.T : 4.{.>.>.>.>.;.>.n % % %                               ",
+"                                3.-.3.3.O M 4.4.i.n e n e e e                                   ",
+"                                      : : : /.4.% e n ;.                                        ",
 "                                                                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                     .....                      ",
-"                   ..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,216 @@
 /* XPM */
 static char * question_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 21 1",
-". c Black",
-"> c #696969",
-"O c #1F1F00",
-"+ c #181818",
-"o c #F6F900",
-"; c #3F3F00",
-"$ c #111111",
+"48 48 165 2",
 "  	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..                     ",
-"                   .......                      ",
+". 	c #000000",
+"+ 	c #080808",
+"@ 	c #2A2A2A",
+"# 	c #434343",
+"$ 	c #545454",
+"% 	c #626262",
+"& 	c #6A6A6A",
+"* 	c #6E6E6E",
+"= 	c #424242",
+"- 	c #525252",
+"; 	c #898989",
+"> 	c #DCDCDC",
+", 	c #E5E5E5",
+"' 	c #EDEDED",
+") 	c #F4F4F4",
+"! 	c #F9F9F9",
+"~ 	c #FCFCFC",
+"{ 	c #FFFFFF",
+"] 	c #888888",
+"^ 	c #4F4F4F",
+"/ 	c #050505",
+"( 	c #0F0F0F",
+"_ 	c #9C9C9C",
+": 	c #E6E6E6",
+"< 	c #9B9B9B",
+"[ 	c #1F1F1F",
+"} 	c #A1A1A1",
+"| 	c #E3E3E3",
+"1 	c #4D4D4D",
+"2 	c #D6D6D6",
+"3 	c #ECECEC",
+"4 	c #D9D9D9",
+"5 	c #C6C6C6",
+"6 	c #B0B0B0",
+"7 	c #848484",
+"8 	c #D3D3D3",
+"9 	c #010101",
+"0 	c #8B8B8B",
+"a 	c #F2F2F2",
+"b 	c #F3F3F3",
+"c 	c #A6A6A6",
+"d 	c #5E5E5E",
+"e 	c #2F2F2F",
+"f 	c #272727",
+"g 	c #202020",
+"h 	c #4E4E4E",
+"i 	c #8A8A8A",
+"j 	c #0B0B0B",
+"k 	c #B6B6B6",
+"l 	c #5D5D5D",
+"m 	c #131313",
+"n 	c #9A9A9A",
+"o 	c #C9C9C9",
+"p 	c #878787",
+"q 	c #0A0A0A",
+"r 	c #373737",
+"s 	c #DADADA",
+"t 	c #B4B4B4",
+"u 	c #B1B1B1",
+"v 	c #030303",
+"w 	c #767676",
+"x 	c #FDFDFD",
+"y 	c #FAFAFA",
+"z 	c #383838",
+"A 	c #F8F8F8",
+"B 	c #AFAFAF",
+"C 	c #070707",
+"D 	c #818181",
+"E 	c #555555",
+"F 	c #BDBDBD",
+"G 	c #7D7D7D",
+"H 	c #3C3C3C",
+"I 	c #F6F6F6",
+"J 	c #535353",
+"K 	c #242424",
+"L 	c #ABABAB",
+"M 	c #393939",
+"N 	c #BBBBBB",
+"O 	c #EAEAEA",
+"P 	c #A3A3A3",
+"Q 	c #4B4B4B",
+"R 	c #616161",
+"S 	c #CFCFCF",
+"T 	c #060606",
+"U 	c #EFEFEF",
+"V 	c #B9B9B9",
+"W 	c #303030",
+"X 	c #161616",
+"Y 	c #2C2C2C",
+"Z 	c #C0C0C0",
+"` 	c #2E2E2E",
+" .	c #858585",
+"..	c #E4E4E4",
+"+.	c #1C1C1C",
+"@.	c #D4D4D4",
+"#.	c #828282",
+"$.	c #C7C7C7",
+"%.	c #3A3A3A",
+"&.	c #090909",
+"*.	c #151515",
+"=.	c #8E8E8E",
+"-.	c #F7F7F7",
+";.	c #C4C4C4",
+">.	c #EBEBEB",
+",.	c #CECECE",
+"'.	c #3D3D3D",
+").	c #676767",
+"!.	c #F1F1F1",
+"~.	c #FBFBFB",
+"{.	c #353535",
+"].	c #212121",
+"^.	c #EEEEEE",
+"/.	c #444444",
+"(.	c #DEDEDE",
+"_.	c #020202",
+":.	c #6B6B6B",
+"<.	c #E1E1E1",
+"[.	c #575757",
+"}.	c #111111",
+"|.	c #939393",
+"1.	c #ADADAD",
+"2.	c #6C6C6C",
+"3.	c #929292",
+"4.	c #4A4A4A",
+"5.	c #1E1E1E",
+"6.	c #3B3B3B",
+"7.	c #A0A0A0",
+"8.	c #696969",
+"9.	c #FEFEFE",
+"0.	c #CBCBCB",
+"a.	c #F0F0F0",
+"b.	c #0E0E0E",
+"c.	c #DFDFDF",
+"d.	c #808080",
+"e.	c #D0D0D0",
+"f.	c #636363",
+"g.	c #323232",
+"h.	c #D2D2D2",
+"i.	c #333333",
+"j.	c #292929",
+"k.	c #484848",
+"l.	c #646464",
+"m.	c #F5F5F5",
+"n.	c #B2B2B2",
+"o.	c #494949",
+"p.	c #E2E2E2",
+"q.	c #3F3F3F",
+"r.	c #0D0D0D",
+"s.	c #E0E0E0",
+"t.	c #2D2D2D",
+"u.	c #3E3E3E",
+"v.	c #C8C8C8",
+"w.	c #D1D1D1",
+"x.	c #7C7C7C",
+"y.	c #141414",
+"z.	c #A4A4A4",
+"A.	c #C2C2C2",
+"B.	c #262626",
+"C.	c #191919",
+"D.	c #999999",
+"E.	c #0C0C0C",
+"F.	c #101010",
+"G.	c #787878",
+"H.	c #797979",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
-"                                                "
-};
+"                                                                                                ",
+"                                . . . . . . . . . . . . . . . .                                 ",
+"                          . . . . + @ # $ % & * * & % $ = @ + . . . .                           ",
+"                      . . . . - ; > , ' ) ! ~ { { ~ ! ) ' , > ] ^ . . . .                       ",
+"                  . . / ( _ : { { { { { { { { { { { { { { { { { { : < ( / . .                   ",
+"                . . [ } | { { { { { { { { { { { { { { { { { { { { { { | } [ . .                 ",
+"              . . 1 2 { { { { { { { { 3 4 5 6 7 7 7 < 5 8 : ! { { { { { { 2 1 . . .             ",
+"          . . 9 0 a { { { { { { { b c d e 9 9 9 f 9 9 9 g h i 4 { { { { { { a ; 9 . .           ",
+"        . . j k { { { { { { { { ' l m 9 9 9 9 n o p 9 9 9 9 q r s { { { { { { { t q . .         ",
+"      . . + u { { { { { { { { { # v 9 9 9 9 w x { y z 9 9 9 9 9 @ A { { { { { { { B C . .       ",
+"    . . . D y { { { { { { { { { 9 9 9 9 9 j ' { { { E 9 9 9 9 9 9 F { { { { { { { y G . . .     ",
+"    . . H I { { { { { { { { { { J 9 9 9 9 ^ { { { { K 9 9 9 9 9 9 L { { { { { { { { I M . . .   ",
+"  . . . N { { { { { { { { { { { O P Q Q R S { { { } 9 9 9 9 9 9 T U { { { { { { { { { V . . .   ",
+"  . . W ! { { { { { { { { { { { { { { { { { { A 6 X 9 9 9 9 9 Y Z { { { { { { { { { { ! ` . .   ",
+"  . .  .{ { { { { { { { { { { { { { { { { { ..7 ( 9 9 9 9 +.* @.{ { { { { { { { { { { { #.. . . ",
+". . . $.{ { { { { { { { { { { { { { { { { < %.&.9 9 9 *.=.5 -.{ { { { { { { { { { { { { ;.. . . ",
+". . . >.{ { { { { { { { { { { { { { { ,.'.+ . . . . ).!.~ { { { { { { { { { { { { { { { O . . . ",
+". . . ~.{ { { { { { { { { { { { { { O {.. . . . . ].^.{ { { { { { { { { { { { { { { { { ~.. . . ",
+". . . A { { { { { { { { { { { { { { k 9 9 9 9 9 9 /.{ { { { { { { { { { { { { { { { { { A . . . ",
+". . . (.{ { { { { { { { { { { { { { 5 _.. . . . . q :.4 U U <.{ { { { { { { { { { { { { > . . . ",
+". . . 6 { { { { { { { { { { { { { { { [.&.. . . . . . . . }.|.{ { { { { { { { { { { { { 1.. . . ",
+". . . 2.{ { { { { { { { { { { { { { { a 3.4.5.9 9 9 5.6.).7.a { { { { { { { { { { { { { 8.. . . ",
+"  . . ( !.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.<.0.F F F 0.s a.9.9.9.9.9.9.9.9.9.9.9.9.9.9.!.b.. . . ",
+"  . . . D { { { { { { { { { { { { { { { { { U c.c.c.U { { { { { { { { { { { { { { { { d.. . .   ",
+"  . . . ( 8 { { { { { { { { { { { { { { { e.f.g.g.g.f.;.{ { { { { { { { { { { { { { h.b.. . .   ",
+"    . . . 4.) { { { { { { { { { { { { { ' i.9 9 9 9 9 j.' { { { { { { { { { { { { ) k.. . .     ",
+"      . . . l.m.{ { { { { { { { { { { { n.. . . . . . . n.{ { { { { { { { { { { m.f.. . . .     ",
+"        . . . o.p.{ { { { { { { { { { { F 9 9 9 9 9 9 9 5 { { { { { { { { { { p.k.. . . .       ",
+"          . . . @ 0.{ { { { { { { { { { b q.. . . . . d { { { { { { { { { { b j.. . . .         ",
+"            . . . r.7.{ { { { { { { { { { s.* = t.= < 3 { { { { { { { { { { A e . . .           ",
+"              . . . . u._ >.y { { { { { { { { { { { { { { { { { { { { { { { { a - . .           ",
+"                . . . . . W % v., { { { { { { { { { { { { { { , w.e.>.{ { { { { U x.T           ",
+"                    . . . . . y.f D z.A.4 >.-.x x -.>.4 A.z.d.B.C.C.Y i c h.{ { { ) D..         ",
+"                        . . . . . . / &.E.( F.}.}.F.b.E.&./ . . . . . 9 T E.}.] 5 ' ) G..       ",
+"                            . . . . . . . . . . . . . . . . . . . . . . . . . . . . M H.H..     ",
+"                                  . . . . . . . . . . . . . .           . . . . . . . . . .     ",
+"                                                                                    . . . .     ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};

art/motif/warning.xpm

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

art/new.xpm

@@ -1,50 +0,0 @@
-/* XPM */
-static 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,42 @@
 /* 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",
+"20 20 16 1",
+"  c Gray0",
+". c #800000",
+"X c #008000",
+"o c #808000",
+"O c #000080",
+"+ c #800080",
+"@ c #008080",
+"# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
 /* 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 +0,0 @@
-/* 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,26 @@
 /* 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",
+"16 15 5 1",
 "  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",
+". c Black",
+"X c Gray100",
+"o c #808000",
+"O c Yellow",
 /* pixels */
-"   .XXXXXXXX    ",
-"   .oooooooX    ",
-"   .OOOOOOOX    ",
-"   .+++++++X    ",
-"@##$%&&&&&%*##@ ",
-"$=-;:>,<123$-=$ ",
-".44.5678.96$44. ",
-"7,,,,,,,,,,,,,7 ",
-"900qwwwwwwwe009 ",
-"rtt9ryyyyyyuttr ",
-"6qq6iiiiiii%qq6 ",
-"633paiiiiii%336 ",
-"XXX*iiiiiii%XXX ",
-"   6iiiiiii%    ",
-"   $XXXXXXX#    "
+"                ",
+"     .........  ",
+"    .XXXXXXXX.  ",
+"    .X.....X.   ",
+"   .XXXXXXXX.   ",
+"   .X.....X.... ",
+"  .XXXXXXXX. . .",
+" .......... . ..",
+".          . . .",
+".............  .",
+".      ooo  . . ",
+".      OOO  ... ",
+"............. . ",
+" .         . .  ",
+"  ...........   "
 };

art/quit.xpm

@@ -1,90 +0,0 @@
-/* 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 +0,0 @@
-/* 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 +0,0 @@
-/* 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,27 @@
 /* XPM */
 static char * repview_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"  c Black",
-"X c #FFFFFF",
-". c #C0C0C0",
-/* pixels */
+"20 20 4 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"@	c #000083",
 "                    ",
-" .............. ",
-" .  .    .    . ",
-" .............. ",
-" .............. ",
-" 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,32 @@
 /* XPM */
 static char *tick_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"10 10 2 1",
-". c Gray0",
-"  c None",
+"10 10 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
 /* pixels */
-"          ",
-"        ..",
-"       ...",
-"      ... ",
-"..   ...  ",
-"... ...   ",
-" .....    ",
-"  ...     ",
-"   .      ",
-"          "};
+"##########",
+"######## #",
+"#######   ",
+"######    ",
+"#####    #",
+"  ##    ##",
+"       ###",
+"#     ####",
+"##   #####",
+"### ######"
+};

art/tipicon.xpm

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

art/toparent.xpm

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

art/undo.xpm

@@ -1,58 +0,0 @@
-/* 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,24 @@
 /* XPM */
 static char * up_xpm[] = {
-"16 15 3 1",
+"16 16 5 1",
 " 	c None",
-".	c Black",
-"X	c Gray100",
+".	c #000000",
+"+	c #C0E4CB",
+"@	c #808080",
+"#	c #77C490",
+"                ",
+"       .        ",
+"      .+.@      ",
+"     .+++.@     ",
+"    .++##+.@    ",
+"   .++####+.@   ",
+"  ....+##....@  ",
+"     .+##.@@@@@ ",
+"     .+##.@     ",
+"     .+##.@     ",
+"     .+##.@     ",
+"     .+##.@     ",
+"     .+##.@     ",
+"     .....@     ",
 "                ",
-"       ..       ",
-"      .XX.      ",
-"     .XXXX.     ",
-"    .XXXXXX.    ",
-"   .XXXXXXXX.   ",
-"  ....XXXX....  ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     ......     ",
 "                "};

art/wxwin16x16.xpm

@@ -9,6 +9,7 @@ static char *wxwin16x16_xpm[] = {
 "+	c #FF0000",
 "                ",
 "                ",
+"                ",
 "    .......     ",
 "    .XXXXX.     ",
 "    .oXXXX.     ",
@@ -21,5 +22,4 @@ static char *wxwin16x16_xpm[] = {
 ".+++++.  .......",
 ".......         ",
 "                ",
-"                ",
 "                "};

build/.cvsignore

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

build/bakefiles/.cvsignore

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

build/bakefiles/Bakefiles.bkgen

@@ -1,259 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<bakefile-gen>
-
-    <!--
-    Formats listed here are not generated by default. To enable them, either
-    remove them from the <disable-formats> directive below or create
-    Bakefiles.local.bkgen file in this directory and add <enable-formats>
-    into it:
-         <?xml version="1.0" ?>
-         <bakefile-gen>
-             <enable-formats>dmars</enable-formats>
-         </bakefile-gen>
-
-    Reasons why these formats are disabled (and so not in CVS):
-    
-    dmars     - In beta testing, will be added when it stabilizes.
-    dmars_smake     - ditto
-    msevc4prj - ditto
-    cbuilderx - Generated projects are too bad to be included in CVS. Please
-                *do not* enable this format until FIXMEs in .bkl files related
-                to cbuilderx are addressed. In particular, the project must
-                be placed into build/msw(?) directory and store object files
-                in its subdirectory and it must copy setup.h as others do.
-    cbx_unix  - Doesn't integrate well and won't be used by most Unix people.
-    -->
-    
-    <disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
-    
-
-    <!-- These wildcards match all .bkl files in wxWidgets tree: -->
-    <input>
-        wx.bkl
-        ../../contrib/build/*/*.bkl
-        ../../samples/*.bkl
-        ../../samples/*/*.bkl
-        ../../samples/*/*/*.bkl
-        ../../demos/*.bkl
-        ../../demos/*/*.bkl
-        ../../demos/*/*/*.bkl
-        ../../utils/*.bkl
-        ../../utils/*/*.bkl
-        ../../utils/*/*/*.bkl
-        ../../contrib/samples/*.bkl
-        ../../contrib/samples/*/*.bkl
-        ../../contrib/samples/*/*/*.bkl
-        ../../contrib/utils/*/*.bkl
-        ../../tests/*.bkl
-    </input>
-
-    <!-- List of output formats to generate: -->
-    <add-formats>
-        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
-    </add-formats>
-    
-    <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
-    </del-formats>
-    <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
-    </del-formats>
-    <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
-    </del-formats>
-    <del-formats files="../../samples/mobile/mobile_samples.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
-    </del-formats>
-    <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
-    </del-formats>
-    <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
-    </del-formats>
-
-    <!-- WinCE can't have console apps: -->
-    <del-formats files="../../samples/console/*">msevc4prj</del-formats>
-    <del-formats files="../../utils/HelpGen/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>
-
-    
-    <!-- Default flags (for all formats and bakefiles): -->
-    <add-flags>-Iformats</add-flags>
-    
-    
-    <!-- Directories where the files go: -->
-    <add-flags files="wx.bkl" formats="autoconf">
-        -o../../Makefile.in
-    </add-flags>
-    <add-flags files="wx.bkl" formats="borland">
-        -o../msw/makefile.bcc
-    </add-flags>
-    <add-flags files="wx.bkl" formats="dmars_smake">
-        -o../msw/makefile.dms
-    </add-flags>
-    <add-flags files="wx.bkl" formats="dmars">
-        -o../msw/makefile.dmc
-    </add-flags>
-    <add-flags files="wx.bkl" formats="mingw">
-        -o../msw/makefile.gcc
-    </add-flags>
-    <add-flags files="wx.bkl" formats="msvc">
-        -o../msw/makefile.vc
-    </add-flags>
-    <add-flags files="wx.bkl" formats="watcom">
-        -o../msw/makefile.wat
-    </add-flags>
-    <add-flags files="wx.bkl" formats="msvc6prj">
-        -o../msw/wx.dsw
-    </add-flags>
-    <add-flags files="wx.bkl" formats="msevc4prj">
-        -o../wince/wx.vcw
-    </add-flags>
-    <add-flags files="wx.bkl" formats="cbuilderx">
-        -o../../wx.cbx
-    </add-flags>
-    <add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
-        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
-    </add-flags>
-    <add-flags files="../../contrib/build/*/*.bkl" formats="cbx_unix">
-        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT)Unix.cbx
-    </add-flags>
-    <!-- FIXME: don't do this once it is possible (new CBX version) -->
-    <add-flags files="../../contrib/build/*/*.bkl" formats="cbuilderx">
-        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
-    </add-flags>
-    <add-flags files="../../contrib/build/*/*.bkl"
-               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
-        -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
-    </add-flags>
-
-    
-
-    <!-- Format specific settings: -->
-    <add-flags formats="autoconf">
-        -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
-    </add-flags>
-
-    <add-formats files="wx.bkl">wx24dsp</add-formats>
-    <add-flags formats="wx24dsp">
-        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
-    </add-flags>
-    
-    <add-formats files="wx.bkl">rpmspec</add-formats>
-
-
-    <!-- Makefile specific settings: -->
-
-    <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
-        -DWRITE_OPTIONS_FILE=0
-    </add-flags>
-    <del-flags files="wx.bkl">
-        -DWRITE_OPTIONS_FILE=0
-    </del-flags>
-    
-    <add-flags files="wx.bkl" formats="borland">
-        -DOPTIONS_FILE=config.bcc
-    </add-flags>
-    <add-flags files="wx.bkl" formats="dmars_smake">
-        -DOPTIONS_FILE=config.dms
-    </add-flags>
-    <add-flags files="wx.bkl" formats="dmars">
-        -DOPTIONS_FILE=config.dmc
-    </add-flags>
-    <add-flags files="wx.bkl" formats="mingw">
-        -DOPTIONS_FILE=config.gcc
-    </add-flags>
-    <add-flags files="wx.bkl" formats="msvc">
-        -DOPTIONS_FILE=config.vc
-    </add-flags>
-    <add-flags files="wx.bkl" formats="watcom">
-        -DOPTIONS_FILE=config.wat
-    </add-flags>
-
-    <add-flags files="../../*/*">-DWXTOPDIR=../</add-flags>
-    <add-flags files="../../*/*/*">-DWXTOPDIR=../../</add-flags>
-    <add-flags files="../../*/*/*/*">-DWXTOPDIR=../../../</add-flags>
-    <add-flags files="../../*/*/*/*/*">-DWXTOPDIR=../../../../</add-flags>
-    
-    <add-flags files="../../*/*" formats="borland">
-        -DOPTIONS_FILE=../build/msw/config.bcc
-    </add-flags>
-    <add-flags files="../../*/*" formats="dmars_smake">
-        -DOPTIONS_FILE=../build/msw/config.dms
-    </add-flags>
-    <add-flags files="../../*/*" formats="dmars">
-        -DOPTIONS_FILE=../build/msw/config.dmc
-    </add-flags>
-    <add-flags files="../../*/*" formats="mingw">
-        -DOPTIONS_FILE=../build/msw/config.gcc
-    </add-flags>
-    <add-flags files="../../*/*" formats="msvc">
-        -DOPTIONS_FILE=../build/msw/config.vc
-    </add-flags>
-    <add-flags files="../../*/*" formats="watcom">
-        -DOPTIONS_FILE=../build/msw/config.wat
-    </add-flags>
-    <add-flags files="../../*/*/*" formats="borland">
-        -DOPTIONS_FILE=../../build/msw/config.bcc
-    </add-flags>
-    <add-flags files="../../*/*/*" formats="dmars_smake">
-        -DOPTIONS_FILE=../../build/msw/config.dms
-    </add-flags>
-    <add-flags files="../../*/*/*" formats="dmars">
-        -DOPTIONS_FILE=../../build/msw/config.dmc
-    </add-flags>
-    <add-flags files="../../*/*/*" formats="mingw">
-        -DOPTIONS_FILE=../../build/msw/config.gcc
-    </add-flags>
-    <add-flags files="../../*/*/*" formats="msvc">
-        -DOPTIONS_FILE=../../build/msw/config.vc
-    </add-flags>
-    <add-flags files="../../*/*/*" formats="watcom">
-        -DOPTIONS_FILE=../../build/msw/config.wat
-    </add-flags>
-    <add-flags files="../../*/*/*/*" formats="borland">
-        -DOPTIONS_FILE=../../../build/msw/config.bcc
-    </add-flags>
-    <add-flags files="../../*/*/*/*" formats="dmars_smake">
-        -DOPTIONS_FILE=../../../build/msw/config.dms
-    </add-flags>
-    <add-flags files="../../*/*/*/*" formats="dmars">
-        -DOPTIONS_FILE=../../../build/msw/config.dmc
-    </add-flags>
-    <add-flags files="../../*/*/*/*" formats="mingw">
-        -DOPTIONS_FILE=../../../build/msw/config.gcc
-    </add-flags>
-    <add-flags files="../../*/*/*/*" formats="msvc">
-        -DOPTIONS_FILE=../../../build/msw/config.vc
-    </add-flags>
-    <add-flags files="../../*/*/*/*" formats="watcom">
-        -DOPTIONS_FILE=../../../build/msw/config.wat
-    </add-flags>
-    <add-flags files="../../*/*/*/*/*" formats="borland">
-        -DOPTIONS_FILE=../../../../build/msw/config.bcc
-    </add-flags>
-    <add-flags files="../../*/*/*/*/*" formats="dmars_smake">
-        -DOPTIONS_FILE=../../../../build/msw/config.dms
-    </add-flags>
-    <add-flags files="../../*/*/*/*/*" formats="dmars">
-        -DOPTIONS_FILE=../../../../build/msw/config.dmc
-    </add-flags>
-    <add-flags files="../../*/*/*/*/*" formats="mingw">
-        -DOPTIONS_FILE=../../../../build/msw/config.gcc
-    </add-flags>
-    <add-flags files="../../*/*/*/*/*" formats="msvc">
-        -DOPTIONS_FILE=../../../../build/msw/config.vc
-    </add-flags>
-    <add-flags files="../../*/*/*/*/*" formats="watcom">
-        -DOPTIONS_FILE=../../../../build/msw/config.wat
-    </add-flags>
-
-
-    <!-- Personal customizations (not in CVS): -->
-    <include file="Bakefiles.local.bkgen" ignore_missing="1"/>
-
-</bakefile-gen>

build/bakefiles/README

@@ -1,43 +0,0 @@
-
-This directory contains Bakefile (see http://bakefile.sourceforge.net)
-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
-directory!). If you run it with no arguments, it will generate all makefiles
-that are not up to date.
-
-Use "bakefile_gen -c" to clean generated files.
-
-You can generate or clean only subset of files by specifying -f or -b flags
-when invoking bakefile_gen. For example, "bakefile_gen -fborland,watcom" will
-only regenerate Borland C++ and OpenWatcom makefiles. -b flag limits
-regeneration only to specified bakefiles. For example,
-"bakefile_gen -b wx.bkl" will only regenerate main library makefiles.
-"bakefile_gen -b "../../samples/html/*/*.bkl" will regenerate makefiles for
-all wxHTML samples. -b and -f can be combined.
-
-You can customize the process of generating makefiles by adding file
-Bakefiles.local.bkgen (same format as Bakefiles.bkgen) with further settings.
-For example, you may disable output for compilers you don't use:
-   <?xml version="1.0" ?>
-   <bakefile-gen>
-     <disable-formats>msvc,msvc6prj</disable-formats>
-   </bakefile-gen>
-
-Note: bakefile_gen creates file .bakefile_gen.state with dependencies
-information. This file can be safely deleted, but it contains valuable
-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 (inc. contrib
-    ones)
-  * src/wxWindows.dsp
-  * {wxGTK,wxMotif,wxX11}.spec (only wxBase headers list)
-  * autoconf_inc.m4
-  * all Makefile.in files
-  (hopefully I didn't forget anything - VS)

build/bakefiles/build_cfg.bkl

@@ -1,56 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <!--
-    Generate build.cfg file on Windows, with settings used to build
-    the library.
-    -->
-
-    <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL'] and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
-
-        <set var="BUILD_CFG_FILE" make_var="1">
-            $(SETUPHDIR)$(DIRSEP)build.cfg
-        </set>
-
-        <action id="build_cfg_file">
-            <is-phony>1</is-phony>
-            <dependency-of>all</dependency-of>
-            <depends>libdir_setup</depends>
-            <command>
-                @echo WXVER_MAJOR=$(WXVER_MAJOR) >$(BUILD_CFG_FILE)
-                @echo WXVER_MINOR=$(WXVER_MINOR) >>$(BUILD_CFG_FILE)
-                @echo WXVER_RELEASE=$(WXVER_RELEASE) >>$(BUILD_CFG_FILE)
-                @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
-                @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
-                @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
-                @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
-                @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)
-                @echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
-                @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)
-                @echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE)
-                @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE)
-                @echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE)
-                @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
-                @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
-                @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
-                @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
-                @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
-                @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
-                @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
-                @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
-                @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
-                @echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
-                @echo CC=$(CC) >>$(BUILD_CFG_FILE)
-                @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
-                @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
-                @echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE)
-                @echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE)
-                @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
-            </command>
-        </action>
-
-    </if>
-
-</makefile>

build/bakefiles/common.bkl

@@ -3,67 +3,36 @@
 
 <makefile>
     
-    <requires version="0.1.7"/>
-
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
 
     <!-- load python module with wxwindows helpers: -->
     <using module="wxwin"/>
 
-    <!-- DFE: Add a platform meaning regular MacOS (not OS X) -->
-    <!-- FIXME: This will be handled in Bakefile but for now I wanted to
-         get my changes to the wx bakefiles in the tree but invisible to
-         windows toolkits and their config.xxx settings -->
-    <if cond="FORMAT=='autoconf'">
-        <option name="PLATFORM_MACOS"/>
-    </if>
-    <if cond="FORMAT!='autoconf'">
-        <set var="PLATFORM_MACOS">0</set>
-    </if>
-
-    <!-- FIXME: PalmOS is another candidate to bakefiles -->
-    <set var="PLATFORM_PALMOS">0</set>
-
     <include file="config.bkl"/>
     
-    <include file="plugins_deps.bkl"/>
     
     <!-- ================================================================== -->
-    <!--                     wxWidgets version numbers:                     -->
+    <!--                     wxWindows version numbers:                     -->
     <!-- ================================================================== -->
 
     <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
     <set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
     <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
-    <set var="WX_RELEASE" make_var="1">
-        $(WXVER_MAJOR).$(WXVER_MINOR)
-    </set>
-    <set var="WX_RELEASE_NODOT" make_var="1">
-        $(WXVER_MAJOR)$(WXVER_MINOR)
-    </set>
     <set var="WX_VERSION" make_var="1">
-        $(WX_RELEASE).$(WXVER_RELEASE)
-    </set>
-    <set var="WX_VERSION_NODOT" make_var="1">
-        $(WX_RELEASE_NODOT)$(WXVER_RELEASE)
+        $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
     </set>
 
     <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
 
-    <!-- this needs to be reset to 0 on beginning of stable series and
-         increment by one 1 every time binary incompatible change is made
-         (i.e. preferably never) -->
-    <set var="WX_BINARY_VERSION">0</set>
-    
     <set var="WXSOVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">$(WX_BINARY_VERSION).0.0</if>
+        <if cond="WX_STABLE_BRANCH=='1'">0.0.0</if>
         <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
     </set>
     <set var="WXMACVERSION">$(WX_VERSION)</set>
     <set var="WXWIN32DLLVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
-        <if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
+        <if cond="WX_STABLE_BRANCH=='1'">$(WXVER_MAJOR)$(WXVER_MINOR)</if>
+        <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)</if>
     </set>
     
     
@@ -98,11 +67,10 @@
         <if cond="DEBUG_FLAG=='1'">d</if>
     </set>
     <set var="WXUNICODEFLAG">
-        <!-- WinCE is Unicode-only platform: -->
-        <if cond="UNICODE=='1' and FORMAT!='msevc4prj'">u</if>
+        <if cond="UNICODE=='1'">u</if>
     </set>
     <set var="WXNAMESUFFIX">
-        $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+        $(WXUNICODEFLAG)$(WXDEBUGFLAG)
     </set>
     
     <set var="WXUNIVNAME">
@@ -115,14 +83,14 @@
     <if cond="FORMAT=='autoconf'">
         <set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>
         <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
-        <set var="WXVERSIONTAG">-$(WX_RELEASE)</set>
+        <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="WXNAMEPREFIX">
-            wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)
+            wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
         </set>
         <set var="WXNAMEPREFIXGUI">
-            wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)</set>
+            wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
         <set var="WXVERSIONTAG"></set>
     </if>
     <set var="WXDLLNAMEPREFIX">
@@ -153,31 +121,20 @@
     <set var="WXLIB_NET">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
     </set>
-    <set var="WXLIB_QA">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('qa')))</if>
-    </set>
     <set var="WXLIB_CORE">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
     </set>
     <set var="WXLIB_ADV">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
     </set>
-    <set var="WXLIB_MEDIA">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
-    </set>
     <set var="WXLIB_HTML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
     </set>
     <set var="WXLIB_XML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if>
     </set>
-    <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>
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('odbc')))</if>
     </set>
     <set var="WXLIB_DBGRID">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
@@ -192,9 +149,6 @@
     <!--             Where to store built libraries and objects:         -->
     <!-- =============================================================== -->
     
-    <set var="DIR_SUFFIX_CPU">
-        <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
-    </set>
 
     <if cond="FORMAT!='autoconf'">
         <set var="WXDLLFLAG">
@@ -203,27 +157,17 @@
         <set var="CFG_NAME_PART">
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>
-        <set var="OBJS" make_var="1">
-            <if cond="FORMAT!='cbuilderx'">
-                $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
-            </if>
-            <!-- FIXME: waiting for removal after CBX has better ../ dirs
-                 support -->
-            <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
-        </set>
-
+        <set var="OBJS" make_var="1">$(COMPILER)_$(CFG_NAME_PART)</set>
         <set var="BUILDDIR">$(OBJS)</set>
     </if>
     
-    <set var="LIBTYPE_SUFFIX" make_var="1">
-        <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
-        <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
-    </set>
-
     <set var="LIBDIRNAME" make_var="1">
         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
-        <if cond="FORMAT!='autoconf'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+        <if cond="FORMAT!='autoconf' and SHARED=='0'">
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG)
+        </if>
+        <if cond="FORMAT!='autoconf' and SHARED=='1'">
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_dll$(CFG)
         </if>
     </set>
     
@@ -246,8 +190,7 @@
         <if cond="DEBUG_INFO=='0'">off</if>
     </set>
     <set var="DEBUGRUNTIME">
-        <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='debug'">on</if>
-        <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">off</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if>
         <if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
         <if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
     </set>
@@ -255,45 +198,13 @@
         <if cond="BUILD=='debug'">off</if>
         <if cond="BUILD=='release'">speed</if>
     </set>
-    <set var="EXCEPTIONSFLAG">
-        <if cond="USE_EXCEPTIONS=='1'">on</if>
-        <if cond="USE_EXCEPTIONS=='0'">off</if>
-    </set>
-    <set var="RTTIFLAG">
-        <if cond="USE_RTTI=='1'">on</if>
-        <if cond="USE_RTTI=='0'">off</if>
-    </set>
-    <set var="THREADSFLAG">
-        <if cond="USE_THREADS=='1'">multi</if>
-        <if cond="USE_THREADS=='0'">single</if>
-    </set>
-
-    <set var="RTTI_DEFINE">
-    	<if cond="USE_RTTI=='0'">wxNO_RTTI</if>
-    </set>
-    <set var="EXCEPTIONS_DEFINE">
-    	<if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
-    </set>
-    <set var="THREAD_DEFINE">
-    	<if cond="USE_THREADS=='0'">wxNO_THREADS</if>
-    </set>
 
     <set var="DEBUG_DEFINE">
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
         <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>
-    <!-- does not cover all cases, but better than nothing -->
-    <set var="NO_VC_CRTDBG">
-        <if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
-        <if cond="FORMAT=='msvc' and BUILD=='release' and DEBUG_FLAG=='1'">__NO_VC_CRTDBG__</if>
-    </set>
     <set var="UNICODE_DEFINE">
-        <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
-    </set>
-
-    <!-- fill for the specific case of the format/compiler -->
-    <set var="WIN32_WINNT">
-        <if cond="FORMAT=='dmars' or FORMAT=='dmars_smake'">_WIN32_WINNT=0x0400</if>
+        <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
     </set>
     
     <set var="UNICOWS_LIB">
@@ -304,15 +215,11 @@
         <debug-info>$(DEBUGINFO)</debug-info>
         <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
         <optimize>$(OPTIMIZEFLAG)</optimize>
-        <threading>$(THREADSFLAG)</threading>
+        <threading>multi</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
-        <cxx-rtti>$(RTTIFLAG)</cxx-rtti>
-        <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>
-        <define>$(NO_VC_CRTDBG)</define>
-        <define>$(WIN32_WINNT)</define>
     </template>
     
     <template id="anylib">
@@ -321,70 +228,15 @@
     </template>
 
     <template id="3rdparty_lib" template="common_settings,anylib">
-        <if cond="FORMAT=='autoconf'">
-            <libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
-        </if>
-        <if cond="FORMAT!='autoconf'">
         <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
-        </if>
         <!--
         we want to install 3rd party libs system-wide only with static
-        version of wxWidgets; otherwise they are embedded in shared libs:
+        version of wxWindows; otherwise they are embedded in shared libs:
         -->
         <install-if>SHARED=='0'</install-if>
-        <pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
     </template>
 
 
-    <!-- deal with the need to copy setup.h here: -->
-
-    <set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
-
-    <define-tag name="msvc-headers" rules="dll,lib">
-        <if cond="IS_MSVC_PRJ">
-            <!-- FIXME: remove this once we require >=bkl-0.1.9 -->
-            <if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
-                <msvc-project-files>
-                    $(addPrefixToList('include\', wxwin.headersOnly(value)))
-                </msvc-project-files>
-            </if>
-            <if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
-                <msvc-project-files>
-                    $(addPrefixToList('include\\', wxwin.headersOnly(value)))
-                </msvc-project-files>
-            </if>
-        </if>
-    </define-tag>
-
-    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
-        <if cond="FORMAT=='msevc4prj'">
-            <msvc-headers>wx/msw/wince/setup.h</msvc-headers>
-            <set var="vc_setup_h">wince\setup.h</set>
-            <set var="vc_setup_h_rule">wince_setup_h</set>
-        </if>
-        <if cond="FORMAT!='msevc4prj'">
-            <msvc-headers>wx/msw/setup.h</msvc-headers>
-            <set var="vc_setup_h">setup.h</set>
-            <set var="vc_setup_h_rule">setup_h</set>
-        </if>
-        <if cond="IS_MSVC_PRJ">
-            <set var="_custom_build_files" append="1">
-                include\wx\msw\$(vc_setup_h)
-            </set>
-            <set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)">
-Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\include\wx\msw\$(vc_setup_h)
-
-"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
-$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-            </set>
-        </if>
-    </define-tag>
-
-    <template id="msvc_setup_h">
-        <msvc-copy-setup-h/>
-    </template>
-
     <!-- =============================================================== -->
     <!--                         3rd party libs:                         -->
     <!-- =============================================================== -->
@@ -400,46 +252,18 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
 
     
     <!-- =============================================================== -->
-    <!--                  Templates for wxWidgets libs:                  -->
+    <!--                  Templates for wxWindows libs:                  -->
     <!-- =============================================================== -->
 
-    <!-- NB: in monolithic build, even wxBase-only must be linked against
-             GUI extralibs, otherwise there would be unresolved references.
-             The variables below are defined so that all libs are used
-             in monolithic build, but not in multilib one. -->
-    <set var="EXTRALIBS_FOR_BASE">
-        <if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_GUI)</if>
-        <if cond="MONOLITHIC=='0'">$(EXTRALIBS)</if>
-    </set>
-    <set var="EXTRALIBS_FOR_GUI">
-        <if cond="MONOLITHIC=='1'"></if>
-        <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
-    </set>
-
     <template id="wx" template="common_settings">
         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>
         <define>$(DEBUG_DEFINE)</define>
-        <define>$(EXCEPTIONS_DEFINE)</define>
-        <define>$(RTTI_DEFINE)</define>
-        <define>$(THREAD_DEFINE)</define>
         <define>$(UNICODE_DEFINE)</define>
-        <!-- this include is added by configure, we need to put other
-             includes before it: -->
-        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
+        <include>$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
-        <warnings>max</warnings>
-        <cppflags-watcom>
-            -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
-            -wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
-            -wcd=657 <!-- define this function inside its class definition (could have improved code quality) -->
-            -wcd=667 <!-- 'va_start' macro will not work without an argument before '...' -->
-        </cppflags-watcom>
-        <cxxflags-mingw>
-            -Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
-        </cxxflags-mingw>
     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->
@@ -453,23 +277,16 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <sys-lib>$(LIB_REGEX)</sys-lib>
         <sys-lib>$(LIB_EXPAT)</sys-lib>
         
-        <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
+        <ldlibs>$(EXTRALIBS)</ldlibs>
 
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
-            <if cond="FORMAT=='borland'">
+            <if cond="COMPILER=='bcc'">
+                <sys-lib>import32</sys-lib>
                 <sys-lib>ole2w32</sys-lib>
             </if>
-            <if cond="FORMAT=='msevc4prj'">
-                <sys-lib>ole32</sys-lib>
-                <sys-lib>oleaut32</sys-lib>
-                <sys-lib>uuid</sys-lib>
-                <sys-lib>commctrl</sys-lib>
-                <sys-lib>winsock</sys-lib>
-                <sys-lib>wininet</sys-lib>
-            </if>
-            <if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
+            <if cond="COMPILER!='bcc'">
                 <sys-lib>kernel32</sys-lib>
                 <sys-lib>user32</sys-lib>
                 <sys-lib>gdi32</sys-lib>
@@ -478,6 +295,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                 <sys-lib>winmm</sys-lib>
                 <sys-lib>shell32</sys-lib>
                 <sys-lib>comctl32</sys-lib>
+                <sys-lib>odbc32</sys-lib>
                 <sys-lib>ole32</sys-lib>
                 <sys-lib>oleaut32</sys-lib>
                 <sys-lib>uuid</sys-lib>
@@ -485,19 +303,37 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
             </if>
-            <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
-                <sys-lib>oleacc</sys-lib>
-            </if>
-            <if cond="FORMAT!='msevc4prj'">
-                <sys-lib>odbc32</sys-lib>
-            </if>
         </if>        
     </template>
 
+    <define-tag name="msvc-headers" rules="dll,lib">
+        <if cond="FORMAT=='msvc6prj'">
+            <msvc-project-files>
+                $(addPrefixToList('include\', wxwin.headersOnly(value)))
+            </msvc-project-files>
+        </if>
+    </define-tag>
+    
+    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
+        <if cond="FORMAT=='msvc6prj'">
+            <msvc-headers>wx/msw/setup.h</msvc-headers>
+            <set var="__custom_build_files" append="1">
+                include\wx\msw\setup.h
+            </set>
+            <set var="__custom_build_include_wx_msw_setup_h">
+Creating $(SETUPHDIR)\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
+$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+            </set>
+        </if>
+    </define-tag>
+
 
     <!-- for GUI libs/samples: -->
     <template id="wx_append_nomono" template="wx_append_base_nomono">
-        <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
+        <ldlibs>$(EXTRALIBS_GUI)</ldlibs>
     </template>
 
 
@@ -518,22 +354,24 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <libname>$(WXLIBNAME)</libname>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
+            <if cond="FORMAT!='autoconf'">
                 <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
                 <precomp-headers-gen>
                     $(WXTOPDIR)src/msw/dummy.cpp
                 </precomp-headers-gen>
             </if>
-            <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
             <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
             <precomp-headers>on</precomp-headers>
             <precomp-headers-file>wxprec_$(id)</precomp-headers-file>
             <precomp-headers-exclude>
+                src/common/unzip.c
                 src/common/extended.c
+                src/msw/gsocket.c
+                src/msw/gsockmsw.c
             </precomp-headers-exclude>
         </if>
         
-        <if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
+        <if cond="FORMAT=='msvc6prj' and BUILDING_LIB=='1'">
             <msvc-file-group>Common Sources:src/common/*</msvc-file-group>
             <msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
             <msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
@@ -554,45 +392,32 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <version>$(WX_VERSION)</version>
         <so_version>$(WXSOVERSION)</so_version>
         <mac_version>$(WXMACVERSION)</mac_version>
-
-        <!-- version info resources: -->
-        <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
-            <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
-            <res-include cond="FORMAT=='autoconf'">
-                $(TOP_SRCDIR)include
-            </res-include>
-        </if>
-        <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
     </template>
 
-    <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
+    <template id="wx_3rdparty_dependencies">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
-    </template>
-
-    <template id="wx_3rdparty_dependencies"
-              template="wx_3rdparty_dependencies_gui">
         <depends>wxexpat</depends>
         <depends>wxzlib</depends>
         <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
 
-    <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
+    <template id="wx_3rdparty_includes">
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
         <include>$(INC_PNG)</include>
-    </template>
-
-    <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>
 
+    <template id="msvc_setup_h">
+        <msvc-copy-setup-h/>
+    </template>
+    
     <template id="wx_lib"
               template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
     <template id="wx_base_lib"
@@ -610,77 +435,59 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
     </template>
                            
     <!-- =============================================================== -->
-    <!--             Templates for building wxWidgets plugins:           -->
+    <!--             Templates for building wxWindows plugins:           -->
     <!-- =============================================================== -->
 
     <if cond="WX_STABLE_BRANCH=='1'">
-        <set var="PLUGIN_VERSION0">
-            <if cond="PLATFORM_UNIX=='1'">$(WX_RELEASE)</if>
-            <if cond="PLATFORM_UNIX=='0'">$(WX_RELEASE_NODOT)</if>
+        <set var="PLUGIN_VERSION">
+            <if cond="PLATFORM_UNIX=='1'">
+                -$(WXVER_MAJOR).$(WXVER_MINOR)
+            </if>
+            <if cond="PLATFORM_UNIX=='0'">
+                $(WXVER_MAJOR)$(WXVER_MINOR)
+            </if>
         </set>
     </if>
     <if cond="WX_STABLE_BRANCH=='0'">
-        <set var="PLUGIN_VERSION0">
-            <if cond="PLATFORM_UNIX=='1'">$(WX_VERSION)</if>
-            <if cond="PLATFORM_UNIX=='0'">$(WX_VERSION_NODOT)</if>
+        <set var="PLUGIN_VERSION">
+            <if cond="PLATFORM_UNIX=='1'">
+                -$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+            </if>
+            <if cond="PLATFORM_UNIX=='0'">
+                $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
+            </if>
         </set>
     </if>
-    <set var="PLUGVERDELIM">
-        <if cond="PLATFORM_UNIX=='1'">-</if>
-        <if cond="PLATFORM_UNIX=='0'"></if>
-    </set>
-    <set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set>
-
-    <set var="PLUGINSUFFIX">
-        <if cond="UNICODE=='0' and BUILD=='release'"></if>
-        <if cond="UNICODE=='0' and BUILD=='debug'">d</if>
-        <if cond="UNICODE=='1' and BUILD=='release'">u</if>
-        <if cond="UNICODE=='1' and BUILD=='debug'">ud</if>
-    </set>
-
-    <set var="PLUGINS_INST_DIR" make_var="1">
-        $(LIBDIR)/wx/$(PLUGIN_VERSION0)
-    </set>
 
     <define-rule name="wx-base-plugin" extends="module">
         <template>
             <dllname>
-                $(id)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
+                $(id)$(addPrefixIfNotEmpty('_',WXNAMESUFFIX))$(PLUGIN_VERSION)$(WXCOMPILER)
             </dllname>
             <define>WXUSINGDLL</define>
             <define>wxUSE_GUI=0</define>
-            <install-to>$(PLUGINS_INST_DIR)</install-to>
         </template>
     </define-rule>
     
     <define-rule name="wx-gui-plugin" extends="module">
         <template template="wx">
             <dllname>
-                $(id)_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
+                $(id)_$(PORTNAME)$(WXUNIVNAME)$(WXNAMESUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
             </dllname>
             <define>WXUSINGDLL</define>
-            <install-to>$(PLUGINS_INST_DIR)</install-to>
         </template>
     </define-rule>
     
     <!-- =============================================================== -->
-    <!--               Support for wxWidgets samples and contrib:        -->
+    <!--               Support for wxWindows 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>
-        <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
+        <if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
             <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>
     </define-tag>
 
-
-    <!-- A hack to keep autoconf happy (we pass CPPFLAGS that contain
-         {top_srcdir} from configure, poor bakefile can't know that
-         and won't output top_srcdir = @top_srcdir@ line): -->
-    <set var="VARS_DONT_ELIMINATE" append="1">top_srcdir</set>
-
-
 </makefile>

build/bakefiles/common_contrib.bkl

@@ -21,9 +21,6 @@
         <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"
@@ -31,8 +28,9 @@
         <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>    
+    
 </makefile>

build/bakefiles/common_samples.bkl

@@ -7,13 +7,13 @@
     <set var="file_common_samples_included">1</set>
     
     <!-- =============================================================== -->
-    <!--                    Template for wxWidgets samples:              -->
+    <!--                    Template for wxWindows samples:              -->
     <!-- =============================================================== -->
 
     <if cond="FORMAT=='autoconf'">
         <set var="MACOSX_RESOURCES">
             <if cond="TOOLKIT=='MAC'">
-                Carbon.r sample.r
+                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r sample.r
             </if>
         </set>
     </if>
@@ -30,41 +30,25 @@
     <template id="wx_util" template="wx_util_b">
         <app-type>gui</app-type>
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
-        <!-- resource files includes: -->
-        <include>$(SRCDIR)/$(WXTOPDIR)samples</include>
-        <!-- this include is not added via <include> for autoconf, see
-             common.bkl: -->
-        <res-include cond="FORMAT=='autoconf'">
-            $(TOP_SRCDIR)include
-        </res-include>
-        
+        <include>$(SRCDIR)/$(WXTOPDIR)samples</include> <!-- for .rc files -->
         <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
-        <if cond="FORMAT=='autoconf'">
-            <wx-os2-lib-resource/>
-        </if>
-
-        <!-- FIXME: temporary, until bakefile can reuse existing pch files -->
-        <if cond="FORMAT!='autoconf'">
-            <define>NOPCH</define>
-        </if>
     </template>
     
     <template id="wx_util_console" template="wx_util_b">
         <app-type>console</app-type>
-        <define>wxUSE_GUI=0</define>
     </template>
     
     <template id="wx_sample" template="wx_util">
         <if cond="FORMAT=='autoconf'">
             <wx-mac-app-bundle/>
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
-            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
+            <__command>$(LF)$(SAMPLES_RPATH_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>
+            <__command>$(SAMPLES_RPATH_POSTLINK)</__command>
         </if>
     </template>
 
@@ -95,28 +79,8 @@
         -->
     </define-rule>
 
-    
-    <!-- =============================================================== -->
-    <!--                    Misc platform specialities:                  -->
-    <!-- =============================================================== -->
-
     <if cond="FORMAT=='autoconf'">
         <include file="mac_bundles.bkl"/>
-
-        <!--
-        A hack to include precompiled OS/2 resource file in apps instead of
-        compiling it from .rc file (gcc on OS/2 doesn't ship with resource
-        compiler):
-        -->
-        <define-tag name="wx-os2-lib-resource" rules="exe">        
-            <set var="os2_lib_res">
-                <if cond="PLATFORM_OS2=='1'">
-                    $(TOP_SRCDIR)include/wx/os2/wx.res
     </if>
-            </set>
-            <set var="__objects" append="1">$(os2_lib_res)</set>
-        </define-tag>
-    </if>
-    
 
 </makefile>

build/bakefiles/compat/FORMATS.bkmanifest

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<bakefile-manifest>
+
+    <format id="wx24dsp">
+        <description>
+            src/wxWindows.dsp which makes same files as 2.4 version
+        </description>
+        <default-filename>wxWindows.dsp</default-filename>
+    </format>
+    
+</bakefile-manifest>

build/bakefiles/compat/README

@@ -0,0 +1,3 @@
+
+This is Bakefile backend that generates wx2.4-compatible VC++ project file
+(src/wxWindows.dsp).

build/bakefiles/compat/wx24dsp.bkl

@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+
+    <include file="win32.bkl"/>
+    <set var="COMPILER">vc</set>
+
+    <define-rule name="__fake">
+        <define-tag name="sources"/>
+        <define-tag name="libname"/>
+        <define-tag name="dllname"/>
+        <define-tag name="dirname"/>
+        <define-tag name="dependency-of"/>
+        <define-tag name="debug-info"/>
+        <define-tag name="debug-runtime-libs"/>
+        <define-tag name="runtime-libs"/>
+        <define-tag name="optimize"/>
+        <define-tag name="threading"/>
+        <define-tag name="cppflags"/>
+        <define-tag name="cflags"/>
+        <define-tag name="cxxflags"/>
+        <define-tag name="ldflags"/>
+        <define-tag name="ldlibs"/>
+        <define-tag name="define"/>
+        <define-tag name="include"/>
+        <define-tag name="install-to"/>
+        <define-tag name="install-if"/>
+        <define-tag name="installable"/>
+        <define-tag name="dir"/>
+        <define-tag name="lib-path"/>
+        <define-tag name="precomp-headers"/>
+        <define-tag name="precomp-headers-gen"/>
+        <define-tag name="precomp-headers-header"/>        
+        <define-tag name="precomp-headers-file"/>
+        <define-tag name="precomp-headers-exclude"/>
+        <define-tag name="version"/>
+        <define-tag name="so_version"/>
+        <define-tag name="mac_version"/>
+        <define-tag name="depends"/>
+        <define-tag name="sys-lib"/>
+        <define-tag name="library"/>
+        <define-tag name="command"/>
+    </define-rule>
+
+    <define-rule name="exe" extends="__fake"/>
+    <define-rule name="dll" extends="__fake"/>
+    <define-rule name="module" extends="__fake"/>
+    <define-rule name="lib" extends="__fake"/>
+    <define-rule name="action" extends="__fake"/>
+    <define-rule name="phony" extends="__fake"/>
+    <define-rule name="subproject" extends="__fake"/>
+
+    <set var="ALL_SOURCES" eval="0">
+        $(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
+    </set>
+    
+    <output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
+    <set var="FORMAT_OUTPUT_VARIABLES">
+        ALL_SOURCES,ALL_HEADERS
+    </set>   
+    
+</makefile>

build/bakefiles/compat/wx24dsp.empy

@@ -318,28 +318,24 @@ LIB32=link.exe -lib
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
 # Name "wxWindows - Win32 Release With Debug Info"
-# Begin Source File
-
-SOURCE="This project is deprecated, please see install.txt"
-# End Source File
-@[for group in SOURCES]@
+@[for group in SOURCES:@
 # Begin Group "@group[0]"
 
 # PROP Default_Filter ""
-@[for src in group[1]]@
+@[for src in group[1]:@
 # Begin Source File
 
 SOURCE=.\@src[4:].replace('/','\\')
-@[if src=='src/msw/dummy.cpp']@
+@[if src=='src/msw/dummy.cpp':@
 # ADD CPP /Yc"wx/wxprec.h"
-@[end if]@
-@[if src.endswith('.c')]@
+]@
+@[if src.endswith('.c'):@
 # SUBTRACT CPP /YX /Yc /Yu
-@[end if]@
+]@
 # End Source File
-@[end for]@
+]@
 # End Group
-@[end for]@
+]@
 # Begin Group "Headers"
 
 # PROP Default_Filter ""
@@ -444,18 +440,18 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Source File
 # End Group
-@[for group in HEADERS]@
+@[for group in HEADERS:@
 # Begin Group "@group[0]"
 
 # PROP Default_Filter ""
-@[for hdr in group[1]]@
+@[for hdr in group[1]:@
 # Begin Source File
 
 SOURCE=..\include\@hdr.replace('/','\\')
 # End Source File
-@[end for]@
+]@
 # End Group
-@[end for]@
+]@
 # End Group
 # End Target
 # End Project

build/bakefiles/config.bkl

@@ -28,7 +28,7 @@
         <values-description>,Unicode</values-description>
         <default-value>0</default-value>        
         <description>
-            Compile Unicode build of wxWidgets?
+            Compile Unicode build of wxWindows?
         </description>
     </option>
 
@@ -54,18 +54,9 @@
         </description>
     </option>
     
-    <!-- FIXME: restore this once bakefile is fixed to not use
-                /Gm /GZ (incompatible with /O2) w/ debug-info -->
-    <set var="DEBUG_INFO_DEFAULT">
-        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
-    </set>
-    -->
-    <set var="DEBUG_INFO_DEFAULT">default</set>
-
     <option name="DEBUG_INFO">
         <values>0,1,default</values>
-        <default-value>$(DEBUG_INFO_DEFAULT)</default-value>
+        <default-value>default</default-value>
         <description>
 Should debugging info be included in the executables? The default value
 "default" means that debug info will be included if BUILD=debug
@@ -88,7 +79,7 @@ be defined if BUILD=debug and not defined if BUILD=release.
             <default-value>default</default-value>
             <description>
 Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
-Acts according to BUILD by default.
+Acts according to DEBUG_INFO by default.
             </description>
         </option>
     </if>
@@ -96,33 +87,15 @@ Acts according to BUILD by default.
         <set var="DEBUG_RUNTIME_LIBS">default</set>
     </if>
     
-    <set var="MONOLITHIC_DEFAULT">
-        <if cond="FORMAT=='watcom'">1</if>
-        <if cond="FORMAT!='watcom'">0</if>
-    </set>
     <option name="MONOLITHIC">
         <values>0,1</values>
         <values-description>Multilib,Monolithic</values-description>
-        <default-value>$(MONOLITHIC_DEFAULT)</default-value>
+        <default-value>0</default-value>
         <description>
             Multiple libraries or single huge monolithic one?
         </description>
     </option>
     
-    <if cond="FORMAT=='autoconf'"> <!-- FIXME - temporary -->
-        <option name="USE_PLUGINS">
-            <values>0,1</values>
-            <default-value>1</default-value>
-            <description>
-                Build parts of the library as dynamically loadable plugins
-                (only supported in multilib build)?
-            </description>
-        </option>
-    </if>
-    <if cond="FORMAT!='autoconf'">
-        <set var="USE_PLUGINS">0</set> <!-- FIXME - temporary -->
-    </if>
-
     <option name="USE_GUI">
         <values>0,1</values>
         <values-description>Base,GUI</values-description>
@@ -140,14 +113,6 @@ Acts according to BUILD by default.
         </description>
     </option>
     
-    <option name="USE_XRC">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Build wxXRC library (USE_GUI must be 1)?
-        </description>
-    </option>
-
     <option name="USE_OPENGL">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -164,43 +129,11 @@ Acts according to BUILD by default.
         </description>
     </option>
     
-    <option name="USE_QA">
-        <values>0,1</values>
-        <default-value>0</default-value>
-        <description>
-            Build quality assurance classes library (USE_GUI must be 1)?
-        </description>
-    </option>
-
-    <option name="USE_EXCEPTIONS">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Enable exceptions in compiled code.
-        </description>
-    </option>
-
-    <option name="USE_RTTI">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Enable run-time type information (RTTI) in compiled code.
-        </description>
-    </option>
-
-    <option name="USE_THREADS">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Enable threading in compiled code.
-        </description>
-    </option>
-
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
         <default-value>0</default-value>
         <description>
-            Is this official build by wxWidgets developers?
+            Is this official build by wxWindows developers?
         </description>
     </option>
     <option name="VENDOR">
@@ -209,14 +142,6 @@ Acts according to BUILD by default.
             Use this to name your customized DLLs differently
         </description>
     </option>
-    <!-- These basically do what vendor does in the places it didn't. -->
-    <!-- They should all be unified under some suitable descriptor    -->
-    <option name="WX_FLAVOUR">
-        <default-value></default-value>
-    </option>
-    <option name="WX_LIB_FLAVOUR">
-        <default-value></default-value>
-    </option>
 
     <option name="CFG">
         <default-value></default-value>
@@ -227,23 +152,6 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
         </description>
     </option>
 
-    <!-- unit tests support: -->
-    <option name="CPPUNIT_CFLAGS">
-        <default-value></default-value>
-        <description>
-Compiler flags needed to compile test suite in tests directory. If you want
-to run the tests, set it so that the compiler can find CppUnit headers.
-        </description>
-    </option>
-
-    <option name="CPPUNIT_LIBS">
-        <default-value></default-value>
-        <description>
-Linker flags needed to link test suite in tests directory. If you want
-to run the tests, include CppUnit library here.
-        </description>
-    </option>
-
 
     <!-- ================================================================== -->
     <!--                             Autoconf                               -->
@@ -255,15 +163,11 @@ to run the tests, include CppUnit library here.
         <option name="TOOLKIT_LOWERCASE"/>
         <option name="TOOLKIT_VERSION"/>
         <option name="TOOLCHAIN_NAME"/>
-        <option name="TOOLCHAIN_FULLNAME"/>
         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_XML"/>
-        <option name="EXTRALIBS_HTML"/>
         <option name="EXTRALIBS_ODBC"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
-        <option name="EXTRALIBS_SDL"/>
-        <option name="EXTRALIBS_GNOMEPRINT"/>
         <option name="HOST_SUFFIX"/>
         <option name="SAMPLES_RPATH_FLAG"/>
         <option name="SAMPLES_RPATH_POSTLINK"/>
@@ -271,15 +175,11 @@ to run the tests, include CppUnit library here.
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
-
-        <option name="WITH_PLUGIN_SDL">
-            <values>0,1</values>
-        </option>
     </if>
 
     
     <!-- ================================================================== -->
-    <!--                         windows compilers                          -->
+    <!--                         Windows compilers                          -->
     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">
@@ -295,28 +195,15 @@ it if SHARED=1 unless you know what you are doing.
         
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
 
-        <set var="TOOLKIT" overwrite="0">
-            <if cond="FORMAT!='msevc4prj'">MSW</if>
-            <if cond="FORMAT=='msevc4prj'">WINCE</if>
-        </set>
+        <set var="TOOLKIT">MSW</set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
         <set var="HOST_SUFFIX"/>
-        <set var="EXTRACFLAGS"/>
         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS_XML"/>
-        <set var="EXTRALIBS_HTML"/>
         <set var="EXTRALIBS_ODBC"/>
         <set var="EXTRALIBS_GUI"/>
-        <set var="EXTRALIBS_OPENGL">
-            <if cond="COMPILER=='wat'">opengl32.lib glu32.lib</if>
-            <if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
-            <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
-        </set>
-        <set var="EXTRALIBS_SDL"/>
-        <set var="EXTRALIBS_GNOMEPRINT"/>
-
-        <set var="WITH_PLUGIN_SDL">0</set>
+        <set var="EXTRACFLAGS"/>
 
         <set var="SRCDIR">
             <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
@@ -341,69 +228,4 @@ Set the version of your Mingw installation here.
         <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
     </if>
     
-    <if cond="FORMAT=='cbuilderx'">
-        <set var="EXTRACFLAGS">
-            <if cond="COMPILER=='gcc'">-DHAVE_W32API_H</if>
-        </set>
-    </if>
-
-
-    <!-- ================================================================== -->
-    <!--            Project files - hardcode some defaults                  -->
-    <!-- ================================================================== -->
-
-    <if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
-        <set var="RUNTIME_LIBS">dynamic</set>
-        <set var="OFFICIAL_BUILD">0</set>
-        <set var="USE_HTML">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>
-        <set var="USE_EXCEPTIONS">1</set>
-        <set var="USE_RTTI">1</set>
-        <set var="USE_THREADS">1</set>
-        <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
-        <set var="DEBUG_FLAG">default</set>
-        <set var="MSLU">0</set>
-    </if>
-
-
-    <!-- FIXME:
-         C++BuilderX supports only wxMSW, monolithic (sic!) static build
-         and the project can't be put into build/msw and store objects in
-         build/msw/something. This *must* be fixed! -->
-    <if cond="FORMAT=='cbuilderx'">
-        <set var="WXUNIV">0</set>
-        <set var="MONOLITHIC">1</set>
-        <set var="SRCDIR">.</set>
-        <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
-        <set var="SHARED">0</set>
-    </if>
-
-
-    <!-- DigitalMars make is braindead, it doesn't have conditional
-         processing: -->
-    <if cond="FORMAT=='dmars'">
-        <set var="RUNTIME_LIBS">static</set>
-        <set var="BUILD">debug</set>
-        <set var="SHARED">0</set>
-        <set var="WXUNIV">0</set>
-        <set var="UNICODE">0</set>
-        <!-- Free version does not distribute OpenGL,
-             in commercial distribution better use dmars_smake format -->
-        <set var="USE_OPENGL">0</set>
-    </if>
-
-    <!-- No need for wxUniv on embedded devices (yet): -->
-    <if cond="FORMAT=='msevc4prj'">
-        <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! -->
-    </if>
-
 </makefile>

build/bakefiles/expat.bkl

@@ -3,20 +3,13 @@
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_EXPAT"/>
-        <set var="LIB_EXPAT">
-            <if cond="wxUSE_EXPAT=='builtin'">
-                wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-            </if>
-        </set>
     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="wxUSE_EXPAT">builtin</set>
+    </if>
     <set var="LIB_EXPAT">
-            <if cond="wxUSE_EXPAT=='builtin'">
-                wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
-            </if>
+        <if cond="wxUSE_EXPAT=='builtin'">wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
     </set>
-    </if>
     <set var="INC_EXPAT">
         <if cond="wxUSE_EXPAT=='builtin'">$(TOP_SRCDIR)src/expat/lib</if>
     </set>
@@ -29,7 +22,7 @@
         <define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             COMPILED_FROM_DSP
         </define>
-        <cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
+        <cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
         <sources>
             src/expat/lib/xmlparse.c
             src/expat/lib/xmlrole.c

build/bakefiles/formats/FORMATS.bkmanifest

@@ -1,28 +0,0 @@
-<?xml version="1.0" ?>
-
-<bakefile-manifest>
-
-    <format id="wx24dsp">
-        <description>
-            src/wxWindows.dsp which makes same files as 2.4 version
-        </description>
-        <default-filename>wxWindows.dsp</default-filename>
-    </format>
-    
-    <format id="rpmspec">
-        <description>
-            wxBase headers list in wx{GTK,Motif,X11}.spec
-        </description>
-        <default-filename>xxx.spec</default-filename>
-    </format>
-
-    <format id="cbx_unix">
-        <description>
-            C++BuilderX projects for Unix (use configure)
-        </description>
-        <default-filename>
-            $(os.path.splitext(os.path.basename(INPUT_FILE))[0])Unix.cbx
-        </default-filename>
-    </format>
-    
-</bakefile-manifest>

build/bakefiles/formats/README

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

build/bakefiles/formats/cbx_unix.bkl

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

build/bakefiles/formats/cbx_unix.empy

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

build/bakefiles/formats/rpmspec.bkl

@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="presets/fake.bkl"/>
-    <set var="COMPILER">gcc</set>
-
-    <set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>
-
-    <output file="../../wxGTK.spec"
-            writer="rpmspec.empy" method="insertBetweenMarkers"/>
-    <output file="../../wxX11.spec"
-            writer="rpmspec.empy" method="insertBetweenMarkers"/>
-    <output file="../../wxMotif.spec"
-            writer="rpmspec.empy" method="insertBetweenMarkers"/>
-    
-</makefile>

build/bakefiles/formats/rpmspec.empy

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

build/bakefiles/formats/wx24dsp.bkl

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

build/bakefiles/jpeg.bkl

@@ -3,20 +3,15 @@
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_LIBJPEG"/>
-        <set var="LIB_JPEG">
-            <if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
-                wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-            </if>
-        </set>
     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="wxUSE_LIBJPEG">builtin</set>
+    </if>
     <set var="LIB_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
             wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
         </if>
     </set>
-    </if>
     <set var="INC_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>
     </set>

build/bakefiles/mac_bundles.bkl

@@ -4,7 +4,7 @@
 <makefile>
 
     <!--
-    Support for application bundles, for wxWidgets samples.
+    Support for application bundles, for wxWindows samples.
     -->
     
     <!-- 
@@ -16,10 +16,13 @@
     </set>
     
     <set var="BUNDLE_PLIST">
-        $(TOP_SRCDIR)src/mac/carbon/Info.plist.in
+        $(TOP_SRCDIR)src/mac/Info.plist.in
+    </set>
+    <set var="BUNDLE_RESOURCE">
+        $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc
     </set>
     <set var="BUNDLE_ICONS">
-        $(TOP_SRCDIR)src/mac/carbon/wxmac.icns
+        $(TOP_SRCDIR)src/mac/wxmac.icns
     </set>
 
     <define-tag name="wx-mac-app-bundle" rules="exe">
@@ -27,16 +30,13 @@
         <!-- bundle directory: -->
         <set var="BUNDLE">$(id).app/Contents</set>
         <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
-        <set var="BUNDLE_TGT_REF">
-            <if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
-            <if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
-        </set>
         
         <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_RESOURCE)</depends-on-file>
             <depends-on-file>$(BUNDLE_ICONS)</depends-on-file>
 
             <command>
@@ -57,8 +57,9 @@
                 <!-- make a hardlink to the binary: -->
                 ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
 
-                <!-- ditto wxWidgets resources and icons: -->
-                cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
+                <!-- ditto wxWindows resources and icons: -->
+                ln -f $(BUNDLE_RESOURCE) $(BUNDLE)/Resources/$(id).rsrc
+                ln -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
             </command>            
         </modify-target>
         
@@ -67,7 +68,7 @@
                     cond="PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(id)_bundle">
             <dependency-of>all</dependency-of>
-            <depends>$(BUNDLE_TGT_REF)</depends>
+            <depends>$(BUNDLE_TGT)</depends>
         </modify-target>
 
         <!-- "make clean" should delete the bundle: -->

build/bakefiles/make_dist.mk

@@ -1,5 +1,6 @@
 #
 # "make dist" target implementation:
+# $Id$
 #
 
 
@@ -67,9 +68,6 @@ DISTDIR=./_dist_dir/$(DISTDIRNAME)
 ALL_DIST: distrib_clean
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
-	cp $(WXDIR)/configure.in $(DISTDIR)
-	cp $(WXDIR)/configure $(DISTDIR)
-	cp $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
 	cp $(WXDIR)/wxwin.m4 $(DISTDIR)
 	cp $(WXDIR)/aclocal.m4 $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
@@ -77,7 +75,6 @@ ALL_DIST: distrib_clean
 	cp $(WXDIR)/install-sh $(DISTDIR)
 	cp $(WXDIR)/mkinstalldirs $(DISTDIR)
 	cp $(WXDIR)/wx-config.in $(DISTDIR)
-	cp $(WXDIR)/wx-config-inplace.in $(DISTDIR)
 	cp $(WXDIR)/version-script.in $(DISTDIR)
 	cp $(WXDIR)/setup.h.in $(DISTDIR)
 	cp $(WXDIR)/setup.h_vms $(DISTDIR)
@@ -102,12 +99,18 @@ ALL_DIST: distrib_clean
 	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
-#	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/README $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
 	cp -Rf $(EXPATDIR) $(DISTDIR)/src
 	(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
 	mkdir $(DISTDIR)/src/iodbc
@@ -126,6 +129,8 @@ ALL_DIST: distrib_clean
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
+	cp $(WXDIR)/configure.in $(DISTDIR)
+	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
 	if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
@@ -139,14 +144,13 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/xml
-	mkdir $(DISTDIR)/include/wx/xrc
 	cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
+	cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
 	cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	cp $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
-	cp $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
 	cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/art
 	mkdir $(DISTDIR)/art/gtk
@@ -161,12 +165,12 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/jpeg
 	mkdir $(DISTDIR)/src/tiff
 	mkdir $(DISTDIR)/src/unix
-	mkdir $(DISTDIR)/src/xrc
-	cp $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.inc $(DISTDIR)/src/common
+	cp $(COMMDIR)/*.h $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.mms $(DISTDIR)/src/common
+	cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
 	cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
 	cp $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
 	cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
@@ -193,13 +197,13 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/xml
 	mkdir $(DISTDIR)/include/wx/msw
-	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/msw
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
+	cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common
 	list='$(ALL_BASE_HEADERS)'; for p in $$list; do \
 	  cp $(WXDIR)/include/$$p $(DISTDIR)/include/$$p; \
 	done
@@ -220,17 +224,10 @@ BASE_DIST: ALL_DIST
 GTK_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
 	cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
-	cp $(GTKDIR)/*.h $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.mms $(DISTDIR)/src/gtk
-
-	mkdir $(DISTDIR)/include/wx/gtk/gnome
-	mkdir $(DISTDIR)/src/gtk/gnome
-	cp $(INCDIR)/wx/gtk/gnome/*.h $(DISTDIR)/include/wx/gtk/gnome
-	cp $(GTKDIR)/gnome/*.cpp $(DISTDIR)/src/gtk/gnome
-
 	mkdir $(DISTDIR)/contrib
 	cp -R $(WXDIR)/contrib $(DISTDIR)
 
@@ -247,6 +244,7 @@ MOTIF_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxMotif.spec $(DISTDIR)
 	cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
 	cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
+	cp $(MOTIFDIR)/*.c $(DISTDIR)/src/motif
 	cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
 	mkdir $(DISTDIR)/src/motif/xmcombo
 	cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
@@ -255,49 +253,24 @@ MOTIF_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/x11
 	mkdir $(DISTDIR)/include/wx/x11
 	cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
-		$(X11DIR)/bitmap.cpp $(X11DIR)/glcanvas.cpp $(X11DIR)/region.cpp \
+		$(X11DIR)/bitmap.cpp $(X11DIR)/region.cpp \
 		$(DISTDIR)/src/x11
 	cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
-		$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
+		$(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \
 		$(DISTDIR)/include/wx/x11
-	mkdir $(DISTDIR)/contrib
-	cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MACX_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/*.* $(DISTDIR)/include
-	mkdir $(DISTDIR)/include/wx/mac/carbon
-	mkdir $(DISTDIR)/include/wx/mac/private
-	mkdir $(DISTDIR)/include/wx/mac/carbon/private
 	cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
-	cp $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon
-	cp $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private
-	cp $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private
-	mkdir $(DISTDIR)/include/wx/mac/corefoundation
-	cp $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
-	mkdir $(DISTDIR)/src/mac/corefoundation
-	cp $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
-	mkdir $(DISTDIR)/src/html/htmlctrl
-	mkdir $(DISTDIR)/src/html/htmlctrl/webkit
-	cp $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit
-	mkdir $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.mm $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.icns $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon
-	mkdir $(DISTDIR)/src/mac/carbon/morefile
-	cp $(MACDIR)/carbon/morefile/*.h $(DISTDIR)/src/mac/carbon/morefile
-	cp $(MACDIR)/carbon/morefile/*.c $(DISTDIR)/src/mac/carbon/morefile
-	mkdir $(DISTDIR)/src/mac/carbon/morefilex
-	cp $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
-	cp $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
-	cp $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
-# obsolete
-#	mkdir $(DISTDIR)/src/mac/macsock
-#	cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
-	mkdir $(DISTDIR)/contrib
-	cp -R $(WXDIR)/contrib $(DISTDIR)
+	cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac
+	cp $(MACDIR)/*.c $(DISTDIR)/src/mac
+	cp $(MACDIR)/*.h $(DISTDIR)/src/mac
+	cp $(MACDIR)/*.r $(DISTDIR)/src/mac
+	mkdir $(DISTDIR)/src/mac/morefile
+	cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile
+	cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile
+	mkdir $(DISTDIR)/src/mac/macsock
+	cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
 
 # TODO: Distribute some files
 COCOA_DIST: ALL_GUI_DIST
@@ -305,6 +278,9 @@ COCOA_DIST: ALL_GUI_DIST
 
 MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
+	mkdir $(DISTDIR)/include/wx/msw/ctl3d
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	mkdir $(DISTDIR)/include/wx/msw/ole
 	mkdir $(DISTDIR)/include/wx/msw/wince
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
@@ -312,24 +288,36 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
-	cp $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw
+	cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
+	cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince
 	mkdir $(DISTDIR)/src/msw/ole
 	mkdir $(DISTDIR)/src/msw/wince
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
-	cp $(MSWDIR)/*.rc $(DISTDIR)/src/msw
+	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
+	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
+	mkdir $(DISTDIR)/contrib
+	cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
 	mkdir $(DISTDIR)/include/wx/msw
+	mkdir $(DISTDIR)/include/wx/msw/ctl3d
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
+	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	mkdir $(DISTDIR)/include/wx/msw/ole
 	mkdir $(DISTDIR)/include/wx/msw/wince
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
-	cp $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw
+	cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
+	cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
+	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
 	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince
 	mkdir $(DISTDIR)/src/msw
@@ -337,10 +325,12 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/msw/wince
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
+	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
 	cp $(SRCDIR)/*.??? $(DISTDIR)/src
 	cp $(SRCDIR)/*.?? $(DISTDIR)/src
+	cp $(MSWDIR)/?ake*.* $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/contrib
 	cp -R $(WXDIR)/contrib $(DISTDIR)
 
@@ -382,7 +372,6 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
-	cp $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty
 
 	mkdir $(DISTDIR)/demos/life
 	mkdir $(DISTDIR)/demos/life/bitmaps
@@ -456,9 +445,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
-	cp $(SAMPDIR)/controls/*.bmp $(DISTDIR)/samples/controls
-	cp $(SAMPDIR)/controls/*.ico $(DISTDIR)/samples/controls
-	cp $(SAMPDIR)/controls/*.rc $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
 
@@ -477,14 +463,10 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs
 
-	mkdir $(DISTDIR)/samples/dialup
-	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
-	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
-	cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
-
 	mkdir $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
+	cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
@@ -535,10 +517,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
 	cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
 
-	mkdir $(DISTDIR)/samples/except
-	cp $(SAMPDIR)/except/Makefile.in $(DISTDIR)/samples/except
-	cp $(SAMPDIR)/except/*.cpp $(DISTDIR)/samples/except
-
 	mkdir $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
@@ -562,12 +540,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help
 	cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc
 
-	mkdir $(DISTDIR)/samples/htlbox
-	cp $(SAMPDIR)/htlbox/Makefile.in $(DISTDIR)/samples/htlbox
-	cp $(SAMPDIR)/htlbox/makefile.unx $(DISTDIR)/samples/htlbox
-	cp $(SAMPDIR)/htlbox/*.cpp $(DISTDIR)/samples/htlbox
-	cp $(SAMPDIR)/htlbox/*.xpm $(DISTDIR)/samples/htlbox
-
 	mkdir $(DISTDIR)/samples/html
 	cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
 	mkdir $(DISTDIR)/samples/html/about
@@ -616,39 +588,27 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/*.mms $(DISTDIR)/samples/image
-	cp $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image
+	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
 
 	mkdir $(DISTDIR)/samples/internat
-	mkdir $(DISTDIR)/samples/internat/bg
-	mkdir $(DISTDIR)/samples/internat/cs
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
-	mkdir $(DISTDIR)/samples/internat/ja
-	mkdir $(DISTDIR)/samples/internat/ka
-	mkdir $(DISTDIR)/samples/internat/pl
+	mkdir $(DISTDIR)/samples/internat/ju
 	mkdir $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
-	cp $(SAMPDIR)/internat/bg/*.mo $(DISTDIR)/samples/internat/bg
-	cp $(SAMPDIR)/internat/cs/*.mo $(DISTDIR)/samples/internat/cs
-	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/ja/*.mo $(DISTDIR)/samples/internat/ja
-	cp $(SAMPDIR)/internat/ka/*.mo $(DISTDIR)/samples/internat/ka
-	cp $(SAMPDIR)/internat/pl/*.mo $(DISTDIR)/samples/internat/pl
 	cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
-	cp $(SAMPDIR)/internat/bg/*.po $(DISTDIR)/samples/internat/bg
-	cp $(SAMPDIR)/internat/cs/*.po $(DISTDIR)/samples/internat/cs
-	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/ja/*.po $(DISTDIR)/samples/internat/ja
-	cp $(SAMPDIR)/internat/ka/*.po $(DISTDIR)/samples/internat/ka
-	cp $(SAMPDIR)/internat/pl/*.po $(DISTDIR)/samples/internat/pl
 	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
 
 	mkdir $(DISTDIR)/samples/ipc
@@ -684,10 +644,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
 	cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
 
-	mkdir $(DISTDIR)/samples/mediaplayer
-	cp $(SAMPDIR)/mediaplayer/Makefile.in $(DISTDIR)/samples/mediaplayer
-	cp $(SAMPDIR)/mediaplayer/*.cpp $(DISTDIR)/samples/mediaplayer
-
 	mkdir $(DISTDIR)/samples/mdi
 	mkdir $(DISTDIR)/samples/mdi/bitmaps
 	cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
@@ -722,6 +678,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
+	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
 
 	mkdir $(DISTDIR)/samples/mobile
@@ -736,10 +693,10 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
 	cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
     
-	mkdir $(DISTDIR)/samples/multimon
-	cp $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon
-	cp $(SAMPDIR)/multimon/makefile.unx $(DISTDIR)/samples/multimon
-	cp $(SAMPDIR)/multimon/*.cpp $(DISTDIR)/samples/multimon
+	mkdir $(DISTDIR)/samples/dialup
+	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
+	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
+	cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
 
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
@@ -775,17 +732,13 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
 
-	mkdir $(DISTDIR)/samples/popup
-	cp $(SAMPDIR)/popup/Makefile.in $(DISTDIR)/samples/popup
-	cp $(SAMPDIR)/popup/makefile.unx $(DISTDIR)/samples/popup
-	cp $(SAMPDIR)/popup/*.cpp $(DISTDIR)/samples/popup
-
 	mkdir $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
 
 #	mkdir $(DISTDIR)/samples/resource
 #	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
@@ -794,16 +747,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 #	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
 #	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
 
-	mkdir $(DISTDIR)/samples/render
-	cp $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render
-	cp $(SAMPDIR)/render/makefile.unx $(DISTDIR)/samples/render
-	cp $(SAMPDIR)/render/*.cpp $(DISTDIR)/samples/render
-
 	mkdir $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
-	cp $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
 
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
@@ -854,17 +802,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
 
-	mkdir $(DISTDIR)/samples/sound
-	cp $(SAMPDIR)/sound/Makefile.in $(DISTDIR)/samples/sound
-	cp $(SAMPDIR)/sound/*.cpp $(DISTDIR)/samples/sound
-	cp $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound
-
-	mkdir $(DISTDIR)/samples/splash
-	cp $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash
-	cp $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash
-	cp $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash
-	cp $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash
-
 	mkdir $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
@@ -922,10 +859,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
 
-	mkdir $(DISTDIR)/samples/vscroll
-	cp $(SAMPDIR)/vscroll/Makefile.in $(DISTDIR)/samples/vscroll
-	cp $(SAMPDIR)/vscroll/*.cpp $(DISTDIR)/samples/vscroll
-
 	mkdir $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/makefile.unx $(DISTDIR)/samples/wizard
@@ -940,17 +873,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/widgets/*.rc $(DISTDIR)/samples/widgets
 	cp $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons
 
-	mkdir $(DISTDIR)/samples/xrc
-	mkdir $(DISTDIR)/samples/xrc/rc
-	cp $(SAMPDIR)/xrc/Makefile.in $(DISTDIR)/samples/xrc
-	cp $(SAMPDIR)/xrc/*.cpp $(DISTDIR)/samples/xrc
-	cp $(SAMPDIR)/xrc/*.h $(DISTDIR)/samples/xrc
-	cp $(SAMPDIR)/xrc/*.rc $(DISTDIR)/samples/xrc
-	cp $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc
-	cp $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc
-	cp $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc
-	cp $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc
-
 UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
 	cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
@@ -975,17 +897,33 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs
 	cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
 
+	mkdir $(DISTDIR)/utils/makegen
+	mkdir $(DISTDIR)/utils/makegen/templates
+	cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen
+	cp $(UTILSDIR)/makegen/*.cpp $(DISTDIR)/utils/makegen
+	cp $(UTILSDIR)/makegen/templates/*.* $(DISTDIR)/utils/makegen/templates
+
 	mkdir $(DISTDIR)/utils/hhp2cached
-	cp $(UTILSDIR)/hhp2cached/Makefile.in $(DISTDIR)/utils/hhp2cached
-	cp $(UTILSDIR)/hhp2cached/*.cpp $(DISTDIR)/utils/hhp2cached
-	cp $(UTILSDIR)/hhp2cached/*.rc $(DISTDIR)/utils/hhp2cached
+	cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached
 
 	mkdir $(DISTDIR)/utils/HelpGen
 	mkdir $(DISTDIR)/utils/HelpGen/src
 	cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
-	cp $(UTILSDIR)/HelpGen/src/Makefile.in $(DISTDIR)/utils/HelpGen/src
-	cp $(UTILSDIR)/HelpGen/src/*.h $(DISTDIR)/utils/HelpGen/src
-	cp $(UTILSDIR)/HelpGen/src/*.cpp $(DISTDIR)/utils/HelpGen/src
+	cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src
+
+	mkdir $(DISTDIR)/utils/dialoged
+	mkdir $(DISTDIR)/utils/dialoged/src
+	mkdir $(DISTDIR)/utils/dialoged/src/bitmaps
+	mkdir $(DISTDIR)/utils/dialoged/docs
+	cp $(UTILSDIR)/dialoged/Makefile.in $(DISTDIR)/utils/dialoged
+	cp $(UTILSDIR)/dialoged/src/*.h $(DISTDIR)/utils/dialoged/src
+	cp $(UTILSDIR)/dialoged/src/*.cpp $(DISTDIR)/utils/dialoged/src
+	cp $(UTILSDIR)/dialoged/src/Makefile.in $(DISTDIR)/utils/dialoged/src
+	cp $(UTILSDIR)/dialoged/src/makefile.unx $(DISTDIR)/utils/dialoged/src
+	cp $(UTILSDIR)/dialoged/src/bitmaps/*.xpm $(DISTDIR)/utils/dialoged/src/bitmaps
+	cp $(UTILSDIR)/dialoged/docs/*.tex $(DISTDIR)/utils/dialoged/docs
+	cp $(UTILSDIR)/dialoged/docs/*.ini $(DISTDIR)/utils/dialoged/docs
+	cp $(UTILSDIR)/dialoged/docs/*.gif $(DISTDIR)/utils/dialoged/docs
 
 	mkdir $(DISTDIR)/utils/helpview
 	mkdir $(DISTDIR)/utils/helpview/src
@@ -997,12 +935,12 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src
 	cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
 
-	mkdir $(DISTDIR)/utils/wxrc
-	cp $(UTILSDIR)/wxrc/Makefile.in $(DISTDIR)/utils/wxrc
-	cp $(UTILSDIR)/wxrc/*.cpp $(DISTDIR)/utils/wxrc
-	cp $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc
-
 MISC_DIST: ALL_GUI_DIST
+	mkdir $(DISTDIR)/misc
+	mkdir $(DISTDIR)/misc/afm
+	cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
+	mkdir $(DISTDIR)/misc/gs_afm
+	cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 
 INTL_DIST:
 	mkdir $(DISTDIR)/locale
@@ -1021,26 +959,64 @@ MANUAL_DIST:
 	cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
 	cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
 
-
-# Copy all the files from wxPython needed for the Debian source package, 
-# and then remove some that are not needed.
+# this target does not generate a complete wxPython dist, it only includes
+# those files needed for the Debian source package.
+# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
 PYTHON_DIST:
-	for dir in `grep -v '#' $(WXDIR)/wxPython/distrib/DIRLIST`; do \
-		echo "Copying dir: $$dir..."; \
-		mkdir $(DISTDIR)/$$dir; \
-		cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
-	done; \
-	\
-	find $(DISTDIR)/wxPython -name "*~"           > RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.pyc"       >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.bat"       >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "core"        >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.orig"      >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.rej"       >> RM_FILES; \
-	for f in `cat RM_FILES`; do rm $$f; done; \
-	rm RM_FILES
+	mkdir $(DISTDIR)/wxPython
+	mkdir $(DISTDIR)/wxPython/contrib
+	mkdir $(DISTDIR)/wxPython/contrib/dllwidget
+	mkdir $(DISTDIR)/wxPython/contrib/gizmos
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	mkdir $(DISTDIR)/wxPython/contrib/ogl
+	mkdir $(DISTDIR)/wxPython/contrib/stc
+	mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
+	mkdir $(DISTDIR)/wxPython/contrib/xrc
+	mkdir $(DISTDIR)/wxPython/demo
+	mkdir $(DISTDIR)/wxPython/demo/bitmaps
+	mkdir $(DISTDIR)/wxPython/demo/bmp_source
+	mkdir $(DISTDIR)/wxPython/demo/data
+	mkdir $(DISTDIR)/wxPython/demo/dllwidget
+	mkdir $(DISTDIR)/wxPython/src
+	mkdir $(DISTDIR)/wxPython/src/gtk
+	mkdir $(DISTDIR)/wxPython/scripts
+	mkdir $(DISTDIR)/wxPython/wxPython
+	mkdir $(DISTDIR)/wxPython/wxPython/lib
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
+	mkdir $(DISTDIR)/wxPython/wxPython/tools
+	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
+	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
+	cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
+	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
+	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+	-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
+	-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
+	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
+	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
+	-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
+	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
+	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
+	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
+	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
+	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
+	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
+	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
+	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
+	cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
 distrib_clean:
 	$(RM) -r _dist_dir
@@ -1048,7 +1024,7 @@ distrib_clean:
 # VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
 #     the files twice
 dist-only:
-	@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
@@ -1063,7 +1039,7 @@ dist-only:
 	fi
 
 dist: @GUIDIST@
-	@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
 	@# 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 \
@@ -1083,7 +1059,7 @@ dist: @GUIDIST@
 	fi
 
 bzip-dist-only:
-	@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
@@ -1098,7 +1074,7 @@ bzip-dist-only:
 	fi
 
 bzip-dist: @GUIDIST@
-	@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
 	@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
@@ -1112,7 +1088,7 @@ bzip-dist: @GUIDIST@
 
 # RR: Copy text and binary data separatly
 win-dist: MSW_ZIP_TEXT_DIST
-	@echo "*** Creating wxWidgets ZIP distribution in $(DISTDIR)..."
+	@echo "*** Creating wxWindows ZIP distribution in $(DISTDIR)..."
 	@cd _dist_dir && mv $(DISTDIRNAME) wxMSW
 	@cd _dist_dir && zip -r -l  ../$(WXARCHIVE_ZIP) *
 	cp $(INCDIR)/wx/msw/*.cur _dist_dir/wxMSW/include/wx/msw
@@ -1122,7 +1098,6 @@ win-dist: MSW_ZIP_TEXT_DIST
 	@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico
 	@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp
 
-debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@
 debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	mkdir $(DISTDIR)/debian
 	-cp $(WXDIR)/debian/* $(DISTDIR)/debian
@@ -1135,25 +1110,12 @@ 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"    \
-			   -o -name "*.bkl" -o -name "*.pro"  \
-			   -o -name "*.vpj" -o -name "*.sc"                      \
-			   -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
-			\) -print0 | xargs -0 rm -rf
-
-	rm -rf $(DISTDIR)/wxPython/SWIG
-	rm -rf $(DISTDIR)/wxPython/distrib
-	rm -rf $(DISTDIR)/wxPython/distutils
-	rm -rf $(DISTDIR)/wxPython/samples
-	rm -rf $(DISTDIR)/wxPython/contrib/iewin
-	find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
-
-	rm -rf $(DEBIAN_SOURCE_DIR)
-	mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
+	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
+			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
+			-print0 | xargs -0 rm -rf
 
+	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 
 debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
 

build/bakefiles/monolithic.bkl

@@ -4,8 +4,7 @@
     
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
-            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
-            $(DBGRID_SRC) $(XRC_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
@@ -16,24 +15,17 @@
          cond="SHARED=='1' and MONOLITHIC=='1'">
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
-        <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
+        <sources>$(MONOLIB_SRC)</sources>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
-        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
         <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
-        <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
     </dll>
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
         <define>wxUSE_BASE=1</define> 
-        <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
+        <sources>$(MONOLIB_SRC)</sources>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
     </lib>
 
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">mono=monolib+monodll</set>
-    <!-- included by wx.bkl from opengl.bkl -->
-    <set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">gl=gllib+gldll</set>
-
 </makefile>

build/bakefiles/multilib.bkl

@@ -22,7 +22,7 @@
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
     </lib>
 
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">base=baselib+basedll</set>
     
     
     <!-- ================================================================= -->
@@ -44,7 +44,7 @@
         <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">net=netlib+netdll</set>
 
     
     <!-- ================================================================= -->
@@ -68,7 +68,7 @@
         <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">core=corelib+coredll</set>
     
     
     <!-- ================================================================= -->
@@ -79,43 +79,19 @@
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_ADV</define>
-        <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
+        <sources>$(ADVANCED_SRC)</sources>
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
         <library>coredll</library>
         <library>basedll</library>
-        <ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
     </dll>
     
     <lib id="advlib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
-        <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
+        <sources>$(ADVANCED_SRC)</sources>
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
-
-
-    <!-- ================================================================= -->
-    <!--                     wxMedia classes library                       -->
-    <!-- ================================================================= -->
-
-    <dll id="mediadll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_MEDIA</define>
-        <sources>$(MEDIA_SRC)</sources>
-        <msvc-headers>$(MEDIA_HDR)</msvc-headers>
-        <library>coredll</library>
-        <library>basedll</library>
-    </dll>
-
-    <lib id="medialib" template="wx_lib"
-         cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
-        <sources>$(MEDIA_SRC)</sources>
-        <msvc-headers>$(MEDIA_HDR)</msvc-headers>
-    </lib>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">adv=advlib+advdll</set>
     
     
     <!-- ================================================================= -->
@@ -157,8 +133,8 @@
         <msvc-headers>$(DBGRID_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">odbc=odbclib+odbcdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbgrid=dbgridlib+dbgriddll</set>
 
     
     <!-- ================================================================ -->
@@ -166,23 +142,22 @@
     <!-- ================================================================ -->
     
     <dll id="htmldll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_HTML</define>
         <sources>$(HTML_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
-        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </dll>
     
     <lib id="htmllib" template="wx_lib"
-         cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">
         <sources>$(HTML_SRC)</sources>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">html=htmllib+htmldll</set>
     
     <!-- ================================================================ -->
     <!--                             OpenGL                               -->
@@ -190,32 +165,9 @@
 
     <!-- included by wx.bkl from opengl.bkl -->
     
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">gl=gllib+gldll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gl=gllib+gldll</set>
     
     
-    <!-- ================================================================ -->
-    <!--                               QA                                 -->
-    <!-- ================================================================ -->
-
-    <dll id="qadll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and USE_QA=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_QA</define>
-        <sources>$(QA_SRC)</sources>
-        <msvc-headers>$(QA_HDR)</msvc-headers>
-        <library>coredll</library>
-        <library>basedll</library>
-        <library>xmldll</library>
-    </dll>
-
-    <lib id="qalib" template="wx_lib"
-         cond="SHARED=='0' and USE_GUI=='1' and USE_QA=='1' and MONOLITHIC=='0'">
-        <sources>$(QA_SRC)</sources>
-        <msvc-headers>$(QA_HDR)</msvc-headers>
-    </lib>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
-
     <!-- ================================================================ -->
     <!--                              XML                                 -->
     <!-- ================================================================ -->
@@ -236,31 +188,6 @@
         <msvc-headers>$(XML_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
-
-    <!-- ================================================================ -->
-    <!--                            XRC                                   -->
-    <!-- ================================================================ -->
-
-    <dll id="xrcdll" template="wx_dll"
-         cond="SHARED=='1' and USE_XRC=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_XRC</define>
-        <sources>$(XRC_SRC)</sources>
-        <library>htmldll</library>
-        <library>advdll</library>
-        <library>coredll</library>
-        <library>xmldll</library>
-        <library>basedll</library>
-        <msvc-headers>$(XRC_HDR)</msvc-headers>
-    </dll>
-
-    <lib id="xrclib" template="wx_lib"
-         cond="SHARED=='0' and USE_XRC=='1' and MONOLITHIC=='0'">
-        <sources>$(XRC_SRC)</sources>
-        <msvc-headers>$(XRC_HDR)</msvc-headers>
-    </lib>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xml=xmllib+xmldll</set>
 
 </makefile>

build/bakefiles/odbc.bkl

@@ -3,19 +3,16 @@
 
     <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>
+    </if>
     <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>

build/bakefiles/opengl.bkl

@@ -24,12 +24,19 @@
         <!-- link against base and core libs in multilib build: --> 
         <sys-lib>$(WXLIBGLDEP_CORE)</sys-lib>
         <sys-lib>$(WXLIBGLDEP_BASE)</sys-lib>
-        <depends>basedll</depends>
-        <depends>coredll</depends>
         <!-- link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
 
-        <ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
+        <if cond="FORMAT=='autoconf'">
+            <ldflags>$(EXTRALIBS_OPENGL)</ldflags>
+        </if>
+        <!-- system libraries on windows: -->
+        <if cond="FORMAT!='autoconf'">
+            <if cond="COMPILER=='wat' or COMPILER=='gcc'">
+                <sys-lib>opengl32</sys-lib>
+                <sys-lib>glu32</sys-lib>
+            </if>
+        </if>        
     </dll>
     
     <lib id="gllib" template="wx_lib"

build/bakefiles/plugins.bkl

@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-     
-    <!-- ================================================================ -->
-    <!--                        Unix audio plugins                        -->
-    <!-- ================================================================ -->
-    
-    <wx-base-plugin id="sound_sdl" cond="WITH_PLUGIN_SDL=='1'">
-        <sources>$(UNIX_SOUND_SRC_SDL)</sources>
-        <ldlibs>$(EXTRALIBS_SDL)</ldlibs>
-    </wx-base-plugin>
-
-
-</makefile>

build/bakefiles/plugins_deps.bkl

@@ -1,21 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <!-- Additional dependencies of core libraries if plugins are
-         disabled (these would be deps of the plugins if they were
-         enabled): -->
-
-    <set var="PLUGIN_ADV_EXTRALIBS">
-        <if cond="USE_PLUGINS=='0'">
-            $(EXTRALIBS_SDL)
-        </if>
-    </set>
-
-
-    <!-- monolithic library must link against all this: -->
-
-    <set var="PLUGIN_MONOLIB_EXTRALIBS">$(PLUGIN_ADV_EXTRALIBS)</set>
-
-</makefile>

build/bakefiles/png.bkl

@@ -3,20 +3,15 @@
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_LIBPNG"/>
-        <set var="LIB_PNG">
-            <if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'">
-                wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-            </if>
-        </set>
     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="wxUSE_LIBPNG">builtin</set>
+    </if>
     <set var="LIB_PNG">
         <if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'">
             wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
         </if>
     </set>
-    </if>
     <set var="INC_PNG">
         <if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>
     </set>

build/bakefiles/regenMakefile.py

@@ -0,0 +1,248 @@
+#!/usr/bin/env python
+
+#
+# Generates Makefile that is used to regenerate native makefiles from
+# bakefiles.
+#
+# $Id$
+#
+
+import string, os.path, copy
+
+# list of files that should _not_ be generated even thought we could do it:
+DONT_GENERATE = [
+    '../../samples/Makefile.in',
+    '../../samples/samples.dsw',
+    '../../demos/demos.dsw',
+    '../../samples/html/html_samples.dsw',
+    '../../samples/opengl/opengl_samples.dsw',
+    '../../samples/mobile/mobile_samples.dsw',
+    '../../utils/utils.dsw',
+]
+
+file = open('Makefile', 'wt')
+file.write("""
+# Generated by regenMakefile.py
+
+BAKEFILE = bakefile -v
+
+
+CDEPS = config.bkl common.bkl common_contrib.bkl
+SDEPS = config.bkl common.bkl common_samples.bkl
+MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
+
+DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
+           -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0
+
+COMPAT_TARGETS = ../../src/wxWindows.dsp
+
+""")
+
+lines = {}
+all = {}
+all['autoconf'] = []
+
+linesCur = None
+
+def addMakefile(bake, makedirs, deps=[], args={}):
+    """Adds rules to regenerate native makefile in directory 'makedir' from
+       bakefiles 'bake'. 'deps' contains additional dependencies (bakefiles
+       other than 'bake'."""
+    print 'adding %s...' % bake
+    global linesCur
+    linesCur = ['\n']
+
+    def add(bake, makedirs, make, dep, format, args={}):
+        global linesCur
+        a = ''
+        if 'all' in args: a += ' %s' % args['all']
+        if format in args: a += ' %s' % args[format]
+        if format != 'autoconf' and 'not_autoconf' in args:
+            a += ' %s' % args['not_autoconf']
+        if format in makedirs:
+            makedir = makedirs[format]
+        else:
+            makedir = makedirs['all']
+        tfile = '%s/%s' % (makedir, make)
+
+        if tfile in DONT_GENERATE: return
+        
+        linesCur.append('%s: %s' % (tfile, dep))
+        linesCur.append('\t$(BAKEFILE) -f%s -o$@ %s %s' % (format, a, bake))
+        linesCur.append('\ttouch $@')
+        if format not in all: all[format] = []
+        all[format].append(tfile)
+
+    dep = string.join(deps + [bake], ' ')
+
+    add(bake, makedirs, 'Makefile.in', dep, 'autoconf', args)
+    add(bake, makedirs, 'makefile.bcc', dep, 'borland', args)
+    add(bake, makedirs, 'makefile.vc', dep, 'msvc', args)
+    add(bake, makedirs, 'makefile.gcc', dep, 'mingw', args)
+    add(bake, makedirs, 'makefile.wat', dep, 'watcom', args)
+    add(bake, makedirs,
+        (bake[1+bake.rfind('/'):]).replace('.bkl','.dsw'),
+        dep, 'msvc6prj', args)
+    
+    lines[bake] = linesCur
+
+
+
+# -----------------------------------------------
+#    Add the makefiles:
+# -----------------------------------------------
+
+# main makefile:
+addMakefile('wx.bkl', {'all':'../msw','autoconf':'../..'}, [ '$(MDEPS)' ],
+            args={
+                'borland':'-DOPTIONS_FILE=config.bcc',
+                'msvc':'-DOPTIONS_FILE=config.vc',
+                'mingw':'-DOPTIONS_FILE=config.gcc',
+                'watcom':'-DOPTIONS_FILE=config.wat',
+                'msvc6prj':'$(DSWFLAGS)',
+            })
+
+# samples main makefile:
+addMakefile('../../samples/samples.bkl', {'all':'../../samples'},
+            args={
+            'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
+            'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
+            'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
+            'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
+            'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
+            })
+addMakefile('../../demos/demos.bkl', {'all':'../../demos'},
+            args={
+            'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
+            'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
+            'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
+            'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
+            'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
+            })
+addMakefile('../../utils/utils.bkl', {'all':'../../utils'},
+            args={
+            'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
+            'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
+            'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
+            'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
+            'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
+            })
+
+
+CONTRIB_DIR = 1
+SAMPLES_DIR = 2
+
+def onSubmakefile(type, dirname, names):
+    bakes = [x for x in names if x.endswith('.bkl')]
+    if len(bakes) == 0: return
+    bakes.sort()
+    dirname = dirname.replace(os.sep, '/')
+    depth = dirname.count('/') - 2
+    if depth <= 0: return
+    
+    if type==SAMPLES_DIR:
+        prefix = ''.join(['../' for i in range(0,depth)])
+        topdirflags = '-DWXTOPDIR=%s../' % prefix
+        srcdirflags = ''
+        cfgbase = '%s../build/msw/config.' % prefix
+    elif type==CONTRIB_DIR:
+        srcdirflags = '-DSRCDIR=../../src/%s' % dirname.split('/')[-1]
+        topdirflags = ' -DWXTOPDIR=../../../'
+        cfgbase = '../../../build/msw/config.'
+
+    args = {
+        'all':topdirflags,
+        'not_autoconf':srcdirflags,
+        'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
+        'msvc':'-DOPTIONS_FILE='+cfgbase+'vc -DWRITE_OPTIONS_FILE=0',
+        'mingw':'-DOPTIONS_FILE='+cfgbase+'gcc -DWRITE_OPTIONS_FILE=0',
+        'borland':'-DOPTIONS_FILE='+cfgbase+'bcc -DWRITE_OPTIONS_FILE=0',
+        'watcom':'-DOPTIONS_FILE='+cfgbase+'wat -DWRITE_OPTIONS_FILE=0',
+        'msvc6prj':'$(DSWFLAGS)',
+    }
+
+    for bake in bakes:
+        if type==CONTRIB_DIR:
+            acdir = '../../contrib/src/%s' % dirname.split('/')[-1]
+            ruledep = '$(CDEPS)'
+        else:
+            acdir = dirname
+            ruledep = '$(SDEPS)'
+        addMakefile('%s/%s' % (dirname, bake),
+                    {'all':dirname,'autoconf':acdir}, deps=[ruledep],
+                    args=args)
+
+os.path.walk(os.path.join('..','..','samples'),
+             onSubmakefile, SAMPLES_DIR)
+os.path.walk(os.path.join('..','..','demos'),
+             onSubmakefile, SAMPLES_DIR)
+os.path.walk(os.path.join('..','..','utils'),
+             onSubmakefile, SAMPLES_DIR)
+os.path.walk(os.path.join('..','..','contrib','build'),
+             onSubmakefile, CONTRIB_DIR)
+os.path.walk(os.path.join('..','..','contrib','samples'),
+             onSubmakefile, SAMPLES_DIR)
+os.path.walk(os.path.join('..','..','contrib','utils'),
+             onSubmakefile, SAMPLES_DIR)
+
+
+cleanCmds = ''
+allK = all.keys()
+allK.sort()
+cleanList = []
+
+for f in allK:
+    all[f].sort()
+
+for f in allK:
+    for i in all[f]:
+        cleanList.append('\trm -f %s\n' % i)
+    cleanCmds = ''.join(cleanList)
+
+for f in allK:
+    var = '%s_ALL' % f.upper()
+    file.write('%s = \\\n\t%s\n' % (var,' \\\n\t'.join(all[f])))
+
+file.write('\nall: $(COMPAT_TARGETS)')
+for f in allK:
+    file.write(' %s' % f)
+file.write('\n\n')
+for f in allK:
+    file.write('%s: $(%s_ALL)\n' % (f, f.upper()))
+
+file.write("""
+clean:
+\trm -f ../../autoconf_inc.m4
+\trm -f $(COMPAT_TARGETS)
+%s
+
+library: ../../Makefile.in\\
+         ../msw/makefile.bcc\\
+         ../msw/makefile.vc\\
+         ../msw/makefile.wat\\
+         ../msw/makefile.gcc\\
+         ../msw/wx.dsw\\
+         ../../src/wxWindows.dsp
+
+../../autoconf_inc.m4: ../../Makefile.in
+
+../../src/wxWindows.dsp: monolithic.bkl files.bkl
+\t$(BAKEFILE) -Icompat -fwx24dsp -DUSE_GUI=1 -DWXUNIV=0 -o$@ wx.bkl
+\ttouch $@
+
+Makefile: regenMakefile.py
+\t./regenMakefile.py
+\t@echo
+\t@echo -------------------------------------------
+\t@echo Please rerun make, Makefile was regenerated
+\t@echo -------------------------------------------
+\t@echo
+\t@exit 1
+""" % cleanCmds)
+linesK = lines.keys()
+linesK.sort()
+for lk in linesK:
+    for l in lines[lk]:
+        file.write('%s\n' % l)
+file.close()

build/bakefiles/regex.bkl

@@ -1,47 +1,23 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
-
 <makefile>
     
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_REGEX"/>
-        <set var="LIB_REGEX">
-            <if cond="wxUSE_REGEX=='builtin'">
-                wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-            </if>
-        </set>
     </if>
     <if cond="FORMAT!='autoconf'">
-        <set var="wxUSE_REGEX">
-            <!-- NB: regex lib doesn't compile on WinCE -->
-            <if cond="FORMAT=='msevc4prj'">no</if>
-            <if cond="FORMAT!='msevc4prj'">builtin</if>
-        </set>
+        <set var="wxUSE_REGEX">builtin</set>
+    </if>
     <set var="LIB_REGEX">
-            <if cond="wxUSE_REGEX=='builtin'">
-                wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
-            </if>
+        <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
     </set>
-    </if>
     <set var="INC_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
     </set>
 
-    <lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
+    <lib id="wxregex" template="3rdparty_lib"
          cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
-        <libname cond="FORMAT=='autoconf'">
-            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-        </libname>
-        <libname cond="FORMAT!='autoconf'">
-            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
-        </libname>
-        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
-        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
-        <define>__WX$(TOOLKIT)__</define>
-        <define>$(UNICODE_DEFINE)</define>
         <dirname>$(LIBDIRNAME)</dirname>
-        <cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
-        <cflags-dmars>-w12</cflags-dmars>
+        <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8066</cflags-borland> 
         <sources>
             src/regex/regcomp.c
             src/regex/regexec.c

build/bakefiles/tiff.bkl

@@ -3,24 +3,15 @@
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_LIBTIFF"/>
-        <set var="LIB_TIFF">
-            <if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
-                wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-            </if>
-        </set>
     </if>
     <if cond="FORMAT!='autoconf'">
-        <set var="wxUSE_LIBTIFF">
-            <!-- NB: libtiff doesn't compile on WinCE -->
-            <if cond="FORMAT=='msevc4prj'">no</if>
-            <if cond="FORMAT!='msevc4prj'">builtin</if>
-        </set>
+        <set var="wxUSE_LIBTIFF">builtin</set>
+    </if>
     <set var="LIB_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
             wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
         </if>
     </set>
-    </if>
     <set var="INC_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
     </set>
@@ -28,25 +19,18 @@
     <set var="TIFF_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
         <if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
-        <if cond="PLATFORM_OS2=='1'">src/tiff/tif_unix.c</if>
         <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
-        <if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if>
-        <if cond="PLATFORM_MSDOS=='1'">src/tiff/tif_msdos.c</if>
     </set>
     
     <lib id="wxtiff" template="3rdparty_lib"
          cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
-        <include>$(INC_ZLIB)</include>
-        <include>$(INC_JPEG)</include>
         <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
-        <cflags-dmars>-w2</cflags-dmars>
         <sources>
             $(TIFF_PLATFORM_SRC)
 		    src/tiff/tif_aux.c
 		    src/tiff/tif_close.c
 		    src/tiff/tif_codec.c
-		    src/tiff/tif_color.c
 		    src/tiff/tif_compress.c
 		    src/tiff/tif_dir.c
 		    src/tiff/tif_dirinfo.c
@@ -54,7 +38,6 @@
 		    src/tiff/tif_dirwrite.c
 		    src/tiff/tif_dumpmode.c
 		    src/tiff/tif_error.c
-		    src/tiff/tif_extension.c
 		    src/tiff/tif_fax3.c
 		    src/tiff/tif_fax3sm.c
 		    src/tiff/tif_getimage.c

build/bakefiles/wx.bkl

@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 
-<!-- Master bakefile for wxWidgets -->
+<!-- Master bakefile for wxWindows -->
 
 <makefile>
 
@@ -19,65 +19,22 @@
     <!-- list of files sorted into categories: -->
     <include file="files.bkl"/>
 
-    <!-- wxWidgets variant where everything is in one library: -->
+    <!-- wxWindows variant where everything is in one library: -->
     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
-
-    <if cond="FORMAT in ['msvc6prj','msevc4prj']">
-        <set var="MSVC6PRJ_MERGED_TARGETS">
-            <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
-            <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
-        </set>
-    </if>
-    
     <!-- OpenGL canvas is built as separate library in both cases: -->
     <include file="opengl.bkl"/>
-    <!-- Dynamically loadable plugins: -->
-    <include file="plugins.bkl"/>
+    
     
     <!-- Samples target (not dependency of 'all'): -->
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>
-        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">../../samples</dir>
     </subproject>
 
     <if cond="FORMAT=='autoconf'">       
-    
-        <!-- WXRC compiler is built by default: -->
-        <!-- FIXME: this is dirty hack, better bakefile support for
-             conditional and optional subprojects is needed -->
-        <action id="wxrc" cond="USE_XRC=='1'">
-            <dependency-of>all</dependency-of>
-
-            <!-- some of these are not built in all configurations, <depends>
-                 takes care of ignoring the disabled ones: -->
-            <depends>monodll</depends>
-            <depends>monolib</depends>
-            <depends>basedll</depends>
-            <depends>baselib</depends>
-            <depends>xmldll</depends>
-            <depends>xmllib</depends>
-            
-            <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
-            </command>
-        </action>
-        <action id="clean-wxrc" cond="USE_XRC=='1'">
-            <dependency-of>clean</dependency-of>
-            <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean) || true
-            </command>
-        </action>
-        <action id="install-wxrc" cond="USE_XRC=='1'">
-            <dependency-of>install</dependency-of>
-            <depends>wxrc</depends>
-            <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
-            </command>
-        </action>
-    
         <!-- "make install": -->
 
         <data-files>
@@ -85,28 +42,33 @@
             <install-to>$(DATADIR)/aclocal</install-to>
         </data-files>
 
+        <data-files-tg id="install-afm" cond="USE_GUI=='1'">
+            <files>misc/afm/*.afm</files>
+            <install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/afm</install-to>
+        </data-files-tg>
+        <data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
+            <files>misc/gs_afm/*.afm</files>
+            <install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/gs_afm</install-to>
+        </data-files-tg>
+
         <action id="install-wxconfig">
             <dependency-of>install</dependency-of>
             <command>
-                $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-                $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
-                $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+                $(INSTALL_DIR) $(BINDIR)
+                $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(BINDIR)
+                (cd $(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
             </command>
         </action>
 
         <data-files>
             <srcdir>$(BUILDDIR)</srcdir>
-            <files>lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h</files>
-            <install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx</install-to>
+            <files>lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h</files>
+            <install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_NAME)/wx</install-to>
         </data-files>
 
         <headers>
             <srcdir>$(SRCDIR)/include</srcdir>
             <files>$(ALL_HEADERS)</files>
-            <install-to>
-                $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-            </install-to>
         </headers>
 
         <!-- Locales: -->
@@ -124,6 +86,23 @@
         <!-- Mac OS X resources: -->
         <set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>
         <set var="MACOS_RSRC">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc</set>
+        <action id="macos-res" cond="TOOLKIT=='MAC'">
+            <dependency-of>all</dependency-of>
+            <set var="__targetname">$(MACOS_R)</set>
+            <command>
+                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o $(MACOS_RSRC)
+                $(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R)
+            </command>
+            <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
+        </action>
+        <action id="macos-res-install" cond="TOOLKIT=='MAC'">
+            <dependency-of>install</dependency-of>
+            <depends>macos-res</depends>
+            <command>
+                $(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
+                $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
+            </command>
+        </action>
         <action id="cocoa-res" cond="TOOLKIT=='COCOA'">
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
@@ -135,7 +114,7 @@
         </action>
         <action id="cocoa-res-install" cond="TOOLKIT=='COCOA'">
             <dependency-of>install</dependency-of>
-            <depends>cocoa-res</depends>
+            <depends>macos-res</depends>
             <command>
                 $(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
                 $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
@@ -145,8 +124,8 @@
     </if>
 
 
-    <!-- copy setup.h on DOS/Windows: -->    
-    <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">
+    <!-- copy setup.h on Windows: -->    
+    <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
@@ -162,7 +141,7 @@
 
         <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
-            <if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
+            <if cond="WXUNIV=='0'">msw</if>
         </set>
         
         <copy-file-to-file-if-not-exist id="master_setup.h">
@@ -175,7 +154,6 @@
             <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
             <dst>$(SETUPHDIR)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>
-
     </if>
 
 
@@ -187,15 +165,15 @@
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "
-@echo " The installation of wxWidgets is finished.  On certain"
+@echo " The installation of wxWindows is finished.  On certain"
 @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
 @echo " if you installed a shared library and also modify the"
 @echo " LD_LIBRARY_PATH (or equivalent) environment variable."
 @echo " "
-@echo " wxWidgets comes with no guarantees and doesn't claim"
+@echo " wxWindows comes with no guarantees and doesn't claim"
 @echo " to be suitable for any purpose."
 @echo " "
-@echo " Read the wxWidgets Licence on licencing conditions."
+@echo " Read the wxWindows Licence on licencing conditions."
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "
@@ -210,6 +188,4 @@
 
     </if>
 
-    <include file="build_cfg.bkl"/>
-
 </makefile>

build/bakefiles/wxpresets/bakefile_quickstart.txt

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

build/bakefiles/wxpresets/presets/wx.bkl

@@ -1,31 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<!--
-Presents for building wxWidgets applications.
-
-FIXME: docs
--->
-
-
-<makefile>
-    
-    <!-- this is just a wrapper that includes the real implementation: -->
-
-    <set var="__wx_included_impl">0</set>
-
-    <if cond="FORMAT in ['autoconf','gnu']">
-        <include file="wx_unix.bkl"/>
-        <set var="__wx_included_impl">1</set>
-    </if>
-
-    <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
-        <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>
-
-</makefile>

build/bakefiles/wxpresets/presets/wx_unix.bkl

@@ -1,88 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<!--
-Presents for building wxWidgets applications using Autoconf or GNU toosets.
-See wx.bkl for platform-independent notes.
-
-Usage:
-    Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined.
-    
-
-Format-specific notes:
-
-* autoconf:
-        Beware that you have to use AM_OPTIONS_WXCONFIG and
-        AM_PATH_WXCONFIG in your configure.in!
-
--->
-
-
-<makefile>
-
-    <!-- ============================================================== -->
-    <!--                           Autoconf                             -->
-    <!-- ============================================================== -->
-    
-    <if cond="FORMAT=='autoconf'">
-        <!-- Autoconf backend is simplicity itself thanks to wx-config... -->
-        <option name="WX_CFLAGS"/>
-        <option name="WX_CXXFLAGS"/>
-        <option name="WX_CPPFLAGS"/>
-        <option name="WX_LIBS"/>
-    </if>
-    
-    <!-- ============================================================== -->
-    <!--                   GNU makefiles for Unix                       -->
-    <!-- ============================================================== -->
-
-    <if cond="FORMAT=='gnu'">
-        <option name="WX_CONFIG">
-            <default-value>wx-config</default-value>
-            <description>Location and arguments of wx-config script</description>
-        </option>
-        <option name="WX_CFLAGS">
-            <default-value>`$(DOLLAR)(WX_CONFIG) --cflags`</default-value>
-            <description>C flags to use with wxWidgets code</description>
-        </option>
-        <option name="WX_CXXFLAGS">
-            <default-value>`$(DOLLAR)(WX_CONFIG) --cxxflags`</default-value>
-            <description>C++ flags to use with wxWidgets code</description>
-        </option>
-        <option name="WX_CPPFLAGS">
-            <default-value>`$(DOLLAR)(WX_CONFIG) --cppflags`</default-value>
-            <description>C preprocessor flags to use with wxWidgets code</description>
-        </option>
-        <option name="WX_LIBS">
-            <default-value>`$(DOLLAR)(WX_CONFIG) --libs`</default-value>
-            <description>wxWidgets libraries to link against</description>
-        </option>
-
-        <!-- 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</set>
-    </if>
-    
-    <!-- ============================================================== -->
-    <!--                          Common code                           -->
-    <!-- ============================================================== -->
-    
-    <if cond="FORMAT not in ['gnu','autoconf']">
-        <error>
-            Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
-        </error>
-    </if>
-    
-    <template id="wx-lib">
-        <cxxflags>$(WX_CXXFLAGS)</cxxflags>
-        <cflags>$(WX_CFLAGS)</cflags>
-    </template>
-
-    <template id="wx" template="wx-lib">
-        <ldlibs>$(WX_LIBS)</ldlibs>
-    </template>
-
-    <!-- not used together with wx-config: -->
-    <define-tag name="wx-lib" rules="exe,dll,module"/>
-
-</makefile>

build/bakefiles/wxpresets/presets/wx_win32.bkl

@@ -1,258 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<!-- Original source: http://wiki.wxwidgets.org/wiki.pl?Bakefile    -->
-<!-- Modified by: Francesco Montorsi <frm@users.sourceforge.net>    -->
-<!--              Vaclav Slavik <vslavik@fastmail.fm> to better fit
-                  into Bakefile's presets                           -->
-<!-- Creation date: 6/9/2004                                        -->
-<!-- Last revision: 22/1/2005 off-CVS                               -->
-<!--                $Id$ -->
-
-
-<!--
-
-FIXME: this template has (at least) the following bugs:
-
- * it's MSW-only, the port is assumed to be wxMSW unconditionally
-
- * multiple wx configurations (CFG variable set when building the
-   library) are not supported
-
--->
-
-<!-- makefile tag signifies the beginning of the bakefile           -->
-<makefile>
-
-    <requires version="0.1.5"/>
-
-    <!--                        OPTIONS                             -->
-    <!--                                                            -->
-    <!--    These are essentially the configurations you            -->
-    <!--    want in bakefile.                                       -->
-    <!--                                                            -->
-    <!--    In MSVC these are the different build                   -->
-    <!--    configurations you can have (in the build menu),        -->
-    <!--    and in autoconf is enabled with enable-xxx=xx.          -->
-    <!--    For other compilers a separate configuration            -->
-    <!--    file is created (such as config.gcc on gcc)             -->
-    <!--    which has several options a user can modify.            -->
-    <!--                                                            -->
-    <!--    Note that the above only happens if an option           -->
-    <!--    is not constant, i.e. if it cannot be determined        -->
-    <!--    by bakefile itself.                                     -->
-
-    <!-- this is a temporary variable until there is non general    -->
-    <!-- function in bakefiles for returning native markup for      -->
-    <!-- reading envrionment variables                              -->
-    <set var="ENV_VAR">
-        <if cond="FORMAT=='watcom'">%</if>
-        <if cond="FORMAT!='watcom'"></if>
-    </set>
-    
-    <!-- The directory where wxWidgets is installed: -->
-    <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
-    <option name="WX_DIR" category="path">
-        <default-value>$(WX_DIR_DEFAULT)</default-value>
-        <description>
-            The directory where wxWidgets library is installed
-        </description>
-    </option>
-
-    <!--    This is a standard option that determines               -->
-    <!--    whether the user wants to build this library as         -->
-    <!--    a dll or as a static library.                           -->
-    <set var="WX_SHARED_DEFAULT" overwrite="0">0</set>
-    <option name="WX_SHARED">
-        <values>0,1</values>
-        <values-description>,DLL</values-description>
-        <default-value>$(WX_SHARED_DEFAULT)</default-value>
-        <description>
-            Use DLL build of wx library to use?
-        </description>
-    </option>
-
-    <!-- Configuration for building the bakefile with               -->
-    <!-- unicode strings or not (unicode or ansi).                  -->
-    <set var="WX_UNICODE_DEFAULT" overwrite="0">0</set>
-    <option name="WX_UNICODE">
-        <values>0,1</values>
-        <values-description>,Unicode</values-description>
-        <default-value>$(WX_UNICODE_DEFAULT)</default-value>        
-        <description>
-            Compile Unicode build of wxWidgets?
-        </description>
-    </option>
-
-    <set var="WX_DEBUG_DEFAULT" overwrite="0">1</set>
-    <option name="WX_DEBUG">
-        <values>0,1</values>
-        <values-description>,Debug</values-description>
-        <default-value>$(WX_DEBUG_DEFAULT)</default-value>
-        <description>
-            Use debug build of wxWidgets (define __WXDEBUG__)?
-        </description>
-    </option>
-
-    <set var="WX_VERSION_DEFAULT" overwrite="0">26</set>
-    <option name="WX_VERSION">
-        <default-value>$(WX_VERSION_DEFAULT)</default-value>
-        <description>
-            Version of the wx library to build against.
-        </description>
-    </option>
-
-    <!--                     HELPER VARIABLES                       -->
-    <!--                                                            -->
-    
-    
-    <!--    The unicode define we want.  By default bakefile        -->
-    <!--    makes variables an empty string, so if unicode          -->
-    <!--    is not defined $(UNICODE_DEFINE) would expand           -->
-    <!--    to nothing (literally).                                 -->
-    <set var="WXUNICODE_DEFINE">
-        <if cond="WX_UNICODE=='1'">_UNICODE</if>
-    </set>    
-    
-    <!--    The debug define we need with win32 compilers           -->    
-    <!--    (on Linux, the wx-config program is used).              -->    
-    <set var="WXDEBUG_DEFINE">        
-        <if cond="WX_DEBUG=='1'">__WXDEBUG__</if>    
-    </set>
-
-    <!--    These are handy ways of dealing with the                -->
-    <!--    extensions in the library names of the                  --> 
-    <!--    wxWindows library.                                      -->
-    <set var="WXLIBPOSTFIX">
-        <if cond="WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
-        <if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
-        <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
-    </set>
-    <set var="WX3RDPARTLIBPOSTFIX">
-        <if cond="WX_DEBUG=='1'">d</if>
-    </set>
-
-    <set var="WXLIBPATH">
-        <if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)_lib</if>
-        <if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)_dll</if>
-    </set>
-
-    <set var="WXLIBINCLUDE">$(WXLIBPATH)$(DIRSEP)msw$(WXLIBPOSTFIX)</set>
-    
-    
-    <!--                        WX TEMPLATE                         -->
-    <!--                                                            -->
-    <!--                                                            -->
-    <!--    While not required, templates make your                 -->
-    <!--    bakefiles much more readable.  Templates, in            -->
-    <!--    essence, are abstract classes like c++.                 -->
-    <!--                                                            -->
-    <!--    Your build targets "inherit" the template,              -->
-    <!--    along with the info associated with the template        -->
-
-    <!--                                                            -->
-    <!--                wxWidgets LIBRARY/APP TEMPLATE              -->
-    <!--                                                            -->
-    <!--    The "base class" of all our build targets               -->
-    <!--    This links with the appropriate native                  -->
-    <!--    libraries required by the platform, the libraries       -->
-    <!--    we want for our stuff, and the wxWindows libs.          -->
-
-
-    
-    <!-- this tag is used to include wx libraries: -->
-    <define-tag name="wx-lib" rules="exe,dll,module">
-        <if cond="value=='base'">
-            <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</sys-lib>
-        </if>
-        <if cond="value in ['net','xml', 'odbc']">
-            <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
-        </if>
-        <if cond="value not in ['base','net','xml']">
-            <sys-lib>wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
-        </if>
-    </define-tag>
-
-    <!-- just a placeholder to mark the place where <wx-lib> will be placed,
-         thanks to the order precedence declaration below it: -->
-    <define-tag name="__wx-libs-point" rules="exe,dll,module"/>
-    <tag-info name="wx-lib"
-              position="before:__wx-libs-point"/>
-    <tag-info name="__wx-syslibs"
-              position="after:__wx-libs-point"/>
-    
-
-    <!-- template for static wx libraries: -->
-    <template id="wx-lib">
-        <!--                    MISCELLANEOUS                       -->
-        <if cond="FORMAT=='mingw'">                    
-            <define>HAVE_W32API_H</define>
-            <ldflags>-mthreads</ldflags>
-        </if>
-
-        <define>$(WXUNICODE_DEFINE)</define>
-        <define>$(WXDEBUG_DEFINE)</define>        
-        <define>__WXMSW__</define>
-
-        <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
-        <include>$(WX_DIR)/include</include>
-    </template>
-    
-    
-    <!-- this ugly tag contains all sys-lib tags used by "wx" template,
-         in order to make sure they are not reorder when wx-lib is moved
-         after __wx-libs-point: -->
-    <define-tag name="__wx-syslibs" rules="exe,dll,module">
-        <!-- wx 3rd party libs, always use them: -->
-        <sys-lib>wxtiff$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxjpeg$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxpng$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxzlib$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
-        <!-- For regex we won't use the WX3RDPARTLIBPOSTIX postfix: 
-             unliked tiff, jpeg, png, zlib, expat, when building
-             in Unicode mode, the "u" suffix is appended to regex -->
-        <sys-lib>wxregex$(WXLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxexpat$(WX3RDPARTLIBPOSTFIX)</sys-lib>
-   
-        <!-- link-in system libs that wx depends on: -->
-        <!-- If on borland, we don't need to do much            -->
-        <if cond="FORMAT=='borland'">
-            <sys-lib>ole2w32</sys-lib>
-        </if>
-
-        <!-- Non-borland, on the other hand...                  -->
-        <if cond="FORMAT!='borland'">
-            <sys-lib>kernel32</sys-lib>
-            <sys-lib>user32</sys-lib>
-            <sys-lib>gdi32</sys-lib>
-            <sys-lib>comdlg32</sys-lib>
-            <sys-lib>winspool</sys-lib>
-            <sys-lib>winmm</sys-lib>
-            <sys-lib>shell32</sys-lib>
-            <sys-lib>comctl32</sys-lib>
-            <sys-lib>ole32</sys-lib>
-            <sys-lib>oleaut32</sys-lib>
-            <sys-lib>uuid</sys-lib>
-            <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               -->
-        <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
-            <sys-lib>oleacc</sys-lib>
-        </if>
-    </define-tag>
-   
-    <!-- template for wx executables/dlls: -->
-    <template id="wx" template="wx-lib">
-        <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: -->
-        <__wx-libs-point/>
-        <__wx-syslibs/>
-    </template>
-
-</makefile>

build/bakefiles/wxpresets/sample/configure.in

@@ -1,48 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.59)
-
-AC_INIT([minimal],[1.2.5],[vslavik@fastmail.fm])
-
-AC_CONFIG_SRCDIR([minimal.cpp])
-
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-
-
-AM_OPTIONS_WXCONFIG
-
-
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_RANLIB
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CXXCPP
-
-
-
-AM_PATH_WXCONFIG(2.4.1, WXFOUND=1)
-
-if test "$WXFOUND" != 1; then
-    AC_MSG_ERROR([
-        Please check that wx-config is in path, the directory
-        where wxWindows libraries are installed (returned by
-        'wx-config --libs' command) is in LD_LIBRARY_PATH or
-        equivalent variable and wxWindows is version 2.4.0 or above.
-    ])
-fi
-
-AC_BAKEFILE([m4_include(autoconf_inc.m4)])
-
-
-AC_CONFIG_FILES([
-         Makefile
-         ])
-
-AC_OUTPUT