tagging 2_9_0 release state

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_9_0@61848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Fix wxDocManager::GetLastDirectory() when there is no history.
2009-09-07 04:53:58 +00:00 · 2009-08-26 22:18:50 +00:00 · 2009-08-23 08:35:42 +00:00 · 2009-08-22 17:40:08 +00:00 · 2009-08-18 18:07:12 +00:00 · 2009-07-27 10:45:04 +00:00
7864 changed files with 1010162 additions and 1450401 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,35 +0,0 @@
-# Windows-specific files that require CRLF:
-
-*.bat       eol=crlf
-*.bcc       eol=crlf
-*.dsw       eol=crlf
-*.gcc       eol=crlf
-*.props     eol=crlf
-*.rc        eol=crlf
-*.sln       eol=crlf
-*.vc        eol=crlf
-*.vcproj    eol=crlf
-*.vcxproj   eol=crlf
-
-# Documentation used with Windows installer:
-
-/BuildGit.txt         text=auto
-/docs/changes.txt     text=auto
-/docs/licence.txt     text=auto
-/docs/readme.txt      text=auto
-/docs/msw/*.txt       text=auto
-
-# Unix-specific files that require LF:
-
-*.h.in       eol=lf
-*.m4         eol=lf
-*.sh         eol=lf
-configure.in eol=lf
-Makefile.am  eol=lf
-Makefile.in  eol=lf
-makefile.unx eol=lf
-
-config.guess eol=lf
-config.sub   eol=lf
-configure    eol=lf
-configure.in eol=lf
--- a/.gitignore
+++ b/.gitignore
@@ -1,432 +0,0 @@
-# /
-/.gdb_history
-/config.cache
-/configarg.cache
-/config.status
-/wx-config
-/config.log
-/stamp-h.in
-/Makefile
-/setup.h
-/*tags
-/autom4te.cache
-
-# /build/
-
-# /build/autoconf_prepend-include/autoconf/
-/build/autoconf_prepend-include/autoconf/autoconf.m4f
-
-# /build/bakefiles/
-/build/bakefiles/.bakefile_gen.state
-/build/bakefiles/Bakefiles.local.bkgen
-/build/bakefiles/wxwin.pyc
-/build/bakefiles/wxpresets/presets/wx_presets.pyc
-
-# /build/msw/
-/build/msw/.m*
-/build/msw/config.dmc
-/build/msw/makefile.dmc
-/build/msw/*c*_msw
-/build/msw/*c*_mswd
-/build/msw/*c*_mswu
-/build/msw/*c*_mswud
-/build/msw/*c*_mswdll
-/build/msw/*c*_mswddll
-/build/msw/*c*_mswudll
-/build/msw/*c*_mswuddll
-/build/msw/*c*_mswuniv
-/build/msw/*c*_mswunivd
-/build/msw/*c*_mswunivu
-/build/msw/*c*_mswunivud
-/build/msw/*c*_mswunivdll
-/build/msw/*c*_mswunivddll
-/build/msw/*c*_mswunivudll
-/build/msw/*c*_mswunivuddll
-/build/msw/*c*_mswhdll
-/build/msw/*c*_mswuhdll
-/build/msw/*.vcproj.*.user
-/build/msw/*.vcxproj.user
-/build/msw/vc*_mswud
-/build/msw/wx_vc8arm_*.vcproj
-/build/msw/wx_vc8arm.sln
-/build/msw/ipch
-/build/msw/wx_vc12.opensdf
-/build/msw/wx_vc12.sdf
-/build/msw/*.suo
-
-# /demos/
-/demos/*/*.sln
-/demos/*/*.dsw
-/demos/*/vc_msw
-/demos/*/vc_msw_x64
-/demos/*/vc_mswd
-/demos/*/vc_mswd_x64
-/demos/*/vc_mswu
-/demos/*/vc_mswu_x64
-/demos/*/vc_mswud
-/demos/*/vc_mswud_x64
-/demos/*/vc_mswdll
-/demos/*/vc_mswdll_x64
-/demos/*/vc_mswddll
-/demos/*/vc_mswddll_x64
-/demos/*/vc_mswudll
-/demos/*/vc_mswudll_x64
-/demos/*/vc_mswuddll
-/demos/*/vc_mswuddll_x64
-/demos/*/vc_mswuniv
-/demos/*/vc_mswuniv_x64
-/demos/*/vc_mswunivd
-/demos/*/vc_mswunivd_x64
-/demos/*/vc_mswunivu
-/demos/*/vc_mswunivu_x64
-/demos/*/vc_mswunivud
-/demos/*/vc_mswunivud_x64
-/demos/*/vc_mswunivdll
-/demos/*/vc_mswunivdll_x64
-/demos/*/vc_mswunivddll
-/demos/*/vc_mswunivddll_x64
-/demos/*/vc_mswunivudll
-/demos/*/vc_mswunivudll_x64
-/demos/*/vc_mswunivuddll
-/demos/*/vc_mswunivuddll_x64
-/demos/*/*Classic?Debug*
-/demos/*/*Classic?Release*
-/demos/*/*Carbon?Debug*
-/demos/*/*Carbon?Release*
-
-# /demos/bombs/
-/demos/bombs/bombsM5.mcp
-/demos/bombs/bombsM*Data
-
-# /demos/forty/
-/demos/forty/fortyM5.mcp
-/demos/forty/fortyM*Data
-
-# /demos/fractal/
-/demos/fractal/fractalM5.mcp
-/demos/fractal/fractalM*Data
-
-# /demos/life/
-/demos/life/lifeM5.mcp
-/demos/life/lifeM*Data
-
-# /demos/poem/
-/demos/poem/poemM5.mcp
-/demos/poem/poemM*Data
-
-# /distrib/release/
-/distrib/release
-
-# /docs/doxygen/
-/docs/doxygen/doxygen.log
-/docs/doxygen/out
-
-# /include/
-/include/Makefile.in
-/include/*.mch
-
-# /include/wx/
-/include/wx/Makefile.in
-
-# /include/wx/generic/
-/include/wx/generic/Makefile.in
-
-# /include/wx/gtk/
-/include/wx/gtk/setup.h
-/include/wx/gtk/Makefile.in
-
-# /include/wx/gtk1/
-/include/wx/gtk1/setup.h
-/include/wx/gtk1/Makefile.in
-
-# /include/wx/html/
-/include/wx/html/Makefile.in
-
-# /include/wx/motif/
-/include/wx/motif/Makefile.in
-
-# /include/wx/msw/
-/include/wx/msw/setup.h
-/include/wx/msw/Makefile.in
-/include/wx/msw/Makefile
-
-# /include/wx/osx/
-/include/wx/osx/setup.h
-
-# /include/wx/protocol/
-/include/wx/protocol/Makefile.in
-
-# /include/wx/univ/
-/include/wx/univ/setup.h
-
-# /include/wx/unix/
-/include/wx/unix/Makefile.in
-
-# /lib/
-/lib/base
-/lib/based
-/lib/basedll
-/lib/basedlld
-/lib/basedllu
-/lib/basedllud
-/lib/baseu
-/lib/baseud
-/lib/bcc_lib
-/lib/cdef*.res
-/lib/dmc_lib
-/lib/evc_armv4_lib
-/lib/evc_emulator_lib
-/lib/expat*.lib
-/lib/gcc_lib
-/lib/gcc_lib32
-/lib/gcc_lib64
-/lib/jpeg*.lib
-/lib/ldef*.res
-/lib/Linux
-/lib/linux
-/lib/linux-gnu
-/lib/msw
-/lib/mswd
-/lib/mswdll
-/lib/mswdlld
-/lib/mswdllu
-/lib/mswdllud
-/lib/mswu
-/lib/mswud
-/lib/png*.lib
-/lib/regex*.lib
-/lib/shell32_sc.lib
-/lib/tiff*.lib
-/lib/univ
-/lib/univd
-/lib/univdll
-/lib/univdlld
-/lib/vc_dll
-/lib/vc_lib
-/lib/vc_x64_dll
-/lib/vc_x64_lib
-/lib/wat_lib
-/lib/winmm32_sc.lib
-/lib/wsock32_sc.lib
-/lib/wx_*.rsrc
-/lib/wxbase*.dll
-/lib/wxbase*.exp
-/lib/wxbase*.ilk
-/lib/wxbase*.lib
-/lib/wxmsw*.dll
-/lib/wxmsw*.exp
-/lib/wxmsw*.ilk
-/lib/wxmsw*.lib
-/lib/zlib*.lib
-
-# /locale/
-/locale/*.mo
-
-# /locale/msw/
-/locale/msw/*.mo
-
-# /misc/
-/misc/system.list
-/misc/bin
-/misc/.gdb_history
-/misc/Test
-/misc/config.cache
-/misc/config.status
-/misc/system.list
-/misc/linux.system.cache
-/misc/wx-config
-/misc/config.log
-/misc/linux-gnu.system.cache
-/misc/*.dsp
-/misc/*.dsw
-/misc/*.plg
-/misc/*.opt
-/misc/*.aps
-/misc/*.ncb
-/misc/*.pro
-/misc/*.opt
-/misc/Release
-/misc/Debug
-/misc/ReleaseDLL
-/misc/DebugDLL
-/misc/robert
-/misc/Makefile.in
-/misc/setup.h.in
-/misc/stamp-h.in
-/misc/Makefile
-/misc/configure
-/misc/setup.h
-/misc/stamp-h
-/misc/libtool
-
-# /samples/
-/samples/**/*.sln
-/samples/**/*.dsw
-/samples/**/vc_msw
-/samples/**/vc_msw_x64
-/samples/**/vc_mswd
-/samples/**/vc_mswd_x64
-/samples/**/vc_mswu
-/samples/**/vc_mswu_x64
-/samples/**/vc_mswud
-/samples/**/vc_mswud_x64
-/samples/**/vc_mswdll
-/samples/**/vc_mswdll_x64
-/samples/**/vc_mswddll
-/samples/**/vc_mswddll_x64
-/samples/**/vc_mswudll
-/samples/**/vc_mswudll_x64
-/samples/**/vc_mswuddll
-/samples/**/vc_mswuddll_x64
-/samples/**/vc_mswuniv
-/samples/**/vc_mswuniv_x64
-/samples/**/vc_mswunivd
-/samples/**/vc_mswunivd_x64
-/samples/**/vc_mswunivu
-/samples/**/vc_mswunivu_x64
-/samples/**/vc_mswunivud
-/samples/**/vc_mswunivud_x64
-/samples/**/vc_mswunivdll
-/samples/**/vc_mswunivdll_x64
-/samples/**/vc_mswunivddll
-/samples/**/vc_mswunivddll_x64
-/samples/**/vc_mswunivudll
-/samples/**/vc_mswunivudll_x64
-/samples/**/vc_mswunivuddll
-/samples/**/vc_mswunivuddll_x64
-
-# /samples/image/
-/samples/image/saved.xpm
-/samples/image/test.png
-/samples/image/test.xpm
-
-# /src/
-/src/FreeBSD
-/src/Linux
-/src/linux
-/src/linux-gnu
-/src/Makefile.in
-/src/*.lo
-/src/*.la
-/src/make.env
-/src/makeprog.env
-/src/makelib.env
-/src/ReleaseDebug
-/src/wxwindowsM*Data
-/src/wxwindowsM5.mcp
-/src/build
-/src/*.ncb
-/src/*.opt
-/src/*.plg
-
-# /src/common/
-/src/common/y_tab.c
-
-# /src/gtk/
-/src/gtk/Makefile.in
-/src/gtk/*.lo
-/src/gtk/*.la
-
-# /src/gtk1/
-/src/gtk1/Makefile.in
-/src/gtk1/*.lo
-/src/gtk1/*.la
-
-# /src/jpeg/
-/src/jpeg/jpegM*Data
-/src/jpeg/jpegM5.mcp
-/src/jpeg/Debug
-/src/jpeg/Release
-
-# /src/motif/
-/src/motif/Makefile.in
-
-# /src/msw/
-/src/msw/Makefile.in
-
-# /src/regex/
-/src/regex/Debug
-/src/regex/Release
-/src/regex/*.vcl
-
-# /src/zlib/
-/src/zlib/zlibM*Data
-/src/zlib/zlibM5.mcp
-/src/zlib/Debug
-/src/zlib/Release
-
-# /tests/
-/tests/*.sln
-/tests/*.dsw
-/tests/vc_msw
-/tests/vc_msw_x64
-/tests/vc_mswd
-/tests/vc_mswd_x64
-/tests/vc_mswu
-/tests/vc_mswu_x64
-/tests/vc_mswud
-/tests/vc_mswud_x64
-/tests/vc_mswdll
-/tests/vc_mswdll_x64
-/tests/vc_mswddll
-/tests/vc_mswddll_x64
-/tests/vc_mswudll
-/tests/vc_mswudll_x64
-/tests/vc_mswuddll
-/tests/vc_mswuddll_x64
-/tests/vc_mswuniv
-/tests/vc_mswuniv_x64
-/tests/vc_mswunivd
-/tests/vc_mswunivd_x64
-/tests/vc_mswunivu
-/tests/vc_mswunivu_x64
-/tests/vc_mswunivud
-/tests/vc_mswunivud_x64
-/tests/vc_mswunivdll
-/tests/vc_mswunivdll_x64
-/tests/vc_mswunivddll
-/tests/vc_mswunivddll_x64
-/tests/vc_mswunivudll
-/tests/vc_mswunivudll_x64
-/tests/vc_mswunivuddll
-/tests/vc_mswunivuddll_x64
-/tests/test_test.dsw
-/tests/test.opt
-/tests/test.sln
-/tests/test.suo
-/tests/test_test.vcproj
-
-# /tests/benchmarks/
-/tests/benchmarks/*.sln
-/tests/benchmarks/*.dsw
-
-# /utils/
-/utils/**/vc_mswu
-/utils/**/vc_mswu_x64
-/utils/**/vc_mswud
-/utils/**/vc_mswud_x64
-/utils/**/vc_mswudll
-/utils/**/vc_mswudll_x64
-/utils/**/vc_mswuddll
-/utils/**/vc_mswuddll_x64
-
-# /utils/emulator/src/
-/utils/emulator/src/*.sln
-/utils/emulator/src/*.dsw
-
-# /utils/helpview/src/
-/utils/helpview/src/*.sln
-/utils/helpview/src/*.dsw
-
-# /utils/hhp2cached/
-/utils/hhp2cached/*.sln
-/utils/hhp2cached/*.dsw
-/utils/hhp2cached/HHP2CachedM*Data
-/utils/hhp2cached/*Classic?Debug*
-/utils/hhp2cached/*Classic?Release*
-/utils/hhp2cached/*Carbon?Debug*
-/utils/hhp2cached/*Carbon?Release*
-
-# /utils/wxrc/
-/utils/wxrc/*.sln
-/utils/wxrc/*.dsw
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +0,0 @@
-# This is the control file for Travis continuous integration system.
-#
-# It is used automatically for the repositories on Github if it's found in the
-# root directory of the project.
-language: cpp
-sudo: required
-
-compiler: gcc
-
-branches:
-    only:
-        - master
-
-notifications:
-    email:
-        recipients:
-            - vadim@wxwidgets.org
-        on_success: change
-        on_failure: change
-
-before_install:
-    - sudo apt-get update
-    - sudo apt-get install -y libcppunit-dev
-
-env:
-    - wxCONFIGURE_FLAGS=
-    - wxCONFIGURE_FLAGS="--disable-shared"
-    - wxCONFIGURE_FLAGS="--disable-precomp-headers --enable-monolithic"
-    - wxCONFIGURE_FLAGS="--enable-stl" CXXFLAGS=-std=c++0x
-
-script:
-    - ./configure --disable-optimise $wxCONFIGURE_FLAGS
-    - make
-    - make -C tests
-    - pushd tests
-    - ./test -t
-    - popd
-    - make samples
-    - sudo make install
-    - make -C samples/minimal -f makefile.unx
--- a/BuildGit.txt
+++ b/BuildGit.txt
@@ -1,13 +0,0 @@
------------------------------------------------------------------------
-                How to build the sources from git
------------------------------------------------------------------------
-
-Before building from git sources under Windows, you need to copy the
-file include/wx/msw/setup0.h to include/wx/msw/setup.h. This is
-necessary in order to allow having local modifications to the latter
-file without showing it as modified, as it is not under version
-control.
-
-After doing this, please proceed with the build as with any official
-release, i.e. follow the instructions in the install.txt file in
-docs/gtk, docs/msw and so on.
--- a/BuildSVN.txt
+++ b/BuildSVN.txt
@@ -0,0 +1,244 @@
+------------------------------------------------------------------------
+                How to build the sources from SVN
+------------------------------------------------------------------------
+
+Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
+etc. alongside these instructions.
+
+I) Windows using plain makefiles
+----------------------------------------
+
+a) If using Microsoft Visual C++ 5.0 or 6.0
+
+Ensure that the command-line compiler and tools (including
+nmake) are installed and ready to run.  Depending on your
+installation there may be a batch file (commonly named VCVARS32.BAT)
+that needs to be run to set correct environment variables and PATH entries.
+
+Continue with item c) below.
+
+
+b) If using the MinGW or Cygwin compilers
+
+You can get MinGW from  http://www.mingw.org/
+
+Cygwin is available at  http://www.cygwin.com/
+
+If you are using Cygwin or MinGW together with the MSYS environment, you
+can build the library using configure (see "Unix ports" and
+"Windows using configure" below). You can also
+build wxWidgets without configure using native makefile, but only with
+MinGW. Using Cygwin together with Windows makefile is no longer supported.
+
+If building with MinGW without configure:
+
+-> Set your path so that it includes the directory
+   where your compiler and tools reside
+
+-> Make sure you have GNU Make installed. It must be Windows native version.
+   Download it from http://www.mingw.org, the executable will be called
+   mingw32-make.exe.
+
+-> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
+   but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
+   have to change variable GCC_VERSION in config.gcc (see msw/install.txt
+   for details).
+
+If using configure, Unix instructions apply.
+
+
+c) Build instructions
+
+Assuming that you installed the wxWidgets sources into c:\wxWidgets:
+
+-> Copy c:\wxWidgets\include\wx\msw\setup0.h
+   to   c:\wxWidgets\include\wx\msw\setup.h
+-> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
+   the features you would like to compile wxWidgets with[out].
+
+   and std iostreams are disabled with
+   #define wxUSE_STD_IOSTREAM   0
+
+-> type: cd c:\wxWidgets\build\msw
+-> type: make -f makefile.gcc  (if using GNU tools)
+or type: nmake -f makefile.vc   (if using MS VC++)
+etc.
+
+   See also docs/msw/install.txt for additional compilation options.
+
+d) Borland (including free command line tools)
+   Download tools from http://www.borland.com/downloads/
+
+   See docs/msw/install.txt for details; in brief:
+
+-> type cd c:\wxWidgets\build\msw
+-> type make -f makefile.bcc
+
+You can customize many things in the build process, detailed description is
+in docs/msw/install.txt.
+
+
+II) Unix ports
+--------------
+
+Building wxGTK or wxMotif completely without configure
+won't ever work, but there is now a new makefile system
+that works without libtool and automake, using only
+configure to create what is needed.
+
+In order to create configure, you need to have the
+GNU autoconf package (version > 2.54) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf). Note that you usually don't
+need to do this because configure is included in SVN.
+
+Set WXWIN environment variable to the base directory such
+as ~/wxWidgets (this is actually not really needed).
+
+-> type: export WXWIN=~/wxWidgets
+-> type: md mybuild
+-> type: cd mybuild
+-> type: ../configure --with-motif
+or type: ../configure --with-gtk
+-> type: make
+-> type: su <type root password>
+-> type: make install
+-> type: ldconfig
+-> type: exit
+
+Call configure with --disable-shared to create a static
+library. Calling "make uninstall" will remove the installed
+library and "make dist" will create a distribution (not
+yet complete).
+
+III) Windows using configure
+----------------------------------------
+
+wxWidgets can be built on Windows using MSYS (see
+http://www.mingw.org/), which is a POSIX build environment
+for Windows. With MSYS you can just ./configure && make (see also VII,
+Unix->Windows cross-compiling using configure).
+
+Of course, you can also build the library using plain makefiles (see
+section I).
+
+V) MacOS X using configure and the Developer Tools
+----------------------------------------
+
+You need to have the Developer Tools installed. If this is not the case,
+you will need to register at the Apple Developer web site (this is a free
+registration) in order to download the Developer Tools installer.
+
+In order to create configure, you need to have the
+GNU autoconf package (version >= 2.54) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf).
+
+-> type: mkdir macbuild
+-> type: cd macbuild
+-> type: ../configure --with-mac
+or type: ../configure
+-> type: make
+
+VI) OS/2
+----------------------------------------
+No notes.
+
+VII) Unix->Windows cross-compiling using configure
+--------------------------------------------------
+
+First you'll need a cross-compiler; linux glibc binaries of MinGW and
+Cygwin (both based on egcs) can be found at
+ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
+based on the latest MinGW release can be found at
+http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
+Otherwise you can compile one yourself.
+
+[ A Note about Cygwin and MinGW: the main difference is that Cygwin
+binaries are always linked against cygwin.dll. This dll encapsulates most
+standard Unix C extensions, which is very handy if you're porting unix
+software to windows. However, wxMSW doesn't need this, so MinGW is
+preferable if you write portable C(++). ]
+
+You might want to build both Unix and Windows binaries in the same source
+tree; to do this make subdirs for each e.g. unix and win32. If you've
+already build wxWidgets in the main dir, do a 'make distclean' there,
+otherwise configure will get confused. (In any case, read the section 'Unix
+using configure' and make sure you're able to build a native wxWidgets
+library; cross-compiling errors can be pretty obscure and you'll want to be
+sure that your configure setup is basically sound.)
+
+To cross compile the windows library, do
+-> cd win32
+(or whatever you called it)
+Now run configure. There are two ways to do this
+-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
+where --build= should read whatever platform you're building on. Configure
+will notice that build and host platforms differ, and automatically prepend
+i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
+The other way to run configure is by specifying the names of the binaries
+yourself:
+-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
+   DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
+   ../configure --host=i586-mingw32 --with-mingw
+
+(all assuming you're using MinGW)
+By default this will compile a DLL, if you want a static library,
+specify --disable-shared.
+
+Type
+-> make
+and wait, wait, wait. Don't leave the room, because the minute you do there
+will be a compile error :-)
+
+NB: if you are using a very old compiler you risk to get quite a few warnings
+    about "ANSI C++ forbids implicit conversion from 'void *'" in all places
+    where va_arg macro is used. This is due to a bug in (some versions of)
+    MinGW headers which may be corrected by upgrading your compier,
+    otherwise you might edit the file
+
+    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
+
+    (instead of egcs-2.91.57 you may have something different), searching for
+    the lines
+
+/* Define __gnuc_va_list.  */
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
+typedef char *__gnuc_va_list;
+#else
+typedef void *__gnuc_va_list;
+#endif
+#endif
+
+    and adding "|| defined(_WIN32)" to the list of platforms on which
+    __gnuc_va_list is char *.
+
+If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
+(or just libwx_msw.a if you opted for a static build).
+Now try building the minimal sample:
+
+-> cd samples/minimal
+-> make
+
+and run it with wine, for example (or copy to a Windows box)
+-> wine minimal.exe
+
+If all is well, do an install; from win32
+-> make install
+
+Native and cross-compiled installations can co-exist peacefully
+(as long as their widget sets differ), except for wx-config. You might
+want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
+
+Cross-compiling TODO:
+---------------------
+- resource compiling must be done manually for now (should/can we link the
+default wx resources into libwx_msw.a?) [ No we can't; the linker won't
+link it in... you have to supply an object file ]
+- static executables are HUGE -- there must be room for improvement.
+
--- a/Makefile.in
+++ b/Makefile.in
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,6 +4,8 @@ dnl Macros for configure.in for wxWindows by Robert Roebling, Phil Blecker,
 dnl Vadim Zeitlin and Ron Lee
 dnl
 dnl This script is under the wxWindows licence.
+dnl
+dnl Version: $Id$
 dnl ---------------------------------------------------------------------------


@@ -21,7 +23,7 @@ ac_ext=mm
 ])

 dnl ===========================================================================
-dnl macros to find a file in the list of include/lib paths
+dnl macros to find the a file in the list of include/lib paths
 dnl ===========================================================================

 dnl ---------------------------------------------------------------------------
@@ -31,7 +33,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_INCLUDES],
 [
 ac_find_includes=
-for ac_dir in $1 /usr/include
+for ac_dir in $1 /usr/include;
  do
    if test -f "$ac_dir/$2"; then
      ac_find_includes=$ac_dir
@@ -41,17 +43,16 @@ for ac_dir in $1 /usr/include
 ])

 dnl ---------------------------------------------------------------------------
-dnl call WX_PATH_FIND_LIBRARIES(lib name, [optional extra search paths])
-dnl sets ac_find_libraries to the full name of the file that was found
-dnl or leaves it empty if not found
+dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
+dnl to the full name of the file that was found or leaves it empty if not found
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_LIBRARIES],
 [
  ac_find_libraries=
-  for ac_dir in $2 $SEARCH_LIB
+  for ac_dir in $1;
  do
    for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/lib$1.$ac_extension"; then
+      if test -f "$ac_dir/lib$2.$ac_extension"; then
        ac_find_libraries=$ac_dir
        break 2
      fi
@@ -94,13 +95,13 @@ AC_DEFUN([WX_INCLUDE_PATH_EXIST],
 dnl ---------------------------------------------------------------------------
 dnl Usage: WX_LINK_PATH_EXIST(path, libpath)
 dnl
-dnl Set ac_path_to_link to nothing if path is already in libpath, or to -Lpath
+dnl Set ac_path_to_link to nothing if path is already in libpath of to -Lpath
 dnl if it is not, so that libpath can be set to "$libpath$ac_path_to_link"
 dnl after calling this function
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_LINK_PATH_EXIST],
 [
-  dnl never add -L/usr/libXXX explicitly to libpath
+  dnl never add -L/usr/libXXX explicitely to libpath
  if test "$1" = "default location"; then
    ac_path_to_link=""
  else
@@ -114,72 +115,6 @@ AC_DEFUN([WX_LINK_PATH_EXIST],
  fi
 ])

-dnl ---------------------------------------------------------------------------
-dnl Usage: WX_FIND_LIB(lib-name, [lib-function to test], [extra search paths])
-dnl
-dnl Tests in a variety of ways for the presence of lib-name
-dnl
-dnl On success, returns any novel path found in ac_find_libraries; else "std"
-dnl             and any cflags in ac_find_cflags
-dnl On failure, ac_find_libraries will be empty
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_FIND_LIB],
-[
-  ac_find_libraries=
-
-  dnl Try with pkg-config first. It requires its lib-name parameter lowercase
-  fl_pkgname=`echo "$1" | tr [[:upper:]] [[:lower:]]`
-  dnl suppress PKG_PROG_PKG_CONFIG output; we don't want to keep seeing it
-  PKG_PROG_PKG_CONFIG() AS_MESSAGE_FD> /dev/null
-  PKG_CHECK_MODULES([$1], [$fl_pkgname],
-    [
-      dnl Start by assuming there are no novel lib paths
-      ac_find_libraries="std"
-
-      dnl A simple copy of the internal vars $1_CFLAGS $1_LIBS doesn't work
-      dnl inside the macro
-      dnl
-      dnl TODO: When we stop being autoconf 2.61 compatible, the next 2 lines
-      dnl should become:
-      dnl AS_VAR_COPY([ac_find_cflags], [$1_CFLAGS])
-      dnl AS_VAR_COPY([fl_libs], [$1_LIBS])
-      eval ac_find_cflags=\$$1_CFLAGS
-      eval fl_libs=\$$1_LIBS
-
-      dnl fl_libs may now contain -Lfoopath -lfoo (only non-standard paths are
-      dnl added) We only want the path bit, not the lib names
-      for fl_path in $fl_libs
-      do
-        if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
-          dnl there shouldn't be >1 novel path
-          dnl return it without the -L, ready for WX_LINK_PATH_EXIST
-          ac_find_libraries=`echo "$fl_path" | cut -c 3-`
-        fi
-      done
-    ],
-    [
-      if test "x$ac_find_libraries" = "x"; then
-        dnl Next with AC_CHECK_LIB, if a test function was provided
-        if test "x$2" != "x"; then
-          AC_CHECK_LIB([$1], [$2], [ac_find_libraries="std"])
-        fi
-      fi
-
-      if test "x$ac_find_libraries" = "x"; then
-        dnl Finally try the search path
-        dnl Output a message again, as AC_CHECK_LIB will just have said "no"
-        AC_MSG_CHECKING([elsewhere])
-        dnl $3 will occasionally hold extra path(s) to search
-        WX_PATH_FIND_LIBRARIES([$1], [$3])
-        if test "x$ac_find_libraries" != "x"; then
-          AC_MSG_RESULT([yes])
-        else
-          AC_MSG_RESULT([no])
-        fi
-      fi
-    ])
-])
-
 dnl ===========================================================================
 dnl C++ features test
 dnl ===========================================================================
@@ -189,7 +124,7 @@ 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(action-if-true, action-if-false)
+dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
 dnl ---------------------------------------------------------------------------

 AC_DEFUN([WX_CPP_NEW_HEADERS],
@@ -312,7 +247,7 @@ AC_DEFUN([WX_CHECK_FUNCS],

    if eval test \$wx_cv_func_$wx_func = yes
    then
-      AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$wx_func]))
+      AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$wx_func])])
      $2
    else
      :
@@ -352,7 +287,7 @@ AC_TRY_RUN([main () {
 }], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown])
 fi])
 if test $ac_cv_c_bigendian = unknown; then
-  AC_MSG_WARN([Assuming little-endian target machine - this may be overridden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
+  AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
 fi
 if test $ac_cv_c_bigendian = yes; then
  AC_DEFINE(WORDS_BIGENDIAN)
@@ -488,10 +423,10 @@ AC_DEFUN([WX_ARG_ENABLE],
          eval "$AS_TR_SH(wx_cv_use_$1)"

          if test x"$enablestring" = xdisable; then
-            if test $$3 = no; then
-              result=yes
-            else
+            if test $$3 = yes; then
              result=no
+            else
+              result=yes
            fi
          else
            result=$$3
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -22,7 +22,6 @@ m4_include([build/aclocal/bakefile-lang.m4])
 m4_include([build/aclocal/bakefile.m4])
 m4_include([build/aclocal/cppunit.m4])
 m4_include([build/aclocal/gtk-2.0.m4])
-m4_include([build/aclocal/gtk-3.0.m4])
 m4_include([build/aclocal/gtk.m4])
 m4_include([build/aclocal/pkg.m4])
 m4_include([build/aclocal/sdl.m4])
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,43 +0,0 @@
-version: '{build}'
-
-branches:
-  only:
-  - master
-  - WX_3_0_BRANCH
-
-environment:
-  matrix:
-  - TOOLSET: msbuild
-    CONFIGURATION: DLL Release
-    ARCH: x64
-    wxUSE_STL: 1
-  - TOOLSET: nmake
-    VS: '9.0'
-    BUILD: release
-    ARCH: x86
-    wxUSE_STL: 0
-  - TOOLSET: nmake
-    VS: '14.0'
-    BUILD: debug
-    ARCH: amd64
-    wxUSE_STL: 1
-  - TOOLSET: mingw
-    wxUSE_STL: 0
-  - TOOLSET: msys2
-    MSYSTEM: MINGW32
-  - TOOLSET: cygwin
-
-clone_depth: 50
-
-before_build:
- ps: |
-    $env:PATH = $env:PATH -replace "C:\\Program Files \(x86\)\\Git\\bin",""
-    if (($env:compiler -ne "msys2") -and ($env:compiler -ne "cygwin")) {
-      gc include\wx\msw\setup0.h |
-      %{$_ -replace "define wxUSE_STL 0", "define wxUSE_STL $env:wxUSE_STL"} |
-      sc include\wx\msw\setup.h
-    }
-
-build_script: build\tools\appveyor.bat
-
-test: off
--- a/art/close.xpm
+++ b/art/close.xpm
@@ -1,16 +0,0 @@
-/* XPM */
-static const char * const close_xpm[] = {
-"12 10 2 1",
-"         c None",
-"X        c black",
-"            ",
-"  XX    XX  ",
-"   XX  XX   ",
-"    XXXX    ",
-"     XX     ",
-"    XXXX    ",
-"   XX  XX   ",
-"  XX    XX  ",
-"            ",
-"            "};
-
--- a/art/first.xpm
+++ b/art/first.xpm
@@ -1,22 +0,0 @@
-/* XPM */
-static const char *const first_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c Black",
-"X	c Gray100",
-"                ",
-"                ",
-"...    .        ",
-"...   ..        ",
-"...  .X.        ",
-"... .XX........ ",
-"....XXXXXXXXXX. ",
-"...XXXXXXXXXXX. ",
-"...XXXXXXXXXXX. ",
-"....XXXXXXXXXX. ",
-"... .XX........ ",
-"...  .X.        ",
-"...   ..        ",
-"...    .        ",
-"                ",
-"                "};
--- a/art/last.xpm
+++ b/art/last.xpm
@@ -1,22 +0,0 @@
-/* XPM */
-static const char *const last_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c Black",
-"X	c Gray100",
-"                ",
-"                ",
-"        .    ...",
-"        ..   ...",
-"        .X.  ...",
-" ........XX. ...",
-" .XXXXXXXXXX....",
-" .XXXXXXXXXXX...",
-" .XXXXXXXXXXX...",
-" .XXXXXXXXXX....",
-" ........XX. ...",
-"        .X.  ...",
-"        ..   ...",
-"        .    ...",
-"                ",
-"                "};
--- a/art/minus.xpm
+++ b/art/minus.xpm
@@ -1,22 +0,0 @@
-/* XPM */
-static const char *const minus_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c Black",
-"X	c Gray100",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-" .............. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .............. ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
--- a/art/osx/README
+++ b/art/osx/README
@@ -1,2 +0,0 @@
-The files in this directory are the sources which were converted by
-misc/scripts/png2c.py and included in src/osx/carbon/renderer.cpp.
--- a/art/osx/close.png
+++ b/art/osx/close.png
--- a/art/osx/close_current.png
+++ b/art/osx/close_current.png
--- a/art/osx/close_pressed.png
+++ b/art/osx/close_pressed.png
--- a/art/plus.xpm
+++ b/art/plus.xpm
@@ -1,22 +0,0 @@
-/* XPM */
-static const char *const plus_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c Black",
-"X	c Gray100",
-"                ",
-"                ",
-"      ....      ",
-"      .XX.      ",
-"      .XX.      ",
-"      .XX.      ",
-" ......XX...... ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" ......XX...... ",
-"      .XX.      ",
-"      .XX.      ",
-"      .XX.      ",
-"      ....      ",
-"                ",
-"                "};
--- a/art/tango/application_x_executable.h
+++ b/art/tango/application_x_executable.h
@@ -1,284 +0,0 @@
-/* application_x_executable.png - 560 bytes */
-static const unsigned char application_x_executable_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x04, 0x16, 0x14, 0x07, 0x38, 0x72,
-  0xb9, 0xac, 0x4a, 0x00, 0x00, 0x01, 0xbd, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xb5, 0x93, 0xcd,
-  0x4e, 0x13, 0x61, 0x14, 0x86, 0x9f, 0xef, 0x9b,
-  0x6f, 0x66, 0xa4, 0x4d, 0x48, 0x28, 0x82, 0xa4,
-  0x60, 0x3b, 0x0d, 0x90, 0x09, 0xc6, 0x28, 0x68,
-  0x20, 0x61, 0xa3, 0x1b, 0x48, 0xf0, 0x06, 0xb8,
-  0x00, 0x37, 0x4d, 0xdc, 0xb0, 0x60, 0xe3, 0xce,
-  0x70, 0x01, 0x2e, 0x9a, 0xb8, 0x61, 0xc3, 0x05,
-  0x34, 0xde, 0x80, 0xd1, 0x95, 0x71, 0xe5, 0x42,
-  0xaa, 0x09, 0xda, 0x51, 0xcc, 0x0c, 0xa1, 0x69,
-  0x0b, 0xb4, 0xfc, 0x65, 0xfa, 0x87, 0x28, 0x2e,
-  0x94, 0x66, 0x14, 0x66, 0x76, 0xbc, 0xc9, 0x59,
-  0x3e, 0x4f, 0x4e, 0xf2, 0x9e, 0x03, 0x21, 0x59,
-  0x5c, 0x5a, 0x9d, 0x9c, 0x59, 0x78, 0x7a, 0xb6,
-  0xb8, 0xb4, 0x3a, 0x49, 0x44, 0x64, 0x18, 0xec,
-  0x39, 0xee, 0xfa, 0xf3, 0x67, 0x8f, 0xf1, 0x1c,
-  0x77, 0x3d, 0x4a, 0x22, 0xa3, 0xe0, 0x62, 0x69,
-  0x87, 0x89, 0x7b, 0x76, 0xa4, 0x44, 0x86, 0xc1,
-  0x9b, 0x95, 0x1a, 0xba, 0xd2, 0xb8, 0x33, 0x3e,
-  0x4c, 0x62, 0x64, 0x28, 0x54, 0x22, 0x2f, 0x5d,
-  0x7b, 0x77, 0x1f, 0x5d, 0x49, 0x74, 0x4d, 0x83,
-  0x33, 0xe8, 0x31, 0x0c, 0x2c, 0x3b, 0x73, 0xa9,
-  0x44, 0xfc, 0x0f, 0x97, 0xea, 0x87, 0x08, 0x04,
-  0x42, 0x80, 0x10, 0x82, 0x4f, 0xc5, 0x12, 0xa6,
-  0xa1, 0x38, 0x3d, 0xfd, 0xc9, 0x17, 0xb7, 0x8a,
-  0xe7, 0xb8, 0x58, 0x76, 0x66, 0x2a, 0x9f, 0xcb,
-  0x16, 0x00, 0x64, 0x10, 0xae, 0x1e, 0x1c, 0xa3,
-  0x6b, 0x1a, 0xba, 0xfa, 0x33, 0xed, 0xf6, 0x0f,
-  0xf8, 0x05, 0x89, 0xde, 0x38, 0xb7, 0x46, 0x93,
-  0x0c, 0xf7, 0xf7, 0x05, 0x37, 0x99, 0x03, 0x50,
-  0xe7, 0x70, 0xed, 0xb8, 0x81, 0xae, 0x34, 0x84,
-  0x10, 0x08, 0x04, 0x8d, 0x56, 0x87, 0xda, 0xbe,
-  0xcf, 0xdd, 0x89, 0x9b, 0x5c, 0x33, 0x15, 0xef,
-  0xde, 0x6f, 0x22, 0x11, 0xa4, 0x07, 0xfa, 0x01,
-  0xf0, 0x1c, 0xf7, 0x35, 0x20, 0xa4, 0x65, 0x67,
-  0xe6, 0x97, 0x57, 0xd6, 0xb8, 0xde, 0x1b, 0xa7,
-  0xd5, 0x3a, 0xc1, 0x6f, 0xb4, 0xf9, 0xee, 0xed,
-  0xb2, 0xb5, 0x5d, 0xa7, 0x5c, 0x39, 0xa4, 0xd9,
-  0xe8, 0x50, 0xae, 0x1c, 0xa1, 0xa4, 0x24, 0x66,
-  0x1a, 0x6c, 0xed, 0xd5, 0xf1, 0x1c, 0x97, 0xd4,
-  0x58, 0xea, 0x3e, 0x80, 0xcc, 0xe7, 0xb2, 0x6f,
-  0x2c, 0x3b, 0x33, 0xb5, 0xbc, 0xb2, 0xc6, 0xc8,
-  0x60, 0x1f, 0x1b, 0xc5, 0x32, 0x7b, 0x35, 0x1f,
-  0xdf, 0xef, 0x30, 0x96, 0x1e, 0x24, 0x95, 0x4c,
-  0xd0, 0x6a, 0x9e, 0x10, 0x33, 0x0d, 0x9c, 0x72,
-  0xb5, 0x0b, 0xbf, 0x7c, 0xf1, 0xe4, 0x43, 0xb7,
-  0x85, 0x7c, 0x2e, 0x5b, 0x38, 0x97, 0x3c, 0x7a,
-  0x78, 0x9b, 0xb8, 0x69, 0x10, 0x37, 0x0d, 0x8e,
-  0x0e, 0x9a, 0x48, 0x21, 0x50, 0x42, 0xf2, 0xd1,
-  0x2b, 0x5d, 0x80, 0xff, 0xa9, 0x31, 0x28, 0x79,
-  0x30, 0x3b, 0x4e, 0xcc, 0x34, 0x18, 0x4d, 0x0f,
-  0x60, 0xea, 0x8a, 0xb7, 0x1b, 0xdf, 0xf0, 0x1c,
-  0x97, 0xa4, 0x75, 0x63, 0x3a, 0x08, 0x77, 0x6b,
-  0x0c, 0x3b, 0xa6, 0xaf, 0xc5, 0x1d, 0x5e, 0x15,
-  0x3e, 0x5f, 0xa8, 0x2e, 0x52, 0x10, 0x94, 0xfc,
-  0xad, 0x2c, 0x14, 0x8e, 0x4c, 0xe0, 0x1b, 0xe7,
-  0xb8, 0xca, 0xfc, 0x06, 0x1f, 0x9b, 0xf0, 0x44,
-  0x52, 0x78, 0x46, 0x4d, 0x00, 0x00, 0x00, 0x00,
-  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
-
-
-/* application_x_executable.png - 1651 bytes */
-static const unsigned char application_x_executable_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
-  0xfe, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0xcb, 0x4f, 0x13, 0x5b, 0x18, 0xff, 0xe6,
-  0xd1, 0x76, 0x18, 0xfa, 0x1a, 0x24, 0xd0, 0x27,
-  0xc5, 0xfa, 0x00, 0x05, 0x0c, 0x41, 0x51, 0x31,
-  0x12, 0x48, 0xbc, 0x80, 0x24, 0x46, 0x17, 0xc6,
-  0x95, 0x3b, 0x15, 0x5d, 0x28, 0x3e, 0x17, 0xfa,
-  0x27, 0xb8, 0xd1, 0xc4, 0xad, 0x3b, 0x25, 0x26,
-  0xba, 0x24, 0x3e, 0x89, 0x89, 0x31, 0x91, 0x47,
-  0x40, 0x20, 0xe1, 0x59, 0x1c, 0xc0, 0x16, 0x5b,
-  0xfa, 0x98, 0xd2, 0x0e, 0xa5, 0x65, 0x86, 0x3e,
-  0xe7, 0x2e, 0x8e, 0x93, 0xda, 0xa2, 0x01, 0xbc,
-  0xdc, 0xdc, 0x9b, 0xdc, 0xfb, 0x6d, 0x7e, 0x39,
-  0xa7, 0xa7, 0x67, 0x7e, 0xbf, 0xdf, 0xf7, 0x7d,
-  0x33, 0xe7, 0x00, 0xfc, 0x1f, 0xff, 0x6c, 0x60,
-  0xdb, 0xbd, 0xe1, 0xe1, 0xc3, 0x27, 0x4f, 0xde,
-  0xbb, 0x67, 0x34, 0xa2, 0x91, 0xd7, 0x9b, 0xfb,
-  0xab, 0xc9, 0x34, 0x34, 0xf4, 0xee, 0xdd, 0xfd,
-  0xfb, 0x3e, 0xdf, 0x76, 0x3d, 0x0f, 0xff, 0xbb,
-  0x88, 0x5f, 0xbb, 0xd6, 0xd1, 0xd1, 0xda, 0xba,
-  0xbc, 0x7c, 0xfa, 0xf4, 0xa9, 0x53, 0xf5, 0xf5,
-  0x82, 0x20, 0xcf, 0xe7, 0xae, 0xfb, 0x17, 0x08,
-  0xc8, 0x27, 0x7e, 0xf5, 0xea, 0x85, 0x0b, 0x2d,
-  0x2d, 0x3c, 0xbf, 0x73, 0xa7, 0xc9, 0x64, 0xb1,
-  0xe8, 0xf5, 0x4d, 0x4d, 0x07, 0x0f, 0xd6, 0xd4,
-  0xd0, 0x74, 0x7b, 0x7b, 0x5b, 0x5b, 0x5d, 0xdd,
-  0xf6, 0x0b, 0xf9, 0x6d, 0x01, 0xeb, 0x1d, 0xbf,
-  0x78, 0xb1, 0xa5, 0x85, 0xe7, 0xed, 0x76, 0xab,
-  0xd5, 0x6a, 0x65, 0x18, 0x87, 0xc3, 0xe3, 0x09,
-  0x04, 0x00, 0xa6, 0xa7, 0xdd, 0x6e, 0xbf, 0x1f,
-  0xe0, 0xd3, 0xa7, 0x89, 0x09, 0x8f, 0x87, 0xa6,
-  0x1b, 0x1b, 0x1b, 0x1b, 0xf7, 0xef, 0x8f, 0xc5,
-  0xb6, 0x4b, 0xc8, 0x96, 0x05, 0xe4, 0x13, 0xef,
-  0xec, 0xbc, 0x74, 0x09, 0x39, 0x6e, 0xb1, 0x58,
-  0xad, 0x0c, 0xc3, 0xb2, 0x5e, 0x2f, 0xc7, 0x01,
-  0x90, 0x24, 0x8e, 0xe3, 0x38, 0x80, 0x42, 0x41,
-  0x92, 0x04, 0x01, 0xd0, 0xd9, 0x79, 0xee, 0x5c,
-  0x73, 0x33, 0xc0, 0xd8, 0xd8, 0xdc, 0xdc, 0xd2,
-  0x92, 0x5a, 0x7d, 0xec, 0x58, 0x43, 0x43, 0x45,
-  0xc5, 0x5f, 0x17, 0xb2, 0x69, 0x01, 0xf9, 0xc4,
-  0xaf, 0x5f, 0xbf, 0x74, 0xa9, 0xb5, 0x95, 0xe7,
-  0xcb, 0xcb, 0xcd, 0x66, 0xab, 0x95, 0x61, 0xe6,
-  0xe7, 0xfd, 0xfe, 0xa5, 0x25, 0x00, 0x92, 0x24,
-  0x08, 0x82, 0x40, 0x88, 0xe3, 0xd9, 0xf1, 0x87,
-  0x0f, 0x23, 0x23, 0x2c, 0x0b, 0xa0, 0x52, 0x29,
-  0x14, 0x0a, 0x05, 0xc0, 0xfc, 0xbc, 0xcf, 0xb7,
-  0xba, 0xaa, 0x56, 0x9f, 0x38, 0xd1, 0xdc, 0x5c,
-  0x53, 0xf3, 0xfb, 0x42, 0x36, 0x14, 0x90, 0x4f,
-  0xfc, 0xc6, 0x8d, 0x8e, 0x8e, 0xb6, 0x36, 0x9e,
-  0xb7, 0xd9, 0xcc, 0x66, 0x8b, 0x85, 0x61, 0x5c,
-  0x2e, 0x8e, 0x0b, 0x87, 0xb3, 0x8e, 0xcb, 0x48,
-  0x10, 0xb2, 0x00, 0x34, 0x3e, 0x79, 0xf2, 0xe8,
-  0xd1, 0x7d, 0xfb, 0x90, 0x00, 0x92, 0xcc, 0xa2,
-  0x5a, 0xad, 0xd5, 0xea, 0xf5, 0x6a, 0xf5, 0xf5,
-  0xeb, 0x1d, 0x1d, 0xed, 0xed, 0xa2, 0xb8, 0x55,
-  0x21, 0xf8, 0x66, 0x89, 0xdf, 0xbc, 0x79, 0xf9,
-  0x72, 0x5b, 0x1b, 0xcf, 0x97, 0x95, 0x99, 0x4c,
-  0x66, 0x33, 0xc3, 0xb8, 0xdd, 0x4b, 0x4b, 0xcb,
-  0xcb, 0xeb, 0x9d, 0xce, 0x1f, 0xe3, 0x38, 0x86,
-  0x61, 0x18, 0xc0, 0x8b, 0x17, 0xef, 0xde, 0x8d,
-  0x8c, 0x00, 0x34, 0x34, 0xd4, 0xd6, 0xda, 0xed,
-  0x00, 0xfb, 0xf6, 0xed, 0xda, 0x65, 0x34, 0x02,
-  0xc4, 0xe3, 0xc9, 0x64, 0x2a, 0x05, 0x60, 0xb1,
-  0x18, 0x0c, 0xa5, 0xa5, 0x05, 0x05, 0x7f, 0xfc,
-  0xd1, 0xd4, 0x54, 0x53, 0x13, 0x8d, 0x6e, 0x56,
-  0x08, 0xbe, 0x11, 0xf1, 0x5b, 0xb7, 0xae, 0x5c,
-  0x69, 0x6b, 0xe3, 0x79, 0xab, 0xd5, 0x68, 0x34,
-  0x9b, 0x19, 0xc6, 0xeb, 0x0d, 0x87, 0x23, 0x91,
-  0x1f, 0x89, 0xe6, 0x3a, 0x9e, 0xef, 0x7c, 0x69,
-  0xa9, 0x5e, 0xaf, 0x56, 0x03, 0x30, 0x8c, 0x56,
-  0x4b, 0xd3, 0x00, 0x92, 0x94, 0xc9, 0x48, 0x12,
-  0xc0, 0xa1, 0x43, 0x55, 0x55, 0x36, 0x1b, 0x80,
-  0xc1, 0xb0, 0x63, 0x87, 0x4e, 0x07, 0xf0, 0xfc,
-  0xf9, 0x9b, 0x37, 0xc3, 0xc3, 0x00, 0x3c, 0x1f,
-  0x8b, 0x49, 0x92, 0x46, 0x53, 0x5b, 0x5b, 0x55,
-  0x55, 0x56, 0x16, 0x89, 0x6c, 0x24, 0xe4, 0x17,
-  0x19, 0xf0, 0x7a, 0xcf, 0x9f, 0x3f, 0x73, 0xa6,
-  0xae, 0x2e, 0x12, 0xb1, 0x58, 0x0c, 0x06, 0xb3,
-  0x99, 0x61, 0x02, 0x81, 0xe5, 0xe5, 0x68, 0xf4,
-  0x47, 0xa7, 0xe5, 0x92, 0xc9, 0x1f, 0xe3, 0xf8,
-  0x8f, 0x99, 0x78, 0xff, 0xbe, 0xb7, 0xd7, 0xe1,
-  0x00, 0x30, 0x1a, 0x8b, 0x8b, 0x75, 0x3a, 0x80,
-  0x92, 0x92, 0xa2, 0x22, 0x8d, 0x06, 0x40, 0x92,
-  0x52, 0xa9, 0x4c, 0x06, 0xc0, 0xe1, 0x60, 0x59,
-  0x9f, 0x0f, 0x40, 0xa5, 0x22, 0x49, 0x92, 0x04,
-  0xa0, 0x28, 0xd4, 0x23, 0x6a, 0xb5, 0x56, 0x5b,
-  0x5c, 0xac, 0xd3, 0xd9, 0x6c, 0x25, 0x25, 0x4a,
-  0x65, 0xb6, 0xb4, 0xf2, 0x99, 0x92, 0x3f, 0x17,
-  0x60, 0x32, 0x3d, 0x7b, 0xd6, 0xdd, 0x3d, 0x3a,
-  0xea, 0xf5, 0xa6, 0x52, 0x18, 0x46, 0x51, 0xf1,
-  0x78, 0x75, 0x75, 0x65, 0xa5, 0xdd, 0xae, 0x52,
-  0x11, 0x04, 0x8e, 0x63, 0x18, 0x80, 0x20, 0xc4,
-  0xe3, 0xa9, 0x14, 0x00, 0x2a, 0x10, 0x14, 0x18,
-  0x06, 0x40, 0xd3, 0x4a, 0x25, 0x41, 0x00, 0xb8,
-  0x5c, 0x8b, 0x8b, 0xe1, 0x30, 0x40, 0x2a, 0x95,
-  0x4e, 0x67, 0x32, 0x00, 0xf5, 0xf5, 0xd5, 0xd5,
-  0x65, 0x65, 0x00, 0xab, 0xab, 0xf1, 0x78, 0x32,
-  0x09, 0xd0, 0xd7, 0xf7, 0xf9, 0xf3, 0xdc, 0x1c,
-  0x00, 0x45, 0x29, 0x95, 0x24, 0x99, 0x2d, 0x35,
-  0x19, 0x03, 0x01, 0xaf, 0xd7, 0xe9, 0x94, 0xa4,
-  0x85, 0x05, 0x8e, 0x4b, 0x24, 0x0a, 0x0a, 0x90,
-  0xe4, 0x23, 0x47, 0xf2, 0x99, 0x12, 0xf9, 0x13,
-  0x8b, 0x8b, 0x73, 0x73, 0xbd, 0xbd, 0xb1, 0x98,
-  0xd9, 0xbc, 0x7b, 0xf7, 0xf1, 0xe3, 0x8f, 0x1f,
-  0x4f, 0x4d, 0xcd, 0xcc, 0xb8, 0xdd, 0x77, 0xef,
-  0x86, 0x42, 0xe1, 0x70, 0x38, 0x2c, 0x08, 0x76,
-  0xbb, 0xcd, 0x66, 0xb1, 0x28, 0x14, 0x2c, 0xeb,
-  0x74, 0x72, 0x1c, 0x80, 0xd5, 0x6a, 0x30, 0xe8,
-  0xf5, 0x00, 0x0b, 0x0b, 0x6e, 0x77, 0x28, 0x04,
-  0x90, 0x4a, 0x21, 0x67, 0x27, 0x26, 0xbe, 0x7c,
-  0xf1, 0x7a, 0x01, 0x94, 0x4a, 0xe4, 0xac, 0x56,
-  0xab, 0xd1, 0x20, 0x1a, 0x99, 0x0c, 0x00, 0x40,
-  0x20, 0x10, 0x0c, 0x46, 0xa3, 0x00, 0x0a, 0x05,
-  0xca, 0xa0, 0x8c, 0x1c, 0xe7, 0xf7, 0xbb, 0x5c,
-  0x92, 0x34, 0x3e, 0xce, 0xb2, 0xc1, 0x20, 0x86,
-  0x61, 0x98, 0x24, 0x25, 0x12, 0x3b, 0x77, 0x0e,
-  0x0d, 0xf5, 0xf4, 0x3c, 0x78, 0x30, 0x35, 0x95,
-  0xcf, 0x77, 0xc3, 0xb3, 0x50, 0x7e, 0x4f, 0x54,
-  0x57, 0xef, 0xdd, 0x6b, 0x30, 0x08, 0x42, 0x43,
-  0xc3, 0x91, 0x23, 0x75, 0x75, 0x34, 0x3d, 0x3f,
-  0xbf, 0xb0, 0xb0, 0xb4, 0x84, 0xdc, 0x07, 0x00,
-  0xc0, 0x71, 0x94, 0xa1, 0x82, 0x02, 0x8a, 0x52,
-  0x2a, 0x01, 0x1a, 0x1a, 0x0e, 0x1d, 0xb2, 0xdb,
-  0xb3, 0xce, 0x8e, 0x8d, 0x4d, 0x4d, 0x79, 0x3c,
-  0x00, 0xd1, 0x68, 0x2c, 0xb6, 0xb6, 0x96, 0x9d,
-  0xf7, 0xf9, 0x16, 0x17, 0xbf, 0x7e, 0x95, 0xa4,
-  0xa1, 0xa1, 0xc9, 0xc9, 0xc5, 0xc5, 0x2c, 0xf1,
-  0xc1, 0xc1, 0x9e, 0x9e, 0x87, 0x0f, 0x5d, 0xae,
-  0x4d, 0x37, 0x71, 0x7e, 0xe4, 0x1e, 0xbe, 0x4c,
-  0xa6, 0xc9, 0x49, 0x96, 0xf5, 0xfb, 0x69, 0x7a,
-  0x68, 0x68, 0x70, 0x70, 0x78, 0x58, 0x10, 0x2a,
-  0x2b, 0xed, 0xf6, 0xd2, 0xd2, 0xf5, 0xaf, 0x47,
-  0x00, 0xd4, 0xac, 0x33, 0x33, 0x2c, 0xeb, 0xf7,
-  0x67, 0x7b, 0x24, 0x93, 0x41, 0x19, 0xa2, 0x28,
-  0xb4, 0x8e, 0xe3, 0x7c, 0x3e, 0xa7, 0x73, 0xeb,
-  0xc4, 0x37, 0x2d, 0xe0, 0x57, 0x42, 0xc6, 0xc6,
-  0x58, 0x96, 0xe3, 0x68, 0x7a, 0x70, 0x70, 0x60,
-  0x60, 0x70, 0x50, 0x10, 0xf6, 0xec, 0x29, 0x2f,
-  0x2f, 0x29, 0xc9, 0x36, 0x61, 0x61, 0x21, 0x45,
-  0xa9, 0x54, 0x00, 0x56, 0xab, 0xd1, 0xc8, 0x30,
-  0xd9, 0x66, 0x57, 0xab, 0x69, 0x9a, 0xa2, 0x00,
-  0x38, 0x0e, 0xd5, 0xf8, 0xc0, 0xc0, 0xf8, 0xb8,
-  0xc7, 0xb3, 0x75, 0xe2, 0xbf, 0xec, 0x81, 0x8d,
-  0x02, 0xf5, 0x88, 0x20, 0x14, 0x16, 0xea, 0x74,
-  0x46, 0x63, 0x57, 0x17, 0xcf, 0x8b, 0xa2, 0x4a,
-  0x75, 0xe7, 0x4e, 0x3a, 0x2d, 0x08, 0xa1, 0x90,
-  0x28, 0xd6, 0xd6, 0x1e, 0x38, 0x50, 0x59, 0xa9,
-  0x50, 0xa4, 0x52, 0xc9, 0x64, 0x3a, 0x8d, 0x6a,
-  0x9f, 0xa6, 0x01, 0x34, 0x1a, 0xb5, 0x9a, 0xa2,
-  0x00, 0x1c, 0x8e, 0xe9, 0xe9, 0xc9, 0x49, 0x49,
-  0x7a, 0xfb, 0xb6, 0xbf, 0x7f, 0x76, 0x16, 0xc3,
-  0xc2, 0x61, 0xaf, 0x77, 0x7c, 0xfc, 0xe0, 0xc1,
-  0x89, 0x89, 0xfe, 0xfe, 0xa7, 0x4f, 0x3d, 0x1e,
-  0xf4, 0x14, 0x49, 0x42, 0x88, 0xfa, 0x65, 0x1b,
-  0x05, 0x68, 0x34, 0x08, 0x8b, 0x8a, 0x42, 0x21,
-  0x9f, 0x6f, 0x7a, 0x5a, 0xa9, 0x8c, 0xc7, 0x45,
-  0x31, 0x12, 0xe9, 0xee, 0x16, 0x45, 0x82, 0x30,
-  0x9b, 0x2f, 0x5e, 0x4c, 0xa7, 0x57, 0x57, 0x83,
-  0xc1, 0xb5, 0xb5, 0xea, 0xea, 0xaa, 0xaa, 0x8a,
-  0x0a, 0x92, 0x94, 0x9b, 0xf6, 0xdb, 0x37, 0xa7,
-  0x73, 0x6e, 0x0e, 0xa0, 0xab, 0xeb, 0xe5, 0xcb,
-  0x91, 0x11, 0x0c, 0x73, 0xb9, 0x26, 0x27, 0x5f,
-  0xbf, 0x3e, 0x7b, 0xd6, 0xed, 0x9e, 0x9d, 0xed,
-  0xeb, 0xe3, 0x79, 0xb4, 0x6f, 0x41, 0x01, 0x42,
-  0x95, 0xea, 0x3b, 0xbd, 0xef, 0xfc, 0xd2, 0xe9,
-  0x5f, 0x09, 0xda, 0xa4, 0x80, 0xc2, 0x42, 0x84,
-  0x5a, 0x2d, 0x42, 0xbd, 0x1e, 0x21, 0xc3, 0x08,
-  0x42, 0x34, 0xca, 0x71, 0x14, 0xb5, 0xb2, 0x12,
-  0x0e, 0x7f, 0xfb, 0xf6, 0xf1, 0x63, 0x3c, 0xae,
-  0x52, 0xed, 0xda, 0x75, 0xf6, 0x6c, 0x32, 0x19,
-  0x8d, 0xfa, 0x7c, 0x89, 0x44, 0x32, 0x99, 0x48,
-  0x88, 0x22, 0x41, 0x74, 0x75, 0xbd, 0x7a, 0x35,
-  0x3a, 0x0a, 0xf0, 0xe5, 0xcb, 0xf0, 0xf0, 0xf3,
-  0xe7, 0xb7, 0x6f, 0x87, 0xc3, 0x7e, 0x3f, 0xcb,
-  0xca, 0x5f, 0x5c, 0x99, 0x30, 0xf9, 0xfd, 0xb5,
-  0x8e, 0xe7, 0x95, 0xb6, 0x4c, 0x7c, 0x6d, 0xed,
-  0x37, 0x05, 0xc8, 0x1b, 0xcb, 0x0e, 0xd1, 0x74,
-  0x2e, 0x6a, 0x34, 0x89, 0x84, 0x28, 0x46, 0x22,
-  0x2a, 0x95, 0x28, 0xc6, 0x62, 0xa1, 0x10, 0xcb,
-  0x8a, 0xa2, 0x42, 0x61, 0xb3, 0x35, 0x35, 0x39,
-  0x1c, 0x4e, 0x67, 0x30, 0x08, 0x30, 0x3d, 0x3d,
-  0x30, 0xf0, 0xe4, 0xc9, 0xa3, 0x47, 0xd1, 0x28,
-  0xcf, 0x7b, 0x3c, 0x2b, 0x2b, 0xe8, 0x7f, 0x72,
-  0xa9, 0xc8, 0x0e, 0x27, 0x12, 0x08, 0xe3, 0xf1,
-  0x5c, 0xc2, 0xf2, 0x87, 0x4c, 0x9e, 0xcf, 0xc6,
-  0x16, 0xaf, 0x94, 0xb2, 0x53, 0x72, 0x06, 0xf2,
-  0x51, 0xa7, 0x93, 0x05, 0xe5, 0x66, 0x4e, 0xa1,
-  0xc8, 0x75, 0x52, 0xbe, 0xd8, 0xc8, 0x19, 0x90,
-  0x05, 0x2d, 0x2f, 0xff, 0x1c, 0xe5, 0xd3, 0xea,
-  0xfa, 0xd8, 0xa6, 0x3b, 0x71, 0x7e, 0x66, 0x28,
-  0x0a, 0xa1, 0x52, 0x89, 0x50, 0x2e, 0x09, 0xd9,
-  0xf1, 0x64, 0x32, 0xd7, 0x51, 0x59, 0xd0, 0xea,
-  0x6a, 0xee, 0xba, 0xff, 0x40, 0xfc, 0x09, 0xee,
-  0x21, 0x14, 0xa1, 0xa0, 0xa8, 0x66, 0xdb, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
--- a/art/tango/dialog_error.h
+++ b/art/tango/dialog_error.h
@@ -1,262 +0,0 @@
-/* dialog_error.png - 653 bytes */
-static const unsigned char dialog_error_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0b, 0x0a, 0x09, 0x32, 0x0e, 0x93,
-  0x53, 0xb4, 0xb0, 0x00, 0x00, 0x02, 0x1a, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x93, 0xbd,
-  0x4f, 0x93, 0x51, 0x14, 0xc6, 0x7f, 0xf7, 0x6d,
-  0x0b, 0xe5, 0xa3, 0xbe, 0xa0, 0xc4, 0x1a, 0x4d,
-  0xa0, 0x68, 0x9b, 0x02, 0xb6, 0x0b, 0xc4, 0x94,
-  0x44, 0x87, 0x8e, 0xba, 0x32, 0x69, 0xd2, 0x81,
-  0x11, 0xfe, 0x22, 0x3b, 0x32, 0x74, 0x66, 0x23,
-  0xb2, 0x90, 0x40, 0x58, 0x44, 0x07, 0x30, 0x92,
-  0x16, 0x9a, 0x68, 0x63, 0xf8, 0xb0, 0x24, 0xa4,
-  0x2d, 0x4d, 0x5b, 0x28, 0xf6, 0x3d, 0xc7, 0xe1,
-  0x7d, 0x4b, 0x10, 0x89, 0x1a, 0x4f, 0x72, 0x73,
-  0x93, 0x9b, 0xf3, 0xfc, 0x9e, 0xe4, 0x39, 0xf7,
-  0x18, 0x6e, 0x54, 0x0e, 0x52, 0xc0, 0x3c, 0x90,
-  0x06, 0xc6, 0xbd, 0xe7, 0x12, 0xb0, 0x0e, 0x2c,
-  0x65, 0x60, 0xeb, 0x7a, 0xbf, 0xb9, 0x21, 0x7e,
-  0x3b, 0x1c, 0x0a, 0x2d, 0x4c, 0x26, 0x93, 0x04,
-  0xc3, 0x61, 0x7c, 0x03, 0x03, 0xa8, 0x2a, 0x9d,
-  0xb3, 0x33, 0xce, 0xcb, 0x65, 0x8a, 0x85, 0x02,
-  0xd5, 0x66, 0x33, 0x9b, 0x81, 0xc5, 0xdf, 0x00,
-  0x39, 0x78, 0x37, 0x9d, 0x4c, 0xbe, 0x1c, 0x99,
-  0x99, 0xe1, 0x72, 0x7b, 0x1b, 0xe7, 0xf4, 0x14,
-  0x1c, 0x07, 0x55, 0x45, 0x0c, 0x58, 0x43, 0x77,
-  0xf1, 0x4f, 0x4d, 0x52, 0xdd, 0xdd, 0xe5, 0x53,
-  0xb1, 0xb8, 0x9a, 0x81, 0x57, 0x00, 0xbe, 0xae,
-  0xf3, 0x74, 0x32, 0xf9, 0xfa, 0x5e, 0x2c, 0x46,
-  0x7b, 0x73, 0x13, 0x6d, 0x34, 0x40, 0x04, 0x55,
-  0x41, 0x45, 0x41, 0x04, 0x69, 0xb6, 0xe8, 0x1c,
-  0x7c, 0xa3, 0x3f, 0x16, 0xc3, 0xb6, 0xac, 0xe8,
-  0x8b, 0x6a, 0xf5, 0xc1, 0x32, 0xac, 0x98, 0x1c,
-  0xa4, 0x86, 0x43, 0xa1, 0xf7, 0xcf, 0xe6, 0xe6,
-  0xb8, 0x58, 0x5b, 0x43, 0x9d, 0x0e, 0xaa, 0x8a,
-  0x2a, 0xa8, 0x7a, 0x62, 0x05, 0xc5, 0x85, 0xa9,
-  0x31, 0x04, 0x53, 0x29, 0x3e, 0x6f, 0x6c, 0x50,
-  0x6b, 0xb5, 0x66, 0x2d, 0x60, 0x7e, 0x32, 0x91,
-  0xe0, 0x72, 0x67, 0x07, 0x75, 0x1c, 0x10, 0x50,
-  0x01, 0x15, 0x71, 0x0f, 0xea, 0x81, 0x14, 0x54,
-  0xc1, 0x71, 0xb8, 0xc8, 0xe7, 0x79, 0x3c, 0x16,
-  0x01, 0x98, 0xf7, 0x03, 0xe9, 0x60, 0xf8, 0x3e,
-  0x3f, 0x3e, 0x7c, 0x44, 0x45, 0x19, 0x2b, 0x7f,
-  0xe7, 0x4f, 0xb5, 0x6f, 0xdf, 0x41, 0xaa, 0x35,
-  0x02, 0x0f, 0x1f, 0x01, 0xa4, 0xfd, 0xc0, 0xb8,
-  0xd5, 0x3f, 0x88, 0x8a, 0x1b, 0xd8, 0xdf, 0x4a,
-  0x44, 0x51, 0xed, 0x60, 0x7a, 0x02, 0x00, 0xe3,
-  0x16, 0x70, 0x95, 0xf6, 0xbf, 0x00, 0xf0, 0xfa,
-  0x54, 0x05, 0x00, 0x3f, 0x50, 0xea, 0xd4, 0xcf,
-  0x26, 0x14, 0x83, 0xaa, 0xc3, 0x97, 0x91, 0x11,
-  0xb7, 0x41, 0xc4, 0xbd, 0x51, 0x37, 0x3c, 0x37,
-  0x55, 0x44, 0xdd, 0x20, 0xb5, 0xd9, 0x02, 0x28,
-  0x59, 0xc0, 0xfa, 0xf9, 0xc9, 0x09, 0xc6, 0x1e,
-  0xba, 0x22, 0xff, 0x22, 0xee, 0x3a, 0x8a, 0x27,
-  0x56, 0xc1, 0x1a, 0x1c, 0xa4, 0x5d, 0xab, 0x01,
-  0xac, 0x5b, 0xc0, 0xd2, 0xfe, 0xde, 0x1e, 0x81,
-  0x78, 0xdc, 0x25, 0xcb, 0x75, 0x91, 0x37, 0x3a,
-  0xed, 0x4e, 0x43, 0x50, 0x63, 0xf0, 0x47, 0x22,
-  0x94, 0x0e, 0x0f, 0x01, 0x96, 0xac, 0x0c, 0x6c,
-  0xd5, 0x5a, 0xad, 0x6c, 0xa5, 0x90, 0xa7, 0x67,
-  0xea, 0xa9, 0x0b, 0xb9, 0xe6, 0x8a, 0x77, 0xab,
-  0x28, 0x18, 0x43, 0x4f, 0x34, 0x46, 0xe3, 0xe0,
-  0x80, 0x7a, 0xbb, 0x9d, 0xcd, 0xc0, 0x96, 0x0f,
-  0x60, 0x19, 0x56, 0x9e, 0x57, 0x2a, 0xb3, 0xb6,
-  0xcf, 0x17, 0x1d, 0x48, 0x24, 0x70, 0x1a, 0x0d,
-  0xe4, 0xa2, 0x7d, 0xf5, 0x13, 0x15, 0x30, 0x76,
-  0x88, 0xde, 0xf8, 0x04, 0x8d, 0x72, 0x99, 0xc2,
-  0xf1, 0xf1, 0x6a, 0x06, 0xde, 0xdc, 0xba, 0x4c,
-  0x76, 0x5f, 0xdf, 0xc2, 0x93, 0xd1, 0x51, 0x02,
-  0xb6, 0x8d, 0xe9, 0xed, 0x45, 0x45, 0x70, 0x9a,
-  0x4d, 0x3a, 0xf5, 0x3a, 0x5f, 0x8f, 0x8e, 0xba,
-  0xce, 0x8b, 0xb7, 0x6e, 0xe3, 0xff, 0xac, 0xf3,
-  0x4f, 0xc2, 0x47, 0x66, 0x1e, 0xb9, 0x58, 0x76,
-  0x77, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
-  0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* dialog_error.png - 1390 bytes */
-static const unsigned char dialog_error_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
-  0xf9, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x56, 0x4d, 0x68, 0x13, 0x5b, 0x18, 0x3d, 0xe9,
-  0xcc, 0x64, 0xf2, 0x53, 0x79, 0xb6, 0x09, 0x09,
-  0x9d, 0x48, 0x13, 0xfc, 0x2b, 0x0a, 0xa5, 0xb8,
-  0xaa, 0x5d, 0x28, 0x82, 0x8b, 0xa2, 0xd9, 0x77,
-  0x25, 0x75, 0xe5, 0xa6, 0x0b, 0x97, 0x42, 0x41,
-  0x41, 0x50, 0x70, 0xe1, 0xde, 0x4a, 0xdd, 0xea,
-  0xd6, 0x85, 0x60, 0x37, 0x76, 0xd7, 0x85, 0x20,
-  0x28, 0xa5, 0x4d, 0xdb, 0x40, 0x23, 0x49, 0x85,
-  0xa4, 0x53, 0x9a, 0xa4, 0x9d, 0xc4, 0xcc, 0x4c,
-  0x9a, 0xc9, 0xbd, 0x6f, 0xf1, 0x79, 0xdf, 0x24,
-  0xd3, 0x57, 0xe3, 0xab, 0xbe, 0xb7, 0x78, 0xf8,
-  0x2d, 0x72, 0xb8, 0x73, 0x73, 0xef, 0x77, 0xce,
-  0xfd, 0x7e, 0xee, 0x05, 0x7e, 0xdb, 0x6f, 0xfb,
-  0x29, 0xf3, 0x1d, 0x77, 0xe1, 0xcb, 0x97, 0x00,
-  0x10, 0x0a, 0xd1, 0x68, 0x66, 0x86, 0x30, 0x9d,
-  0x26, 0x1c, 0x1d, 0x25, 0x1c, 0x18, 0x20, 0xdc,
-  0xdb, 0x23, 0x5c, 0x5d, 0x25, 0x7c, 0xfb, 0x96,
-  0xf0, 0xd9, 0xb3, 0x5b, 0xb7, 0x00, 0xc0, 0x34,
-  0xff, 0x33, 0x01, 0x44, 0xfc, 0xce, 0x1d, 0x1a,
-  0x3d, 0x79, 0x72, 0xf6, 0xec, 0xd8, 0xd8, 0xd8,
-  0x58, 0x24, 0xa2, 0x69, 0x23, 0x23, 0x23, 0x23,
-  0x40, 0x7f, 0x7f, 0x34, 0x1a, 0x8d, 0x02, 0xb2,
-  0xac, 0x28, 0xb2, 0x0c, 0xb4, 0x5a, 0x96, 0x65,
-  0x59, 0x80, 0x61, 0xe8, 0xfa, 0xce, 0x0e, 0xb0,
-  0xbd, 0x9d, 0xcb, 0xe5, 0x72, 0x40, 0x3e, 0xbf,
-  0xbe, 0xbe, 0xbe, 0x5e, 0xa9, 0xd0, 0x3e, 0xb3,
-  0xb3, 0x24, 0xe4, 0xc5, 0x8b, 0x7f, 0x4d, 0x00,
-  0x11, 0x7f, 0xf4, 0x68, 0x70, 0x30, 0x1e, 0x8f,
-  0xc7, 0xef, 0xdf, 0xbf, 0x74, 0x69, 0x72, 0x72,
-  0x72, 0x12, 0x08, 0x85, 0x0c, 0xc3, 0x30, 0x80,
-  0x76, 0x7b, 0x6b, 0x6b, 0x6b, 0x0b, 0xe0, 0xdc,
-  0xb2, 0x4c, 0x13, 0xe0, 0x9c, 0x31, 0xce, 0x01,
-  0xce, 0x39, 0xe7, 0x1c, 0x60, 0x4c, 0x51, 0x14,
-  0x05, 0xe8, 0xeb, 0x4b, 0x24, 0x12, 0x09, 0xc0,
-  0x34, 0xc3, 0xe1, 0x70, 0x18, 0x58, 0x59, 0x59,
-  0x5a, 0x5a, 0x5a, 0x02, 0x0c, 0xa3, 0x5a, 0xad,
-  0x56, 0x1f, 0x3f, 0x26, 0x21, 0x0f, 0x1e, 0xfc,
-  0x28, 0x2f, 0xe9, 0x47, 0x4f, 0x9c, 0x88, 0x3f,
-  0x7d, 0x3a, 0x31, 0x31, 0x35, 0x35, 0x35, 0x05,
-  0xc8, 0xf2, 0xf2, 0xf2, 0xf2, 0x32, 0xc0, 0x58,
-  0xb1, 0x58, 0x2a, 0x01, 0x9c, 0xb7, 0x5a, 0x07,
-  0x07, 0x2e, 0x61, 0x21, 0x80, 0x31, 0xce, 0x19,
-  0x03, 0x38, 0x77, 0x1c, 0xc7, 0x01, 0x18, 0xab,
-  0x56, 0x2b, 0x15, 0x40, 0x92, 0x48, 0xb8, 0xa6,
-  0x4d, 0x4c, 0x4c, 0x4c, 0x00, 0xd5, 0x6a, 0xb1,
-  0x58, 0x2c, 0x5e, 0xbd, 0x9a, 0x4e, 0xdb, 0xb6,
-  0x6d, 0x97, 0x4a, 0xaf, 0x5f, 0x03, 0xc0, 0xa7,
-  0x4f, 0xc7, 0x8e, 0x40, 0x77, 0x8e, 0x7f, 0xf9,
-  0x72, 0xfd, 0xfa, 0xf4, 0xf4, 0xf4, 0x74, 0x24,
-  0x12, 0x08, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x8c,
-  0xd5, 0xeb, 0xf5, 0x3a, 0x11, 0x65, 0x0c, 0x20,
-  0xaa, 0x9d, 0x84, 0xc5, 0xc9, 0x8b, 0x31, 0xcd,
-  0xd3, 0x0c, 0xfd, 0xd2, 0xf7, 0x40, 0x20, 0x18,
-  0x04, 0x9a, 0xcd, 0x64, 0x32, 0x95, 0x02, 0xde,
-  0xbf, 0x5f, 0x5c, 0x7c, 0xf7, 0x4e, 0xa4, 0xd6,
-  0xf0, 0x70, 0xaf, 0x1a, 0xe9, 0xfb, 0xbe, 0xbe,
-  0x99, 0x19, 0x91, 0xe3, 0xa1, 0x90, 0x61, 0xec,
-  0xef, 0x03, 0x9c, 0xd7, 0x6a, 0xb5, 0x9a, 0x4b,
-  0x5c, 0x10, 0x11, 0x44, 0x19, 0x13, 0xc4, 0xbb,
-  0x85, 0x09, 0xe2, 0xe2, 0x3b, 0x63, 0x42, 0x70,
-  0xa3, 0xd1, 0x68, 0x00, 0x81, 0x40, 0xbd, 0x6e,
-  0x18, 0xc0, 0xa9, 0x53, 0xa9, 0x54, 0x2a, 0x15,
-  0x89, 0x08, 0xff, 0xbd, 0x22, 0xd0, 0x43, 0x40,
-  0x3a, 0x3d, 0x34, 0x74, 0xee, 0xdc, 0xf9, 0xf3,
-  0x40, 0xbb, 0x9d, 0xcf, 0x17, 0x0a, 0x2e, 0x41,
-  0xf7, 0x04, 0xdb, 0xed, 0xce, 0x5c, 0x17, 0xe8,
-  0x12, 0x16, 0xc2, 0x84, 0x60, 0x51, 0x1b, 0x2e,
-  0x32, 0x06, 0x1c, 0x1c, 0x50, 0x2a, 0xc6, 0x62,
-  0x9a, 0x36, 0x34, 0xe4, 0xfa, 0xef, 0x25, 0x40,
-  0xfe, 0xfe, 0xf4, 0xe8, 0x68, 0x7f, 0x7f, 0x34,
-  0x1a, 0x89, 0x00, 0x8c, 0xad, 0xac, 0xd8, 0xb6,
-  0xeb, 0x30, 0x1a, 0xdd, 0xdc, 0xdc, 0xdc, 0xec,
-  0xb5, 0x7d, 0x6f, 0x2b, 0x14, 0xe2, 0xf1, 0x78,
-  0x1c, 0xe0, 0xbc, 0xd9, 0x6c, 0x36, 0x81, 0x50,
-  0x28, 0x1c, 0x3e, 0x71, 0xc2, 0xf5, 0xff, 0x93,
-  0x11, 0x18, 0x18, 0x90, 0x65, 0x59, 0x96, 0xe5,
-  0xc3, 0xa1, 0xff, 0x55, 0xe6, 0x8d, 0x9c, 0x24,
-  0x49, 0x52, 0xdf, 0x5f, 0xac, 0xc4, 0x3d, 0x72,
-  0x6c, 0x01, 0x7b, 0x7b, 0xad, 0x96, 0x6d, 0x8b,
-  0x93, 0xef, 0x4c, 0x9d, 0x5f, 0x65, 0x6e, 0x2d,
-  0x88, 0x54, 0x22, 0x7f, 0xc2, 0x7f, 0xaf, 0xf5,
-  0x3d, 0x52, 0x68, 0x75, 0xb5, 0x56, 0xd3, 0x75,
-  0x5d, 0xbf, 0x76, 0x2d, 0x14, 0xf2, 0xfb, 0x29,
-  0x12, 0xe4, 0x60, 0x7b, 0x3b, 0x99, 0x4c, 0x26,
-  0x5d, 0x02, 0x6e, 0x4d, 0x88, 0x31, 0xf0, 0x77,
-  0x39, 0x7f, 0xb8, 0x86, 0xc4, 0x58, 0x92, 0x24,
-  0x09, 0xf8, 0xfa, 0x75, 0x7f, 0x7f, 0x7f, 0xdf,
-  0xf5, 0x7f, 0xec, 0x08, 0xd0, 0x29, 0x2f, 0x2c,
-  0x94, 0x4a, 0x74, 0x73, 0xfa, 0x7c, 0x9a, 0x96,
-  0x48, 0x74, 0x12, 0x71, 0xbb, 0x4b, 0x67, 0x37,
-  0x72, 0xbb, 0x92, 0x97, 0xb0, 0x10, 0xe4, 0xfd,
-  0x3f, 0x9d, 0xbc, 0x24, 0xd1, 0x0d, 0xbe, 0xbb,
-  0xab, 0xeb, 0xdb, 0xdb, 0xae, 0x7f, 0x62, 0xe3,
-  0xf3, 0xfd, 0x43, 0x01, 0x3e, 0x5f, 0xa9, 0x04,
-  0x00, 0x73, 0x73, 0x85, 0x42, 0x36, 0x9b, 0xcd,
-  0x56, 0x2a, 0xa6, 0x19, 0x0c, 0x06, 0x83, 0x00,
-  0x40, 0xc8, 0x39, 0xe7, 0xed, 0x76, 0x67, 0x6d,
-  0xb8, 0x5d, 0xa7, 0x3b, 0xd5, 0xdc, 0xda, 0xe9,
-  0x14, 0xe6, 0x46, 0x46, 0x55, 0x55, 0x15, 0x30,
-  0xcd, 0x40, 0x20, 0x10, 0x00, 0x74, 0x5d, 0xd7,
-  0x77, 0x76, 0x2a, 0x95, 0x5c, 0x0e, 0x00, 0x9e,
-  0x3f, 0xef, 0x16, 0x70, 0x58, 0x88, 0xe4, 0x25,
-  0xfe, 0x4d, 0x57, 0xdf, 0xe2, 0x22, 0x9d, 0xee,
-  0xcd, 0x9b, 0x00, 0x60, 0x18, 0xa6, 0x59, 0x2e,
-  0x97, 0xcb, 0xe9, 0xf4, 0xd0, 0xd0, 0xf8, 0xf8,
-  0xf8, 0x38, 0xc0, 0xd8, 0xee, 0x6e, 0xa5, 0xd2,
-  0x7d, 0x03, 0x77, 0xa7, 0x84, 0x97, 0x68, 0x77,
-  0xb1, 0xfa, 0x7c, 0xaa, 0xea, 0xf7, 0x03, 0x7d,
-  0x7d, 0xa7, 0x4f, 0x9f, 0x39, 0x03, 0x64, 0xb3,
-  0x6b, 0x6b, 0x99, 0x0c, 0x50, 0xa9, 0xb4, 0x5a,
-  0x8e, 0x33, 0x3b, 0x7b, 0xef, 0x1e, 0x00, 0x7c,
-  0xfc, 0x48, 0x7c, 0x44, 0xdb, 0x38, 0xdc, 0x3e,
-  0x3c, 0x02, 0x44, 0xfd, 0x4b, 0xdf, 0xbe, 0xfb,
-  0xfd, 0x6f, 0xde, 0x00, 0xc0, 0xc6, 0xc6, 0x95,
-  0x2b, 0xb6, 0x6d, 0xdb, 0xaa, 0xda, 0x68, 0x94,
-  0x4a, 0xa5, 0xd2, 0xe5, 0xcb, 0x03, 0x03, 0x17,
-  0x2f, 0x5e, 0xb8, 0x00, 0x28, 0x0a, 0x9d, 0x5c,
-  0xbb, 0xdd, 0x68, 0xd0, 0x1b, 0xc8, 0x71, 0x5a,
-  0xad, 0xee, 0xda, 0x20, 0x94, 0x65, 0x49, 0x02,
-  0x64, 0x39, 0x16, 0x8b, 0xc5, 0x00, 0xdb, 0x1e,
-  0x1c, 0x1c, 0x1c, 0x04, 0xb2, 0xd9, 0x4c, 0x26,
-  0x93, 0x01, 0x0a, 0x05, 0xcb, 0xb2, 0xac, 0xb9,
-  0xb9, 0xbb, 0x77, 0x01, 0x60, 0x7e, 0xbe, 0x9b,
-  0xb0, 0x68, 0x1b, 0x87, 0x85, 0x1c, 0x11, 0x01,
-  0x57, 0x00, 0x61, 0x30, 0x48, 0x0f, 0xe0, 0x4c,
-  0x26, 0x99, 0x6c, 0x36, 0x9b, 0x4d, 0xd3, 0xb4,
-  0xac, 0x7c, 0x3e, 0x9f, 0x1f, 0x1d, 0x65, 0x4c,
-  0x96, 0x65, 0x59, 0x55, 0xfd, 0xfe, 0x44, 0x42,
-  0xd3, 0x00, 0x55, 0xa5, 0xe2, 0x56, 0x14, 0xaa,
-  0x19, 0xc6, 0xe8, 0x1e, 0xb1, 0x2c, 0x59, 0x56,
-  0x14, 0xa0, 0x58, 0x2c, 0x97, 0xcb, 0x65, 0x20,
-  0x9b, 0xcd, 0xe5, 0x72, 0xb9, 0x7a, 0xfd, 0xc3,
-  0x07, 0xc7, 0x71, 0x9c, 0xf9, 0xf9, 0x87, 0x0f,
-  0x01, 0xe0, 0xd5, 0x2b, 0xf2, 0xe7, 0x38, 0x84,
-  0xad, 0x56, 0xf7, 0x58, 0xa0, 0x30, 0xce, 0x3d,
-  0x39, 0xe5, 0x8d, 0x40, 0x20, 0x40, 0x28, 0xde,
-  0x44, 0xf1, 0x38, 0xe1, 0xf0, 0xf0, 0xc9, 0x93,
-  0x00, 0x10, 0x8b, 0xdd, 0xbe, 0x0d, 0x00, 0x37,
-  0x6e, 0xa4, 0x52, 0x00, 0x30, 0x36, 0xf6, 0xc7,
-  0x1f, 0x00, 0xa0, 0x69, 0x8a, 0x42, 0xeb, 0x0e,
-  0x0e, 0x00, 0xc0, 0xb2, 0xa8, 0xb3, 0xe8, 0xfa,
-  0xe7, 0xcf, 0x00, 0xb0, 0xb6, 0x46, 0x54, 0x17,
-  0x16, 0x0c, 0x03, 0x00, 0x8a, 0x45, 0xda, 0x77,
-  0x77, 0x97, 0x50, 0xbc, 0x85, 0x44, 0x3f, 0x6a,
-  0x34, 0x08, 0x69, 0x37, 0xa0, 0xdd, 0x3e, 0x42,
-  0x80, 0x5b, 0x03, 0x84, 0x44, 0xc3, 0x15, 0x42,
-  0xf4, 0x00, 0x4d, 0x23, 0x24, 0x19, 0xee, 0xbc,
-  0x88, 0x98, 0x58, 0x27, 0x50, 0xec, 0x27, 0x1c,
-  0x8b, 0xc7, 0x19, 0xd1, 0x77, 0xfb, 0xbd, 0xc0,
-  0x5a, 0xad, 0xfb, 0x7f, 0x82, 0xb8, 0x88, 0x80,
-  0x9b, 0x52, 0x47, 0x08, 0xf0, 0x0a, 0x11, 0xa8,
-  0xaa, 0x84, 0xe1, 0xb0, 0x48, 0x2d, 0x42, 0x59,
-  0xee, 0x46, 0xf1, 0x7f, 0x6f, 0xd7, 0x10, 0x02,
-  0x04, 0x21, 0x91, 0x22, 0xcd, 0x26, 0xa1, 0xb8,
-  0xc2, 0xbc, 0xa9, 0x23, 0xd6, 0x79, 0x6b, 0xe1,
-  0xc8, 0xe7, 0xb4, 0xaf, 0x47, 0x64, 0xbc, 0xa9,
-  0xe6, 0x9d, 0x3f, 0xca, 0xbc, 0x45, 0xe8, 0x45,
-  0x41, 0xd8, 0x5b, 0xbc, 0xde, 0xf5, 0xff, 0x23,
-  0xfb, 0x13, 0xd9, 0xb2, 0xe7, 0x6c, 0xa9, 0xad,
-  0xfd, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
-  0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/dialog_information.h
+++ b/art/tango/dialog_information.h
@@ -1,367 +0,0 @@
-/* dialog_information.png - 863 bytes */
-static const unsigned char dialog_information_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x03, 0x02, 0x06, 0x20, 0x32, 0x3a,
-  0x50, 0x9c, 0xf7, 0x00, 0x00, 0x00, 0x35, 0x74,
-  0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
-  0x6e, 0x74, 0x00, 0x28, 0x63, 0x29, 0x20, 0x32,
-  0x30, 0x30, 0x34, 0x20, 0x4a, 0x61, 0x6b, 0x75,
-  0x62, 0x20, 0x53, 0x74, 0x65, 0x69, 0x6e, 0x65,
-  0x72, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74,
-  0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
-  0x54, 0x68, 0x65, 0x20, 0x47, 0x49, 0x4d, 0x50,
-  0x90, 0xd9, 0x8b, 0x6f, 0x00, 0x00, 0x02, 0xab,
-  0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x92,
-  0x4b, 0x48, 0x54, 0x71, 0x14, 0xc6, 0xbf, 0xff,
-  0xdc, 0x3b, 0xe3, 0xbd, 0x3a, 0xd7, 0x47, 0x26,
-  0x59, 0x6a, 0x66, 0x52, 0x3e, 0x08, 0x45, 0x22,
-  0x13, 0xc4, 0xa1, 0x06, 0x25, 0xd4, 0xa4, 0xa2,
-  0x90, 0x6c, 0x62, 0xca, 0x70, 0x61, 0xb4, 0x08,
-  0x13, 0xb2, 0x45, 0xcb, 0x10, 0x31, 0xaa, 0x45,
-  0x8f, 0x4d, 0xa2, 0x8b, 0x88, 0xa0, 0x02, 0x03,
-  0x03, 0x25, 0xc8, 0x10, 0x49, 0x74, 0x26, 0x4a,
-  0x4a, 0xcd, 0x8a, 0x34, 0x95, 0x4c, 0x9d, 0x71,
-  0x74, 0x9c, 0xb9, 0x77, 0xae, 0xf7, 0xf5, 0x6f,
-  0xe5, 0xa0, 0x35, 0x11, 0x7e, 0xab, 0x73, 0xe0,
-  0xfb, 0x7e, 0x9c, 0x73, 0x38, 0x04, 0x11, 0x54,
-  0x5c, 0xd9, 0xd4, 0x4c, 0x29, 0x1c, 0x06, 0x25,
-  0x29, 0x20, 0x84, 0x98, 0x88, 0x31, 0xcb, 0x10,
-  0xfa, 0xb4, 0xff, 0x65, 0x6b, 0xe3, 0x9f, 0x5e,
-  0x76, 0x7d, 0x53, 0x54, 0xde, 0x94, 0xc1, 0x30,
-  0xa4, 0xef, 0x62, 0x6d, 0x65, 0x5a, 0xb9, 0xbd,
-  0x00, 0x71, 0x02, 0x0f, 0x55, 0x37, 0xe0, 0xf1,
-  0x05, 0x53, 0x7b, 0x7a, 0x3f, 0x5c, 0x21, 0x26,
-  0xe6, 0x2c, 0xa5, 0x7a, 0x49, 0x7f, 0x57, 0xeb,
-  0xd7, 0x88, 0x00, 0x96, 0x25, 0x6f, 0xef, 0xb5,
-  0xd4, 0x6f, 0xdf, 0x93, 0xb9, 0x63, 0x2c, 0x10,
-  0x52, 0x46, 0x67, 0x7d, 0x92, 0x12, 0x5a, 0x55,
-  0x59, 0x45, 0xd3, 0xa3, 0x6d, 0x25, 0xf9, 0x59,
-  0xe9, 0xe9, 0xc9, 0x7b, 0x5b, 0x6e, 0x3d, 0x76,
-  0x01, 0x88, 0x5f, 0xcb, 0x30, 0x6b, 0x45, 0x49,
-  0xd5, 0xd5, 0xdb, 0xf5, 0xe7, 0x8f, 0x96, 0x15,
-  0x1f, 0xcc, 0xf9, 0xac, 0xa8, 0xba, 0x9b, 0xb7,
-  0x98, 0x15, 0x00, 0x44, 0xa7, 0x20, 0xaa, 0x4e,
-  0x0d, 0xef, 0x4a, 0x68, 0x96, 0x8b, 0xe6, 0x10,
-  0xcd, 0x73, 0x3b, 0x75, 0x26, 0x25, 0x73, 0x72,
-  0xfc, 0x6d, 0x27, 0x00, 0x98, 0xc2, 0x24, 0x86,
-  0x3d, 0x57, 0x6e, 0x2f, 0x40, 0x20, 0xa4, 0x8e,
-  0xb1, 0x2c, 0x43, 0x2d, 0x66, 0xc6, 0x20, 0x84,
-  0x50, 0x50, 0x18, 0x9a, 0x6e, 0x28, 0x94, 0xc2,
-  0xe8, 0x1a, 0x9c, 0xec, 0x2e, 0x2a, 0xcc, 0x01,
-  0xc3, 0x72, 0xa7, 0xd6, 0x72, 0x61, 0xc0, 0xaa,
-  0x42, 0xe3, 0x05, 0x2b, 0x0f, 0x59, 0xd1, 0x57,
-  0x55, 0xcd, 0x48, 0x34, 0x33, 0xa6, 0x0b, 0x89,
-  0xb1, 0x9c, 0x73, 0x57, 0xb2, 0xe0, 0xc8, 0xdf,
-  0xbd, 0xd5, 0x01, 0x25, 0x90, 0x3a, 0xe5, 0x11,
-  0xfd, 0x3c, 0xcf, 0x21, 0x20, 0xa9, 0x5c, 0x6d,
-  0x5d, 0x83, 0x69, 0xc3, 0x0d, 0x08, 0x21, 0x44,
-  0xd1, 0x74, 0x48, 0xb2, 0x6a, 0x32, 0x0c, 0x2a,
-  0x26, 0x58, 0xa3, 0xe0, 0xf5, 0x4b, 0x2e, 0x51,
-  0x0a, 0x31, 0x2b, 0x41, 0x49, 0x1b, 0x9e, 0x96,
-  0x86, 0x15, 0x45, 0x37, 0xa9, 0xaa, 0xb1, 0x16,
-  0xe1, 0x01, 0x88, 0x61, 0x40, 0x0c, 0xcf, 0x4a,
-  0x5e, 0x5f, 0x20, 0x46, 0x94, 0x55, 0xcb, 0x8a,
-  0xa4, 0xfa, 0x33, 0x92, 0x63, 0x31, 0xfa, 0xc3,
-  0xf7, 0x5e, 0x54, 0x74, 0x3a, 0xb7, 0x24, 0x29,
-  0xee, 0x6f, 0x8b, 0x1e, 0xc1, 0x6a, 0x49, 0xf0,
-  0xfa, 0x83, 0x88, 0x13, 0x78, 0xb5, 0xa3, 0xad,
-  0x59, 0xdc, 0xb0, 0x82, 0x99, 0xd1, 0x06, 0x7a,
-  0xde, 0x0c, 0x83, 0x8f, 0x62, 0x73, 0x27, 0x7e,
-  0x2d, 0x8b, 0x00, 0xf0, 0xd3, 0x27, 0xea, 0x1f,
-  0x27, 0xbc, 0xfe, 0xde, 0xe1, 0x99, 0x85, 0x25,
-  0x51, 0x36, 0x57, 0xec, 0x4f, 0xab, 0x18, 0x72,
-  0x8d, 0xc1, 0xca, 0x61, 0xe2, 0xaf, 0x1b, 0x6c,
-  0x13, 0x42, 0xc7, 0x3b, 0xbb, 0xfa, 0xe5, 0x99,
-  0xe9, 0xf9, 0xec, 0xb4, 0x24, 0xeb, 0xa1, 0x6b,
-  0xed, 0x03, 0x37, 0xcf, 0x1c, 0xce, 0xba, 0xe4,
-  0xfe, 0x32, 0x1f, 0x62, 0x58, 0x92, 0xe8, 0xb4,
-  0x67, 0x55, 0xfb, 0x17, 0x97, 0x72, 0xdc, 0x83,
-  0x23, 0xaa, 0xc0, 0xfa, 0x4a, 0xc3, 0xab, 0xaf,
-  0xff, 0x83, 0x63, 0xa7, 0x1b, 0xab, 0x64, 0x2a,
-  0x3c, 0x2f, 0x2b, 0x2d, 0xb2, 0x14, 0x1e, 0xc8,
-  0x46, 0x34, 0xcf, 0x41, 0xd5, 0x75, 0xf8, 0x96,
-  0x45, 0x0c, 0xb9, 0xc6, 0xf1, 0xce, 0x35, 0xa2,
-  0xc5, 0x71, 0xd2, 0xe5, 0x27, 0xed, 0x37, 0x1e,
-  0x44, 0x04, 0x00, 0x40, 0x6d, 0x5d, 0x43, 0x62,
-  0x88, 0x6e, 0x71, 0x05, 0x64, 0xa4, 0x3b, 0x4e,
-  0x24, 0x31, 0x84, 0x00, 0x2c, 0x0b, 0x74, 0x75,
-  0xcf, 0x05, 0x19, 0xcd, 0xbf, 0xaf, 0xa3, 0xed,
-  0xce, 0x14, 0xfe, 0xa7, 0x9a, 0x1a, 0xbb, 0xd5,
-  0xe9, 0xb4, 0x51, 0xcf, 0x62, 0x1f, 0x15, 0x65,
-  0x17, 0xfd, 0x3e, 0xf9, 0x8c, 0x3a, 0x9d, 0x36,
-  0x1a, 0xc9, 0xcb, 0xfe, 0x83, 0xa1, 0x02, 0xc0,
-  0xfd, 0xbb, 0x0f, 0x91, 0x9d, 0x9b, 0x8d, 0xe9,
-  0xa9, 0x69, 0x6c, 0x5a, 0x4e, 0xa7, 0x8d, 0xce,
-  0xcc, 0xbe, 0x32, 0x02, 0xd2, 0x10, 0xfd, 0x34,
-  0xfa, 0xc2, 0xd8, 0xec, 0x04, 0x00, 0x50, 0x55,
-  0x7d, 0xf2, 0x7a, 0x8d, 0x20, 0xc4, 0x1f, 0x59,
-  0x58, 0x58, 0x78, 0x9d, 0x97, 0x17, 0xfb, 0x28,
-  0x92, 0xe9, 0x37, 0x56, 0x4c, 0x36, 0x5e, 0x7c,
-  0x8a, 0x1d, 0x04, 0x00, 0x00, 0x00, 0x00, 0x49,
-  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* dialog_information.png - 2022 bytes */
-static const unsigned char dialog_information_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x07,
-  0x71, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
-  0x97, 0x5f, 0x4c, 0x1c, 0xd5, 0x17, 0xc7, 0xcf,
-  0x9d, 0x3b, 0x7f, 0x76, 0x87, 0x59, 0xd8, 0xff,
-  0x05, 0x8a, 0xa2, 0x82, 0x2d, 0x01, 0x6a, 0x11,
-  0x68, 0x42, 0x8a, 0x56, 0xb0, 0x16, 0xa3, 0xa2,
-  0x09, 0xc6, 0xc2, 0x43, 0xf5, 0xc1, 0xc4, 0x07,
-  0x35, 0x31, 0x8d, 0x51, 0x1f, 0x6c, 0xa2, 0x0f,
-  0x3e, 0x19, 0x23, 0xa9, 0x06, 0xa3, 0x26, 0xad,
-  0x25, 0x0a, 0x89, 0x69, 0x0d, 0x31, 0x56, 0xab,
-  0x8d, 0x0f, 0xd5, 0x8a, 0x69, 0x00, 0x53, 0x28,
-  0x74, 0xa9, 0x29, 0x8d, 0x2b, 0xff, 0x97, 0x5d,
-  0xf6, 0xff, 0xcc, 0xce, 0xce, 0xce, 0xcc, 0x9d,
-  0xeb, 0xc3, 0xb8, 0xf1, 0xd7, 0xfc, 0x7e, 0x09,
-  0x14, 0xf1, 0x97, 0x78, 0x1e, 0xe6, 0x9b, 0xc9,
-  0xdc, 0xb9, 0xf7, 0x7c, 0xee, 0x39, 0xe7, 0xde,
-  0x1c, 0x80, 0x7f, 0xb9, 0xa1, 0xad, 0xfe, 0xf8,
-  0xec, 0xb3, 0xcf, 0x3d, 0xf7, 0xf2, 0xcb, 0x2c,
-  0x0b, 0x00, 0x80, 0xd0, 0xf3, 0xcf, 0x23, 0x84,
-  0x31, 0xcf, 0x3f, 0xfe, 0x38, 0xa5, 0x94, 0x52,
-  0xda, 0xd8, 0x08, 0x60, 0x59, 0x86, 0x11, 0x0c,
-  0x02, 0x30, 0x0c, 0xc7, 0xc5, 0x62, 0x08, 0x21,
-  0x84, 0x50, 0x28, 0x44, 0x29, 0x21, 0xba, 0xfe,
-  0xf5, 0xd7, 0x00, 0x00, 0x94, 0x7e, 0xfc, 0xf1,
-  0xe0, 0xe0, 0xc9, 0x93, 0xc7, 0x8f, 0x9b, 0xe6,
-  0xff, 0x0d, 0xc0, 0x76, 0xfc, 0xfe, 0xfb, 0x6d,
-  0xc7, 0x3e, 0xfb, 0xec, 0xc0, 0x81, 0xce, 0xce,
-  0x83, 0x07, 0x2b, 0x2a, 0x6a, 0x6b, 0x77, 0xef,
-  0x6e, 0x68, 0x10, 0x04, 0x49, 0x92, 0x24, 0x51,
-  0x04, 0x10, 0x04, 0x9e, 0xe7, 0x38, 0x00, 0x45,
-  0xc9, 0xe5, 0x34, 0x0d, 0x20, 0x1e, 0x4f, 0x26,
-  0x33, 0x19, 0x80, 0xdf, 0x7f, 0xbf, 0x71, 0xe3,
-  0xda, 0x35, 0x4d, 0x9b, 0x9c, 0x9c, 0x98, 0xb8,
-  0x74, 0x29, 0x1a, 0xb5, 0x2c, 0xd3, 0x2c, 0x14,
-  0x9e, 0x79, 0xc6, 0x06, 0x19, 0x1d, 0xfd, 0xc7,
-  0x00, 0x6c, 0xc7, 0x1f, 0x78, 0xc0, 0xef, 0x0f,
-  0x06, 0xcb, 0xcb, 0xbf, 0xfd, 0xf6, 0xd0, 0xa1,
-  0xee, 0xee, 0xbe, 0x3e, 0x51, 0x34, 0x0c, 0x8c,
-  0x1d, 0x0e, 0x80, 0x50, 0x68, 0x61, 0x21, 0x9d,
-  0x06, 0x90, 0x24, 0xa7, 0x13, 0x00, 0x80, 0x10,
-  0x4a, 0x09, 0xb1, 0xac, 0x42, 0xc1, 0x30, 0x4c,
-  0xd3, 0x34, 0x2d, 0xcb, 0xb2, 0x10, 0xa2, 0xb4,
-  0xae, 0xae, 0xaa, 0xca, 0xe3, 0x61, 0xd9, 0xaa,
-  0xaa, 0xb2, 0x32, 0x9e, 0xc7, 0x78, 0x64, 0xe4,
-  0xf4, 0xe9, 0xe1, 0xe1, 0x7c, 0x3e, 0x12, 0x59,
-  0x59, 0x59, 0x5e, 0x7e, 0xe4, 0x11, 0x1b, 0xe4,
-  0xe2, 0xc5, 0x6d, 0x03, 0xb0, 0x1d, 0xaf, 0xa8,
-  0x00, 0x60, 0x18, 0x96, 0x0d, 0x85, 0x5e, 0x78,
-  0xe1, 0xe8, 0xd1, 0xd7, 0x5e, 0xf3, 0x7a, 0xe7,
-  0xe6, 0x22, 0x11, 0x5d, 0x07, 0x98, 0x9f, 0x5f,
-  0x5f, 0x4f, 0x26, 0x01, 0x9a, 0x9b, 0x6b, 0x6b,
-  0x3d, 0x1e, 0xcb, 0x92, 0x24, 0x87, 0x83, 0x65,
-  0x09, 0xa1, 0x14, 0x80, 0x52, 0xd3, 0xa4, 0x94,
-  0x52, 0x00, 0xcb, 0x8a, 0xc7, 0xb3, 0xd9, 0x42,
-  0x41, 0xd3, 0x42, 0xa1, 0x85, 0x85, 0x54, 0x4a,
-  0xd7, 0x7d, 0x3e, 0x97, 0xcb, 0xe1, 0x90, 0xa4,
-  0x83, 0x07, 0x1b, 0x1b, 0x2b, 0x2a, 0x24, 0x69,
-  0x60, 0xe0, 0xbd, 0xf7, 0xfa, 0xfb, 0xd3, 0x69,
-  0x4d, 0x53, 0xd5, 0x5c, 0xae, 0xa1, 0xc1, 0x06,
-  0x89, 0x44, 0x36, 0xf2, 0x8f, 0xd9, 0x04, 0x23,
-  0x62, 0x98, 0xa3, 0x47, 0x7b, 0x7a, 0x0e, 0x1f,
-  0x3e, 0x72, 0xa4, 0xac, 0x2c, 0x1e, 0x57, 0x14,
-  0x4a, 0x01, 0x42, 0xa1, 0xc5, 0xc5, 0xf5, 0x75,
-  0x80, 0xce, 0xce, 0x7b, 0xee, 0x09, 0x06, 0x09,
-  0x09, 0x04, 0xca, 0xca, 0x04, 0x41, 0xd3, 0x4a,
-  0x4a, 0x1c, 0x0e, 0x96, 0xcd, 0xe5, 0x24, 0xc9,
-  0xe9, 0xe4, 0xf9, 0x5c, 0xce, 0xe5, 0x72, 0x3a,
-  0x39, 0x4e, 0x96, 0xab, 0xaa, 0xfc, 0x7e, 0x51,
-  0x2c, 0x14, 0xbc, 0x5e, 0x97, 0x8b, 0xe7, 0x13,
-  0x89, 0x44, 0x22, 0x9b, 0xcd, 0xe7, 0x15, 0x65,
-  0x76, 0x76, 0x79, 0x39, 0x93, 0x51, 0xd5, 0x87,
-  0x1f, 0xee, 0xee, 0xee, 0xe9, 0x91, 0xa4, 0xe2,
-  0x7a, 0x9b, 0x8d, 0xc0, 0x86, 0x00, 0x08, 0x31,
-  0x0c, 0xc7, 0x75, 0x75, 0xb9, 0xdd, 0x7e, 0x7f,
-  0x30, 0x88, 0xf1, 0xf4, 0xf4, 0xfc, 0x7c, 0x3a,
-  0x0d, 0x50, 0x55, 0x15, 0x0c, 0xf2, 0xbc, 0x61,
-  0x60, 0x8c, 0x31, 0x42, 0x9a, 0x66, 0x17, 0x69,
-  0x3e, 0xcf, 0x30, 0x0c, 0x83, 0x50, 0x2e, 0x87,
-  0x31, 0x42, 0x08, 0xc9, 0xb2, 0xfd, 0x3d, 0x9b,
-  0xe5, 0x38, 0x96, 0x65, 0x98, 0x6c, 0xb6, 0xa4,
-  0x44, 0x10, 0x58, 0x36, 0x1e, 0x77, 0xb9, 0x44,
-  0x91, 0xe3, 0xd6, 0xd7, 0xd7, 0xd6, 0xd2, 0x69,
-  0x55, 0xcd, 0x64, 0x6a, 0x6a, 0xee, 0xbc, 0xb3,
-  0xba, 0x9a, 0x52, 0x84, 0x30, 0x66, 0xd9, 0x43,
-  0x87, 0x36, 0x0b, 0xc0, 0x6e, 0x34, 0x80, 0x52,
-  0xcb, 0x32, 0xcd, 0xdd, 0xbb, 0x1d, 0x0e, 0x87,
-  0xc3, 0xe1, 0x00, 0x88, 0xc5, 0x32, 0x99, 0xc5,
-  0x45, 0x00, 0x86, 0x61, 0x18, 0xa7, 0x53, 0x96,
-  0xed, 0x51, 0x96, 0x85, 0x10, 0x42, 0x00, 0xaa,
-  0x6a, 0x03, 0xa8, 0xaa, 0x0d, 0x50, 0x04, 0xd3,
-  0xf5, 0x74, 0x5a, 0x51, 0x0a, 0x85, 0x44, 0x42,
-  0x92, 0x9c, 0x4e, 0x8e, 0x53, 0x14, 0xcb, 0xa2,
-  0x14, 0xc0, 0x34, 0xb3, 0x59, 0x55, 0xd5, 0x75,
-  0x86, 0x09, 0x04, 0x3c, 0x9e, 0xd2, 0xd2, 0x60,
-  0x90, 0x52, 0x42, 0x4c, 0xb3, 0xae, 0x6e, 0xdb,
-  0x00, 0xec, 0xdc, 0x8f, 0x44, 0x52, 0xa9, 0x6c,
-  0x56, 0x96, 0x6b, 0x6a, 0x4a, 0x4b, 0x45, 0x91,
-  0xe7, 0x55, 0xd5, 0x34, 0x2d, 0x8b, 0xd2, 0x4c,
-  0x26, 0x1a, 0x4d, 0xa7, 0xf3, 0x79, 0x4d, 0x2b,
-  0x2f, 0xf7, 0x78, 0x44, 0xd1, 0x30, 0x38, 0x0e,
-  0x63, 0x84, 0x54, 0x95, 0x10, 0x4a, 0x29, 0x4d,
-  0xa7, 0x15, 0x45, 0x55, 0x0d, 0x23, 0x12, 0xd1,
-  0x75, 0xd3, 0x24, 0x44, 0x96, 0x5d, 0x2e, 0xa7,
-  0x93, 0xe7, 0x79, 0xde, 0x34, 0x09, 0xa1, 0x14,
-  0x21, 0x86, 0x01, 0x40, 0xc8, 0xe7, 0xcb, 0xe5,
-  0xf2, 0x79, 0x4d, 0x2b, 0x14, 0x18, 0x06, 0x63,
-  0x8c, 0x57, 0x57, 0xb7, 0x2d, 0x85, 0xec, 0x28,
-  0x8c, 0x8e, 0x26, 0x93, 0x89, 0x44, 0x2c, 0x46,
-  0xe9, 0x8e, 0x1d, 0x6e, 0xb7, 0xd3, 0xa9, 0xeb,
-  0x0e, 0x07, 0xc7, 0x61, 0x9c, 0xcb, 0x35, 0x37,
-  0xd7, 0xd4, 0xf8, 0xfd, 0x5e, 0x6f, 0x20, 0x50,
-  0x56, 0xe6, 0x70, 0xb0, 0x6c, 0x32, 0xa9, 0x28,
-  0x85, 0xc2, 0xf5, 0xeb, 0xa9, 0x94, 0xa2, 0xe8,
-  0xfa, 0x95, 0x2b, 0xc5, 0x94, 0x69, 0x69, 0xa9,
-  0xad, 0xf5, 0xfb, 0x9b, 0x9a, 0xee, 0xbb, 0xaf,
-  0xbe, 0x7e, 0xc7, 0x8e, 0x03, 0x07, 0x34, 0x4d,
-  0xd7, 0x09, 0xc1, 0x78, 0xe7, 0x4e, 0xbf, 0x5f,
-  0x92, 0x30, 0x5e, 0x5b, 0x8b, 0x46, 0x63, 0x31,
-  0x4d, 0xb3, 0x57, 0x1c, 0x1b, 0xdb, 0xc6, 0x08,
-  0x10, 0xa2, 0xeb, 0xc7, 0x8f, 0x4f, 0x4f, 0x5f,
-  0xba, 0xf4, 0xc3, 0x0f, 0x7d, 0x7d, 0x8f, 0x3e,
-  0xda, 0xdb, 0xfb, 0xf4, 0xd3, 0x2c, 0x7b, 0xed,
-  0xda, 0xd2, 0x52, 0x26, 0xa3, 0xeb, 0x18, 0x33,
-  0x0c, 0x42, 0x84, 0x04, 0x83, 0x6e, 0xb7, 0x28,
-  0x56, 0x57, 0x57, 0x57, 0x07, 0x02, 0x92, 0x54,
-  0x5b, 0x0b, 0x80, 0x10, 0x40, 0xf1, 0x69, 0x59,
-  0x76, 0xca, 0xe4, 0xf3, 0xba, 0x6e, 0x18, 0x84,
-  0x2c, 0x2c, 0xdc, 0x7e, 0x7b, 0x20, 0x20, 0x49,
-  0x6b, 0x6b, 0x4d, 0x4d, 0x77, 0xdc, 0x11, 0x0c,
-  0x3e, 0xf4, 0xd0, 0xc0, 0xc0, 0xc0, 0xc0, 0x07,
-  0x1f, 0x58, 0x96, 0x65, 0x99, 0xa6, 0x61, 0x7c,
-  0xf4, 0xd1, 0x66, 0x01, 0xf0, 0x46, 0x03, 0xae,
-  0x5c, 0x99, 0x9c, 0x1c, 0x1b, 0x8b, 0x46, 0xef,
-  0xbe, 0xbb, 0xae, 0xae, 0xa9, 0x29, 0x18, 0xc4,
-  0x18, 0x80, 0xd2, 0xbd, 0x7b, 0xdb, 0xda, 0x5a,
-  0x5a, 0x1a, 0x1b, 0x59, 0x36, 0x95, 0x52, 0x94,
-  0x42, 0x61, 0x61, 0xc1, 0xe7, 0x2b, 0x2d, 0x15,
-  0x04, 0x51, 0x9c, 0x9e, 0x0e, 0x87, 0x93, 0xc9,
-  0xfe, 0x7e, 0xfb, 0xec, 0xff, 0xfe, 0x7b, 0x59,
-  0xd6, 0x34, 0xc3, 0x18, 0x1a, 0x2a, 0x2d, 0x15,
-  0x45, 0x8e, 0x6b, 0x6d, 0x55, 0x14, 0x4d, 0x33,
-  0xcd, 0x8b, 0x17, 0x45, 0x91, 0xe3, 0x1c, 0x8e,
-  0xee, 0xee, 0x89, 0x89, 0xf1, 0xf1, 0xb1, 0x31,
-  0x5d, 0xbf, 0x7c, 0x79, 0x72, 0x72, 0x72, 0xf2,
-  0xec, 0xd9, 0x53, 0xa7, 0x4e, 0x9c, 0xe8, 0xef,
-  0xff, 0xf0, 0xc3, 0x6d, 0x4d, 0x21, 0xdb, 0x2c,
-  0xcb, 0x34, 0x5f, 0x7d, 0x75, 0x72, 0xf2, 0x97,
-  0x5f, 0xc6, 0xc7, 0x6f, 0xdc, 0x48, 0x26, 0xa3,
-  0xd1, 0x95, 0x15, 0xa7, 0x93, 0x10, 0xcb, 0x42,
-  0xc8, 0x34, 0x55, 0xb5, 0x50, 0x20, 0x64, 0x75,
-  0x55, 0x92, 0x9c, 0x4e, 0x96, 0x45, 0xc8, 0xde,
-  0xfb, 0xd5, 0x55, 0xb7, 0x5b, 0x14, 0x79, 0xde,
-  0x30, 0xec, 0x39, 0x42, 0x21, 0x00, 0x4a, 0x59,
-  0xb6, 0xb2, 0x32, 0x95, 0x8a, 0xc7, 0x23, 0x11,
-  0x5d, 0x3f, 0x77, 0xee, 0xdc, 0xb9, 0x6f, 0xbe,
-  0x59, 0x5b, 0xb3, 0x2c, 0x42, 0x4c, 0xf3, 0xa5,
-  0x97, 0x36, 0xef, 0xcf, 0x2d, 0x02, 0xd8, 0x17,
-  0x8b, 0x61, 0xd8, 0xa7, 0x44, 0x6f, 0xef, 0x57,
-  0x5f, 0x8d, 0x8c, 0x8c, 0x8c, 0x70, 0x9c, 0xdf,
-  0xef, 0x72, 0x39, 0x9d, 0xe5, 0xe5, 0x33, 0x33,
-  0xbf, 0xfe, 0xfa, 0xdb, 0x6f, 0xe1, 0x70, 0x36,
-  0x9b, 0x4c, 0xae, 0xaf, 0x7b, 0xbd, 0x76, 0x6a,
-  0x99, 0xe6, 0xe2, 0xe2, 0xc2, 0x42, 0x38, 0xec,
-  0xf3, 0x85, 0x42, 0xa1, 0xd0, 0xec, 0xec, 0x8f,
-  0x3f, 0x62, 0x8c, 0x10, 0xc3, 0xec, 0xdf, 0x3f,
-  0x3c, 0x3c, 0x34, 0x34, 0x3c, 0xec, 0xf5, 0x5a,
-  0x16, 0x21, 0x84, 0xf4, 0xf5, 0xd9, 0xf3, 0x17,
-  0x6b, 0xe0, 0x1f, 0x00, 0xb8, 0x19, 0x24, 0x1c,
-  0x56, 0xd5, 0x7c, 0x3e, 0x9f, 0x8f, 0x44, 0x56,
-  0x57, 0x57, 0x57, 0x97, 0x96, 0x4a, 0x4a, 0x30,
-  0x06, 0x50, 0xd5, 0x07, 0x1f, 0xbc, 0x7c, 0x79,
-  0x7c, 0xfc, 0xbb, 0xef, 0x5e, 0x7c, 0x51, 0x51,
-  0xd2, 0xe9, 0xa9, 0xa9, 0xcf, 0x3f, 0x9f, 0x9a,
-  0x9a, 0x9a, 0xba, 0x70, 0xe1, 0xfd, 0xf7, 0x45,
-  0xb1, 0xa4, 0x84, 0x65, 0x5f, 0x7f, 0x5d, 0x96,
-  0x15, 0x25, 0x95, 0xd2, 0x34, 0x59, 0x96, 0x65,
-  0x59, 0x8e, 0x44, 0x8a, 0xf3, 0xdd, 0xaa, 0x1f,
-  0x5b, 0x06, 0x28, 0x9a, 0x5d, 0x6c, 0xaf, 0xbc,
-  0x72, 0xf6, 0xec, 0xc8, 0xc8, 0xe9, 0xd3, 0x95,
-  0x95, 0x0c, 0x43, 0x29, 0xc6, 0x3e, 0x5f, 0x57,
-  0x57, 0x57, 0xd7, 0x93, 0x4f, 0xf2, 0xbc, 0xcf,
-  0xe7, 0xf1, 0xec, 0xdd, 0xcb, 0x30, 0x1d, 0x1d,
-  0x9d, 0x9d, 0x4f, 0x3d, 0xe5, 0x70, 0x10, 0x42,
-  0x08, 0xc7, 0xed, 0xdc, 0x79, 0xea, 0xd4, 0xe0,
-  0xe0, 0xa7, 0x9f, 0xde, 0x76, 0x1b, 0x21, 0x84,
-  0x10, 0xf2, 0xc6, 0x1b, 0x5b, 0x5d, 0xbf, 0x68,
-  0x9b, 0x38, 0x85, 0xfe, 0xb7, 0xcd, 0xce, 0x2e,
-  0x2f, 0x0b, 0x42, 0x3c, 0x5e, 0x5e, 0xae, 0x28,
-  0x89, 0x04, 0x42, 0xd7, 0xaf, 0xcf, 0xcd, 0x5d,
-  0xb8, 0x00, 0xa0, 0xaa, 0xb2, 0xac, 0xeb, 0xff,
-  0xb1, 0x43, 0x0c, 0xc3, 0x00, 0x00, 0xac, 0xad,
-  0xc5, 0x62, 0x00, 0x00, 0x2b, 0x2b, 0x2b, 0x2b,
-  0xf3, 0xf3, 0x0c, 0x33, 0x38, 0x78, 0xf2, 0xe4,
-  0x89, 0x13, 0x5f, 0x7e, 0xf9, 0x77, 0x01, 0xb6,
-  0x1c, 0x81, 0x89, 0x89, 0xf3, 0xe7, 0xdf, 0x7e,
-  0x7b, 0x7c, 0xbc, 0xbd, 0xfd, 0xde, 0x7b, 0x0b,
-  0x05, 0x00, 0x97, 0x4b, 0x10, 0x42, 0x21, 0x4a,
-  0xdb, 0xdb, 0xdb, 0xdb, 0xbb, 0xbb, 0x01, 0x3a,
-  0x3a, 0x3a, 0x3a, 0x1e, 0x7b, 0x0c, 0xa0, 0xbe,
-  0xbe, 0xbe, 0x7e, 0xcf, 0x1e, 0x00, 0x9f, 0xcf,
-  0xed, 0xc6, 0x18, 0xa0, 0xa6, 0xa6, 0xba, 0x1a,
-  0x6d, 0xb9, 0x0b, 0xf9, 0x6f, 0xdb, 0xf0, 0x18,
-  0xdd, 0xc8, 0x2a, 0x2b, 0x2b, 0x2b, 0x3d, 0x1e,
-  0x55, 0x15, 0x04, 0x41, 0x08, 0x04, 0xba, 0xba,
-  0x58, 0x16, 0xe3, 0xa5, 0x25, 0x00, 0x9e, 0x17,
-  0x04, 0x9e, 0x07, 0xc8, 0xe5, 0x14, 0x25, 0x93,
-  0x01, 0xf8, 0xf9, 0xe7, 0xd1, 0xd1, 0x99, 0x19,
-  0x80, 0xab, 0x57, 0xaf, 0x5e, 0x0d, 0x87, 0xdf,
-  0x7c, 0x73, 0x66, 0x66, 0x66, 0x26, 0x1c, 0xfe,
-  0xe9, 0xa7, 0xbf, 0xbb, 0xfe, 0x96, 0x53, 0xe8,
-  0x4f, 0x7e, 0xdc, 0xd0, 0xd0, 0xd0, 0x70, 0xd7,
-  0x5d, 0xef, 0xbc, 0xd3, 0xd6, 0xd6, 0xd6, 0x56,
-  0x5e, 0x0e, 0xd0, 0xd4, 0xd4, 0xdc, 0xfc, 0xc4,
-  0x13, 0x7f, 0x01, 0x70, 0x1c, 0xc7, 0xc5, 0xe3,
-  0x00, 0x2d, 0x2d, 0x2d, 0x2d, 0x9a, 0x46, 0xa9,
-  0xfd, 0xdf, 0x5b, 0x6f, 0xd9, 0xfa, 0xee, 0xbb,
-  0xb6, 0x16, 0x93, 0x8e, 0x90, 0x5b, 0xf5, 0xe0,
-  0x16, 0x83, 0x29, 0x08, 0xb6, 0x8a, 0x62, 0x51,
-  0x5b, 0x5b, 0x5b, 0x5b, 0x77, 0xed, 0xda, 0xb3,
-  0xa7, 0xa7, 0xa7, 0xa7, 0x67, 0xff, 0xfe, 0xa1,
-  0xa1, 0xe9, 0xe9, 0xe9, 0xe9, 0x5c, 0xce, 0xef,
-  0xf7, 0xfb, 0x03, 0x81, 0xb2, 0x32, 0x80, 0x58,
-  0x2c, 0x1a, 0x4d, 0x24, 0x14, 0x65, 0xdf, 0xbe,
-  0x7d, 0xfb, 0x02, 0x01, 0x49, 0x3a, 0x76, 0xec,
-  0xd8, 0xb1, 0x4f, 0x3e, 0x69, 0x6b, 0xb3, 0x8b,
-  0x38, 0x91, 0xb0, 0xe7, 0xc9, 0xe7, 0x6d, 0x55,
-  0x55, 0x5b, 0x73, 0xb9, 0x9b, 0xc1, 0xb6, 0x0d,
-  0xa0, 0xa4, 0xe4, 0x66, 0x2d, 0x82, 0x78, 0xbd,
-  0xb6, 0x06, 0x02, 0xbd, 0xbd, 0xbd, 0xbd, 0x87,
-  0x0f, 0x9f, 0x3f, 0x9f, 0x4a, 0xa5, 0x52, 0xe9,
-  0xf4, 0xdc, 0x9c, 0xc7, 0xe3, 0xf1, 0xb8, 0xdd,
-  0xbb, 0x76, 0x9d, 0x39, 0x73, 0xe6, 0xcc, 0x17,
-  0x5f, 0x1c, 0x39, 0x62, 0x8f, 0x8b, 0xc7, 0x6d,
-  0x5d, 0x5f, 0xb7, 0x35, 0x95, 0xba, 0x19, 0x20,
-  0x99, 0xb4, 0x75, 0xe3, 0x5e, 0x79, 0x8b, 0xe5,
-  0xc4, 0xfc, 0x59, 0xfc, 0x3c, 0x6f, 0xab, 0xdd,
-  0x46, 0xfe, 0xf5, 0xce, 0x71, 0x37, 0x6b, 0x31,
-  0x35, 0x8a, 0x0e, 0x15, 0x6f, 0xe6, 0xe2, 0xce,
-  0x17, 0x2f, 0xb0, 0xad, 0x37, 0xf7, 0xff, 0x5a,
-  0xfb, 0x03, 0x24, 0x50, 0xc3, 0x51, 0x78, 0x54,
-  0xe6, 0x96, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
-  0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/dialog_warning.h
+++ b/art/tango/dialog_warning.h
@@ -1,265 +0,0 @@
-/* dialog_warning.png - 603 bytes */
-static const unsigned char dialog_warning_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd6, 0x02, 0x10, 0x0e, 0x27, 0x2d, 0xb7,
-  0xee, 0x92, 0x77, 0x00, 0x00, 0x01, 0xe8, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0xc1,
-  0x4a, 0x1b, 0x61, 0x14, 0x85, 0xbf, 0x3b, 0x99,
-  0xce, 0x34, 0x89, 0x33, 0x83, 0x10, 0x99, 0x4a,
-  0xed, 0x46, 0x43, 0xc4, 0x20, 0x86, 0x41, 0x4a,
-  0x9a, 0x30, 0x04, 0x82, 0x48, 0x63, 0x83, 0x74,
-  0x17, 0xba, 0x10, 0x22, 0x5d, 0x74, 0xe7, 0x30,
-  0x1b, 0xf1, 0x09, 0x5c, 0x1b, 0x74, 0x65, 0xc0,
-  0x42, 0xc0, 0x45, 0x49, 0x56, 0x05, 0xad, 0xaf,
-  0x50, 0x08, 0x3e, 0x80, 0x50, 0x5c, 0x04, 0x0a,
-  0x85, 0x16, 0x5c, 0xd4, 0x40, 0x49, 0x31, 0x7f,
-  0x37, 0xd6, 0x12, 0xc8, 0xb4, 0xf6, 0xc0, 0xbd,
-  0x8b, 0xcb, 0xe1, 0x3b, 0x67, 0x73, 0x85, 0x08,
-  0x85, 0xf0, 0xc8, 0x80, 0xb7, 0x00, 0x03, 0x78,
-  0xdd, 0x80, 0x2f, 0xe3, 0x7c, 0x7a, 0x14, 0xc0,
-  0x84, 0xa3, 0x79, 0x78, 0x0e, 0x70, 0x01, 0x47,
-  0x40, 0x75, 0x9c, 0x4f, 0x8b, 0x48, 0xf7, 0x52,
-  0xb0, 0x5a, 0x58, 0x58, 0xd0, 0x9e, 0xa4, 0x52,
-  0x5a, 0x0a, 0x56, 0x43, 0xf0, 0xee, 0x0d, 0x30,
-  0x61, 0x2f, 0x0d, 0x7a, 0x62, 0x77, 0x97, 0x4c,
-  0xb3, 0x49, 0x1a, 0x74, 0x13, 0xf6, 0xee, 0x05,
-  0x08, 0xa1, 0x38, 0x05, 0xc5, 0x6c, 0xb9, 0x2c,
-  0x7a, 0x3e, 0x8f, 0x9e, 0xcf, 0x93, 0x2d, 0x97,
-  0x65, 0x0a, 0x8a, 0x21, 0x14, 0xf9, 0x97, 0x76,
-  0xa0, 0x7b, 0x02, 0xc3, 0x5e, 0xa7, 0xa3, 0x3c,
-  0xcf, 0x53, 0x9e, 0xe7, 0xa9, 0x5e, 0xa7, 0xa3,
-  0x4e, 0x60, 0xb8, 0x03, 0xdd, 0xbf, 0x36, 0x08,
-  0x61, 0xc5, 0x85, 0xa5, 0x8c, 0xef, 0x8b, 0xe1,
-  0xfb, 0x38, 0x8e, 0x83, 0xe3, 0x38, 0x18, 0xbe,
-  0x4f, 0xc6, 0xf7, 0xc5, 0x85, 0xa5, 0x10, 0x56,
-  0x22, 0x01, 0x26, 0xec, 0x67, 0xc1, 0x48, 0x04,
-  0x01, 0xa2, 0x69, 0x58, 0x96, 0x85, 0x65, 0x59,
-  0x88, 0xa6, 0x91, 0x08, 0x02, 0xb2, 0x60, 0x98,
-  0xb0, 0x3f, 0x16, 0x10, 0xc2, 0xfa, 0x34, 0xa4,
-  0xe7, 0x0a, 0x05, 0x8c, 0x52, 0x09, 0x11, 0xc1,
-  0xb6, 0x6d, 0x6c, 0xdb, 0x46, 0x44, 0x30, 0x4a,
-  0x25, 0xe6, 0x0a, 0x05, 0xa6, 0x21, 0x1d, 0xc2,
-  0xfa, 0x08, 0x20, 0x04, 0x31, 0xa0, 0xb1, 0x78,
-  0x9b, 0xae, 0xe9, 0x3a, 0x22, 0xf2, 0xa7, 0x81,
-  0x08, 0x9a, 0xae, 0x93, 0x08, 0x02, 0x16, 0xc1,
-  0x30, 0xa0, 0x11, 0x82, 0xc0, 0xed, 0x0a, 0xe1,
-  0xd5, 0x2c, 0xb4, 0x5e, 0x2c, 0x2f, 0x1b, 0x93,
-  0x67, 0x67, 0x10, 0x8b, 0xa1, 0x94, 0xa2, 0xdf,
-  0xef, 0x03, 0x90, 0x4c, 0x26, 0x11, 0x11, 0xb8,
-  0xb9, 0xe1, 0x6a, 0x6d, 0x8d, 0x0f, 0xe7, 0xe7,
-  0x83, 0x4b, 0xa8, 0x37, 0xe0, 0x9d, 0x84, 0x10,
-  0x7b, 0x0c, 0x57, 0x4f, 0xc1, 0x9a, 0x3f, 0x3e,
-  0xe6, 0x61, 0xb5, 0x8a, 0x52, 0x0a, 0xa5, 0x14,
-  0xb5, 0x5a, 0x0d, 0x80, 0x76, 0xbb, 0x8d, 0x88,
-  0x20, 0x22, 0xfc, 0x38, 0x3d, 0xe5, 0x62, 0x63,
-  0x83, 0x2e, 0x7c, 0xff, 0x0c, 0x93, 0x9a, 0xc0,
-  0x66, 0x1c, 0xcc, 0x99, 0x5c, 0x8e, 0x78, 0xa5,
-  0x72, 0x67, 0x14, 0x11, 0x5c, 0xd7, 0xc5, 0x75,
-  0xdd, 0x91, 0x5b, 0xbc, 0x52, 0x61, 0x26, 0x97,
-  0x23, 0x0e, 0xa6, 0xc0, 0xa6, 0x6c, 0xc3, 0xd7,
-  0x97, 0x90, 0x9a, 0x3d, 0x38, 0x60, 0xa2, 0x5e,
-  0xbf, 0x4b, 0xff, 0x3d, 0xc0, 0x08, 0x40, 0x44,
-  0xb8, 0x6e, 0xb5, 0xb8, 0xdc, 0xda, 0xe2, 0x3d,
-  0x7c, 0x93, 0x43, 0x18, 0x3e, 0x03, 0x79, 0xc0,
-  0xff, 0xe9, 0x27, 0xf0, 0x11, 0x94, 0xfe, 0x09,
-  0x0e, 0x07, 0xf0, 0x66, 0x22, 0xe2, 0x2f, 0xa2,
-  0x74, 0x0d, 0xc3, 0x1e, 0x34, 0x7f, 0x01, 0x97,
-  0xde, 0x7d, 0x08, 0x1c, 0xb4, 0xe1, 0x13, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
-
-
-/* dialog_warning.png - 1456 bytes */
-static const unsigned char dialog_warning_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
-  0x3b, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0xcd, 0x4b, 0x54, 0x5d, 0x1c, 0x7e, 0xce,
-  0x39, 0xf7, 0xde, 0x99, 0x3b, 0xde, 0xf9, 0xf6,
-  0x6b, 0x66, 0xd4, 0x66, 0x98, 0x3b, 0x63, 0x3a,
-  0xca, 0x54, 0x33, 0xa1, 0x92, 0xd0, 0x62, 0x54,
-  0x0a, 0x84, 0xd2, 0x66, 0x23, 0xe8, 0x26, 0x84,
-  0xc0, 0x8d, 0x8b, 0xc0, 0x45, 0x86, 0x59, 0xb8,
-  0x91, 0xfa, 0x0b, 0x5a, 0xb7, 0x0a, 0x42, 0x21,
-  0xdb, 0x04, 0x12, 0x48, 0x2d, 0x14, 0xa2, 0x31,
-  0xd2, 0x42, 0xb2, 0x50, 0x98, 0x04, 0x1d, 0x50,
-  0x52, 0xc7, 0x99, 0x1c, 0xe7, 0xbe, 0x8b, 0xd3,
-  0xc5, 0xf7, 0xf5, 0xa3, 0x2f, 0xf3, 0xa5, 0x17,
-  0xde, 0xdf, 0xe6, 0x81, 0x73, 0xcf, 0x99, 0xdf,
-  0xf3, 0xfc, 0x3e, 0xce, 0xf9, 0x0d, 0xf0, 0xbf,
-  0x1d, 0x6c, 0x6d, 0x6d, 0x00, 0xc0, 0xd8, 0x71,
-  0xfb, 0xa1, 0xc7, 0x43, 0xbc, 0xa1, 0xa1, 0xa6,
-  0x06, 0x00, 0x52, 0xa9, 0xc1, 0x41, 0x4a, 0x29,
-  0x5d, 0x5c, 0xe4, 0xeb, 0x7e, 0xff, 0x1f, 0x2b,
-  0x80, 0x13, 0x54, 0x94, 0xaa, 0x2a, 0x00, 0x78,
-  0xf6, 0xec, 0xcc, 0x99, 0x68, 0x34, 0x1a, 0xb5,
-  0xd9, 0x2a, 0x2a, 0x42, 0xa1, 0x50, 0xc8, 0xe3,
-  0xa9, 0xad, 0x05, 0x80, 0x17, 0x2f, 0xfe, 0x58,
-  0x01, 0xbc, 0x58, 0xfa, 0xfa, 0x2c, 0x16, 0xaf,
-  0xd7, 0xeb, 0xcd, 0xe7, 0xfd, 0x7e, 0xa3, 0xd1,
-  0x68, 0x04, 0xa2, 0x51, 0x97, 0xcb, 0xe5, 0xa2,
-  0x54, 0x92, 0x24, 0x49, 0x92, 0x1c, 0x0e, 0x2e,
-  0xf4, 0xd2, 0xa5, 0xdf, 0xe6, 0xf7, 0xa8, 0x3f,
-  0xc0, 0x09, 0x39, 0x9d, 0x55, 0x55, 0x84, 0x10,
-  0x32, 0x32, 0xd2, 0xd2, 0x12, 0x8d, 0x46, 0xa3,
-  0x46, 0x23, 0x21, 0xd3, 0xd3, 0xd3, 0xd3, 0x00,
-  0xb0, 0xb9, 0xb9, 0xb9, 0x09, 0x58, 0xad, 0xaa,
-  0xaa, 0xaa, 0x8c, 0x65, 0xb3, 0xc9, 0x64, 0x32,
-  0x79, 0xf1, 0xa2, 0xd3, 0x09, 0x00, 0x77, 0xef,
-  0xbe, 0x7b, 0x07, 0x00, 0x9a, 0xf6, 0xab, 0xfe,
-  0x8f, 0x9c, 0x01, 0x51, 0x04, 0x80, 0x81, 0x81,
-  0xc2, 0x42, 0x9f, 0xcf, 0xe7, 0xd3, 0x34, 0x59,
-  0x5e, 0x5b, 0x5b, 0x5b, 0x03, 0x04, 0xa1, 0xb1,
-  0xb1, 0xb1, 0x11, 0xa0, 0xb4, 0xbe, 0xbe, 0xbe,
-  0x1e, 0xf0, 0x78, 0x14, 0x45, 0x51, 0x00, 0xb3,
-  0x59, 0x96, 0x65, 0x59, 0x96, 0x09, 0x01, 0x80,
-  0xab, 0x57, 0x8f, 0xea, 0x9f, 0x1c, 0x2d, 0xf2,
-  0x1e, 0x4f, 0x75, 0x35, 0x21, 0x84, 0x7c, 0xfc,
-  0xd8, 0xda, 0x1a, 0x8b, 0xc5, 0x62, 0xa2, 0x28,
-  0x49, 0x89, 0x44, 0x22, 0x01, 0x98, 0xcd, 0xa3,
-  0xa3, 0xa3, 0xa3, 0x00, 0x20, 0x49, 0x92, 0x04,
-  0x6c, 0x6c, 0x74, 0x74, 0x74, 0x74, 0x00, 0xeb,
-  0xeb, 0x1e, 0x8f, 0xc7, 0x03, 0x3c, 0x7d, 0x3a,
-  0x31, 0x31, 0x31, 0xb1, 0xb5, 0x35, 0x3b, 0xcb,
-  0x33, 0x38, 0x32, 0x02, 0x00, 0x5b, 0x5b, 0xff,
-  0x5a, 0x06, 0x4e, 0x9f, 0x06, 0x80, 0x27, 0x4f,
-  0x4e, 0x9c, 0xb0, 0xdb, 0xed, 0x76, 0x4a, 0x65,
-  0x39, 0x95, 0x4a, 0xa5, 0x00, 0x83, 0x21, 0x1e,
-  0x8f, 0xc7, 0x01, 0xc6, 0x5c, 0x2e, 0x97, 0x0b,
-  0x60, 0xcc, 0xe9, 0x74, 0x3a, 0x01, 0x49, 0x6a,
-  0x6d, 0x6d, 0x6d, 0x05, 0x9c, 0x4e, 0x42, 0x08,
-  0x01, 0x8a, 0x8b, 0x15, 0x45, 0x51, 0x04, 0x81,
-  0xf7, 0xce, 0xf5, 0xeb, 0x47, 0xcd, 0xc4, 0x4f,
-  0x46, 0x5e, 0x55, 0x6f, 0xde, 0xa4, 0x94, 0xd2,
-  0x2f, 0x5f, 0xa6, 0xa6, 0x9a, 0x9b, 0x9b, 0x9b,
-  0x35, 0xed, 0xe5, 0x4b, 0xb7, 0xdb, 0xed, 0xd6,
-  0xb4, 0xf7, 0xef, 0x13, 0x89, 0x44, 0x42, 0xd3,
-  0xcc, 0x66, 0xb3, 0xd9, 0x6c, 0xd6, 0x34, 0x9f,
-  0x8f, 0x97, 0xd6, 0x87, 0x0f, 0x33, 0x33, 0x33,
-  0x33, 0x9a, 0xf6, 0xea, 0x95, 0xaa, 0xaa, 0xaa,
-  0xa6, 0x4d, 0x4e, 0x36, 0x35, 0x35, 0x35, 0x69,
-  0xda, 0x8d, 0x1b, 0x00, 0x90, 0xcd, 0xf2, 0xdf,
-  0x75, 0x38, 0x8e, 0x3d, 0x03, 0xa7, 0x4e, 0x01,
-  0xc0, 0xe3, 0xc7, 0x5e, 0x6f, 0x20, 0x10, 0x08,
-  0x50, 0x2a, 0x8a, 0x4b, 0x4b, 0x4b, 0x4b, 0x80,
-  0x2c, 0x77, 0x77, 0x77, 0x77, 0x03, 0x94, 0x5a,
-  0x2c, 0x16, 0x0b, 0xa0, 0x28, 0x7a, 0xcd, 0x9b,
-  0xcd, 0x66, 0x33, 0x40, 0x69, 0x41, 0x41, 0x41,
-  0x01, 0x20, 0xcb, 0x9d, 0x9d, 0x9d, 0x9d, 0x40,
-  0x41, 0x01, 0x6f, 0xee, 0x8a, 0x0a, 0x9b, 0xcd,
-  0x66, 0xa3, 0x94, 0xf7, 0xd2, 0xed, 0xdb, 0xc7,
-  0x26, 0x80, 0x47, 0x28, 0x1c, 0xde, 0xd9, 0x61,
-  0x8c, 0x31, 0xbf, 0x3f, 0x1c, 0x2e, 0x2f, 0x2f,
-  0x2f, 0x67, 0x4c, 0xd3, 0x32, 0x99, 0x4c, 0x06,
-  0x30, 0x1a, 0x39, 0x31, 0xdd, 0x74, 0x01, 0x3a,
-  0x12, 0xc2, 0x4b, 0x47, 0x96, 0xbb, 0xba, 0xba,
-  0xba, 0x80, 0xed, 0xed, 0xd5, 0xd5, 0xd5, 0x55,
-  0xa0, 0xae, 0xae, 0xa1, 0xa1, 0xa1, 0x41, 0x10,
-  0x82, 0x41, 0x42, 0x08, 0xb9, 0x76, 0x8d, 0xfb,
-  0xa9, 0xa8, 0xf8, 0xed, 0x02, 0xc2, 0x61, 0x00,
-  0x18, 0x1d, 0x55, 0xd5, 0xca, 0xca, 0xca, 0x4a,
-  0xc6, 0x18, 0x4b, 0x26, 0x93, 0x49, 0x40, 0x96,
-  0x7b, 0x7b, 0x7b, 0x7b, 0x01, 0x42, 0x44, 0x51,
-  0x14, 0x77, 0x89, 0xea, 0x91, 0xb7, 0x58, 0x78,
-  0x46, 0xf4, 0x75, 0xc6, 0x0c, 0x06, 0x83, 0x01,
-  0x50, 0x94, 0x9e, 0x9e, 0x9e, 0x1e, 0x40, 0x10,
-  0x96, 0x97, 0x97, 0x97, 0x01, 0xbf, 0xdf, 0xe9,
-  0x74, 0x3a, 0x19, 0x33, 0x18, 0x00, 0xe0, 0xde,
-  0xbd, 0xdf, 0x26, 0x80, 0x47, 0xe4, 0xdc, 0x39,
-  0x40, 0x10, 0x04, 0xc1, 0xe3, 0xa9, 0xae, 0xe6,
-  0x0f, 0x13, 0x21, 0x26, 0x93, 0xc9, 0x04, 0x18,
-  0x8d, 0xbc, 0x39, 0x75, 0xdb, 0x2b, 0x60, 0xb7,
-  0x84, 0x28, 0xa5, 0x74, 0xf7, 0xbb, 0xc9, 0xd4,
-  0xde, 0xde, 0xde, 0x0e, 0xe4, 0xf3, 0xf9, 0x7c,
-  0x3e, 0x0f, 0x9c, 0x3d, 0x5b, 0x5f, 0x5f, 0x5f,
-  0x4f, 0x69, 0x30, 0xc8, 0x18, 0x63, 0x97, 0x2f,
-  0x73, 0xbf, 0xfc, 0xfd, 0xfe, 0x96, 0x7d, 0xf7,
-  0x1a, 0xbd, 0x75, 0x0b, 0x00, 0x3e, 0x7d, 0x3a,
-  0x79, 0xb2, 0xb6, 0xb6, 0xb6, 0xd6, 0xe5, 0x0a,
-  0x06, 0x79, 0xc9, 0x98, 0xcd, 0x43, 0x43, 0x43,
-  0x43, 0x80, 0x24, 0xd5, 0xd5, 0xd5, 0xd5, 0xed,
-  0x17, 0x90, 0x4e, 0xa7, 0xd3, 0xe9, 0x34, 0xbf,
-  0x44, 0x25, 0x09, 0x30, 0x1a, 0xf9, 0xcb, 0xac,
-  0x7f, 0xd7, 0x31, 0x9b, 0x1d, 0x1f, 0x1f, 0x1f,
-  0x07, 0xd6, 0xd7, 0x87, 0x87, 0x87, 0x87, 0x81,
-  0xd9, 0x59, 0xc6, 0x18, 0xcb, 0xe7, 0xdf, 0xbe,
-  0x4d, 0x24, 0x12, 0x89, 0xc5, 0xc5, 0xc1, 0x41,
-  0x00, 0xf0, 0xf9, 0x7e, 0x3a, 0x03, 0x3c, 0x02,
-  0x17, 0x2e, 0x50, 0x2a, 0x8a, 0xa2, 0x58, 0x58,
-  0x18, 0x0c, 0x16, 0x15, 0x15, 0x15, 0x01, 0x8c,
-  0xf9, 0x7c, 0x3e, 0xdf, 0xe1, 0xc4, 0x73, 0xb9,
-  0x5c, 0x2e, 0x97, 0x03, 0x62, 0xb1, 0x58, 0x2c,
-  0x16, 0x03, 0xe2, 0x71, 0x7e, 0xad, 0xee, 0x25,
-  0xae, 0x67, 0xc4, 0x64, 0x6a, 0x69, 0x69, 0x69,
-  0x01, 0x78, 0xb1, 0x01, 0xb5, 0xb5, 0x65, 0x65,
-  0x65, 0x65, 0x94, 0x72, 0xbf, 0x6e, 0x37, 0xe7,
-  0x71, 0xfe, 0xfc, 0x0f, 0x0b, 0xe0, 0x07, 0x08,
-  0xe1, 0xc9, 0x7b, 0xf0, 0xa0, 0xa6, 0x26, 0x14,
-  0x0a, 0x85, 0x44, 0x11, 0x58, 0x58, 0x58, 0x58,
-  0x00, 0x14, 0xa5, 0xaf, 0xaf, 0xaf, 0xef, 0x70,
-  0x42, 0x82, 0x20, 0x08, 0x82, 0x00, 0x94, 0x96,
-  0x96, 0x96, 0x96, 0x96, 0x02, 0x25, 0x25, 0x25,
-  0x25, 0x25, 0x25, 0xfb, 0xf7, 0xed, 0x3d, 0x6f,
-  0xb7, 0xf7, 0xf7, 0xf7, 0xf7, 0x03, 0xb9, 0xdc,
-  0xdc, 0xdc, 0xdc, 0x1c, 0x10, 0x89, 0x44, 0x22,
-  0x91, 0x88, 0x24, 0x71, 0x1e, 0x0f, 0x1f, 0x1e,
-  0x26, 0x40, 0x38, 0x78, 0x39, 0x1e, 0x37, 0x18,
-  0x24, 0x49, 0x92, 0x2c, 0x16, 0xaf, 0xd7, 0x66,
-  0xb3, 0xd9, 0x00, 0x51, 0x74, 0xbb, 0xdd, 0x6e,
-  0x40, 0x14, 0x03, 0x81, 0x40, 0xe0, 0x6f, 0x11,
-  0xd8, 0x43, 0x48, 0x17, 0x30, 0x36, 0x36, 0x36,
-  0x36, 0x36, 0x76, 0x38, 0xe1, 0xbd, 0x68, 0x32,
-  0xf1, 0x91, 0x63, 0x75, 0xd5, 0xe1, 0x70, 0x38,
-  0x00, 0x55, 0xe5, 0x0f, 0xe0, 0xeb, 0xd7, 0x46,
-  0xa3, 0xd1, 0x68, 0xb3, 0xb5, 0xb5, 0x65, 0x32,
-  0x99, 0xcc, 0x95, 0x2b, 0xfc, 0xc5, 0x7e, 0xf4,
-  0xe8, 0xd0, 0x1e, 0x18, 0x18, 0x00, 0x80, 0x54,
-  0x2a, 0x12, 0x09, 0x87, 0xc3, 0x61, 0xa7, 0xb3,
-  0xac, 0x8c, 0xdf, 0xd7, 0x9a, 0x36, 0x3f, 0x3f,
-  0x3f, 0x0f, 0x00, 0x9a, 0xf6, 0xeb, 0xa3, 0xd7,
-  0x8f, 0x9b, 0xc1, 0x50, 0x59, 0x59, 0x59, 0x09,
-  0x2c, 0x2d, 0x59, 0xad, 0x56, 0x2b, 0xf0, 0xfc,
-  0xf9, 0xd4, 0xd4, 0xd4, 0xd4, 0xca, 0xca, 0x9d,
-  0x3b, 0x00, 0x50, 0x5c, 0xfc, 0x8d, 0x0c, 0x10,
-  0x42, 0x88, 0x28, 0x12, 0xc2, 0x9b, 0x0e, 0xb0,
-  0xdb, 0xed, 0x76, 0x80, 0x31, 0x55, 0x55, 0xd5,
-  0xdd, 0x88, 0xed, 0xad, 0x7d, 0x7d, 0x6d, 0x6f,
-  0x64, 0xf7, 0xef, 0xfb, 0xf6, 0xfa, 0x6e, 0xc6,
-  0x78, 0xa0, 0xf2, 0xf9, 0x8d, 0x8d, 0x8d, 0x0d,
-  0x7d, 0xf7, 0xfe, 0x7f, 0x78, 0xfb, 0x04, 0xbc,
-  0x79, 0xa3, 0x69, 0x9a, 0xd6, 0xd3, 0xb3, 0xb3,
-  0x33, 0x39, 0x39, 0x39, 0x79, 0xff, 0xbe, 0xaa,
-  0x02, 0x80, 0xc9, 0x74, 0xfc, 0x31, 0x3f, 0xd8,
-  0x78, 0xd6, 0x37, 0x36, 0x66, 0x66, 0x80, 0x83,
-  0xa6, 0xd7, 0x9f, 0x9c, 0x46, 0xe9, 0xd7, 0xa6,
-  0xb7, 0x5a, 0xff, 0x89, 0x8a, 0xc2, 0x51, 0x17,
-  0xca, 0x9f, 0x23, 0x7d, 0xd8, 0xde, 0x3d, 0x97,
-  0xcf, 0x73, 0xdc, 0xde, 0xe6, 0x98, 0xcd, 0x72,
-  0x4c, 0xa7, 0x39, 0x7e, 0xfe, 0xcc, 0x71, 0x65,
-  0x85, 0xe3, 0xf7, 0xa7, 0xd3, 0x5f, 0x1e, 0xa7,
-  0xbf, 0x1e, 0xff, 0x7a, 0x9e, 0x17, 0xdb, 0x2e,
-  0xea, 0x02, 0x74, 0xd4, 0xf7, 0xe9, 0xc4, 0xbf,
-  0x7c, 0x39, 0x58, 0x40, 0x2e, 0x77, 0x34, 0x3e,
-  0xff, 0x41, 0xfb, 0x0b, 0xe8, 0x00, 0x80, 0xf8,
-  0x31, 0x40, 0x4e, 0x9f, 0x00, 0x00, 0x00, 0x00,
-  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
--- a/art/tango/document_new.h
+++ b/art/tango/document_new.h
@@ -1,191 +0,0 @@
-/* document_new.png - 477 bytes */
-static const unsigned char document_new_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xfc, 0x00, 0xe9, 0x00, 0x4f, 0x34,
-  0xd7, 0xb1, 0x0d, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x02, 0x12, 0x0e, 0x26, 0x1c, 0xd3,
-  0xb6, 0x19, 0x29, 0x00, 0x00, 0x01, 0x6a, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x90, 0x4f,
-  0x4b, 0x5b, 0x51, 0x10, 0xc5, 0x7f, 0x73, 0xef,
-  0x8d, 0x56, 0x24, 0x7d, 0x25, 0x82, 0xd0, 0xca,
-  0x5b, 0x16, 0xdc, 0xd4, 0xee, 0x5c, 0x66, 0xa9,
-  0x1b, 0xf3, 0x0d, 0xb2, 0x71, 0x59, 0xbf, 0x45,
-  0xde, 0xb2, 0xdd, 0x77, 0x23, 0x04, 0xc4, 0x82,
-  0xdf, 0xc0, 0x4d, 0x37, 0xdd, 0x2a, 0x85, 0x52,
-  0x4a, 0xb2, 0x52, 0x4a, 0x49, 0x5a, 0x84, 0x10,
-  0xff, 0x45, 0x62, 0x9b, 0xde, 0x77, 0xc7, 0x85,
-  0x26, 0xc6, 0x18, 0x93, 0x54, 0x7a, 0x36, 0x33,
-  0x0c, 0x73, 0xe6, 0x9c, 0x33, 0x52, 0x2e, 0x97,
-  0xb7, 0x6b, 0xb5, 0x5a, 0x91, 0x11, 0x98, 0x9d,
-  0xfd, 0xcb, 0xdc, 0x5c, 0x9b, 0x67, 0xd1, 0x6f,
-  0xf2, 0xcb, 0x9f, 0xdf, 0xe5, 0xa2, 0x6f, 0x1f,
-  0xe1, 0xcf, 0xbe, 0x64, 0xc3, 0x19, 0xa5, 0x52,
-  0x49, 0xc7, 0xe1, 0xfc, 0x78, 0x53, 0x2f, 0x4f,
-  0xdf, 0x68, 0xe7, 0xbc, 0xa0, 0x97, 0x27, 0x2b,
-  0x9d, 0x8b, 0xc6, 0xe2, 0xae, 0xb6, 0xb2, 0xeb,
-  0xda, 0x32, 0x33, 0xae, 0xab, 0xd2, 0x6c, 0x36,
-  0x09, 0x21, 0x00, 0x20, 0x22, 0x3d, 0xf5, 0x8c,
-  0xd9, 0x63, 0xda, 0x7e, 0x21, 0xe3, 0xbe, 0x22,
-  0x66, 0x09, 0xeb, 0x4c, 0x26, 0xd8, 0xf6, 0x6a,
-  0xc7, 0xb7, 0x5b, 0x53, 0xce, 0x57, 0x7b, 0x07,
-  0x06, 0xc9, 0xdd, 0x6a, 0xe4, 0x08, 0x6b, 0xea,
-  0x88, 0x79, 0x85, 0xb8, 0x02, 0x60, 0x31, 0x2a,
-  0x46, 0xd3, 0x5f, 0x8b, 0xe0, 0x5e, 0xba, 0xfe,
-  0xac, 0x83, 0xe4, 0xeb, 0x5e, 0x6f, 0x3a, 0x0b,
-  0x4c, 0x81, 0x38, 0x10, 0x0b, 0x82, 0x00, 0x17,
-  0x6e, 0x34, 0x59, 0x08, 0x3a, 0x4f, 0xd0, 0xe7,
-  0xd8, 0x50, 0x45, 0xd3, 0x69, 0x40, 0xd0, 0xb4,
-  0xa2, 0xde, 0x9b, 0x7a, 0xc6, 0xa6, 0x15, 0xf7,
-  0xd0, 0xe7, 0xbb, 0x87, 0x02, 0xaf, 0xf1, 0xe1,
-  0x27, 0xe0, 0xb1, 0x5a, 0x01, 0x14, 0xef, 0x5f,
-  0xe8, 0xe9, 0x59, 0xeb, 0xd3, 0xcc, 0xfc, 0xf7,
-  0x83, 0x91, 0x11, 0x44, 0x04, 0xe5, 0x29, 0x1d,
-  0x5d, 0x43, 0x75, 0x81, 0x34, 0xfd, 0x01, 0x3c,
-  0x61, 0x6b, 0xe7, 0xd0, 0x6c, 0x6c, 0x6c, 0xbf,
-  0x05, 0x70, 0xa3, 0xc8, 0xb7, 0x35, 0x8b, 0xd7,
-  0x3c, 0x22, 0x42, 0x14, 0x45, 0x34, 0x1a, 0x49,
-  0x4f, 0xd4, 0x30, 0x21, 0xfa, 0x7f, 0xd3, 0x8f,
-  0x7b, 0x11, 0x86, 0x39, 0x78, 0x88, 0x7c, 0xc7,
-  0xc1, 0xb0, 0xa5, 0xc1, 0xd9, 0xb0, 0x1d, 0x33,
-  0xa9, 0xdd, 0xb1, 0x11, 0x72, 0xb9, 0x1c, 0x8f,
-  0x81, 0x8b, 0xe3, 0xf8, 0x43, 0x92, 0x24, 0xc5,
-  0x7f, 0x21, 0xc5, 0x71, 0xfc, 0x9e, 0xff, 0x85,
-  0x2b, 0xcc, 0x3d, 0x99, 0x60, 0x7b, 0xac, 0x14,
-  0xc9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
-  0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* document_new.png - 999 bytes */
-static const unsigned char document_new_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xfc, 0x00, 0xe9, 0x00, 0x4f, 0x34,
-  0xd7, 0xb1, 0x0d, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x03,
-  0x72, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
-  0x57, 0xcf, 0x4f, 0x13, 0x41, 0x14, 0xfe, 0xde,
-  0x4c, 0xb7, 0x84, 0x12, 0x95, 0x50, 0x68, 0x6d,
-  0x4c, 0x3c, 0x79, 0x30, 0xc4, 0x93, 0x89, 0x11,
-  0x48, 0xf8, 0x07, 0xb8, 0x70, 0xe0, 0xc4, 0xcd,
-  0x78, 0xe5, 0x4c, 0x48, 0x8c, 0x5c, 0x8c, 0x1a,
-  0x7f, 0xfc, 0x13, 0x1e, 0xb8, 0x18, 0x0f, 0x86,
-  0xbb, 0xc1, 0x90, 0x90, 0x00, 0x25, 0x5c, 0x20,
-  0xc0, 0x09, 0x7a, 0x81, 0xa6, 0xd0, 0x84, 0x10,
-  0x52, 0x6b, 0xdb, 0xc5, 0x79, 0x1e, 0x9e, 0xe3,
-  0xee, 0x4e, 0xbb, 0xd8, 0x4a, 0xd5, 0xf8, 0x92,
-  0xed, 0xec, 0xfc, 0xd8, 0x99, 0xef, 0x7b, 0xef,
-  0x7b, 0x6f, 0xbb, 0xc0, 0x7f, 0x6e, 0xf4, 0xaf,
-  0x01, 0x58, 0xbb, 0xb8, 0x38, 0x3e, 0x9e, 0x9c,
-  0xa4, 0x1f, 0x78, 0x3c, 0x4f, 0x5a, 0xdf, 0x4f,
-  0x24, 0xb2, 0xd9, 0xc5, 0x45, 0xe6, 0x8e, 0x09,
-  0xbc, 0x7a, 0xf5, 0xe6, 0xcd, 0x8b, 0x17, 0xcf,
-  0x9e, 0x49, 0x6f, 0x7e, 0xfe, 0x4f, 0x01, 0x57,
-  0x8a, 0xc8, 0x18, 0x20, 0x9d, 0xee, 0xef, 0xaf,
-  0xd5, 0x80, 0x5c, 0x6e, 0x68, 0xa8, 0x52, 0x01,
-  0xb4, 0x56, 0x8a, 0x19, 0xa8, 0xd7, 0x1b, 0x0d,
-  0xa5, 0xde, 0xbd, 0x9b, 0x98, 0x18, 0x1f, 0x2f,
-  0x14, 0x66, 0x66, 0x84, 0x50, 0xb5, 0x6a, 0x9f,
-  0x4f, 0x5c, 0xbe, 0xfd, 0xfc, 0xfc, 0xdc, 0xdc,
-  0xec, 0xec, 0x93, 0x27, 0xdd, 0x07, 0xce, 0xcc,
-  0xec, 0xfb, 0xe2, 0xe5, 0xdd, 0x5d, 0xc0, 0x98,
-  0x6a, 0x75, 0x69, 0x09, 0xf0, 0x7d, 0xe6, 0x74,
-  0x1a, 0x60, 0x06, 0x52, 0x29, 0xe0, 0xf4, 0xf4,
-  0xe4, 0x64, 0x6f, 0xef, 0xd1, 0x23, 0x66, 0x40,
-  0xeb, 0xcf, 0x9f, 0x25, 0x52, 0xef, 0xdf, 0x0b,
-  0x91, 0x7a, 0x3d, 0xd1, 0xee, 0x81, 0x85, 0x42,
-  0xa1, 0x50, 0x28, 0x00, 0x5a, 0x6b, 0xad, 0xb5,
-  0x00, 0x60, 0x06, 0x88, 0x88, 0x88, 0x82, 0xd6,
-  0x5a, 0xdc, 0xb8, 0x80, 0x07, 0x3c, 0x8f, 0xa8,
-  0x58, 0x04, 0x52, 0x29, 0xa5, 0x3e, 0x7d, 0x02,
-  0xb4, 0xf6, 0xbc, 0xde, 0x5e, 0x80, 0x39, 0x99,
-  0x9c, 0x9a, 0x02, 0x88, 0xb4, 0x1e, 0x18, 0x00,
-  0xae, 0x5f, 0x1f, 0x1c, 0x5c, 0x5e, 0x06, 0x98,
-  0x8d, 0xf9, 0xf0, 0x61, 0x7a, 0x9a, 0x88, 0xf9,
-  0xec, 0x6c, 0x73, 0x53, 0x76, 0xda, 0xd9, 0x51,
-  0xed, 0x12, 0x70, 0x01, 0xb9, 0xc0, 0x2c, 0x21,
-  0xb9, 0x0b, 0xfa, 0xcc, 0xc6, 0xd8, 0xbe, 0x5d,
-  0xfb, 0xed, 0x9b, 0x48, 0xa7, 0x52, 0x91, 0x7d,
-  0xea, 0x75, 0x80, 0x99, 0x68, 0x70, 0x50, 0x44,
-  0x35, 0x30, 0x60, 0xe5, 0x25, 0x6d, 0x4f, 0x8f,
-  0x7d, 0x2e, 0x95, 0x92, 0xbb, 0x1b, 0x37, 0x7e,
-  0x4a, 0xb0, 0x5b, 0x04, 0x00, 0xdb, 0x73, 0xd7,
-  0x29, 0x45, 0x04, 0x28, 0x25, 0x70, 0x88, 0x88,
-  0xb4, 0x06, 0x8c, 0x21, 0xba, 0x76, 0x0d, 0x30,
-  0x06, 0x18, 0x1a, 0x02, 0x88, 0x2e, 0x2e, 0x0e,
-  0x0e, 0x44, 0x52, 0x2b, 0x2b, 0x00, 0x60, 0xcc,
-  0xf1, 0x31, 0xd0, 0x68, 0xd4, 0x6a, 0xf9, 0x3c,
-  0x40, 0xc4, 0xfc, 0xe5, 0xcb, 0xf6, 0xb6, 0x9c,
-  0x71, 0x7a, 0x7a, 0x65, 0x02, 0x4a, 0x09, 0xa4,
-  0xa0, 0x1f, 0xcc, 0x87, 0xc7, 0x03, 0xa2, 0x32,
-  0xae, 0x94, 0x25, 0x00, 0xdc, 0xbc, 0x09, 0xd4,
-  0x6a, 0xc0, 0xe8, 0x28, 0xd0, 0x68, 0x30, 0xdf,
-  0xb9, 0x03, 0x00, 0x8d, 0xc6, 0xc6, 0x06, 0x90,
-  0x48, 0xf8, 0xfe, 0xc7, 0x8f, 0xc0, 0xc1, 0xc1,
-  0xfe, 0xfe, 0xe1, 0xa1, 0xb8, 0xc7, 0x98, 0x85,
-  0x05, 0x41, 0x53, 0x2c, 0x5a, 0x5c, 0x6d, 0xe7,
-  0x80, 0x0b, 0xbc, 0x39, 0x07, 0x6c, 0x0c, 0xec,
-  0x6f, 0x73, 0xa4, 0xa4, 0x95, 0x88, 0x10, 0x01,
-  0xc9, 0xa4, 0x48, 0xe7, 0xd6, 0x2d, 0xc0, 0xf7,
-  0x81, 0x74, 0x5a, 0xe4, 0x35, 0x3c, 0x0c, 0xf4,
-  0xf6, 0xf6, 0xf5, 0x79, 0x1e, 0x90, 0xcf, 0x6f,
-  0x6f, 0x9f, 0x9f, 0x03, 0xf7, 0xef, 0xdf, 0xbd,
-  0x5b, 0x2c, 0x6e, 0x6d, 0xc9, 0x4e, 0x5f, 0xbf,
-  0x76, 0x1c, 0x81, 0x8d, 0x8d, 0xcd, 0xcd, 0x7c,
-  0x3e, 0x3e, 0x22, 0x56, 0x3a, 0x6e, 0x64, 0x9a,
-  0x5b, 0x7b, 0x05, 0x91, 0x92, 0xa2, 0xa0, 0x54,
-  0x5f, 0x1f, 0xc0, 0xac, 0xf5, 0xed, 0xdb, 0x00,
-  0x51, 0x32, 0x79, 0xef, 0x1e, 0x50, 0xa9, 0x54,
-  0xab, 0x9e, 0x07, 0xd8, 0xf2, 0xe9, 0xbe, 0x17,
-  0xda, 0x26, 0xf0, 0xf0, 0xe1, 0x83, 0x07, 0x23,
-  0x23, 0x40, 0x2e, 0x97, 0xcb, 0xe5, 0x72, 0x97,
-  0x6b, 0xdc, 0xb6, 0x51, 0x22, 0xd6, 0xf3, 0x61,
-  0xba, 0x51, 0x09, 0xca, 0xfa, 0x20, 0x9b, 0xdc,
-  0xec, 0x6a, 0x65, 0x1d, 0x4b, 0xa8, 0x54, 0x2a,
-  0x95, 0x4a, 0xa5, 0xf0, 0xc1, 0xcc, 0x16, 0xba,
-  0xfd, 0x75, 0xa5, 0x12, 0x7e, 0x3e, 0x48, 0xf2,
-  0x60, 0x3c, 0x0a, 0xf4, 0x32, 0xb8, 0x5d, 0x20,
-  0xe0, 0xb6, 0xcc, 0x44, 0x36, 0x17, 0x5c, 0x40,
-  0xad, 0xa5, 0x16, 0x47, 0xc8, 0x3a, 0xa4, 0x13,
-  0xf8, 0x1d, 0x10, 0x68, 0x3e, 0x58, 0xcc, 0x56,
-  0x9f, 0xb0, 0xf7, 0xa3, 0x52, 0x91, 0x48, 0x04,
-  0xf3, 0xee, 0xfa, 0xa8, 0xdf, 0xc3, 0xeb, 0xdb,
-  0xb1, 0xb6, 0xf9, 0xae, 0xad, 0xad, 0xaf, 0xaf,
-  0xae, 0xfe, 0xda, 0x83, 0xc1, 0x78, 0x6b, 0xe0,
-  0x71, 0x39, 0x40, 0xe4, 0x66, 0x51, 0x97, 0x09,
-  0x8c, 0x8e, 0x8e, 0x8c, 0x8c, 0x8d, 0x01, 0x99,
-  0x4c, 0x26, 0x93, 0xc9, 0xb4, 0xaa, 0xff, 0x56,
-  0xf3, 0x36, 0xa9, 0xe5, 0x0a, 0x27, 0xaf, 0x8d,
-  0x8e, 0xcc, 0xb9, 0xe3, 0xd1, 0xf9, 0x76, 0xad,
-  0xe3, 0x1c, 0x28, 0x97, 0xcb, 0xe5, 0x72, 0x39,
-  0xbe, 0x8c, 0xba, 0x11, 0x89, 0xee, 0xd1, 0x4c,
-  0x28, 0x2e, 0xa2, 0x5d, 0x27, 0x70, 0x19, 0x35,
-  0x5b, 0x2e, 0xdd, 0xe3, 0xa3, 0x80, 0xc3, 0x50,
-  0x5b, 0xad, 0x0b, 0xbf, 0x02, 0xff, 0x20, 0x81,
-  0x66, 0xcf, 0x05, 0x00, 0x5d, 0x60, 0xd1, 0xb8,
-  0x34, 0x03, 0x0d, 0xef, 0x47, 0xc4, 0x1c, 0x9d,
-  0xff, 0x4b, 0x11, 0x68, 0xae, 0x22, 0xee, 0x5f,
-  0x0b, 0xb7, 0xda, 0x44, 0x81, 0x87, 0x23, 0x15,
-  0xdd, 0xb1, 0xcb, 0x04, 0xb2, 0xd9, 0x6c, 0x36,
-  0x9b, 0xbd, 0x2a, 0xdd, 0xee, 0x5b, 0x2c, 0x01,
-  0x63, 0x8c, 0x31, 0xe6, 0xf9, 0xf3, 0xd7, 0xaf,
-  0xdf, 0xbe, 0x7d, 0xf9, 0xf2, 0xe9, 0xd3, 0x7f,
-  0x05, 0xf0, 0xe8, 0xe8, 0xf0, 0xb0, 0x58, 0x7c,
-  0xfc, 0x38, 0x6e, 0xfe, 0x37, 0x3f, 0xea, 0x3b,
-  0x7b, 0xdd, 0x5f, 0xdd, 0xe2, 0x3f, 0xea, 0xff,
-  0x7b, 0xfb, 0x0e, 0x30, 0x0d, 0x2c, 0x47, 0xc0,
-  0x05, 0x25, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x49,
-  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/document_open.h
+++ b/art/tango/document_open.h
@@ -1,274 +0,0 @@
-/* document_open.png - 537 bytes */
-static const unsigned char document_open_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0b, 0x15, 0x11, 0x32, 0x0d, 0x10,
-  0x15, 0x50, 0x0b, 0x00, 0x00, 0x01, 0xa6, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x91, 0xbf,
-  0x4f, 0x53, 0x51, 0x14, 0xc7, 0x3f, 0x2f, 0x7d,
-  0xa8, 0xef, 0xd1, 0x06, 0x0b, 0x0c, 0x4d, 0x4c,
-  0x37, 0x19, 0x60, 0x73, 0x42, 0x13, 0x23, 0x03,
-  0x83, 0x7f, 0x00, 0x08, 0x46, 0x06, 0x24, 0x0c,
-  0x12, 0x10, 0x1c, 0xdc, 0x0c, 0x04, 0x06, 0x17,
-  0x07, 0x16, 0x36, 0x13, 0x7e, 0x0e, 0x04, 0xd4,
-  0x30, 0x03, 0xd1, 0x41, 0x47, 0x06, 0x13, 0x12,
-  0x0c, 0x6c, 0x84, 0x68, 0x4c, 0x84, 0x26, 0x6d,
-  0x6d, 0xe0, 0xbd, 0xe7, 0xed, 0xbb, 0xf7, 0x38,
-  0xb4, 0x69, 0xad, 0x79, 0x4d, 0x31, 0x7e, 0x72,
-  0x93, 0x7b, 0x4f, 0xce, 0x3d, 0xdf, 0xf3, 0xbd,
-  0xe7, 0x5a, 0x0f, 0x06, 0xfb, 0x66, 0x53, 0xa9,
-  0xd4, 0x1c, 0x7f, 0xa1, 0x94, 0x2a, 0xed, 0xbf,
-  0xd4, 0xd8, 0xca, 0xf2, 0xda, 0x6b, 0xea, 0x60,
-  0x4d, 0x3e, 0x9b, 0x90, 0x91, 0xe1, 0xd1, 0xc8,
-  0x64, 0x10, 0xf8, 0x2c, 0xad, 0x2c, 0x52, 0x28,
-  0x14, 0x1e, 0xbd, 0x7b, 0xb3, 0xb5, 0x11, 0x29,
-  0x30, 0xfe, 0x74, 0x4c, 0x06, 0xfa, 0x07, 0x39,
-  0x3c, 0x3a, 0x04, 0xc0, 0x6e, 0x8a, 0x91, 0x48,
-  0xc4, 0x69, 0x44, 0x2e, 0x9f, 0x7d, 0x39, 0xfe,
-  0x64, 0x6a, 0xc6, 0xd6, 0x5a, 0xe3, 0x38, 0x2e,
-  0xd7, 0x5b, 0x92, 0x25, 0xc5, 0x98, 0xe1, 0xe1,
-  0xc0, 0x50, 0x43, 0x81, 0xcd, 0xb7, 0xeb, 0xd3,
-  0xc0, 0x8c, 0xad, 0x94, 0xc2, 0xf7, 0x3d, 0xf2,
-  0x3f, 0x73, 0x00, 0x24, 0x5b, 0x5b, 0x00, 0xf0,
-  0xbc, 0x8b, 0xba, 0xc5, 0xae, 0xdb, 0x5c, 0x39,
-  0xdb, 0x61, 0x18, 0xd6, 0x38, 0x00, 0x53, 0x49,
-  0x1e, 0x95, 0x9f, 0xf5, 0x27, 0x9d, 0x9d, 0x5d,
-  0x35, 0xb1, 0x0d, 0x44, 0x3a, 0x88, 0xba, 0x1c,
-  0xc5, 0xa5, 0x1d, 0xc4, 0xe3, 0x09, 0xd2, 0xe9,
-  0x74, 0xb4, 0x80, 0xef, 0x7b, 0xbc, 0xff, 0x72,
-  0xce, 0x41, 0xc6, 0x05, 0x60, 0xfe, 0xc3, 0x7a,
-  0x9d, 0x7e, 0x9f, 0x6b, 0xa2, 0xde, 0x89, 0x25,
-  0xb1, 0x01, 0x1c, 0xc7, 0xe5, 0x20, 0xe3, 0xb2,
-  0xf0, 0xfc, 0x3e, 0x81, 0xd2, 0x5c, 0x86, 0x6b,
-  0x57, 0x62, 0x4c, 0xcd, 0xef, 0x56, 0x67, 0x00,
-  0xf0, 0x23, 0x17, 0x70, 0x7c, 0x76, 0xd1, 0xb0,
-  0x58, 0x6b, 0x43, 0xba, 0xdd, 0xad, 0x0e, 0xd1,
-  0x71, 0x4a, 0x81, 0x00, 0x22, 0x82, 0x65, 0x59,
-  0x88, 0x08, 0x22, 0x60, 0x44, 0xd0, 0x46, 0x08,
-  0xb5, 0x50, 0xd4, 0x06, 0x15, 0x1a, 0x42, 0x2d,
-  0xb4, 0x25, 0xae, 0xd6, 0xfe, 0xc2, 0xcd, 0xa4,
-  0x4f, 0xf6, 0x5c, 0xf1, 0x3d, 0xeb, 0x83, 0x58,
-  0x18, 0x84, 0xf2, 0x42, 0x04, 0x04, 0x41, 0xa4,
-  0x2c, 0x0c, 0x04, 0x45, 0x53, 0x15, 0x38, 0xcd,
-  0x9c, 0x71, 0xeb, 0xce, 0x5d, 0xf6, 0x4f, 0xf2,
-  0xe5, 0xa2, 0x52, 0x77, 0x11, 0x30, 0x08, 0x82,
-  0x05, 0x22, 0x15, 0x57, 0xdd, 0x1d, 0xad, 0xec,
-  0x6e, 0xef, 0x90, 0x0c, 0xbe, 0xad, 0x5a, 0xf7,
-  0x1e, 0xbf, 0xfa, 0xe8, 0x35, 0xdd, 0xe8, 0xe1,
-  0x1f, 0x69, 0x2e, 0x7e, 0xdd, 0xfb, 0xb4, 0xfa,
-  0xe2, 0x36, 0xff, 0xcb, 0x6f, 0x37, 0x66, 0xca,
-  0x8b, 0x19, 0x6f, 0x71, 0x8b, 0x00, 0x00, 0x00,
-  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
-  0x82};
-
-
-/* document_open.png - 1596 bytes */
-static const unsigned char document_open_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
-  0xc7, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x56, 0x4d, 0x4c, 0x13, 0x5b, 0x14, 0xfe, 0x66,
-  0x5a, 0xe8, 0x74, 0xa6, 0xa5, 0x94, 0xc2, 0x00,
-  0xa5, 0xa0, 0x08, 0x51, 0x94, 0xbf, 0x18, 0x34,
-  0x28, 0x9a, 0x98, 0x98, 0xb8, 0x35, 0x31, 0x0f,
-  0x35, 0x2e, 0x48, 0x4c, 0x8c, 0x6b, 0x35, 0x1a,
-  0x77, 0x6a, 0xa2, 0x6e, 0x95, 0x9d, 0x0b, 0x5d,
-  0x90, 0xa0, 0xa0, 0x84, 0x9f, 0xc4, 0x44, 0x16,
-  0x24, 0xba, 0x70, 0x61, 0x64, 0x21, 0x7f, 0x15,
-  0x2a, 0x7f, 0x5a, 0x08, 0xa4, 0x2d, 0x50, 0x6a,
-  0x99, 0xb6, 0x40, 0x3b, 0x7f, 0x6f, 0x71, 0x33,
-  0x4e, 0x5b, 0x40, 0x14, 0xf5, 0xbd, 0xbc, 0xe4,
-  0x7d, 0x49, 0x7b, 0x67, 0xee, 0xdc, 0x33, 0x73,
-  0xbe, 0x73, 0xbe, 0x7b, 0xcf, 0x01, 0xfe, 0xe3,
-  0xa0, 0x76, 0x6a, 0xd8, 0xda, 0xfa, 0xec, 0x59,
-  0x4b, 0xcb, 0xb9, 0x73, 0x00, 0x45, 0x01, 0x1d,
-  0x1d, 0xb2, 0x2c, 0x49, 0xb2, 0x0c, 0xa8, 0x2a,
-  0xf9, 0xed, 0xd8, 0x21, 0x8a, 0xfc, 0xb4, 0xf7,
-  0xa8, 0xaa, 0xaa, 0x02, 0xf7, 0xef, 0x5f, 0xba,
-  0x74, 0xf1, 0xe2, 0xe5, 0xcb, 0xb7, 0x6e, 0xfd,
-  0x36, 0xe6, 0x9d, 0x9d, 0x3d, 0x3d, 0xcf, 0x9f,
-  0xab, 0x7f, 0x0c, 0x82, 0x20, 0x08, 0x82, 0xa0,
-  0xaa, 0xad, 0xad, 0x6d, 0x6d, 0x2d, 0x2d, 0x5b,
-  0x87, 0xc4, 0xa8, 0x5d, 0x34, 0x35, 0x35, 0x35,
-  0x35, 0x35, 0xd5, 0xd5, 0x29, 0x0a, 0x20, 0xcb,
-  0xbd, 0xbd, 0x14, 0x45, 0x51, 0x34, 0x9d, 0x1c,
-  0x17, 0xf2, 0xcf, 0xb2, 0x2c, 0x6b, 0x36, 0xd3,
-  0xb4, 0x24, 0x89, 0xa2, 0x2c, 0xeb, 0x2f, 0x92,
-  0x65, 0x59, 0x96, 0xa4, 0xe4, 0xd5, 0x3f, 0x07,
-  0x45, 0x51, 0x14, 0x45, 0xd1, 0xef, 0x25, 0x49,
-  0x92, 0x44, 0x11, 0xc8, 0xcc, 0xcc, 0xcc, 0xcc,
-  0xcc, 0xdc, 0xda, 0xee, 0x1b, 0x01, 0x41, 0x10,
-  0x84, 0x70, 0xf8, 0xf1, 0xe3, 0x2b, 0x57, 0xae,
-  0x5e, 0xbd, 0x76, 0x2d, 0x3f, 0x7f, 0x2b, 0x83,
-  0x85, 0x85, 0xc5, 0x45, 0xbf, 0x1f, 0x70, 0x3a,
-  0x9d, 0xce, 0xa2, 0x22, 0x7d, 0x7e, 0x68, 0x68,
-  0x68, 0x68, 0x68, 0x08, 0xf0, 0xf9, 0xfc, 0x7e,
-  0xbf, 0x1f, 0xa0, 0x69, 0x8a, 0xd2, 0x69, 0x03,
-  0x9b, 0x09, 0x2b, 0xf9, 0x89, 0xa2, 0x10, 0xb1,
-  0xd8, 0xed, 0x76, 0x7b, 0x76, 0x36, 0x50, 0x55,
-  0x55, 0x59, 0x59, 0x55, 0xb5, 0x91, 0xd8, 0x96,
-  0x04, 0x14, 0x05, 0x50, 0x55, 0x49, 0x8a, 0x46,
-  0xa3, 0xd1, 0x68, 0x14, 0x18, 0x1c, 0x1c, 0x18,
-  0x18, 0x18, 0xd0, 0x17, 0xb2, 0x2c, 0xc7, 0xb1,
-  0x2c, 0xe0, 0x72, 0x95, 0x94, 0x38, 0x9d, 0x40,
-  0x43, 0xc3, 0x91, 0x23, 0xc7, 0x8e, 0x01, 0xe1,
-  0x70, 0x38, 0x1c, 0x0a, 0x01, 0xe5, 0xe5, 0xe5,
-  0xe5, 0xe5, 0xe5, 0x40, 0x45, 0x45, 0x45, 0xc5,
-  0xbe, 0x7d, 0x00, 0x4d, 0xd3, 0xb4, 0xc1, 0x90,
-  0xec, 0xa0, 0xa2, 0x68, 0x9a, 0xd6, 0xa8, 0x24,
-  0xcf, 0x6b, 0xf7, 0x46, 0xa3, 0xd1, 0x68, 0x34,
-  0x92, 0x40, 0x04, 0x02, 0x24, 0x13, 0x5a, 0x66,
-  0xb7, 0x21, 0x20, 0xcb, 0x8a, 0xb2, 0xb2, 0x62,
-  0x32, 0x31, 0x8c, 0xcd, 0x06, 0x38, 0x1c, 0x0e,
-  0x47, 0x6e, 0xae, 0xbe, 0xd0, 0xe1, 0xe0, 0xf9,
-  0xec, 0x6c, 0xa0, 0xa1, 0xa1, 0xbe, 0xfe, 0xf8,
-  0x71, 0x20, 0x16, 0x8b, 0xc5, 0x62, 0x31, 0x60,
-  0x76, 0x76, 0x76, 0x76, 0x76, 0x16, 0xf8, 0xf0,
-  0x81, 0x10, 0x66, 0x18, 0xb3, 0xd9, 0x6c, 0xde,
-  0x3c, 0xca, 0x9a, 0x34, 0x92, 0x1d, 0x32, 0x99,
-  0x88, 0x44, 0x76, 0xed, 0x2a, 0x29, 0x29, 0x29,
-  0x01, 0x2a, 0x2b, 0x49, 0xe4, 0x17, 0x17, 0x97,
-  0x96, 0x02, 0x01, 0xc0, 0x62, 0xb1, 0x58, 0x2c,
-  0x96, 0x1f, 0x20, 0x40, 0xd3, 0x06, 0x03, 0x45,
-  0x71, 0x5c, 0x22, 0xb1, 0xbe, 0x2e, 0x08, 0xa2,
-  0xc8, 0x30, 0x0c, 0xc3, 0x30, 0x19, 0x19, 0xda,
-  0x8b, 0xb2, 0xb2, 0xec, 0x76, 0x8e, 0x03, 0xcc,
-  0x66, 0xe2, 0xa0, 0xd7, 0xeb, 0xf5, 0x4e, 0x4f,
-  0x03, 0xa2, 0x48, 0x1c, 0xaa, 0xae, 0xae, 0xa9,
-  0xa9, 0xaa, 0x02, 0x28, 0x4a, 0x55, 0x93, 0xf7,
-  0x00, 0x45, 0xd1, 0x34, 0x39, 0x55, 0x48, 0xa4,
-  0xb5, 0x9d, 0x45, 0x51, 0x44, 0x62, 0x8a, 0x22,
-  0xcb, 0xaa, 0x0a, 0xf0, 0x7c, 0x7e, 0x7e, 0x41,
-  0x01, 0x30, 0x3e, 0x3e, 0x31, 0x31, 0x31, 0x41,
-  0xc6, 0xf1, 0x71, 0x12, 0xc8, 0x9c, 0x9c, 0x07,
-  0x0f, 0xb6, 0x25, 0x40, 0x1c, 0x76, 0xbb, 0xfd,
-  0xfe, 0x40, 0xc0, 0xe7, 0x3b, 0x7c, 0x98, 0x65,
-  0xcd, 0x66, 0x8e, 0x03, 0x38, 0x8e, 0x44, 0xe0,
-  0xe4, 0xc9, 0x13, 0x27, 0x4e, 0x9d, 0x02, 0x82,
-  0xc1, 0x60, 0x70, 0x69, 0x09, 0xf8, 0xf2, 0xc5,
-  0xeb, 0x9d, 0x99, 0x01, 0x22, 0x91, 0x68, 0x34,
-  0x12, 0xd1, 0x63, 0xac, 0x1f, 0xa3, 0x44, 0xbb,
-  0x5a, 0xe4, 0x75, 0x52, 0x84, 0x90, 0xd1, 0x68,
-  0x34, 0x1a, 0x0c, 0x80, 0xd9, 0xcc, 0x30, 0x66,
-  0x33, 0xc0, 0xf3, 0x3c, 0xcf, 0xf3, 0xc0, 0xc7,
-  0x8f, 0x63, 0x63, 0x23, 0x23, 0x40, 0x4e, 0x4e,
-  0x4e, 0x8e, 0xdd, 0xfe, 0xf0, 0xe1, 0x99, 0x33,
-  0xa7, 0x4f, 0x37, 0x36, 0xde, 0xb8, 0xb1, 0x15,
-  0x81, 0x6f, 0xaf, 0x3d, 0x7b, 0xf6, 0xfc, 0xf9,
-  0xbf, 0xfe, 0xba, 0x79, 0xb3, 0xb6, 0xb6, 0xa6,
-  0xa6, 0xb6, 0xf6, 0xce, 0x1d, 0x97, 0xcb, 0xe5,
-  0x2a, 0x2e, 0x66, 0x59, 0x86, 0x61, 0xd9, 0x8c,
-  0x0c, 0x20, 0x3b, 0xdb, 0x6e, 0x2f, 0x2c, 0x04,
-  0xda, 0xdb, 0xfb, 0xfa, 0xdc, 0x6e, 0xc0, 0xe3,
-  0x09, 0x87, 0xf3, 0xf2, 0xb0, 0x63, 0x30, 0x8c,
-  0xc1, 0x90, 0x7c, 0x8a, 0xad, 0xaf, 0xcb, 0xb2,
-  0xb6, 0x67, 0xbe, 0x87, 0xbd, 0x7b, 0x2d, 0x96,
-  0x85, 0x85, 0xfe, 0xfe, 0xf6, 0xf6, 0xe6, 0xe6,
-  0xeb, 0xd7, 0x8f, 0x1e, 0x35, 0xa6, 0x3e, 0x9e,
-  0x99, 0x09, 0x85, 0x42, 0xa1, 0xaf, 0x5f, 0x45,
-  0xb1, 0xb4, 0xb4, 0xac, 0x6c, 0xf7, 0x6e, 0xe0,
-  0xe0, 0xc1, 0x9a, 0x9a, 0x43, 0x87, 0x80, 0xee,
-  0xee, 0x97, 0x2f, 0x7b, 0x7b, 0x81, 0xa6, 0xa6,
-  0x0b, 0x17, 0x48, 0xf9, 0xd2, 0x4e, 0x19, 0x5d,
-  0x2c, 0xda, 0x3d, 0x29, 0x46, 0xe4, 0x5e, 0x1b,
-  0x93, 0x37, 0x6f, 0xb2, 0x84, 0x7e, 0x16, 0xcd,
-  0xcd, 0x4f, 0x9e, 0x74, 0x75, 0xed, 0xdf, 0xbf,
-  0x41, 0x42, 0x04, 0xa1, 0x50, 0x3c, 0x1e, 0x8f,
-  0x27, 0x12, 0xa2, 0x28, 0xcb, 0xb2, 0x2c, 0xcb,
-  0x80, 0xd5, 0x6a, 0xb5, 0x5a, 0xad, 0x40, 0x7f,
-  0xff, 0xdc, 0x1c, 0xc3, 0x00, 0xd5, 0xd5, 0x89,
-  0x84, 0xa2, 0x00, 0x1e, 0x8f, 0xcf, 0x17, 0x8b,
-  0xed, 0x3c, 0x03, 0x3f, 0x0b, 0xa7, 0xd3, 0x6e,
-  0x67, 0x18, 0x20, 0x1a, 0x8d, 0xc7, 0x55, 0x55,
-  0x3f, 0x06, 0xe8, 0xd4, 0x65, 0x63, 0x63, 0xc1,
-  0x60, 0x30, 0xb8, 0xb8, 0x28, 0x8a, 0xb2, 0x4c,
-  0x36, 0xa7, 0xcf, 0x17, 0x08, 0xf8, 0x7c, 0x40,
-  0x66, 0xa6, 0xc1, 0xa0, 0x69, 0xfa, 0x57, 0x5a,
-  0x85, 0x9d, 0x42, 0x10, 0x42, 0xa1, 0xe5, 0x65,
-  0x55, 0x5d, 0x5f, 0x97, 0x24, 0x83, 0x61, 0x7e,
-  0x7e, 0x03, 0x81, 0xce, 0xce, 0x8e, 0x8e, 0xee,
-  0x6e, 0xbf, 0x9f, 0x61, 0x18, 0xc6, 0x6c, 0x56,
-  0x55, 0xab, 0xd5, 0x6a, 0xb5, 0xd9, 0x80, 0x68,
-  0x34, 0x12, 0x11, 0x04, 0xa0, 0xae, 0xee, 0xc0,
-  0x81, 0xa2, 0x22, 0xad, 0x37, 0xf9, 0xe7, 0x60,
-  0xb3, 0x91, 0x3d, 0x18, 0x8b, 0xad, 0xad, 0xc5,
-  0xe3, 0x8a, 0xe2, 0x72, 0xc5, 0x62, 0x6f, 0xde,
-  0xe8, 0x9b, 0x9a, 0x4e, 0x37, 0x10, 0x84, 0x95,
-  0x95, 0x95, 0x95, 0x78, 0x5c, 0x51, 0x48, 0xa2,
-  0x5e, 0xbc, 0x78, 0xf5, 0xea, 0xdd, 0x3b, 0xa0,
-  0xb0, 0x90, 0xe7, 0x1d, 0x0e, 0x20, 0x1c, 0x5e,
-  0x5b, 0x23, 0x4d, 0x9b, 0x76, 0xd6, 0x90, 0x2b,
-  0xad, 0x5e, 0x6a, 0x85, 0x29, 0x79, 0x4c, 0x9e,
-  0xff, 0x9e, 0x5d, 0xfa, 0xa8, 0xaa, 0x00, 0xcb,
-  0x9a, 0x4c, 0x06, 0x03, 0x30, 0x37, 0xe7, 0xf7,
-  0x07, 0x83, 0xa2, 0x48, 0xbc, 0x1c, 0x1b, 0xd3,
-  0xfc, 0x35, 0xa6, 0x13, 0xe0, 0x38, 0x8b, 0x85,
-  0xe3, 0x06, 0x06, 0x3e, 0x7f, 0x9e, 0x9a, 0xf2,
-  0x7a, 0x4b, 0x4b, 0x0b, 0x0b, 0x5d, 0xae, 0xb2,
-  0x32, 0xc0, 0x62, 0xc9, 0xcb, 0x2b, 0x29, 0x01,
-  0x7c, 0xbe, 0x70, 0x38, 0x91, 0x00, 0xd6, 0xd7,
-  0x25, 0x29, 0xb5, 0xc4, 0xa7, 0x56, 0x58, 0x72,
-  0xe6, 0xeb, 0x9d, 0xa5, 0x36, 0xaf, 0xcf, 0xe9,
-  0x25, 0x6e, 0xb3, 0x9c, 0xe6, 0xe4, 0x58, 0x2c,
-  0x19, 0x19, 0x80, 0x24, 0x91, 0x3a, 0xe1, 0x76,
-  0x7b, 0x3c, 0xd3, 0xd3, 0x73, 0x73, 0x6f, 0xdf,
-  0x12, 0xa5, 0x6c, 0x49, 0x80, 0x7c, 0x66, 0x68,
-  0x88, 0xb4, 0x14, 0x8d, 0x8d, 0x05, 0x05, 0x7b,
-  0xf6, 0x14, 0x17, 0x03, 0xa1, 0x50, 0x34, 0x2a,
-  0x49, 0x80, 0xdf, 0x1f, 0x0a, 0xc5, 0xe3, 0x9b,
-  0x25, 0x9b, 0xa2, 0xb4, 0x4a, 0x90, 0xdc, 0x0e,
-  0x53, 0x54, 0xea, 0x7c, 0xf2, 0xba, 0x54, 0x3b,
-  0xfd, 0xfb, 0x14, 0x05, 0x24, 0x12, 0xc4, 0xf1,
-  0xc1, 0xc1, 0xc1, 0x41, 0xb7, 0x5b, 0x14, 0x79,
-  0x7e, 0x75, 0xf5, 0xfd, 0xfb, 0x7b, 0xf7, 0xd2,
-  0xbf, 0x9a, 0x46, 0xc0, 0x64, 0x9a, 0x9f, 0x9f,
-  0x9f, 0xf7, 0xf9, 0xdc, 0x6e, 0xab, 0x35, 0x2b,
-  0xcb, 0x6a, 0x55, 0x94, 0xfa, 0x7a, 0xa7, 0x93,
-  0xe7, 0x69, 0x7a, 0x6c, 0x6c, 0x71, 0x51, 0x92,
-  0x36, 0x8b, 0x7c, 0x2a, 0xf5, 0xf4, 0xeb, 0xf4,
-  0xa3, 0x32, 0x3d, 0x2b, 0xe9, 0x76, 0x3c, 0x6f,
-  0xb3, 0x99, 0x4c, 0x80, 0x28, 0xca, 0xb2, 0xa2,
-  0x00, 0xe3, 0xe3, 0x1e, 0x8f, 0xdb, 0xbd, 0xb4,
-  0xf4, 0xfa, 0x75, 0x47, 0x47, 0x77, 0xf7, 0xd3,
-  0xa7, 0xdb, 0x10, 0xc8, 0xcd, 0x1d, 0x1d, 0x1d,
-  0x1d, 0x1d, 0x1d, 0xe5, 0xb8, 0x82, 0x82, 0xc2,
-  0xc2, 0x82, 0x02, 0x9a, 0xee, 0xeb, 0xfb, 0xf4,
-  0x69, 0x75, 0x15, 0x3f, 0x00, 0x22, 0x05, 0x4d,
-  0x26, 0xc9, 0x92, 0x49, 0x95, 0xcf, 0xc6, 0x88,
-  0x27, 0xdb, 0x49, 0x92, 0x24, 0x91, 0xe7, 0x91,
-  0x48, 0x20, 0x20, 0xcb, 0xc0, 0xea, 0xea, 0xc2,
-  0x42, 0x57, 0x17, 0x59, 0xab, 0x35, 0xf8, 0x7a,
-  0x08, 0xd3, 0x08, 0x44, 0x22, 0xc1, 0x60, 0x30,
-  0x18, 0x0c, 0x4e, 0x4e, 0x8e, 0x8c, 0x0c, 0x0f,
-  0x0f, 0x0f, 0xdf, 0xbd, 0xcb, 0x71, 0x16, 0x8b,
-  0xc7, 0x73, 0xfb, 0xf6, 0x8f, 0x50, 0xf8, 0x9d,
-  0x90, 0xa4, 0xe5, 0xe5, 0xc9, 0xc9, 0xa9, 0xa9,
-  0xe1, 0xe1, 0x9e, 0x9e, 0x47, 0x8f, 0xda, 0xda,
-  0xc8, 0xac, 0xd6, 0xd6, 0x09, 0xc2, 0xb7, 0x8c,
-  0x6e, 0x6e, 0xce, 0x30, 0x64, 0x64, 0xd9, 0x54,
-  0x43, 0x6d, 0xa4, 0x69, 0xfc, 0x51, 0x68, 0x39,
-  0x4a, 0x24, 0xc8, 0xa8, 0x69, 0x20, 0x14, 0x22,
-  0xe3, 0xda, 0xda, 0x36, 0x04, 0xb6, 0x82, 0xe6,
-  0xf8, 0x4e, 0x9a, 0x80, 0x5f, 0x81, 0x26, 0x99,
-  0x7f, 0xa3, 0x84, 0xfe, 0x8f, 0xef, 0xe3, 0x6f,
-  0xc7, 0x72, 0xa6, 0x5a, 0xf7, 0x8f, 0xb0, 0xcc,
-  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
-  0xae, 0x42, 0x60, 0x82};
--- a/art/tango/document_print.h
+++ b/art/tango/document_print.h
@@ -1,229 +0,0 @@
-/* document_print.png - 544 bytes */
-static const unsigned char document_print_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x11, 0x00,
-  0x00, 0x0b, 0x11, 0x01, 0x7f, 0x64, 0x5f, 0x91,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0b, 0x15, 0x12, 0x0d, 0x2f, 0x9f,
-  0xed, 0x85, 0x8a, 0x00, 0x00, 0x01, 0xad, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x93, 0xcd,
-  0x8a, 0x13, 0x41, 0x14, 0x85, 0xbf, 0x7b, 0x33,
-  0x8b, 0xbc, 0x40, 0x76, 0x0d, 0x59, 0xa9, 0xab,
-  0xd0, 0x04, 0xe3, 0x26, 0x44, 0x07, 0x1f, 0xc2,
-  0x9f, 0x77, 0x10, 0xc1, 0x07, 0xd0, 0x1e, 0x67,
-  0x40, 0x10, 0x11, 0x74, 0x44, 0x7d, 0x86, 0x49,
-  0xf2, 0x04, 0xc9, 0x46, 0x46, 0xc2, 0x6c, 0xb2,
-  0x4c, 0x56, 0x13, 0x77, 0x2a, 0x04, 0x3a, 0x7f,
-  0x24, 0x81, 0xe9, 0x4e, 0xa7, 0xaa, 0x5c, 0x68,
-  0x1a, 0xdb, 0x44, 0x47, 0xb4, 0xa0, 0x16, 0xf7,
-  0x52, 0xf7, 0xd4, 0xe1, 0x7c, 0x55, 0xf0, 0x9f,
-  0x4b, 0x7e, 0x2e, 0x1a, 0xcd, 0xfa, 0x21, 0x10,
-  0xfc, 0xc5, 0xdc, 0xd1, 0xdd, 0x3b, 0xf7, 0x0e,
-  0xb6, 0xba, 0x8d, 0x66, 0xdd, 0xc5, 0x71, 0x9c,
-  0xd9, 0xcf, 0x5f, 0x3c, 0xcb, 0xd4, 0x51, 0x14,
-  0xb9, 0x46, 0xb3, 0xee, 0x36, 0x33, 0x7b, 0xbb,
-  0xe4, 0xbb, 0xdd, 0x2e, 0x00, 0x9d, 0xb3, 0x53,
-  0x00, 0x5e, 0x1d, 0xbf, 0xa4, 0x56, 0xdd, 0x07,
-  0xa0, 0x52, 0xa9, 0x64, 0xce, 0xea, 0x2e, 0x81,
-  0x52, 0xa9, 0x94, 0x0e, 0x6f, 0x56, 0xe7, 0xec,
-  0x14, 0xdf, 0xf7, 0x71, 0xce, 0x65, 0xfa, 0x5b,
-  0x0e, 0xac, 0xb5, 0xf4, 0x7a, 0x3d, 0x6a, 0xd5,
-  0x7d, 0x54, 0x95, 0x8f, 0x9d, 0x0f, 0xdc, 0xaa,
-  0xdd, 0x46, 0x44, 0xe8, 0xf7, 0xfb, 0x94, 0xcb,
-  0xe5, 0x3f, 0x0b, 0x00, 0x78, 0x9e, 0x87, 0xaa,
-  0x22, 0xf2, 0x3d, 0xe3, 0x62, 0xb1, 0x88, 0x88,
-  0x20, 0x22, 0x97, 0x3b, 0x70, 0xce, 0x51, 0x28,
-  0x14, 0xd2, 0xfa, 0xe1, 0x83, 0x47, 0x29, 0x2c,
-  0x91, 0xdf, 0x60, 0x7c, 0x12, 0x3c, 0x3e, 0x04,
-  0x82, 0x7c, 0x3e, 0xcf, 0xd5, 0x2b, 0xd7, 0xb0,
-  0xd6, 0xa2, 0xba, 0x1d, 0x8f, 0xb5, 0x16, 0x11,
-  0x61, 0xf0, 0xe9, 0x9c, 0x28, 0x8a, 0x00, 0x8e,
-  0x36, 0x0e, 0x82, 0x83, 0xe0, 0x29, 0xc6, 0x18,
-  0x92, 0x24, 0xb9, 0xf4, 0x11, 0xcc, 0xe7, 0x35,
-  0x54, 0x95, 0x77, 0xef, 0xdf, 0x06, 0xe9, 0x35,
-  0x22, 0xc2, 0x60, 0x30, 0x20, 0x8e, 0x63, 0xda,
-  0xed, 0x36, 0xce, 0x39, 0xc2, 0x30, 0x64, 0x3a,
-  0x9d, 0x32, 0x1e, 0x8f, 0x99, 0x4c, 0x26, 0x8c,
-  0x46, 0x23, 0x86, 0xc3, 0x21, 0xad, 0x56, 0x8b,
-  0xaf, 0x5f, 0x3e, 0x67, 0x33, 0x58, 0x2c, 0x16,
-  0x44, 0x17, 0x17, 0xcc, 0x66, 0x33, 0x7c, 0xdf,
-  0x27, 0x0c, 0x43, 0x00, 0x92, 0x24, 0x49, 0xad,
-  0x03, 0x18, 0x63, 0x18, 0x8f, 0x42, 0xa2, 0x78,
-  0x95, 0x15, 0x50, 0x55, 0xe6, 0x8b, 0x05, 0xed,
-  0x76, 0x8b, 0xe5, 0x72, 0x09, 0xc0, 0x7a, 0xbd,
-  0x46, 0x45, 0xb0, 0xd6, 0xb0, 0x36, 0x06, 0xd5,
-  0x1c, 0x7b, 0xb9, 0x1c, 0xd5, 0xda, 0xcd, 0xdd,
-  0x14, 0x8c, 0x31, 0x5c, 0xaf, 0xdc, 0x48, 0x69,
-  0xfc, 0xe0, 0x82, 0xb5, 0x0e, 0x63, 0x0c, 0xaa,
-  0x9a, 0xe2, 0xdd, 0x84, 0x9c, 0x0a, 0xac, 0x56,
-  0x2b, 0x3c, 0xcf, 0x4b, 0xad, 0xfe, 0xca, 0x7b,
-  0x43, 0x41, 0x55, 0x71, 0xce, 0x61, 0xad, 0xcd,
-  0x08, 0x9c, 0x1c, 0xbf, 0x79, 0x7d, 0xff, 0x1f,
-  0x7e, 0xf3, 0xc9, 0x37, 0xc1, 0x23, 0xd9, 0x67,
-  0xfd, 0x0b, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
-  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
-
-
-/* document_print.png - 1230 bytes */
-static const unsigned char document_print_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
-  0x59, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0xcf, 0x6f, 0x12, 0x5b, 0x14, 0xfe, 0x66,
-  0xfa, 0x06, 0x06, 0x25, 0xa6, 0x6d, 0x5a, 0x50,
-  0x4c, 0x51, 0x44, 0x58, 0xb0, 0xa8, 0x0b, 0x8c,
-  0xd5, 0x98, 0x68, 0x6c, 0x4c, 0x34, 0xae, 0xfc,
-  0xd5, 0x98, 0xa6, 0xba, 0xc7, 0xbf, 0xc1, 0x68,
-  0x22, 0xd5, 0xa8, 0x0b, 0xd7, 0xba, 0xd1, 0x18,
-  0xca, 0xc2, 0x34, 0x56, 0x4c, 0x4d, 0x8c, 0xc6,
-  0x14, 0xd0, 0x60, 0xca, 0xa2, 0x3b, 0x96, 0x6a,
-  0x4d, 0x14, 0x6c, 0xc0, 0x05, 0x03, 0xc8, 0xcf,
-  0x61, 0xe6, 0xba, 0xb8, 0xbd, 0xef, 0x96, 0x5f,
-  0x85, 0xda, 0xfa, 0x5e, 0x5e, 0xf2, 0xce, 0xe6,
-  0xcb, 0xb9, 0x5c, 0xce, 0xfd, 0xbe, 0x73, 0xce,
-  0x9c, 0xb9, 0x03, 0xfc, 0x6f, 0xff, 0xae, 0x09,
-  0x1b, 0xfd, 0x43, 0x28, 0xf4, 0xe2, 0xc5, 0xf3,
-  0xe7, 0xcf, 0x9e, 0x51, 0xef, 0xc2, 0x85, 0xad,
-  0xa5, 0x33, 0x37, 0x77, 0xee, 0xdc, 0xd9, 0xb3,
-  0xe7, 0xcf, 0x5f, 0xbc, 0xf8, 0xc7, 0x14, 0x53,
-  0x01, 0xe4, 0x6f, 0xd3, 0x34, 0x4d, 0xd3, 0xb4,
-  0xdf, 0x47, 0x66, 0x2c, 0xee, 0x46, 0xf9, 0xfc,
-  0xb5, 0x59, 0x41, 0xc9, 0x64, 0x32, 0x99, 0x4c,
-  0x02, 0x99, 0x4c, 0x26, 0x93, 0xc9, 0xf0, 0xf5,
-  0x48, 0x24, 0x12, 0x59, 0x58, 0x00, 0x04, 0x41,
-  0x10, 0x04, 0x01, 0x18, 0x1f, 0x1f, 0x1f, 0x3f,
-  0x79, 0x92, 0xfb, 0x36, 0x9b, 0xcd, 0x66, 0xb3,
-  0x01, 0x56, 0xab, 0xd5, 0x6a, 0xb5, 0x36, 0x47,
-  0x15, 0x56, 0x3b, 0xa3, 0xbb, 0x20, 0x71, 0xab,
-  0x2a, 0x63, 0xb1, 0x58, 0x2c, 0x16, 0x0b, 0xb0,
-  0xb8, 0xb8, 0xb8, 0xf8, 0xe1, 0x03, 0x60, 0x32,
-  0x99, 0x4c, 0x26, 0x13, 0x20, 0xcb, 0xb2, 0x2c,
-  0xcb, 0x7c, 0x9d, 0x11, 0x17, 0x45, 0x51, 0x14,
-  0x3b, 0x9e, 0x2e, 0xf6, 0xcc, 0x6b, 0xcb, 0x04,
-  0xcc, 0xce, 0xce, 0xce, 0x3e, 0x7d, 0x0a, 0x54,
-  0xab, 0xd5, 0x6a, 0xb5, 0x0a, 0x54, 0x2a, 0x95,
-  0x4a, 0xa5, 0xd2, 0x8a, 0xc1, 0x60, 0x30, 0x18,
-  0x08, 0xf0, 0x4a, 0x6c, 0x56, 0xc0, 0xa6, 0x5b,
-  0x88, 0x11, 0x99, 0x9c, 0x9c, 0x9c, 0x9c, 0x9a,
-  0xe2, 0x7e, 0x28, 0x14, 0x0a, 0xcd, 0xcd, 0xf1,
-  0x7d, 0x13, 0x13, 0x13, 0x13, 0x97, 0x2e, 0xf1,
-  0xcc, 0xaf, 0x2f, 0x40, 0x55, 0x7b, 0x3d, 0xbf,
-  0x67, 0xa5, 0xd7, 0xaf, 0xdf, 0xb8, 0x71, 0xed,
-  0x9a, 0xd7, 0xdb, 0x9a, 0x2b, 0x4a, 0x28, 0x9d,
-  0x4e, 0xa7, 0xd3, 0x69, 0x8e, 0x92, 0x24, 0x49,
-  0x92, 0x04, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e,
-  0xb6, 0x12, 0xef, 0xd4, 0x42, 0x9d, 0xce, 0xf9,
-  0x6d, 0x01, 0x34, 0xe0, 0xe5, 0xcb, 0xd4, 0x5b,
-  0x5a, 0xea, 0x54, 0x01, 0xd6, 0xdb, 0x0c, 0x47,
-  0x47, 0x47, 0x47, 0x0f, 0x1c, 0x00, 0x9c, 0x4e,
-  0xa7, 0xd3, 0xe9, 0xe4, 0x84, 0x9b, 0xb1, 0xbd,
-  0x2d, 0x2d, 0x35, 0x9e, 0xbb, 0x4e, 0xb3, 0xf5,
-  0x46, 0x7c, 0x66, 0xc6, 0xef, 0xbf, 0x79, 0xf3,
-  0xd6, 0x2d, 0xfe, 0x7b, 0xa1, 0x50, 0x28, 0x14,
-  0x0a, 0xdc, 0xd7, 0x75, 0x5d, 0xd7, 0x75, 0x80,
-  0x8e, 0x47, 0xc0, 0x6e, 0xb7, 0xdb, 0xf7, 0xec,
-  0x01, 0x46, 0x46, 0x46, 0x46, 0xec, 0x76, 0xfe,
-  0x0c, 0x94, 0xcb, 0xe5, 0x72, 0xb9, 0x0c, 0x14,
-  0x8b, 0xc5, 0x62, 0xb1, 0xd8, 0x1a, 0xc7, 0xed,
-  0x76, 0xb9, 0x5c, 0x2e, 0xe6, 0xcd, 0xcc, 0x50,
-  0x1e, 0x53, 0x53, 0xac, 0xde, 0x2d, 0x09, 0xec,
-  0x95, 0x78, 0x3e, 0x9f, 0xcb, 0x65, 0xb3, 0x40,
-  0x38, 0x1c, 0x8d, 0x46, 0xa3, 0x40, 0x24, 0x12,
-  0x0e, 0x87, 0xc3, 0x94, 0xb8, 0xa6, 0xf5, 0x5a,
-  0xf0, 0x56, 0xdb, 0xbd, 0x9b, 0x56, 0xcc, 0xe5,
-  0xa2, 0xc4, 0x0f, 0x1f, 0x3e, 0x72, 0xe4, 0xe8,
-  0x51, 0x60, 0x65, 0x65, 0x65, 0xe5, 0xfb, 0x77,
-  0x60, 0x7e, 0xfe, 0xe5, 0xcb, 0xf9, 0x79, 0xb6,
-  0xfb, 0xca, 0x95, 0xe9, 0x69, 0xbf, 0xff, 0xf6,
-  0xed, 0x60, 0xb0, 0x4b, 0xcb, 0x90, 0x16, 0xa3,
-  0x99, 0x23, 0x7f, 0xdc, 0xe8, 0x33, 0xc4, 0x31,
-  0x91, 0x48, 0x24, 0x12, 0x09, 0x42, 0x18, 0xaf,
-  0x66, 0xbe, 0x1d, 0xa7, 0x50, 0x2e, 0xa7, 0x28,
-  0xd9, 0x2c, 0x10, 0x8d, 0xbe, 0x7b, 0xf7, 0xfe,
-  0x3d, 0x30, 0x36, 0x36, 0x36, 0x76, 0xe8, 0x10,
-  0x30, 0x34, 0x34, 0x34, 0x34, 0x3c, 0x0c, 0xc4,
-  0xe3, 0xf1, 0x78, 0x3c, 0x0e, 0x78, 0x3c, 0x1e,
-  0x8f, 0xc7, 0x03, 0xd0, 0xe3, 0x5b, 0x7b, 0x9b,
-  0xb5, 0x54, 0x73, 0xa5, 0x08, 0xd1, 0x75, 0x42,
-  0x00, 0x41, 0x10, 0xc5, 0x76, 0x1d, 0x1e, 0x08,
-  0x04, 0x02, 0x4f, 0x9e, 0x00, 0x5e, 0xaf, 0xd7,
-  0x7b, 0xf0, 0x60, 0xe7, 0x0a, 0x76, 0x14, 0xf0,
-  0xed, 0x5b, 0x32, 0x99, 0x4a, 0x01, 0xa9, 0x54,
-  0x2a, 0x95, 0x4a, 0x01, 0x66, 0xb3, 0xd9, 0x6c,
-  0x36, 0x03, 0xb1, 0x58, 0x2c, 0x16, 0x8b, 0x01,
-  0x0e, 0x87, 0xc3, 0xb1, 0x77, 0x2f, 0x5d, 0xdf,
-  0xbe, 0x7d, 0xb5, 0x1f, 0xd7, 0x4c, 0x17, 0x26,
-  0xa8, 0x79, 0x5c, 0x6a, 0x5a, 0xbd, 0x5e, 0xaf,
-  0xb7, 0x9e, 0x47, 0x08, 0x21, 0xba, 0x0e, 0xd4,
-  0x6a, 0xb5, 0x9a, 0xaa, 0x02, 0xd9, 0x6c, 0x36,
-  0x9b, 0xcd, 0x52, 0xbf, 0xdd, 0xfe, 0xae, 0x02,
-  0xd8, 0xc1, 0x8c, 0xc8, 0xf4, 0xb4, 0xdf, 0xef,
-  0xf7, 0x03, 0xaa, 0x5a, 0xaf, 0xd7, 0x6a, 0x34,
-  0xb3, 0xba, 0xde, 0x8e, 0x28, 0x2d, 0x33, 0x21,
-  0x8d, 0x17, 0x01, 0x46, 0x70, 0xed, 0xca, 0xda,
-  0x4a, 0x18, 0x0c, 0xb2, 0x6c, 0x30, 0xf0, 0xb8,
-  0xec, 0x4d, 0x5e, 0xaf, 0xb7, 0x17, 0xdc, 0x55,
-  0x80, 0xa2, 0x28, 0x8a, 0xa2, 0x00, 0x6e, 0xb7,
-  0xdb, 0xed, 0x72, 0x01, 0x3b, 0x77, 0x5a, 0xad,
-  0x16, 0x0b, 0xa0, 0x28, 0xb9, 0x9c, 0xa2, 0xf0,
-  0x79, 0x40, 0xc9, 0x37, 0x12, 0x25, 0x84, 0x0a,
-  0x55, 0x55, 0xe0, 0xe7, 0x4f, 0x3a, 0x65, 0x4a,
-  0xa5, 0x52, 0xa9, 0x5c, 0x06, 0x44, 0xb1, 0xaf,
-  0x4f, 0x10, 0xb8, 0x60, 0x41, 0x10, 0x84, 0xb5,
-  0x2d, 0xc7, 0x2a, 0x68, 0x34, 0x1a, 0x0c, 0x92,
-  0x84, 0xae, 0xd6, 0x51, 0x00, 0x53, 0xce, 0x32,
-  0xc9, 0x5a, 0xc5, 0x68, 0x94, 0x65, 0xa3, 0x91,
-  0x8f, 0x45, 0x96, 0x49, 0x4d, 0xa3, 0x63, 0x94,
-  0x99, 0xae, 0xd3, 0xde, 0xef, 0xef, 0xef, 0xef,
-  0x1f, 0x1c, 0xe4, 0xc2, 0x08, 0xa1, 0xcf, 0x82,
-  0xae, 0xd3, 0x8a, 0xf0, 0x75, 0x8a, 0x6c, 0x1c,
-  0x13, 0x42, 0x88, 0x20, 0xf0, 0xab, 0x49, 0xa3,
-  0x31, 0xc9, 0xba, 0xde, 0x41, 0xc0, 0xc3, 0x87,
-  0x0b, 0x0b, 0xe1, 0xf0, 0xdb, 0xb7, 0x3e, 0xdf,
-  0xe9, 0xd3, 0xa7, 0x4e, 0x9d, 0x39, 0x03, 0xbc,
-  0x7e, 0xfd, 0xe6, 0xcd, 0xab, 0x57, 0xdd, 0x33,
-  0xb2, 0x55, 0xb6, 0x6f, 0x9f, 0xc3, 0xb1, 0x7f,
-  0x3f, 0xf0, 0xf9, 0xf3, 0xf2, 0xf2, 0xc7, 0x8f,
-  0x4c, 0x08, 0x63, 0xb0, 0x8e, 0x80, 0x5a, 0x4d,
-  0x55, 0x55, 0xf5, 0xf1, 0x63, 0x83, 0x41, 0x92,
-  0x24, 0xc9, 0xe7, 0xcb, 0xe7, 0xf3, 0x79, 0x45,
-  0x01, 0x8e, 0x1f, 0x3f, 0x76, 0xec, 0xc4, 0x89,
-  0xee, 0x57, 0x01, 0x66, 0x9a, 0xa6, 0x69, 0xac,
-  0x77, 0x9b, 0xa7, 0x0c, 0xcb, 0x74, 0xbb, 0xf7,
-  0x87, 0xaa, 0xaa, 0x6a, 0xbd, 0xce, 0x5b, 0x6e,
-  0x79, 0xf9, 0xcb, 0x97, 0x4f, 0x9f, 0xe8, 0x75,
-  0xfd, 0xc7, 0x8f, 0xfb, 0xf7, 0x79, 0x84, 0xd5,
-  0xd8, 0x9d, 0x08, 0xd0, 0xb9, 0xfb, 0xe0, 0x01,
-  0xf5, 0x7c, 0xbe, 0x7f, 0x2e, 0xf7, 0xed, 0x04,
-  0x3d, 0x7a, 0x74, 0xf7, 0xee, 0x9d, 0x3b, 0xf7,
-  0xee, 0x5d, 0xbd, 0xca, 0x56, 0xbb, 0x0a, 0x68,
-  0x34, 0x96, 0x43, 0x93, 0x89, 0x62, 0x7f, 0x3f,
-  0xc5, 0xe1, 0x61, 0x8a, 0xbb, 0x76, 0x51, 0xdc,
-  0xb1, 0x83, 0xe2, 0xb6, 0x6d, 0x8d, 0xc8, 0x9e,
-  0x0e, 0x16, 0x87, 0xf9, 0xec, 0x12, 0x91, 0x4e,
-  0x53, 0xfc, 0xfa, 0x95, 0x22, 0xfb, 0x34, 0x2a,
-  0x95, 0x28, 0xb2, 0x5a, 0x35, 0xce, 0xb1, 0x0d,
-  0x08, 0x68, 0x36, 0xd6, 0x3c, 0x7d, 0x7d, 0x14,
-  0xd9, 0xbc, 0x60, 0xbe, 0x2c, 0x37, 0xae, 0x37,
-  0x0b, 0x60, 0x84, 0x58, 0x26, 0xcb, 0xe5, 0x46,
-  0x9f, 0xed, 0xdf, 0xf8, 0x27, 0xe6, 0x7f, 0xce,
-  0x7e, 0x01, 0x3d, 0x5a, 0x60, 0xf5, 0xf2, 0x06,
-  0x15, 0x25, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
-  0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/document_save.h
+++ b/art/tango/document_save.h
@@ -1,340 +0,0 @@
-/* document_save.png - 911 bytes */
-static const unsigned char document_save_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0b, 0x0a, 0x0d, 0x37, 0x0f, 0x9e,
-  0x2a, 0xd8, 0xbf, 0x00, 0x00, 0x00, 0x8c, 0x74,
-  0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
-  0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
-  0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
-  0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
-  0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
-  0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
-  0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
-  0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
-  0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
-  0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
-  0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
-  0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
-  0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
-  0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
-  0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
-  0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
-  0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
-  0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
-  0x8a, 0xc7, 0x47, 0x00, 0x00, 0x02, 0x84, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x92, 0x4d,
-  0x48, 0x54, 0x61, 0x14, 0x86, 0x9f, 0xb9, 0xdd,
-  0xf1, 0xe6, 0xcf, 0xe4, 0x4c, 0xe0, 0xb5, 0x31,
-  0xcd, 0x91, 0xb2, 0x51, 0x6c, 0x51, 0x51, 0x34,
-  0x26, 0x14, 0xb8, 0xc8, 0x16, 0x45, 0x14, 0x2e,
-  0x42, 0x28, 0x2c, 0x82, 0x8a, 0xa9, 0xc1, 0x56,
-  0x2d, 0x2a, 0xca, 0x45, 0x11, 0x54, 0x10, 0x06,
-  0x52, 0xb4, 0x28, 0x0a, 0x22, 0xb0, 0x28, 0x28,
-  0x6a, 0x5b, 0xd0, 0x22, 0x89, 0x44, 0x8a, 0xa6,
-  0x45, 0x99, 0x54, 0x6a, 0x86, 0xa4, 0xe8, 0xdc,
-  0x9b, 0xce, 0xfd, 0xf9, 0x4e, 0x0b, 0x61, 0x6c,
-  0xb2, 0x36, 0xbd, 0x9b, 0xf3, 0xc1, 0xe1, 0x3c,
-  0x9c, 0xf7, 0x3d, 0x5f, 0xe0, 0xc8, 0xd9, 0xe3,
-  0x27, 0x3f, 0x5b, 0x15, 0xda, 0xd8, 0xb8, 0x33,
-  0x09, 0x54, 0x01, 0x5b, 0x81, 0x86, 0xa0, 0x26,
-  0xd9, 0xd0, 0xc2, 0x9f, 0x3f, 0x16, 0x19, 0xce,
-  0xcd, 0xbb, 0xe7, 0xcf, 0x9d, 0xe0, 0x1f, 0x0a,
-  0x34, 0x77, 0x74, 0xed, 0x8d, 0xad, 0xac, 0x8f,
-  0x55, 0x97, 0x9b, 0x83, 0xab, 0x6b, 0xca, 0x3a,
-  0xaa, 0x23, 0x85, 0x6b, 0x6d, 0xcf, 0x27, 0xfd,
-  0x2d, 0xc3, 0xeb, 0xde, 0xe7, 0xea, 0xc3, 0xd7,
-  0x51, 0xe2, 0x91, 0x37, 0xcb, 0xba, 0x3b, 0xef,
-  0x0c, 0xff, 0x15, 0x90, 0x3c, 0x7d, 0xbe, 0xdb,
-  0x9d, 0x1a, 0x3b, 0xec, 0x89, 0xc6, 0xa8, 0x1f,
-  0x66, 0xda, 0x28, 0x63, 0x81, 0x1e, 0xa4, 0xad,
-  0x65, 0x23, 0xcb, 0x2b, 0x16, 0x73, 0xf9, 0xfe,
-  0x0b, 0xfc, 0xa1, 0x3e, 0x62, 0x05, 0xe3, 0x7f,
-  0x9b, 0xef, 0x24, 0x79, 0x2c, 0x25, 0x5f, 0x46,
-  0x06, 0x44, 0x44, 0x64, 0xe0, 0x73, 0x5a, 0x7a,
-  0xd3, 0x03, 0x92, 0xba, 0xf6, 0x44, 0x12, 0x07,
-  0x2f, 0x48, 0xcf, 0xab, 0x2f, 0xd2, 0xf5, 0xf4,
-  0xad, 0xb4, 0x9e, 0xba, 0x2e, 0xef, 0x06, 0x87,
-  0xe5, 0x77, 0x59, 0x96, 0x25, 0xa9, 0x8e, 0xa4,
-  0xe8, 0x86, 0xee, 0xb3, 0xb4, 0x3c, 0xc6, 0xc4,
-  0xc4, 0x04, 0xe1, 0x92, 0x72, 0xb4, 0xc0, 0x24,
-  0x85, 0xe2, 0x00, 0xd0, 0xf7, 0x71, 0x14, 0xb3,
-  0x44, 0xe7, 0xfb, 0x78, 0x86, 0xf7, 0x03, 0x9f,
-  0x58, 0xb2, 0xa8, 0x10, 0x02, 0x00, 0x42, 0x41,
-  0x41, 0x01, 0x00, 0xba, 0xe7, 0x82, 0x28, 0xc1,
-  0x57, 0x8a, 0xed, 0x27, 0x6e, 0xcc, 0xdb, 0xb1,
-  0x77, 0x70, 0x02, 0xd7, 0xf3, 0xb9, 0xd8, 0xf3,
-  0x92, 0x8b, 0x3d, 0x2f, 0x01, 0x78, 0x7c, 0x76,
-  0x1f, 0xc8, 0x6c, 0x5f, 0x03, 0x50, 0xa2, 0x50,
-  0xbe, 0xa2, 0xeb, 0x50, 0x23, 0x00, 0xed, 0xbb,
-  0x77, 0xd2, 0x98, 0x58, 0xc7, 0xcc, 0x8c, 0x4d,
-  0x34, 0xa4, 0xd1, 0x94, 0x58, 0xcf, 0xde, 0xd6,
-  0xed, 0x00, 0xec, 0x69, 0x5e, 0x81, 0xf2, 0x15,
-  0x22, 0x32, 0x07, 0x10, 0x11, 0x22, 0x91, 0x30,
-  0x15, 0x65, 0x31, 0x2e, 0x1d, 0x58, 0xc7, 0xcd,
-  0xbb, 0x0f, 0x88, 0xc7, 0xaa, 0xd0, 0x08, 0xa0,
-  0x11, 0x20, 0x51, 0x5f, 0xcd, 0xad, 0x7b, 0x8f,
-  0x68, 0xdb, 0x5c, 0xc3, 0x8e, 0xa6, 0xf5, 0x14,
-  0x15, 0x17, 0xe5, 0x03, 0x00, 0x2c, 0xcb, 0xc2,
-  0x34, 0x4d, 0xaa, 0xa3, 0xb5, 0x39, 0x48, 0xe3,
-  0xaa, 0xe5, 0xd4, 0xc6, 0x2a, 0xb9, 0x7c, 0xfb,
-  0x21, 0x6d, 0x9b, 0x6b, 0xd8, 0xb5, 0x29, 0x81,
-  0x69, 0x9a, 0x38, 0x8e, 0x93, 0xb3, 0xa8, 0x03,
-  0x28, 0xa5, 0xb0, 0x6d, 0x1b, 0x00, 0xd3, 0x34,
-  0x31, 0x4d, 0x93, 0xee, 0xa3, 0x85, 0x1c, 0xbb,
-  0xda, 0x43, 0xd6, 0xf5, 0xd9, 0xdf, 0x52, 0x4f,
-  0xfb, 0xb6, 0x2d, 0x68, 0x9a, 0xc6, 0xd4, 0xd4,
-  0x14, 0xb6, 0x6d, 0x13, 0x0a, 0x85, 0xe6, 0x00,
-  0x86, 0x61, 0x50, 0x59, 0x59, 0x99, 0x17, 0xde,
-  0x9a, 0x86, 0x0d, 0x3c, 0xbb, 0xb2, 0x01, 0x00,
-  0xdb, 0xb6, 0x71, 0x1c, 0x87, 0xe9, 0xe9, 0xe9,
-  0x79, 0x21, 0xeb, 0x00, 0xfd, 0xfd, 0xfd, 0xb8,
-  0xae, 0x9b, 0xd7, 0xf0, 0x3c, 0x0f, 0x5d, 0xd7,
-  0x73, 0xef, 0x3f, 0x15, 0x89, 0x44, 0xf2, 0x33,
-  0xf0, 0x3c, 0x8f, 0x74, 0x3a, 0xcd, 0xc8, 0xc8,
-  0x08, 0x99, 0x4c, 0x06, 0x11, 0x41, 0x44, 0x30,
-  0x0c, 0x83, 0xa1, 0xa1, 0x21, 0x42, 0xa1, 0x50,
-  0xae, 0x5a, 0x96, 0x85, 0x65, 0x59, 0xf9, 0x57,
-  0x50, 0x4a, 0x51, 0x5c, 0x5c, 0x44, 0x30, 0x18,
-  0xcc, 0x7d, 0x12, 0x00, 0xd7, 0x75, 0x11, 0x35,
-  0x0b, 0x13, 0x35, 0x7b, 0x3e, 0xe5, 0xfb, 0xf9,
-  0x16, 0xc2, 0xe1, 0x30, 0xa5, 0xa5, 0xa5, 0x44,
-  0xa3, 0x51, 0x00, 0xb2, 0xd9, 0x2c, 0x40, 0x2e,
-  0xed, 0x78, 0x5d, 0x1c, 0xa5, 0x14, 0xf1, 0xba,
-  0x3a, 0x94, 0x52, 0x2c, 0x89, 0x46, 0x73, 0x96,
-  0x03, 0xa9, 0x8e, 0xe4, 0x19, 0xe0, 0x34, 0xff,
-  0xa7, 0xce, 0x5f, 0x93, 0x3b, 0x33, 0x4c, 0xd5,
-  0x22, 0x62, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x49,
-  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* document_save.png - 1755 bytes */
-static const unsigned char document_save_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
-  0x66, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
-  0x56, 0x49, 0x4c, 0x13, 0x6f, 0x14, 0x7f, 0x33,
-  0xa5, 0x1b, 0x1d, 0x4a, 0xa7, 0x65, 0x86, 0xb6,
-  0x58, 0x4a, 0x01, 0x6b, 0x11, 0x64, 0x33, 0xa0,
-  0xb8, 0x63, 0xe2, 0x01, 0x23, 0x46, 0x2f, 0x7a,
-  0xd0, 0x8b, 0x41, 0x0f, 0xa2, 0x51, 0x71, 0x09,
-  0xc6, 0xe5, 0xa0, 0x46, 0x03, 0x1a, 0xd1, 0x10,
-  0xe1, 0xe0, 0x92, 0xb8, 0x81, 0x92, 0xc8, 0xc5,
-  0x03, 0x1a, 0x43, 0x8c, 0xc4, 0x18, 0x15, 0x12,
-  0xdc, 0x11, 0x43, 0xc1, 0xda, 0x14, 0x8b, 0x94,
-  0xb6, 0x94, 0x4e, 0xf7, 0x65, 0xfe, 0x87, 0xc9,
-  0x38, 0xd8, 0xda, 0xe0, 0xfa, 0x4f, 0xfc, 0x25,
-  0x93, 0x2f, 0xef, 0x7d, 0xdb, 0xfb, 0xbd, 0xed,
-  0x1b, 0x80, 0x7f, 0x1c, 0xc8, 0x4c, 0x0b, 0x76,
-  0xee, 0x3c, 0x79, 0xb2, 0xbe, 0xfe, 0xca, 0x95,
-  0x4f, 0x9f, 0x28, 0x4a, 0xad, 0x5e, 0xb7, 0xce,
-  0x66, 0x73, 0x38, 0x82, 0x41, 0xb9, 0x3c, 0xd1,
-  0x7a, 0xb1, 0x98, 0xcf, 0xa7, 0x69, 0x8f, 0x87,
-  0x24, 0x31, 0xcc, 0xed, 0x1e, 0x18, 0x48, 0x4f,
-  0x97, 0x48, 0xde, 0xbf, 0xaf, 0xab, 0x6b, 0x6e,
-  0x3e, 0x7a, 0xf4, 0xce, 0x9d, 0x27, 0x4f, 0xfe,
-  0x37, 0x02, 0x2d, 0x2d, 0xd7, 0xae, 0xd5, 0xd5,
-  0x15, 0x17, 0x77, 0x76, 0xbe, 0x78, 0xa1, 0xd3,
-  0xf5, 0xf6, 0x66, 0x65, 0xe9, 0xf5, 0x79, 0x79,
-  0x81, 0x80, 0x56, 0x9b, 0x9e, 0x4e, 0x92, 0x28,
-  0xea, 0x76, 0x87, 0x42, 0x28, 0x2a, 0x12, 0x65,
-  0x64, 0x48, 0xa5, 0x22, 0x11, 0x8a, 0x7e, 0xfe,
-  0xec, 0x76, 0x07, 0x83, 0x00, 0x0e, 0x87, 0xcf,
-  0x17, 0x08, 0x00, 0x4c, 0x4e, 0x7e, 0xf8, 0xd0,
-  0xdd, 0x3d, 0x32, 0xe2, 0xf5, 0x7a, 0x3c, 0x7e,
-  0xbf, 0x50, 0xa8, 0xd3, 0xe1, 0xf8, 0xe0, 0x60,
-  0x7d, 0x7d, 0x6b, 0xeb, 0xb1, 0x63, 0xed, 0xed,
-  0x6d, 0x6d, 0x7f, 0x8a, 0x00, 0x2f, 0x91, 0xe1,
-  0xdd, 0xdd, 0x83, 0x83, 0x2a, 0x55, 0x67, 0x67,
-  0x66, 0x66, 0x61, 0xe1, 0x8a, 0x15, 0x32, 0x99,
-  0xc9, 0x64, 0x34, 0x0e, 0x0e, 0x0a, 0x04, 0xc3,
-  0xc3, 0x26, 0x93, 0xc9, 0xc4, 0xe7, 0x9b, 0xcd,
-  0x1f, 0x3f, 0x0e, 0x0f, 0xa3, 0xa8, 0xd9, 0x3c,
-  0x31, 0x61, 0xb7, 0x03, 0xf0, 0xf9, 0x29, 0x29,
-  0x72, 0x39, 0x00, 0x8e, 0x8b, 0x44, 0x02, 0x01,
-  0x80, 0x48, 0x44, 0x10, 0xb9, 0xb9, 0x38, 0x3e,
-  0x39, 0xe9, 0xf3, 0x45, 0xa3, 0x52, 0xe9, 0xe8,
-  0xa8, 0xcd, 0x26, 0x12, 0x55, 0x55, 0x55, 0x57,
-  0xaf, 0x59, 0xa3, 0x50, 0xf4, 0xf7, 0xf7, 0xf6,
-  0x3e, 0x7a, 0xf4, 0xee, 0x9d, 0xd1, 0xf8, 0xbb,
-  0x04, 0xd0, 0x58, 0xc5, 0xf3, 0xe7, 0x43, 0x43,
-  0x22, 0x51, 0x63, 0xe3, 0xac, 0x59, 0x69, 0x69,
-  0x49, 0x49, 0x26, 0x13, 0x45, 0x19, 0x8d, 0x0f,
-  0x1e, 0x7c, 0xf8, 0x50, 0x5e, 0x4e, 0x10, 0xcf,
-  0x9e, 0x6d, 0xde, 0xdc, 0xd3, 0xd3, 0xd4, 0x54,
-  0x5b, 0x8b, 0xa2, 0x4b, 0x97, 0x6a, 0xb5, 0x7d,
-  0x7d, 0x55, 0x55, 0xa1, 0x90, 0xcb, 0x35, 0x3a,
-  0x3a, 0x35, 0x65, 0xb1, 0x0c, 0x0f, 0xbf, 0x7d,
-  0x4b, 0xd3, 0xe3, 0xe3, 0x53, 0x53, 0x6e, 0x37,
-  0x80, 0xdb, 0xed, 0xf1, 0x50, 0x14, 0x00, 0x8e,
-  0x93, 0xa4, 0x4a, 0x05, 0x20, 0x91, 0x90, 0xa4,
-  0x46, 0x23, 0x14, 0xbe, 0x79, 0x63, 0xb3, 0x15,
-  0x15, 0xdd, 0xbe, 0xbd, 0x7f, 0xff, 0x89, 0x13,
-  0xd5, 0xd5, 0x12, 0xc9, 0x1f, 0x27, 0xe0, 0x74,
-  0x7a, 0xbd, 0x62, 0x71, 0x6e, 0x2e, 0x8f, 0x17,
-  0x89, 0x50, 0x94, 0xcb, 0xb5, 0x6c, 0xd9, 0xec,
-  0xd9, 0x16, 0xcb, 0xaa, 0x55, 0xa7, 0x4e, 0xed,
-  0xdb, 0x77, 0xf9, 0xf2, 0xad, 0x5b, 0xec, 0xba,
-  0x86, 0x86, 0x03, 0x07, 0x6e, 0xde, 0xbc, 0x7f,
-  0xbf, 0xac, 0x4c, 0xa3, 0xb1, 0x58, 0x8e, 0x1f,
-  0xa7, 0x28, 0xa7, 0xd3, 0xe9, 0x44, 0x10, 0x8f,
-  0x67, 0x6a, 0xca, 0xe1, 0x00, 0x08, 0x06, 0xfd,
-  0x7e, 0xaf, 0x97, 0x3b, 0x97, 0x24, 0x35, 0x9a,
-  0xd9, 0xb3, 0x51, 0x94, 0x20, 0x24, 0x92, 0x60,
-  0xd0, 0x6c, 0x9e, 0x98, 0x08, 0x06, 0x75, 0xba,
-  0xd6, 0xd6, 0xdf, 0x25, 0x10, 0x57, 0x03, 0x9b,
-  0x36, 0x1d, 0x3a, 0xb4, 0x77, 0xef, 0xdd, 0xbb,
-  0x3a, 0x9d, 0x50, 0x18, 0x0a, 0xbd, 0x7e, 0x3d,
-  0x35, 0xe5, 0x74, 0x46, 0xa3, 0x87, 0x0f, 0x27,
-  0x3a, 0x40, 0x28, 0x14, 0x8b, 0x11, 0x04, 0xe0,
-  0xf1, 0x63, 0x87, 0x43, 0xab, 0x05, 0xc8, 0xca,
-  0xca, 0xcf, 0x2f, 0x2d, 0x4d, 0x7c, 0xa1, 0x4c,
-  0xe6, 0xf3, 0x0d, 0x0c, 0x00, 0x4c, 0x4c, 0x7c,
-  0xf9, 0x32, 0x36, 0x06, 0xa0, 0x56, 0x47, 0xa3,
-  0x93, 0x93, 0x33, 0x99, 0x59, 0x5f, 0xdf, 0xdc,
-  0x7c, 0xfe, 0x7c, 0x4b, 0xcb, 0xe9, 0xd3, 0xb1,
-  0x33, 0x49, 0xb1, 0x0a, 0x8d, 0x46, 0x2a, 0x75,
-  0xbb, 0xef, 0xdd, 0xf3, 0x7a, 0xed, 0x76, 0x81,
-  0xa0, 0xb5, 0xb5, 0xa1, 0xe1, 0xd4, 0xa9, 0x33,
-  0x67, 0x66, 0xf6, 0xc4, 0xca, 0x95, 0x75, 0x75,
-  0x2d, 0x2d, 0x33, 0xaf, 0xf3, 0xfb, 0x15, 0x8a,
-  0x05, 0x0b, 0x00, 0x2c, 0x96, 0x91, 0x91, 0x9e,
-  0x1e, 0x80, 0xeb, 0xd7, 0xcf, 0x9d, 0x4b, 0xec,
-  0x1e, 0x80, 0x83, 0x07, 0x0f, 0x1d, 0x3a, 0x70,
-  0xa0, 0xb1, 0x91, 0x91, 0xe2, 0x09, 0xc4, 0xa5,
-  0x90, 0xd7, 0x3b, 0x36, 0x26, 0x10, 0x0c, 0x0d,
-  0xe1, 0xb8, 0x4c, 0x46, 0x10, 0x00, 0x5e, 0xaf,
-  0xd7, 0x3b, 0x3d, 0x15, 0x3c, 0x1e, 0x8f, 0xc7,
-  0xe3, 0x89, 0x1f, 0xe3, 0x0d, 0xf5, 0xf9, 0xbe,
-  0xa7, 0xe7, 0xf1, 0xf8, 0x7c, 0x81, 0x20, 0xf1,
-  0x79, 0x66, 0xb3, 0xc5, 0x62, 0x36, 0x73, 0x32,
-  0x41, 0x10, 0x04, 0x41, 0x00, 0xec, 0xda, 0xb5,
-  0x67, 0xcf, 0x8e, 0x1d, 0xc5, 0xc5, 0x33, 0x46,
-  0x80, 0x41, 0x4e, 0x8e, 0x52, 0xa9, 0x54, 0xaa,
-  0x54, 0x9c, 0x86, 0xa2, 0x98, 0xa2, 0xc4, 0x30,
-  0x89, 0x04, 0xc3, 0x7e, 0xdc, 0xe3, 0xb1, 0xa0,
-  0xe9, 0x68, 0x34, 0x1a, 0xe5, 0xe4, 0xf5, 0xeb,
-  0x8f, 0x1f, 0x6f, 0x6f, 0x07, 0x08, 0x87, 0x83,
-  0xc1, 0x60, 0x10, 0xa0, 0xa3, 0xe3, 0xf0, 0xe1,
-  0x0d, 0x1b, 0xb8, 0x79, 0x1c, 0xc7, 0x71, 0x1c,
-  0x07, 0xb0, 0xd9, 0x6c, 0x36, 0x9b, 0x4d, 0xaf,
-  0x67, 0xb4, 0x2f, 0x5f, 0x26, 0x8c, 0x00, 0x83,
-  0xb5, 0x6b, 0x4b, 0x4a, 0x8a, 0x8a, 0x4a, 0x4b,
-  0x01, 0x7c, 0x3e, 0x9f, 0xcf, 0xe7, 0x03, 0x40,
-  0x10, 0xe6, 0x8b, 0xf5, 0xb8, 0xc1, 0x50, 0x56,
-  0xb6, 0x7c, 0x39, 0x37, 0xa6, 0xa6, 0xe2, 0x38,
-  0x41, 0x70, 0xf3, 0x81, 0x40, 0x20, 0xe0, 0xf7,
-  0x4f, 0x97, 0x7d, 0x3e, 0xb7, 0x1b, 0x20, 0x37,
-  0xb7, 0xb8, 0x78, 0xe1, 0x42, 0x80, 0xec, 0xec,
-  0x82, 0x82, 0xb2, 0x32, 0x6e, 0x3e, 0x39, 0x59,
-  0x2c, 0x4e, 0x4e, 0xe6, 0xe4, 0xc5, 0x8b, 0x2b,
-  0x2a, 0x96, 0x2c, 0x61, 0xa5, 0x79, 0xf3, 0x62,
-  0x2d, 0x4d, 0x40, 0x60, 0xf5, 0x6a, 0xb5, 0x5a,
-  0xad, 0xce, 0xc8, 0x48, 0xec, 0xc9, 0x8b, 0x17,
-  0x77, 0xef, 0xae, 0xac, 0x04, 0x30, 0x1a, 0x5f,
-  0xbd, 0x7a, 0xfa, 0x94, 0xd3, 0x5b, 0xad, 0x16,
-  0xcb, 0xc8, 0x08, 0xe3, 0x6b, 0x9a, 0x06, 0x88,
-  0x44, 0xc2, 0xe1, 0x50, 0x88, 0x4b, 0x29, 0xb7,
-  0xdb, 0xe5, 0x72, 0x3a, 0xb9, 0xf5, 0x23, 0x23,
-  0x6f, 0xdf, 0xf6, 0xf5, 0x01, 0x5c, 0xb8, 0x50,
-  0x5b, 0xbb, 0x68, 0x51, 0xfc, 0x3d, 0x1a, 0x8d,
-  0x46, 0xa3, 0xd5, 0xb2, 0xd2, 0x91, 0x23, 0x09,
-  0x09, 0xb0, 0x39, 0x26, 0x16, 0x33, 0x1e, 0x10,
-  0x08, 0x04, 0x02, 0x81, 0x00, 0x40, 0xa1, 0x50,
-  0x28, 0x14, 0x8a, 0xf8, 0x83, 0x55, 0x2a, 0x82,
-  0xd0, 0x6a, 0x01, 0x9a, 0x9a, 0x6a, 0x6a, 0xe6,
-  0xcf, 0x07, 0x18, 0x1c, 0xec, 0xeb, 0xeb, 0xe9,
-  0x01, 0x90, 0xcb, 0x09, 0x42, 0xad, 0x06, 0x88,
-  0x46, 0x19, 0x02, 0xd3, 0x93, 0x87, 0xa6, 0x01,
-  0xa4, 0x52, 0x99, 0x4c, 0xa1, 0x00, 0x30, 0x1a,
-  0x5f, 0xbe, 0x7c, 0xf6, 0x8c, 0xdb, 0xaf, 0xd5,
-  0xaa, 0xd5, 0x6c, 0x82, 0x00, 0x00, 0x48, 0x24,
-  0x12, 0xc9, 0xf4, 0x57, 0x02, 0xc7, 0x71, 0x5c,
-  0xa1, 0x88, 0xaf, 0x85, 0x98, 0x08, 0xe8, 0xf5,
-  0xe9, 0xe9, 0x24, 0xa9, 0x54, 0x72, 0x1a, 0xa7,
-  0xd3, 0xe9, 0x74, 0x3a, 0xb9, 0x03, 0xd9, 0x11,
-  0x45, 0x51, 0x14, 0x45, 0x01, 0x74, 0xba, 0x8c,
-  0x8c, 0x39, 0x73, 0x00, 0x9a, 0x9b, 0xb7, 0x6f,
-  0xaf, 0xa8, 0x88, 0x27, 0x82, 0xa2, 0x08, 0x82,
-  0x20, 0x00, 0x18, 0x96, 0x9a, 0x2a, 0x97, 0x73,
-  0x86, 0xb3, 0xeb, 0xd9, 0xfd, 0xb1, 0xe7, 0xb3,
-  0xf7, 0xb2, 0x48, 0x4d, 0x95, 0x4a, 0x53, 0x53,
-  0x39, 0x3b, 0x13, 0x10, 0x98, 0x37, 0x6f, 0xee,
-  0xdc, 0xbc, 0xbc, 0xfc, 0x7c, 0x80, 0x50, 0x28,
-  0x14, 0x0a, 0x85, 0x68, 0x3a, 0x29, 0x29, 0x29,
-  0x89, 0xc7, 0x03, 0x70, 0xb9, 0x5c, 0x2e, 0x97,
-  0x8b, 0x3b, 0x58, 0x2c, 0x16, 0x8b, 0xc5, 0x62,
-  0xee, 0xc2, 0x82, 0x02, 0xbd, 0xbe, 0xb4, 0x14,
-  0xe0, 0xd2, 0xa5, 0xba, 0xba, 0xca, 0x4a, 0x8e,
-  0x88, 0x4c, 0x96, 0x96, 0xa6, 0x52, 0x01, 0x98,
-  0x4c, 0x03, 0x03, 0xfd, 0xfd, 0xdc, 0x3c, 0xbb,
-  0x3e, 0xd6, 0x60, 0x76, 0x8c, 0x44, 0x22, 0x91,
-  0x70, 0x18, 0x80, 0xa2, 0x28, 0x8a, 0xa2, 0x68,
-  0x3a, 0x27, 0x27, 0x3b, 0x3b, 0x27, 0x87, 0xb5,
-  0xb3, 0xa2, 0x22, 0x8e, 0x40, 0x20, 0x10, 0x08,
-  0x04, 0x02, 0x85, 0x85, 0x4a, 0xa5, 0x52, 0xa9,
-  0x54, 0x02, 0x60, 0x18, 0x86, 0x61, 0x18, 0x82,
-  0x84, 0xc3, 0xe1, 0x70, 0x24, 0x02, 0x10, 0x8d,
-  0x7e, 0xdb, 0x3d, 0x62, 0x2f, 0x64, 0x47, 0xb9,
-  0x3c, 0x25, 0x45, 0xa5, 0x02, 0x68, 0x6a, 0xda,
-  0xb6, 0xad, 0xac, 0x8c, 0x23, 0x72, 0xf6, 0xec,
-  0x96, 0x2d, 0xa5, 0xa5, 0xdc, 0x7c, 0xec, 0x3e,
-  0x16, 0xac, 0xe1, 0x4c, 0xcb, 0x60, 0xbb, 0x10,
-  0x82, 0x68, 0x34, 0x1a, 0x4d, 0x66, 0x26, 0x80,
-  0xdf, 0xef, 0xf7, 0x07, 0x02, 0x29, 0x29, 0xec,
-  0xfa, 0xaf, 0x6d, 0x54, 0x28, 0x14, 0x0a, 0x85,
-  0xc2, 0xb5, 0x6b, 0xf5, 0x7a, 0xbd, 0x7e, 0x7a,
-  0x2e, 0xb2, 0x6d, 0xec, 0x67, 0x81, 0xe3, 0x38,
-  0x5e, 0x5e, 0x0e, 0xf0, 0xf0, 0xe1, 0xb9, 0x73,
-  0xe5, 0xe5, 0x3f, 0xbf, 0x3f, 0x16, 0x06, 0x83,
-  0xc1, 0x60, 0x30, 0x00, 0x88, 0x44, 0x22, 0x91,
-  0x50, 0x58, 0x53, 0xc3, 0x68, 0xb7, 0x6e, 0x8d,
-  0x7b, 0x07, 0x98, 0x7e, 0x0b, 0x60, 0xb7, 0xdb,
-  0xed, 0x76, 0xfb, 0xcf, 0x5f, 0x44, 0xd3, 0xb1,
-  0xc5, 0xfb, 0x67, 0xf6, 0xb1, 0x0f, 0x5a, 0x2c,
-  0x92, 0x12, 0x6d, 0x08, 0x06, 0x99, 0x87, 0x85,
-  0xed, 0x42, 0x5d, 0x5d, 0x5d, 0x5d, 0x5d, 0x5d,
-  0x6c, 0xa4, 0x00, 0x24, 0x12, 0x0c, 0x4b, 0x4e,
-  0x06, 0x48, 0x49, 0xc1, 0x30, 0xa9, 0x94, 0x2b,
-  0x6a, 0xb6, 0x36, 0x10, 0x84, 0x29, 0x5e, 0x56,
-  0x66, 0x52, 0x92, 0x4b, 0x19, 0x92, 0x24, 0x49,
-  0x92, 0x04, 0x18, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
-  0x9f, 0x59, 0x4e, 0x44, 0x00, 0x85, 0x19, 0x10,
-  0x0e, 0x87, 0xc3, 0xe1, 0x30, 0x00, 0x8f, 0xc7,
-  0xe3, 0xf1, 0x78, 0x9c, 0xa7, 0x50, 0x14, 0x41,
-  0x78, 0x3c, 0xb6, 0x76, 0x38, 0xc2, 0xec, 0x3c,
-  0x9f, 0xcf, 0xe7, 0xf3, 0xf9, 0xbf, 0x1e, 0x91,
-  0x1f, 0x45, 0xc2, 0x08, 0xb0, 0x1e, 0x64, 0x5f,
-  0xe2, 0x92, 0x92, 0x92, 0x92, 0xe2, 0x62, 0x86,
-  0x50, 0x24, 0xc2, 0x11, 0x62, 0x09, 0xc6, 0x82,
-  0x7d, 0x47, 0xfe, 0x36, 0xe2, 0x08, 0x30, 0x21,
-  0xa3, 0x69, 0xa6, 0x1b, 0x21, 0xdf, 0xfc, 0x6e,
-  0x7f, 0xef, 0x41, 0xfb, 0x59, 0xc8, 0x64, 0x32,
-  0x99, 0x4c, 0xc6, 0xc9, 0x3a, 0x9d, 0x4e, 0xa7,
-  0xd3, 0xcd, 0x2c, 0x5b, 0xad, 0x56, 0xab, 0xd5,
-  0xca, 0xc6, 0x92, 0xb3, 0xeb, 0x2b, 0x01, 0xab,
-  0xd5, 0x6a, 0x1d, 0x1b, 0xdb, 0xb8, 0xf1, 0xc6,
-  0x8d, 0xb6, 0xb6, 0xab, 0x57, 0x3b, 0x3a, 0xfe,
-  0xbe, 0xef, 0x7e, 0x05, 0x08, 0xc2, 0xd8, 0xf9,
-  0xbd, 0x9f, 0x8e, 0x7f, 0x14, 0xff, 0x01, 0x85,
-  0x15, 0x45, 0xf6, 0x3e, 0x16, 0xe7, 0xe2, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
--- a/art/tango/document_save_as.h
+++ b/art/tango/document_save_as.h
@@ -1,332 +0,0 @@
-/* document_save_as.png - 866 bytes */
-static const unsigned char document_save_as_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0b, 0x0a, 0x0d, 0x38, 0x0f, 0x19,
-  0xb2, 0xc4, 0x70, 0x00, 0x00, 0x00, 0x8c, 0x74,
-  0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
-  0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
-  0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
-  0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
-  0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
-  0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
-  0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
-  0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
-  0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
-  0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
-  0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
-  0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
-  0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
-  0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
-  0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
-  0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
-  0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
-  0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
-  0x8a, 0xc7, 0x47, 0x00, 0x00, 0x02, 0x57, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x92, 0x4f,
-  0x48, 0x93, 0x61, 0x1c, 0xc7, 0x3f, 0xef, 0xdb,
-  0xfc, 0x33, 0x73, 0xf2, 0xce, 0xe1, 0x6b, 0x5a,
-  0xb6, 0x89, 0x9a, 0x48, 0x1d, 0x22, 0x34, 0xb6,
-  0x04, 0x0d, 0x0f, 0x69, 0x90, 0x44, 0xe1, 0x21,
-  0x84, 0xc4, 0x22, 0xa8, 0x58, 0x8d, 0x79, 0xea,
-  0x60, 0x61, 0x1e, 0x0c, 0x21, 0x03, 0xf1, 0x20,
-  0x45, 0x87, 0xa4, 0x20, 0x84, 0x15, 0x05, 0x45,
-  0xdd, 0x22, 0xa1, 0x83, 0x66, 0x79, 0x28, 0xb2,
-  0x83, 0x9a, 0x68, 0x59, 0x86, 0xe4, 0x70, 0x6e,
-  0xa5, 0xdb, 0xde, 0xf7, 0xd7, 0x61, 0xb6, 0x12,
-  0x2d, 0xc8, 0xcf, 0xe9, 0x79, 0x9e, 0x2f, 0xcf,
-  0x87, 0xef, 0xf3, 0xe3, 0x51, 0xce, 0x75, 0x5c,
-  0xb8, 0x38, 0x15, 0xce, 0x57, 0xe7, 0xe6, 0xa3,
-  0x0b, 0x40, 0x01, 0x50, 0x07, 0xec, 0x4c, 0x51,
-  0x65, 0xd9, 0x96, 0xfe, 0xfd, 0x5b, 0x56, 0x5a,
-  0xb4, 0xaf, 0xbf, 0xf3, 0x4a, 0x2b, 0x7f, 0x41,
-  0xa9, 0xf1, 0xf7, 0x34, 0xb9, 0x76, 0x94, 0xb9,
-  0x9c, 0xb9, 0xfa, 0xe4, 0xee, 0xc2, 0x1c, 0xbf,
-  0xd3, 0x6e, 0xdd, 0x13, 0x89, 0x1b, 0x8c, 0x7e,
-  0x59, 0xe4, 0xf5, 0xd0, 0x80, 0x39, 0xf6, 0x71,
-  0x96, 0x52, 0xfb, 0x9b, 0xed, 0xbd, 0xed, 0x77,
-  0x67, 0xd6, 0x15, 0x78, 0xdb, 0x3a, 0x7b, 0x63,
-  0xa1, 0xb9, 0xb3, 0x71, 0x51, 0x99, 0x35, 0x34,
-  0x7e, 0xa4, 0xe5, 0xb0, 0xc9, 0x92, 0x42, 0x63,
-  0xed, 0x3e, 0x8a, 0xf2, 0xb3, 0xe9, 0xbe, 0xff,
-  0x02, 0xe3, 0xd3, 0x08, 0xae, 0xd4, 0xf9, 0xf5,
-  0xee, 0xb7, 0xe3, 0x6d, 0xf1, 0xc9, 0xf4, 0xe7,
-  0x09, 0x11, 0x11, 0x99, 0x98, 0x1a, 0x95, 0xa1,
-  0xd1, 0x09, 0xf1, 0xdd, 0x78, 0x22, 0xee, 0xd3,
-  0x57, 0x25, 0x30, 0x3c, 0x2d, 0x3d, 0x4f, 0xdf,
-  0x4a, 0xc3, 0xa5, 0x9b, 0xf2, 0x6e, 0x72, 0x46,
-  0xfe, 0x24, 0x1c, 0x0e, 0x8b, 0xcf, 0xef, 0x15,
-  0x4b, 0x9a, 0xc5, 0x60, 0x6b, 0xae, 0x8b, 0x60,
-  0x30, 0x88, 0x96, 0x99, 0x8b, 0xaa, 0x2c, 0x60,
-  0x95, 0x28, 0x00, 0x23, 0xe3, 0xb3, 0xe8, 0x99,
-  0x16, 0xbe, 0xce, 0x2f, 0xf2, 0x7e, 0xe2, 0x03,
-  0x5b, 0xb2, 0xac, 0xa0, 0x00, 0x08, 0xa9, 0xa9,
-  0xa9, 0x00, 0x58, 0xe2, 0x31, 0x10, 0x53, 0x30,
-  0x4c, 0x93, 0xfa, 0xd6, 0x5b, 0x6b, 0x3a, 0x0e,
-  0x4d, 0x06, 0x89, 0xc5, 0x0d, 0xba, 0x02, 0x83,
-  0x74, 0x05, 0x06, 0x01, 0x78, 0xdc, 0x71, 0x02,
-  0x24, 0x91, 0xab, 0x00, 0xa6, 0x98, 0x98, 0x86,
-  0x49, 0xcf, 0x19, 0x0f, 0x00, 0xcd, 0xc7, 0x8e,
-  0xe0, 0x71, 0x97, 0xb3, 0xb4, 0x14, 0x21, 0xcf,
-  0xa6, 0x52, 0xe9, 0xae, 0xa0, 0xa9, 0xa1, 0x1e,
-  0x80, 0xe3, 0x35, 0xc5, 0x98, 0x86, 0x89, 0x88,
-  0xfc, 0x16, 0x88, 0x08, 0x76, 0xbb, 0x46, 0x7e,
-  0x8e, 0x8b, 0x6b, 0xa7, 0xca, 0xe9, 0xeb, 0x7f,
-  0x40, 0xa9, 0xab, 0x00, 0x15, 0x05, 0x15, 0x05,
-  0x77, 0x99, 0x93, 0xdb, 0xf7, 0x1e, 0xd1, 0x58,
-  0x5d, 0xc8, 0xe1, 0xca, 0x0a, 0x32, 0x36, 0x67,
-  0xac, 0x16, 0x00, 0x84, 0xc3, 0x61, 0x74, 0x5d,
-  0xc7, 0x99, 0x57, 0x92, 0x94, 0x78, 0x76, 0x15,
-  0x51, 0xe2, 0xda, 0x46, 0xf7, 0x9d, 0x87, 0x34,
-  0x56, 0x17, 0x72, 0xb4, 0xca, 0x8d, 0xae, 0xeb,
-  0x44, 0xa3, 0xd1, 0xe4, 0x13, 0x2d, 0x00, 0xa6,
-  0x69, 0x12, 0x89, 0x44, 0x00, 0xd0, 0x75, 0x1d,
-  0x5d, 0xd7, 0xe9, 0x3d, 0x6f, 0xa5, 0xe5, 0x7a,
-  0x80, 0xe5, 0x98, 0xc1, 0xc9, 0xda, 0x32, 0x9a,
-  0x0f, 0x1d, 0x40, 0x55, 0x55, 0x42, 0xa1, 0x10,
-  0x91, 0x48, 0x04, 0x9b, 0xcd, 0x96, 0xf8, 0x07,
-  0x3e, 0xbf, 0x57, 0x2a, 0xca, 0xf7, 0x22, 0xac,
-  0x0c, 0xf8, 0x3f, 0x18, 0x7e, 0xf5, 0x32, 0xd1,
-  0xc0, 0xe3, 0xae, 0x04, 0x91, 0x15, 0x83, 0x92,
-  0x98, 0xb0, 0x22, 0x20, 0xca, 0xca, 0x36, 0xa1,
-  0x2f, 0x29, 0x2e, 0x66, 0x7c, 0x7c, 0x0c, 0x41,
-  0x41, 0xf9, 0x53, 0xe0, 0x70, 0x38, 0x78, 0x3e,
-  0xf0, 0x2c, 0x19, 0x08, 0xb2, 0xa6, 0xcd, 0xfe,
-  0xaa, 0x1a, 0x00, 0xb2, 0x1d, 0x0e, 0x10, 0x25,
-  0x99, 0x5b, 0x00, 0x34, 0x4d, 0x23, 0x3d, 0xdd,
-  0xfa, 0xcf, 0xba, 0x9a, 0x5d, 0x03, 0xc0, 0xae,
-  0xd9, 0x57, 0x9d, 0x5b, 0x7e, 0x2d, 0xea, 0x6a,
-  0x0f, 0xb2, 0x11, 0x14, 0x9f, 0xdf, 0x7b, 0x19,
-  0x68, 0x63, 0x63, 0xb4, 0xff, 0x04, 0x95, 0xbe,
-  0xf4, 0xab, 0x3f, 0x7b, 0xb6, 0x9d, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
-
-
-/* document_save_as.png - 1728 bytes */
-static const unsigned char document_save_as_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
-  0x4b, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
-  0x57, 0x59, 0x4c, 0x13, 0x5d, 0x14, 0x3e, 0x33,
-  0xb4, 0xd3, 0x96, 0xd2, 0x65, 0x5a, 0xa6, 0xb4,
-  0xc5, 0x5a, 0x5a, 0x4a, 0x45, 0x71, 0x41, 0x4c,
-  0x55, 0xdc, 0x31, 0xf1, 0x41, 0xa3, 0x44, 0x5f,
-  0xf4, 0x41, 0x63, 0x4c, 0xf0, 0x45, 0x25, 0x42,
-  0xdd, 0x30, 0x2e, 0x0f, 0xee, 0xa2, 0xc6, 0x85,
-  0x08, 0x31, 0x2e, 0x89, 0xbb, 0x92, 0xe8, 0x8b,
-  0x2f, 0x1a, 0xe3, 0x83, 0xc4, 0x18, 0x91, 0x26,
-  0x88, 0x8a, 0xc8, 0x52, 0x6a, 0x6d, 0x8a, 0x45,
-  0x0a, 0x94, 0xd2, 0xe9, 0x0e, 0x9d, 0xff, 0x61,
-  0x32, 0xff, 0x60, 0x4b, 0xd3, 0xff, 0x47, 0xff,
-  0xc5, 0x2f, 0x69, 0xee, 0x9c, 0x7b, 0xcf, 0x3d,
-  0xf7, 0xfb, 0xce, 0x9c, 0x7b, 0xef, 0x14, 0xe0,
-  0x37, 0x07, 0x92, 0xca, 0xa1, 0xbc, 0xfc, 0xc4,
-  0x89, 0xaa, 0xaa, 0x1b, 0x37, 0xbe, 0x7e, 0x25,
-  0x49, 0xb5, 0x7a, 0xed, 0x5a, 0xb7, 0x7b, 0x70,
-  0x30, 0x12, 0x91, 0xc9, 0x92, 0xf9, 0x0b, 0x04,
-  0x5c, 0x2e, 0x45, 0xf9, 0xfd, 0x0a, 0x45, 0x46,
-  0x86, 0xcf, 0xd7, 0xd6, 0x96, 0x95, 0x25, 0x14,
-  0x7e, 0xfe, 0x6c, 0x36, 0xd7, 0xd4, 0x1c, 0x3e,
-  0xfc, 0xe8, 0xd1, 0xeb, 0xd7, 0xff, 0x9a, 0x80,
-  0xda, 0xda, 0x5b, 0xb7, 0xcc, 0xe6, 0xc2, 0xc2,
-  0xc7, 0x8f, 0xdf, 0xbd, 0xd3, 0xe9, 0x9a, 0x9a,
-  0x72, 0x72, 0x8c, 0xc6, 0xa9, 0x53, 0xc3, 0x61,
-  0xad, 0x36, 0x2b, 0x4b, 0xa1, 0x40, 0x51, 0x9f,
-  0x2f, 0x1a, 0x45, 0x51, 0x3e, 0x3f, 0x3b, 0x5b,
-  0x2c, 0xe6, 0xf3, 0x51, 0xf4, 0xdb, 0x37, 0x9f,
-  0x2f, 0x12, 0x01, 0x18, 0x1c, 0x0c, 0x06, 0xc3,
-  0x61, 0x80, 0xa1, 0xa1, 0x8e, 0x8e, 0x17, 0x2f,
-  0x6c, 0xb6, 0x40, 0xc0, 0xef, 0x0f, 0x85, 0x78,
-  0x3c, 0x9d, 0x0e, 0xc7, 0xdb, 0xdb, 0xab, 0xaa,
-  0xea, 0xea, 0x8e, 0x1c, 0xb9, 0x7f, 0xff, 0xde,
-  0xbd, 0x5f, 0x25, 0x20, 0x2d, 0x19, 0xf1, 0x17,
-  0x2f, 0xda, 0xdb, 0x55, 0xaa, 0xc7, 0x8f, 0x27,
-  0x4f, 0x9e, 0x39, 0x73, 0xd9, 0x32, 0xa9, 0xd4,
-  0x6e, 0xb7, 0x5a, 0xdb, 0xdb, 0x31, 0xac, 0xbb,
-  0xdb, 0x6e, 0xb7, 0xdb, 0xb9, 0x5c, 0x87, 0xe3,
-  0xcb, 0x97, 0xee, 0x6e, 0x14, 0x75, 0x38, 0xfa,
-  0xfb, 0x07, 0x06, 0x00, 0xb8, 0x5c, 0x91, 0x48,
-  0x26, 0x03, 0xc0, 0x71, 0x3e, 0x1f, 0xc3, 0x00,
-  0xf8, 0x7c, 0x82, 0x30, 0x18, 0x70, 0x7c, 0x68,
-  0x28, 0x18, 0x8c, 0xc5, 0xc4, 0xe2, 0x9e, 0x1e,
-  0xb7, 0x9b, 0xcf, 0x5f, 0xb9, 0x72, 0xcd, 0x9a,
-  0xd5, 0xab, 0xe5, 0xf2, 0xe6, 0xe6, 0xa6, 0xa6,
-  0x97, 0x2f, 0x3f, 0x7d, 0xb2, 0x5a, 0x7f, 0x56,
-  0x00, 0x1a, 0xdf, 0xf1, 0xf6, 0x6d, 0x57, 0x17,
-  0x9f, 0x5f, 0x5d, 0x3d, 0x69, 0x52, 0x66, 0x26,
-  0x87, 0x63, 0xb7, 0x93, 0xa4, 0xd5, 0xfa, 0xfc,
-  0x79, 0x47, 0xc7, 0xdc, 0xb9, 0x04, 0xd1, 0xd8,
-  0xb8, 0x69, 0x53, 0x43, 0xc3, 0xf9, 0xf3, 0xdb,
-  0xb7, 0xa3, 0xe8, 0xe2, 0xc5, 0x5a, 0xad, 0xc5,
-  0xb2, 0x72, 0x65, 0x34, 0xea, 0xf5, 0xf6, 0xf4,
-  0x0c, 0x0f, 0x3b, 0x9d, 0xdd, 0xdd, 0xad, 0xad,
-  0x14, 0xd5, 0xd7, 0x37, 0x3c, 0xec, 0xf3, 0x01,
-  0xf8, 0x7c, 0x7e, 0x3f, 0x49, 0x02, 0xe0, 0xb8,
-  0x42, 0xa1, 0x52, 0x01, 0x08, 0x85, 0x0a, 0x85,
-  0x46, 0xc3, 0xe3, 0x7d, 0xfc, 0xe8, 0x76, 0xcf,
-  0x9a, 0xf5, 0xf0, 0xe1, 0x9e, 0x3d, 0xc7, 0x8e,
-  0xad, 0x59, 0x23, 0x14, 0xfe, 0x72, 0x01, 0x1e,
-  0x4f, 0x20, 0x20, 0x10, 0x18, 0x0c, 0x69, 0x69,
-  0xa3, 0xa3, 0x24, 0xe9, 0xf5, 0x2e, 0x59, 0x92,
-  0x97, 0xe7, 0x74, 0xae, 0x58, 0x71, 0xf2, 0xe4,
-  0xee, 0xdd, 0xd7, 0xaf, 0x3f, 0x78, 0xc0, 0xf8,
-  0x9d, 0x3e, 0xbd, 0x77, 0xef, 0xdd, 0xbb, 0xcf,
-  0x9e, 0x99, 0x4c, 0x1a, 0x8d, 0xd3, 0x79, 0xf4,
-  0x28, 0x49, 0x7a, 0x3c, 0x1e, 0x0f, 0x82, 0xf8,
-  0xfd, 0xc3, 0xc3, 0x83, 0x83, 0x00, 0x91, 0x48,
-  0x28, 0x14, 0x08, 0xb0, 0x71, 0x15, 0x0a, 0x8d,
-  0x26, 0x2f, 0x0f, 0x45, 0x09, 0x42, 0x28, 0x8c,
-  0x44, 0x1c, 0x8e, 0xfe, 0xfe, 0x48, 0x44, 0xa7,
-  0xab, 0xab, 0xfb, 0x59, 0x01, 0x09, 0x7b, 0x60,
-  0xe3, 0xc6, 0x03, 0x07, 0x76, 0xed, 0x7a, 0xf2,
-  0x44, 0xa7, 0xe3, 0xf1, 0xa2, 0xd1, 0x0f, 0x1f,
-  0x86, 0x87, 0x3d, 0x9e, 0x58, 0xec, 0xe0, 0xc1,
-  0x64, 0x01, 0x78, 0x3c, 0x81, 0x00, 0x41, 0x00,
-  0x5e, 0xbd, 0x1a, 0x1c, 0xd4, 0x6a, 0x01, 0x72,
-  0x72, 0x0a, 0x0a, 0x8a, 0x8a, 0x92, 0x2f, 0x28,
-  0x95, 0x06, 0x83, 0x6d, 0x6d, 0x00, 0xfd, 0xfd,
-  0xdf, 0xbf, 0xf7, 0xf6, 0x02, 0xa8, 0xd5, 0xb1,
-  0xd8, 0xd0, 0x50, 0x2a, 0x9a, 0x55, 0x55, 0x35,
-  0x35, 0x17, 0x2f, 0xd6, 0xd6, 0x9e, 0x39, 0x13,
-  0x3f, 0xc2, 0x89, 0xef, 0xd0, 0x68, 0xc4, 0x62,
-  0x9f, 0xef, 0xe9, 0xd3, 0x40, 0x60, 0x60, 0x00,
-  0xc3, 0xea, 0xea, 0x4e, 0x9f, 0x3e, 0x79, 0xf2,
-  0xec, 0xd9, 0xd4, 0x99, 0x58, 0xbe, 0xdc, 0x6c,
-  0xae, 0xad, 0x4d, 0xed, 0x17, 0x0a, 0xc9, 0xe5,
-  0xf3, 0xe6, 0x01, 0x38, 0x9d, 0x36, 0x5b, 0x43,
-  0x03, 0xc0, 0xed, 0xdb, 0x17, 0x2e, 0x24, 0x4f,
-  0x0f, 0xc0, 0xfe, 0xfd, 0x07, 0x0e, 0xec, 0xdd,
-  0x5b, 0x5d, 0x4d, 0x5b, 0x89, 0x02, 0x12, 0x4a,
-  0x28, 0x10, 0xe8, 0xed, 0xc5, 0xb0, 0xae, 0x2e,
-  0x1c, 0x97, 0x4a, 0x09, 0x02, 0x20, 0x10, 0x08,
-  0x04, 0xc6, 0x96, 0x82, 0xdf, 0xef, 0xf7, 0xfb,
-  0xfd, 0x89, 0x6d, 0x22, 0xd1, 0x60, 0x70, 0xbc,
-  0xfe, 0xb4, 0x34, 0x2e, 0x17, 0xc3, 0x92, 0xc7,
-  0x73, 0x38, 0x9c, 0x4e, 0x87, 0x83, 0xb5, 0x09,
-  0x82, 0x20, 0x08, 0x02, 0x60, 0xe7, 0xce, 0xca,
-  0xca, 0x1d, 0x3b, 0x0a, 0x0b, 0x53, 0xbe, 0x01,
-  0x1a, 0xb9, 0xb9, 0x4a, 0xa5, 0x52, 0xa9, 0x52,
-  0xb1, 0x3d, 0x24, 0x49, 0x6f, 0xca, 0x8c, 0x0c,
-  0xa1, 0x30, 0x23, 0xe3, 0xaf, 0x67, 0x3c, 0x1e,
-  0x14, 0x15, 0x8b, 0xc5, 0x62, 0xac, 0xbd, 0x6e,
-  0xdd, 0xd1, 0xa3, 0xf7, 0xef, 0x03, 0x8c, 0x8c,
-  0x44, 0x22, 0x91, 0x08, 0x40, 0x7d, 0xfd, 0xc1,
-  0x83, 0xeb, 0xd7, 0xb3, 0xe3, 0x38, 0x8e, 0xe3,
-  0x38, 0x0e, 0xe0, 0x76, 0xbb, 0xdd, 0x6e, 0xb7,
-  0xd1, 0x48, 0xf7, 0xb6, 0xb4, 0x24, 0x7d, 0x03,
-  0x34, 0x4a, 0x4b, 0x67, 0xcf, 0x9e, 0x35, 0xab,
-  0xa8, 0x08, 0x20, 0x18, 0x0c, 0x06, 0x83, 0x41,
-  0x00, 0x04, 0xa1, 0x7f, 0xf1, 0x19, 0xcf, 0xcf,
-  0x37, 0x99, 0x96, 0x2e, 0x65, 0x5b, 0x89, 0x04,
-  0xc7, 0x09, 0x82, 0x1d, 0x0f, 0x87, 0xc3, 0xe1,
-  0x50, 0x68, 0xac, 0x1d, 0x0c, 0xfa, 0x7c, 0x00,
-  0x06, 0x43, 0x61, 0xe1, 0xfc, 0xf9, 0x00, 0x7a,
-  0xfd, 0xf4, 0xe9, 0x26, 0x13, 0x3b, 0x9e, 0x9e,
-  0x2e, 0x10, 0xa4, 0xa7, 0xb3, 0xf6, 0xc2, 0x85,
-  0xc5, 0xc5, 0x8b, 0x16, 0x31, 0xd6, 0x8c, 0x19,
-  0xf1, 0x4c, 0x93, 0x08, 0x58, 0xb5, 0x4a, 0xad,
-  0x56, 0xab, 0xb3, 0xb3, 0x93, 0x67, 0xf2, 0xea,
-  0xd5, 0x8a, 0x8a, 0x92, 0x12, 0x00, 0xab, 0xf5,
-  0xfd, 0xfb, 0x37, 0x6f, 0xd8, 0x7e, 0x97, 0xcb,
-  0xe9, 0xb4, 0xd9, 0xe8, 0x5c, 0x53, 0x14, 0xc0,
-  0xe8, 0xe8, 0xc8, 0x48, 0x34, 0xca, 0x96, 0x94,
-  0xcf, 0xe7, 0xf5, 0x7a, 0x3c, 0xac, 0xbf, 0xcd,
-  0xd6, 0xda, 0x6a, 0xb1, 0x00, 0x5c, 0xbe, 0xbc,
-  0x7d, 0xfb, 0x82, 0x05, 0x89, 0xeb, 0x68, 0x34,
-  0x1a, 0x8d, 0x56, 0xcb, 0x58, 0x87, 0x0e, 0x25,
-  0x15, 0xc0, 0xd4, 0x98, 0x40, 0x40, 0x67, 0x00,
-  0xc3, 0x30, 0x0c, 0xc3, 0x00, 0xe4, 0x72, 0xb9,
-  0x5c, 0x2e, 0x4f, 0x0c, 0xac, 0x52, 0x11, 0x84,
-  0x56, 0x0b, 0x70, 0xfe, 0x7c, 0x59, 0xd9, 0x9c,
-  0x39, 0x00, 0xed, 0xed, 0x16, 0x4b, 0x43, 0x03,
-  0x80, 0x4c, 0x46, 0x10, 0x6a, 0x35, 0x40, 0x2c,
-  0x46, 0x0b, 0x18, 0x5b, 0x3c, 0x14, 0x05, 0x20,
-  0x16, 0x4b, 0xa5, 0x72, 0x39, 0x80, 0xd5, 0xda,
-  0xd2, 0xd2, 0xd8, 0xc8, 0xce, 0xd7, 0x6a, 0xd5,
-  0x6a, 0xa6, 0x40, 0x00, 0x00, 0x84, 0x42, 0xa1,
-  0x70, 0xec, 0x2d, 0x81, 0xe3, 0x38, 0x2e, 0x97,
-  0x27, 0xee, 0x85, 0xb8, 0x37, 0x60, 0x34, 0x66,
-  0x65, 0x29, 0x14, 0x4a, 0x25, 0xdb, 0xe3, 0xf1,
-  0x78, 0x3c, 0x1e, 0x0f, 0x1b, 0x90, 0x69, 0x51,
-  0x14, 0x45, 0x51, 0x14, 0x40, 0xa7, 0xcb, 0xce,
-  0x9e, 0x32, 0x05, 0xa0, 0xa6, 0x66, 0xdb, 0xb6,
-  0xe2, 0xe2, 0x44, 0x21, 0x28, 0x8a, 0x20, 0x08,
-  0x02, 0x90, 0x91, 0x21, 0x91, 0xc8, 0x64, 0x2c,
-  0x71, 0xc6, 0x9f, 0x99, 0x1f, 0x1f, 0x9f, 0x59,
-  0x97, 0x81, 0x44, 0x22, 0x16, 0x4b, 0x24, 0x2c,
-  0xcf, 0x24, 0x02, 0x66, 0xcc, 0x98, 0x36, 0x6d,
-  0xea, 0xd4, 0x82, 0x02, 0x80, 0x68, 0x34, 0x1a,
-  0x8d, 0x46, 0x29, 0x8a, 0xc3, 0xe1, 0x70, 0xd2,
-  0xd2, 0x00, 0xbc, 0x5e, 0xaf, 0xd7, 0xeb, 0x65,
-  0x03, 0x0b, 0x04, 0x02, 0x81, 0x40, 0xc0, 0x2e,
-  0x38, 0x7d, 0xba, 0xd1, 0x58, 0x54, 0x04, 0x70,
-  0xed, 0x9a, 0xd9, 0x5c, 0x52, 0xc2, 0x0a, 0x91,
-  0x4a, 0x33, 0x33, 0x55, 0x2a, 0x00, 0xbb, 0xbd,
-  0xad, 0xad, 0xb9, 0x99, 0x1d, 0x67, 0xfc, 0xe3,
-  0x09, 0x33, 0xed, 0xe8, 0xe8, 0xe8, 0xe8, 0xc8,
-  0x08, 0x00, 0x49, 0x92, 0x24, 0x49, 0x52, 0x54,
-  0x6e, 0xae, 0x5e, 0x9f, 0x9b, 0xcb, 0xf0, 0x2c,
-  0x2e, 0x66, 0x9e, 0xfe, 0x3c, 0x85, 0xc2, 0xe1,
-  0x70, 0x38, 0x1c, 0x9e, 0x39, 0x53, 0xa9, 0x54,
-  0x2a, 0x95, 0x4a, 0x80, 0x53, 0xa7, 0xaa, 0xab,
-  0x8f, 0x1f, 0x47, 0x52, 0x7e, 0xad, 0x26, 0x83,
-  0xc9, 0x24, 0x12, 0x45, 0x22, 0x00, 0x16, 0x8b,
-  0xc5, 0x02, 0x00, 0x30, 0x77, 0xae, 0x48, 0xd4,
-  0xd9, 0x09, 0x70, 0xed, 0xda, 0x95, 0x2b, 0x9d,
-  0x9d, 0x7f, 0x37, 0x1a, 0x82, 0x6c, 0xd9, 0xb2,
-  0x79, 0x73, 0x59, 0x19, 0x40, 0x28, 0x14, 0x0a,
-  0x85, 0xc3, 0x22, 0x51, 0x82, 0x00, 0x1e, 0x8f,
-  0xc7, 0xe3, 0xf1, 0x4a, 0x4b, 0x8d, 0x46, 0xa3,
-  0x71, 0x6c, 0x2d, 0x56, 0x56, 0x56, 0x54, 0xec,
-  0xd9, 0x03, 0x80, 0x20, 0x74, 0x0d, 0x53, 0x14,
-  0x7d, 0x1a, 0xd1, 0x55, 0x4d, 0x07, 0xa7, 0x6d,
-  0x7a, 0xfc, 0x47, 0xeb, 0x47, 0x12, 0xf4, 0x49,
-  0xc6, 0xc6, 0x01, 0x00, 0xd0, 0xeb, 0xf5, 0x7a,
-  0xbd, 0x1e, 0xc0, 0x66, 0xb3, 0xd9, 0x6c, 0x36,
-  0x76, 0x3e, 0x3d, 0x03, 0xe0, 0xc2, 0x85, 0x4b,
-  0x97, 0xce, 0x9d, 0x03, 0xc8, 0xcf, 0xcf, 0xcf,
-  0xcf, 0xcf, 0x07, 0xe0, 0xf3, 0xf9, 0x7c, 0x1e,
-  0xaf, 0xac, 0x8c, 0xf6, 0xd8, 0xba, 0x35, 0xe1,
-  0x1e, 0xa0, 0xcf, 0x5b, 0xd6, 0x4e, 0x4f, 0xa7,
-  0x4b, 0xc5, 0xe1, 0x70, 0x38, 0x1c, 0x8e, 0x89,
-  0xbe, 0x8f, 0x44, 0x18, 0x0c, 0x06, 0x83, 0xc1,
-  0xc0, 0xda, 0x32, 0x99, 0x4c, 0x86, 0xe3, 0xf4,
-  0x33, 0x8a, 0x8e, 0x4d, 0xd0, 0xf8, 0xbc, 0x18,
-  0xa0, 0x90, 0x02, 0x32, 0x19, 0x8e, 0x27, 0xff,
-  0xfb, 0x32, 0x71, 0x30, 0x17, 0x14, 0x03, 0x89,
-  0x44, 0x22, 0x91, 0x4a, 0xe9, 0x56, 0x2c, 0xa6,
-  0x5b, 0x76, 0xd3, 0x26, 0x07, 0x27, 0x95, 0x03,
-  0x97, 0x8b, 0x61, 0x5c, 0x2e, 0x80, 0xc9, 0x64,
-  0x32, 0x8d, 0xbd, 0x70, 0xfe, 0x2f, 0x48, 0x29,
-  0xa0, 0xa2, 0xc2, 0x6c, 0x2e, 0x2f, 0xff, 0xe7,
-  0x08, 0xd0, 0xe7, 0xfa, 0xc4, 0xd7, 0x49, 0x10,
-  0xd0, 0xd7, 0xd7, 0xd7, 0xd7, 0xd7, 0x47, 0x51,
-  0xbb, 0x77, 0x9b, 0xcd, 0xfb, 0xf6, 0x4d, 0xfc,
-  0x14, 0xfa, 0xd5, 0x70, 0xb9, 0x5c, 0x2e, 0x97,
-  0x8b, 0xd9, 0x15, 0x2c, 0x2f, 0xce, 0x58, 0x87,
-  0xde, 0xde, 0x0d, 0x1b, 0xee, 0xdc, 0xb9, 0x77,
-  0xef, 0xe6, 0xcd, 0xfa, 0xfa, 0xff, 0x9a, 0xf0,
-  0xf8, 0x40, 0x10, 0x9a, 0xe7, 0x78, 0x1f, 0x1d,
-  0xbf, 0x29, 0xfe, 0x00, 0xb1, 0xc5, 0xe7, 0x75,
-  0x19, 0x76, 0x78, 0x24, 0x00, 0x00, 0x00, 0x00,
-  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
--- a/art/tango/drive_harddisk.h
+++ b/art/tango/drive_harddisk.h
@@ -1,193 +0,0 @@
-/* drive_harddisk.png - 603 bytes */
-static const unsigned char drive_harddisk_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x04, 0x05, 0x0f, 0x35, 0x08, 0xeb,
-  0xcf, 0x7c, 0x77, 0x00, 0x00, 0x00, 0x8c, 0x74,
-  0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
-  0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
-  0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
-  0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
-  0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
-  0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
-  0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
-  0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
-  0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
-  0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
-  0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
-  0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
-  0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
-  0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
-  0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
-  0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
-  0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
-  0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
-  0x8a, 0xc7, 0x47, 0x00, 0x00, 0x01, 0x50, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x93, 0x4d,
-  0x6e, 0xc2, 0x30, 0x10, 0x85, 0xbf, 0xa0, 0x40,
-  0xa4, 0x20, 0xcb, 0xc9, 0x26, 0x6a, 0x24, 0xf6,
-  0x70, 0x37, 0x24, 0xc4, 0x0d, 0xda, 0xde, 0x90,
-  0x15, 0x27, 0x40, 0x2c, 0xd8, 0x41, 0x6c, 0x10,
-  0xf9, 0x99, 0xe9, 0x22, 0xe0, 0x28, 0xed, 0xa2,
-  0x55, 0x99, 0x85, 0xed, 0x19, 0xcf, 0x7b, 0x7e,
-  0x33, 0xb6, 0xe1, 0x45, 0x8b, 0x36, 0xdb, 0xf5,
-  0x07, 0xf0, 0xfe, 0x4f, 0xfc, 0x27, 0x9b, 0xed,
-  0x5a, 0xff, 0x63, 0xce, 0x39, 0xdd, 0x6c, 0xd7,
-  0x1a, 0x03, 0x88, 0x08, 0xe7, 0xf3, 0x19, 0x55,
-  0x85, 0x28, 0x02, 0xd5, 0xb1, 0x4c, 0x40, 0x9f,
-  0x43, 0x04, 0xa0, 0xcc, 0x66, 0x33, 0x00, 0x62,
-  0x00, 0x15, 0xa5, 0x13, 0xe9, 0xb3, 0x45, 0x06,
-  0x00, 0x10, 0x11, 0x21, 0xaa, 0x7d, 0x8c, 0xa8,
-  0xc7, 0xf7, 0xce, 0x40, 0x20, 0x2a, 0x48, 0x27,
-  0x44, 0x0f, 0x90, 0x02, 0xa8, 0x3e, 0x00, 0xca,
-  0x53, 0x18, 0xaa, 0x3d, 0xb1, 0xd0, 0xab, 0x0d,
-  0x0a, 0x54, 0xc9, 0xf3, 0x8c, 0xd3, 0xe9, 0xf4,
-  0xa7, 0xce, 0x65, 0x59, 0x46, 0xd7, 0x75, 0x00,
-  0x4c, 0x9e, 0x41, 0xe7, 0x1c, 0x45, 0x51, 0xfc,
-  0x0a, 0x2e, 0x8a, 0x82, 0xba, 0xae, 0x83, 0x1f,
-  0x9a, 0xe8, 0xbd, 0x0f, 0x09, 0x00, 0xd7, 0xeb,
-  0x95, 0xaa, 0xaa, 0x00, 0x30, 0xc6, 0x90, 0xa6,
-  0x29, 0x93, 0xc9, 0x84, 0xcb, 0xe5, 0x82, 0xf7,
-  0x1e, 0x63, 0xcc, 0x40, 0x90, 0x24, 0x09, 0x8b,
-  0xc5, 0x62, 0x74, 0x92, 0xb5, 0x16, 0x6b, 0x2d,
-  0x00, 0xde, 0x7b, 0xea, 0xba, 0xe6, 0x76, 0xbb,
-  0xfd, 0x50, 0x14, 0x03, 0xec, 0x76, 0x3b, 0x9a,
-  0xa6, 0x19, 0x6d, 0xb4, 0x6d, 0x4b, 0x1c, 0xc7,
-  0x61, 0xfd, 0xdd, 0xf2, 0x3c, 0x1f, 0xf7, 0xa0,
-  0x6d, 0x5b, 0xf6, 0xfb, 0x3d, 0xc7, 0xe3, 0x91,
-  0xaa, 0xaa, 0x50, 0x55, 0x54, 0x95, 0x24, 0x49,
-  0x38, 0x1c, 0x0e, 0x18, 0x63, 0xc2, 0xec, 0x9c,
-  0xc3, 0x39, 0x37, 0x10, 0xa8, 0x2a, 0x22, 0xc2,
-  0x7c, 0x9e, 0x32, 0x9d, 0x4e, 0xc3, 0x23, 0x01,
-  0x68, 0x9a, 0x06, 0x95, 0x9e, 0x4c, 0x45, 0xfa,
-  0xdc, 0xc7, 0x0d, 0x84, 0x12, 0xb2, 0x2c, 0xc3,
-  0x5a, 0x4b, 0x59, 0x96, 0x00, 0xdc, 0xef, 0x77,
-  0x80, 0xd0, 0xed, 0xe5, 0x6a, 0x89, 0x88, 0xb0,
-  0x5c, 0xad, 0x10, 0x11, 0xde, 0xca, 0x32, 0x94,
-  0xfc, 0xfa, 0x67, 0x7a, 0xd5, 0xbe, 0x00, 0x97,
-  0x55, 0xed, 0x26, 0xb6, 0x6c, 0xb5, 0x0b, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
-
-
-/* drive_harddisk.png - 881 bytes */
-static const unsigned char drive_harddisk_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x02,
-  0xfc, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x4d, 0x4b, 0xeb, 0x40, 0x14, 0xbd, 0x93,
-  0xa4, 0x4d, 0xd3, 0xa4, 0x36, 0x21, 0xb4, 0xa6,
-  0x95, 0x2a, 0xb5, 0x35, 0xa4, 0x96, 0xd6, 0x8f,
-  0x5d, 0xd5, 0x5f, 0xe0, 0xa2, 0x5b, 0x7f, 0x80,
-  0x82, 0x0b, 0x41, 0xdc, 0x88, 0x22, 0xae, 0xc5,
-  0x8f, 0x8d, 0x08, 0x82, 0xd0, 0x8d, 0x20, 0x2e,
-  0xf4, 0x47, 0x89, 0x16, 0x21, 0xd2, 0x12, 0x42,
-  0x4b, 0xd2, 0x4f, 0xdb, 0xbc, 0x45, 0x18, 0xf3,
-  0x48, 0xed, 0xb3, 0x4f, 0xeb, 0xf3, 0x2d, 0x7a,
-  0x20, 0x24, 0x67, 0x26, 0x93, 0x39, 0xe7, 0xde,
-  0xb9, 0x33, 0x04, 0x60, 0x84, 0x11, 0xbe, 0x04,
-  0xd4, 0xaf, 0x63, 0x7b, 0x7b, 0x67, 0x67, 0x6b,
-  0x6b, 0x73, 0xd3, 0x66, 0x57, 0x57, 0x3f, 0x2b,
-  0x73, 0x6f, 0xef, 0xe2, 0xe2, 0xfc, 0xfc, 0xf2,
-  0xf2, 0xf4, 0xd4, 0xdd, 0x43, 0xbd, 0x2f, 0x3c,
-  0x12, 0xc1, 0xc2, 0x8f, 0x8f, 0x8f, 0x8e, 0xce,
-  0xce, 0x7e, 0x4e, 0xfa, 0xfe, 0xfe, 0xc1, 0xc1,
-  0xee, 0xee, 0xc9, 0x89, 0xcd, 0x7a, 0x0d, 0x10,
-  0xef, 0x0f, 0x4b, 0xa7, 0x43, 0xa1, 0x50, 0x28,
-  0x14, 0x02, 0xa8, 0xd5, 0x6a, 0xb5, 0x5a, 0xcd,
-  0xe9, 0x31, 0x4d, 0xd3, 0x34, 0xcd, 0xef, 0xbb,
-  0x17, 0x8b, 0xcf, 0xcf, 0xc5, 0xa2, 0xc3, 0xb1,
-  0x0e, 0x3b, 0xb0, 0xf3, 0xf3, 0x03, 0x1a, 0x48,
-  0x24, 0x24, 0x49, 0x92, 0x70, 0x1e, 0x00, 0x00,
-  0x0c, 0xc3, 0x34, 0x0d, 0x03, 0x80, 0x65, 0x59,
-  0x96, 0x65, 0x87, 0x1f, 0x69, 0x4d, 0xd3, 0x75,
-  0x4d, 0x03, 0x60, 0x18, 0x9f, 0x8f, 0x61, 0x9c,
-  0x76, 0x41, 0x10, 0x04, 0x41, 0xc0, 0x4c, 0x96,
-  0x07, 0x34, 0x90, 0xcf, 0x2f, 0x2c, 0xcc, 0xcd,
-  0x2d, 0x2e, 0x02, 0xd4, 0xeb, 0xf5, 0x7a, 0xbd,
-  0x0e, 0x80, 0x90, 0x7d, 0xe1, 0xc8, 0x0c, 0x1b,
-  0x3c, 0x1f, 0x0c, 0xf2, 0x3c, 0x80, 0xdf, 0xcf,
-  0x30, 0x7e, 0xbf, 0xd3, 0xbe, 0xbc, 0x9c, 0xcb,
-  0xad, 0xac, 0x60, 0x96, 0xc9, 0x0c, 0x68, 0x60,
-  0x75, 0x35, 0x1a, 0x8d, 0x46, 0x27, 0x26, 0x86,
-  0x2f, 0xb4, 0x1f, 0x48, 0x92, 0x20, 0x48, 0xb2,
-  0xb7, 0x3d, 0x16, 0x8b, 0xc5, 0xa6, 0xa6, 0x30,
-  0x3b, 0x3c, 0xec, 0x6b, 0x00, 0xaf, 0x31, 0x86,
-  0xb1, 0x23, 0xe0, 0xf5, 0x7a, 0xbd, 0x5e, 0x2f,
-  0x80, 0x28, 0x8a, 0xa2, 0x28, 0xfe, 0x3b, 0x23,
-  0x18, 0xee, 0xa5, 0x2a, 0x08, 0x82, 0x20, 0x8a,
-  0xbd, 0xb5, 0xe0, 0xca, 0x80, 0x2c, 0x8f, 0x8f,
-  0x87, 0xc3, 0x92, 0xe4, 0xb4, 0xe8, 0xba, 0xae,
-  0xeb, 0xba, 0xf3, 0x41, 0x7c, 0x27, 0x08, 0x82,
-  0x20, 0x08, 0x18, 0x1a, 0xdc, 0xdf, 0xc7, 0xf3,
-  0x62, 0x04, 0x83, 0x63, 0x63, 0xc1, 0xa0, 0xa3,
-  0x13, 0x3f, 0xb9, 0xb6, 0xd1, 0x4c, 0x66, 0x76,
-  0x36, 0x95, 0x4a, 0xa7, 0x01, 0xda, 0xed, 0x76,
-  0xbb, 0xdd, 0xb6, 0x2c, 0x8a, 0xa2, 0x28, 0x92,
-  0x44, 0xa8, 0x52, 0xa9, 0x54, 0x2a, 0x15, 0x80,
-  0x6e, 0xb7, 0xdb, 0xed, 0x76, 0xdd, 0xc5, 0xf5,
-  0x75, 0xb8, 0x05, 0x77, 0x3a, 0x9d, 0xce, 0xeb,
-  0x2b, 0x80, 0x61, 0x18, 0x46, 0xbb, 0x6d, 0x59,
-  0x89, 0xc4, 0xf4, 0x74, 0x22, 0x81, 0xd0, 0xe3,
-  0xe3, 0xd3, 0xd3, 0xc3, 0x43, 0x2e, 0x67, 0xbf,
-  0x75, 0x7f, 0xff, 0x66, 0xa0, 0xd9, 0x6c, 0x36,
-  0x9b, 0xcd, 0x6c, 0x56, 0x92, 0x24, 0x49, 0x92,
-  0x00, 0x38, 0x8e, 0xe3, 0x38, 0x0e, 0xa1, 0x6a,
-  0xb5, 0x5a, 0xad, 0x56, 0x3f, 0x9e, 0x70, 0x58,
-  0xc0, 0xc2, 0xed, 0x2d, 0x03, 0x07, 0x0a, 0xa1,
-  0x58, 0x2c, 0x16, 0x9b, 0x9c, 0x04, 0x68, 0x34,
-  0x1a, 0x8d, 0x66, 0x33, 0x10, 0xe8, 0xc9, 0x00,
-  0x4d, 0xd3, 0x34, 0x4d, 0xe7, 0xf3, 0xb2, 0x2c,
-  0xcb, 0xbf, 0x6f, 0x56, 0xc3, 0x8e, 0xf4, 0x67,
-  0xa1, 0x28, 0x8a, 0xa2, 0x28, 0x00, 0x3e, 0x9f,
-  0xcf, 0x47, 0xd3, 0xeb, 0xeb, 0x76, 0xeb, 0xc6,
-  0x46, 0xcf, 0x49, 0x5c, 0x2e, 0x97, 0xcb, 0xe5,
-  0x32, 0x80, 0xa6, 0x69, 0x9a, 0xa6, 0xfd, 0xfd,
-  0x44, 0x96, 0x65, 0x59, 0x96, 0x35, 0xfc, 0x71,
-  0xf8, 0x40, 0x73, 0x83, 0xea, 0x37, 0xa0, 0xd5,
-  0x6a, 0xb5, 0x5a, 0x2d, 0x80, 0x6c, 0x36, 0x9b,
-  0xcd, 0x66, 0x01, 0x0a, 0x85, 0x42, 0xa1, 0x50,
-  0xc0, 0x99, 0x02, 0x60, 0x59, 0x8e, 0xf3, 0xfb,
-  0x01, 0x02, 0x01, 0x8e, 0x1b, 0x1b, 0x73, 0x8a,
-  0x9a, 0x61, 0x18, 0x86, 0x61, 0x00, 0x10, 0x42,
-  0x08, 0x21, 0x87, 0xdb, 0x4b, 0xd2, 0x59, 0x7a,
-  0xe1, 0x70, 0x38, 0x1c, 0x0e, 0x03, 0x94, 0x4a,
-  0xa5, 0x52, 0xa9, 0xf4, 0x31, 0xef, 0x67, 0x60,
-  0xe0, 0x7d, 0x84, 0x24, 0x49, 0x92, 0x24, 0x9d,
-  0x48, 0x11, 0x04, 0x42, 0x24, 0x89, 0x6b, 0xc7,
-  0x31, 0x8c, 0xfb, 0x3d, 0x1e, 0x8f, 0xc7, 0xe3,
-  0xf9, 0x7c, 0x46, 0x06, 0x05, 0x35, 0xe8, 0x8b,
-  0xa9, 0x54, 0x2a, 0xa5, 0x28, 0xb6, 0x20, 0x00,
-  0x00, 0x8a, 0xa2, 0x28, 0xea, 0x0f, 0xa3, 0xf1,
-  0x39, 0xf2, 0xdd, 0xe8, 0x91, 0x60, 0xa7, 0xcc,
-  0xb2, 0x22, 0x91, 0x48, 0x24, 0x12, 0x41, 0x08,
-  0xd7, 0x44, 0x32, 0x99, 0x4c, 0xce, 0xcc, 0x7c,
-  0x7d, 0x42, 0x9e, 0xe7, 0x79, 0x9e, 0x77, 0x78,
-  0x3c, 0x1e, 0x8f, 0xc7, 0xe3, 0x1f, 0x73, 0x55,
-  0x55, 0x55, 0x55, 0xc5, 0xb9, 0x44, 0x6f, 0xbf,
-  0x01, 0x6f, 0x06, 0x54, 0x55, 0x55, 0x5f, 0x5e,
-  0xd6, 0xd6, 0x6e, 0x6e, 0x6e, 0x6f, 0xaf, 0xaf,
-  0xef, 0xee, 0xbe, 0x3f, 0x76, 0x9f, 0x01, 0x42,
-  0xb6, 0xce, 0xa5, 0xa5, 0x9f, 0x56, 0x32, 0xc2,
-  0x08, 0xff, 0x0b, 0x7e, 0x01, 0xa0, 0xaf, 0x82,
-  0x1b, 0x07, 0x0a, 0xd5, 0xef, 0x00, 0x00, 0x00,
-  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
-  0x82};
--- a/art/tango/drive_optical.h
+++ b/art/tango/drive_optical.h
@@ -1,287 +0,0 @@
-/* drive_optical.png - 720 bytes */
-static const unsigned char drive_optical_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x04, 0x05, 0x11, 0x07, 0x15, 0x73,
-  0x01, 0xca, 0xa5, 0x00, 0x00, 0x00, 0x8c, 0x74,
-  0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
-  0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
-  0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
-  0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
-  0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
-  0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
-  0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
-  0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
-  0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
-  0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
-  0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
-  0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
-  0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
-  0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
-  0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
-  0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
-  0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
-  0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
-  0x8a, 0xc7, 0x47, 0x00, 0x00, 0x01, 0xc5, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x92, 0x4d,
-  0x6b, 0x13, 0x51, 0x14, 0x86, 0x9f, 0x33, 0x99,
-  0x66, 0x16, 0xc3, 0xe0, 0x64, 0x60, 0x16, 0x53,
-  0x9d, 0x2c, 0xfc, 0xf8, 0x03, 0x45, 0xd4, 0x8d,
-  0x28, 0x6e, 0x0a, 0x22, 0xea, 0x5a, 0x5d, 0xb8,
-  0x95, 0x48, 0xc8, 0x3f, 0xd0, 0x82, 0x50, 0x44,
-  0x84, 0x58, 0x68, 0x45, 0x41, 0x11, 0x11, 0x44,
-  0xff, 0x81, 0x4a, 0xd6, 0xd9, 0x68, 0x49, 0xb4,
-  0x26, 0xa8, 0xcb, 0x66, 0x19, 0x21, 0xd0, 0x84,
-  0x04, 0x92, 0xb9, 0xc7, 0xc5, 0xa4, 0xcd, 0x04,
-  0xe9, 0x22, 0x3d, 0xab, 0xc3, 0xb9, 0xe7, 0x3e,
-  0xef, 0x7b, 0xee, 0x3d, 0x52, 0xae, 0x94, 0x1e,
-  0x02, 0x0f, 0x38, 0x5a, 0xac, 0x51, 0xae, 0x94,
-  0xf4, 0x28, 0xd1, 0xef, 0xf7, 0xb5, 0x5c, 0x29,
-  0xa9, 0x0d, 0x60, 0x8c, 0xa1, 0xd7, 0xeb, 0x2d,
-  0x24, 0x9d, 0x77, 0xf2, 0x00, 0xd8, 0x00, 0x6a,
-  0x14, 0x35, 0x0a, 0xb2, 0x00, 0x41, 0x99, 0x01,
-  0x8c, 0x1a, 0x8c, 0x2a, 0xe8, 0x14, 0x32, 0x3d,
-  0x4c, 0xd3, 0xff, 0x0a, 0xe9, 0x7d, 0xd5, 0x8c,
-  0x03, 0x55, 0x8c, 0x49, 0x00, 0x41, 0xd0, 0x83,
-  0x4e, 0x9d, 0xf5, 0x83, 0x80, 0x98, 0x8c, 0x81,
-  0x2c, 0x60, 0xdf, 0x85, 0x00, 0x46, 0x01, 0x91,
-  0x99, 0xa0, 0xea, 0x01, 0xd8, 0x48, 0x96, 0x98,
-  0x1d, 0xc1, 0x18, 0x34, 0xd1, 0x54, 0x53, 0x04,
-  0x55, 0x45, 0x54, 0x51, 0xd9, 0x57, 0x13, 0x44,
-  0x14, 0xd5, 0x43, 0x46, 0x70, 0x1c, 0x87, 0xe5,
-  0xe3, 0xcb, 0x87, 0xbe, 0xd7, 0x60, 0x30, 0x00,
-  0x60, 0x38, 0x1c, 0x02, 0x30, 0x1a, 0x8d, 0xe6,
-  0x1d, 0x34, 0x1a, 0x0d, 0xc6, 0xe3, 0xf1, 0x42,
-  0xdf, 0xe8, 0x79, 0x5e, 0x0a, 0x30, 0x89, 0x21,
-  0x9f, 0xcf, 0xf3, 0xe6, 0xed, 0xab, 0x85, 0x00,
-  0x97, 0x2e, 0x5e, 0x49, 0x01, 0x62, 0x09, 0xed,
-  0x76, 0x0b, 0x80, 0xa7, 0x4f, 0xaa, 0x4c, 0x26,
-  0x13, 0x46, 0xa3, 0x21, 0xdd, 0xbf, 0x5d, 0x9a,
-  0xcd, 0x06, 0xb6, 0xbd, 0xc4, 0x8d, 0xeb, 0x37,
-  0xa9, 0xd5, 0x6a, 0x04, 0x41, 0x40, 0x14, 0x45,
-  0xac, 0x3f, 0x7e, 0x44, 0x10, 0x04, 0x53, 0x80,
-  0x08, 0xbe, 0xef, 0x13, 0x86, 0x21, 0xdb, 0xdb,
-  0x5f, 0x59, 0x59, 0x39, 0x8b, 0xef, 0x17, 0xf0,
-  0xfd, 0x02, 0xa7, 0x4f, 0x9d, 0x01, 0xa0, 0x5e,
-  0xaf, 0xe3, 0xba, 0x2e, 0x61, 0x18, 0xf2, 0xf9,
-  0xcb, 0x27, 0x1c, 0xc7, 0xc1, 0x75, 0x5d, 0x00,
-  0x72, 0xe7, 0x2f, 0x9c, 0x93, 0xdf, 0x7f, 0x7e,
-  0x5d, 0xde, 0xdb, 0xeb, 0xb3, 0xf3, 0xf3, 0x07,
-  0xbe, 0xef, 0x53, 0x8c, 0x8b, 0x00, 0x74, 0x3a,
-  0x1d, 0xba, 0xdd, 0x2e, 0x9e, 0xe7, 0x11, 0x45,
-  0x11, 0x1f, 0x3e, 0xbe, 0xa7, 0xd5, 0xde, 0x21,
-  0x49, 0x12, 0x9a, 0xdf, 0x1b, 0x88, 0xc8, 0xda,
-  0xdc, 0xf2, 0x96, 0xee, 0xdf, 0xbb, 0x96, 0xb3,
-  0xad, 0x67, 0xf1, 0x89, 0xf8, 0xe4, 0xea, 0xea,
-  0x55, 0x8a, 0x71, 0x8c, 0x65, 0xe5, 0xd8, 0xed,
-  0xec, 0x9a, 0x17, 0x2f, 0xb7, 0x2c, 0xa0, 0x05,
-  0xac, 0x6f, 0x54, 0x37, 0xdf, 0x65, 0xf6, 0x8b,
-  0x6c, 0x6e, 0xdd, 0xbe, 0x73, 0x6b, 0xa9, 0x10,
-  0x1c, 0x7b, 0x6e, 0x59, 0xd6, 0xdd, 0xb9, 0xd5,
-  0x57, 0x7d, 0x2d, 0x22, 0x5b, 0x1b, 0xd5, 0xcd,
-  0x6f, 0xd9, 0xfa, 0x3f, 0xbd, 0x90, 0xec, 0xc4,
-  0x00, 0x9c, 0x8f, 0x27, 0x00, 0x00, 0x00, 0x00,
-  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
-
-
-/* drive_optical.png - 1513 bytes */
-static const unsigned char drive_optical_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xeb, 0x00, 0xeb, 0x00, 0xeb, 0x34,
-  0x28, 0x49, 0x00, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
-  0x74, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x5b, 0x6b, 0x13, 0x5b, 0x14, 0xfe, 0x26,
-  0x99, 0x5c, 0x66, 0xd2, 0x26, 0xe6, 0xd6, 0x26,
-  0x29, 0x69, 0x92, 0xb6, 0x84, 0x6a, 0x5b, 0x6f,
-  0x4f, 0x4d, 0xeb, 0x4b, 0xab, 0xad, 0x20, 0x28,
-  0x22, 0x88, 0xb4, 0x8a, 0x2f, 0x0a, 0x2a, 0x15,
-  0xf1, 0x45, 0x14, 0xf1, 0x41, 0x11, 0xc4, 0xcb,
-  0x8b, 0x88, 0xb5, 0x7d, 0x54, 0x6a, 0x43, 0xfc,
-  0x01, 0x82, 0x94, 0xb6, 0x5e, 0x1a, 0x6b, 0xbd,
-  0x80, 0xa5, 0x22, 0x48, 0x93, 0xa7, 0x48, 0x8d,
-  0x26, 0x0d, 0x3a, 0x6d, 0x9a, 0xa6, 0xb9, 0x9e,
-  0x87, 0xed, 0x76, 0xa6, 0x4d, 0x7a, 0x1a, 0x7b,
-  0x0e, 0xc8, 0x81, 0xb3, 0x20, 0xec, 0xcc, 0xde,
-  0xd9, 0xb3, 0xbf, 0x6f, 0xad, 0x6f, 0xad, 0xbd,
-  0x02, 0xfc, 0xc7, 0x8d, 0x59, 0x6d, 0xe1, 0xcc,
-  0x99, 0xb3, 0x67, 0x7b, 0x7a, 0x4e, 0x9c, 0x20,
-  0x4f, 0xfd, 0xfd, 0x7f, 0x16, 0xe6, 0xf9, 0xf3,
-  0x77, 0xee, 0xdc, 0xbe, 0xdd, 0xdb, 0x7b, 0xf3,
-  0xe6, 0xca, 0x15, 0xb6, 0x38, 0x70, 0xab, 0x95,
-  0x02, 0xbf, 0x7e, 0xfd, 0xda, 0xb5, 0x5b, 0xb7,
-  0x80, 0x6c, 0x36, 0x9b, 0xcd, 0x66, 0x81, 0x7c,
-  0x3e, 0x9f, 0xcf, 0xe7, 0x4b, 0xf0, 0x0c, 0xc3,
-  0x30, 0xe2, 0xf7, 0xdf, 0x87, 0x2c, 0x97, 0xcb,
-  0xe5, 0x72, 0x39, 0x70, 0xe1, 0xc2, 0xc5, 0x8b,
-  0xe7, 0xce, 0xdd, 0xb8, 0x41, 0x66, 0x0b, 0x09,
-  0xc8, 0x8a, 0x6f, 0x6f, 0x68, 0x30, 0x9b, 0xcd,
-  0x66, 0xb3, 0x19, 0x48, 0x24, 0x12, 0x89, 0x44,
-  0x02, 0x58, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x04,
-  0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0xd6, 0x1e,
-  0x93, 0xc9, 0x64, 0x92, 0x8e, 0xc9, 0x64, 0xe9,
-  0x23, 0x3d, 0x6f, 0x61, 0x61, 0x61, 0x61, 0x61,
-  0x01, 0xa0, 0x38, 0x88, 0x63, 0xb7, 0x6e, 0x2d,
-  0x91, 0x40, 0x6d, 0xad, 0xc5, 0x62, 0xb1, 0xd0,
-  0x38, 0x00, 0x40, 0x2e, 0x97, 0xcb, 0xe5, 0x72,
-  0xd2, 0x08, 0x90, 0xb1, 0xf0, 0x53, 0x4a, 0x7c,
-  0xfe, 0x3e, 0x72, 0x0c, 0x23, 0x9e, 0xa3, 0xd7,
-  0xeb, 0xf5, 0x7a, 0x3d, 0x5d, 0x75, 0xbb, 0x4b,
-  0x24, 0xb0, 0x6f, 0xdf, 0xb6, 0x6d, 0x5b, 0xb6,
-  0x6c, 0xdf, 0x2e, 0x7a, 0x5e, 0x04, 0x48, 0x88,
-  0xe4, 0x72, 0xf9, 0x3c, 0x21, 0x44, 0x89, 0x89,
-  0x04, 0xa5, 0xeb, 0x94, 0x78, 0x2e, 0x97, 0xcb,
-  0xe5, 0xf3, 0x64, 0x5e, 0xfa, 0x1e, 0x0a, 0x74,
-  0x35, 0x69, 0xb6, 0xb6, 0x7a, 0x3c, 0x3b, 0x76,
-  0xd0, 0xa7, 0xa6, 0xa6, 0x12, 0x09, 0xec, 0xd9,
-  0x63, 0xb3, 0xd9, 0x6c, 0x55, 0x55, 0xd2, 0x39,
-  0xf2, 0x7a, 0x72, 0xa8, 0x14, 0x08, 0x8d, 0x87,
-  0x08, 0x90, 0x12, 0xa2, 0xeb, 0x52, 0x62, 0x52,
-  0x82, 0xe4, 0xf7, 0x22, 0xc1, 0x62, 0xfb, 0xec,
-  0x76, 0xbb, 0xdd, 0xe1, 0xa0, 0x18, 0x2e, 0x5d,
-  0x5a, 0x95, 0x00, 0xd5, 0x18, 0xc7, 0x71, 0x1c,
-  0xcf, 0x03, 0x4a, 0xa5, 0x52, 0xa9, 0x54, 0x02,
-  0x2a, 0x95, 0x5a, 0xad, 0x52, 0x49, 0x01, 0xd0,
-  0x03, 0xc4, 0x51, 0x0a, 0x88, 0x52, 0x12, 0x23,
-  0xb0, 0xdc, 0xc3, 0x52, 0x29, 0xae, 0x8c, 0x80,
-  0x74, 0x9e, 0x61, 0x64, 0x32, 0x99, 0xc4, 0xbd,
-  0x7a, 0xbd, 0x5e, 0x6f, 0x34, 0x16, 0xe6, 0xc2,
-  0x8a, 0x08, 0xb8, 0xdd, 0x95, 0x95, 0x15, 0x15,
-  0x16, 0x8b, 0x38, 0x93, 0x4a, 0xa5, 0x52, 0xa9,
-  0xd4, 0x72, 0xcf, 0xd0, 0x6a, 0xb4, 0xdc, 0x73,
-  0xc5, 0x9f, 0x45, 0x82, 0xb9, 0x5c, 0x36, 0x4b,
-  0x63, 0xb5, 0x9c, 0xe0, 0xf2, 0x88, 0x90, 0xe7,
-  0x4c, 0x26, 0x9d, 0x4e, 0xa7, 0x45, 0x1c, 0x3a,
-  0x9d, 0x56, 0xab, 0xd3, 0x15, 0xe6, 0xc2, 0x0a,
-  0x02, 0x4d, 0x4d, 0x9b, 0x36, 0x6d, 0xdc, 0xd8,
-  0xd0, 0x00, 0xa4, 0xd3, 0xe9, 0x74, 0x3a, 0x2d,
-  0x8a, 0x44, 0xaa, 0x69, 0x22, 0xa5, 0xc2, 0x5c,
-  0x90, 0x7a, 0xba, 0x30, 0x52, 0x62, 0x04, 0x8a,
-  0x45, 0x50, 0x2a, 0x41, 0xe9, 0x18, 0x8f, 0xc7,
-  0xe3, 0xf1, 0x78, 0x3e, 0x5f, 0x5b, 0x5b, 0x53,
-  0x53, 0x5b, 0x4b, 0x71, 0x7a, 0x3c, 0x05, 0x04,
-  0x48, 0xf9, 0xdb, 0xbc, 0xd9, 0x62, 0xb1, 0x58,
-  0x2c, 0x16, 0x80, 0xe7, 0x79, 0x9e, 0xe7, 0x19,
-  0xa6, 0x58, 0x72, 0x15, 0x4b, 0x36, 0x69, 0x25,
-  0xa2, 0x42, 0x5a, 0x59, 0x9d, 0xc4, 0x35, 0xe9,
-  0x3e, 0x51, 0x78, 0xc5, 0x92, 0x5b, 0xa7, 0xd3,
-  0xe9, 0x74, 0x3a, 0x86, 0xb1, 0xdb, 0xed, 0xf6,
-  0xea, 0x6a, 0x5a, 0x9e, 0xcb, 0xcb, 0xe9, 0xfe,
-  0x5f, 0x17, 0x99, 0x4a, 0xa5, 0x52, 0xa9, 0x54,
-  0xfb, 0xf6, 0xb9, 0xdd, 0x6e, 0xb7, 0xb4, 0x58,
-  0x19, 0x8d, 0x46, 0xa3, 0xc9, 0x84, 0x3f, 0x6e,
-  0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0x80, 0x5a,
-  0xad, 0x56, 0xab, 0x54, 0xc7, 0x8e, 0x91, 0xd9,
-  0xe3, 0xc7, 0x0b, 0x6e, 0xe2, 0x68, 0x34, 0x1a,
-  0x8d, 0x46, 0x81, 0x58, 0x2c, 0x16, 0x8b, 0xc5,
-  0x7e, 0xff, 0xa0, 0x52, 0x6f, 0xea, 0xdf, 0xdd,
-  0x47, 0x2f, 0xb4, 0x95, 0xc6, 0xae, 0xb6, 0x81,
-  0x26, 0xaf, 0xd7, 0xeb, 0xf3, 0x0d, 0x0c, 0xfc,
-  0xfb, 0x1e, 0x2d, 0xd5, 0x0e, 0x1c, 0xd8, 0xbf,
-  0xff, 0xe0, 0xc1, 0x75, 0x10, 0x90, 0xfa, 0x86,
-  0x61, 0x80, 0xce, 0xce, 0xce, 0xce, 0xdd, 0xbb,
-  0xc5, 0x2b, 0x3f, 0x93, 0xc9, 0x64, 0x32, 0x19,
-  0xe0, 0xc7, 0x0f, 0x41, 0xf8, 0xfe, 0x1d, 0x30,
-  0x18, 0xf4, 0x7a, 0x83, 0x01, 0x98, 0x98, 0x98,
-  0x98, 0x78, 0xf5, 0x0a, 0xa8, 0xa9, 0x21, 0x49,
-  0xc7, 0x30, 0x0c, 0x23, 0x93, 0x01, 0x81, 0x40,
-  0x30, 0x38, 0x3d, 0x0d, 0xb4, 0xb7, 0xb7, 0xb5,
-  0xed, 0xdc, 0x09, 0x4c, 0x4f, 0x4f, 0x4f, 0x7f,
-  0xfa, 0x44, 0xca, 0xa3, 0xc1, 0x00, 0xc8, 0x64,
-  0x32, 0x99, 0x5c, 0x4e, 0x72, 0x8f, 0xe3, 0x00,
-  0xbf, 0xdf, 0xef, 0xf7, 0xfb, 0xd7, 0x46, 0xb7,
-  0x26, 0x01, 0x83, 0xc1, 0x60, 0x30, 0x1a, 0x81,
-  0xc6, 0xc6, 0xc6, 0xc6, 0xa6, 0x26, 0x31, 0xc9,
-  0x68, 0xcf, 0x33, 0x3b, 0x1b, 0x8b, 0xcd, 0xce,
-  0x02, 0x1a, 0x8d, 0x46, 0x53, 0x56, 0x06, 0x68,
-  0xb5, 0x5a, 0xed, 0x86, 0x0d, 0xc0, 0xd0, 0xd0,
-  0xd0, 0xd0, 0x93, 0x27, 0xa4, 0x9e, 0x33, 0x0c,
-  0xb0, 0x6b, 0x57, 0x7b, 0x7b, 0x47, 0x07, 0x60,
-  0x36, 0x57, 0x54, 0x54, 0x54, 0x90, 0x5e, 0x27,
-  0x1e, 0x07, 0x4c, 0x26, 0xa3, 0xd1, 0x6c, 0x06,
-  0x14, 0x0a, 0x85, 0x42, 0xa9, 0x04, 0x38, 0x8e,
-  0xe3, 0xd4, 0x6a, 0x60, 0x6a, 0x6a, 0x6a, 0x6a,
-  0x6a, 0x6a, 0x1d, 0x04, 0x22, 0x91, 0x48, 0x24,
-  0x12, 0xc9, 0xe7, 0xad, 0x56, 0xab, 0xd5, 0x6a,
-  0x65, 0x98, 0xaa, 0x2a, 0x9b, 0xcd, 0x66, 0x03,
-  0xb2, 0xd9, 0x4c, 0x26, 0x9b, 0x05, 0xaa, 0xab,
-  0xab, 0xab, 0x69, 0x35, 0x48, 0x26, 0x01, 0x93,
-  0xc9, 0x64, 0x32, 0x99, 0x80, 0x48, 0x24, 0x1a,
-  0xfd, 0xf6, 0x0d, 0xf0, 0x78, 0x9a, 0x9b, 0x3d,
-  0x1e, 0xe2, 0xe9, 0xf6, 0x76, 0xf1, 0xbd, 0xa1,
-  0x50, 0x28, 0x14, 0x0a, 0x01, 0xa3, 0xa3, 0x4f,
-  0x9f, 0x0e, 0x0f, 0x03, 0x2e, 0x97, 0xd3, 0x59,
-  0x53, 0x43, 0x00, 0xf3, 0x3c, 0xad, 0x36, 0x80,
-  0x20, 0xcc, 0xcd, 0x09, 0x02, 0xe0, 0x74, 0x3a,
-  0x1c, 0x4e, 0x27, 0xe0, 0x72, 0xb9, 0x5c, 0x2e,
-  0x17, 0x10, 0x0e, 0x87, 0xc3, 0xe1, 0x30, 0xcd,
-  0x12, 0xb1, 0xbf, 0xfd, 0x45, 0x20, 0x1c, 0x0e,
-  0x87, 0xbf, 0x7e, 0x3d, 0x74, 0x68, 0x60, 0x60,
-  0x70, 0xf0, 0xfe, 0xfd, 0x47, 0x8f, 0x44, 0x01,
-  0x91, 0xe4, 0x0a, 0x85, 0x3e, 0x7f, 0x0e, 0x85,
-  0x80, 0x2b, 0x57, 0x2e, 0x5f, 0xbe, 0x7a, 0x95,
-  0x54, 0x03, 0xb5, 0x1a, 0x60, 0x59, 0x96, 0x65,
-  0x59, 0xc0, 0x6a, 0x25, 0xed, 0x2f, 0x25, 0x12,
-  0x0c, 0x06, 0x83, 0x81, 0x80, 0xd8, 0x55, 0xb2,
-  0x2c, 0xcb, 0x2a, 0x14, 0x22, 0x70, 0x2a, 0x2d,
-  0x7a, 0x9f, 0x50, 0x47, 0xf8, 0x7c, 0x3e, 0x9f,
-  0xd7, 0x0b, 0xcc, 0xcd, 0xc5, 0xe3, 0x82, 0x00,
-  0x7c, 0xf8, 0xf0, 0xf1, 0xa3, 0x18, 0x09, 0x86,
-  0x21, 0x38, 0x5b, 0x5a, 0x7e, 0xcd, 0x94, 0x9a,
-  0x4c, 0x3d, 0x3d, 0xa7, 0x4f, 0x9f, 0x3a, 0xd5,
-  0xd7, 0xd7, 0xd5, 0xd5, 0xd5, 0xd5, 0xdd, 0xbd,
-  0x77, 0xaf, 0xc7, 0xd3, 0xdc, 0xdc, 0xd2, 0x52,
-  0x55, 0x45, 0x01, 0xd0, 0x9c, 0xa0, 0xed, 0xb0,
-  0x20, 0x08, 0x82, 0x20, 0xac, 0xde, 0x36, 0xcf,
-  0xcf, 0xcf, 0xcf, 0xcf, 0xcf, 0x03, 0x75, 0x75,
-  0x75, 0x75, 0x75, 0x75, 0xc0, 0xe4, 0xe4, 0xe4,
-  0xe4, 0xfb, 0xf7, 0x82, 0x30, 0x32, 0x32, 0x3a,
-  0x3a, 0x3c, 0xec, 0xf3, 0xdd, 0xbb, 0xd7, 0xdb,
-  0xdb, 0xdf, 0x7f, 0xf2, 0xe4, 0x5a, 0xb8, 0xe4,
-  0xa5, 0x12, 0x78, 0xfb, 0xf6, 0xcd, 0x9b, 0x77,
-  0xef, 0x1e, 0x3f, 0xe6, 0x38, 0x9e, 0x57, 0xab,
-  0x3b, 0x3a, 0x88, 0xe6, 0x4d, 0x26, 0x87, 0xc3,
-  0xe1, 0x70, 0x38, 0xd4, 0x6a, 0x99, 0x8c, 0xf4,
-  0x2e, 0xb4, 0x7a, 0x15, 0xb6, 0xdf, 0xc4, 0x38,
-  0x8e, 0xe3, 0x38, 0x0e, 0x20, 0xfb, 0x80, 0xf1,
-  0xf1, 0xf1, 0xf1, 0x97, 0x2f, 0x53, 0xa9, 0xe7,
-  0xcf, 0x5f, 0xbc, 0x78, 0xf6, 0x6c, 0x6c, 0x8c,
-  0x00, 0xef, 0xea, 0xfa, 0x09, 0x4f, 0x4e, 0x75,
-  0xf0, 0x8f, 0x09, 0x2c, 0x27, 0x32, 0x38, 0x58,
-  0x56, 0x56, 0x5e, 0xce, 0xf3, 0x4e, 0xa7, 0xdf,
-  0xef, 0xf7, 0x8f, 0x8d, 0xb9, 0x5c, 0x95, 0x95,
-  0x95, 0x95, 0x16, 0x8b, 0x52, 0x49, 0xa4, 0x25,
-  0x93, 0x69, 0xb5, 0x5a, 0xad, 0x56, 0x2b, 0x02,
-  0xa6, 0x36, 0x33, 0xf3, 0xe5, 0xcb, 0xcc, 0x4c,
-  0x36, 0xeb, 0xf5, 0x7a, 0xbd, 0x0f, 0x1f, 0x26,
-  0x12, 0x81, 0x40, 0x30, 0x18, 0x08, 0x3c, 0x78,
-  0xd0, 0xdb, 0x7b, 0xf7, 0x6e, 0x5f, 0x1f, 0x05,
-  0x2e, 0x0a, 0x78, 0x2d, 0x3c, 0xeb, 0xf8, 0xb3,
-  0x07, 0x88, 0x49, 0xc4, 0xb2, 0x87, 0x0f, 0x1f,
-  0x39, 0xd2, 0xdd, 0xdd, 0xda, 0xaa, 0xd1, 0x68,
-  0x34, 0x3c, 0x7f, 0xf4, 0x28, 0xcb, 0xca, 0xe5,
-  0x2c, 0xdb, 0xd6, 0x46, 0xaa, 0x8f, 0xdd, 0xce,
-  0xfc, 0x34, 0x12, 0x91, 0x99, 0x19, 0x22, 0xb5,
-  0x91, 0x11, 0x85, 0x42, 0xa1, 0x50, 0x28, 0xfa,
-  0xfb, 0x09, 0xf0, 0xd7, 0xaf, 0xd7, 0x87, 0xe3,
-  0x7f, 0xfb, 0xf3, 0xf6, 0x17, 0xf1, 0x8b, 0x66,
-  0xcc, 0x3d, 0xb8, 0xf4, 0x62, 0x00, 0x00, 0x00,
-  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
-  0x82};
--- a/art/tango/drive_removable_media.h
+++ b/art/tango/drive_removable_media.h
@@ -1,178 +0,0 @@
-/* drive_removable_media.png - 510 bytes */
-static const unsigned char drive_removable_media_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0a, 0x11, 0x12, 0x00, 0x1d, 0x50,
-  0x96, 0x14, 0xa0, 0x00, 0x00, 0x00, 0x8c, 0x74,
-  0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
-  0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
-  0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
-  0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
-  0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
-  0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
-  0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
-  0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
-  0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
-  0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
-  0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
-  0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
-  0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
-  0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
-  0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
-  0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
-  0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
-  0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
-  0x8a, 0xc7, 0x47, 0x00, 0x00, 0x00, 0xf3, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x93, 0xbf,
-  0x4a, 0xc3, 0x50, 0x14, 0xc6, 0x7f, 0x29, 0xc9,
-  0x62, 0xb9, 0x90, 0x0c, 0xf6, 0x21, 0xb2, 0x16,
-  0xb1, 0x20, 0x76, 0x2f, 0x3a, 0x14, 0x9f, 0xa0,
-  0x14, 0x9c, 0x94, 0xd2, 0x37, 0x88, 0xbe, 0x85,
-  0xd2, 0xa1, 0x20, 0x9d, 0x4a, 0xe9, 0x33, 0x48,
-  0xe9, 0x03, 0x84, 0x90, 0x59, 0x3a, 0x79, 0xa7,
-  0x2c, 0x81, 0x90, 0xbf, 0x70, 0x3b, 0x48, 0xc8,
-  0x20, 0x15, 0xd2, 0xeb, 0x37, 0x9f, 0xef, 0x77,
-  0xbe, 0x73, 0x38, 0x07, 0x34, 0x65, 0xcc, 0xe6,
-  0x4f, 0x2f, 0x80, 0x77, 0xa6, 0xff, 0xd5, 0x04,
-  0xbc, 0xe9, 0xe4, 0xb1, 0xb5, 0xb3, 0xaa, 0x2a,
-  0x3e, 0x56, 0x4b, 0xcf, 0x04, 0x50, 0x4a, 0x11,
-  0x04, 0x41, 0x2b, 0x80, 0xeb, 0xba, 0x00, 0x74,
-  0x74, 0x77, 0xd0, 0xa9, 0x13, 0x68, 0x01, 0xce,
-  0x51, 0xdd, 0x54, 0x7b, 0x04, 0x13, 0xe0, 0x70,
-  0xf8, 0x42, 0xca, 0xef, 0x56, 0xc6, 0x6e, 0xf7,
-  0xa2, 0x01, 0x8c, 0xc7, 0x0f, 0x18, 0x86, 0x71,
-  0xb2, 0x38, 0x49, 0x12, 0x00, 0xd2, 0x34, 0x05,
-  0x20, 0xcb, 0x32, 0x84, 0x10, 0xec, 0xf6, 0x9f,
-  0x3f, 0x00, 0xdf, 0xf7, 0x29, 0xcb, 0xb2, 0x55,
-  0x02, 0x21, 0x44, 0x93, 0xa0, 0xd6, 0x66, 0xbb,
-  0xa6, 0x77, 0xd9, 0xfb, 0xd3, 0x38, 0xb8, 0x1e,
-  0xd0, 0xef, 0x5f, 0x11, 0x86, 0x61, 0x03, 0xa8,
-  0x37, 0x3a, 0x7b, 0x9e, 0x03, 0x60, 0x59, 0xd6,
-  0x49, 0x80, 0xe3, 0x38, 0xbc, 0x2f, 0xde, 0xb8,
-  0x1b, 0xdd, 0x37, 0x00, 0xdb, 0xb6, 0x51, 0x4a,
-  0x91, 0xe7, 0x39, 0x00, 0x71, 0x1c, 0x03, 0x50,
-  0x14, 0xc5, 0x2f, 0x80, 0x94, 0x92, 0xdb, 0x9b,
-  0x21, 0x51, 0x14, 0xfd, 0xcf, 0x33, 0xe9, 0x9e,
-  0x01, 0x47, 0x57, 0x47, 0x4e, 0xf4, 0x9c, 0x50,
-  0x7b, 0x51, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
-  0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* drive_removable_media.png - 862 bytes */
-static const unsigned char drive_removable_media_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x02,
-  0xe9, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0xbf, 0x4f, 0xea, 0x50, 0x14, 0x3e, 0x85,
-  0x16, 0x88, 0xe5, 0x57, 0x42, 0x69, 0xa9, 0xd8,
-  0xa1, 0x92, 0xb2, 0x18, 0x89, 0xac, 0xfe, 0x09,
-  0x0e, 0x26, 0xc6, 0x44, 0x47, 0x37, 0x1d, 0x4c,
-  0x8c, 0x83, 0x11, 0x4d, 0xfc, 0x07, 0x74, 0x32,
-  0x26, 0x26, 0x2e, 0x2f, 0xc1, 0x18, 0x07, 0x1d,
-  0x4d, 0x8c, 0xff, 0x06, 0x23, 0x0b, 0x91, 0x09,
-  0xa4, 0x50, 0x03, 0x05, 0x6d, 0xf8, 0x51, 0xfa,
-  0x86, 0xfb, 0x2e, 0x85, 0x42, 0x95, 0x97, 0xf7,
-  0x84, 0x85, 0x6f, 0xe0, 0xde, 0x7b, 0xce, 0xb9,
-  0xf0, 0x7d, 0xe7, 0x9c, 0xdb, 0x5b, 0x00, 0x66,
-  0x98, 0xe1, 0x9f, 0x40, 0xd8, 0x39, 0x0e, 0x0e,
-  0x0e, 0x0f, 0xf7, 0xf7, 0xf7, 0xf6, 0xd0, 0xea,
-  0xe6, 0x66, 0xba, 0x34, 0x53, 0xa9, 0xab, 0xab,
-  0xcb, 0xcb, 0xeb, 0xeb, 0x8b, 0x0b, 0xab, 0x87,
-  0x1c, 0x4d, 0x9c, 0xe7, 0x31, 0xf1, 0xcd, 0xcd,
-  0x8d, 0x8d, 0xad, 0x2d, 0x00, 0x8a, 0xa2, 0x28,
-  0x8a, 0x9a, 0x3c, 0xf5, 0xe7, 0xe7, 0x97, 0x97,
-  0xa7, 0xa7, 0xf3, 0x73, 0xb4, 0x1a, 0x43, 0x00,
-  0xc2, 0xd2, 0x52, 0x2c, 0xb6, 0xb8, 0x28, 0x49,
-  0xa6, 0x25, 0x9b, 0xcd, 0x66, 0xb3, 0xd9, 0xc9,
-  0x11, 0x17, 0x04, 0x41, 0x10, 0x04, 0x00, 0x9f,
-  0xcf, 0xe7, 0xf3, 0xfb, 0x71, 0x62, 0x57, 0x56,
-  0x50, 0x25, 0x32, 0x19, 0x1c, 0xe7, 0x18, 0xbd,
-  0x3d, 0x16, 0xa3, 0x69, 0x9a, 0xf6, 0x7a, 0x27,
-  0x47, 0xd8, 0x8a, 0x56, 0xab, 0xd5, 0x6a, 0xb5,
-  0x00, 0x82, 0xc1, 0x40, 0x20, 0x18, 0xc4, 0xd6,
-  0x78, 0xdc, 0x1a, 0x67, 0x23, 0x60, 0x7d, 0x9d,
-  0xe3, 0x38, 0x8e, 0xe3, 0x00, 0x1a, 0x8d, 0x46,
-  0xa3, 0xd1, 0x98, 0xbc, 0x80, 0x66, 0xb3, 0xd9,
-  0x6c, 0x36, 0x01, 0x78, 0x3e, 0x12, 0x89, 0x46,
-  0x01, 0xc2, 0x61, 0x86, 0xe1, 0xb8, 0x9d, 0x9d,
-  0x6f, 0x05, 0xcc, 0xcf, 0xf3, 0x7c, 0x34, 0xba,
-  0xb6, 0xe6, 0x72, 0x51, 0x94, 0xcb, 0x05, 0xa0,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xd3, 0x13, 0xa0, 0xeb,
-  0xba, 0xae, 0xeb, 0x00, 0x9d, 0x4e, 0xa7, 0xd3,
-  0x6e, 0x2f, 0x2f, 0xdb, 0x0a, 0xc0, 0x3d, 0x46,
-  0xd3, 0x73, 0x73, 0x5e, 0x2f, 0x80, 0xc7, 0xe3,
-  0xf1, 0x78, 0x3c, 0x00, 0x9a, 0xa6, 0x69, 0x9a,
-  0x36, 0x79, 0x01, 0xf8, 0x77, 0xdd, 0x6e, 0xb7,
-  0xdb, 0xed, 0x06, 0x60, 0x98, 0x50, 0x88, 0x65,
-  0x05, 0x01, 0xf3, 0xc4, 0x71, 0x96, 0x43, 0x1c,
-  0x8f, 0xfb, 0xfd, 0x7e, 0x7f, 0x20, 0x00, 0x50,
-  0xaf, 0xd7, 0xeb, 0xf5, 0x3a, 0x52, 0xde, 0xe9,
-  0x4c, 0x5e, 0x00, 0x86, 0x61, 0x18, 0x86, 0x61,
-  0x00, 0xd0, 0x34, 0x4d, 0xd3, 0xb4, 0xc9, 0x13,
-  0x8d, 0x99, 0x4c, 0x4f, 0x00, 0xee, 0x31, 0xdc,
-  0xfb, 0xf8, 0x10, 0x95, 0xcb, 0xe5, 0xb2, 0x2c,
-  0x4f, 0x4f, 0x40, 0xb7, 0x6b, 0x18, 0xba, 0x0e,
-  0x10, 0x89, 0x70, 0x1c, 0xcf, 0xe3, 0x4a, 0xec,
-  0xee, 0x22, 0xef, 0xe3, 0x63, 0x4f, 0x00, 0x49,
-  0x3a, 0x9d, 0x24, 0x99, 0x48, 0x48, 0x92, 0x24,
-  0x49, 0x12, 0x00, 0xc3, 0x30, 0x0c, 0xc3, 0x00,
-  0x24, 0x93, 0xc9, 0xa4, 0x59, 0xb0, 0x71, 0x40,
-  0x10, 0x04, 0x81, 0x73, 0x67, 0xef, 0x45, 0xf3,
-  0xd1, 0x51, 0xc8, 0x82, 0x22, 0xbd, 0x5e, 0xf4,
-  0x34, 0x2c, 0x14, 0x0a, 0x85, 0x42, 0x01, 0x20,
-  0x97, 0xcb, 0xe5, 0x72, 0xb9, 0x44, 0xa2, 0xc7,
-  0x1b, 0x4f, 0x3e, 0x3f, 0x35, 0xed, 0xe3, 0x63,
-  0x61, 0x81, 0xe7, 0x79, 0x1e, 0x5f, 0x63, 0x00,
-  0x00, 0xa1, 0x50, 0x28, 0xc4, 0x30, 0xd3, 0xab,
-  0x00, 0x86, 0x28, 0x8a, 0xa2, 0x28, 0x02, 0x54,
-  0xab, 0xb5, 0xda, 0xfb, 0x7b, 0x38, 0x3c, 0x24,
-  0xa0, 0x56, 0x53, 0xd5, 0x6a, 0x15, 0xb5, 0x4c,
-  0xb9, 0x0c, 0xa0, 0x28, 0x8a, 0xa2, 0x28, 0x83,
-  0xb9, 0xc3, 0x9f, 0x04, 0xd1, 0x6f, 0x75, 0x38,
-  0xf0, 0x7a, 0xd0, 0x87, 0x32, 0x68, 0xb7, 0x36,
-  0xe7, 0xd8, 0x3e, 0x58, 0x99, 0xfe, 0x35, 0x80,
-  0xf5, 0x0c, 0x98, 0xb0, 0xb9, 0x89, 0x87, 0x91,
-  0x4e, 0xdf, 0xde, 0xfe, 0xfa, 0xf5, 0x73, 0x19,
-  0x3e, 0x3e, 0x3e, 0x3a, 0x3a, 0x3d, 0xfd, 0xfe,
-  0xb1, 0x8d, 0x13, 0xfd, 0x17, 0x02, 0x50, 0x2e,
-  0x4e, 0x4e, 0x52, 0xa9, 0xb3, 0xb3, 0xc1, 0xec,
-  0x0f, 0x47, 0x0e, 0x67, 0x6e, 0x94, 0x1f, 0x77,
-  0x7d, 0x7f, 0x64, 0xa5, 0xa2, 0x28, 0x95, 0x8a,
-  0xd9, 0xf3, 0x18, 0xf9, 0x7c, 0x3e, 0xff, 0xfa,
-  0x8a, 0x2a, 0x20, 0x8a, 0xc3, 0xdf, 0xf9, 0x85,
-  0x80, 0xc1, 0x92, 0x97, 0x4a, 0xa5, 0x52, 0xa9,
-  0x34, 0xba, 0x05, 0xcc, 0xe8, 0x7e, 0x62, 0xd6,
-  0x96, 0xb1, 0xf7, 0x63, 0x61, 0x04, 0x61, 0x12,
-  0x1e, 0x17, 0x43, 0x02, 0x64, 0x59, 0x96, 0x65,
-  0xd9, 0x30, 0x58, 0x96, 0x65, 0x59, 0xf6, 0xab,
-  0x7c, 0xff, 0x0c, 0xec, 0x32, 0x5d, 0x2c, 0x16,
-  0x8b, 0xc5, 0xe2, 0x70, 0xed, 0xc8, 0xfe, 0x80,
-  0xb7, 0xb7, 0xed, 0xed, 0xbb, 0xbb, 0xfb, 0xfb,
-  0x74, 0xfa, 0xe1, 0x61, 0xd2, 0xc4, 0xc7, 0x03,
-  0x41, 0x20, 0x9e, 0xab, 0xab, 0x3d, 0xcb, 0x77,
-  0x1b, 0xd0, 0xe8, 0xf8, 0xf3, 0xca, 0xe1, 0x74,
-  0xa2, 0x11, 0xff, 0x33, 0xb0, 0x8e, 0x24, 0x39,
-  0x18, 0x67, 0xad, 0x20, 0xce, 0xa0, 0xae, 0xa3,
-  0x11, 0xdf, 0xf1, 0xed, 0xf6, 0xe8, 0x11, 0xc7,
-  0x75, 0xbb, 0x83, 0xfb, 0x67, 0x98, 0xe1, 0xbf,
-  0xe1, 0x37, 0x5a, 0x8c, 0x28, 0xe4, 0xc5, 0xfe,
-  0xbe, 0x74, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
-  0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/edit_copy.h
+++ b/art/tango/edit_copy.h
@@ -1,197 +0,0 @@
-/* edit_copy.png - 498 bytes */
-static const unsigned char edit_copy_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0a, 0x1a, 0x14, 0x08, 0x2f, 0x83,
-  0x14, 0x34, 0x9b, 0x00, 0x00, 0x01, 0x7f, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0x4b,
-  0x4b, 0x02, 0x51, 0x18, 0x86, 0xdf, 0x23, 0x33,
-  0x63, 0xda, 0x80, 0xfd, 0x0a, 0xcf, 0x08, 0xdd,
-  0x16, 0xfd, 0x8f, 0x08, 0x5a, 0xb6, 0x88, 0xa0,
-  0x75, 0x17, 0xf0, 0x42, 0xb6, 0xb0, 0x45, 0x91,
-  0x76, 0xdb, 0x44, 0x44, 0x44, 0x1b, 0xb1, 0x36,
-  0x05, 0xfe, 0x04, 0x31, 0xb3, 0x36, 0x81, 0x65,
-  0x30, 0xa3, 0xbf, 0xa0, 0x9a, 0x30, 0x05, 0x37,
-  0xcd, 0xed, 0xb4, 0x69, 0x74, 0x46, 0x47, 0xb1,
-  0x6f, 0xf5, 0x9d, 0xc3, 0x79, 0x1f, 0xde, 0xf7,
-  0xe3, 0x3b, 0xe4, 0xe8, 0x24, 0x33, 0xaf, 0xeb,
-  0xfa, 0x2c, 0x46, 0x28, 0xc1, 0xcf, 0xbd, 0x6d,
-  0xae, 0xc5, 0xef, 0x9c, 0x77, 0x9c, 0x61, 0x18,
-  0xd3, 0xf1, 0xe8, 0xd6, 0x28, 0x7a, 0xa4, 0x0f,
-  0xf6, 0x26, 0x01, 0xb8, 0x01, 0x76, 0xd3, 0x6a,
-  0x35, 0xc1, 0x18, 0xeb, 0x13, 0x11, 0x42, 0x00,
-  0x00, 0xa1, 0xd0, 0x84, 0x27, 0x94, 0x73, 0x1e,
-  0x6a, 0xb5, 0x1a, 0x5e, 0xab, 0x95, 0x85, 0xc6,
-  0x77, 0x63, 0x66, 0x90, 0x8b, 0xfd, 0xcc, 0x6e,
-  0xca, 0xee, 0x79, 0x9e, 0xbf, 0x75, 0x01, 0x24,
-  0x49, 0x42, 0xb1, 0x54, 0x98, 0xfa, 0x47, 0xa4,
-  0x45, 0x17, 0x40, 0x51, 0x94, 0x4e, 0x8c, 0x56,
-  0xab, 0x39, 0x54, 0x6c, 0x47, 0x72, 0x01, 0x28,
-  0xa5, 0x28, 0x96, 0x0a, 0x9d, 0xb3, 0x2c, 0xcb,
-  0x9e, 0xe2, 0x48, 0x24, 0xd2, 0x3f, 0x03, 0xc6,
-  0x18, 0x64, 0x59, 0x76, 0x0d, 0xd2, 0xf9, 0x70,
-  0x50, 0xb9, 0x00, 0x94, 0x52, 0x94, 0xca, 0xc5,
-  0xa1, 0x0e, 0x7a, 0xa1, 0x9c, 0x2d, 0xb6, 0x2c,
-  0x06, 0x45, 0x19, 0xcd, 0x41, 0x30, 0x38, 0x8e,
-  0x76, 0xbb, 0xdd, 0x05, 0xe8, 0xba, 0x0e, 0xc6,
-  0x18, 0xc2, 0x61, 0x8a, 0xf2, 0x53, 0x69, 0xa8,
-  0x03, 0x4a, 0x25, 0x98, 0xa6, 0x81, 0xca, 0x4b,
-  0xa5, 0x0b, 0xd0, 0xb4, 0x1f, 0x04, 0x02, 0x63,
-  0xb0, 0x2c, 0x36, 0xd4, 0xee, 0xe5, 0xd5, 0x05,
-  0x1e, 0x1e, 0xef, 0xdd, 0x11, 0x04, 0x9e, 0xaf,
-  0x9e, 0x9d, 0x9f, 0xba, 0x16, 0x87, 0x31, 0xcb,
-  0xd3, 0xb6, 0x28, 0x8a, 0x58, 0x59, 0x5e, 0x85,
-  0x65, 0x99, 0x50, 0xbf, 0x54, 0xe4, 0xae, 0xb3,
-  0xe0, 0x36, 0xd6, 0xa3, 0x79, 0x00, 0x79, 0xc7,
-  0x72, 0x6c, 0x1b, 0x86, 0xe1, 0xeb, 0x15, 0x3b,
-  0x4b, 0x55, 0x55, 0xe4, 0x6e, 0xb2, 0x00, 0xf0,
-  0xec, 0xf3, 0x1a, 0x92, 0xa6, 0xe9, 0xf0, 0xfb,
-  0xfd, 0x10, 0x04, 0x01, 0xa2, 0x28, 0x82, 0x10,
-  0x82, 0x7a, 0xbd, 0x0e, 0x80, 0xe0, 0xe3, 0xf3,
-  0xdd, 0x16, 0xa7, 0x12, 0xb1, 0xe4, 0x1c, 0xe9,
-  0x15, 0x1f, 0x1e, 0xa7, 0xb3, 0xa6, 0x69, 0x2e,
-  0x79, 0x7d, 0xac, 0xbf, 0x2a, 0x00, 0x28, 0x24,
-  0x62, 0xc9, 0x1d, 0x00, 0xf8, 0x05, 0x42, 0x59,
-  0xa6, 0x03, 0x15, 0x88, 0xf7, 0xd8, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
-
-
-/* edit_copy.png - 1020 bytes */
-static const unsigned char edit_copy_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x88, 0x00, 0x8a, 0x00, 0x85, 0x09,
-  0xa5, 0xa9, 0xd5, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x03,
-  0x87, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
-  0x57, 0xbb, 0x4e, 0xe3, 0x40, 0x14, 0xbd, 0x33,
-  0xb6, 0xf3, 0x70, 0x41, 0xba, 0x7c, 0x81, 0x13,
-  0xdb, 0xfc, 0x07, 0x42, 0x08, 0x1a, 0x2a, 0x24,
-  0x4a, 0x6a, 0x8a, 0x44, 0x40, 0x10, 0x88, 0x1a,
-  0x29, 0x84, 0x37, 0x12, 0x20, 0x14, 0x89, 0x9a,
-  0x86, 0x96, 0x0a, 0x09, 0x45, 0x10, 0x84, 0x40,
-  0x3c, 0x24, 0x20, 0xc1, 0xd4, 0x50, 0x00, 0x05,
-  0x89, 0x08, 0x8a, 0x3d, 0x7e, 0x6c, 0xe1, 0x9d,
-  0xb5, 0xd7, 0x8e, 0x93, 0x40, 0x82, 0xb4, 0x3b,
-  0x95, 0x67, 0x3c, 0x73, 0xee, 0x39, 0xf7, 0xdc,
-  0x19, 0x8f, 0x01, 0xfe, 0xf3, 0x86, 0xe8, 0xc3,
-  0xd2, 0xd2, 0xea, 0x6a, 0x2e, 0x37, 0x32, 0x62,
-  0x59, 0xa6, 0x69, 0x9a, 0x92, 0xf4, 0xe3, 0x81,
-  0x11, 0xc6, 0x18, 0x97, 0xcb, 0x13, 0x13, 0xa9,
-  0xd4, 0xd4, 0xd4, 0xde, 0xde, 0x77, 0x71, 0x58,
-  0xfa, 0x40, 0x88, 0xa6, 0x69, 0x9a, 0x28, 0x4e,
-  0x4f, 0x4f, 0x4d, 0xcd, 0xce, 0xfe, 0x7c, 0xe6,
-  0xd6, 0xd6, 0xd6, 0xd7, 0x97, 0x97, 0x45, 0xb1,
-  0x53, 0x9c, 0x3f, 0x02, 0x30, 0xc6, 0x18, 0x21,
-  0xe7, 0x45, 0xa5, 0x52, 0xa9, 0xbc, 0xbf, 0x77,
-  0x9f, 0x78, 0x4f, 0x4f, 0x4f, 0x4f, 0x2c, 0x06,
-  0x80, 0x10, 0x42, 0xee, 0x78, 0x1d, 0x0b, 0xf8,
-  0x6e, 0xb3, 0x2c, 0xcb, 0xb2, 0x2c, 0x84, 0x34,
-  0x4d, 0xd3, 0x34, 0x8d, 0x61, 0x9a, 0xcf, 0x03,
-  0x08, 0x85, 0x42, 0xa1, 0x70, 0x98, 0xf6, 0x2d,
-  0xeb, 0xc7, 0x05, 0x28, 0x8a, 0xa2, 0x3c, 0x3e,
-  0x06, 0x13, 0xbf, 0xbc, 0xbc, 0xbe, 0xbe, 0xb8,
-  0x18, 0x1d, 0xad, 0xd5, 0x6a, 0xb5, 0x8f, 0x0f,
-  0x41, 0xa0, 0x6f, 0x1b, 0x61, 0x21, 0x64, 0x67,
-  0xde, 0x2d, 0x68, 0x71, 0x71, 0x79, 0x39, 0x9b,
-  0x6d, 0xb7, 0x68, 0xd1, 0xef, 0x76, 0x70, 0x30,
-  0x31, 0x91, 0x4e, 0x67, 0x32, 0x43, 0x43, 0x2d,
-  0x05, 0x24, 0x93, 0xc9, 0x64, 0x22, 0xe1, 0x1f,
-  0x57, 0x55, 0x55, 0x55, 0x55, 0x86, 0x39, 0x3a,
-  0x2a, 0x14, 0x0e, 0x0f, 0x05, 0x21, 0x93, 0x99,
-  0x9c, 0x9c, 0x99, 0x41, 0x88, 0x0a, 0xeb, 0x34,
-  0xb3, 0x8d, 0xa9, 0x03, 0x2c, 0x2d, 0xad, 0xac,
-  0x2c, 0x2c, 0x0c, 0x0c, 0x74, 0xec, 0x00, 0x21,
-  0xba, 0x4e, 0x88, 0xe3, 0x07, 0x0d, 0x53, 0xad,
-  0x56, 0xab, 0x95, 0x4a, 0xb7, 0xe9, 0x3b, 0x7b,
-  0xe7, 0xef, 0x78, 0x6d, 0x08, 0x08, 0x72, 0xa0,
-  0x5e, 0xaf, 0xd7, 0xeb, 0x75, 0x80, 0x93, 0x93,
-  0x62, 0xb1, 0x50, 0xe8, 0x3e, 0x61, 0x87, 0x6a,
-  0xf3, 0x9d, 0xf2, 0x25, 0x07, 0xdc, 0x40, 0x84,
-  0x10, 0xa2, 0x69, 0xc1, 0x01, 0x4a, 0xa5, 0x52,
-  0xa9, 0x54, 0xea, 0x9c, 0xb8, 0x24, 0x49, 0x92,
-  0x2c, 0x77, 0x20, 0x20, 0x91, 0x48, 0x24, 0x04,
-  0xc1, 0x06, 0x74, 0xc0, 0xdd, 0x0e, 0x9c, 0x9e,
-  0x1e, 0x1f, 0xfb, 0xd7, 0x49, 0x92, 0x24, 0x7d,
-  0xe5, 0x73, 0xe8, 0x4d, 0x04, 0xed, 0x7f, 0xdb,
-  0x01, 0xba, 0x50, 0x51, 0x14, 0x45, 0x51, 0xfc,
-  0x02, 0x08, 0x21, 0x84, 0x90, 0xe0, 0x00, 0xe5,
-  0x72, 0xb9, 0x5c, 0x2e, 0xb7, 0x4f, 0xbc, 0x11,
-  0x8a, 0x65, 0x01, 0xc8, 0xb2, 0x2c, 0xf7, 0xf6,
-  0xb6, 0x21, 0xc0, 0x0b, 0x40, 0x81, 0x05, 0x41,
-  0x10, 0x1a, 0x3b, 0xa0, 0xaa, 0xaa, 0x0a, 0x70,
-  0x7a, 0x7a, 0x76, 0x76, 0x72, 0xe2, 0x07, 0x96,
-  0x65, 0x59, 0x6e, 0x64, 0x7d, 0xb3, 0x4c, 0xbb,
-  0xf1, 0xe9, 0xa9, 0xd3, 0x15, 0x07, 0xdc, 0x7b,
-  0x80, 0x8e, 0x13, 0x42, 0x88, 0xae, 0xb7, 0x76,
-  0x20, 0x88, 0x70, 0x50, 0xe2, 0x64, 0x59, 0x96,
-  0x25, 0xc9, 0x19, 0x0f, 0x87, 0xc3, 0xe1, 0x70,
-  0xf8, 0x0b, 0x02, 0x4c, 0xd3, 0x34, 0x4d, 0xd3,
-  0xef, 0x80, 0x5b, 0x00, 0x80, 0xfd, 0x1d, 0xa8,
-  0xd7, 0x01, 0xce, 0xce, 0xce, 0xcf, 0x8b, 0x45,
-  0x3f, 0xb0, 0x28, 0x8a, 0xa2, 0x28, 0xfa, 0x33,
-  0xdb, 0xca, 0x01, 0x84, 0x10, 0xc2, 0x18, 0x80,
-  0x65, 0x59, 0x96, 0x61, 0x9c, 0x52, 0xa5, 0xbc,
-  0x5a, 0x0a, 0x30, 0x0c, 0xc3, 0x30, 0x8c, 0x60,
-  0x6b, 0x69, 0x3f, 0x28, 0xf3, 0x74, 0xfc, 0xfe,
-  0xfe, 0xfe, 0xde, 0x7b, 0x0a, 0x35, 0xc3, 0xe3,
-  0x79, 0x9e, 0xe7, 0x79, 0x80, 0x58, 0x2c, 0x16,
-  0x73, 0xce, 0x7b, 0x80, 0x78, 0x3c, 0x1e, 0x8f,
-  0xc7, 0xfd, 0xbc, 0xda, 0x12, 0xe0, 0x25, 0xea,
-  0xcd, 0x54, 0xa3, 0xef, 0x2d, 0x9d, 0x2f, 0x8a,
-  0xa2, 0x98, 0x4c, 0x06, 0x13, 0xa6, 0x7d, 0x8c,
-  0x31, 0x66, 0x18, 0x00, 0x86, 0x61, 0x18, 0x86,
-  0x71, 0x32, 0x8d, 0x31, 0xc6, 0x18, 0xfb, 0x2b,
-  0x23, 0xd0, 0x01, 0x77, 0x6d, 0x13, 0x02, 0x10,
-  0x8d, 0x46, 0xa3, 0xd1, 0xa8, 0xbf, 0xa4, 0x28,
-  0x71, 0x8e, 0xe3, 0x38, 0x8e, 0x0b, 0x16, 0x60,
-  0x8b, 0xb4, 0xe7, 0x37, 0x3a, 0x65, 0xe8, 0x7a,
-  0x5a, 0x32, 0x74, 0x1d, 0xcb, 0xb2, 0x2c, 0xcb,
-  0xfa, 0x37, 0x71, 0xb1, 0x68, 0x1f, 0xd7, 0x5e,
-  0x21, 0xac, 0x03, 0x18, 0x0a, 0x85, 0x42, 0x0f,
-  0x0f, 0x9b, 0x9b, 0xdb, 0xdb, 0x1b, 0x1b, 0xed,
-  0x9f, 0xe0, 0x34, 0x90, 0x57, 0x68, 0x50, 0xe6,
-  0x69, 0x66, 0x29, 0x71, 0xba, 0x6e, 0x67, 0x27,
-  0x9f, 0xdf, 0xda, 0x6a, 0x37, 0xea, 0xf5, 0xb5,
-  0x4f, 0xc0, 0x77, 0xff, 0x8c, 0xb2, 0xd9, 0x5c,
-  0x6e, 0x7e, 0x7e, 0x66, 0xa6, 0xd5, 0xde, 0xf1,
-  0x96, 0x0a, 0x9d, 0xe7, 0x94, 0x8e, 0x3d, 0x6f,
-  0x60, 0xa0, 0xaf, 0x6f, 0x70, 0xd0, 0xc1, 0x7f,
-  0x7d, 0x7d, 0x7b, 0x7b, 0x79, 0x01, 0xb8, 0xbc,
-  0xbc, 0xba, 0xba, 0xb8, 0x00, 0xb0, 0x2f, 0x8a,
-  0xdb, 0xdb, 0x3e, 0x01, 0x9d, 0xb6, 0xa0, 0xbd,
-  0xc3, 0x71, 0x1c, 0xc7, 0xb2, 0x36, 0x51, 0xd6,
-  0x15, 0xcd, 0xed, 0x04, 0x42, 0x8e, 0x10, 0xda,
-  0x9e, 0x9e, 0x9e, 0x9f, 0x9f, 0x9e, 0x00, 0x6e,
-  0x6f, 0xef, 0xee, 0x6e, 0x6e, 0x00, 0x22, 0x11,
-  0x9e, 0xe7, 0xf9, 0x8d, 0x8d, 0x54, 0x6a, 0x7c,
-  0x3c, 0x9d, 0xce, 0xe7, 0xbb, 0x2e, 0x80, 0xee,
-  0x9d, 0x48, 0x24, 0x12, 0x89, 0x44, 0x82, 0xaf,
-  0x02, 0x94, 0xa8, 0xd7, 0x09, 0xc3, 0x30, 0x0c,
-  0xd3, 0x74, 0x32, 0x4e, 0x89, 0x03, 0x60, 0x8c,
-  0xd0, 0xd8, 0x98, 0x4d, 0x7c, 0x77, 0xd7, 0x1b,
-  0xb7, 0xe3, 0x7b, 0xbb, 0x7d, 0x3f, 0xdf, 0xdf,
-  0xd7, 0x75, 0x5d, 0xd7, 0xf5, 0xe1, 0x61, 0x3a,
-  0xde, 0xee, 0xff, 0x96, 0x2d, 0x92, 0x5e, 0x14,
-  0x4d, 0xd3, 0x76, 0xa5, 0x58, 0xb4, 0x4b, 0xaa,
-  0xbf, 0x7f, 0x76, 0x36, 0x93, 0x99, 0x9b, 0xfb,
-  0xfc, 0xec, 0x56, 0xa2, 0xff, 0xb9, 0xf6, 0x0b,
-  0xd9, 0xe5, 0x3d, 0x1c, 0x7d, 0xfc, 0xfa, 0x4e,
-  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
-  0xae, 0x42, 0x60, 0x82};
--- a/art/tango/edit_cut.h
+++ b/art/tango/edit_cut.h
@@ -1,333 +0,0 @@
-/* edit_cut.png - 807 bytes */
-static const unsigned char edit_cut_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0a, 0x1c, 0x16, 0x1d, 0x31, 0x68,
-  0x41, 0x64, 0x5e, 0x00, 0x00, 0x02, 0xb4, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x85, 0x93, 0x5d,
-  0x48, 0x93, 0x51, 0x18, 0xc7, 0x9f, 0x73, 0xde,
-  0x77, 0xaf, 0xaf, 0xdb, 0xd4, 0x7d, 0xa5, 0xdb,
-  0x6c, 0xf8, 0x15, 0x68, 0x78, 0xd1, 0x55, 0x10,
-  0x74, 0x61, 0x94, 0x49, 0x57, 0x45, 0xde, 0x64,
-  0x22, 0x11, 0x68, 0x69, 0x96, 0x58, 0xa8, 0x69,
-  0x81, 0x90, 0x04, 0x95, 0xa5, 0x7d, 0x81, 0x88,
-  0x10, 0x94, 0x18, 0xe8, 0x10, 0xf4, 0x4a, 0x90,
-  0x24, 0xba, 0x0c, 0x02, 0xb5, 0x30, 0x6d, 0x33,
-  0x36, 0xf2, 0x63, 0xef, 0x36, 0x75, 0x9b, 0xee,
-  0x75, 0x5f, 0xef, 0x76, 0xce, 0xdb, 0x4d, 0xce,
-  0x61, 0x5a, 0xe7, 0xee, 0xfc, 0xff, 0x0f, 0x3f,
-  0xfe, 0xcf, 0xf3, 0x9c, 0x83, 0x20, 0xe5, 0x3c,
-  0xeb, 0x7d, 0x72, 0x0e, 0x00, 0xde, 0xf3, 0x3c,
-  0xef, 0x6d, 0xba, 0x79, 0xbb, 0x74, 0x8f, 0xd7,
-  0xcf, 0xb2, 0xec, 0xa5, 0x3b, 0xcd, 0xad, 0xba,
-  0x54, 0x1d, 0xa7, 0x5e, 0x18, 0x86, 0x19, 0xbb,
-  0xd5, 0xd8, 0xac, 0x8d, 0x46, 0xa3, 0xcb, 0x7d,
-  0xfd, 0xaf, 0x3b, 0x53, 0x3d, 0x05, 0xab, 0xb8,
-  0x70, 0xe6, 0x74, 0xb9, 0xe6, 0xc5, 0xab, 0x9e,
-  0x4f, 0x07, 0x02, 0x08, 0x21, 0xfc, 0x4f, 0x87,
-  0x1d, 0xd7, 0xd5, 0xd6, 0x57, 0x10, 0x42, 0x8e,
-  0xed, 0xe8, 0x4f, 0x7b, 0x1e, 0x97, 0x99, 0x73,
-  0xcd, 0xa6, 0xed, 0x90, 0x88, 0x28, 0xa5, 0x27,
-  0x0e, 0x04, 0x60, 0x8c, 0x43, 0x4b, 0x4b, 0xbf,
-  0x80, 0x4f, 0x4b, 0x43, 0xb1, 0x58, 0xac, 0x74,
-  0x27, 0x05, 0xcb, 0xb2, 0x53, 0x85, 0x85, 0x85,
-  0xe0, 0x71, 0x7b, 0x28, 0xa5, 0xd4, 0xf1, 0xaf,
-  0x04, 0x15, 0x36, 0x9b, 0x0d, 0x56, 0x5d, 0x2b,
-  0xa8, 0xae, 0xb6, 0xbe, 0x38, 0x91, 0x48, 0x9c,
-  0xea, 0x79, 0xde, 0x3d, 0x50, 0x52, 0x52, 0xa2,
-  0x40, 0x80, 0xc1, 0xe1, 0x74, 0x00, 0x00, 0x58,
-  0x0f, 0x04, 0xdc, 0x6d, 0xbd, 0xf7, 0x19, 0x63,
-  0xbc, 0xbc, 0xb8, 0x68, 0x07, 0x3e, 0x8d, 0x47,
-  0x92, 0x24, 0x1d, 0xd7, 0xeb, 0xf4, 0xd7, 0x64,
-  0x0a, 0xb0, 0xbe, 0xb1, 0x46, 0x01, 0x60, 0xa2,
-  0xad, 0xa5, 0xe3, 0xe1, 0x81, 0x00, 0x00, 0x00,
-  0x4a, 0x69, 0xe5, 0xc2, 0x8f, 0x05, 0x79, 0x6d,
-  0xcd, 0x03, 0x8d, 0x37, 0x9a, 0x54, 0xf1, 0x44,
-  0x1c, 0x89, 0x62, 0x10, 0xe6, 0xe6, 0xe6, 0x24,
-  0x00, 0xe8, 0xda, 0x5b, 0xff, 0x17, 0xa0, 0xad,
-  0xa5, 0x63, 0x1a, 0x63, 0x3c, 0x64, 0x5f, 0xb4,
-  0xd1, 0x60, 0x70, 0x0b, 0x6b, 0x34, 0x1a, 0x10,
-  0xdc, 0x82, 0x2c, 0xcb, 0xf2, 0xbb, 0xb6, 0x96,
-  0x8e, 0xe9, 0xff, 0x02, 0xfe, 0xa4, 0x98, 0x9a,
-  0x9d, 0x99, 0xc6, 0x4e, 0xa7, 0x03, 0xd2, 0x39,
-  0x1e, 0x32, 0xdf, 0x0e, 0x46, 0x10, 0x42, 0x6f,
-  0xf6, 0xab, 0x45, 0x7b, 0x85, 0x31, 0xa3, 0xb1,
-  0x97, 0x50, 0x7a, 0x3d, 0xbe, 0xb9, 0xa9, 0x26,
-  0xe5, 0x65, 0x32, 0x33, 0xf9, 0x11, 0x15, 0x18,
-  0x73, 0x40, 0x20, 0x74, 0x0b, 0x21, 0x34, 0x50,
-  0xe9, 0xf1, 0xb4, 0xef, 0x0b, 0x18, 0x33, 0x99,
-  0x3a, 0xe3, 0x7e, 0xff, 0x83, 0xa3, 0x26, 0x13,
-  0x24, 0x28, 0x45, 0xde, 0xad, 0x4d, 0xd9, 0x17,
-  0xde, 0x1e, 0x66, 0x65, 0x54, 0x55, 0x90, 0x9d,
-  0xc3, 0xf0, 0x1c, 0x47, 0x25, 0x59, 0x06, 0xe7,
-  0xfa, 0x3a, 0x28, 0xb2, 0xb2, 0xae, 0x56, 0xba,
-  0xdd, 0x43, 0xc9, 0x16, 0xc6, 0xcd, 0xe6, 0x1a,
-  0xc9, 0xe7, 0xeb, 0x2a, 0x36, 0x1a, 0xe9, 0xc2,
-  0xca, 0xca, 0x54, 0x30, 0x12, 0x96, 0x02, 0x41,
-  0x11, 0xd7, 0xc4, 0x69, 0x4d, 0x94, 0x23, 0x3a,
-  0x96, 0xc1, 0x34, 0x10, 0x12, 0x13, 0x8e, 0xd5,
-  0xd5, 0x0f, 0x47, 0xf4, 0x7a, 0x12, 0xf3, 0xf9,
-  0x06, 0xc7, 0xcd, 0xe6, 0xdd, 0x97, 0x3a, 0x6a,
-  0x30, 0x08, 0xf3, 0x45, 0x45, 0x64, 0x84, 0x61,
-  0xee, 0x03, 0x00, 0xcc, 0x58, 0x2c, 0x21, 0xab,
-  0x52, 0x99, 0xd8, 0xf1, 0x47, 0x18, 0x86, 0x7c,
-  0xc9, 0x35, 0x07, 0x01, 0x00, 0x86, 0x31, 0x6e,
-  0xff, 0x96, 0x9f, 0x4f, 0x46, 0x0d, 0x06, 0x61,
-  0x77, 0x88, 0xb1, 0x98, 0x5e, 0x92, 0x24, 0x52,
-  0x45, 0xc8, 0xa3, 0x09, 0x95, 0xea, 0xa5, 0x82,
-  0x65, 0x79, 0x84, 0xb1, 0x3d, 0x39, 0x69, 0x8e,
-  0x9b, 0x51, 0xf3, 0xe9, 0xaa, 0xc9, 0x8c, 0x8c,
-  0xbe, 0xcb, 0x94, 0x76, 0x83, 0x2c, 0x53, 0x20,
-  0xc4, 0xb0, 0x0b, 0xe0, 0x38, 0x41, 0xad, 0x54,
-  0x32, 0x5f, 0xf3, 0xf2, 0x62, 0x26, 0x9d, 0xae,
-  0x69, 0x5e, 0x10, 0xbc, 0x8a, 0xcc, 0xcc, 0x2b,
-  0xc9, 0x8f, 0xa4, 0xd5, 0x36, 0x7c, 0x77, 0xb9,
-  0x36, 0x0e, 0x1f, 0x3a, 0xd4, 0x30, 0x6b, 0xb1,
-  0xc4, 0x08, 0xa5, 0x18, 0x30, 0x0e, 0x00, 0x00,
-  0x30, 0x00, 0x00, 0xd5, 0x5a, 0xad, 0xcf, 0xe5,
-  0xf7, 0x9f, 0xf4, 0x4b, 0x12, 0x1b, 0x00, 0x90,
-  0x39, 0xb5, 0xfa, 0xec, 0x45, 0x41, 0x48, 0xee,
-  0xdc, 0x2a, 0x8a, 0xee, 0xea, 0xec, 0x6c, 0x8f,
-  0x37, 0x10, 0xc8, 0xf1, 0x87, 0xc3, 0x1a, 0x5f,
-  0x24, 0xe2, 0x53, 0xa8, 0x54, 0xe7, 0xad, 0xa2,
-  0xe8, 0xfe, 0x0d, 0xa0, 0xf3, 0x3a, 0x07, 0xdc,
-  0x34, 0xc1, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x49,
-  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* edit_cut.png - 1800 bytes */
-static const unsigned char edit_cut_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x1c, 0x20, 0x00,
-  0x00, 0x1c, 0x20, 0x01, 0xcd, 0x0f, 0x9b, 0x9e,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
-  0x93, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xdd,
-  0x56, 0x5b, 0x48, 0x54, 0x5b, 0x18, 0xfe, 0xd7,
-  0xde, 0x6b, 0xcf, 0xac, 0x49, 0xad, 0xd4, 0x99,
-  0xcc, 0x66, 0x1c, 0x27, 0xe8, 0x32, 0x51, 0x99,
-  0x15, 0x35, 0x26, 0x1a, 0x95, 0x16, 0x15, 0x3d,
-  0x44, 0x20, 0x45, 0x44, 0xbd, 0x04, 0x49, 0x76,
-  0x91, 0x1e, 0x2a, 0x28, 0x0a, 0x83, 0xa0, 0x1b,
-  0x64, 0x44, 0x10, 0x15, 0x3d, 0x44, 0x84, 0x97,
-  0x30, 0x33, 0xa2, 0xc2, 0x92, 0xec, 0x82, 0xd9,
-  0x43, 0x16, 0xd9, 0x4d, 0x4a, 0xcc, 0xb4, 0xa9,
-  0xa6, 0xd1, 0xc6, 0xb9, 0xed, 0xd9, 0xb7, 0x75,
-  0x1e, 0x56, 0xeb, 0x98, 0x9e, 0xe3, 0xc9, 0xcc,
-  0xf3, 0x70, 0xce, 0xff, 0xb2, 0x58, 0x7b, 0xad,
-  0xff, 0xfb, 0xff, 0xef, 0xfb, 0xff, 0xb5, 0xd7,
-  0x02, 0xf8, 0x8f, 0x1b, 0x1a, 0xec, 0xc6, 0xe3,
-  0xc7, 0x4f, 0x9c, 0x38, 0x76, 0xac, 0xa1, 0xc1,
-  0x30, 0x0c, 0xc3, 0x30, 0xb2, 0xb2, 0x54, 0x55,
-  0x55, 0x55, 0x35, 0x37, 0x77, 0xf7, 0xee, 0x9d,
-  0x3b, 0xf7, 0xec, 0x79, 0xf0, 0xe0, 0x57, 0x03,
-  0x1f, 0x3a, 0x74, 0xe4, 0xc8, 0xc1, 0x83, 0xc5,
-  0xc5, 0x1c, 0x9d, 0x10, 0x42, 0x2c, 0x96, 0xce,
-  0xce, 0xe2, 0xe2, 0x6d, 0xdb, 0x76, 0xec, 0x70,
-  0x38, 0x06, 0x8b, 0x23, 0x0c, 0x36, 0x90, 0x20,
-  0x08, 0x82, 0x20, 0x78, 0x3c, 0x73, 0xe6, 0xcc,
-  0x99, 0xe3, 0xf1, 0x00, 0x58, 0xad, 0xc9, 0xc9,
-  0x56, 0x6b, 0x6d, 0xed, 0x50, 0x95, 0x23, 0x84,
-  0x10, 0x42, 0x8e, 0x1e, 0x5d, 0xbe, 0x7c, 0xd9,
-  0xb2, 0x15, 0x2b, 0x00, 0x18, 0xbe, 0xdd, 0xce,
-  0xe2, 0x5d, 0xb9, 0x32, 0x6c, 0x04, 0xe2, 0xe2,
-  0xe2, 0xe2, 0xe2, 0xe2, 0x36, 0x6f, 0x5e, 0xb2,
-  0x64, 0xf1, 0xe2, 0xa5, 0x4b, 0x11, 0x72, 0xb9,
-  0x9c, 0xce, 0xf1, 0xe3, 0x01, 0x44, 0x51, 0x10,
-  0x44, 0x91, 0x90, 0xb3, 0x67, 0xcf, 0x9d, 0x3b,
-  0x7d, 0xba, 0xa4, 0x64, 0xb0, 0x01, 0x4f, 0x9e,
-  0x3c, 0x75, 0xaa, 0xb4, 0xb4, 0xac, 0xcc, 0x6e,
-  0x1f, 0x37, 0xce, 0x6e, 0xc7, 0x38, 0x31, 0x71,
-  0xf4, 0xe8, 0xa4, 0x24, 0x80, 0xf9, 0xf3, 0x73,
-  0x73, 0x17, 0x2c, 0x00, 0x18, 0x3b, 0x36, 0x25,
-  0x65, 0xec, 0xd8, 0xe9, 0xd3, 0x87, 0x8d, 0x80,
-  0xa6, 0x69, 0x9a, 0xa6, 0xd9, 0xed, 0x56, 0x6b,
-  0x72, 0xb2, 0xcd, 0xd6, 0xfb, 0x3d, 0x37, 0x77,
-  0xfe, 0xfc, 0x05, 0x0b, 0xf8, 0x6c, 0xcf, 0x9e,
-  0x9f, 0xe1, 0x30, 0x65, 0xd3, 0xd3, 0x63, 0xb1,
-  0x58, 0x2c, 0x16, 0x5b, 0xbd, 0x3a, 0x2b, 0xcb,
-  0xe3, 0xc9, 0xce, 0x06, 0xd0, 0x75, 0x5d, 0xd7,
-  0x75, 0x5e, 0x11, 0x80, 0x70, 0x38, 0x12, 0x09,
-  0x87, 0xd3, 0xd2, 0x86, 0x8d, 0x00, 0x0b, 0xd8,
-  0xd2, 0x52, 0x53, 0x73, 0xed, 0xda, 0x95, 0x2b,
-  0x86, 0x61, 0x32, 0x99, 0x4c, 0x26, 0x13, 0x80,
-  0x24, 0x61, 0x2c, 0x49, 0x00, 0x29, 0x29, 0x29,
-  0x29, 0xa9, 0xa9, 0xa2, 0x78, 0xf1, 0xe2, 0xa5,
-  0x4b, 0x17, 0x2e, 0xd4, 0xd5, 0x0d, 0x84, 0x93,
-  0x90, 0x90, 0x90, 0x90, 0x90, 0x50, 0x5d, 0x3d,
-  0x6f, 0x5e, 0x56, 0x56, 0x76, 0x36, 0x13, 0x46,
-  0xd7, 0x79, 0xeb, 0x00, 0xdc, 0xbd, 0x5b, 0x5f,
-  0x7f, 0xe7, 0x0e, 0x40, 0x30, 0x18, 0x0c, 0x06,
-  0x83, 0xbb, 0x76, 0x0d, 0x1b, 0x01, 0x66, 0x2b,
-  0x57, 0xfa, 0x7c, 0x5f, 0xbf, 0xfa, 0x7c, 0x08,
-  0xc9, 0xb2, 0x2c, 0x47, 0xa3, 0x00, 0x94, 0x52,
-  0x4a, 0x29, 0x40, 0x46, 0xc6, 0xf4, 0xe9, 0x33,
-  0x66, 0x00, 0x84, 0x42, 0xa1, 0x50, 0x30, 0xb8,
-  0x70, 0xe1, 0xdf, 0x2b, 0x9f, 0x93, 0xc3, 0x94,
-  0xce, 0xcc, 0x74, 0x38, 0xec, 0x76, 0xa7, 0xb3,
-  0xd7, 0xff, 0xf3, 0xe7, 0x2f, 0x5f, 0x3e, 0x7f,
-  0x66, 0x42, 0x29, 0xca, 0xb7, 0x6f, 0xec, 0xa7,
-  0x50, 0x5a, 0x3a, 0x6c, 0x04, 0x18, 0xe0, 0xfb,
-  0xf7, 0x6c, 0x76, 0xfe, 0x7c, 0x75, 0x75, 0x4d,
-  0x4d, 0x55, 0x15, 0xa5, 0xec, 0x6c, 0xf4, 0x26,
-  0x32, 0x73, 0xe6, 0x8c, 0x19, 0xb3, 0x67, 0x03,
-  0x54, 0x54, 0x54, 0x56, 0x96, 0x95, 0xbd, 0x79,
-  0xc3, 0xfd, 0xe3, 0xe3, 0xe3, 0xe3, 0xe3, 0xe3,
-  0xaf, 0x5f, 0x5f, 0xb4, 0x68, 0xe1, 0xc2, 0xfc,
-  0x7c, 0xde, 0x92, 0x00, 0x18, 0x63, 0x8c, 0x31,
-  0x40, 0x7d, 0xfd, 0xbd, 0x7b, 0x75, 0x75, 0x00,
-  0xd1, 0x68, 0x34, 0x1a, 0x89, 0x64, 0x66, 0x0e,
-  0x36, 0xf1, 0x5f, 0xac, 0x00, 0x27, 0xb2, 0x71,
-  0xa3, 0x2c, 0xcb, 0xb2, 0x2c, 0x07, 0x02, 0xaf,
-  0x5e, 0xbd, 0x7e, 0xfd, 0xe2, 0x05, 0xa5, 0x08,
-  0x21, 0x84, 0x10, 0x80, 0xd5, 0x6a, 0xb5, 0xda,
-  0x6c, 0xac, 0x05, 0x7a, 0x7a, 0x26, 0x4d, 0x3a,
-  0x77, 0xee, 0xfc, 0xf9, 0x33, 0x67, 0x4a, 0x4b,
-  0x47, 0x8f, 0x1e, 0x35, 0x2a, 0x31, 0x71, 0xe4,
-  0x48, 0x42, 0xcc, 0x66, 0x8b, 0xa5, 0x97, 0x70,
-  0x53, 0xd3, 0xd3, 0xa7, 0x4f, 0x9e, 0x00, 0x98,
-  0xcd, 0x66, 0xb3, 0xd9, 0x5c, 0x5e, 0xde, 0x57,
-  0xa8, 0x7f, 0x81, 0x40, 0x5f, 0x2b, 0x2c, 0x7c,
-  0xf4, 0xa8, 0xb1, 0xb1, 0xa1, 0x01, 0xa1, 0x11,
-  0x23, 0x46, 0x8c, 0xf8, 0x31, 0xb1, 0x79, 0xf3,
-  0xb2, 0xb2, 0x72, 0x72, 0x78, 0xcf, 0x6f, 0xdf,
-  0x9e, 0x96, 0xe6, 0x74, 0xa6, 0xa7, 0xf7, 0xae,
-  0x0b, 0x82, 0x20, 0x20, 0x04, 0xd0, 0xd1, 0xd1,
-  0xd9, 0xd9, 0xde, 0xae, 0x28, 0x5b, 0xb7, 0x16,
-  0x15, 0x15, 0x17, 0xaf, 0x59, 0x33, 0xb4, 0x3c,
-  0x86, 0x40, 0x80, 0x29, 0x55, 0x5e, 0xce, 0x2e,
-  0xb4, 0xfa, 0xfa, 0xfb, 0xf7, 0x1f, 0x3c, 0xb8,
-  0x77, 0xcf, 0x30, 0x44, 0x51, 0x14, 0x45, 0x11,
-  0x40, 0x92, 0x24, 0x49, 0x92, 0x98, 0xb2, 0x84,
-  0x00, 0xe8, 0x3a, 0x6b, 0x19, 0x5e, 0xa9, 0x5b,
-  0xb7, 0x6a, 0x6b, 0x6f, 0xde, 0xe4, 0x87, 0x35,
-  0x2f, 0x6f, 0xa8, 0x89, 0xff, 0x66, 0x05, 0xb8,
-  0x6d, 0xd8, 0xf0, 0xee, 0x5d, 0x6b, 0xeb, 0xdb,
-  0xb7, 0x94, 0x02, 0x20, 0x44, 0x69, 0xaf, 0xd2,
-  0x6e, 0xf7, 0xa4, 0x49, 0x53, 0xa6, 0x00, 0x84,
-  0xc3, 0xe1, 0x70, 0x28, 0x04, 0xd0, 0xda, 0xda,
-  0xd6, 0xd6, 0xda, 0x0a, 0x80, 0xb1, 0x28, 0x8a,
-  0xe2, 0xcb, 0x97, 0x43, 0xbd, 0xc1, 0xfb, 0x9b,
-  0x38, 0x54, 0xc7, 0xdb, 0xb7, 0x6b, 0x6b, 0xeb,
-  0xea, 0x02, 0x81, 0xbc, 0xbc, 0xfc, 0xfc, 0x45,
-  0x8b, 0x2c, 0x96, 0x4f, 0x9f, 0x5a, 0x5a, 0x5a,
-  0x5a, 0x72, 0x72, 0xdc, 0xee, 0x8c, 0x8c, 0xcc,
-  0x4c, 0x00, 0xf6, 0xd4, 0x00, 0x50, 0x14, 0x45,
-  0x51, 0x14, 0x00, 0xbf, 0xff, 0xd5, 0xab, 0x97,
-  0x2f, 0x01, 0xd6, 0xaf, 0x2f, 0x2c, 0x2c, 0x2a,
-  0x1a, 0x33, 0xe6, 0x77, 0x13, 0x1f, 0xa6, 0x0a,
-  0x00, 0xb8, 0xdd, 0x7b, 0xf7, 0x96, 0x94, 0x28,
-  0x4a, 0x2c, 0xd6, 0xd6, 0xd6, 0xd6, 0x06, 0xd0,
-  0xdc, 0xfc, 0xec, 0x59, 0x53, 0x13, 0x80, 0xdb,
-  0xed, 0x76, 0xbb, 0xdd, 0x08, 0x45, 0xa3, 0xc1,
-  0x60, 0x30, 0x08, 0xe0, 0xf3, 0xb5, 0xb4, 0xbc,
-  0x79, 0x03, 0x50, 0x5d, 0x6d, 0x32, 0x99, 0x4c,
-  0x83, 0xbf, 0xb9, 0x7f, 0x66, 0x83, 0x7e, 0xcc,
-  0x5d, 0xbc, 0x08, 0x00, 0xe0, 0x72, 0x8d, 0x1a,
-  0x45, 0x08, 0x21, 0x25, 0x25, 0x82, 0x80, 0x10,
-  0x42, 0x05, 0x05, 0xb1, 0x98, 0xa6, 0x69, 0x1a,
-  0x21, 0xd3, 0xa6, 0x4d, 0x9b, 0x36, 0x75, 0x2a,
-  0x42, 0x7e, 0xbf, 0xc5, 0x62, 0xb1, 0x00, 0x7c,
-  0xf8, 0xd0, 0xd8, 0xf8, 0xf8, 0x31, 0x40, 0x5a,
-  0x9a, 0xc7, 0x33, 0x77, 0x2e, 0x40, 0x72, 0x72,
-  0x34, 0x1a, 0x8d, 0x02, 0x34, 0x37, 0x37, 0x37,
-  0xbf, 0x78, 0x41, 0xa9, 0xd9, 0x8c, 0x31, 0xc6,
-  0xb2, 0x6c, 0x18, 0x94, 0x52, 0x5a, 0x59, 0x19,
-  0x08, 0xc8, 0xb2, 0x2c, 0xef, 0xdf, 0xbf, 0x6e,
-  0x1d, 0x00, 0x40, 0x5b, 0xdb, 0xb0, 0x11, 0x60,
-  0x8a, 0x15, 0x16, 0x4a, 0x92, 0x28, 0x8a, 0xe2,
-  0xbe, 0x7d, 0xe9, 0xe9, 0x89, 0x89, 0x89, 0x89,
-  0xa9, 0xa9, 0x84, 0xb0, 0xc3, 0x2a, 0x49, 0xec,
-  0x26, 0xe5, 0xd6, 0xd8, 0xd8, 0xde, 0xde, 0xde,
-  0x4e, 0xe9, 0x77, 0xf8, 0xef, 0xf8, 0x94, 0x7a,
-  0x3c, 0x4e, 0xa7, 0xd3, 0x89, 0xfe, 0x8c, 0xa7,
-  0xaa, 0x86, 0x61, 0x18, 0x00, 0xb2, 0xcc, 0x5a,
-  0xed, 0xfd, 0xfb, 0xee, 0xee, 0xee, 0x6e, 0xaf,
-  0x57, 0x55, 0x75, 0x5d, 0xd7, 0x0f, 0x1c, 0x58,
-  0xb9, 0x52, 0x51, 0x14, 0xe5, 0xf4, 0xe9, 0x9f,
-  0xe5, 0x37, 0x60, 0x0b, 0x55, 0x55, 0x39, 0x1c,
-  0x76, 0x7b, 0x7e, 0xbe, 0xae, 0x53, 0x4a, 0xe9,
-  0xae, 0x5d, 0x93, 0x27, 0xdb, 0x6c, 0x36, 0x5b,
-  0x6a, 0xea, 0xb7, 0x6f, 0xd1, 0x68, 0x34, 0xea,
-  0xf7, 0x37, 0x37, 0x7b, 0xbd, 0x5e, 0x6f, 0x77,
-  0xb7, 0xdf, 0x1f, 0x89, 0x44, 0x22, 0x00, 0x5f,
-  0xbe, 0x84, 0x42, 0xa1, 0x10, 0x80, 0xa2, 0xe8,
-  0xba, 0xae, 0x1f, 0x3e, 0x8c, 0x71, 0x41, 0xc1,
-  0xaa, 0x55, 0x67, 0xce, 0xf0, 0x39, 0x5f, 0xe7,
-  0xfb, 0xb9, 0x3f, 0xc7, 0xe3, 0xf8, 0x3c, 0x1e,
-  0x8f, 0x3f, 0x64, 0x02, 0x00, 0x91, 0x48, 0x24,
-  0xb2, 0x71, 0x63, 0x76, 0xb6, 0xcb, 0xe5, 0x72,
-  0xb9, 0x5c, 0x7e, 0x7f, 0x38, 0x1c, 0x0e, 0xf3,
-  0x44, 0x2b, 0x2a, 0x58, 0x62, 0xa7, 0x4e, 0x59,
-  0x2c, 0xac, 0x12, 0x1f, 0x3f, 0xf6, 0xf4, 0xf4,
-  0xf4, 0x00, 0x18, 0x06, 0x00, 0xc0, 0xd3, 0xa7,
-  0xab, 0x56, 0x95, 0x95, 0x55, 0x56, 0x6e, 0xda,
-  0xc4, 0xb0, 0x9a, 0x9a, 0xf8, 0x3a, 0xdf, 0xcf,
-  0xfd, 0x39, 0x1e, 0xc7, 0xe7, 0xf1, 0x78, 0xfc,
-  0xdf, 0x20, 0xa0, 0xaa, 0xaa, 0x3a, 0x61, 0x02,
-  0x21, 0xec, 0xca, 0x0f, 0x87, 0x15, 0x45, 0x51,
-  0x34, 0xcd, 0xe7, 0xd3, 0x75, 0x5d, 0xaf, 0xa9,
-  0x61, 0x3d, 0xbc, 0x69, 0x53, 0x5c, 0x1c, 0x7b,
-  0xdc, 0xb1, 0x33, 0xd1, 0xd9, 0xb9, 0x7e, 0x3d,
-  0x00, 0xc0, 0xb5, 0x6b, 0x0c, 0x83, 0x10, 0xd6,
-  0xd3, 0x57, 0xaf, 0xf2, 0x75, 0xbe, 0x9f, 0xfb,
-  0x73, 0x3c, 0x8e, 0xcf, 0xe3, 0x51, 0xaa, 0x28,
-  0x8a, 0x32, 0x71, 0x62, 0xdf, 0x56, 0xfc, 0xab,
-  0xe1, 0x01, 0x78, 0x09, 0x08, 0xa9, 0xaa, 0xa6,
-  0x39, 0x1c, 0x3d, 0x3d, 0xb2, 0x2c, 0xcb, 0x00,
-  0x23, 0x47, 0xb2, 0xe7, 0x6e, 0x46, 0x06, 0xc6,
-  0x18, 0xdf, 0xb8, 0xe1, 0x70, 0x24, 0x25, 0x25,
-  0x25, 0x31, 0x6d, 0x3f, 0x7e, 0xf4, 0xf9, 0xda,
-  0xdb, 0x35, 0x4d, 0xd3, 0x2a, 0x2a, 0x98, 0xbf,
-  0xdd, 0xce, 0x7b, 0x9f, 0x23, 0xb2, 0xf5, 0xf2,
-  0x72, 0x00, 0xaf, 0xd7, 0xeb, 0x5d, 0xb7, 0x6e,
-  0xd6, 0x2c, 0x87, 0xc3, 0xe1, 0x18, 0x33, 0xa6,
-  0xa3, 0xa3, 0xab, 0xab, 0xab, 0xeb, 0xc6, 0x0d,
-  0x49, 0xc2, 0x18, 0x63, 0x4d, 0xe3, 0xf1, 0x04,
-  0x41, 0xd3, 0x74, 0x9d, 0xe3, 0x10, 0xc2, 0x45,
-  0x65, 0xa3, 0xae, 0x73, 0xfc, 0x7e, 0x15, 0xe0,
-  0x4c, 0x05, 0xc1, 0x64, 0xc2, 0x18, 0xe3, 0x0b,
-  0x17, 0x3a, 0x3a, 0x02, 0x81, 0x40, 0x00, 0x20,
-  0x3e, 0x5e, 0x92, 0x24, 0x09, 0x63, 0x8b, 0xc5,
-  0x6c, 0x36, 0x9b, 0x01, 0x9e, 0x3f, 0xf7, 0x7a,
-  0xbd, 0x5e, 0x80, 0xae, 0x2e, 0x4a, 0x29, 0x7d,
-  0xf8, 0x70, 0xcb, 0x16, 0x4d, 0xd3, 0xb4, 0xca,
-  0x4a, 0xe6, 0x9f, 0x94, 0xd4, 0x77, 0xb4, 0xd9,
-  0x8a, 0x8a, 0x34, 0x4d, 0xd3, 0x2e, 0x5f, 0xfe,
-  0xfa, 0x95, 0x52, 0x4a, 0x1b, 0x1a, 0xb8, 0x3f,
-  0xc7, 0xe3, 0xf8, 0x3c, 0x9e, 0x61, 0x60, 0x8c,
-  0x71, 0x59, 0x19, 0xf3, 0x37, 0x9b, 0xd9, 0x28,
-  0x8a, 0xfd, 0x2b, 0x32, 0x40, 0x69, 0xf8, 0x46,
-  0x8c, 0x2f, 0x5f, 0x26, 0x84, 0x90, 0x9d, 0x3b,
-  0x05, 0x81, 0x52, 0x4a, 0xf3, 0xf2, 0xd8, 0x6f,
-  0x0f, 0x21, 0xaf, 0x97, 0x52, 0x4a, 0x6f, 0xdf,
-  0xde, 0xba, 0x55, 0x55, 0x55, 0xb5, 0xaa, 0xaa,
-  0xaf, 0x1f, 0x3b, 0x09, 0x3f, 0x14, 0xba, 0x5f,
-  0xa5, 0x35, 0xed, 0xf8, 0x71, 0x8c, 0x31, 0x2e,
-  0x28, 0x18, 0x37, 0x4e, 0x10, 0x04, 0x21, 0x2f,
-  0x0f, 0x63, 0x84, 0x10, 0xd2, 0xf5, 0x58, 0x0c,
-  0x21, 0x84, 0xee, 0xde, 0x5d, 0xbb, 0x56, 0x96,
-  0x65, 0xf9, 0xd8, 0x31, 0xbe, 0x7f, 0xa0, 0x0a,
-  0xfc, 0xe4, 0x37, 0xca, 0x99, 0xf6, 0x56, 0xa6,
-  0xef, 0xc8, 0x13, 0x93, 0xa4, 0x7f, 0xee, 0x55,
-  0xbe, 0x9f, 0xaf, 0x73, 0x82, 0x3c, 0x31, 0x9e,
-  0x50, 0xff, 0x39, 0x37, 0xde, 0x8a, 0xfd, 0x85,
-  0xf9, 0x1f, 0xd8, 0x1f, 0x0f, 0x81, 0xaf, 0x1e,
-  0x56, 0x80, 0xb3, 0xac, 0x00, 0x00, 0x00, 0x00,
-  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
--- a/art/tango/edit_delete.h
+++ b/art/tango/edit_delete.h
@@ -1,339 +0,0 @@
-/* edit_delete.png - 680 bytes */
-static const unsigned char edit_delete_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8b, 0x21,
-  0xf4, 0xa3, 0x7e, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd6, 0x06, 0x13, 0x0f, 0x1d, 0x09, 0x48,
-  0xb3, 0xcb, 0xc6, 0x00, 0x00, 0x00, 0x0f, 0x74,
-  0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
-  0x6e, 0x74, 0x00, 0x69, 0x64, 0x20, 0x6c, 0x6f,
-  0x67, 0x6f, 0x86, 0xc6, 0x77, 0xb9, 0x00, 0x00,
-  0x02, 0x1a, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb,
-  0xa5, 0x90, 0xbf, 0x4f, 0x13, 0x71, 0x18, 0xc6,
-  0x9f, 0xfb, 0xa5, 0x77, 0x2d, 0xb4, 0xa5, 0xd7,
-  0xd6, 0x5a, 0x2a, 0x14, 0xa2, 0x0c, 0xb4, 0x0e,
-  0x6e, 0x6e, 0x50, 0x28, 0x83, 0xec, 0x9a, 0x38,
-  0x69, 0x6a, 0x7f, 0x80, 0x11, 0x4d, 0x4d, 0xdc,
-  0x1a, 0xe9, 0x60, 0x52, 0x07, 0x93, 0x42, 0xd4,
-  0x34, 0xc5, 0x46, 0x05, 0x37, 0x27, 0x75, 0x31,
-  0x31, 0xb6, 0x16, 0xf9, 0x03, 0x64, 0x30, 0xba,
-  0xb5, 0x8b, 0xa9, 0x18, 0x13, 0x38, 0xae, 0x72,
-  0x57, 0xee, 0x7a, 0x77, 0x0e, 0x72, 0x17, 0x43,
-  0x89, 0x51, 0x7c, 0xa7, 0xf7, 0xfb, 0xe6, 0x79,
-  0x3e, 0xef, 0xfb, 0x7c, 0x09, 0xec, 0xd5, 0xe2,
-  0xfd, 0xc2, 0x3b, 0x59, 0x96, 0xc6, 0xf1, 0x17,
-  0xc5, 0x71, 0xb6, 0xda, 0x8d, 0xb9, 0x4c, 0x14,
-  0x00, 0x68, 0x73, 0x28, 0xcb, 0xd2, 0xf8, 0x6c,
-  0xfa, 0x1a, 0x14, 0x45, 0xb1, 0x84, 0x86, 0x61,
-  0x74, 0x99, 0x0d, 0xc3, 0xc0, 0x93, 0xe5, 0xb2,
-  0xb5, 0x88, 0x0e, 0x4d, 0xe7, 0xe7, 0x01, 0xe4,
-  0x00, 0x1d, 0x92, 0x24, 0x41, 0x10, 0x84, 0x2e,
-  0xa3, 0xf9, 0x66, 0x18, 0x06, 0x24, 0x49, 0x02,
-  0x00, 0x42, 0xd3, 0x79, 0x03, 0x40, 0x8e, 0x06,
-  0x90, 0xcb, 0x66, 0x2e, 0xa0, 0xbe, 0xba, 0x04,
-  0x51, 0x14, 0xd1, 0x6c, 0x36, 0x0f, 0x34, 0x03,
-  0x00, 0x45, 0x51, 0x20, 0x08, 0x02, 0xa2, 0x28,
-  0x22, 0x9b, 0x49, 0xe1, 0x4e, 0xe1, 0x79, 0xce,
-  0x8a, 0xf0, 0xb1, 0xd1, 0x82, 0x20, 0x08, 0x68,
-  0x34, 0x1a, 0x7f, 0x8c, 0x60, 0x6a, 0x87, 0xc7,
-  0xf6, 0x22, 0x98, 0xc3, 0xba, 0x1c, 0x44, 0xfc,
-  0x6e, 0xa5, 0x4b, 0x4c, 0x10, 0x07, 0x21, 0x82,
-  0x56, 0x67, 0x01, 0x22, 0x67, 0x63, 0x38, 0x4c,
-  0x59, 0x80, 0xd8, 0x19, 0xfe, 0xff, 0x00, 0x9f,
-  0xbe, 0x88, 0xff, 0x64, 0x1c, 0x0d, 0x3a, 0x7e,
-  0x45, 0x0c, 0x9d, 0xcb, 0xd7, 0x40, 0x60, 0xec,
-  0x50, 0xeb, 0x0d, 0xac, 0x5a, 0x5f, 0x34, 0x77,
-  0xfd, 0xaa, 0x71, 0xf9, 0x52, 0x5c, 0x7d, 0x54,
-  0x2e, 0x29, 0x93, 0x93, 0x53, 0xcc, 0xda, 0xda,
-  0x7b, 0x26, 0x1a, 0x9d, 0xd0, 0xaa, 0xd5, 0x0a,
-  0x19, 0x8b, 0x4d, 0x69, 0xb5, 0x5a, 0x95, 0x9a,
-  0x88, 0xc6, 0xf4, 0xb7, 0x95, 0x37, 0xe4, 0xe2,
-  0xc2, 0x03, 0xaa, 0x2b, 0x02, 0xcb, 0xb2, 0xaa,
-  0xda, 0x51, 0xb7, 0x79, 0xaf, 0x47, 0x6b, 0xb5,
-  0x7e, 0x10, 0x43, 0xa1, 0xe1, 0x5e, 0x5d, 0x37,
-  0xe4, 0xc1, 0xc1, 0x21, 0x5a, 0xd3, 0x74, 0xc9,
-  0xe1, 0x70, 0xf8, 0x69, 0x86, 0xd9, 0xe4, 0x38,
-  0x9b, 0xed, 0xf7, 0x23, 0x48, 0xb3, 0xe1, 0x79,
-  0x7e, 0x87, 0x24, 0xc9, 0xd7, 0x36, 0x9b, 0x0d,
-  0x23, 0xa7, 0x46, 0x20, 0xed, 0xee, 0x28, 0x03,
-  0x03, 0x27, 0x74, 0x97, 0xcb, 0x29, 0xbb, 0xfb,
-  0xdc, 0x6d, 0x00, 0x88, 0x84, 0xc3, 0x47, 0xbd,
-  0x5e, 0xaf, 0xda, 0x05, 0x28, 0x2c, 0xdc, 0x2b,
-  0x01, 0xd0, 0x22, 0xe1, 0xd3, 0x17, 0x7d, 0x1e,
-  0xdf, 0xb1, 0x8d, 0x6f, 0x5f, 0x7d, 0x00, 0x64,
-  0x9e, 0xf7, 0x90, 0x24, 0x49, 0xd4, 0x7b, 0x1d,
-  0x3d, 0x9d, 0xfe, 0xfe, 0x20, 0x58, 0x96, 0xd3,
-  0xed, 0x76, 0xbb, 0x54, 0x2c, 0x3e, 0x4c, 0xef,
-  0xbf, 0x20, 0x71, 0x33, 0x73, 0x8b, 0x5f, 0x5e,
-  0x79, 0xac, 0x03, 0xf8, 0xbc, 0xb5, 0xb5, 0x29,
-  0xf0, 0x6e, 0xde, 0xef, 0x72, 0x3a, 0xe9, 0x5d,
-  0xa5, 0xcd, 0xac, 0xaf, 0x7f, 0x38, 0x09, 0x00,
-  0x2b, 0xcf, 0x9e, 0x3a, 0xd3, 0xa9, 0xd9, 0xb6,
-  0xda, 0x51, 0xce, 0xef, 0x07, 0x94, 0x4b, 0x4b,
-  0x45, 0xf8, 0xfd, 0xc7, 0x8f, 0x24, 0x13, 0xe9,
-  0xd1, 0x64, 0x22, 0xdd, 0xa7, 0x28, 0x0a, 0x5e,
-  0xbe, 0x7a, 0xd1, 0x43, 0x51, 0x74, 0xe0, 0x4a,
-  0x3c, 0x49, 0xa4, 0x92, 0x33, 0x44, 0x20, 0x10,
-  0x98, 0xb9, 0x3d, 0x9f, 0xfd, 0xce, 0xb2, 0xdc,
-  0x86, 0x09, 0xf8, 0x09, 0xe4, 0xcc, 0xc3, 0x08,
-  0xa5, 0xf7, 0x2c, 0x65, 0x00, 0x00, 0x00, 0x00,
-  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
-
-
-/* edit_delete.png - 1974 bytes */
-static const unsigned char edit_delete_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x07,
-  0x1d, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
-  0x57, 0x5b, 0x6c, 0x1b, 0x45, 0x14, 0xbd, 0xfb,
-  0x74, 0xd6, 0x8e, 0x1f, 0xb1, 0x9d, 0x87, 0xdd,
-  0x92, 0x6c, 0x1c, 0x6c, 0x13, 0xda, 0x12, 0xb5,
-  0xc2, 0x90, 0xa2, 0x44, 0x46, 0x6a, 0xe9, 0x07,
-  0x20, 0xa0, 0x20, 0x0a, 0x02, 0xc1, 0x07, 0x08,
-  0x02, 0x12, 0x7c, 0x20, 0x95, 0x47, 0xc5, 0xab,
-  0x08, 0xaa, 0x56, 0xfc, 0x54, 0xa8, 0x52, 0x45,
-  0x29, 0x42, 0xe2, 0x07, 0xd1, 0x26, 0x4a, 0x0b,
-  0x12, 0x01, 0x84, 0x50, 0x88, 0x1c, 0xa7, 0x02,
-  0x82, 0x84, 0xab, 0x52, 0xa2, 0xa6, 0xf1, 0x5a,
-  0x89, 0xb1, 0x63, 0xa7, 0x8e, 0x9d, 0xdd, 0xc4,
-  0xeb, 0xf5, 0x7a, 0x67, 0xf9, 0x18, 0x2d, 0x4e,
-  0x93, 0x9a, 0x24, 0x02, 0xf1, 0x38, 0x3f, 0x57,
-  0x77, 0xe6, 0xee, 0xec, 0x39, 0x73, 0xf7, 0xce,
-  0xdc, 0x05, 0xf8, 0x9f, 0x83, 0x58, 0x2b, 0xe0,
-  0xbd, 0xf7, 0x8e, 0x1d, 0x3b, 0x7a, 0x74, 0x78,
-  0x58, 0x96, 0x65, 0xb9, 0x58, 0xbc, 0xfd, 0xf6,
-  0x7f, 0x8a, 0x18, 0x45, 0x91, 0x24, 0x49, 0x7e,
-  0xf0, 0xc1, 0x8b, 0x2f, 0xee, 0xdf, 0x7f, 0xe0,
-  0x40, 0x5f, 0x5f, 0xad, 0x38, 0x7a, 0xad, 0x85,
-  0x0c, 0xe2, 0xcf, 0x3e, 0xdb, 0xd7, 0xf7, 0xdc,
-  0x73, 0x00, 0xe5, 0x72, 0xb9, 0x5c, 0x2e, 0xaf,
-  0x8e, 0xd3, 0x75, 0x5d, 0xd7, 0xf5, 0xb5, 0x89,
-  0xad, 0x8c, 0x23, 0x08, 0x82, 0x20, 0x96, 0x6d,
-  0x23, 0xc3, 0x30, 0x0c, 0xc3, 0x00, 0x9c, 0x38,
-  0x71, 0xf2, 0xe4, 0xf1, 0xe3, 0x4f, 0x3f, 0x8d,
-  0x47, 0xd7, 0x21, 0x80, 0xe7, 0xef, 0xbc, 0xf3,
-  0xf0, 0xe1, 0x37, 0xdf, 0xc4, 0xde, 0xc1, 0x83,
-  0xcb, 0x83, 0x10, 0x02, 0x28, 0x16, 0x8b, 0xc5,
-  0x62, 0x11, 0xa0, 0x50, 0x28, 0x14, 0x0a, 0x85,
-  0xb5, 0x09, 0xaf, 0x9c, 0x37, 0x88, 0x91, 0x24,
-  0x49, 0x92, 0x64, 0xed, 0x38, 0x87, 0xc3, 0xe1,
-  0x70, 0x38, 0xaa, 0x3e, 0xe6, 0xb5, 0xf2, 0x4d,
-  0x07, 0x0f, 0x26, 0x12, 0x43, 0x43, 0x07, 0x0e,
-  0xbc, 0xf5, 0x16, 0xbd, 0x72, 0xe2, 0xb5, 0xd7,
-  0x5e, 0x78, 0x61, 0xdf, 0x3e, 0x80, 0x8b, 0x17,
-  0x93, 0x49, 0x51, 0x04, 0x10, 0xc5, 0xa9, 0xa9,
-  0x4f, 0x3f, 0x05, 0x10, 0x45, 0x51, 0x14, 0x45,
-  0x80, 0x54, 0x2a, 0x95, 0x4a, 0xa5, 0xd6, 0x4f,
-  0xdc, 0x00, 0x45, 0x51, 0x14, 0x45, 0x55, 0x77,
-  0x9c, 0xe3, 0x38, 0x8e, 0xe3, 0x56, 0xc7, 0x21,
-  0x84, 0x10, 0x42, 0xd5, 0xf7, 0xdd, 0x7f, 0xff,
-  0x83, 0x0f, 0x3e, 0xfc, 0x70, 0x75, 0x7e, 0x70,
-  0xb0, 0xbf, 0xff, 0xab, 0xaf, 0x8c, 0x0d, 0x5e,
-  0x25, 0xa0, 0x8a, 0xe9, 0xe9, 0x74, 0x5a, 0x96,
-  0x01, 0xca, 0x65, 0x41, 0x90, 0xa4, 0xea, 0xce,
-  0x0b, 0x82, 0x20, 0x08, 0xc2, 0xfa, 0x89, 0xd7,
-  0xc2, 0xca, 0x4c, 0x18, 0xf0, 0xf9, 0x7c, 0x3e,
-  0x9f, 0x0f, 0x60, 0x7a, 0x7a, 0x76, 0x56, 0x92,
-  0x00, 0x34, 0xcd, 0x66, 0x53, 0x55, 0x00, 0x8f,
-  0xa7, 0xb1, 0x91, 0x61, 0x56, 0xc7, 0xd7, 0x14,
-  0xc0, 0x30, 0x34, 0x4d, 0xd3, 0x00, 0xbf, 0xfe,
-  0x5a, 0x2c, 0x6e, 0xde, 0x0c, 0xf0, 0xc4, 0x13,
-  0x47, 0x8e, 0x7c, 0xfb, 0x6d, 0x6d, 0x42, 0x57,
-  0x7f, 0xc9, 0x7f, 0x0d, 0x99, 0x0c, 0xb6, 0x9b,
-  0x37, 0x03, 0x6c, 0xdd, 0xfa, 0xe7, 0xdb, 0x52,
-  0x53, 0x80, 0xf1, 0xd8, 0xb6, 0x6d, 0x3b, 0x77,
-  0xee, 0xde, 0xfd, 0x77, 0x51, 0xdb, 0x38, 0xf6,
-  0xec, 0xf9, 0xe8, 0xa3, 0xe7, 0x9f, 0x07, 0xb8,
-  0x70, 0xe1, 0xe5, 0x97, 0xdf, 0x7f, 0x7f, 0x03,
-  0x02, 0x76, 0xef, 0xde, 0xbe, 0xdd, 0xe5, 0xfa,
-  0xf7, 0x88, 0x1b, 0x40, 0xe8, 0xd8, 0xb1, 0x4f,
-  0x3e, 0x01, 0x00, 0xc0, 0x35, 0xb9, 0x6e, 0x01,
-  0x46, 0x11, 0xff, 0xd7, 0xb1, 0x4c, 0x80, 0xae,
-  0x03, 0x8c, 0x8c, 0xbc, 0xf3, 0xce, 0xd1, 0xa3,
-  0xa7, 0x4f, 0x87, 0xc3, 0xff, 0x36, 0xb1, 0x5a,
-  0xd0, 0x75, 0x00, 0x5d, 0x8f, 0x46, 0x0d, 0x7f,
-  0x55, 0xe1, 0x1d, 0x39, 0xf2, 0xee, 0xbb, 0x87,
-  0x0e, 0xe9, 0xfa, 0x43, 0x0f, 0xed, 0xdb, 0xf7,
-  0xc8, 0x23, 0x57, 0xae, 0xcc, 0xcf, 0xe7, 0x72,
-  0xb9, 0x9c, 0xdd, 0x7e, 0xf2, 0xe4, 0x87, 0x1f,
-  0x9e, 0x38, 0x51, 0x2e, 0xef, 0xda, 0xb5, 0x6b,
-  0xd7, 0x1d, 0x77, 0x30, 0xcc, 0xf8, 0xf8, 0xf8,
-  0xf8, 0x8f, 0x3f, 0x02, 0x74, 0x77, 0x77, 0x77,
-  0xef, 0xdc, 0x49, 0x92, 0x91, 0x48, 0x24, 0x12,
-  0x89, 0x28, 0x4a, 0x38, 0x1c, 0x0e, 0x87, 0xc3,
-  0x2c, 0x1b, 0x8b, 0x9d, 0x3f, 0xff, 0xf3, 0xcf,
-  0xaa, 0xba, 0x7d, 0x7b, 0x57, 0xd7, 0x8e, 0x1d,
-  0x2c, 0x1b, 0x8d, 0x9e, 0x3b, 0x17, 0x8d, 0x2a,
-  0x4a, 0x28, 0x74, 0xf3, 0xcd, 0xa1, 0x10, 0xc3,
-  0xc4, 0x62, 0xb1, 0x58, 0x2c, 0x56, 0x2e, 0x77,
-  0x75, 0x75, 0x75, 0x75, 0x75, 0xb1, 0x6c, 0x36,
-  0x9b, 0xcd, 0xce, 0xcd, 0x21, 0x74, 0xe1, 0xc2,
-  0x2f, 0xbf, 0x9c, 0x3f, 0x5f, 0xa9, 0x3c, 0xf6,
-  0xd8, 0xa3, 0x8f, 0x3e, 0xfe, 0x38, 0xc7, 0x39,
-  0x9d, 0x4e, 0xa7, 0xd3, 0x99, 0xcf, 0x0f, 0x0e,
-  0x9e, 0x3d, 0x3b, 0x30, 0xe0, 0x76, 0xbf, 0xf2,
-  0xca, 0x4b, 0x2f, 0xbd, 0xfa, 0x6a, 0xf5, 0xc0,
-  0x20, 0x6b, 0x29, 0x25, 0x49, 0x92, 0x24, 0x88,
-  0x4a, 0x45, 0x55, 0x2b, 0x15, 0x55, 0x5d, 0x58,
-  0x70, 0xb9, 0x1a, 0x1b, 0xdd, 0xee, 0xc5, 0x45,
-  0x49, 0x92, 0xa4, 0xc5, 0xc5, 0x42, 0xa1, 0xa5,
-  0xa5, 0xb9, 0xd9, 0xe3, 0xd1, 0x34, 0x84, 0x10,
-  0xd2, 0x75, 0x51, 0xf4, 0x7a, 0xbd, 0xde, 0x4d,
-  0x9b, 0x34, 0x4d, 0xd3, 0x34, 0x0d, 0xa1, 0x5c,
-  0xae, 0xa1, 0xa1, 0xa1, 0xc1, 0xe9, 0xd4, 0x34,
-  0x9a, 0x66, 0x18, 0x86, 0x29, 0x14, 0x3c, 0x9e,
-  0xe6, 0x66, 0xaf, 0x77, 0x61, 0x41, 0x96, 0x8b,
-  0x45, 0x59, 0xce, 0x64, 0x30, 0x31, 0x00, 0x4d,
-  0xab, 0x54, 0x10, 0x9a, 0x9b, 0xf3, 0x78, 0x3c,
-  0x1e, 0x8f, 0x47, 0xd7, 0x6d, 0x36, 0x9b, 0xcd,
-  0x6a, 0xcd, 0xe5, 0x6c, 0x36, 0x87, 0xc3, 0x6e,
-  0x5f, 0x58, 0x30, 0x99, 0x4c, 0xa6, 0xba, 0xba,
-  0xda, 0x27, 0x5c, 0xcd, 0x1a, 0xa0, 0x69, 0x8a,
-  0x62, 0x18, 0x4d, 0x1b, 0x1b, 0xfb, 0xfe, 0xfb,
-  0xd1, 0xd1, 0x6f, 0xbe, 0x71, 0xb9, 0x9c, 0x4e,
-  0x97, 0x6b, 0xcf, 0x9e, 0x40, 0xc0, 0xef, 0x0f,
-  0x04, 0x00, 0x12, 0x89, 0xe9, 0x69, 0x41, 0x28,
-  0x97, 0x5b, 0x5b, 0x5b, 0x5b, 0xaf, 0xbb, 0x0e,
-  0xa1, 0x7c, 0x3e, 0x9f, 0x9f, 0x9f, 0x97, 0x65,
-  0xa7, 0xb3, 0xa1, 0xc1, 0xe9, 0x2c, 0x95, 0x24,
-  0x49, 0x92, 0x44, 0x91, 0xe3, 0x5a, 0x5a, 0x5a,
-  0x5a, 0x9a, 0x9b, 0x11, 0x5a, 0x5a, 0x5a, 0x5a,
-  0x5a, 0x5a, 0x42, 0x08, 0xfb, 0x04, 0x41, 0x10,
-  0x24, 0x09, 0x40, 0x10, 0x3c, 0xdf, 0xde, 0xce,
-  0xf3, 0x14, 0xd5, 0xd4, 0xd4, 0xd4, 0xd4, 0xd4,
-  0x44, 0x92, 0x33, 0x33, 0xc9, 0x64, 0x22, 0x81,
-  0x10, 0x16, 0x88, 0x10, 0xc7, 0x99, 0x4c, 0x1c,
-  0x77, 0xad, 0x1b, 0x60, 0xcd, 0x0c, 0x50, 0x14,
-  0x49, 0xaa, 0x2a, 0x6e, 0x24, 0x42, 0xa1, 0x9e,
-  0x9e, 0xdb, 0x6e, 0xeb, 0xed, 0xcd, 0xe5, 0xdc,
-  0xee, 0xc6, 0x46, 0xb7, 0x5b, 0x55, 0x79, 0xbe,
-  0xad, 0xad, 0xbd, 0x5d, 0x96, 0x5d, 0x2e, 0x97,
-  0xcb, 0xed, 0xc6, 0xd7, 0x12, 0x41, 0xc4, 0xe3,
-  0x56, 0xab, 0xcd, 0x56, 0x5f, 0x5f, 0xa9, 0x60,
-  0x21, 0xb2, 0x6c, 0xb3, 0x59, 0xad, 0x76, 0xbb,
-  0xa6, 0x79, 0xbd, 0x5e, 0xaf, 0xc7, 0x33, 0x3f,
-  0x8f, 0xe3, 0x09, 0x02, 0x21, 0x5d, 0x47, 0x08,
-  0x21, 0xbb, 0xdd, 0x66, 0xb3, 0xdb, 0x35, 0xcd,
-  0x62, 0xb1, 0x58, 0x2c, 0x16, 0x84, 0xf0, 0x3c,
-  0xc0, 0xc4, 0xc4, 0xc4, 0xc4, 0xc5, 0x8b, 0x14,
-  0x85, 0x79, 0x54, 0x2a, 0x1b, 0x16, 0x40, 0x10,
-  0x00, 0x04, 0xa1, 0xaa, 0x14, 0x45, 0xd3, 0x14,
-  0x05, 0x10, 0x08, 0x04, 0x83, 0xc1, 0x20, 0xcf,
-  0x5f, 0xbe, 0x3c, 0x39, 0x79, 0xe9, 0xd2, 0xc4,
-  0x04, 0xcf, 0xb7, 0xb5, 0xf1, 0xbc, 0xaa, 0x3a,
-  0x1c, 0x76, 0xbb, 0xdd, 0x4e, 0xd3, 0xd9, 0x6c,
-  0x2e, 0x97, 0xc9, 0xc4, 0x62, 0x98, 0x80, 0xd9,
-  0xcc, 0xf3, 0x3c, 0xcf, 0xf3, 0x8b, 0x8b, 0xf8,
-  0x93, 0xa0, 0x28, 0x41, 0x10, 0x84, 0x78, 0xfc,
-  0xa6, 0x9b, 0xc6, 0xc7, 0xc7, 0xc7, 0x7f, 0xf8,
-  0x61, 0xd3, 0x26, 0x96, 0x65, 0x59, 0x86, 0x01,
-  0xb0, 0x5a, 0xad, 0xd6, 0xfa, 0x7a, 0x4d, 0x9b,
-  0x9c, 0xbc, 0x7c, 0x79, 0x72, 0x92, 0xe3, 0xf6,
-  0xee, 0xbd, 0xef, 0xbe, 0x07, 0x1e, 0x68, 0x6f,
-  0x4f, 0xa7, 0x53, 0xa9, 0x74, 0xba, 0xa1, 0x21,
-  0x93, 0xc9, 0x64, 0x66, 0x67, 0x15, 0x65, 0xc3,
-  0x02, 0x8a, 0x45, 0x59, 0x2e, 0x16, 0xb3, 0x59,
-  0x86, 0xa1, 0x69, 0x86, 0xd1, 0xf5, 0xfe, 0xfe,
-  0x81, 0x81, 0x53, 0xa7, 0xf2, 0xf9, 0x72, 0xb9,
-  0x52, 0x51, 0x94, 0x78, 0x5c, 0x14, 0x45, 0xb1,
-  0x50, 0xc8, 0xe7, 0x07, 0x06, 0x06, 0x07, 0x4f,
-  0x9f, 0x16, 0xc5, 0xfa, 0x7a, 0xb3, 0xb9, 0xbe,
-  0x3e, 0x14, 0x9a, 0x9f, 0xcf, 0xe5, 0xe6, 0xe6,
-  0x12, 0x09, 0xdc, 0xf3, 0x14, 0x8b, 0x5f, 0x7e,
-  0xf9, 0xf5, 0xd7, 0x5f, 0x7c, 0x41, 0x92, 0x37,
-  0xde, 0xb8, 0x65, 0x4b, 0x67, 0x27, 0xc0, 0xd6,
-  0xad, 0xdb, 0xb6, 0x6d, 0xd9, 0x02, 0x50, 0x2a,
-  0x95, 0x4a, 0x8a, 0xa2, 0x28, 0xd9, 0xec, 0xdc,
-  0x5c, 0x36, 0x9b, 0x4e, 0x27, 0x12, 0x82, 0x30,
-  0x35, 0x05, 0x30, 0x36, 0x36, 0x36, 0x16, 0x8d,
-  0x02, 0xdc, 0x7b, 0xef, 0x3d, 0xf7, 0xec, 0xdd,
-  0xbb, 0xb0, 0x80, 0x5b, 0x18, 0xaf, 0x77, 0xc3,
-  0x35, 0x80, 0x0f, 0xac, 0x72, 0x39, 0x10, 0xe8,
-  0xec, 0x0c, 0x04, 0xce, 0x9d, 0x2b, 0x95, 0x64,
-  0x59, 0x96, 0x93, 0xc9, 0xa9, 0xa9, 0xc9, 0xc9,
-  0x78, 0xfc, 0xee, 0xbb, 0x05, 0x21, 0x1e, 0x17,
-  0x04, 0x4d, 0x6b, 0x6b, 0xf3, 0xf9, 0x5a, 0x5b,
-  0x3f, 0xfe, 0x98, 0xa6, 0x69, 0x9a, 0xa6, 0x75,
-  0x7d, 0x64, 0x64, 0x74, 0x74, 0x64, 0xe4, 0xae,
-  0xbb, 0x70, 0x6f, 0x84, 0xd0, 0x0d, 0x37, 0x74,
-  0x76, 0x06, 0x83, 0xc7, 0x8f, 0x63, 0xff, 0x8d,
-  0x37, 0x8c, 0x66, 0xce, 0x62, 0xb1, 0x5a, 0xcd,
-  0xe6, 0xb3, 0x67, 0x23, 0x91, 0x68, 0x74, 0x64,
-  0x64, 0xc7, 0x0e, 0x9c, 0xf1, 0x9f, 0x7e, 0x62,
-  0xd9, 0xba, 0x3a, 0x96, 0xad, 0x54, 0x3e, 0xfb,
-  0xec, 0xf3, 0xcf, 0xcf, 0x9c, 0xb9, 0xf5, 0xd6,
-  0xde, 0xde, 0xde, 0xde, 0x70, 0x78, 0x74, 0x14,
-  0x73, 0xea, 0xe9, 0x59, 0xb7, 0x00, 0x84, 0x10,
-  0xd2, 0x34, 0x55, 0x45, 0x48, 0x51, 0x10, 0xe2,
-  0x38, 0x4c, 0x80, 0x24, 0x3b, 0x3a, 0xfc, 0x7e,
-  0x9f, 0x6f, 0x68, 0xa8, 0xd6, 0x73, 0xd7, 0x5f,
-  0xef, 0xf7, 0x77, 0x74, 0x54, 0xe7, 0xf1, 0xb9,
-  0x44, 0x51, 0xbf, 0xfd, 0x96, 0x4e, 0x27, 0x93,
-  0x87, 0x0e, 0x19, 0xe3, 0x26, 0x93, 0xc9, 0xc4,
-  0xb2, 0x00, 0xed, 0xed, 0x3e, 0x1f, 0xcf, 0x0f,
-  0x0d, 0xe1, 0x2a, 0xd2, 0x75, 0xab, 0xd5, 0x6a,
-  0x75, 0x38, 0x1a, 0x1b, 0x83, 0x41, 0xbf, 0x3f,
-  0x18, 0x34, 0x9b, 0x15, 0x05, 0x67, 0x6a, 0x9d,
-  0x19, 0xa0, 0xff, 0xf0, 0x23, 0x91, 0x68, 0x34,
-  0x12, 0x31, 0x9b, 0xfd, 0x7e, 0xbf, 0x3f, 0x10,
-  0xe8, 0xe9, 0xa1, 0x69, 0x45, 0x31, 0x99, 0x00,
-  0x4a, 0x25, 0x45, 0x29, 0x95, 0x8c, 0x0c, 0x2d,
-  0xaf, 0x19, 0x0c, 0x5c, 0xcc, 0xd5, 0xe6, 0xce,
-  0xe8, 0x51, 0x97, 0x8f, 0x13, 0x44, 0xb5, 0x7b,
-  0x35, 0xba, 0x52, 0x8a, 0xa2, 0x28, 0x9a, 0x06,
-  0xb0, 0x58, 0x4c, 0x26, 0xb3, 0x19, 0x40, 0x96,
-  0x97, 0x96, 0x64, 0x99, 0x24, 0x87, 0x87, 0xbf,
-  0xfb, 0x6e, 0x78, 0x18, 0xbf, 0xb1, 0x0a, 0x93,
-  0x09, 0x5b, 0x45, 0x59, 0x21, 0xc0, 0x62, 0x49,
-  0xa7, 0xd3, 0xe9, 0xd9, 0xd9, 0xb7, 0xdf, 0xc6,
-  0xfe, 0xeb, 0xaf, 0x77, 0x77, 0xdf, 0x72, 0x4b,
-  0x77, 0x77, 0x2e, 0x67, 0x74, 0xf1, 0x92, 0x24,
-  0x49, 0x92, 0x04, 0xa0, 0xaa, 0xaa, 0xaa, 0xaa,
-  0x55, 0x22, 0xb8, 0xdf, 0xd7, 0x75, 0x4d, 0xd3,
-  0x34, 0x5d, 0x07, 0xd0, 0x34, 0x84, 0x34, 0x6d,
-  0x59, 0xb1, 0x91, 0xf8, 0xe0, 0xa4, 0x28, 0x8a,
-  0xba, 0x96, 0x00, 0xfc, 0x09, 0x02, 0xb0, 0x2c,
-  0xcb, 0xd6, 0xd5, 0x01, 0x24, 0x93, 0xc9, 0xe4,
-  0xcc, 0x4c, 0x3e, 0x3f, 0x3b, 0x9b, 0xc9, 0xa4,
-  0x52, 0xa1, 0x50, 0x3e, 0x9f, 0xcf, 0xe7, 0xf3,
-  0x67, 0xce, 0xe0, 0xd5, 0x3c, 0x1e, 0x6c, 0x13,
-  0x89, 0x15, 0x17, 0x84, 0xf1, 0x8b, 0xe1, 0xf5,
-  0x3e, 0xf5, 0x54, 0x5f, 0xdf, 0x93, 0x4f, 0xee,
-  0xdf, 0xdf, 0xd1, 0xd1, 0xd1, 0xe1, 0xf3, 0x3d,
-  0xf3, 0x4c, 0xed, 0x4a, 0xb9, 0xfa, 0x3f, 0x60,
-  0x2d, 0xbf, 0x16, 0x8c, 0xcc, 0xac, 0xb4, 0xf8,
-  0x86, 0x1e, 0x1a, 0xea, 0xef, 0x3f, 0x75, 0x6a,
-  0x60, 0xe0, 0xf0, 0xe1, 0x99, 0x99, 0x99, 0x99,
-  0x64, 0xf2, 0xd2, 0x25, 0xfc, 0x54, 0x36, 0x4b,
-  0xac, 0x5c, 0x06, 0x5b, 0x96, 0xc5, 0xd6, 0xe8,
-  0x47, 0xed, 0xf6, 0xab, 0xc7, 0x8d, 0x5f, 0x11,
-  0x23, 0xde, 0xb0, 0x08, 0x19, 0xb4, 0xaf, 0xbd,
-  0xae, 0x31, 0x6e, 0x58, 0x23, 0x47, 0xc6, 0x3c,
-  0x45, 0x5d, 0x3d, 0x6e, 0x58, 0xe3, 0x13, 0xba,
-  0x72, 0x05, 0x5b, 0x59, 0xc6, 0x56, 0x55, 0xd7,
-  0xde, 0x9a, 0xff, 0x38, 0x7e, 0x07, 0x0e, 0xaf,
-  0xa6, 0xde, 0x03, 0x83, 0xf8, 0x4f, 0x00, 0x00,
-  0x00, 0x18, 0x7a, 0x54, 0x58, 0x74, 0x43, 0x6f,
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x78,
-  0xda, 0xcb, 0x4c, 0x51, 0xc8, 0xc9, 0x4f, 0xcf,
-  0x07, 0x00, 0x0a, 0x18, 0x02, 0x9f, 0xc3, 0x06,
-  0x77, 0xdf, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
-  0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/edit_find.h
+++ b/art/tango/edit_find.h
@@ -1,309 +0,0 @@
-/* edit_find.png - 617 bytes */
-static const unsigned char edit_find_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xef, 0x34,
-  0x06, 0x67, 0x1b, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0b, 0x05, 0x10, 0x0f, 0x05, 0x25,
-  0xfd, 0xad, 0x2f, 0x00, 0x00, 0x01, 0xf6, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x92, 0x4d,
-  0x6b, 0x13, 0x51, 0x18, 0x85, 0x9f, 0x3b, 0xc9,
-  0x24, 0x4d, 0x9a, 0x66, 0x86, 0x4a, 0x52, 0x0a,
-  0x0a, 0xb5, 0x5d, 0x68, 0x1a, 0x45, 0x14, 0xc1,
-  0x85, 0xb8, 0x14, 0x0a, 0x55, 0x77, 0xe2, 0x26,
-  0xbf, 0xc0, 0x6f, 0xa9, 0xf4, 0x1f, 0x88, 0xb6,
-  0x24, 0x41, 0x44, 0x14, 0x74, 0x59, 0x77, 0x55,
-  0x10, 0xc5, 0x4d, 0xa8, 0x3b, 0x41, 0xec, 0xa2,
-  0x54, 0x28, 0xa4, 0x89, 0x56, 0xab, 0x96, 0x50,
-  0x35, 0x8d, 0xcd, 0x47, 0x27, 0x4d, 0x32, 0x33,
-  0xd7, 0x45, 0x48, 0x49, 0x42, 0x52, 0xaa, 0x67,
-  0x77, 0x0f, 0xef, 0x3d, 0xef, 0xe1, 0xbc, 0x47,
-  0x3c, 0x79, 0xfa, 0x78, 0x31, 0xf7, 0x27, 0x77,
-  0x8c, 0x3d, 0x40, 0x55, 0xd5, 0xe7, 0x13, 0xb7,
-  0x26, 0x2f, 0xb6, 0x90, 0xd3, 0xd1, 0xbb, 0x96,
-  0xdc, 0x23, 0xee, 0x4d, 0xdf, 0x91, 0xed, 0xa2,
-  0x4e, 0x29, 0xeb, 0x5c, 0x3e, 0xbf, 0xb9, 0xeb,
-  0x76, 0x4d, 0xd3, 0x3b, 0xf2, 0x4e, 0x21, 0xc4,
-  0xce, 0x23, 0x99, 0x4c, 0x76, 0x1c, 0x0a, 0x85,
-  0x42, 0x5d, 0x85, 0x77, 0x1c, 0xb4, 0x0f, 0x66,
-  0x32, 0x19, 0x66, 0x5f, 0xcc, 0x02, 0x90, 0x98,
-  0x4b, 0x00, 0xd0, 0xb4, 0x6b, 0x77, 0x07, 0xdf,
-  0xbe, 0xaf, 0x92, 0x4a, 0xa7, 0x39, 0x7a, 0x6a,
-  0x8c, 0x6d, 0xc5, 0x8b, 0x69, 0x2b, 0xb8, 0x64,
-  0x85, 0xd4, 0xfc, 0x6b, 0x26, 0x6e, 0xdf, 0x8c,
-  0xc4, 0xa2, 0xf7, 0x9f, 0x35, 0xfe, 0x28, 0xed,
-  0x0e, 0x34, 0x5d, 0x23, 0x95, 0x4e, 0x73, 0xe8,
-  0xe4, 0x18, 0x9f, 0x0b, 0x5e, 0x06, 0x07, 0x02,
-  0x8c, 0x1c, 0x08, 0x52, 0x12, 0x3e, 0xb4, 0xd1,
-  0x71, 0xfc, 0x9a, 0x3e, 0x73, 0xed, 0xc6, 0x95,
-  0xe3, 0x5d, 0x1d, 0x24, 0xe6, 0x12, 0x0c, 0x87,
-  0x4f, 0xb3, 0x52, 0x70, 0x73, 0xe9, 0xcc, 0x10,
-  0xbe, 0x1e, 0x15, 0xd3, 0xb6, 0x51, 0x1d, 0x0a,
-  0xef, 0x96, 0x25, 0xc1, 0x23, 0xe3, 0x36, 0x4b,
-  0x6f, 0x16, 0x00, 0x01, 0xa0, 0x74, 0x0a, 0x4b,
-  0x7a, 0x03, 0x0c, 0x0d, 0xe8, 0x58, 0xb6, 0x64,
-  0xdb, 0x34, 0xa9, 0xd4, 0x2c, 0xca, 0x55, 0x8b,
-  0x7e, 0x9f, 0x9b, 0x5f, 0x65, 0xb5, 0x25, 0x09,
-  0x45, 0x4a, 0x89, 0x94, 0x76, 0x4b, 0x30, 0x6e,
-  0xb7, 0x0b, 0x84, 0xa0, 0x5c, 0xb5, 0xa8, 0xd6,
-  0x24, 0x9b, 0x5b, 0x35, 0xdc, 0xaa, 0x83, 0xfd,
-  0xfd, 0x1e, 0xa4, 0x10, 0x2d, 0x5d, 0x70, 0x02,
-  0xb6, 0x69, 0x9a, 0x2d, 0x4e, 0x6c, 0x63, 0x83,
-  0x35, 0xa3, 0x8a, 0xdf, 0xa3, 0xa2, 0xf7, 0xb9,
-  0xb0, 0x2d, 0x89, 0xdf, 0xe3, 0xe4, 0xd3, 0x46,
-  0x81, 0x7d, 0x3d, 0x96, 0x9d, 0x6b, 0x72, 0xae,
-  0xd4, 0x2b, 0xea, 0x42, 0xd3, 0x74, 0x34, 0x4d,
-  0xe7, 0xc2, 0xb9, 0xf3, 0xa4, 0x17, 0xde, 0x12,
-  0xec, 0x13, 0x7c, 0xf9, 0x99, 0x27, 0x9b, 0x2b,
-  0x91, 0x37, 0x2a, 0x7c, 0x5c, 0x59, 0xa7, 0x54,
-  0xae, 0x90, 0x5b, 0x7a, 0xe5, 0x2c, 0x15, 0x8b,
-  0x3f, 0x1a, 0x02, 0x22, 0x1a, 0x9f, 0x9a, 0xb1,
-  0x2c, 0x2b, 0xd2, 0x7c, 0x0d, 0xc3, 0x30, 0x70,
-  0x38, 0x54, 0x4e, 0x9c, 0x8d, 0xb0, 0xbc, 0x56,
-  0x64, 0xcb, 0x54, 0x18, 0xec, 0x95, 0xac, 0x2f,
-  0xbe, 0x64, 0xf8, 0xe0, 0x08, 0x00, 0x1f, 0xe6,
-  0xdf, 0xa7, 0x1e, 0x3e, 0x78, 0x74, 0x58, 0x74,
-  0x6b, 0xd8, 0xd5, 0xeb, 0x97, 0xa7, 0x02, 0x81,
-  0xe0, 0x64, 0x33, 0xe7, 0xeb, 0xf5, 0x11, 0x1e,
-  0x0d, 0xf3, 0x3b, 0x9b, 0xad, 0xf7, 0x65, 0xf5,
-  0x2b, 0x82, 0x7f, 0x44, 0x2c, 0x1e, 0x95, 0x0d,
-  0x91, 0xff, 0x12, 0x00, 0x94, 0x58, 0x3c, 0x6a,
-  0x01, 0x94, 0x0d, 0x83, 0xbf, 0x06, 0x8c, 0xf6,
-  0xd3, 0x7f, 0x33, 0xe7, 0x2e, 0x00, 0x00, 0x00,
-  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
-  0x82};
-
-
-/* edit_find.png - 1797 bytes */
-static const unsigned char edit_find_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
-  0x90, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x6b, 0x4c, 0x53, 0x67, 0x18, 0x7e, 0xce,
-  0xb5, 0x2d, 0x15, 0x2a, 0xd8, 0x23, 0x68, 0x14,
-  0xc9, 0x60, 0xb4, 0x04, 0xab, 0x46, 0x64, 0x2e,
-  0xa8, 0x40, 0xcc, 0xa6, 0x01, 0xa7, 0xdb, 0x62,
-  0x16, 0x17, 0x4d, 0xf6, 0x63, 0xfc, 0xda, 0x88,
-  0xb7, 0x68, 0x96, 0x45, 0x8d, 0xc6, 0x0c, 0xd8,
-  0xd8, 0xbc, 0x10, 0x37, 0xe6, 0x66, 0xb6, 0x69,
-  0x62, 0xc6, 0x94, 0x2c, 0x9a, 0x99, 0xa0, 0x59,
-  0x26, 0x64, 0xba, 0x8d, 0x59, 0x27, 0xde, 0x20,
-  0x14, 0x6f, 0x28, 0xa4, 0x55, 0x0b, 0xd8, 0x1e,
-  0x0e, 0xa5, 0xf4, 0x9c, 0xd3, 0x73, 0xce, 0x7e,
-  0x7c, 0x6b, 0x60, 0x68, 0x37, 0x99, 0xb2, 0xfd,
-  0xd9, 0xfb, 0xe7, 0xcd, 0xe9, 0xf7, 0x9d, 0xef,
-  0x7b, 0x9e, 0xf7, 0x79, 0x2f, 0xa7, 0xc0, 0xff,
-  0xf6, 0xdf, 0x1a, 0x15, 0x6f, 0x61, 0xff, 0xfe,
-  0xcf, 0x3f, 0xaf, 0xad, 0xbd, 0x7e, 0x7d, 0x70,
-  0x70, 0x70, 0x30, 0x14, 0xca, 0xca, 0x22, 0xbf,
-  0x1a, 0xc6, 0x23, 0x0f, 0xa1, 0x00, 0x8a, 0xa2,
-  0x28, 0xb2, 0xc3, 0x30, 0x86, 0x77, 0x3d, 0x7a,
-  0xff, 0xa3, 0x4e, 0x20, 0x76, 0xea, 0xd4, 0xa6,
-  0x4d, 0x1b, 0x37, 0xbe, 0xf3, 0xce, 0x4b, 0x2f,
-  0x3d, 0x31, 0xb3, 0xea, 0xea, 0x8f, 0x3e, 0xaa,
-  0xaa, 0xd2, 0x75, 0xe3, 0x0f, 0xd3, 0x75, 0x5d,
-  0xd7, 0xf5, 0xa7, 0xef, 0x63, 0xb6, 0x6b, 0xd7,
-  0x9e, 0x3d, 0xd5, 0xd5, 0x9a, 0x36, 0x56, 0x9c,
-  0xec, 0x5f, 0x2f, 0xc7, 0x22, 0x48, 0x51, 0x92,
-  0x24, 0x49, 0xfd, 0xfd, 0x4f, 0x1c, 0x97, 0x87,
-  0x2c, 0x29, 0x29, 0x29, 0xc9, 0x66, 0x1b, 0x7d,
-  0xdf, 0xe3, 0x1b, 0x1d, 0x6f, 0x81, 0x48, 0xfa,
-  0xf4, 0x01, 0x0f, 0x43, 0x1d, 0x99, 0x6a, 0xff,
-  0xdc, 0xe2, 0x2a, 0x10, 0xef, 0x02, 0x8f, 0xc7,
-  0xe3, 0xf1, 0x78, 0x9e, 0x1c, 0xb8, 0xd3, 0xe9,
-  0x74, 0xe6, 0xe4, 0x8c, 0x23, 0x81, 0x78, 0x0a,
-  0x38, 0x9d, 0x4e, 0xa7, 0xd3, 0x39, 0x76, 0xc0,
-  0xa3, 0x9f, 0xff, 0x33, 0x05, 0x3a, 0x3a, 0x3a,
-  0x3a, 0x3a, 0x3a, 0xfe, 0xfe, 0x60, 0xb7, 0xfb,
-  0xb7, 0xdf, 0xdc, 0x6e, 0xa0, 0xbb, 0xbb, 0xab,
-  0xeb, 0xce, 0x1d, 0x80, 0x14, 0x2d, 0x40, 0x0a,
-  0x18, 0x60, 0x59, 0x96, 0x65, 0x59, 0x60, 0xd1,
-  0xa2, 0x45, 0x8b, 0x8a, 0x8a, 0xc6, 0x81, 0x40,
-  0x3c, 0x05, 0x72, 0x72, 0x72, 0x72, 0x1e, 0x25,
-  0x7d, 0x57, 0x57, 0x77, 0x77, 0x57, 0x17, 0x70,
-  0xf0, 0xe0, 0xa1, 0x43, 0x07, 0x0f, 0x02, 0x6b,
-  0xd6, 0xac, 0x5e, 0xbd, 0x66, 0x0d, 0x50, 0x5a,
-  0x5a, 0x52, 0xb2, 0x7c, 0x39, 0xa0, 0x28, 0xaa,
-  0xaa, 0x69, 0x80, 0xa6, 0x91, 0xb0, 0xf0, 0x3c,
-  0xc3, 0x50, 0x14, 0x30, 0x30, 0x20, 0x49, 0xc1,
-  0x20, 0xd0, 0xd4, 0xd4, 0xd4, 0xd4, 0xd8, 0xc8,
-  0x30, 0x5b, 0xb6, 0x6c, 0xdb, 0xf6, 0xee, 0xbb,
-  0x05, 0x05, 0x55, 0x55, 0x15, 0x15, 0x1f, 0x7c,
-  0xd0, 0xdc, 0x3c, 0x6e, 0x0a, 0xc4, 0xd6, 0xfb,
-  0xfb, 0xfb, 0xfb, 0x45, 0x11, 0x38, 0x75, 0xea,
-  0xfb, 0xef, 0x4f, 0x9e, 0x04, 0xca, 0xcb, 0xdf,
-  0x7e, 0x7b, 0xfd, 0x7a, 0xa0, 0xb1, 0xf1, 0xe2,
-  0xc5, 0xbb, 0x77, 0x81, 0xeb, 0xd7, 0x45, 0xd1,
-  0xef, 0x07, 0x78, 0xde, 0x62, 0x49, 0x48, 0x00,
-  0x54, 0x95, 0x50, 0xd0, 0x34, 0x59, 0x0e, 0x87,
-  0x81, 0x59, 0xb3, 0x26, 0x4f, 0x36, 0x0c, 0x60,
-  0xe3, 0xc6, 0xf5, 0xeb, 0x37, 0x6d, 0x02, 0x6a,
-  0x6a, 0xf6, 0xed, 0xdb, 0xbd, 0xfb, 0xa7, 0x9f,
-  0x2a, 0x2a, 0x2a, 0x2b, 0x77, 0xee, 0x9c, 0x37,
-  0x6f, 0xdb, 0xb6, 0xad, 0x5b, 0x77, 0xec, 0xb8,
-  0x74, 0xe9, 0xa9, 0x29, 0xe0, 0x70, 0x38, 0x1c,
-  0x0e, 0x07, 0x21, 0x00, 0x00, 0xef, 0xbd, 0x57,
-  0x59, 0xb9, 0x73, 0x27, 0x50, 0x5e, 0xfe, 0xd6,
-  0x5b, 0xeb, 0xd6, 0x01, 0xdf, 0x7d, 0x77, 0xe1,
-  0x42, 0x4f, 0x0f, 0x70, 0xef, 0x5e, 0x24, 0x92,
-  0x94, 0x04, 0xbc, 0xfe, 0x7a, 0x71, 0xf1, 0xb4,
-  0x69, 0xc0, 0xd4, 0xa9, 0x29, 0x29, 0x16, 0x0b,
-  0x10, 0x8d, 0x92, 0x54, 0xf2, 0x78, 0xbc, 0x5e,
-  0x49, 0x02, 0x1a, 0x1b, 0xaf, 0x5e, 0xed, 0xe9,
-  0x01, 0x44, 0xd1, 0xed, 0xf6, 0xf9, 0x80, 0xb5,
-  0x6b, 0xcb, 0xcb, 0x37, 0x6c, 0xa0, 0xe9, 0x9a,
-  0x9a, 0x7d, 0xfb, 0xf6, 0xec, 0x39, 0x7b, 0x96,
-  0xdc, 0x9a, 0x98, 0x18, 0x0f, 0x27, 0x13, 0x6f,
-  0xe1, 0xc5, 0x17, 0x97, 0x2c, 0x79, 0xe1, 0x85,
-  0x1d, 0x3b, 0x16, 0x2c, 0x28, 0x28, 0x58, 0xb8,
-  0x90, 0xa2, 0x22, 0x91, 0x48, 0x64, 0x68, 0x08,
-  0x68, 0x6f, 0x6f, 0x6f, 0xf7, 0x78, 0x80, 0xf3,
-  0xe7, 0x49, 0x8e, 0x4f, 0x9f, 0x3e, 0x7d, 0x7a,
-  0x7a, 0x3a, 0xd0, 0xd9, 0x19, 0x08, 0xb0, 0x2c,
-  0xd0, 0xd9, 0x19, 0x0a, 0x59, 0x2c, 0xc0, 0x9b,
-  0x6f, 0x16, 0x17, 0xa7, 0xa7, 0x03, 0x93, 0x27,
-  0xdb, 0x6c, 0x66, 0x33, 0x60, 0x36, 0x73, 0x1c,
-  0xc3, 0x00, 0x9a, 0xa6, 0xeb, 0x00, 0x60, 0xb1,
-  0x98, 0x4c, 0x2c, 0x0b, 0x58, 0xad, 0x66, 0x33,
-  0xcb, 0x02, 0xad, 0xad, 0x77, 0xef, 0x2a, 0x0a,
-  0x60, 0x32, 0xe9, 0x7a, 0x38, 0xac, 0x28, 0xa9,
-  0xa9, 0xc9, 0xc9, 0x66, 0x33, 0x45, 0xcd, 0x9a,
-  0x35, 0x7b, 0xb6, 0xcb, 0x15, 0x0a, 0x9d, 0x39,
-  0xf3, 0xe3, 0x8f, 0x67, 0xcf, 0xba, 0xdd, 0xa3,
-  0x71, 0xc6, 0x9d, 0x03, 0xf1, 0x52, 0xca, 0xe1,
-  0x70, 0x38, 0xb2, 0xb3, 0x81, 0xe6, 0xe6, 0x5f,
-  0x7f, 0xfd, 0xf9, 0x67, 0x20, 0x2f, 0x6f, 0xee,
-  0xdc, 0xbc, 0x3c, 0xe0, 0xdc, 0xb9, 0xae, 0x2e,
-  0x55, 0x05, 0x16, 0x2c, 0x70, 0x38, 0x04, 0x01,
-  0xe0, 0x38, 0x8e, 0x63, 0x59, 0x12, 0x71, 0x00,
-  0x88, 0x44, 0x48, 0x0d, 0x90, 0xe9, 0x0b, 0xa8,
-  0x6a, 0x34, 0xaa, 0x69, 0x80, 0xd7, 0xdb, 0xd7,
-  0x37, 0x34, 0x04, 0x30, 0x8c, 0xae, 0x2b, 0x0a,
-  0xd0, 0xd6, 0x46, 0x12, 0xee, 0xb9, 0xe7, 0xf2,
-  0xf3, 0xe7, 0xcf, 0x37, 0x9b, 0x7b, 0x7a, 0x7a,
-  0x7a, 0xfc, 0xfe, 0x9a, 0x9a, 0x78, 0xb8, 0xc6,
-  0x4c, 0x80, 0xa4, 0x17, 0x01, 0xc8, 0x71, 0x80,
-  0xae, 0x03, 0x34, 0x0d, 0x58, 0xad, 0x64, 0xa2,
-  0x4e, 0x9a, 0x94, 0x98, 0xc8, 0x71, 0x80, 0x2c,
-  0xab, 0x6a, 0x34, 0x3a, 0xec, 0x15, 0x85, 0x50,
-  0x19, 0x1a, 0x52, 0x14, 0x4d, 0x03, 0xfa, 0xfa,
-  0x44, 0x31, 0x1c, 0x06, 0x9c, 0xce, 0x69, 0xd3,
-  0x12, 0x13, 0x01, 0x93, 0x49, 0x96, 0x7d, 0x3e,
-  0x40, 0x14, 0x55, 0x95, 0x65, 0x01, 0x8b, 0x85,
-  0xd4, 0x0c, 0xb9, 0x27, 0x7e, 0xc3, 0xfd, 0xdb,
-  0x22, 0x8e, 0xb5, 0xbf, 0x91, 0xfd, 0x7b, 0xe4,
-  0x3e, 0x93, 0x89, 0x44, 0x9a, 0xe3, 0x68, 0xda,
-  0x30, 0x80, 0xde, 0x5e, 0x51, 0x8c, 0x44, 0x86,
-  0xbb, 0x4c, 0xcc, 0x64, 0x59, 0x96, 0xa3, 0x51,
-  0xa0, 0xb7, 0x57, 0x92, 0x64, 0x19, 0x20, 0x6f,
-  0x01, 0x34, 0xcd, 0x30, 0x0c, 0x43, 0x82, 0xa2,
-  0xeb, 0x80, 0xa6, 0x45, 0xa3, 0xaa, 0xaa, 0x69,
-  0xb2, 0x2c, 0xcb, 0xb2, 0xcc, 0x30, 0xe4, 0x7e,
-  0x55, 0x1d, 0x33, 0x81, 0x18, 0x0d, 0x4d, 0xd3,
-  0x34, 0x4d, 0x7b, 0x98, 0x40, 0x6e, 0x6e, 0x6e,
-  0xee, 0xcc, 0x99, 0x80, 0xcf, 0xe7, 0xf3, 0xf9,
-  0x7c, 0xc0, 0xc4, 0x89, 0x3c, 0xcf, 0xf3, 0xc0,
-  0xcd, 0x9b, 0x3e, 0x5f, 0x30, 0x18, 0x7b, 0x1b,
-  0xb0, 0x58, 0x78, 0x9e, 0xa2, 0x80, 0x09, 0x13,
-  0x48, 0xae, 0xc7, 0xda, 0xa9, 0xd5, 0xca, 0xf3,
-  0x2c, 0x0b, 0x18, 0x06, 0x21, 0x1a, 0x08, 0x84,
-  0xc3, 0x14, 0x05, 0xcc, 0x98, 0x21, 0x08, 0x34,
-  0x4d, 0x51, 0x81, 0x40, 0x20, 0xf0, 0xe0, 0x81,
-  0x2c, 0xa7, 0xa5, 0xa5, 0xa5, 0x4d, 0x99, 0x72,
-  0xee, 0xdc, 0x3f, 0x4e, 0xa1, 0x91, 0x04, 0x46,
-  0x2a, 0xe3, 0x72, 0xcd, 0x9c, 0xe9, 0x72, 0x01,
-  0xe7, 0xcf, 0x5f, 0xb8, 0xe0, 0x76, 0x03, 0xcb,
-  0x96, 0xe5, 0xe5, 0xa5, 0xa6, 0x02, 0xbd, 0xbd,
-  0x43, 0x43, 0x24, 0xe2, 0x24, 0x65, 0x0c, 0xc3,
-  0x30, 0x48, 0x74, 0x75, 0xdd, 0x30, 0x86, 0x6b,
-  0x21, 0x1a, 0x25, 0xcf, 0xa2, 0x18, 0x0a, 0x45,
-  0x22, 0x80, 0xd9, 0x2c, 0x08, 0x99, 0x99, 0x40,
-  0x49, 0xc9, 0x9c, 0x39, 0x82, 0x40, 0xd3, 0x5f,
-  0x7d, 0x75, 0xe8, 0xd0, 0x97, 0x5f, 0x4a, 0x92,
-  0x28, 0x8a, 0x62, 0x30, 0xd8, 0xd4, 0x34, 0x46,
-  0x02, 0xc3, 0xe2, 0x9b, 0x4c, 0x26, 0x93, 0xc9,
-  0x04, 0xd8, 0xed, 0x76, 0xbb, 0xdd, 0x0e, 0x08,
-  0x82, 0x20, 0x08, 0x02, 0xf0, 0xfc, 0xf3, 0xf3,
-  0xe7, 0x17, 0x14, 0x00, 0x7e, 0xbf, 0xdf, 0xef,
-  0xf7, 0x03, 0xb7, 0x6e, 0xb5, 0xb7, 0xb7, 0xb4,
-  0x00, 0x4b, 0x97, 0xe6, 0xe6, 0x26, 0x25, 0x01,
-  0x17, 0x2f, 0xde, 0xb9, 0x23, 0x49, 0x40, 0x73,
-  0x73, 0x6b, 0x2b, 0x99, 0xc4, 0x14, 0xc5, 0x30,
-  0xc0, 0xc0, 0x80, 0x2c, 0x1b, 0x06, 0xd0, 0xd0,
-  0xf0, 0xcb, 0x2f, 0xd7, 0xae, 0x01, 0xa7, 0x4f,
-  0xb7, 0xb6, 0xf6, 0xf6, 0x02, 0x2b, 0x57, 0xba,
-  0x5c, 0x2c, 0x0b, 0x9c, 0x39, 0x73, 0xfa, 0xf4,
-  0x89, 0x13, 0x86, 0x31, 0x63, 0x46, 0x7a, 0x7a,
-  0x46, 0x86, 0xd5, 0x1a, 0x0a, 0x0d, 0x0c, 0x0c,
-  0x0e, 0x6e, 0xde, 0xfc, 0xda, 0x6b, 0xab, 0x56,
-  0xad, 0x5c, 0x39, 0x65, 0xca, 0x43, 0x48, 0xe3,
-  0x31, 0x23, 0xdf, 0xe7, 0xc7, 0x8f, 0x13, 0x05,
-  0x5e, 0x79, 0x65, 0x74, 0x6d, 0x8c, 0x36, 0xaf,
-  0xd7, 0xeb, 0xf5, 0x7a, 0x81, 0xac, 0xac, 0xcc,
-  0xcc, 0xec, 0x6c, 0x60, 0xd9, 0xb2, 0x57, 0x5f,
-  0x5d, 0xbd, 0x1a, 0xf8, 0xe1, 0x87, 0x2b, 0x57,
-  0xfc, 0x7e, 0xa0, 0xbb, 0xfb, 0xc1, 0x03, 0x45,
-  0x01, 0x14, 0xc5, 0x30, 0x68, 0x1a, 0x78, 0xf6,
-  0x59, 0x41, 0xe0, 0x38, 0xa0, 0xb0, 0xd0, 0xe9,
-  0x4c, 0x4e, 0x06, 0x6a, 0x6b, 0xf7, 0xee, 0xad,
-  0xa8, 0xd0, 0xf5, 0x15, 0x2b, 0x96, 0x2f, 0x7f,
-  0xf9, 0x65, 0x9a, 0x6e, 0x69, 0xb9, 0x74, 0xa9,
-  0xa5, 0x05, 0x08, 0x06, 0x83, 0xc1, 0x40, 0x40,
-  0xd7, 0x25, 0x49, 0x92, 0x24, 0xa9, 0xaf, 0x8f,
-  0xe7, 0x39, 0x8e, 0xe7, 0x97, 0x2e, 0xfd, 0xe4,
-  0x93, 0x8f, 0x3f, 0xfe, 0xf4, 0xd3, 0xcb, 0x97,
-  0x1f, 0xf3, 0x83, 0x99, 0xfd, 0xa3, 0x56, 0xac,
-  0x56, 0xe2, 0x63, 0x83, 0x25, 0xe6, 0x27, 0x4c,
-  0x28, 0x2a, 0x2a, 0x2e, 0x2e, 0x2c, 0x74, 0xb9,
-  0x1c, 0x0e, 0xa7, 0x33, 0x3b, 0xbb, 0xba, 0xda,
-  0x6e, 0x4f, 0x49, 0xb1, 0xdb, 0x15, 0x65, 0xe2,
-  0xc4, 0xe4, 0xe4, 0x94, 0x14, 0x8e, 0xcb, 0xcf,
-  0x9f, 0x37, 0x2f, 0x3f, 0xdf, 0x6a, 0xcd, 0xc8,
-  0xc8, 0xc8, 0xc8, 0xc8, 0x48, 0x48, 0xa8, 0xab,
-  0xfb, 0xe6, 0x9b, 0xba, 0xba, 0xdb, 0xb7, 0x6f,
-  0xdd, 0xea, 0xec, 0xbc, 0x71, 0x83, 0xe7, 0x43,
-  0x21, 0x49, 0x0a, 0x87, 0xab, 0xaa, 0x52, 0x53,
-  0xd3, 0xd2, 0x04, 0xa1, 0xb6, 0xb6, 0xb4, 0xb4,
-  0xa4, 0xa4, 0xb4, 0x14, 0xb8, 0x7a, 0xb5, 0xad,
-  0xad, 0xb5, 0x15, 0x28, 0x2c, 0x5c, 0xb8, 0xb0,
-  0xa8, 0x48, 0xd7, 0xbf, 0xfe, 0xba, 0xae, 0xee,
-  0xf0, 0x61, 0x9a, 0x26, 0x04, 0x28, 0xea, 0x31,
-  0xdb, 0x68, 0x34, 0x4a, 0xbc, 0x24, 0x11, 0x7f,
-  0xff, 0x3e, 0xf1, 0x37, 0x6f, 0x12, 0xdf, 0xd6,
-  0x46, 0x06, 0xcd, 0x91, 0x23, 0x07, 0x0e, 0x7c,
-  0xf6, 0xd9, 0x17, 0x5f, 0x3c, 0xf3, 0x0c, 0x4d,
-  0xb3, 0x2c, 0x45, 0x55, 0x56, 0xaa, 0x6a, 0x34,
-  0x1a, 0x89, 0x5c, 0xbe, 0xfc, 0xed, 0xb7, 0xc7,
-  0x8e, 0x1d, 0x3d, 0x4a, 0x51, 0xbb, 0x77, 0xef,
-  0xdd, 0xfb, 0xe1, 0x87, 0xa4, 0xfb, 0x18, 0xc6,
-  0xb5, 0x6b, 0x59, 0x59, 0x59, 0x59, 0x99, 0x99,
-  0xdb, 0xb7, 0xd7, 0xd7, 0xd7, 0xd7, 0xd7, 0xd7,
-  0xef, 0xdf, 0xaf, 0xeb, 0x9a, 0x06, 0xbc, 0xff,
-  0x7e, 0x43, 0xc3, 0xc9, 0x93, 0x0d, 0x0d, 0xc0,
-  0xe2, 0xc5, 0xc5, 0xc5, 0x8b, 0x17, 0x03, 0x36,
-  0x9b, 0xcd, 0x66, 0xb3, 0xd1, 0x0f, 0xe1, 0x1d,
-  0xc7, 0xbf, 0x2c, 0x00, 0x99, 0x10, 0x23, 0x7d,
-  0xac, 0xb6, 0x46, 0x7f, 0xa4, 0xc4, 0x9e, 0x87,
-  0x93, 0xb3, 0xac, 0xac, 0xac, 0xac, 0xac, 0xec,
-  0x8d, 0x37, 0x2c, 0x96, 0x84, 0x04, 0x93, 0xe9,
-  0xc0, 0x81, 0x3f, 0xef, 0x5b, 0xb5, 0x8a, 0x28,
-  0x50, 0x5f, 0x3f, 0xbe, 0xf8, 0xff, 0x05, 0xfb,
-  0x1d, 0x75, 0xcb, 0xe2, 0xbb, 0xec, 0x47, 0x44,
-  0xaf, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
-  0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/edit_find_replace.h
+++ b/art/tango/edit_find_replace.h
@@ -1,315 +0,0 @@
-/* edit_find_replace.png - 776 bytes */
-static const unsigned char edit_find_replace_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd6, 0x01, 0x06, 0x16, 0x04, 0x03, 0xf5,
-  0x76, 0x68, 0x82, 0x00, 0x00, 0x02, 0x95, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x93, 0x4d,
-  0x6c, 0x0c, 0x61, 0x18, 0xc7, 0x7f, 0x33, 0xb3,
-  0xb3, 0xb5, 0x48, 0xb7, 0xcc, 0x2c, 0xc1, 0x81,
-  0x56, 0xd0, 0x89, 0xe0, 0xa0, 0x89, 0x83, 0xa0,
-  0xb8, 0x34, 0x71, 0x20, 0x52, 0x49, 0x89, 0xaf,
-  0x63, 0x4b, 0x8a, 0x5a, 0x41, 0xa4, 0x44, 0x10,
-  0x82, 0x8a, 0x22, 0x71, 0xad, 0x44, 0x13, 0xc4,
-  0x36, 0x12, 0xd1, 0x83, 0x4b, 0x7d, 0xb4, 0x44,
-  0x48, 0x89, 0x8f, 0x9d, 0xa5, 0x45, 0x62, 0x5b,
-  0x95, 0xd4, 0x6e, 0x77, 0x67, 0x3f, 0xba, 0x5d,
-  0xbb, 0x3b, 0xaf, 0x03, 0x3b, 0x69, 0x2f, 0x4e,
-  0xfe, 0xc9, 0x93, 0x3c, 0xef, 0x9b, 0xfc, 0x7f,
-  0x79, 0x9e, 0x37, 0xff, 0x57, 0x62, 0x9c, 0xf6,
-  0x1d, 0x68, 0xd4, 0x34, 0x4d, 0x8b, 0x14, 0xcf,
-  0xd1, 0x68, 0x54, 0xbf, 0xda, 0x7a, 0x2d, 0xca,
-  0x3f, 0x24, 0x15, 0x1b, 0xff, 0xa1, 0x03, 0x6b,
-  0x4b, 0xbd, 0x65, 0x5d, 0x4b, 0x56, 0xd4, 0x88,
-  0x14, 0x53, 0x25, 0x55, 0x8c, 0x89, 0xbe, 0x97,
-  0x0f, 0xa4, 0x84, 0x15, 0x5f, 0x77, 0xa9, 0xa5,
-  0xf5, 0xd1, 0x3f, 0x01, 0x8d, 0xfb, 0xf7, 0x6a,
-  0xba, 0xee, 0x8b, 0x2c, 0xac, 0xaa, 0x61, 0x20,
-  0xed, 0x61, 0xe5, 0xe2, 0x59, 0x98, 0xe1, 0x18,
-  0xe9, 0x64, 0x02, 0x2b, 0xd4, 0x89, 0xcb, 0xa5,
-  0xa0, 0x28, 0xb2, 0x63, 0x52, 0x55, 0x35, 0xe0,
-  0x6f, 0x3a, 0xbc, 0x05, 0xc0, 0x05, 0xa0, 0xeb,
-  0xbe, 0x48, 0xf9, 0xe2, 0x95, 0x7c, 0xb1, 0x4a,
-  0xa8, 0x5b, 0x5d, 0xce, 0x24, 0xb7, 0x82, 0xaa,
-  0xc8, 0x74, 0x87, 0x04, 0x33, 0x96, 0x6c, 0x60,
-  0xf8, 0x7d, 0x27, 0xc7, 0x8e, 0x36, 0x3b, 0x80,
-  0xf3, 0x17, 0xcf, 0xd6, 0x16, 0x7b, 0x97, 0x73,
-  0x3b, 0xd9, 0xc7, 0xbc, 0xe9, 0xa5, 0x14, 0x6c,
-  0x41, 0x36, 0x57, 0x20, 0x9b, 0xb3, 0xf1, 0x95,
-  0x96, 0xf0, 0x75, 0x68, 0x0c, 0x09, 0xb0, 0xac,
-  0x38, 0x00, 0x5e, 0x6f, 0x19, 0x25, 0x6f, 0x8e,
-  0x73, 0x79, 0xab, 0x2c, 0x80, 0x1d, 0xce, 0x5c,
-  0x6a, 0x21, 0xc1, 0xe0, 0x70, 0x82, 0x70, 0x24,
-  0x43, 0x3c, 0x9d, 0x67, 0x8e, 0xe6, 0xc1, 0x2d,
-  0x17, 0xd0, 0xa7, 0xd8, 0x00, 0x84, 0x42, 0x21,
-  0x00, 0x5a, 0xb7, 0x29, 0xec, 0xba, 0xd2, 0x43,
-  0x75, 0xed, 0x7e, 0x80, 0x9b, 0x32, 0x40, 0xc2,
-  0x8a, 0xaf, 0xeb, 0x7b, 0xdd, 0xc5, 0xcc, 0x52,
-  0x09, 0x73, 0x60, 0x84, 0x91, 0xd4, 0x18, 0x2f,
-  0xcc, 0xef, 0xc4, 0x52, 0x19, 0xa2, 0xef, 0xef,
-  0xb3, 0x69, 0xe3, 0x26, 0x0c, 0xc3, 0xa0, 0xad,
-  0x41, 0x63, 0xf7, 0xd5, 0x67, 0x0c, 0x3e, 0x6d,
-  0xe7, 0x9d, 0x39, 0x58, 0x00, 0x90, 0x01, 0xa6,
-  0x95, 0x4d, 0xef, 0xaa, 0x28, 0x9f, 0x4f, 0xf8,
-  0xd5, 0x3d, 0x2a, 0x7c, 0x25, 0xf4, 0x84, 0x7e,
-  0x92, 0x1c, 0xcd, 0x32, 0xfc, 0xba, 0x03, 0x5d,
-  0xd3, 0x18, 0x4d, 0x8f, 0x3a, 0xe6, 0x81, 0x27,
-  0x37, 0x79, 0xd7, 0x1f, 0x65, 0xc4, 0xec, 0x50,
-  0x80, 0x2a, 0xe9, 0xcc, 0x99, 0x53, 0x62, 0xee,
-  0xbc, 0x72, 0x7c, 0xba, 0x4e, 0xd0, 0x0c, 0x92,
-  0x4a, 0xa7, 0x9c, 0x67, 0x59, 0xb6, 0x74, 0x19,
-  0xd5, 0x6b, 0xaa, 0x69, 0x6b, 0xd0, 0xd8, 0x79,
-  0xa9, 0x9b, 0x70, 0x4f, 0x3b, 0x6f, 0x3f, 0x45,
-  0x89, 0x99, 0x01, 0x80, 0xaa, 0xa6, 0x5b, 0x76,
-  0xaf, 0x0b, 0x70, 0xcc, 0x07, 0x9b, 0xfc, 0x58,
-  0x56, 0xdc, 0xd9, 0x17, 0xf8, 0x63, 0x6e, 0x79,
-  0x4a, 0xff, 0xc3, 0x36, 0x3e, 0x7e, 0x4f, 0x12,
-  0x33, 0x03, 0xfc, 0x5a, 0x54, 0xcf, 0x91, 0x93,
-  0xd7, 0x7b, 0x01, 0x49, 0x6e, 0x6e, 0x3e, 0x21,
-  0x05, 0xcd, 0x20, 0xf9, 0xc2, 0x2f, 0xbb, 0x68,
-  0x32, 0x0c, 0x03, 0xc3, 0x30, 0xa8, 0xac, 0xac,
-  0xe4, 0x9b, 0xbc, 0x82, 0xe0, 0xf3, 0xe7, 0xf4,
-  0x0f, 0x59, 0xc4, 0x82, 0x77, 0xa9, 0x3b, 0xfd,
-  0x02, 0xdb, 0x33, 0xdb, 0xc9, 0x90, 0x0c, 0xe0,
-  0x3f, 0x78, 0x48, 0x02, 0x10, 0xc2, 0x61, 0x20,
-  0x84, 0xe0, 0xc6, 0x1e, 0x9d, 0xcf, 0x3f, 0xa2,
-  0xdc, 0x09, 0x04, 0x88, 0x7c, 0xe8, 0x60, 0x55,
-  0x7d, 0x07, 0x93, 0xb4, 0x05, 0xe4, 0x72, 0xb9,
-  0x62, 0x04, 0x84, 0x3c, 0x2e, 0x95, 0x76, 0x3e,
-  0x9f, 0x9f, 0x00, 0x68, 0xba, 0x65, 0xb3, 0x7e,
-  0xe6, 0x67, 0x6a, 0x36, 0xef, 0x66, 0x79, 0xc3,
-  0x63, 0xc4, 0xe4, 0x39, 0x24, 0x93, 0x49, 0x72,
-  0xb9, 0x3c, 0x80, 0x32, 0x31, 0x48, 0x80, 0xaa,
-  0xba, 0xf1, 0x7a, 0xdd, 0x0e, 0x20, 0x93, 0xc9,
-  0x90, 0x48, 0x24, 0xc8, 0x66, 0xb3, 0x28, 0x8a,
-  0x82, 0xaa, 0xaa, 0x7f, 0xcb, 0x05, 0x60, 0x4f,
-  0x00, 0x28, 0x8a, 0x72, 0xfb, 0x42, 0xcb, 0xb9,
-  0xed, 0x42, 0x88, 0x09, 0x53, 0x14, 0x4b, 0x92,
-  0x9c, 0x7f, 0x87, 0xc7, 0xe3, 0x69, 0x07, 0x72,
-  0xfc, 0x0f, 0xfd, 0x06, 0x79, 0xcd, 0x1b, 0x0c,
-  0xce, 0xbd, 0xad, 0x59, 0x00, 0x00, 0x00, 0x00,
-  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
-
-
-/* edit_find_replace.png - 1681 bytes */
-static const unsigned char edit_find_replace_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
-  0x1c, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x97, 0x5b, 0x48, 0x14, 0x5f, 0x1c, 0xc7, 0xbf,
-  0x73, 0x66, 0x6f, 0xee, 0x96, 0x9b, 0x79, 0x89,
-  0x2c, 0xf2, 0x92, 0xed, 0xa6, 0xa8, 0x50, 0x69,
-  0x14, 0xf4, 0x90, 0xa5, 0x50, 0xd8, 0x43, 0x42,
-  0x0f, 0x45, 0xd0, 0xed, 0x51, 0x34, 0x33, 0x23,
-  0x08, 0xa4, 0x42, 0x7c, 0xe8, 0xa2, 0x48, 0x51,
-  0x44, 0xbd, 0x14, 0x8a, 0x58, 0xd8, 0x15, 0x31,
-  0x0b, 0xba, 0x90, 0xd6, 0x4b, 0x4a, 0x98, 0xe8,
-  0xae, 0x25, 0xa9, 0x69, 0xdb, 0x65, 0xd5, 0xbd,
-  0x39, 0xeb, 0xde, 0x67, 0xfe, 0x0f, 0xd3, 0xf9,
-  0x8f, 0xbb, 0x36, 0xec, 0xf6, 0xff, 0x3f, 0xf4,
-  0xd2, 0xef, 0xe5, 0xc7, 0xcc, 0x99, 0x39, 0xe7,
-  0xf3, 0x3d, 0xbf, 0xcb, 0x9c, 0x01, 0xfe, 0xda,
-  0x9f, 0x35, 0x46, 0x6e, 0xe0, 0xda, 0xb5, 0xeb,
-  0xd7, 0xaf, 0x5e, 0xfd, 0xf8, 0xd1, 0xed, 0x76,
-  0xbb, 0x39, 0x2e, 0x2b, 0xcb, 0xef, 0xf7, 0xfb,
-  0xfd, 0x7e, 0x41, 0x08, 0x04, 0x02, 0x81, 0x50,
-  0x88, 0x10, 0xb9, 0xf7, 0x94, 0x4a, 0xa5, 0x92,
-  0x65, 0x79, 0x5e, 0xa5, 0x52, 0xa9, 0x54, 0x2a,
-  0x41, 0x88, 0x11, 0xe3, 0xa7, 0x75, 0x75, 0xd5,
-  0xd4, 0x54, 0x57, 0x9f, 0x3c, 0xb9, 0x6b, 0x57,
-  0xac, 0x02, 0x14, 0x72, 0x03, 0x2e, 0x97, 0xcb,
-  0xe5, 0x74, 0x66, 0x65, 0x6d, 0xdf, 0x5e, 0x54,
-  0x54, 0x52, 0xc2, 0x30, 0x9d, 0x9d, 0x5d, 0x5d,
-  0x9d, 0x9d, 0x0c, 0x93, 0x9f, 0xbf, 0x69, 0xd3,
-  0x8e, 0x1d, 0x80, 0xc7, 0xc3, 0x30, 0x5a, 0x2d,
-  0x10, 0x0c, 0xf2, 0x3c, 0x21, 0x80, 0x4a, 0x25,
-  0x08, 0x3e, 0x1f, 0xf0, 0xe1, 0xc3, 0xdb, 0xb7,
-  0x1d, 0x1d, 0x84, 0x94, 0x94, 0x14, 0x17, 0x17,
-  0x15, 0x01, 0x1b, 0x36, 0xac, 0x5f, 0x5f, 0x50,
-  0x10, 0x0d, 0x1d, 0x68, 0x6c, 0x6c, 0x6a, 0xba,
-  0x70, 0x61, 0xe7, 0xce, 0xdf, 0x8d, 0x80, 0xac,
-  0x00, 0xba, 0xe3, 0x14, 0xdc, 0x60, 0x28, 0x28,
-  0xd8, 0xb1, 0x03, 0x18, 0x19, 0x71, 0x3a, 0xe3,
-  0xe2, 0x80, 0x82, 0x02, 0x83, 0x21, 0x29, 0x09,
-  0x50, 0xab, 0x95, 0x4a, 0x85, 0x02, 0x30, 0x99,
-  0x26, 0x26, 0x6c, 0x36, 0x40, 0xaf, 0xcf, 0xc9,
-  0x29, 0x2d, 0x05, 0x1e, 0x3f, 0xee, 0xea, 0xea,
-  0xec, 0x04, 0x74, 0x3a, 0x9d, 0x4e, 0xa7, 0x03,
-  0x52, 0x53, 0x97, 0x2f, 0x4f, 0x4d, 0x5d, 0xb8,
-  0x4e, 0x7c, 0x7c, 0x7c, 0xbc, 0x5e, 0x4f, 0xaf,
-  0xa2, 0x45, 0x8c, 0x61, 0x22, 0x9f, 0x93, 0x4d,
-  0x05, 0x9e, 0xe7, 0x79, 0x80, 0x90, 0xcc, 0xcc,
-  0xdc, 0xdc, 0x2d, 0x5b, 0x80, 0xd1, 0x51, 0xa7,
-  0x53, 0xad, 0x06, 0xca, 0xca, 0x36, 0x6f, 0x4e,
-  0x4f, 0x07, 0xb2, 0xb3, 0x57, 0xae, 0x5c, 0xb2,
-  0x04, 0x48, 0x4b, 0x4b, 0x4e, 0xd6, 0x6a, 0x81,
-  0xbc, 0xbc, 0xb4, 0xb4, 0xa5, 0x4b, 0x81, 0x60,
-  0x90, 0x65, 0x75, 0x3a, 0x20, 0x25, 0x25, 0x2f,
-  0xaf, 0xb4, 0x14, 0x68, 0x6f, 0xbf, 0x7b, 0xb7,
-  0xbd, 0x7d, 0xe1, 0xfc, 0x82, 0x20, 0x08, 0xb1,
-  0x24, 0x58, 0x53, 0xd3, 0xbe, 0x7d, 0x84, 0x08,
-  0x82, 0xe8, 0x79, 0x3e, 0x72, 0x9c, 0x44, 0x9b,
-  0x40, 0x10, 0xe2, 0xe2, 0x92, 0x92, 0x80, 0xb4,
-  0xb4, 0x65, 0xcb, 0xe2, 0xe3, 0x01, 0xaf, 0xd7,
-  0xe7, 0xf3, 0xfb, 0x01, 0x97, 0x8b, 0xe3, 0xe6,
-  0xe6, 0x00, 0xb7, 0xdb, 0xe3, 0xf1, 0xfb, 0x81,
-  0x6f, 0xdf, 0xac, 0xd6, 0x99, 0x19, 0x80, 0x65,
-  0x83, 0x41, 0x8f, 0x07, 0xf8, 0xfa, 0xd5, 0xe5,
-  0x62, 0xe6, 0x55, 0x98, 0xd9, 0x6c, 0x36, 0x9b,
-  0xcd, 0x80, 0xc9, 0x64, 0x32, 0x99, 0x4c, 0xa2,
-  0x80, 0x58, 0xc0, 0x0f, 0x1e, 0xbc, 0x74, 0xe9,
-  0xf5, 0x6b, 0x60, 0xeb, 0xd6, 0x3d, 0x7b, 0xaa,
-  0xaa, 0xa4, 0xfb, 0x51, 0x53, 0x88, 0x9a, 0x5a,
-  0xad, 0x56, 0xab, 0x54, 0x80, 0xcf, 0x27, 0x2e,
-  0xe9, 0xf5, 0x06, 0x83, 0x82, 0x00, 0x10, 0x42,
-  0x08, 0xc3, 0x00, 0xb3, 0xb3, 0xa2, 0x00, 0xbd,
-  0x7e, 0xf1, 0x62, 0x9d, 0x0e, 0xc8, 0xca, 0x52,
-  0xa9, 0x34, 0x1a, 0xa0, 0xaf, 0x6f, 0x74, 0xd4,
-  0xe1, 0x90, 0xe6, 0x31, 0x1a, 0x8d, 0x46, 0xa3,
-  0x51, 0xda, 0x79, 0xb9, 0x08, 0x50, 0xc0, 0x43,
-  0x87, 0x2e, 0x5f, 0x7e, 0xf3, 0x06, 0x98, 0x9c,
-  0x7c, 0xf5, 0xaa, 0xa5, 0x05, 0x18, 0x18, 0x30,
-  0x9b, 0xa7, 0xa6, 0x42, 0x21, 0xf1, 0x29, 0x96,
-  0x8d, 0x59, 0x80, 0x20, 0xcc, 0xcd, 0xcd, 0xcc,
-  0x00, 0x16, 0x0b, 0xc7, 0xe9, 0x74, 0x80, 0xc7,
-  0xe3, 0x72, 0xd9, 0x6c, 0x80, 0x56, 0xab, 0x52,
-  0x89, 0xe3, 0x62, 0x58, 0x35, 0x1a, 0xa5, 0x92,
-  0xe7, 0x81, 0xc9, 0x49, 0xbb, 0x3d, 0x18, 0x04,
-  0x12, 0x13, 0x35, 0x1a, 0x8d, 0x06, 0xb0, 0xdb,
-  0xa5, 0x08, 0x0c, 0x0f, 0xd3, 0x39, 0x81, 0xec,
-  0xec, 0xec, 0xec, 0x9c, 0x1c, 0x69, 0x1d, 0x96,
-  0xed, 0xed, 0x3d, 0x75, 0x8a, 0x65, 0x17, 0x82,
-  0x8f, 0x8c, 0xcc, 0xcc, 0x00, 0x36, 0x9b, 0xc9,
-  0x74, 0xef, 0x1e, 0xcb, 0x56, 0x57, 0xb7, 0xb5,
-  0xf1, 0xbc, 0x14, 0x5b, 0x59, 0x01, 0x73, 0x73,
-  0x6e, 0xb7, 0xdb, 0x0d, 0x7c, 0xf8, 0xf0, 0xee,
-  0xdd, 0xf3, 0xe7, 0xc0, 0xaa, 0x55, 0x85, 0x85,
-  0x65, 0x65, 0x80, 0xcd, 0xe6, 0xf1, 0x28, 0x14,
-  0x80, 0x5e, 0xaf, 0xd1, 0xa8, 0x54, 0x00, 0xcb,
-  0x8a, 0x45, 0x6c, 0xb7, 0x3b, 0x9d, 0x1c, 0x07,
-  0xc4, 0xc5, 0xe9, 0x74, 0x84, 0x00, 0x53, 0x53,
-  0xfd, 0xfd, 0xf7, 0xef, 0x03, 0xdb, 0xb6, 0x15,
-  0x15, 0x6d, 0xdb, 0x06, 0xac, 0x5d, 0xbb, 0x76,
-  0xad, 0xd1, 0x28, 0x75, 0x1d, 0x1a, 0x81, 0x4b,
-  0x97, 0xf6, 0xef, 0x57, 0x28, 0x00, 0x9a, 0x2a,
-  0xe3, 0xe3, 0x2f, 0x5f, 0x36, 0x37, 0x03, 0x7d,
-  0x7d, 0x83, 0x83, 0xdf, 0xbf, 0x03, 0x1c, 0x37,
-  0x32, 0xf2, 0xe8, 0x11, 0x10, 0x09, 0x2e, 0x5b,
-  0x03, 0x15, 0x15, 0x47, 0x8f, 0x96, 0x97, 0x0f,
-  0x0f, 0xe7, 0xe6, 0xe6, 0xe6, 0xe6, 0xe7, 0x03,
-  0x99, 0x99, 0x19, 0x19, 0xab, 0x57, 0x03, 0x13,
-  0x13, 0xbd, 0xbd, 0x0f, 0x1e, 0x00, 0x06, 0xc3,
-  0xf2, 0xe5, 0x5a, 0x2d, 0x30, 0x36, 0x66, 0xb5,
-  0xce, 0xce, 0x02, 0xfd, 0xfd, 0xe3, 0xe3, 0x0e,
-  0x87, 0x58, 0xf4, 0x82, 0x20, 0x81, 0x27, 0x24,
-  0x24, 0x24, 0x24, 0x24, 0x00, 0x84, 0x30, 0x0c,
-  0xcb, 0x86, 0x83, 0x03, 0x40, 0x73, 0x73, 0x45,
-  0x45, 0x72, 0xf2, 0x7c, 0xf0, 0x67, 0xcf, 0x9a,
-  0x9b, 0x81, 0xfe, 0xfe, 0xe1, 0xe1, 0xa9, 0xa9,
-  0xe8, 0xe0, 0xd4, 0xfe, 0x1d, 0xa8, 0xaf, 0xaf,
-  0xaf, 0xaf, 0xab, 0x13, 0x84, 0xb4, 0xb4, 0xf4,
-  0xf4, 0x8c, 0x0c, 0xe9, 0x81, 0xe4, 0xe4, 0xa4,
-  0xa4, 0xa4, 0x24, 0x60, 0x68, 0xc8, 0x64, 0x1a,
-  0x1a, 0x02, 0x38, 0xce, 0xed, 0xe6, 0x38, 0xf9,
-  0x94, 0x33, 0x18, 0xd6, 0xac, 0x31, 0x18, 0x80,
-  0x92, 0x92, 0xe2, 0xe2, 0x92, 0x12, 0x09, 0x58,
-  0xa1, 0x50, 0x28, 0x14, 0x0a, 0xe0, 0xd6, 0xad,
-  0xf2, 0xf2, 0xc4, 0x44, 0xe0, 0xe0, 0xc1, 0xa6,
-  0x26, 0x11, 0xfc, 0xc5, 0x8b, 0xe6, 0x66, 0xc0,
-  0x64, 0xfa, 0xfc, 0xd9, 0x6e, 0x07, 0xa6, 0xa6,
-  0x06, 0x06, 0xda, 0xdb, 0xa3, 0x83, 0x47, 0x4d,
-  0xa1, 0x48, 0xf0, 0x23, 0x47, 0x0e, 0x1f, 0x3e,
-  0x72, 0x44, 0xec, 0x22, 0x66, 0x73, 0x64, 0x9d,
-  0x84, 0x77, 0x15, 0x41, 0x90, 0x72, 0x5e, 0xab,
-  0xd5, 0x6a, 0xb5, 0x5a, 0xa0, 0xbb, 0xbb, 0xa1,
-  0xa1, 0xb0, 0x50, 0x02, 0x1f, 0x1b, 0xeb, 0xe9,
-  0xb9, 0x73, 0x07, 0x18, 0x1a, 0x1a, 0x1b, 0xb3,
-  0xd9, 0x80, 0x99, 0x99, 0xc1, 0xc1, 0xbb, 0x77,
-  0x63, 0x07, 0x97, 0x15, 0x60, 0xb5, 0x5a, 0xad,
-  0x3f, 0x7e, 0x48, 0xfe, 0xd8, 0xb1, 0xaa, 0xaa,
-  0xea, 0x6a, 0xc0, 0xe9, 0x74, 0x3a, 0x1d, 0x0e,
-  0xb1, 0x9b, 0x18, 0x0c, 0x0b, 0x81, 0x23, 0xaf,
-  0x09, 0x21, 0x84, 0x65, 0x81, 0x96, 0x96, 0xca,
-  0xca, 0x94, 0x14, 0xe0, 0xc0, 0x81, 0xc6, 0xc6,
-  0x9e, 0x1e, 0xe0, 0xd3, 0xa7, 0xa7, 0x4f, 0x6f,
-  0xde, 0x04, 0xcc, 0xe6, 0x2f, 0x5f, 0x1c, 0x0e,
-  0x11, 0xfc, 0xde, 0x3d, 0xc0, 0xe3, 0x59, 0xb7,
-  0xae, 0xae, 0x0e, 0x00, 0xda, 0xda, 0x6a, 0x6b,
-  0x63, 0xc5, 0x9f, 0x57, 0x03, 0xb5, 0xb5, 0xb5,
-  0xb5, 0xa7, 0x4f, 0x33, 0x4c, 0x4d, 0xcd, 0xf1,
-  0xe3, 0x27, 0x4e, 0x30, 0x4c, 0x28, 0xc4, 0xf3,
-  0x81, 0x00, 0xcf, 0x13, 0x42, 0x08, 0x21, 0xe1,
-  0x6d, 0x8f, 0x61, 0xc4, 0x9c, 0xfe, 0xd5, 0x84,
-  0x4a, 0xa5, 0x52, 0xa9, 0x54, 0xce, 0x07, 0x6f,
-  0x68, 0xe8, 0xee, 0x06, 0x46, 0x46, 0x44, 0xf0,
-  0xc1, 0xc1, 0xf1, 0x71, 0xbb, 0x5d, 0x02, 0xaf,
-  0xaa, 0x6a, 0x6d, 0x0d, 0x06, 0x63, 0x07, 0x8e,
-  0x39, 0x85, 0x28, 0x30, 0xcf, 0x8b, 0xdf, 0xe4,
-  0xf9, 0xfd, 0xfb, 0x57, 0x3b, 0x4f, 0x8b, 0x94,
-  0x16, 0xf3, 0xd8, 0x18, 0xb0, 0x71, 0x23, 0xf0,
-  0xfe, 0x7d, 0x4f, 0x4f, 0x4f, 0x0f, 0x30, 0x31,
-  0x31, 0x39, 0x69, 0xb7, 0x8b, 0xed, 0xf0, 0xfe,
-  0x7d, 0xe0, 0xc0, 0x81, 0x2b, 0x57, 0xac, 0x56,
-  0x69, 0x7e, 0xea, 0x45, 0xa3, 0x7d, 0x9e, 0xf6,
-  0xfd, 0xff, 0x20, 0x80, 0x22, 0x86, 0x42, 0xa1,
-  0x50, 0x28, 0x24, 0x2f, 0x80, 0x61, 0x18, 0x86,
-  0x10, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0xe0,
-  0xc6, 0x8d, 0xf2, 0xf2, 0x15, 0x2b, 0x80, 0xc1,
-  0xc1, 0x1f, 0x3f, 0xd2, 0xd3, 0x01, 0x87, 0xa3,
-  0xb5, 0xf5, 0xf6, 0x6d, 0x20, 0x33, 0x93, 0x90,
-  0x81, 0x01, 0x60, 0xef, 0xde, 0xf3, 0xe7, 0xcd,
-  0x66, 0x31, 0x25, 0x9d, 0x4e, 0x80, 0x65, 0x59,
-  0x96, 0x65, 0x81, 0x40, 0xc0, 0xef, 0x0f, 0x04,
-  0xe8, 0xcc, 0xf4, 0x74, 0xe4, 0x72, 0x85, 0x0b,
-  0x59, 0xf8, 0xe9, 0x8b, 0xfa, 0x21, 0x9b, 0x2f,
-  0x60, 0x7e, 0x64, 0x94, 0x4a, 0xb1, 0xff, 0x53,
-  0x01, 0x1c, 0xc7, 0x71, 0x1c, 0x07, 0x9c, 0x3d,
-  0xfb, 0xf0, 0xa1, 0x20, 0x00, 0x95, 0x95, 0xc5,
-  0xc5, 0xe3, 0xe3, 0xc0, 0xae, 0x5d, 0x15, 0x15,
-  0x4f, 0x9e, 0x48, 0xa9, 0x35, 0x3d, 0x3d, 0x3d,
-  0x3d, 0x3d, 0x0d, 0x88, 0xc7, 0x6d, 0xb1, 0x56,
-  0x08, 0x01, 0x7c, 0x3e, 0x9f, 0xcf, 0xe7, 0xa3,
-  0xab, 0x26, 0x26, 0x8a, 0x9e, 0xde, 0xf1, 0x78,
-  0x7e, 0x53, 0x80, 0x94, 0xdf, 0x6a, 0xb5, 0x5a,
-  0xad, 0x56, 0x4b, 0x5e, 0x2e, 0xd5, 0x28, 0x90,
-  0xc5, 0x62, 0xb1, 0x58, 0x2c, 0x80, 0xd7, 0xeb,
-  0xf5, 0x7a, 0xbd, 0x12, 0x20, 0xf5, 0xb4, 0x9d,
-  0xd2, 0x9d, 0xa7, 0x9e, 0xbe, 0x1f, 0x0e, 0x4c,
-  0xab, 0x43, 0xfe, 0xdc, 0x24, 0x23, 0x40, 0x10,
-  0xc4, 0x89, 0x3b, 0x3a, 0x2e, 0x5e, 0x6c, 0x6c,
-  0x3c, 0x77, 0x6e, 0xf7, 0xee, 0x48, 0x60, 0x39,
-  0x21, 0x52, 0xed, 0x88, 0x87, 0x0c, 0x9e, 0x17,
-  0xef, 0xd0, 0x5f, 0x16, 0x69, 0x8b, 0xc2, 0xdb,
-  0x40, 0x5d, 0xdd, 0x99, 0x33, 0xf5, 0xf5, 0xf4,
-  0x70, 0x41, 0x4f, 0x51, 0x34, 0xa9, 0xe4, 0x05,
-  0xc4, 0xd8, 0x6f, 0x15, 0x3f, 0x85, 0xea, 0x74,
-  0xa2, 0x5f, 0xbc, 0x38, 0xdc, 0x2f, 0x5a, 0x14,
-  0x3e, 0x4e, 0xff, 0xd8, 0x68, 0x31, 0x52, 0x00,
-  0x0a, 0x44, 0x77, 0x98, 0x9e, 0x94, 0x68, 0xae,
-  0xbb, 0xdd, 0xe1, 0xe3, 0xb4, 0xac, 0xff, 0xb7,
-  0x00, 0x69, 0xdf, 0xc2, 0xc1, 0xe8, 0x35, 0x15,
-  0x18, 0x39, 0x4e, 0x85, 0x50, 0x80, 0x48, 0x21,
-  0x34, 0x45, 0xe4, 0x40, 0x63, 0xfd, 0x25, 0xfd,
-  0x6b, 0x7f, 0xce, 0xfe, 0x01, 0xc9, 0xa7, 0x95,
-  0x94, 0xde, 0x64, 0xc1, 0x5d, 0x00, 0x00, 0x00,
-  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
-  0x82};
--- a/art/tango/edit_paste.h
+++ b/art/tango/edit_paste.h
@@ -1,229 +0,0 @@
-/* edit_paste.png - 561 bytes */
-static const unsigned char edit_paste_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59,
-  0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b,
-  0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00,
-  0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xd5,
-  0x0a, 0x0e, 0x00, 0x1c, 0x15, 0xaf, 0xe2, 0xf1,
-  0x18, 0x00, 0x00, 0x01, 0xd0, 0x49, 0x44, 0x41,
-  0x54, 0x38, 0xcb, 0x95, 0x93, 0xb1, 0x6b, 0x53,
-  0x51, 0x14, 0xc6, 0x7f, 0xf7, 0xbd, 0x34, 0x82,
-  0x24, 0x31, 0x8d, 0xd4, 0x94, 0x0c, 0x85, 0x22,
-  0x06, 0x5c, 0x5c, 0xb4, 0x6a, 0x62, 0x04, 0xd1,
-  0x12, 0x70, 0x76, 0xd0, 0x21, 0x38, 0x14, 0x45,
-  0x6d, 0x1d, 0xc4, 0xc5, 0x41, 0x97, 0x82, 0x38,
-  0x08, 0x8e, 0xfa, 0x0f, 0x34, 0x83, 0xbb, 0x9b,
-  0xa8, 0x4b, 0xd5, 0x2e, 0xba, 0x38, 0x29, 0x91,
-  0x52, 0xa8, 0xd1, 0x48, 0x42, 0x5e, 0x6f, 0x6c,
-  0xd0, 0x46, 0xef, 0x39, 0x0e, 0xa1, 0x31, 0x2f,
-  0x6d, 0x20, 0x7e, 0xdb, 0xfd, 0xce, 0x3d, 0x3f,
-  0xce, 0xf9, 0xe0, 0x18, 0x06, 0x54, 0x2a, 0x95,
-  0x8c, 0xef, 0x7b, 0xcf, 0x9d, 0x93, 0xd9, 0x7e,
-  0xdf, 0xf7, 0xbd, 0x17, 0xce, 0x49, 0xb1, 0x5c,
-  0x2e, 0x6b, 0xbf, 0x6f, 0x00, 0x6e, 0xce, 0x9a,
-  0x2b, 0x06, 0x1e, 0x2a, 0x8c, 0x2b, 0x1e, 0x76,
-  0xf2, 0x12, 0xb9, 0xdc, 0x11, 0x3c, 0xcf, 0x00,
-  0x20, 0xa2, 0xac, 0xac, 0x7c, 0x60, 0x5f, 0xed,
-  0x29, 0x06, 0x01, 0x68, 0xaa, 0xea, 0xad, 0xc7,
-  0x2f, 0x59, 0x32, 0xf3, 0x67, 0x89, 0xf8, 0x9e,
-  0x09, 0x2e, 0x9c, 0x39, 0x18, 0xfb, 0xd2, 0xc9,
-  0xf0, 0x2e, 0xc8, 0xd2, 0xb4, 0x1d, 0xa6, 0xa7,
-  0xa7, 0x30, 0x66, 0x1b, 0x20, 0xac, 0xad, 0xad,
-  0x93, 0x4c, 0x44, 0x39, 0x9a, 0xfc, 0xcc, 0xa4,
-  0xbf, 0xce, 0xb3, 0xd7, 0xab, 0x56, 0x54, 0x53,
-  0x11, 0x20, 0xe6, 0x79, 0x66, 0x2c, 0x1a, 0xf1,
-  0x79, 0x5f, 0xcf, 0xb2, 0x78, 0xff, 0x11, 0x41,
-  0x10, 0x50, 0xa9, 0x54, 0x42, 0xab, 0xcd, 0xcd,
-  0x1d, 0x22, 0x95, 0x4a, 0x71, 0xef, 0xee, 0x6d,
-  0x2e, 0x66, 0xbe, 0x21, 0xaa, 0x31, 0x20, 0x1a,
-  0xe9, 0xff, 0xd4, 0xde, 0x82, 0x44, 0x22, 0x81,
-  0xaa, 0x30, 0x33, 0x73, 0x6c, 0x30, 0x1e, 0xe2,
-  0xf1, 0x38, 0x5b, 0x7f, 0xc0, 0xa9, 0xe9, 0x79,
-  0x3d, 0x80, 0x6a, 0x28, 0x1b, 0x96, 0xdf, 0xbc,
-  0x0d, 0xbd, 0x0b, 0xf9, 0x1c, 0xbb, 0x29, 0xc2,
-  0x10, 0x9d, 0x3e, 0x95, 0xe7, 0x1f, 0x5c, 0x10,
-  0x71, 0xc3, 0x01, 0xba, 0x4b, 0x61, 0x7b, 0x02,
-  0x55, 0x45, 0x45, 0xc8, 0x9d, 0x3c, 0xfe, 0x7f,
-  0x13, 0x14, 0xf2, 0x39, 0x44, 0x04, 0x11, 0x41,
-  0x55, 0xb0, 0xd6, 0x32, 0x31, 0x91, 0x1e, 0x0d,
-  0xd0, 0xdf, 0x28, 0xd2, 0x6d, 0x6e, 0xfd, 0x68,
-  0x8d, 0x3e, 0x81, 0x88, 0xeb, 0x41, 0xaa, 0x5f,
-  0xab, 0x34, 0x1a, 0xf5, 0x1d, 0x21, 0x87, 0x01,
-  0x03, 0x35, 0xe7, 0xba, 0x80, 0x56, 0xcb, 0xd2,
-  0xa8, 0xd7, 0x29, 0x16, 0xcf, 0x0f, 0xdb, 0x14,
-  0x6f, 0xd8, 0x04, 0xd6, 0x6e, 0x50, 0xfb, 0x5e,
-  0x43, 0x44, 0x7a, 0xfe, 0xf5, 0xf9, 0xab, 0x5c,
-  0x9e, 0x5a, 0x1e, 0xbe, 0xc2, 0xde, 0x31, 0xa5,
-  0x19, 0x34, 0x49, 0xa7, 0x33, 0xa4, 0xd3, 0x19,
-  0xb2, 0xd9, 0xc3, 0x58, 0xbb, 0x81, 0xaa, 0x70,
-  0x63, 0xe1, 0x5a, 0xaf, 0xd9, 0x37, 0x1a, 0x02,
-  0x6c, 0x8a, 0xe8, 0xef, 0xf6, 0x2f, 0xb7, 0xe7,
-  0x44, 0xf2, 0x23, 0x0f, 0x16, 0xef, 0xf0, 0xd3,
-  0xed, 0x8c, 0xa6, 0xb0, 0xff, 0x13, 0xab, 0xed,
-  0x03, 0x00, 0x24, 0xb5, 0x8a, 0x31, 0x66, 0x53,
-  0x55, 0x3b, 0x06, 0x60, 0xe1, 0x5c, 0xf7, 0x1a,
-  0x31, 0x8c, 0x33, 0x82, 0x54, 0xbb, 0xd7, 0xf8,
-  0xe4, 0x15, 0x4b, 0x7f, 0x01, 0x4f, 0xe6, 0xe1,
-  0x98, 0x78, 0x69, 0xc4, 0xda, 0x00, 0x00, 0x00,
-  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
-  0x82};
-
-
-/* edit_paste.png - 1209 bytes */
-static const unsigned char edit_paste_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
-  0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
-  0x44, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
-  0x57, 0x4d, 0x68, 0x53, 0x4b, 0x14, 0xfe, 0xee,
-  0xcd, 0x4d, 0x34, 0xda, 0x34, 0x7f, 0xe6, 0xa7,
-  0x86, 0x80, 0x10, 0x68, 0xb1, 0x3b, 0xa9, 0x5d,
-  0x74, 0x23, 0x51, 0x4c, 0x4a, 0x70, 0x61, 0x8d,
-  0x6e, 0x84, 0xb8, 0xeb, 0x4e, 0xec, 0xd6, 0xb8,
-  0x10, 0x8a, 0x86, 0xe2, 0xc6, 0xb8, 0x10, 0x05,
-  0x69, 0x05, 0xc1, 0x80, 0x5b, 0xdd, 0x24, 0x3b,
-  0xcd, 0x42, 0x83, 0x60, 0xb3, 0x28, 0x42, 0x41,
-  0x41, 0x90, 0x5a, 0x69, 0xfe, 0xcc, 0xcf, 0xcd,
-  0x4d, 0x62, 0xd2, 0x64, 0xc6, 0xc5, 0x70, 0xb1,
-  0x49, 0xee, 0x7d, 0x4d, 0x7c, 0x6d, 0x9f, 0xef,
-  0x6c, 0x0e, 0x33, 0x73, 0xe6, 0xcc, 0xf9, 0xce,
-  0x77, 0xce, 0xdc, 0xb9, 0xc0, 0xff, 0x5c, 0xb8,
-  0xbd, 0x72, 0x14, 0x0a, 0x85, 0x42, 0xa1, 0xd0,
-  0x9b, 0x37, 0x6c, 0xe4, 0xf5, 0xfe, 0xb3, 0x75,
-  0x32, 0x19, 0x8b, 0xc5, 0x62, 0xb1, 0xd8, 0xd9,
-  0xb3, 0xfb, 0x0e, 0x60, 0x71, 0x71, 0x71, 0x11,
-  0xe0, 0xf9, 0xaf, 0x5f, 0x93, 0x49, 0x40, 0xa7,
-  0x93, 0xe7, 0x5b, 0x2d, 0x87, 0xe3, 0xe2, 0xc5,
-  0x53, 0xa7, 0x04, 0xe1, 0xd0, 0xa1, 0xd1, 0xd1,
-  0x57, 0xaf, 0x08, 0x21, 0x84, 0x52, 0x9b, 0x6d,
-  0x6a, 0x6a, 0x6a, 0x6a, 0x62, 0x02, 0xe0, 0x38,
-  0x8e, 0xe3, 0x76, 0x78, 0xa7, 0x94, 0x52, 0x4a,
-  0x81, 0x74, 0x3a, 0x9d, 0xfe, 0xf4, 0x09, 0xe0,
-  0x79, 0x9e, 0xe7, 0xb8, 0x7c, 0xbe, 0xdd, 0x6e,
-  0x36, 0xab, 0xd5, 0x60, 0x50, 0xa7, 0xcb, 0x66,
-  0x5f, 0xbe, 0x5c, 0x5d, 0x95, 0xed, 0x4f, 0x9c,
-  0xf0, 0x7a, 0x81, 0x56, 0x8b, 0x9d, 0x4f, 0xc8,
-  0xd0, 0x00, 0x16, 0x16, 0x7c, 0x3e, 0x8d, 0xe6,
-  0xda, 0x35, 0x4a, 0x01, 0x42, 0x1e, 0x3e, 0x24,
-  0x84, 0x10, 0x60, 0x64, 0x44, 0x5e, 0xff, 0xf9,
-  0xd3, 0x6c, 0x9e, 0x99, 0xe1, 0x79, 0x87, 0x63,
-  0x7c, 0x7c, 0x66, 0x86, 0xe3, 0xdc, 0x6e, 0xb7,
-  0xdb, 0xe1, 0x18, 0x3c, 0x73, 0x9b, 0x9b, 0x9b,
-  0x9b, 0xf9, 0x3c, 0x90, 0xc9, 0x7c, 0xfe, 0x9c,
-  0x4a, 0x51, 0x7a, 0xf8, 0x70, 0xb1, 0x98, 0x4a,
-  0x11, 0x42, 0x29, 0x5b, 0xe7, 0x79, 0x8e, 0x03,
-  0x24, 0x89, 0x52, 0x42, 0x78, 0xfe, 0xc6, 0x8d,
-  0x47, 0x8f, 0x5e, 0xbf, 0xee, 0x74, 0x9e, 0x3f,
-  0xef, 0xf5, 0x23, 0xa8, 0x65, 0xbc, 0x54, 0x7a,
-  0xf7, 0x8e, 0x90, 0x07, 0x0f, 0x82, 0xc1, 0x33,
-  0x67, 0x3c, 0x1e, 0xa3, 0x31, 0x9b, 0xdd, 0xde,
-  0xb6, 0xdb, 0x81, 0x0f, 0x1f, 0x44, 0x71, 0x72,
-  0x12, 0x68, 0x34, 0x44, 0xb1, 0xd3, 0x01, 0xac,
-  0x56, 0xab, 0xd5, 0x66, 0x03, 0x3c, 0x1e, 0x8f,
-  0x67, 0x7c, 0xbc, 0x27, 0x3b, 0x1c, 0x63, 0x42,
-  0x69, 0xdc, 0x6c, 0x36, 0x9b, 0x00, 0x90, 0xc9,
-  0x64, 0x32, 0x13, 0x13, 0x1c, 0xa7, 0xd7, 0xbb,
-  0x5c, 0x27, 0x4f, 0x6a, 0x34, 0xd3, 0xd3, 0xa3,
-  0xa3, 0xeb, 0xeb, 0x80, 0xd1, 0x08, 0x64, 0xb3,
-  0x46, 0x63, 0x3c, 0x9e, 0x4a, 0x7d, 0xf9, 0x12,
-  0x8d, 0x32, 0x0f, 0x03, 0x00, 0x90, 0x4b, 0xc5,
-  0x60, 0x10, 0x04, 0xc0, 0x64, 0xd2, 0x6a, 0xb5,
-  0x5a, 0x9e, 0x07, 0x56, 0x57, 0x8b, 0xc5, 0xc9,
-  0x49, 0x20, 0x1c, 0xbe, 0x7d, 0xfb, 0xde, 0x3d,
-  0xa0, 0x52, 0x29, 0x97, 0x2b, 0x15, 0x20, 0x1a,
-  0x8d, 0x46, 0xef, 0xdf, 0x07, 0xd6, 0xd6, 0xd6,
-  0xd6, 0xd6, 0xd7, 0x07, 0x67, 0xc0, 0x60, 0x30,
-  0x18, 0x46, 0x46, 0x80, 0x70, 0x38, 0x1c, 0xbe,
-  0x75, 0x0b, 0x30, 0x9b, 0x2d, 0x16, 0xb3, 0x19,
-  0x58, 0x5a, 0xba, 0x73, 0xe7, 0xe6, 0x4d, 0x20,
-  0x18, 0x74, 0x3a, 0x0b, 0x05, 0x80, 0x10, 0x4a,
-  0x39, 0xee, 0xd8, 0x31, 0x56, 0x86, 0xfd, 0x7e,
-  0x84, 0xdd, 0x0e, 0xe2, 0x38, 0x4a, 0x19, 0x99,
-  0x2c, 0x63, 0x56, 0xab, 0xc5, 0x62, 0xb5, 0x02,
-  0x82, 0xa0, 0xd1, 0x68, 0x34, 0x40, 0x24, 0x12,
-  0x89, 0x44, 0x22, 0x40, 0xbb, 0xdd, 0x6e, 0xb7,
-  0xdb, 0x83, 0x03, 0x10, 0x04, 0x41, 0x10, 0x84,
-  0xdf, 0xbd, 0x62, 0x34, 0x1a, 0x8d, 0x26, 0x13,
-  0x50, 0xaf, 0xb7, 0x5a, 0x8c, 0xa9, 0x01, 0xfd,
-  0x0c, 0x7e, 0xa4, 0x1a, 0x40, 0x16, 0x80, 0x56,
-  0xab, 0xd5, 0x6a, 0xb5, 0xc3, 0xef, 0x97, 0x9b,
-  0x5b, 0x69, 0x65, 0x4f, 0x01, 0xa8, 0xb9, 0x4b,
-  0x24, 0x12, 0x89, 0x44, 0xe2, 0xcf, 0x02, 0x07,
-  0x80, 0xd9, 0xd9, 0xd9, 0x59, 0xbf, 0x7f, 0xf8,
-  0xfd, 0x43, 0x03, 0x50, 0x93, 0x40, 0x20, 0x10,
-  0x08, 0x04, 0x06, 0x0b, 0x98, 0xd2, 0x6e, 0x4d,
-  0x08, 0x40, 0x08, 0xbb, 0xdf, 0x0e, 0x00, 0x80,
-  0x32, 0x07, 0xbb, 0x31, 0xa0, 0x14, 0xb8, 0xec,
-  0x89, 0x52, 0xc0, 0xe7, 0xf3, 0xf9, 0x7c, 0xbe,
-  0x03, 0x01, 0xa0, 0x2c, 0xbd, 0x0c, 0x28, 0x65,
-  0x78, 0xe7, 0xb8, 0x17, 0x88, 0x28, 0x8a, 0x62,
-  0xa5, 0x02, 0xd8, 0xed, 0x76, 0xbb, 0xd3, 0xb9,
-  0x0f, 0x00, 0x76, 0x6b, 0xa5, 0x78, 0x3c, 0x1e,
-  0x97, 0x19, 0x50, 0xca, 0xb4, 0x1c, 0xb8, 0xdf,
-  0xef, 0xf7, 0xfb, 0xfd, 0xfd, 0xf3, 0xa2, 0x58,
-  0xad, 0x8a, 0xe2, 0xf0, 0xe7, 0x0e, 0xc5, 0x80,
-  0x92, 0x33, 0xb9, 0x76, 0xe5, 0x26, 0x54, 0xcb,
-  0xb0, 0x6c, 0x27, 0xeb, 0x5e, 0xbb, 0x7c, 0x3e,
-  0x97, 0xcb, 0xe7, 0x87, 0xcf, 0xfc, 0x50, 0x00,
-  0x94, 0x44, 0x2d, 0x20, 0xb5, 0x12, 0xda, 0xda,
-  0xda, 0xda, 0xfa, 0xfe, 0x1d, 0x90, 0x24, 0x49,
-  0xaa, 0xd5, 0x80, 0x7a, 0xbd, 0x5e, 0xaf, 0xd7,
-  0x7f, 0xdb, 0xfd, 0x55, 0x00, 0x76, 0x8e, 0x65,
-  0x00, 0x1b, 0x1b, 0x1b, 0x1b, 0xdf, 0xbe, 0x01,
-  0x73, 0x73, 0x73, 0x73, 0x97, 0x2f, 0xf7, 0xfb,
-  0xab, 0x54, 0x2a, 0x95, 0x72, 0xf9, 0x80, 0x01,
-  0x74, 0x3a, 0xea, 0x81, 0xf7, 0x97, 0x50, 0x77,
-  0xa6, 0xe5, 0x80, 0x45, 0x51, 0x14, 0x45, 0x91,
-  0x31, 0x53, 0xad, 0xfe, 0x47, 0x0c, 0x28, 0x35,
-  0x65, 0xad, 0x26, 0x49, 0x92, 0x04, 0xe4, 0x72,
-  0xb9, 0x5c, 0x2e, 0x07, 0x50, 0xda, 0x7d, 0xdf,
-  0xcb, 0x81, 0x67, 0xb3, 0xd9, 0x6c, 0x26, 0x03,
-  0x2c, 0x2f, 0x3f, 0x7d, 0xba, 0xbc, 0x0c, 0x5c,
-  0xb8, 0xe0, 0x74, 0xa6, 0xd3, 0x7b, 0x00, 0xa0,
-  0xb7, 0x71, 0x8f, 0x1e, 0xd5, 0xe9, 0x08, 0x01,
-  0xf2, 0xf9, 0x42, 0x21, 0x9f, 0x07, 0xc6, 0xc6,
-  0xc6, 0xc6, 0x5c, 0xae, 0xfe, 0x7d, 0x4a, 0x73,
-  0x3b, 0x45, 0xce, 0xbc, 0x5a, 0xe0, 0x56, 0xab,
-  0x4e, 0x57, 0xab, 0xed, 0x03, 0x03, 0x6e, 0x37,
-  0x21, 0x1f, 0x3f, 0x02, 0x4b, 0x4b, 0x77, 0xef,
-  0x86, 0xc3, 0xec, 0xd1, 0xc5, 0xf3, 0x7f, 0x44,
-  0x5e, 0x97, 0x5c, 0xb9, 0xe2, 0x72, 0xbd, 0x7f,
-  0x0f, 0x1c, 0x39, 0xa2, 0xd1, 0xb4, 0x5a, 0xc3,
-  0xef, 0xef, 0x03, 0xf0, 0xec, 0x59, 0x32, 0x09,
-  0x34, 0x9b, 0x0b, 0x0b, 0xe7, 0xcf, 0x03, 0xc5,
-  0xa2, 0x24, 0x35, 0x1a, 0xed, 0xb6, 0xcd, 0x76,
-  0xfa, 0xf4, 0xf1, 0xe3, 0x95, 0x0a, 0x30, 0x3d,
-  0x4d, 0xe9, 0xdb, 0xb7, 0xea, 0x0e, 0x07, 0xbd,
-  0xbf, 0xd5, 0x85, 0xbd, 0x43, 0xcb, 0x65, 0x49,
-  0x92, 0x5f, 0xb7, 0x94, 0xe6, 0x72, 0xaa, 0xd6,
-  0x6a, 0x0b, 0xd7, 0xaf, 0x9f, 0x3b, 0x07, 0x5c,
-  0xba, 0xc4, 0x71, 0x3c, 0xcf, 0xf3, 0x8f, 0x1f,
-  0xb3, 0x2a, 0xb7, 0xd9, 0x94, 0x0e, 0x53, 0x0b,
-  0x62, 0x70, 0xe9, 0x87, 0x4d, 0x29, 0xc0, 0x71,
-  0xa5, 0x12, 0x21, 0x7a, 0xbd, 0xc3, 0x11, 0x89,
-  0x6c, 0x6f, 0x3b, 0x9d, 0x5e, 0xef, 0x93, 0x27,
-  0x2b, 0x2b, 0x2b, 0x2b, 0x2f, 0x5e, 0x34, 0x1a,
-  0xbb, 0x02, 0xe8, 0x95, 0xf9, 0xf9, 0xf9, 0xf9,
-  0xab, 0x57, 0xf5, 0x7a, 0x36, 0x32, 0x99, 0x98,
-  0xb6, 0x58, 0x98, 0x66, 0x3f, 0x1c, 0x80, 0x0c,
-  0xd0, 0x6e, 0xef, 0x9e, 0x37, 0x18, 0x98, 0xae,
-  0xd7, 0x99, 0x2e, 0x95, 0x98, 0x2e, 0x14, 0x98,
-  0x96, 0x3f, 0x65, 0x3f, 0x7e, 0x30, 0x5d, 0x2c,
-  0x76, 0x8f, 0xab, 0x55, 0x16, 0xf8, 0xbf, 0xf9,
-  0x62, 0xfc, 0xa5, 0xf2, 0x0b, 0xaf, 0xc4, 0x0e,
-  0xdb, 0x06, 0x1b, 0x53, 0xf5, 0x00, 0x00, 0x00,
-  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
-  0x82};
--- a/art/tango/edit_redo.h
+++ b/art/tango/edit_redo.h
@@ -1,235 +0,0 @@
-/* edit_redo.png - 591 bytes */
-static const unsigned char edit_redo_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd6, 0x07, 0x1a, 0x0a, 0x27, 0x15, 0x3f,
-  0xb8, 0xed, 0x21, 0x00, 0x00, 0x01, 0xdc, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x93, 0x4d,
-  0x6b, 0x13, 0x51, 0x18, 0x85, 0x9f, 0x3b, 0x5f,
-  0x4d, 0x8c, 0xa4, 0x42, 0x4c, 0x63, 0x83, 0x1f,
-  0x6d, 0x36, 0xd5, 0x76, 0xd3, 0xd2, 0x2a, 0x7e,
-  0x54, 0x63, 0x0d, 0x42, 0xa9, 0x38, 0x6e, 0x44,
-  0x2b, 0x82, 0xb8, 0x1a, 0x70, 0xad, 0x3b, 0xc1,
-  0xbf, 0xe0, 0x7e, 0x56, 0xdd, 0x75, 0x29, 0x44,
-  0x0a, 0x85, 0x8a, 0xc5, 0x52, 0xba, 0x6a, 0xa4,
-  0xa8, 0x1b, 0xc1, 0x4d, 0x75, 0x21, 0x29, 0x62,
-  0x4c, 0x26, 0x4d, 0x9a, 0xc9, 0x64, 0xc6, 0xcd,
-  0x18, 0x27, 0x9d, 0x41, 0x82, 0x67, 0xf9, 0x5e,
-  0x9e, 0xc3, 0xb9, 0xe7, 0xbe, 0x17, 0xfa, 0x90,
-  0x6e, 0x6a, 0x9e, 0x6e, 0x6a, 0xd3, 0x51, 0x67,
-  0x12, 0xfd, 0x6b, 0x5b, 0x37, 0xb5, 0xc2, 0x7f,
-  0x1b, 0x3c, 0x7e, 0x60, 0x00, 0xbc, 0xd1, 0x4d,
-  0x6d, 0x2e, 0x38, 0x17, 0x11, 0x71, 0x07, 0x80,
-  0x3c, 0xb0, 0x08, 0x4c, 0x01, 0x93, 0x01, 0x03,
-  0x96, 0x96, 0x4d, 0x80, 0x1b, 0x45, 0xc3, 0x5e,
-  0x0f, 0x19, 0xe8, 0xa6, 0x76, 0x01, 0x78, 0x3e,
-  0x27, 0xb4, 0x54, 0xb6, 0x70, 0x75, 0x58, 0x4d,
-  0x8d, 0xe6, 0x10, 0x02, 0x55, 0x8e, 0x61, 0xd9,
-  0x3f, 0x29, 0x7d, 0x5b, 0xe1, 0xca, 0xe8, 0xbd,
-  0x1e, 0x13, 0x11, 0x80, 0x17, 0x80, 0x17, 0x8f,
-  0xf2, 0xf9, 0xf3, 0xf2, 0x50, 0x4e, 0xaa, 0xd9,
-  0x65, 0xbc, 0xda, 0xa7, 0x9e, 0x74, 0x1f, 0x9b,
-  0x35, 0x80, 0xae, 0xc9, 0xb9, 0x3d, 0x7b, 0x56,
-  0xf8, 0xf0, 0x04, 0xf0, 0xf2, 0xe1, 0xb5, 0xeb,
-  0x37, 0x63, 0x99, 0x33, 0x58, 0x95, 0x75, 0x2c,
-  0x4f, 0x23, 0xee, 0xda, 0x00, 0x0c, 0x3a, 0x0d,
-  0x36, 0xdb, 0xce, 0xdf, 0xe2, 0x84, 0xc4, 0xa5,
-  0x91, 0xbb, 0x2c, 0x2d, 0x9b, 0x28, 0xfe, 0xec,
-  0xe9, 0x9d, 0xb3, 0xe3, 0x93, 0xb1, 0x74, 0x96,
-  0xfa, 0xaf, 0x77, 0x24, 0x5a, 0x0d, 0x12, 0x34,
-  0x18, 0x6e, 0x55, 0x78, 0x45, 0x02, 0x47, 0xea,
-  0xed, 0x3a, 0x3d, 0x78, 0xb2, 0x7b, 0x0d, 0x05,
-  0x60, 0x40, 0xd5, 0x66, 0x8f, 0x8f, 0x4d, 0xa7,
-  0xe3, 0xd6, 0x7b, 0xb2, 0xfb, 0x55, 0x76, 0xa4,
-  0x04, 0x9a, 0x22, 0xa8, 0x1d, 0x89, 0x33, 0xee,
-  0x43, 0x17, 0x15, 0x30, 0xeb, 0x16, 0x99, 0x63,
-  0xa7, 0xd9, 0x5c, 0xfd, 0xd0, 0xed, 0x40, 0x01,
-  0xe8, 0xb8, 0x6e, 0x46, 0xc8, 0x82, 0x54, 0xc3,
-  0x62, 0xab, 0x54, 0xf7, 0xd6, 0x5a, 0x95, 0xd0,
-  0xeb, 0x4c, 0x5c, 0x3e, 0x11, 0x82, 0xbb, 0x7b,
-  0xe0, 0x74, 0x9c, 0xe4, 0xd1, 0xc6, 0x57, 0xb6,
-  0x77, 0x76, 0x59, 0x6b, 0xb5, 0x2d, 0xe0, 0x19,
-  0x30, 0x55, 0x34, 0x6c, 0x51, 0x34, 0x6c, 0x01,
-  0xf0, 0x36, 0x39, 0x14, 0x82, 0x81, 0x6e, 0x07,
-  0xec, 0x37, 0xab, 0xee, 0x4a, 0x5d, 0x48, 0xc0,
-  0xfd, 0xa2, 0x61, 0xaf, 0x1e, 0x4e, 0xe0, 0xc3,
-  0x33, 0x45, 0xc3, 0x2e, 0x45, 0x6e, 0xa2, 0xaa,
-  0xc8, 0x07, 0x80, 0x17, 0x05, 0xfb, 0x0a, 0xc1,
-  0xc1, 0x04, 0x1b, 0xcd, 0xbd, 0xb2, 0x5a, 0x90,
-  0xbd, 0x18, 0xa6, 0x36, 0x7f, 0xd8, 0xe4, 0xcf,
-  0x35, 0xa2, 0x24, 0x03, 0x8c, 0xdd, 0x96, 0xdd,
-  0x2f, 0x07, 0xed, 0xfa, 0xad, 0x99, 0xdc, 0x8f,
-  0xd4, 0x6e, 0xf9, 0x94, 0xd0, 0xd5, 0xad, 0xcf,
-  0xaf, 0x3b, 0x76, 0x3f, 0x7f, 0x24, 0xb8, 0x89,
-  0x23, 0xc0, 0x02, 0x50, 0x05, 0x36, 0x9e, 0x24,
-  0xdd, 0xef, 0x02, 0xbc, 0xf9, 0x45, 0xa7, 0xf3,
-  0x2f, 0x83, 0xdf, 0xd7, 0x4b, 0xba, 0x05, 0x5e,
-  0xcf, 0x35, 0xde, 0x00, 0x00, 0x00, 0x00, 0x49,
-  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* edit_redo.png - 1234 bytes */
-static const unsigned char edit_redo_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
-  0x5d, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x96, 0x4d, 0x6b, 0x13, 0x5d, 0x14, 0xc7, 0xcf,
-  0xbd, 0x33, 0x93, 0x69, 0x4c, 0x6d, 0x8d, 0x69,
-  0xe3, 0x18, 0x2b, 0x36, 0x8a, 0x88, 0x52, 0x2d,
-  0x58, 0x15, 0x0a, 0x62, 0xa5, 0xa2, 0x34, 0x55,
-  0xba, 0x10, 0x44, 0x04, 0x57, 0x22, 0x7e, 0x06,
-  0x97, 0x7e, 0x01, 0x17, 0xea, 0xae, 0x1b, 0x17,
-  0xfa, 0x09, 0x5c, 0xf8, 0x52, 0x10, 0x14, 0x14,
-  0x71, 0x51, 0x6c, 0xbb, 0x10, 0x4b, 0x4d, 0xb0,
-  0x96, 0xa4, 0x79, 0xc1, 0x4c, 0x9a, 0x97, 0x49,
-  0x66, 0x32, 0xf7, 0x9e, 0x67, 0x71, 0xb9, 0x84,
-  0x4e, 0x33, 0x4f, 0x9b, 0xd6, 0x07, 0x11, 0x9e,
-  0xb3, 0x39, 0x9c, 0x70, 0xce, 0x9d, 0xdf, 0xff,
-  0x9c, 0x33, 0x37, 0x03, 0xf0, 0xbf, 0x6d, 0xcd,
-  0xa6, 0xa6, 0xa6, 0xa7, 0x03, 0x01, 0x44, 0xe1,
-  0x77, 0xef, 0xfe, 0x5d, 0xe7, 0xd2, 0x3f, 0x23,
-  0xa7, 0x5c, 0x16, 0x42, 0xc2, 0xe1, 0xbf, 0x4e,
-  0xc0, 0xf9, 0xf3, 0x13, 0x13, 0xa7, 0x4e, 0xc9,
-  0xa8, 0x58, 0xdc, 0xa9, 0x90, 0x3f, 0x34, 0x81,
-  0xdf, 0x27, 0x84, 0xec, 0x14, 0x44, 0x3c, 0x38,
-  0x14, 0x12, 0xd1, 0x9d, 0x3b, 0xc2, 0x3f, 0x7e,
-  0xbc, 0x19, 0x78, 0xb9, 0xdc, 0x6c, 0xe6, 0xf3,
-  0x00, 0x3d, 0x3d, 0x9a, 0x16, 0x8d, 0x02, 0x7c,
-  0xf8, 0xf0, 0xfa, 0xf5, 0xc2, 0x82, 0xcc, 0xda,
-  0xbb, 0xf7, 0xc5, 0x8b, 0x7b, 0xf7, 0x1c, 0xc7,
-  0x34, 0xff, 0x33, 0x01, 0x02, 0x3c, 0x91, 0x10,
-  0xd1, 0xcb, 0x97, 0x89, 0x44, 0x20, 0x10, 0x8b,
-  0x2d, 0x2c, 0x30, 0x76, 0xee, 0xdc, 0xc0, 0xc0,
-  0x89, 0x13, 0x96, 0xd5, 0xdd, 0xdd, 0x68, 0xa8,
-  0xaa, 0xb7, 0xae, 0xd9, 0x6c, 0x36, 0x5d, 0x17,
-  0xa0, 0x5a, 0x75, 0x9c, 0x62, 0x11, 0xc0, 0xb6,
-  0x2b, 0x15, 0xce, 0x01, 0x0c, 0xc3, 0x30, 0x0c,
-  0xa3, 0x73, 0x21, 0x1d, 0x0b, 0x10, 0xe0, 0x57,
-  0xae, 0x88, 0xe8, 0xcd, 0x9b, 0x6b, 0xd7, 0xc6,
-  0xc7, 0x47, 0x47, 0x01, 0x6a, 0xb5, 0x60, 0x90,
-  0x31, 0x80, 0xb5, 0xb5, 0x52, 0xc9, 0x34, 0x01,
-  0x1c, 0x07, 0xb1, 0x5e, 0x07, 0xa0, 0x94, 0x52,
-  0x42, 0x00, 0x08, 0x51, 0x55, 0x42, 0x00, 0x1c,
-  0xc7, 0xb6, 0x6d, 0x1b, 0x80, 0x52, 0x11, 0x9b,
-  0x66, 0x36, 0x5b, 0xab, 0x01, 0x10, 0x42, 0x29,
-  0x00, 0x40, 0x3c, 0x1e, 0x8f, 0xc7, 0xe3, 0x5e,
-  0x21, 0xa1, 0x90, 0x10, 0x62, 0x59, 0xdb, 0x16,
-  0x20, 0xc0, 0x0f, 0x1f, 0x16, 0x51, 0x32, 0x79,
-  0xe9, 0xd2, 0xd5, 0xab, 0xa3, 0xa3, 0x00, 0xcd,
-  0x26, 0xa2, 0x65, 0x01, 0x14, 0x0a, 0xa6, 0x99,
-  0xcd, 0xae, 0x3b, 0x9a, 0x00, 0x00, 0x70, 0xee,
-  0xba, 0x88, 0x00, 0x94, 0x2a, 0x0a, 0x21, 0x00,
-  0x88, 0x9a, 0x66, 0xdb, 0xa2, 0xf3, 0x88, 0x00,
-  0xb6, 0x5d, 0xad, 0x72, 0xde, 0x12, 0x20, 0xad,
-  0xbd, 0x10, 0x4d, 0x13, 0x42, 0x5c, 0x57, 0xfe,
-  0xa2, 0x42, 0x47, 0xf6, 0xe4, 0xc9, 0x85, 0x0b,
-  0x67, 0xcf, 0x1e, 0x3b, 0x66, 0xdb, 0xa2, 0xab,
-  0xba, 0x9e, 0xcf, 0x9b, 0xe6, 0xea, 0x2a, 0x00,
-  0x22, 0x63, 0xff, 0x56, 0xc9, 0x18, 0x21, 0xb6,
-  0x0d, 0xa0, 0xaa, 0x42, 0x88, 0xeb, 0xda, 0x36,
-  0xe7, 0x1b, 0xf3, 0xda, 0x83, 0xcb, 0x55, 0x6a,
-  0x81, 0x6f, 0x53, 0xc0, 0xe4, 0x24, 0x62, 0x7f,
-  0xbf, 0xae, 0x03, 0x64, 0xb3, 0xd5, 0x6a, 0x2a,
-  0x05, 0xa0, 0x28, 0x8a, 0x42, 0x29, 0x40, 0x24,
-  0x12, 0x0e, 0xef, 0xdb, 0x27, 0xb2, 0x28, 0x05,
-  0xd0, 0x34, 0x42, 0x74, 0x1d, 0x00, 0x71, 0xfd,
-  0x09, 0x88, 0x00, 0x8c, 0x01, 0x94, 0xcb, 0x9c,
-  0x2f, 0x2e, 0x02, 0x04, 0x02, 0xa1, 0x10, 0x21,
-  0x00, 0x03, 0x03, 0x86, 0x31, 0x38, 0xd8, 0xf9,
-  0x3b, 0xd0, 0xa1, 0x00, 0x01, 0x16, 0x0c, 0x02,
-  0x28, 0x0a, 0x21, 0xaa, 0x0a, 0xd0, 0xdb, 0xdb,
-  0xd7, 0xd7, 0xd3, 0x03, 0xa0, 0x69, 0xb9, 0x9c,
-  0x65, 0x01, 0xbc, 0x7d, 0xfb, 0xe9, 0xd3, 0xd2,
-  0x92, 0x7f, 0xfd, 0xc5, 0x8b, 0x93, 0x93, 0x67,
-  0xce, 0x00, 0xa8, 0x6a, 0x57, 0x17, 0xc0, 0xf6,
-  0xc1, 0xa5, 0x6d, 0xeb, 0x7f, 0x80, 0x10, 0x80,
-  0xee, 0xee, 0xde, 0xde, 0x60, 0x10, 0x20, 0x97,
-  0x2b, 0x14, 0x32, 0x19, 0x44, 0x01, 0x5e, 0x2a,
-  0x89, 0x8c, 0xe3, 0xc7, 0x05, 0x00, 0x21, 0xd2,
-  0xcb, 0x5a, 0x45, 0x21, 0x44, 0xd3, 0x76, 0x0e,
-  0xbe, 0x6d, 0x01, 0x8a, 0x02, 0xa0, 0xaa, 0x00,
-  0x86, 0xa1, 0x28, 0x43, 0x43, 0x88, 0x8b, 0x8b,
-  0x1f, 0x3f, 0x96, 0x4a, 0x72, 0xff, 0x6f, 0xdc,
-  0x10, 0x00, 0xdf, 0xbe, 0xf9, 0xd5, 0xdb, 0x36,
-  0x63, 0xb5, 0x9a, 0x17, 0xfc, 0xe0, 0xc1, 0x4e,
-  0xc1, 0xa5, 0x75, 0xbc, 0x42, 0xb6, 0x8d, 0x58,
-  0xa9, 0x30, 0xd6, 0x68, 0x20, 0xaa, 0xaa, 0x7c,
-  0xa9, 0x74, 0xfd, 0xe8, 0xd1, 0x4c, 0xc6, 0x71,
-  0xbe, 0x7e, 0x6d, 0xcd, 0xa8, 0xbd, 0xb5, 0x07,
-  0x4f, 0xa7, 0x3b, 0xe5, 0x90, 0xb6, 0xc5, 0x09,
-  0x48, 0xa0, 0x54, 0xea, 0xc0, 0x81, 0xb9, 0x39,
-  0xc6, 0x2a, 0x95, 0xb5, 0xb5, 0x46, 0xa3, 0x50,
-  0x68, 0x65, 0x3c, 0x7c, 0xf8, 0xe0, 0x01, 0x80,
-  0xbc, 0x48, 0xe5, 0x95, 0x28, 0xeb, 0x5a, 0x82,
-  0x1c, 0xa7, 0x56, 0x43, 0x3c, 0x74, 0x48, 0x80,
-  0x67, 0x32, 0x7e, 0x79, 0x5b, 0xb5, 0x4d, 0x26,
-  0xd0, 0x3a, 0x18, 0x11, 0x11, 0xf1, 0xf3, 0xe7,
-  0x5f, 0xbf, 0x4c, 0x73, 0x7e, 0x7e, 0x62, 0x82,
-  0x10, 0x80, 0xe1, 0x61, 0xef, 0x45, 0xa8, 0x28,
-  0x7e, 0x27, 0x09, 0xe0, 0x40, 0xc0, 0xd3, 0x3f,
-  0x4f, 0x03, 0xe5, 0x9d, 0xe5, 0xe7, 0xb7, 0x3c,
-  0x01, 0x6f, 0x47, 0x28, 0xad, 0x56, 0x57, 0x57,
-  0x01, 0xee, 0xdf, 0x9f, 0x99, 0xa9, 0xd7, 0x15,
-  0x25, 0x1c, 0x76, 0x5d, 0xc6, 0x1c, 0x07, 0x51,
-  0x55, 0x1b, 0x0d, 0x5d, 0x2f, 0x95, 0x12, 0x89,
-  0x47, 0x8f, 0x34, 0xed, 0xd6, 0xad, 0xf5, 0x42,
-  0xe4, 0xa7, 0x84, 0x9f, 0xd7, 0xb4, 0xf5, 0xb1,
-  0xac, 0xf3, 0x9f, 0xa0, 0xd7, 0x7c, 0x3a, 0xd6,
-  0x02, 0x97, 0xfe, 0xc7, 0x8f, 0x77, 0xef, 0x38,
-  0xb7, 0xac, 0x23, 0x47, 0x2e, 0x5f, 0xa6, 0x34,
-  0x9f, 0xcf, 0x64, 0x96, 0x97, 0x8b, 0xc5, 0xa9,
-  0xa9, 0xd3, 0xa7, 0xc7, 0xc7, 0xe3, 0x71, 0xce,
-  0xb3, 0xd9, 0x74, 0xba, 0x58, 0x1c, 0x1b, 0x33,
-  0xcd, 0x54, 0x0a, 0x71, 0x7a, 0xda, 0xb2, 0x0a,
-  0x85, 0xd6, 0x39, 0x12, 0xcc, 0xcf, 0xb7, 0x9e,
-  0xd3, 0x1e, 0xd8, 0x7f, 0x02, 0x9b, 0x08, 0xd8,
-  0xe8, 0x97, 0x96, 0x5e, 0xbd, 0xe2, 0xfc, 0xcb,
-  0x97, 0xc1, 0xc1, 0xb1, 0x31, 0x4a, 0x67, 0x67,
-  0xf3, 0xf9, 0x6c, 0xd6, 0x34, 0x6f, 0xdf, 0x8e,
-  0xc5, 0x22, 0x91, 0x5d, 0xbb, 0x56, 0x56, 0x7a,
-  0x7a, 0x86, 0x86, 0x18, 0xbb, 0x79, 0x73, 0xff,
-  0xfe, 0x91, 0x11, 0x4a, 0xbf, 0x7f, 0x5f, 0x5e,
-  0x7e, 0xff, 0x9e, 0x73, 0xb9, 0xeb, 0x5e, 0x50,
-  0x2f, 0xb0, 0x14, 0x24, 0x81, 0xe5, 0x8a, 0xfa,
-  0xaf, 0xd2, 0x26, 0x02, 0xfc, 0x05, 0x25, 0x93,
-  0x33, 0x33, 0x9c, 0x27, 0x93, 0x7b, 0xf6, 0xc4,
-  0xe3, 0x84, 0x3c, 0x7d, 0xea, 0x38, 0xaa, 0xea,
-  0xba, 0x9a, 0x26, 0x32, 0x08, 0x21, 0x84, 0x52,
-  0x42, 0x2a, 0x15, 0xc3, 0x18, 0x1e, 0xa6, 0xd4,
-  0xb6, 0x43, 0xa1, 0xfe, 0x7e, 0x42, 0x5c, 0xb7,
-  0x54, 0xfa, 0xf9, 0x13, 0xd1, 0xb6, 0x39, 0x77,
-  0xdd, 0x8d, 0x60, 0x5e, 0x60, 0x3f, 0x01, 0x2d,
-  0x3e, 0x9f, 0xdd, 0xf2, 0x0a, 0xf0, 0x76, 0xca,
-  0x6f, 0x47, 0x29, 0x1d, 0x19, 0xb9, 0x7b, 0x57,
-  0x51, 0x22, 0x91, 0x68, 0xf4, 0xe4, 0x49, 0x4a,
-  0xaf, 0x5f, 0x17, 0x1f, 0x69, 0xd1, 0xa8, 0xf8,
-  0x56, 0xca, 0xe5, 0xe6, 0xe7, 0x9f, 0x3d, 0x63,
-  0xec, 0xf9, 0x73, 0xce, 0x19, 0x43, 0xe4, 0xbc,
-  0xaf, 0x8f, 0x73, 0x45, 0xe1, 0xdc, 0x30, 0x62,
-  0x31, 0x42, 0x54, 0x55, 0xd7, 0xbb, 0xba, 0x10,
-  0x39, 0x4f, 0xa7, 0x57, 0x56, 0x10, 0xeb, 0xf5,
-  0xb9, 0xb9, 0xd9, 0x59, 0xc6, 0xe4, 0x75, 0xed,
-  0x15, 0xb6, 0xe5, 0xaf, 0x51, 0xff, 0x95, 0x6a,
-  0xef, 0xfd, 0x1a, 0xe1, 0x67, 0x7e, 0xb7, 0xce,
-  0xe6, 0x2b, 0xf4, 0xd7, 0xdb, 0x3f, 0xc6, 0xc6,
-  0x73, 0xce, 0xcc, 0x6b, 0x02, 0xd3, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
--- a/art/tango/edit_undo.h
+++ b/art/tango/edit_undo.h
@@ -1,287 +0,0 @@
-/* edit_undo.png - 650 bytes */
-static const unsigned char edit_undo_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd6, 0x07, 0x1a, 0x0a, 0x0e, 0x00, 0x16,
-  0x23, 0x96, 0x21, 0x00, 0x00, 0x02, 0x17, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0x4f,
-  0x68, 0x92, 0x61, 0x1c, 0xc7, 0xbf, 0xcf, 0xf3,
-  0xbe, 0xcf, 0xd4, 0xe5, 0xfe, 0xe8, 0xc6, 0x1a,
-  0xd2, 0x88, 0xd6, 0xc1, 0xf2, 0x10, 0x14, 0x84,
-  0x41, 0x83, 0x15, 0x04, 0x42, 0xb0, 0x43, 0x78,
-  0x08, 0x82, 0x62, 0x44, 0x50, 0x5d, 0x3b, 0x8c,
-  0x3c, 0x78, 0x28, 0xc7, 0x8c, 0x1d, 0x22, 0xba,
-  0x74, 0xa9, 0x58, 0x41, 0x10, 0x34, 0xe9, 0x50,
-  0x2c, 0x16, 0xc1, 0x52, 0x8c, 0x5a, 0x76, 0x8a,
-  0x94, 0xb4, 0x68, 0x0d, 0x72, 0x13, 0x5c, 0xbe,
-  0x3a, 0xe7, 0x86, 0xef, 0xeb, 0xf3, 0x3c, 0x1d,
-  0xc2, 0xa5, 0x9b, 0x96, 0x7d, 0x6f, 0xcf, 0x17,
-  0xbe, 0x9f, 0xe7, 0x79, 0x7e, 0xcf, 0xf7, 0x01,
-  0x9a, 0x28, 0x3a, 0x05, 0x89, 0x16, 0xa4, 0x6e,
-  0x35, 0xe6, 0xee, 0xa1, 0x97, 0x29, 0xc8, 0xa2,
-  0x45, 0xd1, 0xda, 0x85, 0xdf, 0xc7, 0x6c, 0x4c,
-  0x41, 0xd6, 0xed, 0x0d, 0xb5, 0x9a, 0xff, 0x73,
-  0x02, 0xbf, 0x8f, 0xd9, 0x3c, 0x4e, 0x23, 0xe7,
-  0xf6, 0x86, 0x80, 0xc2, 0xd5, 0xcd, 0x6b, 0xe8,
-  0xa4, 0x27, 0xc3, 0x05, 0xcd, 0x80, 0xb6, 0xc5,
-  0xc3, 0xc9, 0xec, 0xc5, 0xf1, 0x09, 0xbd, 0x54,
-  0x0b, 0x20, 0x5b, 0xc3, 0x46, 0x6e, 0x1c, 0x2a,
-  0xd5, 0x00, 0x8b, 0x17, 0x90, 0x15, 0x70, 0x2e,
-  0x01, 0x88, 0xf2, 0x9b, 0xd9, 0xc7, 0x5f, 0x19,
-  0x05, 0x79, 0x95, 0x28, 0x78, 0x02, 0x41, 0xe3,
-  0x47, 0x15, 0xa0, 0xf8, 0x7d, 0xac, 0xdd, 0xe3,
-  0x34, 0x56, 0xdd, 0xde, 0x10, 0x8c, 0x9f, 0xd7,
-  0x41, 0x28, 0x45, 0xb9, 0x0c, 0x80, 0x2f, 0x42,
-  0x5f, 0x4f, 0x41, 0x5b, 0x89, 0x41, 0xca, 0x92,
-  0x3a, 0xe8, 0x3a, 0xd1, 0x67, 0xb6, 0x28, 0xbd,
-  0x36, 0xe4, 0x4f, 0x0f, 0xec, 0xab, 0xbc, 0x8e,
-  0x44, 0xc5, 0x32, 0x00, 0x28, 0x13, 0x17, 0x84,
-  0x5e, 0x0d, 0x53, 0xaa, 0xfc, 0xa6, 0xaa, 0x0c,
-  0x52, 0x4a, 0x08, 0xc1, 0x21, 0x84, 0x80, 0xe0,
-  0x6b, 0x28, 0xaf, 0xa7, 0x60, 0xb2, 0x98, 0xc8,
-  0x8e, 0xae, 0x5d, 0x9d, 0x9d, 0x62, 0xed, 0xd0,
-  0xee, 0xfd, 0xfa, 0xa3, 0x48, 0x54, 0x18, 0xf4,
-  0x65, 0x92, 0xd9, 0xe7, 0x43, 0x5e, 0xb0, 0x8e,
-  0x93, 0x00, 0x00, 0xce, 0x75, 0x2c, 0x7c, 0xfb,
-  0x88, 0xc5, 0xef, 0x71, 0xa4, 0xd3, 0x5f, 0xea,
-  0x06, 0x56, 0xd4, 0xe2, 0xb0, 0xf7, 0xbb, 0x60,
-  0x6e, 0x67, 0x07, 0x86, 0x9d, 0xdd, 0xe1, 0xed,
-  0x33, 0x18, 0x19, 0xc3, 0x42, 0xe2, 0x26, 0xf6,
-  0xb8, 0xae, 0x40, 0xf0, 0x62, 0x5d, 0x58, 0x14,
-  0xef, 0x22, 0x93, 0x65, 0x28, 0xeb, 0x1c, 0x3d,
-  0x8e, 0x4b, 0xf8, 0xf4, 0x76, 0xba, 0x74, 0xfc,
-  0x6c, 0xda, 0xaa, 0x02, 0x40, 0x20, 0x68, 0x68,
-  0xf0, 0x31, 0x3b, 0x30, 0x99, 0x73, 0x8f, 0x8c,
-  0x01, 0x00, 0x62, 0x33, 0x77, 0xea, 0xdf, 0xcb,
-  0x42, 0xe0, 0x3a, 0x72, 0x19, 0x85, 0xcc, 0x03,
-  0x98, 0xcc, 0x3a, 0x08, 0x91, 0x6a, 0x5d, 0x0f,
-  0x02, 0x41, 0x43, 0x9b, 0x4d, 0x32, 0xfb, 0xfc,
-  0xb3, 0xc9, 0xcd, 0xcc, 0xd0, 0x28, 0xc8, 0xd0,
-  0x28, 0x08, 0x80, 0x83, 0xa5, 0xbc, 0x3c, 0x95,
-  0x98, 0xbb, 0xfd, 0xbe, 0x6f, 0xe0, 0x1c, 0xb8,
-  0xe8, 0x00, 0x91, 0xd2, 0x84, 0xbf, 0xd5, 0xb8,
-  0x51, 0x95, 0xc3, 0xf7, 0xe1, 0x78, 0x37, 0x4d,
-  0xe5, 0xea, 0xf2, 0x0d, 0x11, 0x79, 0x68, 0x93,
-  0xdb, 0x9a, 0x58, 0xbb, 0x73, 0x23, 0x7f, 0xf8,
-  0x3c, 0x96, 0x14, 0x61, 0x95, 0x1b, 0xc5, 0x38,
-  0x84, 0x6a, 0xcf, 0x37, 0x05, 0x34, 0x83, 0x44,
-  0xa7, 0x30, 0xd8, 0xed, 0x38, 0x2c, 0xb4, 0xec,
-  0x12, 0x00, 0xdc, 0x6a, 0xf8, 0x99, 0xfe, 0xa1,
-  0xa3, 0x5d, 0x3b, 0xf7, 0xce, 0x7c, 0x8e, 0x3d,
-  0xa9, 0x1c, 0x3b, 0xa3, 0x5d, 0xfb, 0x6f, 0x80,
-  0x6c, 0xeb, 0xb7, 0xa6, 0x3e, 0x3c, 0x7f, 0x41,
-  0x75, 0xed, 0x69, 0xd5, 0xfb, 0x05, 0x05, 0x16,
-  0xe2, 0x25, 0x2b, 0xbe, 0x24, 0x14, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
-
-
-/* edit_undo.png - 1586 bytes */
-static const unsigned char edit_undo_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
-  0xbd, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xe5,
-  0x97, 0x4b, 0x68, 0x13, 0x5d, 0x18, 0x86, 0xdf,
-  0x33, 0x97, 0x4c, 0xe2, 0x34, 0x69, 0x53, 0x13,
-  0x9b, 0x34, 0xf6, 0x6a, 0xac, 0xf5, 0xb6, 0xd0,
-  0x8d, 0x88, 0x56, 0xb0, 0x8a, 0x8a, 0x22, 0x16,
-  0x75, 0x53, 0x91, 0x22, 0x52, 0xa1, 0xab, 0x2e,
-  0x15, 0x37, 0x0a, 0xe2, 0x65, 0x29, 0x2a, 0xba,
-  0x50, 0x90, 0xd2, 0x8d, 0xa5, 0x22, 0x28, 0x8a,
-  0x20, 0xda, 0x68, 0x6b, 0xb5, 0x76, 0xd1, 0x6a,
-  0xa5, 0x82, 0x56, 0xeb, 0x25, 0xbd, 0x25, 0xd6,
-  0xa4, 0x21, 0xd7, 0x49, 0xe6, 0xf6, 0x2f, 0xe6,
-  0x1f, 0x42, 0x52, 0x63, 0x6a, 0x15, 0x85, 0xff,
-  0x3f, 0x9b, 0x97, 0x99, 0x9c, 0x73, 0xe6, 0x7d,
-  0xbe, 0xf3, 0x7d, 0xe7, 0x9c, 0x00, 0xff, 0xf7,
-  0xd6, 0xd5, 0xd5, 0xd1, 0x51, 0x5d, 0xdd, 0xdc,
-  0xdc, 0xdb, 0xdb, 0xd6, 0x06, 0xa8, 0xea, 0x9f,
-  0xfe, 0x3e, 0x35, 0xdf, 0x81, 0xb7, 0x6f, 0x5f,
-  0xbf, 0x5e, 0x56, 0xb6, 0x79, 0x33, 0xc7, 0x09,
-  0xc2, 0xc7, 0x8f, 0xd7, 0xae, 0xfd, 0x69, 0xe3,
-  0xf3, 0x06, 0xd0, 0x8d, 0xdb, 0x6c, 0x14, 0x35,
-  0x36, 0xe6, 0xf1, 0xac, 0x5b, 0xb7, 0x63, 0xc7,
-  0xf6, 0xed, 0x7f, 0xcb, 0xfe, 0x4f, 0x00, 0xcc,
-  0x36, 0xbe, 0x75, 0xeb, 0xd2, 0xa5, 0x00, 0x20,
-  0xcb, 0xe3, 0xe3, 0x7f, 0x0f, 0x80, 0x99, 0xaf,
-  0x71, 0x51, 0x54, 0xd5, 0x8a, 0x0a, 0x80, 0x65,
-  0x19, 0x66, 0xc1, 0x02, 0xad, 0xef, 0x9b, 0x37,
-  0x80, 0x5e, 0x0b, 0xc9, 0xa4, 0x28, 0x02, 0x43,
-  0x43, 0x82, 0x20, 0x8a, 0xc0, 0xcb, 0x97, 0xc9,
-  0xa4, 0xa2, 0x10, 0xd2, 0xd9, 0x39, 0x38, 0x38,
-  0x39, 0xc9, 0xb2, 0x3d, 0x3d, 0xa7, 0x4f, 0x9f,
-  0x3d, 0x9b, 0x4a, 0xc5, 0x62, 0xbf, 0x0a, 0x40,
-  0xff, 0xac, 0x71, 0x55, 0x95, 0xa4, 0x2f, 0x5f,
-  0x00, 0xc0, 0x60, 0x58, 0xbb, 0x16, 0x20, 0x84,
-  0x10, 0x49, 0x02, 0x4a, 0x4b, 0x2b, 0x2b, 0x79,
-  0x1e, 0x70, 0xb9, 0xaa, 0xab, 0x5d, 0x2e, 0xc0,
-  0x6e, 0x77, 0xb9, 0x9c, 0x4e, 0x87, 0xa3, 0xa8,
-  0xc8, 0x62, 0xa1, 0xe9, 0x68, 0x34, 0x14, 0x0a,
-  0x04, 0xc2, 0xe1, 0x25, 0x4b, 0x56, 0xac, 0x58,
-  0xb4, 0x48, 0x96, 0xf7, 0xee, 0x75, 0xb9, 0x96,
-  0x2f, 0x67, 0xd9, 0xe7, 0xcf, 0x7b, 0x7a, 0x7a,
-  0x7b, 0x15, 0x25, 0x1c, 0xfe, 0x6d, 0x00, 0xf7,
-  0xef, 0xb7, 0xb7, 0x57, 0x54, 0x6c, 0xd8, 0x60,
-  0xb5, 0x02, 0x5e, 0x6f, 0x77, 0xb7, 0x6e, 0x3c,
-  0x91, 0x10, 0xc5, 0xea, 0x6a, 0x80, 0xa2, 0x8c,
-  0xc6, 0x35, 0x6b, 0xd2, 0xfd, 0x55, 0x15, 0x60,
-  0x59, 0x00, 0xa0, 0x28, 0xa7, 0x53, 0x53, 0x9b,
-  0x0d, 0x60, 0x18, 0x8e, 0x2b, 0x2d, 0x05, 0x78,
-  0xbe, 0xa0, 0x40, 0x51, 0xca, 0xcb, 0x2b, 0x2b,
-  0x6b, 0x6a, 0x96, 0x2d, 0x5b, 0xb9, 0x92, 0x65,
-  0x39, 0x4e, 0x92, 0x6a, 0x6b, 0x6d, 0x36, 0x55,
-  0x9d, 0x99, 0xd9, 0xb4, 0x49, 0x03, 0x19, 0x18,
-  0xd0, 0x40, 0xa6, 0xa6, 0xe6, 0x0d, 0xd0, 0xd5,
-  0x75, 0xe3, 0xc6, 0x92, 0x25, 0x4d, 0x4d, 0x3c,
-  0x2f, 0x49, 0x9f, 0x3e, 0xdd, 0xbd, 0xab, 0x1b,
-  0x8f, 0xc7, 0x45, 0xb1, 0xa2, 0x02, 0xa0, 0x28,
-  0x42, 0x18, 0x06, 0xa0, 0x69, 0x86, 0xe1, 0xb8,
-  0xef, 0x4f, 0x26, 0xcb, 0x80, 0x28, 0xa6, 0x52,
-  0x91, 0x08, 0x90, 0x4c, 0x26, 0x12, 0x7e, 0x3f,
-  0x30, 0x36, 0xe6, 0xf5, 0xf6, 0xf5, 0x69, 0xa0,
-  0x46, 0x23, 0xc0, 0xf3, 0x16, 0x8b, 0xc5, 0x42,
-  0x88, 0xc5, 0x62, 0xb7, 0x97, 0x97, 0xbb, 0x5c,
-  0x46, 0x63, 0x2c, 0xe6, 0xf5, 0xca, 0x72, 0x65,
-  0xe5, 0xaa, 0x55, 0x2c, 0xfb, 0xe4, 0x89, 0x06,
-  0x22, 0x8a, 0x73, 0x05, 0x20, 0xd9, 0x2f, 0xee,
-  0xdc, 0xd1, 0x52, 0x67, 0xe1, 0xc2, 0xcc, 0xd4,
-  0x11, 0x04, 0x49, 0x72, 0xbb, 0xb5, 0x3e, 0xda,
-  0xf4, 0x84, 0x18, 0x8d, 0x40, 0x3c, 0x1e, 0x8d,
-  0x4e, 0x4e, 0x02, 0x81, 0xc0, 0xf4, 0xf4, 0xeb,
-  0xd7, 0xf9, 0x3f, 0xc8, 0x30, 0x0c, 0x03, 0x00,
-  0x25, 0x25, 0x8b, 0x17, 0x6f, 0xdb, 0x06, 0x0c,
-  0x0e, 0x3e, 0x7b, 0xf6, 0xe2, 0xc5, 0xab, 0x57,
-  0x89, 0x44, 0x24, 0x12, 0x0c, 0xf6, 0xf7, 0xef,
-  0xdc, 0xd9, 0xd2, 0x02, 0xb4, 0xb4, 0xcc, 0x1b,
-  0x40, 0x6f, 0xb9, 0x6a, 0xc0, 0xef, 0xff, 0xfa,
-  0x35, 0x95, 0x02, 0xc2, 0xe1, 0x70, 0x78, 0x62,
-  0x02, 0x58, 0xba, 0xd4, 0xed, 0xae, 0xaa, 0x02,
-  0x00, 0x9a, 0x76, 0x38, 0xd2, 0xe3, 0x05, 0x41,
-  0x10, 0x12, 0x09, 0x20, 0x16, 0x8b, 0x46, 0x7d,
-  0x3e, 0x40, 0x10, 0xa2, 0xd1, 0x60, 0x10, 0x20,
-  0x84, 0x61, 0x08, 0x01, 0x0c, 0x06, 0x93, 0xa9,
-  0xac, 0x0c, 0x48, 0x26, 0x45, 0xb1, 0xb6, 0x16,
-  0x18, 0x1d, 0x1d, 0x18, 0xb8, 0x7d, 0x7b, 0x78,
-  0x78, 0xcb, 0x96, 0xe6, 0x66, 0x60, 0xf5, 0xea,
-  0xb9, 0x02, 0xe4, 0xdc, 0x85, 0x1a, 0x1a, 0x0e,
-  0x1f, 0x1e, 0x1b, 0x7b, 0xfc, 0x58, 0x03, 0xa9,
-  0xaf, 0xef, 0xeb, 0xf3, 0x78, 0xa6, 0xa6, 0x3c,
-  0x9e, 0xf5, 0xeb, 0xeb, 0xeb, 0x9d, 0x4e, 0x20,
-  0x1e, 0xcf, 0xdc, 0x41, 0xfa, 0xfb, 0x1f, 0x3c,
-  0x78, 0xfa, 0x74, 0xf6, 0x3c, 0xe1, 0xb0, 0xaa,
-  0x16, 0x14, 0x00, 0x0e, 0x87, 0xd3, 0x59, 0x5e,
-  0xae, 0xaa, 0x85, 0x85, 0x45, 0x45, 0x13, 0x13,
-  0x84, 0x00, 0xc9, 0x64, 0x38, 0xac, 0xd5, 0x88,
-  0x24, 0x01, 0x80, 0xc1, 0x60, 0xb7, 0x57, 0x56,
-  0x02, 0xc0, 0xf4, 0xf4, 0x5c, 0xed, 0xcf, 0xe1,
-  0x1c, 0xd0, 0x41, 0x82, 0x41, 0x49, 0xb2, 0x5a,
-  0xeb, 0xeb, 0xfb, 0xfb, 0x1f, 0x3d, 0x7a, 0xff,
-  0x1e, 0xa8, 0xaa, 0xaa, 0xaa, 0xd2, 0x22, 0x9f,
-  0xd9, 0x36, 0x6e, 0x3c, 0x74, 0x08, 0x20, 0x44,
-  0xd7, 0x60, 0x30, 0x12, 0x31, 0x1a, 0x1b, 0x1b,
-  0x43, 0xa1, 0x40, 0xe0, 0xdb, 0xb7, 0xe9, 0xe9,
-  0x44, 0x22, 0x16, 0x2b, 0x29, 0x51, 0x55, 0x59,
-  0x96, 0x24, 0x59, 0xd6, 0x6a, 0x43, 0x14, 0x01,
-  0x51, 0x54, 0x14, 0x9a, 0x2e, 0x28, 0x90, 0x24,
-  0xbf, 0x7f, 0xcf, 0x1e, 0xa7, 0x53, 0xd7, 0x5f,
-  0x06, 0xc8, 0x04, 0x79, 0xf2, 0x64, 0x7c, 0x3c,
-  0x91, 0x70, 0x3a, 0x77, 0xed, 0xd2, 0x41, 0x00,
-  0x86, 0xa9, 0xae, 0x9e, 0x35, 0x2d, 0xa5, 0xeb,
-  0xc1, 0x83, 0xad, 0xad, 0xdf, 0xbe, 0x75, 0x76,
-  0xfa, 0x7c, 0xc1, 0x20, 0x21, 0x47, 0x8e, 0x4c,
-  0x4c, 0x4c, 0x4c, 0x84, 0x42, 0x00, 0xc7, 0x99,
-  0x4c, 0x85, 0x85, 0xaa, 0x2a, 0x49, 0xa2, 0x18,
-  0x08, 0xa8, 0xaa, 0xa2, 0xc8, 0xb2, 0x20, 0x00,
-  0x92, 0xa4, 0x28, 0x46, 0x63, 0x5a, 0x7f, 0x53,
-  0xd3, 0x0d, 0xd1, 0xff, 0xee, 0x5a, 0x2c, 0xdb,
-  0xde, 0x7e, 0xf1, 0xa2, 0xc3, 0xb1, 0x7b, 0xb7,
-  0x7e, 0x70, 0x65, 0x5e, 0xe6, 0x0c, 0x86, 0xef,
-  0x2b, 0xcb, 0x3e, 0x7c, 0xd8, 0xd6, 0x66, 0xb5,
-  0x86, 0x42, 0x81, 0xc0, 0xbb, 0x77, 0xab, 0x56,
-  0xc9, 0xf2, 0x87, 0x0f, 0xfd, 0xfd, 0x0e, 0x87,
-  0x24, 0xdd, 0xbf, 0x7f, 0xf5, 0xaa, 0xd9, 0xac,
-  0x8f, 0x27, 0x64, 0x2e, 0xae, 0x7e, 0xb0, 0x02,
-  0xfa, 0x04, 0xe9, 0x48, 0x6a, 0xca, 0x30, 0xba,
-  0xa1, 0xa6, 0xa6, 0xd6, 0x56, 0x9f, 0xcf, 0xe3,
-  0x19, 0x1e, 0xf6, 0xfb, 0x4b, 0x4a, 0xf6, 0xed,
-  0xcb, 0x1c, 0x9f, 0x0b, 0x80, 0xe3, 0x68, 0x9a,
-  0x10, 0x55, 0x05, 0x28, 0x8a, 0xa2, 0x58, 0x36,
-  0x95, 0x0a, 0x87, 0x23, 0x91, 0x05, 0x0b, 0x52,
-  0x29, 0x59, 0x96, 0xe5, 0x64, 0x52, 0x3f, 0x07,
-  0xf4, 0x40, 0x51, 0x79, 0x33, 0x24, 0x47, 0x11,
-  0x67, 0x03, 0x68, 0x47, 0x55, 0x7a, 0x62, 0x1d,
-  0x84, 0xa2, 0x5a, 0x5a, 0x8e, 0x1d, 0xf3, 0xfb,
-  0xbb, 0xbb, 0xb5, 0x67, 0x9b, 0x4d, 0x53, 0x7d,
-  0xf1, 0x67, 0x47, 0x32, 0x91, 0x50, 0x14, 0x8e,
-  0xf3, 0xf9, 0x08, 0x61, 0x18, 0x9e, 0x77, 0x3a,
-  0x23, 0x91, 0x40, 0xe0, 0xed, 0x5b, 0x8a, 0x12,
-  0x45, 0x49, 0x22, 0x44, 0x3b, 0xe3, 0xd3, 0xc0,
-  0x5a, 0x79, 0xa7, 0x55, 0x51, 0xf2, 0x00, 0xe8,
-  0x1f, 0xcc, 0xb7, 0x02, 0xba, 0x66, 0x47, 0x2a,
-  0xfb, 0x7d, 0x7a, 0xbe, 0x6b, 0xd7, 0x4e, 0x9f,
-  0x2e, 0x2c, 0x6c, 0x68, 0x30, 0x9b, 0xcd, 0x66,
-  0x42, 0x1c, 0x8e, 0x54, 0x4a, 0x92, 0x58, 0x76,
-  0x72, 0x72, 0x7c, 0x7c, 0x6a, 0x4a, 0x51, 0xec,
-  0xf6, 0x58, 0x2c, 0x14, 0x4a, 0x26, 0x3b, 0x3a,
-  0xb4, 0xfe, 0xfa, 0xed, 0x2a, 0x91, 0xc8, 0x34,
-  0xae, 0xa7, 0x58, 0xfa, 0x7f, 0x47, 0x9e, 0xcb,
-  0x5c, 0x36, 0x50, 0x2e, 0x30, 0x7d, 0x85, 0xb2,
-  0x57, 0x8a, 0xa6, 0xcd, 0x66, 0xb3, 0x19, 0x60,
-  0x18, 0xb7, 0xbb, 0xa6, 0x86, 0xe7, 0x8f, 0x1f,
-  0xaf, 0xaa, 0x72, 0xbb, 0xe3, 0x71, 0x9f, 0xef,
-  0xd6, 0xad, 0x9b, 0x37, 0xbb, 0xbb, 0x59, 0xf6,
-  0xeb, 0x57, 0xbf, 0x5f, 0x55, 0xcf, 0x9c, 0x39,
-  0x79, 0xf2, 0xc2, 0x05, 0xe0, 0xde, 0x3d, 0x6d,
-  0x9c, 0x7e, 0xd6, 0xeb, 0x27, 0xb2, 0xae, 0xd9,
-  0x20, 0x39, 0x2f, 0x73, 0xb9, 0x0c, 0xd3, 0x79,
-  0xfa, 0xa7, 0x23, 0xef, 0x76, 0xbb, 0xdd, 0x14,
-  0xc5, 0xf3, 0xed, 0xed, 0xe7, 0xcf, 0x5b, 0xad,
-  0x97, 0x2f, 0x5b, 0xad, 0x45, 0x45, 0x82, 0x10,
-  0x89, 0x78, 0x3c, 0xdd, 0xdd, 0xd1, 0xa8, 0x2c,
-  0x4f, 0x4e, 0x7e, 0xf9, 0xa2, 0x28, 0x27, 0x4e,
-  0x9c, 0x3a, 0x75, 0xe5, 0x0a, 0xd0, 0xd3, 0x93,
-  0x99, 0x2a, 0xd9, 0xc6, 0xb3, 0x53, 0x28, 0x0d,
-  0x40, 0x7e, 0x6c, 0x28, 0x57, 0x6a, 0xa4, 0x9f,
-  0x59, 0x96, 0x65, 0x01, 0x86, 0xa9, 0xab, 0xdb,
-  0xb0, 0x81, 0xe3, 0xac, 0xd6, 0xba, 0xba, 0x35,
-  0x6b, 0x68, 0xda, 0xe9, 0xb4, 0x58, 0x78, 0x5e,
-  0x51, 0x8a, 0x8b, 0x8d, 0x46, 0x8e, 0x93, 0xe5,
-  0xe5, 0xcb, 0x63, 0xb1, 0x78, 0x5c, 0x92, 0x28,
-  0xea, 0xe8, 0xd1, 0x73, 0xe7, 0x54, 0xb5, 0xad,
-  0x2d, 0xd3, 0x88, 0x2c, 0x67, 0x6a, 0x2a, 0x95,
-  0xa9, 0x3a, 0x80, 0xfe, 0x7b, 0xba, 0x16, 0x72,
-  0xd4, 0x00, 0x70, 0xe0, 0x40, 0x63, 0xa3, 0xc1,
-  0x40, 0x88, 0xc9, 0x64, 0x32, 0xa9, 0xaa, 0xc1,
-  0x20, 0x08, 0x82, 0xc0, 0x30, 0x84, 0x8c, 0x8c,
-  0x8c, 0x8c, 0x28, 0x8a, 0xa2, 0xc8, 0xb2, 0x2c,
-  0x2b, 0x0a, 0x21, 0x9a, 0x09, 0x59, 0xde, 0xbf,
-  0xbf, 0xae, 0x4e, 0x14, 0x79, 0xbe, 0xb8, 0xb8,
-  0xb8, 0x58, 0x51, 0xec, 0xf6, 0xd1, 0x51, 0xaf,
-  0x57, 0x14, 0xbd, 0xde, 0xcf, 0x9f, 0x47, 0x47,
-  0x81, 0xa1, 0xa1, 0x4b, 0x97, 0x6e, 0xdc, 0x00,
-  0x66, 0x66, 0xb2, 0x23, 0x98, 0x69, 0x48, 0xd7,
-  0x6c, 0xa0, 0xd9, 0x91, 0xcf, 0xb3, 0x02, 0xf9,
-  0x52, 0x2a, 0x57, 0x8a, 0x65, 0xef, 0x3a, 0xf9,
-  0x9e, 0xb3, 0x8b, 0x52, 0xd7, 0x6c, 0xa0, 0xd9,
-  0xc5, 0xfb, 0x9f, 0x69, 0xff, 0x00, 0xcd, 0x22,
-  0xea, 0x2d, 0xd8, 0x5b, 0x2a, 0x93, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
--- a/art/tango/folder.h
+++ b/art/tango/folder.h
@@ -1,197 +0,0 @@
-/* folder.png - 498 bytes */
-static const unsigned char folder_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0b, 0x0a, 0x12, 0x39, 0x0d, 0xf9,
-  0xdd, 0x70, 0x50, 0x00, 0x00, 0x01, 0x7f, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x91, 0x4d,
-  0x88, 0x52, 0x51, 0x18, 0x86, 0x9f, 0x63, 0x2a,
-  0xfe, 0x40, 0xa6, 0x8b, 0x10, 0x5a, 0x04, 0x41,
-  0xb4, 0x0e, 0x82, 0x99, 0x20, 0x9a, 0xe5, 0x2c,
-  0xe3, 0x62, 0x11, 0xb4, 0xa9, 0x88, 0x20, 0x88,
-  0xfe, 0x98, 0xdd, 0x6c, 0x66, 0xb6, 0xb3, 0x08,
-  0xa2, 0x5d, 0x50, 0x33, 0xce, 0x2a, 0x44, 0xa4,
-  0x65, 0x49, 0x50, 0xb6, 0x6c, 0x17, 0x18, 0x46,
-  0x9b, 0x88, 0x22, 0x28, 0x05, 0x0b, 0xb1, 0x7b,
-  0x8f, 0x47, 0xcf, 0xfd, 0x66, 0x71, 0xed, 0x0a,
-  0xe2, 0x05, 0xcd, 0x97, 0x0f, 0x0e, 0x9c, 0xc3,
-  0xf7, 0xbc, 0x2f, 0xef, 0x51, 0x97, 0x2e, 0x97,
-  0xb6, 0x8a, 0xc5, 0xe2, 0x36, 0x53, 0x32, 0xc6,
-  0x04, 0xe7, 0xc0, 0xdc, 0xda, 0xdb, 0xdd, 0x7f,
-  0x42, 0x84, 0xd4, 0x9d, 0x7b, 0xb7, 0xe5, 0xfa,
-  0xd5, 0x1b, 0x33, 0x1f, 0xb5, 0xf6, 0x78, 0xb6,
-  0xf7, 0x94, 0x5e, 0xaf, 0x77, 0xa5, 0x5a, 0xa9,
-  0x3d, 0x8f, 0x04, 0x94, 0x9c, 0x8b, 0xb4, 0x3e,
-  0xb5, 0xa2, 0x4c, 0x78, 0xdb, 0x78, 0x33, 0x7d,
-  0xf5, 0xa8, 0x5a, 0xa9, 0x3d, 0x00, 0x88, 0x03,
-  0xa4, 0xd3, 0x19, 0x8e, 0xe4, 0xf2, 0x91, 0x00,
-  0xe7, 0x42, 0x29, 0x70, 0x53, 0x0a, 0xa5, 0x14,
-  0xb5, 0x17, 0xd5, 0xfb, 0x40, 0x00, 0x30, 0xc6,
-  0xe0, 0x79, 0x2e, 0xaf, 0x3f, 0xf6, 0x69, 0x76,
-  0x32, 0xcc, 0xa5, 0xc3, 0x0e, 0x67, 0x6e, 0x3a,
-  0x52, 0x48, 0xe9, 0xcf, 0x61, 0x82, 0x66, 0x27,
-  0xc3, 0xe3, 0x8d, 0x75, 0xb4, 0xb1, 0x73, 0x31,
-  0x52, 0xc9, 0x43, 0xdc, 0x7d, 0x58, 0x3f, 0x15,
-  0x07, 0xf0, 0x3c, 0x17, 0x80, 0x9f, 0xbf, 0x35,
-  0x5f, 0xda, 0x7f, 0xe7, 0x02, 0x9c, 0x38, 0x9a,
-  0x05, 0x20, 0xa6, 0xb5, 0x26, 0x9d, 0x9e, 0x33,
-  0xfa, 0x0c, 0xc5, 0x5c, 0xd7, 0x0d, 0x13, 0xfc,
-  0x17, 0xe0, 0x5f, 0x07, 0x4b, 0x01, 0x16, 0x4d,
-  0x60, 0xad, 0x8f, 0x1e, 0x06, 0x65, 0x87, 0xbf,
-  0x90, 0x88, 0xf9, 0x08, 0x20, 0x22, 0x28, 0xa5,
-  0x10, 0x11, 0x44, 0xc0, 0x17, 0xc1, 0x5a, 0x61,
-  0x68, 0x7d, 0xcc, 0x48, 0x18, 0x8c, 0x2c, 0x43,
-  0x2b, 0xe4, 0xb2, 0xc9, 0x09, 0xc0, 0xf3, 0x5c,
-  0x8e, 0xe7, 0x06, 0x74, 0xfb, 0x86, 0x1f, 0x5d,
-  0x0f, 0x44, 0xe1, 0x23, 0x8c, 0x07, 0x11, 0x10,
-  0x04, 0x91, 0x31, 0x18, 0x18, 0x59, 0x99, 0x00,
-  0x7e, 0x75, 0xda, 0x9c, 0x3e, 0x7b, 0x8e, 0x0f,
-  0x5f, 0xff, 0x8c, 0x97, 0x02, 0x77, 0x11, 0xf0,
-  0x11, 0x04, 0x05, 0x22, 0x61, 0xaa, 0x95, 0x93,
-  0x05, 0xea, 0x2f, 0x5f, 0x91, 0xd7, 0xdf, 0xcb,
-  0xea, 0xfc, 0xb5, 0x9d, 0x86, 0x9b, 0x38, 0xb6,
-  0xb6, 0x68, 0x79, 0xd9, 0xe1, 0xb7, 0xf7, 0xef,
-  0xca, 0x9b, 0xab, 0x2c, 0xab, 0x03, 0xc2, 0x87,
-  0xb4, 0xca, 0xa7, 0xb0, 0xe2, 0xf8, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
-
-
-/* folder.png - 1019 bytes */
-static const unsigned char folder_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x03,
-  0x86, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0xcd, 0x4b, 0x1b, 0x41, 0x14, 0x7f, 0x3b,
-  0x9b, 0x68, 0x22, 0x46, 0x8a, 0x8a, 0xa0, 0x05,
-  0x7b, 0x4f, 0xed, 0xc9, 0x42, 0xb1, 0x20, 0xfa,
-  0x67, 0xf4, 0xaa, 0x12, 0x24, 0x88, 0x44, 0x2f,
-  0xbd, 0xb4, 0x16, 0x0a, 0x3d, 0xb5, 0xb4, 0x9e,
-  0x64, 0xb5, 0x22, 0x08, 0x8a, 0xf8, 0x41, 0xcf,
-  0xde, 0x5a, 0x0f, 0x82, 0xa0, 0xf8, 0x95, 0x48,
-  0x89, 0xf1, 0xd0, 0x43, 0x5b, 0x13, 0x4d, 0x4d,
-  0x4c, 0x36, 0xd9, 0xec, 0xe7, 0x4c, 0x0f, 0xeb,
-  0xeb, 0x26, 0x9b, 0x6c, 0x35, 0xb4, 0xa8, 0x07,
-  0x7f, 0x97, 0x37, 0xef, 0xcd, 0xce, 0xcc, 0xfb,
-  0xbd, 0xdf, 0xce, 0xbe, 0x04, 0xe0, 0x0e, 0x77,
-  0xf8, 0x27, 0x70, 0xf6, 0xc0, 0xc8, 0xc8, 0xe8,
-  0x68, 0x28, 0xf4, 0xfa, 0xb5, 0x61, 0x50, 0xaa,
-  0xeb, 0xaf, 0x5e, 0x5d, 0xb6, 0x81, 0xaa, 0xaa,
-  0xaa, 0xaa, 0x5a, 0x3e, 0xa5, 0x86, 0x41, 0xe9,
-  0xb3, 0x67, 0xd3, 0xd3, 0x1f, 0x3f, 0xce, 0xcc,
-  0x2c, 0x2d, 0x5d, 0x3b, 0x81, 0xe1, 0xe1, 0x50,
-  0x68, 0x68, 0x88, 0xb1, 0x81, 0x81, 0xbe, 0xbe,
-  0x40, 0xa0, 0xfa, 0x0d, 0x05, 0x61, 0x6a, 0x6a,
-  0x62, 0x02, 0x20, 0x95, 0x4a, 0xa5, 0x52, 0xa9,
-  0xc7, 0x8f, 0x57, 0x56, 0x96, 0x96, 0x3e, 0x7d,
-  0xda, 0xde, 0xbe, 0x76, 0x02, 0x5d, 0x5d, 0x4f,
-  0x9e, 0x3c, 0x7d, 0x0a, 0x90, 0x48, 0x24, 0x12,
-  0x89, 0x44, 0xf5, 0x1b, 0xef, 0xee, 0xee, 0xef,
-  0xef, 0xec, 0x00, 0x68, 0x9a, 0xa6, 0x69, 0x1a,
-  0x00, 0x63, 0x8c, 0x31, 0x56, 0x6e, 0x11, 0x4d,
-  0x4d, 0x8d, 0x8d, 0xcd, 0xcd, 0xcf, 0x9f, 0x4f,
-  0x4e, 0x0a, 0xc2, 0xd4, 0xd4, 0xbb, 0x77, 0x57,
-  0x3d, 0xc7, 0xe5, 0x34, 0xe1, 0xf7, 0xfb, 0xfd,
-  0x0f, 0x1f, 0x02, 0x10, 0x42, 0x08, 0xcf, 0x57,
-  0x4f, 0xa0, 0xad, 0xad, 0xad, 0xed, 0xfe, 0x7d,
-  0xe7, 0x79, 0x42, 0x08, 0x21, 0x04, 0x80, 0xe7,
-  0x79, 0x9e, 0xe7, 0x01, 0x16, 0x17, 0x97, 0x97,
-  0x17, 0x16, 0xde, 0xbe, 0x0d, 0x06, 0x83, 0xc1,
-  0x60, 0x70, 0x72, 0x52, 0x10, 0x04, 0x41, 0x10,
-  0x44, 0xb1, 0x6a, 0x05, 0x06, 0x07, 0x83, 0xc1,
-  0x40, 0x80, 0xb1, 0x9e, 0x9e, 0xee, 0xee, 0xde,
-  0x5e, 0x80, 0xcf, 0x9f, 0x63, 0x31, 0xc6, 0x00,
-  0xf6, 0xf6, 0x7e, 0xfe, 0xac, 0x9e, 0xc6, 0xff,
-  0x83, 0xdb, 0xad, 0x69, 0x67, 0x67, 0x6f, 0xde,
-  0x6c, 0x6c, 0xcc, 0xce, 0x86, 0x42, 0x63, 0x63,
-  0x18, 0x77, 0x54, 0xa0, 0xa3, 0xa3, 0xa3, 0xe3,
-  0xd1, 0x23, 0x80, 0x0f, 0x1f, 0xbe, 0x7c, 0x09,
-  0x87, 0x01, 0x5e, 0xbc, 0xe8, 0xef, 0xef, 0xe9,
-  0x01, 0x90, 0x65, 0x4d, 0x33, 0x8c, 0xeb, 0x27,
-  0xf0, 0xfe, 0xfd, 0xdc, 0xdc, 0xfa, 0xfa, 0xcb,
-  0x97, 0xa6, 0x77, 0x05, 0x02, 0x07, 0x07, 0x07,
-  0x07, 0x91, 0x88, 0xe5, 0xa7, 0xd3, 0xf9, 0xbc,
-  0xaa, 0x02, 0x24, 0x93, 0xd9, 0xac, 0xa2, 0x5c,
-  0x5f, 0xe2, 0xed, 0xed, 0xcd, 0xcd, 0x75, 0x75,
-  0xce, 0xf3, 0xc4, 0x1e, 0x90, 0x65, 0x59, 0x96,
-  0x65, 0x4b, 0x81, 0x9b, 0x46, 0xa1, 0xa0, 0xaa,
-  0x7f, 0x53, 0x9c, 0x38, 0x4d, 0xd8, 0x15, 0xb8,
-  0xad, 0x28, 0x23, 0x20, 0x49, 0x92, 0x24, 0x49,
-  0xb7, 0x49, 0x81, 0x42, 0xa1, 0x50, 0x40, 0xef,
-  0xe8, 0xe8, 0x52, 0x02, 0x88, 0xdb, 0xa2, 0x40,
-  0x26, 0x93, 0xc9, 0x64, 0x32, 0x00, 0x84, 0xe8,
-  0x7a, 0x36, 0x9b, 0xcb, 0x5d, 0x99, 0x80, 0x5d,
-  0x01, 0xaf, 0xb7, 0xa6, 0xa6, 0x52, 0x3f, 0xc0,
-  0x66, 0x54, 0xdc, 0xa0, 0x00, 0x00, 0x28, 0x35,
-  0x47, 0x94, 0x52, 0x6a, 0xfa, 0x94, 0xa2, 0xcf,
-  0x18, 0x80, 0x61, 0x94, 0x5a, 0x5d, 0xaf, 0x6c,
-  0x25, 0x49, 0x96, 0x15, 0x05, 0x80, 0x10, 0xc6,
-  0x0c, 0x23, 0x16, 0xb3, 0x9f, 0x6f, 0xfb, 0x0a,
-  0x71, 0x7f, 0xfa, 0x82, 0x5d, 0x01, 0x5d, 0x37,
-  0x0c, 0x4a, 0x01, 0x14, 0x45, 0xd7, 0xcd, 0x94,
-  0xcc, 0x44, 0x8b, 0x09, 0xe0, 0x0e, 0x26, 0x11,
-  0xdc, 0xcb, 0xea, 0xb8, 0x66, 0x1c, 0x4f, 0xc1,
-  0x28, 0xc7, 0xe1, 0x4e, 0xd6, 0x5a, 0x80, 0xfa,
-  0x7a, 0x8f, 0xc7, 0xe5, 0x02, 0x38, 0x3d, 0x4d,
-  0xa7, 0xd3, 0x69, 0x4d, 0x23, 0xc4, 0x30, 0x24,
-  0x29, 0x9f, 0xbf, 0xa8, 0xfb, 0x45, 0xe1, 0x29,
-  0x75, 0x24, 0x80, 0x0a, 0x74, 0x76, 0x46, 0xa3,
-  0x9b, 0x9b, 0x00, 0x84, 0xf0, 0x3c, 0x21, 0x00,
-  0x8a, 0xa2, 0x69, 0x94, 0x16, 0xa7, 0x65, 0x25,
-  0x5a, 0x9c, 0xd6, 0x65, 0x09, 0x16, 0x13, 0xaa,
-  0xa4, 0x69, 0x63, 0xa3, 0xcf, 0x47, 0x08, 0xc0,
-  0xc9, 0xc9, 0xaf, 0x5f, 0xd9, 0x2c, 0xc7, 0x11,
-  0x22, 0xcb, 0xc9, 0xe4, 0xda, 0xda, 0x45, 0xdd,
-  0x2f, 0xf2, 0x56, 0x55, 0x1b, 0x01, 0xb7, 0x1b,
-  0x47, 0x91, 0xc8, 0xd7, 0xaf, 0xd1, 0x28, 0x40,
-  0x43, 0xc3, 0xbd, 0x7b, 0x2d, 0x2d, 0x00, 0x89,
-  0xc4, 0xf9, 0xb9, 0xa2, 0x00, 0xc8, 0x72, 0xa9,
-  0x02, 0xf6, 0x74, 0xcb, 0x89, 0x38, 0x8d, 0xad,
-  0x51, 0x71, 0x09, 0x7c, 0x3e, 0xaf, 0xd7, 0xe5,
-  0xb2, 0x0a, 0x95, 0x4c, 0x9e, 0x9f, 0x8b, 0xa2,
-  0x61, 0xb8, 0x5c, 0x67, 0x67, 0x5b, 0x5b, 0xb8,
-  0xa2, 0xa6, 0xc6, 0x81, 0x80, 0xd5, 0x32, 0x3c,
-  0x9e, 0xd6, 0x56, 0xbf, 0x1f, 0xe0, 0xc1, 0x03,
-  0x9f, 0x8f, 0xe7, 0x01, 0xa2, 0xd1, 0x78, 0x3c,
-  0x9f, 0xb7, 0x0e, 0x33, 0x49, 0x54, 0xa6, 0x60,
-  0x8f, 0x97, 0xbe, 0x3a, 0xc5, 0xda, 0x98, 0xe3,
-  0xe2, 0x82, 0xd4, 0xd6, 0xba, 0xdd, 0x94, 0x02,
-  0xfc, 0xf8, 0x71, 0x74, 0x74, 0x78, 0xc8, 0x98,
-  0x28, 0x8a, 0x62, 0x3e, 0x2f, 0x8a, 0xdf, 0xbf,
-  0x47, 0xa3, 0xb1, 0x18, 0x5e, 0x62, 0xaf, 0xd7,
-  0xb4, 0xb9, 0x9c, 0x8d, 0x40, 0xa1, 0x10, 0x0e,
-  0x87, 0xc3, 0x91, 0x48, 0x20, 0xf0, 0xed, 0xdb,
-  0xfc, 0xfc, 0xde, 0xde, 0xf4, 0x34, 0xdc, 0x28,
-  0x38, 0x2e, 0x97, 0x3b, 0x3c, 0x5c, 0x5d, 0x1d,
-  0x1f, 0x8f, 0xc7, 0x8f, 0x8f, 0xe3, 0xf1, 0xe3,
-  0xe3, 0xb2, 0x27, 0x4a, 0x5d, 0xfc, 0xce, 0x78,
-  0x3c, 0xa6, 0xf5, 0xf9, 0x4a, 0x19, 0x63, 0x1c,
-  0x25, 0xc4, 0xcb, 0x84, 0xb5, 0xb5, 0xd7, 0xb8,
-  0x3c, 0xa1, 0xca, 0xcf, 0xa1, 0xc5, 0x9e, 0x8b,
-  0x16, 0xff, 0x2a, 0xa1, 0xc5, 0x8e, 0x90, 0xcd,
-  0xa2, 0xcf, 0x55, 0x3e, 0x00, 0x89, 0xe0, 0x65,
-  0x41, 0x8b, 0x77, 0xc4, 0x9e, 0xb8, 0x7d, 0xbd,
-  0x9d, 0x80, 0xd3, 0x73, 0x08, 0x7c, 0x21, 0x71,
-  0x1d, 0xfa, 0xba, 0x5e, 0xd9, 0xe2, 0xfc, 0x4d,
-  0xfc, 0xac, 0xbc, 0x43, 0x29, 0x7e, 0x03, 0xc4,
-  0x0c, 0x3e, 0x03, 0x1d, 0xa3, 0x8f, 0xcb, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
--- a/art/tango/folder_new.h
+++ b/art/tango/folder_new.h
@@ -1,251 +0,0 @@
-/* folder_new.png - 635 bytes */
-static const unsigned char folder_new_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0b, 0x11, 0x0f, 0x07, 0x00, 0x55,
-  0x4f, 0xf7, 0x2d, 0x00, 0x00, 0x02, 0x08, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x90, 0x3d,
-  0x68, 0x53, 0x61, 0x14, 0x86, 0x9f, 0xef, 0xf6,
-  0xde, 0x96, 0x7b, 0x53, 0x49, 0xdb, 0xb4, 0x24,
-  0xa4, 0xb5, 0x0a, 0x56, 0x5c, 0x15, 0x07, 0x15,
-  0xfc, 0x9d, 0xc4, 0xc9, 0x4a, 0x14, 0x45, 0x07,
-  0x15, 0x17, 0x41, 0xc4, 0xc1, 0x4d, 0x10, 0x5d,
-  0x9d, 0x04, 0x11, 0x41, 0x50, 0x5b, 0x27, 0x11,
-  0x71, 0x70, 0xb2, 0x45, 0xb0, 0x95, 0x2e, 0xba,
-  0xd4, 0x40, 0x25, 0x0e, 0x2d, 0x41, 0x2d, 0x42,
-  0xdb, 0x68, 0xab, 0x21, 0xbd, 0xf7, 0xe6, 0xbb,
-  0x3f, 0xc7, 0x21, 0x21, 0xad, 0xa5, 0x41, 0xc5,
-  0x87, 0x0f, 0xbe, 0xe1, 0x9c, 0xf3, 0x9e, 0xf7,
-  0xbc, 0xea, 0xc4, 0xc9, 0xdc, 0x8d, 0x4c, 0x26,
-  0x73, 0x93, 0x35, 0x68, 0xad, 0x6b, 0x7f, 0x55,
-  0x5f, 0x1c, 0x7a, 0xf4, 0xf8, 0x3e, 0x4d, 0x50,
-  0x97, 0xaf, 0x5c, 0x92, 0xf3, 0x67, 0x2f, 0xac,
-  0x5b, 0xf4, 0x7d, 0x8f, 0x87, 0x43, 0x0f, 0x28,
-  0x97, 0xcb, 0xa7, 0x9f, 0x3d, 0x7d, 0xfe, 0x24,
-  0x9c, 0x3f, 0xaa, 0x00, 0x0b, 0x08, 0xcc, 0xf4,
-  0x0b, 0x69, 0x08, 0xe4, 0x8e, 0x1d, 0xa7, 0xf0,
-  0xb1, 0xd0, 0x6c, 0x09, 0x63, 0xe3, 0xaf, 0x69,
-  0x31, 0x84, 0xde, 0x0c, 0x0c, 0x6c, 0x16, 0xfa,
-  0x32, 0x32, 0x76, 0xe4, 0xa0, 0x5c, 0x07, 0xde,
-  0x9b, 0x00, 0xb6, 0xed, 0xd0, 0x91, 0xec, 0x6c,
-  0x2a, 0x90, 0x1b, 0x1c, 0xa4, 0xbb, 0xe3, 0x1b,
-  0x03, 0x1b, 0x67, 0xe9, 0x48, 0xf5, 0x10, 0x84,
-  0xd6, 0xa1, 0xd8, 0x28, 0xde, 0x55, 0xf1, 0xdc,
-  0x6d, 0x53, 0x6b, 0x8d, 0xe7, 0xb9, 0xbc, 0xfa,
-  0x50, 0x61, 0xaa, 0xe4, 0xac, 0x33, 0x2e, 0x0c,
-  0xa4, 0x7f, 0x72, 0x66, 0x5f, 0x11, 0xab, 0xbd,
-  0x17, 0xc3, 0x3e, 0x85, 0x63, 0x76, 0xb1, 0xec,
-  0x4d, 0x6c, 0x2f, 0x7e, 0x1e, 0xbd, 0xd7, 0x70,
-  0x30, 0x55, 0x72, 0xb8, 0x73, 0xf5, 0x30, 0xbe,
-  0x8e, 0x7e, 0x0f, 0x89, 0x90, 0x64, 0xeb, 0x34,
-  0x59, 0xbb, 0x84, 0xed, 0x64, 0x69, 0x31, 0x53,
-  0x28, 0x65, 0x60, 0x99, 0x36, 0xa1, 0x48, 0xc2,
-  0x04, 0xf0, 0x3c, 0x17, 0x80, 0xb9, 0x25, 0x9f,
-  0xe2, 0xc2, 0xf2, 0x1a, 0x81, 0x98, 0x94, 0x03,
-  0x41, 0xf7, 0x06, 0xb2, 0xd1, 0x34, 0xed, 0x6a,
-  0x02, 0xcb, 0xda, 0x46, 0xa8, 0x27, 0x29, 0xce,
-  0xb5, 0x62, 0xfa, 0xbe, 0x8f, 0x6d, 0x3b, 0x4d,
-  0xef, 0x17, 0x0c, 0x96, 0xbc, 0x1e, 0x0a, 0xa5,
-  0x9d, 0x54, 0xf4, 0x0c, 0xfd, 0xfa, 0x2d, 0x76,
-  0x5b, 0x1e, 0x37, 0x48, 0x30, 0x92, 0xef, 0xc7,
-  0x74, 0x5d, 0xb7, 0xe1, 0xa0, 0x19, 0x91, 0x98,
-  0x7c, 0xf7, 0xd2, 0x54, 0x74, 0x92, 0xd9, 0xf2,
-  0x16, 0xda, 0x5a, 0x7c, 0x92, 0xed, 0x7d, 0xcc,
-  0xcc, 0x4f, 0xd2, 0xc8, 0xe0, 0xcf, 0x18, 0x54,
-  0x23, 0x87, 0xaa, 0x5b, 0xeb, 0x6d, 0xb3, 0x6d,
-  0xaa, 0x81, 0x89, 0xb1, 0x3a, 0x83, 0xbf, 0x25,
-  0x8a, 0x62, 0xfc, 0x40, 0x00, 0x56, 0x1c, 0x58,
-  0x46, 0x8c, 0x00, 0x22, 0x82, 0x52, 0x0a, 0x11,
-  0x41, 0x04, 0x62, 0x11, 0xa2, 0x48, 0x08, 0xa2,
-  0x18, 0x1d, 0x0a, 0xd5, 0x30, 0x22, 0x88, 0x84,
-  0x64, 0xa2, 0x75, 0x45, 0xc0, 0xf3, 0x5c, 0x36,
-  0x25, 0xab, 0x2c, 0x56, 0x34, 0x5f, 0x17, 0x3d,
-  0x10, 0x45, 0x8c, 0x50, 0x7f, 0x88, 0x80, 0x20,
-  0x88, 0xd4, 0x85, 0x81, 0x30, 0x5a, 0xe5, 0x60,
-  0xbe, 0xb4, 0xc0, 0x8e, 0x3d, 0x7b, 0xc9, 0x7f,
-  0xfa, 0x51, 0x1f, 0xaa, 0x6d, 0x17, 0x81, 0x18,
-  0x41, 0x50, 0x20, 0xd2, 0x70, 0xb5, 0x6b, 0x6b,
-  0x17, 0xa3, 0x2f, 0x47, 0xe8, 0xf4, 0x67, 0x87,
-  0xd5, 0xfe, 0x73, 0xb7, 0xc6, 0x5d, 0xab, 0xf7,
-  0x00, 0xff, 0x48, 0x22, 0xf8, 0xf2, 0xee, 0xcd,
-  0xf0, 0xb5, 0xdd, 0xfc, 0x2f, 0xbf, 0x00, 0x5c,
-  0xb6, 0xf8, 0x8a, 0x37, 0xe1, 0x9a, 0xa9, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
-
-
-/* folder_new.png - 1316 bytes */
-static const unsigned char folder_new_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
-  0xaf, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x4b, 0x6b, 0x53, 0x4d, 0x18, 0x7e, 0xce,
-  0x9c, 0x49, 0x9a, 0xc4, 0xa6, 0x37, 0x6d, 0x4b,
-  0x2b, 0x54, 0x21, 0x42, 0xa1, 0xd6, 0x85, 0xa6,
-  0x20, 0x16, 0x44, 0xff, 0x81, 0x3b, 0x29, 0xb8,
-  0xf2, 0xd2, 0x95, 0x48, 0xed, 0x5a, 0x28, 0xf8,
-  0x07, 0xcc, 0x4a, 0x44, 0x8b, 0x3b, 0x37, 0x41,
-  0x5c, 0xe8, 0x46, 0x57, 0x2a, 0x64, 0x21, 0x28,
-  0xd6, 0xda, 0x1b, 0x49, 0xeb, 0x05, 0x69, 0x6d,
-  0x4e, 0x92, 0xe6, 0xd2, 0x5c, 0x4e, 0x4e, 0xce,
-  0x65, 0xe6, 0x5b, 0x9c, 0x4e, 0x93, 0x9e, 0x24,
-  0xf4, 0x8b, 0x97, 0xef, 0xdb, 0xf4, 0xdd, 0xbc,
-  0xf3, 0xce, 0x9c, 0x79, 0xe7, 0x79, 0xde, 0x4b,
-  0x66, 0x02, 0x1c, 0xc8, 0x81, 0xfc, 0x96, 0x48,
-  0xce, 0x89, 0xdb, 0xb7, 0xa7, 0xa7, 0xa7, 0xa6,
-  0xee, 0xde, 0xb5, 0x2c, 0xc6, 0x4c, 0x73, 0x66,
-  0x66, 0x3f, 0x07, 0xba, 0xae, 0xeb, 0xba, 0x5e,
-  0xb5, 0x19, 0xb3, 0x2c, 0xc6, 0x26, 0x26, 0x66,
-  0x67, 0x1f, 0x3d, 0x7a, 0xfc, 0x38, 0x1c, 0xfe,
-  0xcf, 0x09, 0xdc, 0xba, 0x35, 0x35, 0x75, 0xf3,
-  0x26, 0xe7, 0xd7, 0xaf, 0x5f, 0xbd, 0x3a, 0x39,
-  0xd9, 0xba, 0xc3, 0x07, 0x0f, 0x1e, 0x3e, 0xbc,
-  0x7f, 0x1f, 0xc8, 0x64, 0x32, 0x99, 0x4c, 0x66,
-  0x6c, 0xec, 0xe9, 0xd3, 0x70, 0xf8, 0xd9, 0xb3,
-  0x8f, 0x1f, 0xf7, 0xdb, 0x67, 0x9a, 0x89, 0xc4,
-  0xa5, 0x4b, 0xd2, 0x0e, 0x1e, 0x97, 0xcb, 0xd6,
-  0x86, 0x41, 0x69, 0x7f, 0xff, 0xf3, 0xe7, 0x9c,
-  0xb7, 0x4c, 0xe0, 0xdc, 0xb9, 0xb3, 0x67, 0xc7,
-  0xc7, 0x01, 0x45, 0x51, 0x14, 0x45, 0x69, 0x9d,
-  0xc8, 0xa7, 0x4f, 0x9f, 0x3f, 0xcf, 0xcd, 0x01,
-  0x86, 0x61, 0x18, 0x86, 0x01, 0x70, 0xce, 0x39,
-  0xe7, 0xf5, 0x5a, 0x96, 0x09, 0xe1, 0x1c, 0xb8,
-  0x78, 0x71, 0x7c, 0xdc, 0xef, 0x0f, 0x85, 0x6e,
-  0xdc, 0xb8, 0x7c, 0x39, 0x97, 0x8b, 0x46, 0x6d,
-  0x2f, 0x6e, 0xb7, 0xf0, 0x26, 0xb4, 0x4d, 0x48,
-  0x55, 0xc5, 0x39, 0xb4, 0x19, 0x80, 0x91, 0x91,
-  0x91, 0x91, 0x93, 0x27, 0x01, 0x42, 0x08, 0x91,
-  0xe5, 0xd6, 0x09, 0x0c, 0x0e, 0x0e, 0x0e, 0x1e,
-  0x3d, 0xda, 0x7c, 0x5d, 0x96, 0x65, 0x99, 0x73,
-  0xa0, 0xaf, 0xaf, 0xbb, 0x3b, 0x9d, 0x06, 0x5c,
-  0x2e, 0xc6, 0x22, 0x91, 0xe9, 0x69, 0x5d, 0x97,
-  0xe5, 0xb1, 0xb1, 0x54, 0x0a, 0x90, 0xa4, 0x8e,
-  0x0e, 0x4a, 0x29, 0x65, 0x2c, 0x16, 0xfb, 0xf1,
-  0x43, 0x92, 0x18, 0x53, 0x94, 0x50, 0xc8, 0xce,
-  0x54, 0x38, 0x6c, 0x13, 0xa9, 0x54, 0xea, 0x08,
-  0x88, 0x9a, 0x5e, 0x59, 0x59, 0x59, 0x59, 0x5e,
-  0x06, 0x5e, 0xbf, 0x5e, 0x5d, 0xe5, 0x1c, 0x98,
-  0x9f, 0xff, 0xf9, 0xb3, 0x75, 0x1a, 0x8d, 0x85,
-  0x73, 0xe0, 0xc4, 0x89, 0xfe, 0xfe, 0xed, 0x6d,
-  0xe0, 0xca, 0x95, 0xf3, 0xe7, 0x63, 0x31, 0xe0,
-  0xcc, 0x99, 0xe1, 0xe1, 0xd3, 0xa7, 0x01, 0xd3,
-  0xa4, 0x74, 0x62, 0xa2, 0xb7, 0x57, 0x96, 0x29,
-  0xed, 0xe9, 0x01, 0x4a, 0xa5, 0x72, 0x39, 0x12,
-  0xe9, 0xee, 0x4e, 0x26, 0x13, 0x89, 0x17, 0x2f,
-  0x66, 0x66, 0x02, 0x81, 0xfe, 0x7e, 0x45, 0x11,
-  0x25, 0xb9, 0xbc, 0xdc, 0x34, 0x03, 0xa3, 0xa3,
-  0xa3, 0xa3, 0xa7, 0x4e, 0x01, 0xf7, 0xee, 0xbd,
-  0x79, 0xb3, 0xb0, 0x00, 0xdc, 0xb9, 0x73, 0xed,
-  0xda, 0x85, 0x0b, 0x80, 0xa6, 0x19, 0x86, 0x65,
-  0xfd, 0x3a, 0x78, 0x42, 0x00, 0xd3, 0x04, 0x8e,
-  0x1c, 0xf1, 0xf9, 0xbe, 0x7e, 0x05, 0x02, 0x81,
-  0xae, 0x2e, 0x45, 0x01, 0x7c, 0x3e, 0xaf, 0x77,
-  0x60, 0x00, 0x90, 0x65, 0x4a, 0x0f, 0x1f, 0x06,
-  0x24, 0x49, 0x92, 0x08, 0x01, 0x28, 0x95, 0x65,
-  0xaf, 0x17, 0xc8, 0xe5, 0xca, 0x65, 0xb7, 0x3b,
-  0x10, 0xb0, 0xbd, 0x74, 0x76, 0x0a, 0x7f, 0x4d,
-  0x09, 0x2c, 0x2d, 0x2d, 0x2d, 0x2d, 0x2e, 0x56,
-  0xed, 0x6c, 0xb6, 0x54, 0xd2, 0x75, 0x20, 0x95,
-  0xca, 0xe7, 0x2b, 0x95, 0x5f, 0x27, 0x20, 0x49,
-  0x00, 0x63, 0x40, 0xb1, 0xe8, 0xf3, 0x51, 0x0a,
-  0x1c, 0x3a, 0x44, 0x48, 0x67, 0x27, 0x40, 0x88,
-  0x24, 0xad, 0xad, 0x01, 0x7e, 0xbf, 0x2c, 0x47,
-  0x22, 0x80, 0xcb, 0xe5, 0x72, 0x0d, 0x0f, 0x03,
-  0xa6, 0x69, 0x18, 0x73, 0x73, 0xc0, 0xb7, 0x6f,
-  0x8a, 0xe2, 0x76, 0x03, 0xc1, 0xe0, 0xf1, 0xe3,
-  0x40, 0x26, 0xb3, 0x1b, 0x10, 0xe7, 0x01, 0x9a,
-  0xa6, 0x69, 0x9a, 0x56, 0xcd, 0xc0, 0x9f, 0x16,
-  0xce, 0xed, 0x2c, 0x64, 0xb3, 0xe5, 0x72, 0x6f,
-  0x2f, 0xb0, 0xbc, 0x9c, 0x4c, 0x06, 0x83, 0x40,
-  0x2c, 0x96, 0x4a, 0x0d, 0x0d, 0x01, 0xa9, 0xd4,
-  0xd6, 0xd6, 0xbb, 0x77, 0x40, 0x2e, 0x97, 0xc9,
-  0x84, 0xc3, 0xc0, 0xc6, 0x46, 0x3a, 0x4d, 0x08,
-  0xf0, 0xea, 0xd5, 0xfc, 0xfc, 0xd0, 0x90, 0xf0,
-  0xb2, 0xb9, 0xd9, 0x72, 0x06, 0xfe, 0xb4, 0x58,
-  0x16, 0xe7, 0x94, 0x02, 0x5b, 0x5b, 0xaa, 0xda,
-  0xd7, 0x07, 0x14, 0x8b, 0xba, 0xde, 0xd1, 0x01,
-  0xac, 0xaf, 0xe7, 0x72, 0x81, 0x00, 0xd0, 0xd6,
-  0x46, 0x69, 0xb9, 0x6c, 0x97, 0xd4, 0xc0, 0x00,
-  0xf0, 0xe5, 0x4b, 0x22, 0x51, 0xc5, 0x53, 0x28,
-  0x34, 0x25, 0xa0, 0xaa, 0xaa, 0xaa, 0xaa, 0xb5,
-  0x19, 0xb0, 0x7b, 0xe0, 0x6f, 0x0a, 0x21, 0x80,
-  0xa6, 0x99, 0xa6, 0xcf, 0x57, 0xd5, 0x42, 0xda,
-  0xdb, 0x5d, 0x2e, 0xd3, 0x04, 0x2a, 0x15, 0xc3,
-  0xa0, 0x74, 0x6d, 0xcd, 0x79, 0x2f, 0x90, 0x66,
-  0x4e, 0xff, 0x76, 0x06, 0xfe, 0xad, 0x6c, 0x6f,
-  0x6f, 0x6f, 0x17, 0x0a, 0x00, 0x21, 0xa6, 0x99,
-  0xcf, 0x17, 0x8b, 0x75, 0xe4, 0x9b, 0x6d, 0x74,
-  0xf6, 0x80, 0xd7, 0xeb, 0x76, 0x37, 0xba, 0x0f,
-  0x44, 0x2c, 0x6a, 0x2f, 0x28, 0x00, 0x60, 0xcc,
-  0x1e, 0x31, 0xc6, 0x98, 0x6d, 0x33, 0x26, 0x6c,
-  0xce, 0x01, 0xcb, 0xda, 0xab, 0x4d, 0xb3, 0xb1,
-  0x56, 0x55, 0x4d, 0xab, 0x54, 0x00, 0x42, 0x38,
-  0xb7, 0xac, 0xd5, 0x55, 0xe7, 0xf9, 0x8e, 0x12,
-  0x92, 0x76, 0x6f, 0x66, 0x67, 0x06, 0x4c, 0xd3,
-  0xb2, 0x18, 0x03, 0x2a, 0x15, 0xd3, 0xb4, 0x21,
-  0xd9, 0x40, 0x6b, 0x09, 0x08, 0x0f, 0x36, 0x11,
-  0xe1, 0x4b, 0xac, 0x88, 0x79, 0x71, 0x8a, 0x98,
-  0x95, 0x24, 0xe1, 0xa9, 0xba, 0x17, 0x68, 0x6f,
-  0xf7, 0x78, 0x28, 0x05, 0x92, 0xc9, 0x6c, 0x36,
-  0x9b, 0x35, 0x0c, 0x42, 0x2c, 0x4b, 0x55, 0x4b,
-  0xa5, 0x9d, 0xb8, 0xef, 0x04, 0x9e, 0xb1, 0xa6,
-  0x04, 0x44, 0x06, 0x82, 0xc1, 0x68, 0xf4, 0xfd,
-  0x7b, 0x80, 0x10, 0x59, 0x26, 0xc4, 0xae, 0x45,
-  0xc6, 0x6a, 0x61, 0x55, 0x81, 0xd6, 0xc2, 0xda,
-  0x0f, 0x60, 0x2d, 0xa1, 0x46, 0x39, 0xed, 0xe9,
-  0xf1, 0xfb, 0x09, 0x01, 0x12, 0x89, 0xad, 0xad,
-  0x7c, 0x5e, 0x92, 0x08, 0xd1, 0xb4, 0x54, 0xea,
-  0xed, 0xdb, 0x9d, 0xb8, 0xef, 0xe0, 0xd6, 0x75,
-  0x07, 0x01, 0xf1, 0x88, 0x02, 0x16, 0x17, 0x57,
-  0x56, 0xa2, 0x51, 0xa0, 0xa3, 0xa3, 0xab, 0xab,
-  0xaf, 0x0f, 0x50, 0x94, 0x5c, 0xae, 0x52, 0xb1,
-  0x9b, 0xac, 0x36, 0x03, 0x4e, 0xb8, 0xf5, 0x44,
-  0x9a, 0x8d, 0xab, 0xa3, 0xda, 0x10, 0xf8, 0xfd,
-  0x5e, 0x2f, 0xa5, 0xd5, 0x40, 0xa5, 0x52, 0xb9,
-  0x5c, 0xa1, 0x60, 0x59, 0x94, 0xa6, 0xd3, 0x1f,
-  0x3e, 0x88, 0x1d, 0xe2, 0x8d, 0x54, 0x47, 0xa0,
-  0xda, 0xff, 0x1e, 0xcf, 0xc0, 0xc0, 0xc8, 0x08,
-  0x70, 0xec, 0x98, 0xdf, 0x2f, 0xcb, 0x40, 0x34,
-  0x1a, 0x8f, 0x97, 0x4a, 0xd5, 0xc3, 0x6c, 0x12,
-  0x8d, 0x29, 0x38, 0xe7, 0xf7, 0x96, 0x4e, 0x6d,
-  0x6e, 0xec, 0x71, 0x6d, 0x40, 0xda, 0xda, 0x5c,
-  0x2e, 0xc6, 0x80, 0x8d, 0x8d, 0xb5, 0xb5, 0x58,
-  0x8c, 0xf3, 0x42, 0xa1, 0x50, 0x28, 0x95, 0x0a,
-  0x85, 0xf5, 0xf5, 0x68, 0x74, 0x75, 0x55, 0x34,
-  0xb1, 0xd7, 0x6b, 0xeb, 0x62, 0xd1, 0x41, 0xa0,
-  0x5c, 0x5e, 0x58, 0x58, 0x58, 0x58, 0x5c, 0x9c,
-  0x9c, 0xfc, 0xfe, 0xfd, 0xc9, 0x93, 0xf9, 0xf9,
-  0xd9, 0x59, 0xfc, 0xaf, 0x22, 0x49, 0xc5, 0x62,
-  0x2c, 0xf6, 0xf2, 0x65, 0x28, 0x14, 0x8f, 0x6f,
-  0x6e, 0xc6, 0xe3, 0xd5, 0x0b, 0x6c, 0xf7, 0x8b,
-  0xbd, 0xa6, 0xf8, 0x9d, 0xf1, 0x78, 0x6c, 0xed,
-  0xf7, 0xef, 0x65, 0x2c, 0xe6, 0x45, 0x0a, 0x45,
-  0x33, 0x89, 0xd8, 0x3a, 0x63, 0x5c, 0x0f, 0xa8,
-  0xf1, 0x77, 0x42, 0x8b, 0x57, 0x96, 0xd0, 0xe2,
-  0xaf, 0x92, 0xd0, 0xe5, 0xb2, 0xad, 0xf3, 0x79,
-  0x61, 0x4b, 0x8d, 0x0f, 0x10, 0x44, 0x44, 0xb3,
-  0x08, 0x2d, 0x7a, 0xc4, 0x09, 0xdc, 0xb9, 0xdf,
-  0x49, 0xa0, 0xd9, 0x77, 0x42, 0x44, 0x41, 0x8a,
-  0x7d, 0xc2, 0x36, 0xcd, 0xc6, 0x5a, 0xac, 0xff,
-  0xce, 0xb3, 0xf2, 0x40, 0xfe, 0x8c, 0xfc, 0x03,
-  0x43, 0x77, 0xd7, 0xb0, 0xfa, 0xd8, 0xe9, 0xe0,
-  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
-  0xae, 0x42, 0x60, 0x82};
--- a/art/tango/folder_open.h
+++ b/art/tango/folder_open.h
@@ -1,230 +0,0 @@
-/* folder_open.png - 523 bytes */
-static const unsigned char folder_open_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0b, 0x0a, 0x13, 0x00, 0x30, 0xae,
-  0xf3, 0xdb, 0xcc, 0x00, 0x00, 0x01, 0x98, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x91, 0x4d,
-  0x4b, 0x5b, 0x41, 0x18, 0x85, 0x9f, 0x91, 0xd4,
-  0x92, 0x08, 0xa6, 0x29, 0x28, 0xb1, 0x4a, 0xc1,
-  0xd2, 0x2e, 0x5d, 0x08, 0x42, 0x2d, 0x94, 0xe6,
-  0x27, 0x94, 0x60, 0x55, 0x70, 0xe3, 0x47, 0x29,
-  0x48, 0xab, 0xa8, 0x5b, 0xbb, 0x68, 0xb7, 0xdd,
-  0xb9, 0x12, 0x84, 0x1a, 0x75, 0x55, 0x24, 0x04,
-  0x97, 0xea, 0xc2, 0x6a, 0x57, 0xe2, 0x42, 0x97,
-  0xba, 0x13, 0xf1, 0xa3, 0xa0, 0x12, 0x35, 0x29,
-  0xe6, 0xde, 0x3b, 0xb9, 0x73, 0x5f, 0x17, 0x37,
-  0x5a, 0x12, 0x12, 0xd4, 0xf6, 0x30, 0x30, 0x30,
-  0xc3, 0xfb, 0x9c, 0x33, 0x67, 0x54, 0x67, 0x77,
-  0xc7, 0x97, 0x68, 0x34, 0xfa, 0x95, 0x12, 0x69,
-  0xad, 0xfd, 0xdd, 0xd1, 0x83, 0x33, 0x89, 0xb9,
-  0x29, 0x2a, 0x48, 0x0d, 0x8f, 0x7c, 0x92, 0xfe,
-  0xde, 0xf7, 0x65, 0x2f, 0x6d, 0xdb, 0x62, 0x7a,
-  0xe6, 0x3b, 0xd9, 0x6c, 0xb6, 0x27, 0x39, 0x9f,
-  0xfa, 0x51, 0x16, 0xf0, 0x71, 0x68, 0x50, 0xba,
-  0xde, 0x75, 0xb3, 0xbd, 0xb3, 0x5d, 0xc9, 0x84,
-  0xd5, 0xb5, 0x9f, 0xa5, 0x47, 0x13, 0xc9, 0xf9,
-  0xd4, 0x18, 0x40, 0xc0, 0x18, 0x43, 0x30, 0x18,
-  0xe2, 0x51, 0x38, 0x52, 0x11, 0x10, 0x7f, 0xdb,
-  0xe1, 0xbb, 0x29, 0x85, 0x52, 0x8a, 0xd4, 0x42,
-  0x72, 0x14, 0xf0, 0x01, 0x5a, 0x6b, 0x2c, 0x2b,
-  0xc7, 0x45, 0xe6, 0x9c, 0x7f, 0x51, 0xc0, 0x75,
-  0xdd, 0x5b, 0x13, 0xdc, 0xbc, 0xb7, 0x90, 0xa0,
-  0x08, 0x00, 0xdc, 0x24, 0x48, 0x6c, 0x85, 0xef,
-  0x66, 0x5b, 0x1b, 0xa7, 0xed, 0x43, 0x5c, 0xc2,
-  0xd5, 0x4e, 0x69, 0x02, 0x8f, 0xf1, 0x81, 0x18,
-  0x25, 0x26, 0x65, 0x15, 0x7a, 0x18, 0xe0, 0xf3,
-  0xe4, 0x8a, 0x0f, 0xb8, 0x4e, 0xf0, 0xa4, 0xae,
-  0x09, 0xc7, 0x35, 0x1c, 0x9d, 0xd9, 0xb7, 0x02,
-  0x9e, 0xd5, 0xd7, 0x00, 0x50, 0x05, 0x10, 0x0c,
-  0x86, 0xf8, 0x6d, 0x85, 0xa9, 0x0d, 0x55, 0xdf,
-  0xbb, 0xc4, 0xaa, 0xeb, 0x0e, 0x32, 0x16, 0x34,
-  0x37, 0xdc, 0xad, 0x03, 0x63, 0x3c, 0xec, 0xbc,
-  0x29, 0x4e, 0xb0, 0xbe, 0x07, 0x6d, 0x2d, 0x4f,
-  0x39, 0x4c, 0x5b, 0x00, 0x88, 0x08, 0x9e, 0x27,
-  0xb8, 0xc6, 0xc3, 0xc9, 0x1b, 0x2e, 0x6d, 0x97,
-  0x8b, 0x4b, 0xcd, 0x49, 0xc6, 0xe6, 0x38, 0xe3,
-  0x90, 0x73, 0x4c, 0xf1, 0x2f, 0x3c, 0x8f, 0x58,
-  0xa4, 0xff, 0x68, 0x8e, 0xce, 0x2c, 0x10, 0x85,
-  0x87, 0x50, 0x58, 0x88, 0x80, 0x20, 0x88, 0x28,
-  0x44, 0x04, 0x01, 0xec, 0xbc, 0xf7, 0x17, 0x70,
-  0x7c, 0x7a, 0x42, 0xeb, 0xab, 0xd7, 0x6c, 0xee,
-  0x9e, 0x17, 0x86, 0xc4, 0x1f, 0x12, 0xf0, 0x10,
-  0x04, 0x05, 0x22, 0xfe, 0xb0, 0xc0, 0xcb, 0x17,
-  0x8f, 0x59, 0x5e, 0x5c, 0x22, 0x62, 0x1f, 0xcc,
-  0xaa, 0x37, 0x7d, 0xdf, 0xd6, 0x72, 0x0f, 0x1a,
-  0x63, 0xf7, 0x2d, 0xaf, 0x26, 0xbf, 0xbf, 0xf1,
-  0x6b, 0x76, 0xbc, 0x9d, 0xff, 0xd5, 0x15, 0x26,
-  0x94, 0xc3, 0xfa, 0x0c, 0x4b, 0xb2, 0xef, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
-
-
-/* folder_open.png - 1261 bytes */
-static const unsigned char folder_open_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
-  0x78, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0xcb, 0x6f, 0x12, 0x5f, 0x14, 0x3e, 0x03,
-  0x25, 0x8c, 0x3c, 0x4a, 0x6a, 0x91, 0x97, 0x10,
-  0x13, 0x4d, 0x5a, 0x1b, 0x5d, 0xf9, 0x68, 0x65,
-  0x63, 0xd7, 0xc6, 0x98, 0xa6, 0x31, 0x8d, 0x2b,
-  0x96, 0xc6, 0x95, 0x56, 0xa3, 0x3b, 0x13, 0x17,
-  0xfa, 0x07, 0x34, 0x71, 0xe1, 0xc6, 0x15, 0x31,
-  0x36, 0x41, 0xdb, 0x6e, 0x8c, 0x0b, 0x13, 0x4d,
-  0x34, 0x31, 0x56, 0x13, 0x41, 0x04, 0x86, 0x9a,
-  0x6a, 0x6a, 0xd1, 0x09, 0x30, 0x03, 0x0c, 0x32,
-  0x33, 0x3c, 0x86, 0x3b, 0x0f, 0x17, 0x93, 0x29,
-  0x30, 0x3f, 0x48, 0xa1, 0x55, 0x7f, 0x9b, 0x7e,
-  0x09, 0xdc, 0x3b, 0xe7, 0xde, 0xef, 0xde, 0xf3,
-  0x9d, 0x73, 0xee, 0x1d, 0x00, 0xd8, 0xc3, 0x1e,
-  0x76, 0x05, 0x4c, 0xeb, 0x84, 0x42, 0xa1, 0x50,
-  0x28, 0x74, 0xf2, 0xa4, 0x2c, 0x03, 0x48, 0xd2,
-  0xf3, 0xe7, 0x18, 0x86, 0x61, 0x06, 0xc3, 0xd6,
-  0x34, 0xac, 0xf5, 0xdd, 0x1d, 0x46, 0x23, 0x86,
-  0x19, 0x0c, 0x57, 0xaf, 0x86, 0xc3, 0xe1, 0x70,
-  0x38, 0xfc, 0xe4, 0xc9, 0x3f, 0x17, 0x30, 0x33,
-  0x33, 0x33, 0x73, 0xe1, 0x42, 0x34, 0x3a, 0x3f,
-  0x7f, 0xfd, 0xfa, 0x8d, 0x1b, 0x27, 0x4e, 0x0c,
-  0xba, 0xd0, 0xe2, 0x62, 0x24, 0xb2, 0xb2, 0x22,
-  0x08, 0x95, 0x4a, 0xb9, 0x9c, 0xcb, 0x4d, 0x4f,
-  0x3f, 0x7d, 0x1a, 0x89, 0x2c, 0x2f, 0x7f, 0xf8,
-  0xf0, 0xb7, 0x05, 0x0c, 0x69, 0x1d, 0x59, 0x06,
-  0x50, 0x14, 0x51, 0xe4, 0x79, 0x9e, 0xe7, 0x79,
-  0x80, 0x58, 0x2c, 0x1a, 0x8d, 0x46, 0xfb, 0x5f,
-  0xe8, 0xd0, 0x21, 0xbf, 0xdf, 0xe7, 0x33, 0x9b,
-  0x93, 0xc9, 0x5f, 0xbf, 0x28, 0xea, 0xd9, 0xb3,
-  0xb9, 0xb9, 0x4b, 0x97, 0x2e, 0x5e, 0x3c, 0x77,
-  0x4e, 0x15, 0x32, 0xc8, 0x4a, 0x3b, 0x16, 0x20,
-  0x49, 0xb2, 0x5c, 0xa9, 0x98, 0xcd, 0x38, 0xee,
-  0x70, 0x00, 0x8c, 0x8e, 0x8e, 0x8e, 0x3a, 0x9d,
-  0x83, 0x2f, 0x18, 0x0c, 0x9e, 0x39, 0x73, 0xf6,
-  0xec, 0x81, 0x03, 0xef, 0xde, 0xad, 0xae, 0xbe,
-  0x7e, 0xfd, 0xf1, 0xa3, 0x2a, 0xa4, 0x5f, 0xf6,
-  0xfd, 0xfb, 0xaa, 0xe0, 0xf9, 0xf9, 0x81, 0x05,
-  0x18, 0x0c, 0x46, 0x23, 0x86, 0x59, 0xad, 0xcd,
-  0x66, 0xa3, 0xc1, 0xb2, 0x08, 0xe1, 0x38, 0x8e,
-  0xe3, 0xb8, 0xc9, 0x94, 0xc9, 0x64, 0x32, 0x9b,
-  0x9b, 0x00, 0x18, 0x86, 0x61, 0xda, 0x49, 0xc0,
-  0x30, 0x00, 0x83, 0x41, 0x3d, 0x23, 0x9a, 0x55,
-  0x8f, 0x63, 0xc7, 0x26, 0x26, 0x8e, 0x1f, 0xef,
-  0x5f, 0x38, 0x41, 0xac, 0xad, 0xa5, 0x52, 0xd7,
-  0xae, 0xa9, 0x4f, 0x3b, 0x10, 0xa0, 0x3a, 0x9c,
-  0x48, 0xe4, 0x72, 0xf9, 0x7c, 0x36, 0x7b, 0xfa,
-  0xb4, 0xc5, 0xb2, 0x6f, 0x9f, 0xd5, 0x0a, 0xe0,
-  0x76, 0xbb, 0xdd, 0x1e, 0x0f, 0x80, 0x24, 0x49,
-  0x92, 0x24, 0x0d, 0x9e, 0x91, 0xed, 0xa0, 0x28,
-  0x8a, 0xa2, 0x28, 0x3b, 0xe7, 0x0f, 0x75, 0x3e,
-  0x7e, 0xff, 0x4e, 0xd3, 0x34, 0x4d, 0x51, 0x08,
-  0x1d, 0x3c, 0xe8, 0xf3, 0x05, 0x02, 0x26, 0x53,
-  0x36, 0x9b, 0xcf, 0x67, 0xb3, 0x00, 0xf5, 0xba,
-  0xa2, 0xd8, 0xed, 0x00, 0xc9, 0x64, 0xa5, 0xe2,
-  0x76, 0x03, 0x54, 0x2a, 0xcd, 0xa6, 0xd9, 0xbc,
-  0xf3, 0x8d, 0x71, 0xdc, 0x68, 0x6c, 0x0f, 0x48,
-  0xa3, 0x31, 0x3c, 0x3c, 0x3b, 0x0b, 0x70, 0xea,
-  0xd4, 0xe5, 0xcb, 0xb3, 0xb3, 0xbd, 0x25, 0x8d,
-  0x8d, 0xd9, 0x6c, 0x14, 0xf5, 0xfe, 0xfd, 0xe2,
-  0xe2, 0xc2, 0xc2, 0xcd, 0x9b, 0xc1, 0xa0, 0x4e,
-  0xc0, 0xe6, 0x26, 0xc3, 0x30, 0x4c, 0xb9, 0x8c,
-  0xd0, 0xd4, 0xd4, 0xe4, 0x64, 0x30, 0x08, 0xc0,
-  0xb2, 0x2c, 0xcb, 0xb2, 0x00, 0x6f, 0xdf, 0x6e,
-  0x6c, 0x00, 0x00, 0xdc, 0xbe, 0x7d, 0xe5, 0xca,
-  0xf9, 0xf3, 0x7f, 0x3e, 0x13, 0xfd, 0x62, 0x61,
-  0xe1, 0xe1, 0xc3, 0xa5, 0xa5, 0x89, 0x89, 0x1e,
-  0x19, 0x60, 0x18, 0x41, 0x10, 0x84, 0x66, 0x13,
-  0xa1, 0x4c, 0xe6, 0xc7, 0x8f, 0x4c, 0x06, 0x80,
-  0xa2, 0x68, 0x9a, 0xa2, 0x00, 0x38, 0x4e, 0x14,
-  0x03, 0x01, 0x80, 0x5a, 0xad, 0xd1, 0x40, 0x08,
-  0x80, 0x20, 0x48, 0x92, 0xe3, 0xfe, 0x9d, 0xe3,
-  0x3e, 0xdf, 0xc8, 0x08, 0x8e, 0x03, 0xf0, 0xbc,
-  0x20, 0x28, 0x8a, 0x28, 0xf6, 0x10, 0x40, 0x10,
-  0xc5, 0x62, 0xb1, 0x48, 0xd3, 0x08, 0x05, 0x02,
-  0x7e, 0x7f, 0x20, 0x00, 0x50, 0xad, 0xf2, 0x7c,
-  0xb5, 0x0a, 0x00, 0x50, 0x2e, 0xff, 0x1f, 0x11,
-  0xd7, 0xc0, 0xb2, 0x0c, 0x53, 0x2a, 0x29, 0x4a,
-  0xa3, 0x21, 0x8a, 0x46, 0x23, 0x49, 0x6a, 0xf6,
-  0xad, 0x77, 0xad, 0x7a, 0x7d, 0xe5, 0x72, 0x92,
-  0x24, 0x49, 0xb2, 0x2c, 0x8a, 0x24, 0x49, 0x92,
-  0x24, 0x09, 0x90, 0x4c, 0x6e, 0x6c, 0x50, 0x14,
-  0xc0, 0xf4, 0xf4, 0xe4, 0xe4, 0xf8, 0x38, 0xc0,
-  0x6e, 0x0e, 0xdc, 0x4e, 0xe0, 0x70, 0x58, 0x2c,
-  0x26, 0x13, 0x40, 0xb5, 0x5a, 0xaf, 0x0b, 0x82,
-  0x2c, 0xfb, 0xfd, 0xd5, 0xea, 0xab, 0x57, 0xb7,
-  0x6e, 0x69, 0xe3, 0x43, 0x7a, 0x82, 0x28, 0x22,
-  0x24, 0x8a, 0x08, 0x29, 0x8a, 0xea, 0x6c, 0xad,
-  0x26, 0xcb, 0x38, 0x0e, 0x10, 0x08, 0xb8, 0x5c,
-  0x76, 0x3b, 0x40, 0xb9, 0x5c, 0xad, 0x22, 0xa4,
-  0xde, 0x1e, 0x00, 0xea, 0x1c, 0xad, 0xa7, 0x5d,
-  0xa8, 0x7a, 0x91, 0xed, 0x76, 0xed, 0x3a, 0xee,
-  0xc6, 0xd3, 0x43, 0x51, 0x00, 0x2c, 0x16, 0xb3,
-  0xd9, 0x68, 0x04, 0x20, 0x88, 0x5c, 0xae, 0x58,
-  0x44, 0x48, 0x1d, 0x21, 0x88, 0x9e, 0x02, 0xac,
-  0x56, 0x9b, 0xcd, 0x62, 0x89, 0x46, 0x0b, 0x85,
-  0x42, 0x81, 0xa6, 0x0f, 0x1f, 0x1e, 0x1f, 0x1f,
-  0x1b, 0x3b, 0x7a, 0x14, 0xc0, 0x62, 0x19, 0x19,
-  0x71, 0xbb, 0x01, 0x48, 0x92, 0x61, 0xea, 0x75,
-  0x80, 0x46, 0x43, 0x14, 0x65, 0xb9, 0x73, 0x3b,
-  0xcd, 0x71, 0xcd, 0x39, 0x0c, 0x53, 0x3f, 0xed,
-  0xf6, 0x96, 0xad, 0x25, 0xab, 0x5b, 0x56, 0xf7,
-  0xef, 0xb7, 0xd9, 0x4c, 0x26, 0x00, 0x51, 0x94,
-  0x24, 0x45, 0x01, 0x48, 0x24, 0xd2, 0xe9, 0x6f,
-  0xdf, 0x7e, 0xfe, 0x7c, 0xf3, 0x46, 0xad, 0x94,
-  0x9e, 0x02, 0xd4, 0x0d, 0x3e, 0x7d, 0xe2, 0x79,
-  0x9e, 0xe7, 0xb8, 0xb9, 0x39, 0xaf, 0xf7, 0xc8,
-  0x11, 0x9f, 0x0f, 0xa0, 0x54, 0xe2, 0xb8, 0x66,
-  0x13, 0x20, 0x97, 0x63, 0x18, 0x41, 0xe8, 0x16,
-  0x2f, 0x0c, 0x6b, 0x8f, 0x68, 0x4b, 0x44, 0xa7,
-  0xbd, 0x7d, 0x5e, 0x27, 0xaf, 0x15, 0x08, 0x0c,
-  0x03, 0x68, 0x36, 0x55, 0xc7, 0x63, 0xb1, 0x58,
-  0x2c, 0x91, 0x40, 0xc8, 0xe5, 0xaa, 0xd5, 0x56,
-  0x57, 0xef, 0xdd, 0xd3, 0xef, 0xaa, 0x13, 0x60,
-  0x36, 0x93, 0x24, 0x49, 0x66, 0xb3, 0xc9, 0xa4,
-  0xdd, 0x3e, 0x3c, 0x6c, 0xb7, 0xcb, 0xf2, 0xd4,
-  0x94, 0xd7, 0xeb, 0x74, 0x1a, 0x0c, 0x04, 0x41,
-  0xd3, 0x08, 0x75, 0x8b, 0x7c, 0x67, 0xca, 0xf5,
-  0x7d, 0x7d, 0x79, 0xe8, 0xb3, 0xa2, 0xe7, 0xb9,
-  0x5c, 0x0e, 0x87, 0xd9, 0x0c, 0x80, 0x90, 0x24,
-  0xc9, 0x32, 0xc0, 0x97, 0x2f, 0xe9, 0x74, 0x22,
-  0x51, 0x28, 0xbc, 0x7c, 0x19, 0x89, 0x2c, 0x2f,
-  0x3f, 0x7a, 0xb4, 0x8d, 0x00, 0xa7, 0x33, 0x95,
-  0x4a, 0xa5, 0x52, 0x29, 0xab, 0xd5, 0xe3, 0xf1,
-  0x7a, 0x3d, 0x1e, 0x83, 0xe1, 0xc5, 0x8b, 0xb5,
-  0xb5, 0x5a, 0x0d, 0xfa, 0x80, 0x5a, 0x0a, 0x5a,
-  0x99, 0xb4, 0x97, 0x4c, 0x67, 0xf9, 0xfc, 0x37,
-  0xe2, 0xed, 0x3c, 0x51, 0x14, 0x45, 0x75, 0x9c,
-  0xe3, 0xf2, 0x79, 0x49, 0x02, 0xa8, 0xd5, 0x28,
-  0x6a, 0x69, 0x49, 0x9d, 0xab, 0xfd, 0xc0, 0x6f,
-  0x85, 0x50, 0x27, 0x80, 0xe3, 0x8a, 0xc5, 0x62,
-  0xb1, 0x58, 0x5c, 0x5f, 0xff, 0xfc, 0x39, 0x1e,
-  0x8f, 0xc7, 0xef, 0xde, 0xb5, 0x5a, 0x6d, 0xb6,
-  0x74, 0xfa, 0xce, 0x9d, 0x7e, 0x24, 0xfc, 0x49,
-  0x88, 0x62, 0xa9, 0xb4, 0xbe, 0xfe, 0xf5, 0x6b,
-  0x3c, 0xbe, 0xb2, 0xf2, 0xe0, 0xc1, 0xe3, 0xc7,
-  0xaa, 0xd5, 0x66, 0x53, 0x5b, 0x96, 0xdd, 0xca,
-  0x68, 0x77, 0x3a, 0x8e, 0xab, 0xad, 0xc5, 0xd2,
-  0x49, 0xd4, 0xda, 0xd6, 0x5f, 0x9d, 0xbf, 0x03,
-  0x2d, 0x47, 0xcd, 0xa6, 0xda, 0x6a, 0x35, 0xc0,
-  0x30, 0x6a, 0x5b, 0xaf, 0x6f, 0x23, 0xa0, 0x17,
-  0x34, 0xc7, 0xb1, 0x01, 0x79, 0xbb, 0x85, 0x56,
-  0x32, 0xff, 0xfa, 0x2d, 0xb4, 0x87, 0xed, 0xf1,
-  0x1b, 0xf2, 0x64, 0x75, 0xa3, 0x7d, 0x21, 0xad,
-  0x59, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
-  0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/go_down.h
+++ b/art/tango/go_down.h
@@ -1,272 +0,0 @@
-/* go_down.png - 683 bytes */
-static const unsigned char go_down_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
-  0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
-  0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
-  0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
-  0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
-  0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
-  0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
-  0x02, 0x3d, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
-  0x85, 0x93, 0x4d, 0x68, 0x13, 0x41, 0x18, 0x86,
-  0xdf, 0x99, 0xec, 0xe6, 0x0f, 0x6b, 0xc0, 0x60,
-  0xd2, 0x43, 0xfc, 0xc1, 0xaa, 0xf5, 0x22, 0x1a,
-  0x8f, 0x49, 0xb4, 0xe0, 0xc1, 0x8b, 0xf1, 0x22,
-  0x14, 0x2f, 0x1e, 0x2a, 0xe2, 0x41, 0x14, 0xea,
-  0xa1, 0x55, 0xf1, 0x2a, 0x08, 0xd2, 0x15, 0x3c,
-  0xa9, 0x50, 0x84, 0x9c, 0x14, 0x21, 0xa2, 0x52,
-  0x53, 0x5b, 0x72, 0xb1, 0xd6, 0x55, 0x08, 0xb5,
-  0x2d, 0x14, 0x7b, 0xa8, 0x55, 0xb4, 0x54, 0xcd,
-  0x9a, 0xae, 0xfd, 0x0b, 0xe9, 0x26, 0xb3, 0xb3,
-  0x9f, 0x87, 0xd6, 0x1a, 0x9b, 0x18, 0xdf, 0xe3,
-  0x37, 0xdf, 0x3c, 0xf3, 0xbe, 0xf3, 0xcd, 0x30,
-  0x22, 0x42, 0xb5, 0xe2, 0xdd, 0x6a, 0x1e, 0x84,
-  0x30, 0xea, 0x89, 0xc1, 0xd0, 0x7b, 0x44, 0x73,
-  0x75, 0x49, 0xa9, 0x69, 0x22, 0x84, 0x6f, 0x5d,
-  0x48, 0xc3, 0x76, 0x04, 0x6c, 0x47, 0x60, 0xc9,
-  0x2a, 0x60, 0xc9, 0x32, 0x01, 0x00, 0x77, 0x1f,
-  0xdd, 0xa8, 0x01, 0xd7, 0x02, 0x00, 0x30, 0xc6,
-  0x90, 0x9b, 0x79, 0x8e, 0xb2, 0x5d, 0x42, 0xa1,
-  0x38, 0x83, 0x8f, 0x73, 0x63, 0x68, 0x3f, 0x78,
-  0xb5, 0xae, 0x29, 0x5e, 0xaf, 0x58, 0x1d, 0xca,
-  0xa3, 0xf8, 0xeb, 0x6e, 0x6c, 0x08, 0x00, 0x11,
-  0x88, 0x1c, 0x10, 0x11, 0x14, 0xee, 0x6e, 0x08,
-  0x50, 0x12, 0x97, 0x55, 0x9d, 0x1c, 0xc4, 0xd6,
-  0xed, 0xbb, 0x60, 0x39, 0x24, 0xbd, 0x92, 0x6c,
-  0x48, 0xb2, 0xb1, 0x5c, 0x36, 0x51, 0xbd, 0x16,
-  0xef, 0x52, 0xd7, 0x0d, 0x32, 0x8e, 0x37, 0x0a,
-  0x39, 0x48, 0x45, 0x42, 0x2d, 0xd1, 0x8b, 0x27,
-  0xaf, 0xfb, 0x14, 0x97, 0x0a, 0x22, 0xc7, 0x2b,
-  0x49, 0x82, 0x98, 0x04, 0xb8, 0x44, 0x51, 0x16,
-  0xa0, 0x7a, 0x39, 0xb8, 0xc2, 0x70, 0xfe, 0xd4,
-  0x35, 0x2f, 0x08, 0x10, 0xa2, 0x82, 0x74, 0x36,
-  0x55, 0x9a, 0x5f, 0x9c, 0x4b, 0x31, 0x22, 0x42,
-  0xa2, 0x5b, 0x4d, 0xb7, 0x45, 0x8f, 0x27, 0x8f,
-  0x44, 0x93, 0x9e, 0xf7, 0xf9, 0x57, 0x90, 0x5c,
-  0x40, 0xa2, 0x8c, 0x15, 0x7b, 0x11, 0xd3, 0xf3,
-  0x39, 0x10, 0x68, 0x2d, 0x16, 0x47, 0xdb, 0xf6,
-  0xd3, 0x18, 0x9d, 0x18, 0x29, 0x4f, 0x4e, 0x8d,
-  0xf7, 0xbd, 0xee, 0x11, 0xed, 0x7c, 0x2d, 0x72,
-  0xc7, 0xcb, 0xb1, 0x8c, 0xf1, 0xc5, 0x98, 0xa2,
-  0x48, 0x70, 0x2f, 0x88, 0x57, 0x00, 0x97, 0x8d,
-  0x42, 0x65, 0x1a, 0xaa, 0x8f, 0xc1, 0xed, 0xe3,
-  0x50, 0x7d, 0x2e, 0x44, 0x23, 0x47, 0x61, 0x2e,
-  0x98, 0x34, 0xf9, 0x61, 0xdc, 0x20, 0xc2, 0x99,
-  0xf5, 0x4b, 0xd4, 0x35, 0x51, 0x04, 0x21, 0xf9,
-  0x70, 0xf0, 0x9e, 0xe5, 0xe5, 0x4d, 0x08, 0xf8,
-  0x83, 0x28, 0xd1, 0x4f, 0x94, 0x5d, 0x8b, 0x70,
-  0x7b, 0x39, 0xdc, 0x3e, 0x17, 0xb6, 0x6d, 0xd9,
-  0x83, 0x90, 0xaf, 0x05, 0xd9, 0xa1, 0x8c, 0x45,
-  0x0e, 0x92, 0xba, 0x26, 0x8a, 0x7f, 0x4d, 0x41,
-  0xd7, 0xc4, 0x44, 0x45, 0xac, 0x74, 0x3e, 0x18,
-  0xbc, 0x53, 0xda, 0x11, 0x38, 0x00, 0x9b, 0x95,
-  0xa0, 0x7a, 0x56, 0x4f, 0xde, 0xbc, 0x29, 0x80,
-  0xfd, 0xa1, 0x63, 0xe8, 0xcb, 0x3e, 0x2e, 0x09,
-  0x51, 0xe9, 0xd4, 0x35, 0x31, 0x51, 0x77, 0x8c,
-  0xba, 0x26, 0x7a, 0x67, 0x8d, 0x4f, 0x2f, 0x86,
-  0xc7, 0x06, 0x44, 0x6b, 0x30, 0x01, 0xae, 0x30,
-  0x28, 0x6e, 0x8e, 0x43, 0xe1, 0x13, 0xc8, 0xbd,
-  0x7b, 0x5b, 0xf9, 0x61, 0x7e, 0xeb, 0xd7, 0x35,
-  0xd1, 0xdb, 0xf0, 0x1d, 0x90, 0x83, 0x8e, 0xa1,
-  0x91, 0x81, 0xef, 0xa6, 0xb1, 0x40, 0xbb, 0x9b,
-  0x62, 0xd8, 0xe5, 0x8f, 0xc1, 0xfc, 0xba, 0x4c,
-  0xb9, 0x51, 0x3d, 0xef, 0xc8, 0xd5, 0xdc, 0x0d,
-  0x01, 0xba, 0x26, 0x8a, 0x24, 0x91, 0xcc, 0x64,
-  0x9f, 0x59, 0x5b, 0xb1, 0x0f, 0x41, 0xa7, 0x15,
-  0x4f, 0xfb, 0x9f, 0x58, 0x8e, 0xfc, 0x93, 0xbb,
-  0x5a, 0x6c, 0xe3, 0x6f, 0xfc, 0xad, 0x78, 0x97,
-  0x7a, 0x2e, 0xd2, 0xbc, 0xf3, 0x36, 0x00, 0xcc,
-  0xe6, 0x3f, 0x5f, 0xda, 0x68, 0xfd, 0xbf, 0x00,
-  0x00, 0x38, 0x7c, 0x45, 0xbd, 0x0f, 0x00, 0xc3,
-  0x37, 0xc5, 0xd9, 0x7f, 0xf5, 0xfc, 0x02, 0x73,
-  0x4a, 0x12, 0x2a, 0x86, 0x68, 0x1c, 0xcb, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
-
-
-/* go_down.png - 1433 bytes */
-static const unsigned char go_down_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
-  0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
-  0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
-  0xf6, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x56, 0x4f, 0x48, 0x54, 0x5d, 0x14, 0xff, 0xbd,
-  0x7f, 0x33, 0xa3, 0x0b, 0x87, 0x52, 0x73, 0xd2,
-  0x6c, 0x08, 0x22, 0xed, 0x9f, 0x15, 0x95, 0xda,
-  0x88, 0x60, 0x11, 0xd8, 0x42, 0x22, 0xa2, 0x20,
-  0x6a, 0x2d, 0xb6, 0x69, 0x11, 0x21, 0x51, 0xdb,
-  0x8a, 0xa0, 0xc9, 0x5a, 0xe5, 0x2e, 0x28, 0x17,
-  0x62, 0x59, 0x60, 0xa4, 0x84, 0x0b, 0x8d, 0x90,
-  0x66, 0x42, 0x73, 0x51, 0x03, 0x86, 0xc3, 0x0c,
-  0x3a, 0x33, 0x3a, 0x3a, 0xe5, 0xe4, 0x38, 0x32,
-  0xe3, 0x9b, 0xb9, 0xf7, 0xbd, 0xfb, 0x2d, 0xde,
-  0xf7, 0x98, 0x7c, 0x36, 0x9f, 0x3a, 0xfa, 0xf1,
-  0x7d, 0x8b, 0x0e, 0x3c, 0x0e, 0xe7, 0x9e, 0x7b,
-  0xef, 0xf9, 0xfd, 0xce, 0xbd, 0xe7, 0xbe, 0x03,
-  0xfc, 0x91, 0x3f, 0xb2, 0x21, 0xe1, 0x72, 0x5d,
-  0xe8, 0x70, 0xb4, 0xb6, 0x8a, 0xe2, 0xec, 0x2c,
-  0xa0, 0xaa, 0x40, 0x49, 0x49, 0xee, 0x10, 0x78,
-  0x1e, 0x88, 0x44, 0x5c, 0x2e, 0xa7, 0x93, 0x52,
-  0x9b, 0x6d, 0xbd, 0xab, 0xc5, 0xdc, 0x03, 0x6b,
-  0xc0, 0xef, 0xdd, 0x6b, 0x69, 0x79, 0xfe, 0x1c,
-  0xa0, 0x54, 0x55, 0x09, 0x01, 0x14, 0x45, 0x55,
-  0x29, 0xd5, 0xec, 0x74, 0x3a, 0x63, 0x2b, 0x8a,
-  0xe6, 0xd7, 0xe7, 0xa5, 0xd3, 0x8a, 0x22, 0xcb,
-  0x40, 0x7b, 0x7b, 0x57, 0xd7, 0xdd, 0xbb, 0xb9,
-  0x27, 0x60, 0x03, 0x04, 0x32, 0xc2, 0x71, 0xc0,
-  0xd0, 0x90, 0xdf, 0xff, 0xf2, 0x25, 0x90, 0x4a,
-  0x51, 0x9a, 0x4c, 0x66, 0xb4, 0x0e, 0xd4, 0x38,
-  0x7e, 0xe6, 0xcc, 0xde, 0xbd, 0xcd, 0xcd, 0x1b,
-  0x8f, 0xcd, 0x6f, 0x06, 0x81, 0xb5, 0x92, 0xe4,
-  0x72, 0xbe, 0xb0, 0xff, 0x32, 0x01, 0xc6, 0x32,
-  0xdf, 0x4a, 0x1f, 0x63, 0xbf, 0xfa, 0x19, 0x63,
-  0x4c, 0x55, 0x33, 0xe3, 0xff, 0x39, 0x81, 0xdf,
-  0x01, 0xd3, 0xb4, 0x56, 0x25, 0x99, 0x39, 0x1a,
-  0x60, 0x42, 0x14, 0x25, 0x95, 0xda, 0x8c, 0xb4,
-  0x69, 0x92, 0xb5, 0x06, 0xea, 0xea, 0x5a, 0x5b,
-  0x45, 0xf1, 0xfd, 0x7b, 0x0d, 0x4e, 0x43, 0xc3,
-  0x0a, 0xe6, 0xbc, 0x28, 0x72, 0x9c, 0x2c, 0x6b,
-  0x80, 0x2d, 0x16, 0x1d, 0x78, 0xe6, 0xd3, 0x6d,
-  0x4d, 0xa7, 0xd3, 0x8a, 0xb2, 0xb4, 0x04, 0xc8,
-  0x32, 0xa5, 0x89, 0xc4, 0xca, 0x7d, 0x1c, 0x8e,
-  0x1b, 0x37, 0x44, 0xf1, 0x77, 0x67, 0xc2, 0xf3,
-  0xc0, 0x87, 0x0f, 0xda, 0x2b, 0xb5, 0x12, 0x47,
-  0x56, 0x02, 0xaa, 0xaa, 0x28, 0x8c, 0xb5, 0xb5,
-  0xd9, 0xed, 0x36, 0xdb, 0x9e, 0x3d, 0x35, 0x35,
-  0xcd, 0xcd, 0x67, 0xcf, 0xde, 0xbe, 0x9d, 0x97,
-  0x27, 0x8a, 0x82, 0x20, 0x49, 0x80, 0xa2, 0x30,
-  0x46, 0xa9, 0xc5, 0xa2, 0xbf, 0x32, 0xaa, 0xca,
-  0x18, 0xa5, 0x5a, 0x40, 0x55, 0xd5, 0x80, 0x69,
-  0xa7, 0xa0, 0xaa, 0xb2, 0x0c, 0xc8, 0x32, 0x30,
-  0x3f, 0x0f, 0x48, 0x92, 0xd9, 0xcc, 0xf3, 0x00,
-  0xcf, 0x0b, 0x02, 0x00, 0x5c, 0xbd, 0x7a, 0xf1,
-  0xe2, 0xad, 0x5b, 0x5a, 0x02, 0x00, 0x80, 0x10,
-  0x42, 0x52, 0x29, 0xe0, 0xcd, 0x9b, 0x81, 0x81,
-  0xce, 0xce, 0x64, 0x72, 0x6e, 0x6e, 0x7e, 0x3e,
-  0x1c, 0x7e, 0xf4, 0x28, 0x1b, 0x4e, 0x21, 0x9b,
-  0x63, 0x6a, 0xca, 0xed, 0x66, 0xcc, 0xeb, 0x2d,
-  0x28, 0xa8, 0xaa, 0x8a, 0xc5, 0x64, 0x39, 0x12,
-  0x89, 0xc5, 0xa6, 0xa6, 0xea, 0xeb, 0x77, 0xef,
-  0x2e, 0x2f, 0xdf, 0xbf, 0x5f, 0x92, 0x3e, 0x7f,
-  0x0e, 0x85, 0xde, 0xbd, 0x03, 0xfc, 0xfe, 0x68,
-  0x74, 0x64, 0x04, 0x50, 0x55, 0x9e, 0xd7, 0x9e,
-  0x4f, 0x60, 0x69, 0x09, 0x88, 0xc5, 0x08, 0x09,
-  0x87, 0x81, 0x64, 0x52, 0x55, 0xa3, 0x51, 0x80,
-  0xe7, 0x25, 0x89, 0xe3, 0x00, 0x41, 0x10, 0x45,
-  0x8e, 0x03, 0xc6, 0xc7, 0xa3, 0x51, 0x97, 0x0b,
-  0x08, 0x06, 0x63, 0x31, 0x8f, 0x07, 0x28, 0x2b,
-  0xb3, 0x5a, 0x2b, 0x2b, 0x81, 0xc1, 0x41, 0xb7,
-  0xbb, 0xb7, 0x37, 0x99, 0x9c, 0x9a, 0x8a, 0x46,
-  0x83, 0xc1, 0x3b, 0x77, 0x5c, 0xae, 0xb6, 0x36,
-  0x45, 0x79, 0xfa, 0x74, 0xdd, 0x04, 0x74, 0x09,
-  0x85, 0xdc, 0x6e, 0x55, 0x75, 0xbb, 0xf3, 0xf3,
-  0x0f, 0x1c, 0x98, 0x9d, 0xdd, 0xb5, 0x8b, 0x10,
-  0x42, 0x08, 0xd9, 0xb7, 0xef, 0xd8, 0xb1, 0x8a,
-  0x8a, 0x93, 0x27, 0x45, 0x31, 0x12, 0x49, 0x24,
-  0x7c, 0x3e, 0x40, 0x96, 0x19, 0x5b, 0x58, 0x00,
-  0xbe, 0x7f, 0x97, 0x65, 0x9f, 0x4f, 0x23, 0x94,
-  0x4a, 0x01, 0x82, 0xa0, 0x01, 0x17, 0x45, 0x4d,
-  0x6b, 0x57, 0x06, 0x30, 0x99, 0x24, 0xc9, 0x6c,
-  0x06, 0xea, 0xeb, 0xed, 0xf6, 0x4b, 0x97, 0x80,
-  0xd1, 0x51, 0x8f, 0x67, 0x78, 0x58, 0x96, 0xbd,
-  0xde, 0x40, 0xc0, 0xe3, 0xe9, 0xe9, 0x71, 0xb9,
-  0x9c, 0x4e, 0x45, 0xb9, 0x7e, 0x7d, 0x35, 0x7c,
-  0xab, 0x12, 0xd0, 0xa5, 0xa6, 0xa6, 0xb4, 0x94,
-  0xb1, 0xbe, 0xbe, 0xb1, 0x31, 0x4a, 0x27, 0x27,
-  0x4f, 0x9f, 0x2e, 0x28, 0xc8, 0xcf, 0xb7, 0x5a,
-  0x4b, 0x4b, 0x2b, 0x2b, 0xed, 0xf6, 0x23, 0x47,
-  0x04, 0xe1, 0xeb, 0xd7, 0xb9, 0xb9, 0xfe, 0x7e,
-  0x00, 0x10, 0x45, 0x4a, 0x01, 0x51, 0x34, 0x99,
-  0x78, 0x3e, 0x43, 0x40, 0x10, 0x24, 0x49, 0xb3,
-  0x45, 0x91, 0xe7, 0x81, 0xda, 0xda, 0xb2, 0xb2,
-  0x0b, 0x17, 0x80, 0x40, 0x20, 0x10, 0x08, 0x06,
-  0x29, 0x1d, 0x1e, 0xfe, 0xf2, 0x65, 0x68, 0xc8,
-  0xe3, 0x59, 0x5a, 0x8a, 0xc5, 0x14, 0xa5, 0xa9,
-  0x69, 0x66, 0x66, 0x74, 0x34, 0xf3, 0x0c, 0x6c,
-  0x02, 0x81, 0xb1, 0xb1, 0xb1, 0x31, 0x80, 0xb1,
-  0x9d, 0x3b, 0xeb, 0xea, 0x54, 0xf5, 0xf5, 0x6b,
-  0xbf, 0x7f, 0x7a, 0x7a, 0x7c, 0xfc, 0xf2, 0x65,
-  0x9b, 0xad, 0xb8, 0xb8, 0xac, 0xcc, 0x6a, 0xdd,
-  0xbe, 0xbd, 0xa8, 0xa8, 0xbc, 0x9c, 0xe3, 0xe6,
-  0xe6, 0x08, 0xf1, 0xfb, 0xb5, 0x8c, 0xf3, 0xfc,
-  0x4a, 0x22, 0x87, 0x0e, 0x6d, 0xdb, 0xd6, 0xd8,
-  0x08, 0x24, 0x12, 0xb1, 0x18, 0xa5, 0x8c, 0xf5,
-  0xf7, 0x0f, 0x0e, 0xbe, 0x7d, 0x1b, 0x89, 0x28,
-  0x0a, 0x21, 0x94, 0x3a, 0x1c, 0xc3, 0xc3, 0x4f,
-  0x9e, 0x00, 0xbf, 0x96, 0xf9, 0x3f, 0xcb, 0xba,
-  0x9f, 0xd1, 0x8f, 0x1f, 0x1f, 0x3c, 0x00, 0x16,
-  0x17, 0x79, 0x9e, 0x10, 0x42, 0x1a, 0x1a, 0xfa,
-  0xfa, 0x06, 0x06, 0xba, 0xbb, 0x17, 0x16, 0xcc,
-  0x66, 0x45, 0xd9, 0xb2, 0x05, 0xa8, 0xa8, 0x28,
-  0x2c, 0x74, 0x38, 0x34, 0xe0, 0x1c, 0x97, 0x29,
-  0xda, 0x8a, 0x8a, 0xa2, 0xa2, 0x13, 0x27, 0x80,
-  0xbc, 0x3c, 0x45, 0xd9, 0xba, 0x15, 0xe8, 0xed,
-  0xed, 0xef, 0xef, 0xe9, 0x59, 0x5c, 0x64, 0x0c,
-  0x10, 0x84, 0x53, 0xa7, 0xdc, 0xee, 0xc7, 0x8f,
-  0x81, 0x9f, 0x3f, 0xd7, 0x8b, 0x67, 0xcd, 0x27,
-  0x60, 0x94, 0x40, 0xc0, 0xed, 0x06, 0xe2, 0xf1,
-  0x1d, 0x3b, 0xaa, 0xab, 0x39, 0x6e, 0x60, 0xc0,
-  0xe7, 0x9b, 0x9c, 0xf4, 0x7a, 0xaf, 0x5c, 0xa9,
-  0xab, 0xab, 0xaa, 0x6a, 0x6c, 0x34, 0x99, 0x54,
-  0x55, 0x14, 0x65, 0x19, 0xb0, 0x5a, 0x2d, 0x96,
-  0xe2, 0x62, 0xc0, 0x6e, 0xcf, 0xcb, 0x3b, 0x7a,
-  0x14, 0xe8, 0xe8, 0xe8, 0xea, 0x7a, 0xf6, 0x2c,
-  0x91, 0x48, 0x26, 0x65, 0x59, 0x96, 0xcf, 0x9f,
-  0x77, 0xbb, 0x9d, 0x4e, 0x42, 0x46, 0x46, 0x72,
-  0xc5, 0x91, 0x33, 0x01, 0x5d, 0x42, 0xa1, 0x4f,
-  0x9f, 0x54, 0x35, 0x1c, 0xb6, 0xd9, 0x6a, 0x6b,
-  0x29, 0x1d, 0x1f, 0x9f, 0x98, 0x98, 0x98, 0xf0,
-  0xf9, 0x9a, 0x9a, 0x1a, 0x1a, 0x0e, 0x1f, 0x3e,
-  0x77, 0x4e, 0x92, 0x8a, 0x8a, 0x2c, 0x16, 0xbb,
-  0x1d, 0xe8, 0xec, 0x7c, 0xf5, 0xaa, 0xa3, 0x23,
-  0x91, 0x88, 0xc7, 0xe3, 0xf1, 0x78, 0xfc, 0xe6,
-  0x4d, 0x97, 0xeb, 0xe1, 0x43, 0x4a, 0x5f, 0xbc,
-  0xd8, 0x68, 0xfc, 0x35, 0x12, 0xd0, 0xbb, 0x18,
-  0xf1, 0xef, 0xff, 0x86, 0x24, 0x69, 0xda, 0x6c,
-  0xd6, 0x75, 0x28, 0xe4, 0x72, 0x31, 0x36, 0x31,
-  0x51, 0x58, 0x78, 0xf0, 0xa0, 0x2c, 0x03, 0x33,
-  0x33, 0x3f, 0x7e, 0x84, 0xc3, 0xc7, 0x8f, 0x7b,
-  0xbd, 0x93, 0x93, 0xdf, 0xbe, 0x51, 0x3a, 0x3d,
-  0x1d, 0x0c, 0x4e, 0x4f, 0x77, 0x77, 0xbb, 0x5c,
-  0x6d, 0x6d, 0x94, 0x3a, 0x9d, 0xda, 0x3a, 0x93,
-  0x69, 0xf9, 0x7e, 0xfa, 0xfe, 0x3c, 0xbf, 0x3c,
-  0x6e, 0xf6, 0x62, 0xce, 0xd2, 0x5e, 0xe9, 0x0b,
-  0x8d, 0x1b, 0x1b, 0x09, 0xe8, 0xb6, 0x20, 0x18,
-  0x01, 0x54, 0x57, 0x5f, 0xbb, 0x26, 0x08, 0xf7,
-  0xef, 0x0b, 0x82, 0x20, 0xf0, 0x7c, 0x49, 0xc9,
-  0xe8, 0x68, 0x7b, 0x3b, 0x21, 0x2d, 0x2d, 0xe9,
-  0x74, 0x3a, 0x0d, 0x10, 0xb2, 0x1c, 0x98, 0xf6,
-  0x0b, 0x04, 0x14, 0x65, 0xb9, 0xad, 0xcf, 0xd3,
-  0x6d, 0xe3, 0x38, 0x63, 0x59, 0x08, 0x18, 0x01,
-  0xea, 0xf6, 0x6a, 0xe3, 0xab, 0xf9, 0xf5, 0xc0,
-  0x46, 0x60, 0xc6, 0xf1, 0xd5, 0xfc, 0xe9, 0xb4,
-  0x4e, 0x38, 0x4b, 0x2b, 0xa1, 0x2f, 0x34, 0x9e,
-  0x48, 0x36, 0xd1, 0x33, 0xa9, 0x67, 0x50, 0xbf,
-  0x02, 0xc6, 0xab, 0xa0, 0xf7, 0x3a, 0xfa, 0xfc,
-  0xb5, 0x9e, 0x80, 0x0e, 0x58, 0xd7, 0x99, 0x2b,
-  0xb5, 0xce, 0x0e, 0x5d, 0x07, 0xa2, 0x5f, 0x19,
-  0xa3, 0x36, 0x02, 0x17, 0x0c, 0x35, 0xf6, 0x6b,
-  0x7f, 0xfa, 0x3b, 0xe2, 0x46, 0x22, 0xfa, 0xbc,
-  0xcd, 0x68, 0xbc, 0xff, 0xa7, 0xf2, 0x17, 0xde,
-  0xda, 0xf8, 0x24, 0x62, 0xe8, 0x0f, 0xfe, 0x00,
-  0x00, 0x00, 0x22, 0x7a, 0x54, 0x58, 0x74, 0x53,
-  0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00,
-  0x00, 0x78, 0xda, 0x2b, 0x2f, 0x2f, 0xd7, 0xcb,
-  0xcc, 0xcb, 0x2e, 0x4e, 0x4e, 0x2c, 0x48, 0xd5,
-  0xcb, 0x2f, 0x4a, 0x07, 0x00, 0x36, 0xd8, 0x06,
-  0x58, 0x10, 0x53, 0xca, 0x5c, 0x00, 0x00, 0x00,
-  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
-  0x82};
--- a/art/tango/go_first.h
+++ b/art/tango/go_first.h
@@ -1,278 +0,0 @@
-/* go_first.png - 666 bytes */
-static const unsigned char go_first_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
-  0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
-  0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
-  0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
-  0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
-  0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
-  0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
-  0x02, 0x2c, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
-  0x7d, 0x53, 0x4d, 0x48, 0x54, 0x51, 0x18, 0x3d,
-  0xdf, 0xbd, 0xef, 0x8d, 0x33, 0x19, 0x46, 0x09,
-  0x31, 0x41, 0x4d, 0x45, 0x41, 0xc2, 0x50, 0x54,
-  0x8b, 0xa6, 0xe6, 0x41, 0x20, 0x65, 0xa5, 0x26,
-  0x24, 0xb8, 0x48, 0x5c, 0x84, 0xa0, 0x41, 0x20,
-  0x6d, 0x66, 0x84, 0xb6, 0x41, 0xb4, 0x9a, 0x60,
-  0xd6, 0x19, 0x34, 0xb4, 0x28, 0xa8, 0x45, 0x20,
-  0xd3, 0xa6, 0x82, 0xa0, 0x18, 0xc8, 0x12, 0xc1,
-  0x4c, 0x88, 0x08, 0x8a, 0x99, 0x10, 0xed, 0xc7,
-  0xd1, 0x9c, 0x9f, 0x37, 0xef, 0xfe, 0xb5, 0x08,
-  0xc9, 0x91, 0x37, 0x73, 0xe1, 0x6e, 0xee, 0x77,
-  0xce, 0xe1, 0x1c, 0xbe, 0x73, 0x11, 0x4f, 0x58,
-  0x26, 0x9e, 0xb0, 0x8c, 0x31, 0x06, 0x8d, 0x6e,
-  0x3c, 0x61, 0x8d, 0x38, 0xe3, 0x56, 0xce, 0x6f,
-  0x66, 0xa1, 0xc9, 0x71, 0x92, 0xf6, 0x56, 0x22,
-  0x64, 0x22, 0xe1, 0x83, 0x3d, 0xf9, 0xc5, 0x2f,
-  0x21, 0x3f, 0x0c, 0x6b, 0x42, 0x3e, 0x0c, 0xc2,
-  0xfc, 0xb9, 0x13, 0x03, 0x7d, 0x63, 0xfd, 0xb7,
-  0x7c, 0xc9, 0x00, 0xfc, 0x1d, 0x38, 0x49, 0x7b,
-  0xb4, 0x35, 0xd4, 0x96, 0x1e, 0xee, 0x1d, 0x0f,
-  0x85, 0xdb, 0x23, 0xc4, 0x18, 0x6f, 0xe8, 0xb2,
-  0x4e, 0x60, 0xdd, 0x72, 0x47, 0xe4, 0x58, 0xcf,
-  0x60, 0xd7, 0x58, 0xa8, 0x2c, 0x8b, 0x98, 0x5b,
-  0x78, 0x85, 0xe3, 0x7b, 0xce, 0x83, 0x38, 0x5c,
-  0x27, 0x69, 0x9b, 0x3a, 0x36, 0x61, 0x89, 0xe2,
-  0x09, 0x6b, 0xfd, 0xf1, 0x08, 0x31, 0x96, 0xed,
-  0x3d, 0x35, 0xb8, 0x2b, 0x16, 0x3d, 0x6b, 0x7f,
-  0x5b, 0xfe, 0x80, 0x62, 0x65, 0x11, 0x86, 0x34,
-  0x62, 0x7b, 0xfb, 0xa0, 0xa1, 0xa0, 0xb5, 0x82,
-  0xd2, 0x12, 0x4a, 0x4b, 0x48, 0x25, 0x71, 0xfb,
-  0xfe, 0xf5, 0xff, 0x0e, 0xda, 0x5a, 0xdb, 0xa7,
-  0x2e, 0x77, 0x5d, 0x0b, 0x6e, 0xdf, 0xb6, 0x83,
-  0x66, 0x0a, 0xcf, 0x21, 0xb4, 0x0b, 0xe2, 0x06,
-  0x20, 0x8d, 0x5c, 0xe1, 0x11, 0x34, 0x14, 0xa4,
-  0xf6, 0x20, 0x64, 0x0d, 0x9e, 0xf0, 0x70, 0x7a,
-  0xdf, 0x50, 0x7d, 0x84, 0xab, 0x97, 0x6e, 0x84,
-  0x96, 0xdd, 0xef, 0x98, 0xce, 0xbf, 0x05, 0x88,
-  0xc0, 0x19, 0x03, 0x67, 0x80, 0x86, 0x80, 0x2b,
-  0x57, 0xe1, 0xea, 0x35, 0xb8, 0xa2, 0x04, 0xa9,
-  0x15, 0xa0, 0x18, 0x24, 0xbc, 0x7a, 0x81, 0xb5,
-  0x5a, 0x11, 0x2b, 0xd5, 0x1f, 0xf8, 0x59, 0x2e,
-  0xc0, 0x93, 0x2e, 0x14, 0xaf, 0x42, 0xf3, 0x2a,
-  0x8c, 0x2d, 0x60, 0xd9, 0x04, 0xc6, 0x09, 0x86,
-  0x03, 0x1a, 0x06, 0x4a, 0x1a, 0xb8, 0xea, 0x0f,
-  0x80, 0x0d, 0x6b, 0xcc, 0x4c, 0xa6, 0xab, 0xb5,
-  0xb2, 0x32, 0x87, 0x76, 0xc6, 0x50, 0x55, 0x2b,
-  0xa8, 0xa8, 0x22, 0x14, 0xf3, 0xc0, 0x6d, 0x82,
-  0x15, 0x60, 0xb0, 0x5a, 0x18, 0xec, 0x16, 0x06,
-  0x2b, 0xc0, 0xc0, 0x6d, 0x02, 0xb1, 0x4d, 0x5b,
-  0xa8, 0x79, 0x95, 0xd8, 0xb3, 0xd7, 0x8f, 0xb3,
-  0x47, 0x3b, 0x62, 0xe1, 0x33, 0xd1, 0x2b, 0x81,
-  0x8f, 0xbf, 0x5f, 0xe0, 0x97, 0xfc, 0x0a, 0x6e,
-  0x11, 0x2e, 0x1e, 0x48, 0x82, 0x71, 0x02, 0x00,
-  0x68, 0xf5, 0xcf, 0x81, 0x92, 0xa6, 0x5e, 0x20,
-  0x97, 0x12, 0x73, 0x4e, 0xd2, 0x8e, 0xce, 0x7e,
-  0x9a, 0xca, 0x2c, 0x2c, 0xe5, 0xbb, 0xbb, 0x3b,
-  0xfb, 0xb7, 0xac, 0xd2, 0x7e, 0x7c, 0x2e, 0xbd,
-  0x01, 0x31, 0xc2, 0x9d, 0xbb, 0x37, 0x5d, 0xe1,
-  0x9a, 0xe0, 0xe6, 0x35, 0xd6, 0xf5, 0x20, 0x97,
-  0x12, 0x25, 0x00, 0x03, 0x4e, 0xd2, 0x1e, 0x7d,
-  0x38, 0x79, 0x2f, 0x7d, 0xa1, 0xb3, 0x37, 0xe4,
-  0xec, 0x1e, 0x22, 0x00, 0x10, 0xae, 0x09, 0xe6,
-  0x52, 0x82, 0x36, 0x17, 0xc9, 0xb7, 0xca, 0xb9,
-  0x94, 0x98, 0x10, 0xc2, 0x3b, 0x99, 0x7d, 0xf9,
-  0xb4, 0xf0, 0x7e, 0xfa, 0x5d, 0x4d, 0x08, 0xcf,
-  0x0f, 0xd6, 0x58, 0x60, 0x3d, 0x92, 0xd1, 0x88,
-  0xce, 0xce, 0xcf, 0x64, 0x1f, 0x3c, 0x99, 0xa8,
-  0x34, 0xc2, 0x35, 0xfd, 0x8d, 0x1b, 0x22, 0x8d,
-  0x30, 0x8e, 0x61, 0x3f, 0xcc, 0x5f, 0x5a, 0xcc,
-  0x0f, 0xfb, 0xcc, 0x70, 0xa3, 0x34, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
-
-
-/* go_first.png - 1501 bytes */
-static const unsigned char go_first_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
-  0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
-  0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
-  0x3a, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x96, 0x5f, 0x48, 0x54, 0x4f, 0x14, 0xc7, 0xcf,
-  0xcc, 0xdc, 0xbd, 0xbb, 0x6e, 0xca, 0xaf, 0x16,
-  0xc5, 0x4d, 0x2a, 0x23, 0x35, 0x24, 0x89, 0x84,
-  0x24, 0x58, 0xb5, 0x55, 0x50, 0xb4, 0x3f, 0x1a,
-  0x54, 0xba, 0x52, 0x41, 0xff, 0x2c, 0x22, 0xa3,
-  0x7c, 0xc8, 0x20, 0xab, 0x87, 0x08, 0x4a, 0x29,
-  0x83, 0xe8, 0xc5, 0x0a, 0x31, 0x02, 0x5f, 0xb2,
-  0xa2, 0x17, 0xb3, 0x40, 0x2c, 0x7c, 0x48, 0x2a,
-  0x4d, 0x13, 0xc2, 0x50, 0xca, 0xa8, 0x2d, 0xd4,
-  0x34, 0x95, 0x4d, 0xf7, 0xcf, 0xbd, 0x77, 0xee,
-  0xfc, 0x1e, 0xe6, 0x37, 0x5c, 0x77, 0x7f, 0x9a,
-  0x3f, 0x75, 0xdf, 0x7e, 0x1d, 0xb8, 0x9c, 0x3b,
-  0xf7, 0xce, 0x9d, 0xf9, 0x7c, 0xcf, 0x9c, 0x33,
-  0x73, 0x01, 0xfe, 0xd8, 0x1f, 0x5b, 0x94, 0x21,
-  0x71, 0x93, 0x9e, 0x5e, 0x51, 0x21, 0x49, 0x43,
-  0x43, 0x00, 0x8c, 0x01, 0xc4, 0xc6, 0xce, 0xd0,
-  0x15, 0x01, 0x7c, 0xfd, 0xda, 0xde, 0x5e, 0x53,
-  0xa3, 0x69, 0xf1, 0xf1, 0xf3, 0x9d, 0x28, 0x3d,
-  0xfd, 0xf4, 0x69, 0x49, 0xda, 0xbd, 0x1b, 0x21,
-  0x8c, 0x01, 0x4e, 0x9e, 0x7c, 0xf9, 0xf2, 0xda,
-  0x35, 0x4d, 0xcb, 0xce, 0x5e, 0xac, 0x00, 0xc9,
-  0xb8, 0xe5, 0xe0, 0xc7, 0x8f, 0x97, 0x94, 0x9c,
-  0x3b, 0x37, 0xfd, 0x29, 0x63, 0x8c, 0x01, 0xdc,
-  0xba, 0xd5, 0xd8, 0x58, 0x55, 0x15, 0x17, 0x37,
-  0x3f, 0x60, 0x84, 0xb8, 0xf0, 0xaa, 0xaa, 0x15,
-  0x2b, 0x62, 0x62, 0x12, 0x12, 0x4e, 0x9d, 0xfa,
-  0xf6, 0xed, 0xc7, 0x8f, 0x4f, 0x9f, 0x22, 0x22,
-  0xc2, 0xb5, 0x02, 0x78, 0xb6, 0x17, 0x0f, 0x1e,
-  0xbc, 0x7b, 0x57, 0x5d, 0x3d, 0xff, 0x01, 0x39,
-  0x78, 0x54, 0x14, 0x8f, 0x74, 0x4b, 0xcb, 0x86,
-  0x0d, 0x49, 0x49, 0x0e, 0x47, 0x79, 0xf9, 0xd1,
-  0xa3, 0x3b, 0x76, 0x54, 0x56, 0x86, 0x0f, 0x5c,
-  0x98, 0xb4, 0xf8, 0x21, 0xa6, 0x83, 0x27, 0x26,
-  0x72, 0xf0, 0xd6, 0xd6, 0xdc, 0xdc, 0x4d, 0x9b,
-  0x76, 0xed, 0x5a, 0xbe, 0x3c, 0x2d, 0x2d, 0x39,
-  0x39, 0x2b, 0xcb, 0x64, 0x92, 0x24, 0x42, 0x4c,
-  0xa6, 0x70, 0xe3, 0x87, 0x41, 0x00, 0x07, 0xcf,
-  0xcf, 0x97, 0x24, 0x49, 0x32, 0x9b, 0x1b, 0x1b,
-  0x8b, 0x8a, 0x72, 0x72, 0x0e, 0x1d, 0x8a, 0x8a,
-  0x8a, 0x89, 0xb1, 0xd9, 0xec, 0x76, 0x84, 0x3a,
-  0x3b, 0xdd, 0xee, 0xa7, 0x4f, 0x01, 0x36, 0x6f,
-  0x4e, 0x48, 0x70, 0xb9, 0x00, 0x10, 0x22, 0x04,
-  0xc0, 0xef, 0xe7, 0xdf, 0x31, 0x36, 0xf7, 0x0c,
-  0x08, 0x01, 0x0c, 0x0f, 0xf3, 0xda, 0xb3, 0xdb,
-  0xc3, 0x26, 0x80, 0x17, 0x7d, 0x65, 0xe5, 0xd2,
-  0xa5, 0x91, 0x91, 0xd1, 0xd1, 0x17, 0x2e, 0x14,
-  0x17, 0xe7, 0xe6, 0x96, 0x96, 0x5a, 0xad, 0x5e,
-  0x2f, 0x63, 0xe3, 0xe3, 0x00, 0x9d, 0x9d, 0x6e,
-  0x77, 0x73, 0x33, 0x80, 0x24, 0x61, 0x2c, 0xcb,
-  0x00, 0xba, 0xae, 0xeb, 0x9a, 0x06, 0x70, 0xf1,
-  0xe2, 0xe1, 0xc3, 0x75, 0x75, 0x16, 0x0b, 0xc6,
-  0x7c, 0xad, 0x10, 0x12, 0x9e, 0x5f, 0x02, 0x59,
-  0xd8, 0xf9, 0xf3, 0xb7, 0x6f, 0xef, 0xdf, 0x3f,
-  0xd3, 0xa6, 0xb2, 0x20, 0x01, 0x08, 0x65, 0x64,
-  0x9c, 0x39, 0x23, 0x49, 0x8f, 0x1f, 0xaf, 0x5a,
-  0x65, 0xb7, 0x27, 0x25, 0xe5, 0xe5, 0x6d, 0xdf,
-  0x9e, 0x99, 0xe9, 0x72, 0x59, 0xad, 0x03, 0x03,
-  0xe3, 0xe3, 0x3d, 0x3d, 0x00, 0xc3, 0xc3, 0x1e,
-  0xcf, 0xe7, 0xcf, 0x00, 0x84, 0x60, 0x2c, 0x49,
-  0xc6, 0x26, 0xd0, 0xd2, 0xd2, 0xd7, 0x77, 0xf7,
-  0xae, 0xf1, 0x9c, 0x10, 0x84, 0x24, 0x69, 0xba,
-  0x80, 0x60, 0x21, 0x4e, 0x67, 0x42, 0x42, 0x49,
-  0xc9, 0xdc, 0x44, 0xff, 0x41, 0xc0, 0xf4, 0x78,
-  0x00, 0xa4, 0xa6, 0x26, 0x27, 0x3b, 0x1c, 0x5b,
-  0xb7, 0xa6, 0xa5, 0xa5, 0xa4, 0x64, 0x66, 0x9a,
-  0xcd, 0x1d, 0x1d, 0x6e, 0xf7, 0x93, 0x27, 0x00,
-  0xbf, 0x7e, 0x05, 0x02, 0xe3, 0xe3, 0x3c, 0xe2,
-  0x26, 0x13, 0x80, 0xae, 0x33, 0xa6, 0xeb, 0x5c,
-  0x80, 0xae, 0x03, 0xe8, 0x3a, 0x00, 0x17, 0xc4,
-  0xdf, 0x33, 0x86, 0x90, 0xa6, 0xf1, 0xd1, 0x39,
-  0x38, 0x63, 0x18, 0x1b, 0x82, 0x35, 0x4d, 0xd7,
-  0x55, 0x35, 0x0c, 0x02, 0x44, 0x44, 0xb6, 0x6c,
-  0xc9, 0xc9, 0x29, 0x28, 0x20, 0x64, 0xd9, 0xb2,
-  0x25, 0x4b, 0xec, 0x76, 0x42, 0x5e, 0xbc, 0xe8,
-  0xef, 0x6f, 0x68, 0x00, 0xd0, 0x34, 0xc6, 0x14,
-  0x85, 0x47, 0x96, 0x83, 0x71, 0x58, 0x71, 0x01,
-  0x48, 0x12, 0xa5, 0x00, 0xaa, 0x8a, 0xd0, 0xd4,
-  0x14, 0x00, 0xa5, 0x94, 0x2a, 0x0a, 0x80, 0xa6,
-  0x69, 0x9a, 0xdf, 0xcf, 0x41, 0x15, 0xc5, 0x10,
-  0x20, 0x49, 0x08, 0x59, 0x2c, 0x00, 0xaa, 0xca,
-  0x98, 0xd7, 0x1b, 0x96, 0x15, 0x08, 0x36, 0x5d,
-  0x67, 0x4c, 0xd3, 0x00, 0x54, 0x55, 0xd7, 0x03,
-  0x01, 0x00, 0x55, 0xa5, 0xd4, 0xef, 0xe7, 0x29,
-  0x10, 0x08, 0x18, 0x11, 0xc7, 0x58, 0x96, 0x45,
-  0x89, 0x6a, 0x1a, 0x80, 0x24, 0x99, 0x4c, 0x18,
-  0x03, 0x60, 0xcc, 0x4f, 0x07, 0x8c, 0x09, 0xe1,
-  0xc1, 0xe1, 0x2b, 0xcc, 0x98, 0xae, 0x33, 0x06,
-  0x10, 0x08, 0x50, 0xea, 0xf3, 0x01, 0x4c, 0x4d,
-  0x51, 0x3a, 0x36, 0x36, 0x37, 0x0f, 0x9e, 0xab,
-  0x03, 0x63, 0xfc, 0x7a, 0xf6, 0xac, 0xb5, 0xb5,
-  0xa9, 0x49, 0xd7, 0xfb, 0xfa, 0x3e, 0x7e, 0xec,
-  0xed, 0x0d, 0x04, 0xb2, 0xb3, 0x13, 0x13, 0xf7,
-  0xec, 0x01, 0x88, 0x8c, 0x34, 0x9b, 0x6d, 0x36,
-  0x80, 0x40, 0x40, 0xd3, 0xbc, 0x5e, 0x00, 0x4a,
-  0x31, 0x0e, 0x04, 0x00, 0x00, 0x08, 0xe1, 0xe0,
-  0xb2, 0x8c, 0x31, 0x80, 0xc9, 0x64, 0x36, 0x63,
-  0x0c, 0x20, 0xcb, 0x16, 0x0b, 0xf7, 0x56, 0x2b,
-  0xc6, 0x00, 0x66, 0x73, 0x44, 0x04, 0x6f, 0x47,
-  0x44, 0x10, 0x02, 0x60, 0x32, 0x59, 0x2c, 0x84,
-  0x18, 0x42, 0x17, 0x2d, 0x80, 0xe3, 0x1b, 0xf7,
-  0x5d, 0x5d, 0xef, 0xdf, 0xbf, 0x7e, 0xfd, 0xfc,
-  0x79, 0x6b, 0x6b, 0x7b, 0x7b, 0x73, 0xb3, 0xcf,
-  0xe7, 0x70, 0xc4, 0xc7, 0xef, 0xdc, 0x09, 0xb0,
-  0x7a, 0xb5, 0xcd, 0xb6, 0x7e, 0xbd, 0x11, 0x59,
-  0x01, 0x40, 0x88, 0xc9, 0xc4, 0xbd, 0x2c, 0x23,
-  0xc4, 0x01, 0xa7, 0x03, 0xcb, 0xb2, 0xd5, 0x2a,
-  0xc0, 0x79, 0x0a, 0xf1, 0x7e, 0x18, 0xe3, 0x19,
-  0xd8, 0x08, 0x59, 0x74, 0x0a, 0xbd, 0x7a, 0x75,
-  0xe3, 0x06, 0xa5, 0xc7, 0x8e, 0x29, 0xca, 0x91,
-  0x23, 0x03, 0x03, 0xe5, 0xe5, 0x1e, 0xcf, 0xe4,
-  0x64, 0x43, 0xc3, 0x89, 0x13, 0xdb, 0xb6, 0x65,
-  0x65, 0x15, 0x15, 0x59, 0x2c, 0xd1, 0xd1, 0x7f,
-  0xfd, 0x15, 0x1b, 0x0b, 0xf0, 0xe1, 0xc3, 0xc4,
-  0x44, 0x5b, 0x1b, 0x00, 0xc6, 0x3c, 0x49, 0x0a,
-  0x0a, 0xd6, 0xac, 0xa9, 0xa8, 0x00, 0x20, 0x44,
-  0xa4, 0x90, 0x48, 0x29, 0x0e, 0x4a, 0xa9, 0xa6,
-  0x31, 0x06, 0x40, 0xa9, 0xaa, 0xf2, 0x3a, 0xe2,
-  0xed, 0x60, 0x93, 0x65, 0xee, 0xfd, 0x7e, 0x11,
-  0xd0, 0x05, 0x9e, 0x03, 0xb2, 0xdc, 0xd5, 0x55,
-  0x57, 0x47, 0x69, 0x7d, 0xfd, 0xda, 0xb5, 0x05,
-  0x05, 0x3f, 0x7f, 0x0e, 0x0c, 0x3c, 0x7c, 0xe8,
-  0xf7, 0xdf, 0xbb, 0x77, 0xf5, 0x6a, 0x7e, 0xbe,
-  0xd3, 0x59, 0x58, 0x68, 0xb5, 0x66, 0x64, 0xac,
-  0x5c, 0xe9, 0x72, 0x21, 0xd4, 0xdd, 0x3d, 0x3a,
-  0xda, 0xd4, 0x64, 0x7c, 0x59, 0x53, 0x73, 0xe7,
-  0xce, 0xa5, 0x4b, 0x8a, 0x42, 0xa9, 0xa2, 0x30,
-  0x26, 0x80, 0x7e, 0x67, 0x08, 0x01, 0x8c, 0x8c,
-  0xfc, 0x13, 0x6f, 0x29, 0xd8, 0xab, 0xea, 0x02,
-  0x05, 0x88, 0xe5, 0x25, 0xa4, 0xbf, 0xbf, 0xa9,
-  0x49, 0xd7, 0xdf, 0xbc, 0xf1, 0x78, 0xdc, 0x6e,
-  0x9f, 0xaf, 0xb4, 0x54, 0x55, 0x55, 0xf5, 0xd1,
-  0xa3, 0x9b, 0x37, 0x1d, 0x8e, 0x8d, 0x1b, 0x9d,
-  0x4e, 0x9b, 0x2d, 0x23, 0x23, 0x25, 0x65, 0xef,
-  0x5e, 0x49, 0xd2, 0x75, 0x4a, 0x79, 0x84, 0x39,
-  0x78, 0x7b, 0xfb, 0xf5, 0xeb, 0x9a, 0x96, 0x99,
-  0xc9, 0xc7, 0xe1, 0x55, 0x63, 0x78, 0x11, 0xe1,
-  0xd0, 0xb6, 0x98, 0xd7, 0xa8, 0x8e, 0x05, 0x0a,
-  0xe0, 0x1b, 0x24, 0x00, 0xa5, 0xc2, 0x0f, 0x0d,
-  0xf5, 0xf4, 0x30, 0xf6, 0xe5, 0x8b, 0xc7, 0xf3,
-  0xfd, 0xbb, 0xa6, 0x1d, 0x38, 0x40, 0xa9, 0xa2,
-  0xb4, 0xb5, 0x5d, 0xbe, 0x3c, 0x3a, 0x3a, 0x36,
-  0x36, 0x32, 0xb2, 0x6e, 0x5d, 0x5e, 0x9e, 0xd3,
-  0x59, 0x58, 0x68, 0xb1, 0x04, 0x8f, 0x63, 0x7c,
-  0x1f, 0xec, 0xc5, 0xf8, 0xc2, 0x8b, 0x64, 0x0a,
-  0x9d, 0xf7, 0x37, 0x02, 0x8a, 0x8b, 0x53, 0x53,
-  0xcf, 0x9e, 0x35, 0x0e, 0x96, 0x60, 0x53, 0x94,
-  0xe0, 0x48, 0x18, 0x13, 0x78, 0xbd, 0xa3, 0xa3,
-  0x00, 0xaa, 0xda, 0xd1, 0x51, 0x5b, 0x4b, 0x69,
-  0x59, 0x99, 0xaa, 0x1e, 0x3c, 0xd8, 0xdb, 0x5b,
-  0x56, 0x36, 0x31, 0x31, 0x31, 0x31, 0x36, 0xe6,
-  0x72, 0xf1, 0x7e, 0x42, 0x88, 0xcf, 0x17, 0x3c,
-  0x9e, 0x38, 0xba, 0x42, 0xdb, 0xa1, 0x7e, 0x46,
-  0x01, 0xfc, 0xa7, 0xa9, 0xb6, 0xf6, 0xfe, 0xfd,
-  0x2b, 0x57, 0x66, 0xfb, 0xf7, 0x18, 0x1c, 0x0c,
-  0x5e, 0x52, 0x31, 0x90, 0xf8, 0xcf, 0x14, 0x13,
-  0x13, 0x22, 0x4e, 0x83, 0xee, 0xee, 0xfa, 0x7a,
-  0x4a, 0xab, 0xab, 0x15, 0xc5, 0xe5, 0x1a, 0x1c,
-  0x7c, 0xfb, 0x36, 0x2a, 0x2a, 0x2e, 0x0e, 0xe3,
-  0x7d, 0xfb, 0x78, 0xbf, 0xc9, 0x49, 0xee, 0x35,
-  0x6d, 0x66, 0x50, 0x31, 0x5e, 0xa8, 0xd0, 0x69,
-  0xd4, 0x30, 0x2f, 0x13, 0xa0, 0xa2, 0xf8, 0x44,
-  0x5b, 0x14, 0x95, 0xd8, 0xe6, 0x44, 0xae, 0xe2,
-  0x59, 0xb6, 0xe9, 0xd0, 0x14, 0x11, 0x81, 0x10,
-  0xe0, 0x22, 0xf7, 0x05, 0xb0, 0xe8, 0xf7, 0x6f,
-  0x9b, 0xa7, 0x80, 0x50, 0x33, 0x8a, 0x79, 0xe6,
-  0x76, 0xe8, 0xbe, 0x3d, 0x1b, 0x78, 0xa8, 0xff,
-  0x1f, 0xd9, 0xdf, 0xdd, 0x50, 0x87, 0x70, 0x35,
-  0xc2, 0x80, 0x45, 0x00, 0x00, 0x00, 0x22, 0x7a,
-  0x54, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77,
-  0x61, 0x72, 0x65, 0x00, 0x00, 0x78, 0xda, 0x2b,
-  0x2f, 0x2f, 0xd7, 0xcb, 0xcc, 0xcb, 0x2e, 0x4e,
-  0x4e, 0x2c, 0x48, 0xd5, 0xcb, 0x2f, 0x4a, 0x07,
-  0x00, 0x36, 0xd8, 0x06, 0x58, 0x10, 0x53, 0xca,
-  0x5c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
-  0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/go_home.h
+++ b/art/tango/go_home.h
@@ -1,252 +0,0 @@
-/* go_home.png - 606 bytes */
-static const unsigned char go_home_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x0a, 0x0e, 0x14, 0x25, 0x13, 0x53,
-  0x2a, 0xd2, 0x3b, 0x00, 0x00, 0x01, 0xeb, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0xbf,
-  0x6b, 0x53, 0x51, 0x14, 0x80, 0xbf, 0x7b, 0xfb,
-  0xde, 0x4b, 0xd3, 0x40, 0xf2, 0x24, 0xa0, 0x55,
-  0x87, 0x64, 0x51, 0x7b, 0x13, 0x68, 0x55, 0xac,
-  0x11, 0x5c, 0x1c, 0x8c, 0x42, 0x13, 0xa7, 0x87,
-  0xd4, 0x4a, 0x27, 0x91, 0xa2, 0xa3, 0x18, 0x5c,
-  0x3a, 0xb4, 0x6e, 0xc1, 0xa9, 0xfe, 0x18, 0xea,
-  0xd4, 0x25, 0x8b, 0xf5, 0xc7, 0x60, 0x13, 0xf0,
-  0x0f, 0xf0, 0x3f, 0x10, 0x79, 0x5b, 0x5c, 0xc4,
-  0x5a, 0xdb, 0xf0, 0x62, 0x51, 0x89, 0x21, 0x79,
-  0xd7, 0x21, 0xf6, 0xd9, 0x97, 0x50, 0x21, 0x67,
-  0xba, 0x5c, 0xce, 0xf7, 0xdd, 0x73, 0x0e, 0xe7,
-  0xc2, 0x01, 0xe1, 0x29, 0x55, 0xac, 0x80, 0xae,
-  0x80, 0xf6, 0x94, 0x7a, 0xc8, 0x30, 0xb1, 0x07,
-  0x7b, 0x4a, 0x69, 0x4f, 0xa9, 0x3d, 0x49, 0x71,
-  0x68, 0x78, 0xb1, 0x38, 0xa3, 0xcb, 0x37, 0x6f,
-  0xfc, 0x57, 0x22, 0xfa, 0xe1, 0x9a, 0xeb, 0x6e,
-  0x14, 0x94, 0x62, 0xfd, 0xdc, 0x59, 0xb6, 0x27,
-  0x4e, 0x71, 0xe4, 0xf0, 0x38, 0x27, 0xbc, 0x26,
-  0x53, 0x6b, 0x6b, 0xd4, 0x5c, 0x97, 0x82, 0x52,
-  0xd7, 0x0e, 0xb9, 0x6e, 0x75, 0x40, 0xb0, 0x1f,
-  0x7e, 0x53, 0x9c, 0x61, 0xf7, 0xf8, 0x31, 0x94,
-  0xca, 0x32, 0x16, 0x8d, 0xd2, 0x6a, 0xb5, 0x18,
-  0xdb, 0xfc, 0x4a, 0xb6, 0x5c, 0x1e, 0x90, 0x88,
-  0x7e, 0xb8, 0x7a, 0xfb, 0x16, 0x9d, 0x64, 0x92,
-  0x74, 0x2a, 0x4d, 0x2a, 0x95, 0x02, 0x40, 0x6b,
-  0x68, 0xb7, 0xdb, 0xec, 0xd6, 0xeb, 0x9c, 0x2c,
-  0x95, 0x42, 0x12, 0xb1, 0x1f, 0x7e, 0xf7, 0xa0,
-  0x44, 0xc7, 0x30, 0xc9, 0xe5, 0x2e, 0x60, 0xdb,
-  0x76, 0xd0, 0x9a, 0xd6, 0x1a, 0x00, 0xdf, 0xf7,
-  0xf9, 0xb9, 0xb5, 0x45, 0x72, 0x6e, 0x2e, 0x90,
-  0x88, 0x0a, 0xe8, 0x82, 0x52, 0xbc, 0x7f, 0x54,
-  0xc6, 0x6b, 0x36, 0x39, 0x3f, 0x9d, 0x23, 0x1e,
-  0x8f, 0x23, 0x84, 0x08, 0x09, 0x7c, 0xdf, 0x0f,
-  0xce, 0x86, 0x10, 0x8c, 0xe6, 0xf3, 0xd4, 0x5c,
-  0x17, 0x03, 0xb8, 0x03, 0xac, 0x4e, 0x9d, 0x3e,
-  0xc3, 0xfd, 0xd2, 0x3d, 0x36, 0xaa, 0x6f, 0x03,
-  0xf0, 0xc9, 0xca, 0x33, 0x56, 0x1e, 0x3f, 0x45,
-  0x8b, 0x11, 0x74, 0xa7, 0x85, 0x30, 0x46, 0xd1,
-  0xdd, 0xdf, 0x2c, 0x2f, 0x2d, 0xd1, 0xee, 0xa5,
-  0xcc, 0xca, 0x79, 0x78, 0xbe, 0x30, 0x99, 0x21,
-  0x11, 0x4f, 0x00, 0xa0, 0xd4, 0x04, 0x99, 0x8c,
-  0x22, 0x9b, 0xcd, 0xf4, 0x5e, 0x14, 0x92, 0x91,
-  0xf4, 0x95, 0xde, 0xc4, 0x53, 0x79, 0x90, 0x16,
-  0x5a, 0x6b, 0x16, 0x26, 0x33, 0xcc, 0xc3, 0xba,
-  0xec, 0xef, 0xd3, 0xb2, 0x2c, 0x4c, 0xd3, 0xc4,
-  0x30, 0x8c, 0xe0, 0xfe, 0x4b, 0xe3, 0x07, 0x00,
-  0x1f, 0xea, 0x3b, 0x74, 0xbb, 0x7e, 0x90, 0x0b,
-  0x30, 0x20, 0x90, 0x52, 0x22, 0xa5, 0xc4, 0x92,
-  0x9f, 0x01, 0xe8, 0x60, 0xf1, 0xf1, 0x53, 0x03,
-  0x80, 0x6f, 0xde, 0x2f, 0x3a, 0x22, 0x12, 0x5a,
-  0x24, 0x63, 0x60, 0xb3, 0xfe, 0x0e, 0xcf, 0xe7,
-  0x28, 0x00, 0x97, 0x2e, 0x4e, 0x73, 0x35, 0x1a,
-  0x43, 0xea, 0x71, 0x2e, 0x4b, 0x93, 0xed, 0x4d,
-  0x42, 0x15, 0x18, 0xfd, 0x15, 0xfc, 0x9b, 0x7e,
-  0xef, 0xa5, 0xef, 0xde, 0x0e, 0xa2, 0xd9, 0x38,
-  0x70, 0xf5, 0x03, 0x41, 0x24, 0x12, 0xc1, 0xb6,
-  0x6d, 0x12, 0x89, 0x04, 0x02, 0x89, 0x10, 0x10,
-  0x8b, 0xc5, 0x70, 0x1c, 0x67, 0x00, 0xb2, 0x2c,
-  0x2b, 0xfc, 0x17, 0xae, 0xcf, 0x3a, 0xaf, 0x00,
-  0x87, 0xe1, 0x62, 0xf5, 0xe5, 0x8b, 0xd7, 0x77,
-  0xff, 0x00, 0x56, 0xf8, 0xd5, 0xa3, 0x85, 0xbb,
-  0x80, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
-  0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* go_home.png - 1354 bytes */
-static const unsigned char go_home_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
-  0xd5, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xdd,
-  0x55, 0xcf, 0x4f, 0x53, 0x4b, 0x14, 0xfe, 0x66,
-  0x7a, 0xef, 0x2d, 0x2d, 0xc5, 0x96, 0x02, 0x4a,
-  0x31, 0xd2, 0xc6, 0xc4, 0x48, 0x23, 0x21, 0x1a,
-  0x83, 0x90, 0xb0, 0x71, 0xa1, 0x68, 0x48, 0x03,
-  0x26, 0x8d, 0x81, 0xf8, 0x23, 0xfd, 0x0b, 0xba,
-  0x32, 0x25, 0x46, 0x83, 0xff, 0x40, 0x63, 0x82,
-  0x42, 0x74, 0xa5, 0x62, 0x74, 0x81, 0x51, 0x12,
-  0x4a, 0xc2, 0x86, 0x35, 0x0b, 0x16, 0x2e, 0xa4,
-  0x56, 0x5c, 0x48, 0x94, 0x05, 0x29, 0x84, 0x1f,
-  0x2d, 0x28, 0xa5, 0x85, 0xde, 0x76, 0xde, 0x62,
-  0x32, 0xef, 0x96, 0x7b, 0xb9, 0xa1, 0x82, 0x79,
-  0x2f, 0xef, 0x9d, 0xcd, 0xc9, 0x99, 0x3b, 0x73,
-  0xe6, 0xfb, 0xe6, 0x7c, 0xf7, 0x1c, 0xe0, 0x3f,
-  0x6e, 0xe4, 0x4f, 0x27, 0x7c, 0xfb, 0x16, 0x00,
-  0x3c, 0x1e, 0x1e, 0x25, 0x93, 0x7b, 0xbf, 0x5e,
-  0xb8, 0x70, 0xe7, 0x0e, 0x00, 0x7c, 0xfa, 0xf4,
-  0x6f, 0x13, 0x37, 0x01, 0x7e, 0xf1, 0x22, 0xf7,
-  0x8c, 0x6d, 0x6d, 0x45, 0x22, 0x91, 0x88, 0xe6,
-  0xc5, 0xfa, 0x5e, 0x82, 0x47, 0xb7, 0x23, 0x57,
-  0x40, 0x00, 0xe7, 0xd1, 0xc7, 0x8f, 0x37, 0x6e,
-  0x44, 0x22, 0x91, 0x88, 0xf9, 0xfe, 0xf1, 0xf1,
-  0x68, 0x34, 0x1a, 0x15, 0x51, 0x43, 0x03, 0xaf,
-  0xc8, 0xd2, 0xd2, 0x61, 0xef, 0xa7, 0x7f, 0x1a,
-  0xf8, 0xe6, 0xe6, 0xf4, 0xf4, 0xf4, 0xb4, 0x71,
-  0x7f, 0x2a, 0x35, 0x31, 0x31, 0x31, 0x01, 0xec,
-  0x25, 0x98, 0x4c, 0x1e, 0xb5, 0x22, 0xbf, 0x4d,
-  0xc0, 0x0c, 0x78, 0x2e, 0x37, 0x3b, 0x3b, 0x3b,
-  0x0b, 0x38, 0x1c, 0x35, 0x35, 0x35, 0x35, 0xe6,
-  0xe7, 0xff, 0x34, 0x91, 0xb2, 0x25, 0x64, 0x06,
-  0x5c, 0x55, 0xe7, 0xe7, 0xe7, 0xe7, 0x01, 0x4a,
-  0x25, 0x49, 0x92, 0x00, 0x4a, 0x7d, 0x3e, 0x9f,
-  0x4f, 0x2f, 0x15, 0x0d, 0xf0, 0xda, 0x5a, 0x2c,
-  0x16, 0x8b, 0x01, 0x94, 0x12, 0x42, 0x08, 0xe0,
-  0x76, 0x77, 0x77, 0x77, 0x77, 0x1f, 0x5e, 0x5a,
-  0x07, 0x56, 0xc0, 0x0c, 0x38, 0x63, 0xc9, 0x64,
-  0x32, 0x09, 0x50, 0x5a, 0x55, 0x55, 0x55, 0x65,
-  0x04, 0xfe, 0xf5, 0x6b, 0x20, 0xd0, 0xd5, 0x05,
-  0x2c, 0x2e, 0xde, 0xba, 0xd5, 0xd7, 0xa7, 0xad,
-  0xd7, 0xd6, 0xf6, 0xf4, 0xf4, 0xf4, 0x00, 0xaa,
-  0xca, 0x18, 0x63, 0x47, 0xaf, 0x88, 0x69, 0x05,
-  0x78, 0x02, 0xfe, 0x0e, 0xc0, 0x9b, 0x37, 0x1a,
-  0xf0, 0x74, 0x3a, 0x9d, 0x2e, 0x49, 0x40, 0xaa,
-  0xab, 0xab, 0xab, 0x35, 0x80, 0x99, 0xcc, 0xdd,
-  0xbb, 0xb7, 0x6f, 0x03, 0xab, 0xab, 0x4d, 0x4d,
-  0x67, 0xcf, 0x02, 0x27, 0x4e, 0x1c, 0x3f, 0x5e,
-  0x5f, 0x0f, 0x9c, 0x39, 0x93, 0x4e, 0x6f, 0x6c,
-  0x00, 0x8b, 0x8b, 0xfd, 0xfd, 0xfd, 0xfd, 0x1a,
-  0xe0, 0xe5, 0x65, 0x5e, 0x11, 0x45, 0x39, 0x5c,
-  0x45, 0x0e, 0x20, 0xc0, 0x98, 0xf6, 0x32, 0xd9,
-  0x6c, 0x36, 0x0b, 0x00, 0xbb, 0xbb, 0xbb, 0xbb,
-  0x00, 0xe0, 0x74, 0x3a, 0x9d, 0xda, 0x45, 0x3b,
-  0x3b, 0x91, 0xc8, 0xbd, 0x7b, 0xc0, 0xcf, 0x9f,
-  0x27, 0x4f, 0x36, 0x34, 0x00, 0x7e, 0xbf, 0xdf,
-  0x7f, 0xee, 0x1c, 0x60, 0xb7, 0xdb, 0x6c, 0x36,
-  0x1b, 0x90, 0xcb, 0xe5, 0x72, 0xb9, 0x1c, 0x60,
-  0xb7, 0x2f, 0x2d, 0x2d, 0x2f, 0x03, 0x0b, 0x0b,
-  0xa1, 0x50, 0x28, 0x54, 0x4a, 0x64, 0x7c, 0x7c,
-  0x7c, 0x1c, 0x50, 0x14, 0x4a, 0x29, 0x35, 0x12,
-  0xe1, 0x04, 0x88, 0x01, 0xaf, 0xb4, 0x3f, 0xf0,
-  0x8a, 0x0a, 0xfd, 0x3a, 0x63, 0x9c, 0x00, 0x21,
-  0x6e, 0xb7, 0xdb, 0xad, 0x25, 0x66, 0xec, 0xf1,
-  0xe3, 0x68, 0x14, 0xa0, 0x94, 0xff, 0xbc, 0xe7,
-  0xcf, 0x7b, 0xbd, 0x3e, 0x1f, 0xe0, 0xf5, 0x7a,
-  0xbd, 0x5e, 0x6f, 0xe9, 0x79, 0xc6, 0x38, 0xfd,
-  0x53, 0xa7, 0x1a, 0x1b, 0x01, 0x59, 0x9e, 0x9c,
-  0x9c, 0x9c, 0x04, 0x46, 0x47, 0x83, 0xc1, 0x60,
-  0x10, 0xe8, 0xeb, 0x0b, 0x87, 0xc3, 0x61, 0x8d,
-  0x48, 0xb9, 0x26, 0xed, 0xbf, 0x6c, 0xb7, 0x1b,
-  0x4a, 0xa5, 0x03, 0x6e, 0xb1, 0xbc, 0x7a, 0xf5,
-  0xe2, 0x05, 0xa0, 0xaa, 0x92, 0x24, 0xcb, 0x40,
-  0x47, 0x47, 0x5b, 0x5b, 0x7b, 0x3b, 0xe0, 0x72,
-  0xb9, 0x5c, 0x2e, 0x97, 0x31, 0x23, 0x63, 0x82,
-  0x02, 0x37, 0xb1, 0xaf, 0xa6, 0x66, 0x66, 0x66,
-  0x66, 0x06, 0x18, 0x1d, 0x6d, 0x6f, 0x6f, 0x6f,
-  0xd7, 0x88, 0x94, 0x6b, 0x65, 0xb7, 0xd1, 0xc1,
-  0xc1, 0xb1, 0xb1, 0x0f, 0x1f, 0x80, 0x42, 0x61,
-  0x64, 0xe4, 0xe5, 0x4b, 0x20, 0x9f, 0xe7, 0x5d,
-  0xa7, 0xb5, 0xb5, 0xb5, 0xf5, 0xd2, 0x25, 0xc0,
-  0xe1, 0x70, 0x38, 0x1c, 0x0e, 0xa0, 0x50, 0x28,
-  0x14, 0x0a, 0x05, 0x73, 0x9f, 0xcf, 0xe7, 0xf3,
-  0xf9, 0xbc, 0x16, 0x5b, 0xad, 0xbc, 0x72, 0x9d,
-  0x9d, 0x73, 0x73, 0x73, 0x73, 0xc0, 0xe8, 0xe8,
-  0xd0, 0xd0, 0xd0, 0x90, 0xf1, 0x7e, 0xae, 0x0c,
-  0x6a, 0xc0, 0x6b, 0xfa, 0x0f, 0x4c, 0x4d, 0xb5,
-  0xb4, 0xb4, 0xb4, 0x84, 0x42, 0x2b, 0x2b, 0xf1,
-  0x78, 0x3c, 0x3e, 0x32, 0xd2, 0xd6, 0x36, 0x3f,
-  0xff, 0xed, 0x1b, 0xf0, 0xe0, 0xc1, 0xc3, 0x87,
-  0xf7, 0xef, 0x1f, 0x4c, 0x78, 0x78, 0xf8, 0xe9,
-  0xd3, 0x67, 0xcf, 0x80, 0x62, 0xb1, 0x58, 0x2c,
-  0x16, 0x81, 0xc1, 0xc1, 0x27, 0x4f, 0x86, 0x86,
-  0x00, 0xc6, 0x08, 0xb1, 0x58, 0x00, 0xc6, 0x54,
-  0x35, 0x97, 0x03, 0x08, 0x91, 0xa4, 0x8a, 0x0a,
-  0x80, 0xb1, 0x42, 0x61, 0x67, 0x07, 0x78, 0xf4,
-  0x68, 0x60, 0x60, 0x60, 0x00, 0x88, 0xc5, 0x78,
-  0x77, 0xab, 0xad, 0x6d, 0x6e, 0x6e, 0x6e, 0x0e,
-  0x87, 0xaf, 0x5f, 0x4f, 0x24, 0x12, 0x89, 0xe1,
-  0xe1, 0x32, 0x25, 0x04, 0x74, 0x76, 0xc6, 0xe3,
-  0xf1, 0xf8, 0xeb, 0xd7, 0x37, 0x6f, 0xf6, 0xf6,
-  0x06, 0x83, 0x23, 0x23, 0x5d, 0x5d, 0x6e, 0x77,
-  0xe9, 0x80, 0xf2, 0xfb, 0xfd, 0xfe, 0xa6, 0x26,
-  0x80, 0x10, 0xde, 0x3d, 0x84, 0x17, 0x26, 0x5e,
-  0x58, 0x48, 0x87, 0x31, 0x42, 0x28, 0x05, 0x2c,
-  0x16, 0x9f, 0xaf, 0xb3, 0x93, 0xcf, 0x8f, 0x89,
-  0x09, 0x80, 0x10, 0xaf, 0xf7, 0xea, 0x55, 0x80,
-  0xb1, 0x85, 0x85, 0xa9, 0x29, 0x6d, 0x7f, 0x2c,
-  0xd6, 0xdb, 0x1b, 0x0c, 0x02, 0x3e, 0x5f, 0x63,
-  0xe3, 0xe9, 0xd3, 0xcf, 0x9f, 0x03, 0x89, 0x44,
-  0x22, 0x71, 0x04, 0x09, 0xe9, 0x35, 0xac, 0x28,
-  0x8a, 0xa2, 0x28, 0x80, 0x2c, 0xcb, 0xb2, 0x2c,
-  0x03, 0x92, 0xc4, 0x25, 0x25, 0x62, 0xf1, 0xf2,
-  0x7a, 0x22, 0xc9, 0xe4, 0xfa, 0xfa, 0xd6, 0x96,
-  0x96, 0xe7, 0xf3, 0xe7, 0xef, 0xdf, 0xd7, 0xd6,
-  0xf8, 0xbe, 0x62, 0xd1, 0x78, 0x4f, 0x34, 0x1a,
-  0x8d, 0x46, 0xa3, 0xa5, 0x2b, 0xbf, 0x45, 0x40,
-  0xfa, 0xbb, 0x42, 0xfa, 0xc4, 0x94, 0xf2, 0x76,
-  0x27, 0xbc, 0xa2, 0x50, 0xba, 0xb8, 0x08, 0x48,
-  0x12, 0x21, 0xa9, 0x94, 0x46, 0x40, 0x78, 0x55,
-  0x05, 0x14, 0x05, 0xf8, 0xf2, 0xe5, 0xc7, 0x8f,
-  0xf5, 0x75, 0x2d, 0xcf, 0xca, 0x4a, 0x3a, 0xbd,
-  0xbd, 0x0d, 0xa8, 0x2a, 0x21, 0x56, 0xab, 0xf1,
-  0x1e, 0x6e, 0xa2, 0x2b, 0x96, 0xd1, 0x46, 0xb9,
-  0x59, 0x2c, 0xdc, 0x57, 0x56, 0x9a, 0x11, 0xd0,
-  0x4b, 0xa6, 0x58, 0xe4, 0x73, 0x33, 0x9b, 0xcd,
-  0xe5, 0x4a, 0x81, 0x7b, 0x3c, 0x1e, 0x8f, 0xc7,
-  0x03, 0x5c, 0xbe, 0xdc, 0xd1, 0xd1, 0xda, 0x0a,
-  0x5c, 0xbb, 0x66, 0xb3, 0x55, 0x56, 0x02, 0x94,
-  0x32, 0x56, 0x5f, 0x0f, 0x5c, 0xb9, 0x42, 0xa9,
-  0x2c, 0x03, 0xab, 0xab, 0x7c, 0x48, 0xed, 0x4f,
-  0x40, 0x88, 0x57, 0x0c, 0x32, 0x55, 0x35, 0x21,
-  0x20, 0x20, 0x89, 0x97, 0x2f, 0x9f, 0x00, 0x00,
-  0x58, 0xad, 0x00, 0x1f, 0x5b, 0x1a, 0x01, 0x61,
-  0x9b, 0x9b, 0xe9, 0xf4, 0xda, 0x1a, 0x40, 0xc8,
-  0xc6, 0x46, 0x69, 0x05, 0xf4, 0x96, 0x4a, 0xa5,
-  0x52, 0xa9, 0x94, 0x7e, 0x95, 0x98, 0x36, 0x1b,
-  0x93, 0x0a, 0x88, 0x03, 0x5a, 0xdb, 0x12, 0x9a,
-  0x17, 0xfd, 0xdb, 0xe9, 0xe4, 0x93, 0x98, 0x10,
-  0xbe, 0xab, 0x94, 0x0e, 0x21, 0x40, 0x5d, 0x5d,
-  0x5d, 0x5d, 0x5d, 0x1d, 0x90, 0xc9, 0x64, 0x32,
-  0x99, 0x0c, 0x10, 0x08, 0x04, 0x02, 0x81, 0x00,
-  0x0e, 0x34, 0xbb, 0xdd, 0x6e, 0x37, 0x4e, 0xa1,
-  0x4c, 0x46, 0x3c, 0xa3, 0x01, 0xe9, 0xfe, 0xc0,
-  0x85, 0x84, 0xaa, 0xaa, 0x78, 0x17, 0x32, 0xbe,
-  0xc9, 0x3f, 0x65, 0xef, 0xdf, 0xbf, 0x7b, 0x37,
-  0x36, 0x26, 0xcb, 0x3c, 0xd2, 0xa4, 0x63, 0x42,
-  0x40, 0x4f, 0x44, 0x48, 0xc9, 0x6a, 0xe5, 0x5e,
-  0xfc, 0x4c, 0xc7, 0x8e, 0x71, 0x2f, 0xb4, 0x59,
-  0x5b, 0xcb, 0x3d, 0x97, 0x8f, 0x76, 0xae, 0x50,
-  0xd8, 0x9b, 0x57, 0xf4, 0x1f, 0xb1, 0x9e, 0xcf,
-  0x73, 0xbf, 0xb1, 0xc1, 0xfd, 0xaf, 0x5f, 0xdc,
-  0xaf, 0xae, 0x72, 0xbf, 0xbd, 0xbd, 0x7f, 0x9e,
-  0x03, 0x09, 0xe8, 0x89, 0xe8, 0x63, 0x21, 0x2d,
-  0x11, 0x8b, 0x17, 0x12, 0xb1, 0xfe, 0x9c, 0x1e,
-  0x80, 0x90, 0x82, 0xf0, 0xe2, 0xbb, 0xf0, 0xe6,
-  0x6d, 0xf3, 0x7f, 0x67, 0x7f, 0x01, 0x78, 0xb4,
-  0xac, 0x22, 0x26, 0x29, 0xea, 0x45, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
--- a/art/tango/go_last.h
+++ b/art/tango/go_last.h
@@ -1,276 +0,0 @@
-/* go_last.png - 685 bytes */
-static const unsigned char go_last_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
-  0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
-  0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
-  0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
-  0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
-  0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
-  0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
-  0x02, 0x3f, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
-  0x95, 0x93, 0x4d, 0x48, 0x94, 0x51, 0x14, 0x86,
-  0x9f, 0xfb, 0xdd, 0x7b, 0x3f, 0xc7, 0xd1, 0xa2,
-  0x60, 0xb2, 0x08, 0x8d, 0x2c, 0x28, 0x08, 0xd2,
-  0x16, 0x05, 0xe1, 0x48, 0x44, 0x04, 0x2d, 0xb4,
-  0x45, 0x42, 0x8b, 0x68, 0x63, 0x50, 0x04, 0xad,
-  0xa2, 0x46, 0x11, 0x5a, 0xe4, 0xaa, 0x4d, 0xc2,
-  0xe0, 0xa2, 0x5c, 0x54, 0x10, 0x04, 0x69, 0xe4,
-  0x22, 0x22, 0xfb, 0x33, 0x88, 0x16, 0xa3, 0xd2,
-  0x1f, 0x62, 0xb5, 0x29, 0x82, 0x82, 0xd0, 0xf9,
-  0x61, 0x4a, 0xd3, 0xd1, 0xe9, 0xfb, 0xe6, 0xbb,
-  0xb7, 0x85, 0x69, 0x6a, 0x63, 0xd4, 0x0b, 0x77,
-  0x73, 0xce, 0xe1, 0x81, 0xfb, 0xbe, 0xe7, 0x08,
-  0x6b, 0x2d, 0x4b, 0x55, 0xdf, 0xaa, 0x13, 0xd6,
-  0x70, 0x3d, 0xd1, 0xe1, 0x5f, 0xf9, 0xa3, 0xf9,
-  0x4b, 0xd1, 0x98, 0xb6, 0x00, 0x4e, 0xb1, 0xa6,
-  0x35, 0xd4, 0x55, 0x56, 0x6c, 0xee, 0x8c, 0xb6,
-  0xe8, 0xdb, 0xd1, 0x98, 0x2e, 0x5f, 0x0e, 0xb2,
-  0x2c, 0x00, 0xe0, 0x54, 0x53, 0x7b, 0xe9, 0xfe,
-  0x5d, 0x87, 0x0e, 0x22, 0x78, 0x17, 0x8d, 0xe9,
-  0xed, 0xff, 0x0d, 0x90, 0x42, 0xb1, 0xa7, 0xb6,
-  0xa1, 0xe4, 0x54, 0x53, 0x7b, 0x55, 0x38, 0xb4,
-  0x62, 0x28, 0x1a, 0xd3, 0x27, 0x8a, 0xcd, 0xa9,
-  0x68, 0x8b, 0x4e, 0x62, 0x59, 0xbb, 0xb0, 0x28,
-  0x24, 0x79, 0x63, 0x4d, 0x68, 0x64, 0xf4, 0x29,
-  0xd5, 0x91, 0x1a, 0xd1, 0x7a, 0x34, 0x1e, 0xee,
-  0xe9, 0xbf, 0xd4, 0x59, 0xdf, 0xa2, 0x0f, 0x58,
-  0x4b, 0x73, 0xa2, 0xc3, 0x9f, 0x9a, 0x9f, 0xad,
-  0x3b, 0xab, 0x6c, 0x5b, 0x73, 0x1c, 0x47, 0x48,
-  0xa4, 0xa3, 0x90, 0x42, 0x21, 0x1d, 0x89, 0x94,
-  0x92, 0xe7, 0x5f, 0xee, 0xa1, 0x1c, 0xc5, 0xea,
-  0xd2, 0xf5, 0x6c, 0x5c, 0x55, 0xc3, 0xe0, 0xdb,
-  0x27, 0x7e, 0xdf, 0xc0, 0xcd, 0x31, 0x6b, 0x4c,
-  0x23, 0x30, 0x02, 0xa0, 0x00, 0x8c, 0x09, 0x78,
-  0xfc, 0xfe, 0x1a, 0x5a, 0x96, 0xa0, 0x95, 0x4b,
-  0x89, 0x1b, 0xc2, 0x75, 0x5d, 0x94, 0xd4, 0x08,
-  0x21, 0xc9, 0xe6, 0x3f, 0xf1, 0x3d, 0x9d, 0xa6,
-  0x66, 0xeb, 0x4e, 0x5d, 0x59, 0x51, 0x5d, 0xd5,
-  0xfd, 0xe8, 0xf2, 0xd0, 0x44, 0x2e, 0xfb, 0xdb,
-  0x83, 0x82, 0xf1, 0xc8, 0xe6, 0x46, 0x19, 0x9b,
-  0xf8, 0x48, 0x32, 0xf7, 0x81, 0xac, 0xf7, 0x99,
-  0xc9, 0x20, 0x4d, 0x41, 0xe4, 0x08, 0x64, 0x9e,
-  0x82, 0x33, 0xc3, 0xb4, 0xc9, 0x32, 0x9c, 0x7a,
-  0x48, 0xe0, 0xe6, 0xc4, 0xc9, 0xa6, 0x73, 0xe1,
-  0x79, 0x0f, 0x00, 0x66, 0xfc, 0x29, 0x72, 0xde,
-  0x38, 0x8e, 0x12, 0x18, 0xeb, 0x50, 0xf0, 0x27,
-  0x99, 0x12, 0x63, 0x64, 0x0a, 0x02, 0xad, 0x42,
-  0xb8, 0xa2, 0x14, 0x4d, 0x19, 0x4e, 0xe0, 0xb2,
-  0xd2, 0x8b, 0xa0, 0x4c, 0x29, 0x8b, 0x00, 0xf3,
-  0x91, 0x48, 0x81, 0x23, 0x05, 0x52, 0x09, 0x94,
-  0x16, 0x28, 0xd7, 0x41, 0x38, 0x3e, 0x9e, 0xf1,
-  0x30, 0x41, 0x81, 0xda, 0x35, 0x0d, 0x8c, 0xa7,
-  0x73, 0xf6, 0xce, 0xb3, 0xf8, 0x0c, 0x10, 0x5e,
-  0x04, 0x38, 0xbc, 0xa3, 0x0d, 0xa9, 0xc5, 0xec,
-  0x53, 0x02, 0xa9, 0x1c, 0xfa, 0x93, 0x71, 0x1c,
-  0x25, 0x88, 0xa8, 0x4d, 0x6c, 0x29, 0xdb, 0xc7,
-  0xd0, 0xcb, 0x01, 0xef, 0xd5, 0xc8, 0x60, 0xd2,
-  0x1a, 0x16, 0x98, 0x28, 0x48, 0x75, 0xdd, 0xba,
-  0xb0, 0x28, 0x46, 0xe9, 0x92, 0x3f, 0x73, 0xfc,
-  0x7c, 0x48, 0x2a, 0xc9, 0xb6, 0xc8, 0x5e, 0xca,
-  0xbd, 0x0d, 0xf4, 0xde, 0xed, 0x9e, 0x4e, 0x65,
-  0x47, 0x1f, 0x58, 0x33, 0x1b, 0x63, 0x34, 0xa6,
-  0x67, 0xbf, 0x90, 0xb8, 0xe8, 0xaf, 0x5b, 0xba,
-  0x1c, 0x73, 0x7b, 0xbe, 0x3b, 0x72, 0x84, 0x64,
-  0x32, 0x63, 0x7b, 0xfa, 0xba, 0x66, 0x7c, 0xcf,
-  0x3b, 0x5d, 0xec, 0x36, 0xd4, 0xd2, 0xc2, 0x9c,
-  0xfc, 0x82, 0xc7, 0xe0, 0x8b, 0xa1, 0x1f, 0xc3,
-  0x23, 0xaf, 0x53, 0x26, 0xa0, 0x31, 0xd1, 0xe1,
-  0xbf, 0x29, 0x36, 0xb7, 0x2c, 0xe0, 0x46, 0xef,
-  0xd5, 0xe9, 0x6f, 0x13, 0x99, 0xfb, 0x26, 0xe0,
-  0xd8, 0xc2, 0xcd, 0xfb, 0x27, 0x80, 0x90, 0x0c,
-  0x64, 0xbf, 0x66, 0xfe, 0x7a, 0xce, 0x73, 0xfa,
-  0x09, 0xc7, 0xf5, 0xe4, 0x41, 0xd6, 0x0e, 0xe2,
-  0x73, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
-  0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* go_last.png - 1468 bytes */
-static const unsigned char go_last_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
-  0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
-  0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
-  0x19, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x5d, 0x48, 0x54, 0x5b, 0x14, 0xfe, 0xf6,
-  0x3e, 0xe7, 0x38, 0xc7, 0xa9, 0x0c, 0x14, 0xc6,
-  0x4a, 0xac, 0x04, 0x11, 0xf2, 0x41, 0x0a, 0x4a,
-  0x74, 0x84, 0xa2, 0x20, 0xa1, 0x88, 0x8a, 0x30,
-  0xc1, 0xa7, 0x20, 0xe8, 0xe7, 0x21, 0x88, 0x70,
-  0x84, 0x0c, 0xf1, 0xa9, 0xb2, 0x87, 0xa2, 0x87,
-  0x08, 0x91, 0x10, 0x8b, 0x28, 0x1d, 0xa5, 0x50,
-  0x2a, 0xa4, 0x19, 0xc1, 0x9a, 0xc4, 0x28, 0xc9,
-  0x4c, 0x27, 0xa7, 0x44, 0x2d, 0x63, 0xca, 0xd1,
-  0xd4, 0x06, 0xb3, 0xe6, 0xcc, 0xcc, 0xf9, 0xb9,
-  0x0f, 0xfb, 0xee, 0x3b, 0xfe, 0xcc, 0xd4, 0x68,
-  0xbe, 0x5c, 0x68, 0xc1, 0xb0, 0x58, 0xe7, 0xec,
-  0xbd, 0xf6, 0xf7, 0xad, 0xb5, 0xd7, 0x5a, 0x67,
-  0x80, 0xbf, 0xf2, 0x57, 0xfe, 0x48, 0xc8, 0x72,
-  0x39, 0x2a, 0x28, 0x28, 0x2b, 0x13, 0xc5, 0x27,
-  0x4f, 0x0c, 0x43, 0xd7, 0x81, 0x6b, 0xd7, 0x3a,
-  0x3b, 0xaf, 0x5c, 0x51, 0xd5, 0x7b, 0xf7, 0x16,
-  0xeb, 0xc7, 0x6a, 0xb5, 0xd9, 0x44, 0x71, 0x64,
-  0x04, 0x30, 0x0c, 0x60, 0xfd, 0xfa, 0x28, 0x90,
-  0x09, 0x30, 0x36, 0xd6, 0xd9, 0x79, 0xf9, 0xb2,
-  0xaa, 0xae, 0x59, 0x23, 0x2e, 0x17, 0x01, 0x06,
-  0x7c, 0xc7, 0x8e, 0xf4, 0x74, 0x8b, 0x25, 0x33,
-  0x33, 0x37, 0xd7, 0x6a, 0xb5, 0xd9, 0x06, 0x07,
-  0xb7, 0x6d, 0x63, 0x40, 0xca, 0xcb, 0x19, 0x21,
-  0xc3, 0x88, 0xc7, 0x13, 0xb0, 0x6e, 0xdd, 0xc9,
-  0x93, 0xc5, 0xc5, 0xe5, 0xe5, 0x00, 0x21, 0x84,
-  0x90, 0x59, 0x61, 0xae, 0xae, 0xb6, 0xdb, 0x2f,
-  0x5e, 0x4c, 0x4d, 0xe5, 0x36, 0x5d, 0x2e, 0x02,
-  0x5c, 0x8e, 0x1f, 0x3f, 0x78, 0xb0, 0xa2, 0x22,
-  0x31, 0x71, 0xcb, 0x96, 0xac, 0xac, 0x82, 0x82,
-  0xd3, 0xa7, 0x09, 0xa1, 0x14, 0x70, 0x3a, 0xad,
-  0xd6, 0xd2, 0x52, 0x51, 0x5c, 0xb5, 0x6a, 0xb1,
-  0xfe, 0x9a, 0x9a, 0x7a, 0x7a, 0x2e, 0x5d, 0x8a,
-  0xfd, 0x7e, 0xd9, 0x09, 0x88, 0x22, 0xa5, 0xa2,
-  0x08, 0xec, 0xdd, 0x6b, 0xb5, 0x96, 0x94, 0xc8,
-  0x72, 0x61, 0x61, 0x5e, 0x5e, 0x51, 0xd1, 0xf6,
-  0xed, 0x8c, 0x88, 0xdb, 0xcd, 0x88, 0x64, 0x66,
-  0x2e, 0xdb, 0x79, 0xb1, 0x5e, 0xb0, 0xbb, 0xe8,
-  0xf3, 0xb1, 0x94, 0x46, 0x52, 0x16, 0x4b, 0x08,
-  0x11, 0x04, 0x40, 0x51, 0x34, 0xcd, 0x30, 0x54,
-  0x55, 0x96, 0xbb, 0xbb, 0xbd, 0x5e, 0x87, 0x03,
-  0xd8, 0xb4, 0x29, 0x23, 0x23, 0x37, 0x57, 0x92,
-  0x52, 0x52, 0x56, 0xaf, 0xb6, 0x58, 0xd2, 0xd3,
-  0x1b, 0x1b, 0x9d, 0xce, 0xda, 0xda, 0x57, 0xaf,
-  0xac, 0xd6, 0xd2, 0x52, 0xa0, 0xb8, 0x98, 0x5d,
-  0xad, 0xc7, 0x8f, 0x97, 0x9d, 0x00, 0x07, 0x7e,
-  0xe1, 0xc2, 0x89, 0x13, 0xb7, 0x6e, 0x71, 0x90,
-  0x0b, 0x57, 0x44, 0x7e, 0x86, 0xa1, 0xeb, 0xb2,
-  0xac, 0xeb, 0x86, 0xa1, 0xaa, 0x40, 0x28, 0x64,
-  0x18, 0x33, 0x33, 0x40, 0x4f, 0xcf, 0xd8, 0x98,
-  0xc3, 0x01, 0x64, 0x64, 0x24, 0x27, 0xe7, 0xe4,
-  0x10, 0x72, 0xec, 0xd8, 0xa1, 0x43, 0x36, 0x5b,
-  0x52, 0x52, 0x7d, 0x7d, 0x6b, 0x6b, 0x4d, 0xcd,
-  0xfd, 0xfb, 0x56, 0xab, 0xcd, 0x36, 0x31, 0x71,
-  0xfe, 0x3c, 0x2b, 0xca, 0xaa, 0xaa, 0x65, 0x24,
-  0xc0, 0x44, 0x55, 0x75, 0x3d, 0x1c, 0x06, 0x9e,
-  0x3d, 0x1b, 0x1a, 0x6a, 0x6c, 0x8c, 0x06, 0x9e,
-  0x95, 0x2f, 0x40, 0x08, 0x2b, 0x51, 0x41, 0xd0,
-  0x34, 0xc0, 0x30, 0x28, 0x55, 0x55, 0xb6, 0x46,
-  0xd3, 0x80, 0x81, 0x81, 0x6f, 0xdf, 0x9e, 0x3f,
-  0x07, 0x2c, 0x16, 0xb3, 0x79, 0xc3, 0x06, 0xe0,
-  0xc8, 0x91, 0x03, 0x07, 0x4e, 0x9d, 0x32, 0x9b,
-  0x5b, 0x5a, 0xda, 0xdb, 0xef, 0xde, 0xad, 0xa8,
-  0x20, 0xa4, 0xac, 0x6c, 0x60, 0x20, 0x37, 0x97,
-  0x79, 0x23, 0x71, 0x77, 0xc7, 0xdf, 0x12, 0xd0,
-  0x34, 0x5d, 0x57, 0x55, 0x20, 0x18, 0x54, 0xd5,
-  0x9f, 0x3f, 0xa3, 0xad, 0x20, 0x84, 0x1d, 0x29,
-  0x8a, 0xcc, 0x62, 0xb6, 0x61, 0x50, 0xca, 0x88,
-  0x10, 0xc2, 0x34, 0xcb, 0xcc, 0x97, 0x2f, 0x81,
-  0x40, 0x7f, 0x3f, 0xe0, 0xf7, 0x07, 0x83, 0xa3,
-  0xa3, 0xc0, 0xbe, 0x7d, 0xbb, 0x76, 0x15, 0x15,
-  0x99, 0xcd, 0x2f, 0x5e, 0xf4, 0xf4, 0xb8, 0x5c,
-  0x7b, 0xf6, 0x74, 0x75, 0xf5, 0xf5, 0x75, 0x74,
-  0x44, 0xcb, 0xf7, 0x12, 0x09, 0x70, 0xe0, 0x5e,
-  0xaf, 0xdf, 0xff, 0xfe, 0x3d, 0x10, 0x0a, 0x69,
-  0x5a, 0x20, 0x10, 0x89, 0xbc, 0x2c, 0xcb, 0xb2,
-  0x2c, 0x03, 0x66, 0xb3, 0xd9, 0xbc, 0x62, 0x05,
-  0x60, 0x36, 0xcb, 0xb2, 0xd9, 0x0c, 0x48, 0x92,
-  0x20, 0x24, 0x24, 0x00, 0x84, 0x50, 0xca, 0x9b,
-  0x27, 0xcb, 0x08, 0x21, 0xe1, 0x30, 0xe0, 0xf7,
-  0xab, 0xaa, 0xd7, 0x0b, 0x74, 0x76, 0x7a, 0xbd,
-  0x76, 0x3b, 0x90, 0x93, 0x93, 0x9d, 0x5d, 0x58,
-  0x68, 0x32, 0xa5, 0xa6, 0xa6, 0xa5, 0x25, 0x27,
-  0x33, 0xf8, 0xf1, 0x50, 0xf8, 0x2d, 0x81, 0xe9,
-  0x69, 0x45, 0x99, 0x98, 0x00, 0xbe, 0x7f, 0x0f,
-  0x06, 0x27, 0x27, 0x67, 0xc7, 0x5d, 0x10, 0xf8,
-  0x65, 0x0a, 0x85, 0x00, 0x4d, 0x53, 0xd5, 0x99,
-  0x19, 0x20, 0x10, 0x08, 0x85, 0x28, 0x05, 0x04,
-  0xc1, 0x30, 0x28, 0x05, 0x4c, 0x26, 0x49, 0x32,
-  0x99, 0x00, 0x41, 0x60, 0xdd, 0x89, 0x10, 0xb6,
-  0x53, 0xd3, 0x58, 0xa6, 0x28, 0xa5, 0x94, 0x65,
-  0x8c, 0x10, 0x55, 0x05, 0x00, 0x4e, 0x98, 0xc6,
-  0xd5, 0x21, 0x97, 0xdc, 0x46, 0x29, 0xa5, 0x94,
-  0x90, 0xd9, 0x5a, 0x10, 0x08, 0x01, 0x04, 0x41,
-  0x14, 0x09, 0x01, 0x44, 0x51, 0x92, 0x58, 0x04,
-  0x25, 0x29, 0x1c, 0x06, 0x74, 0x5d, 0x92, 0x14,
-  0x05, 0x50, 0x55, 0x41, 0x98, 0x99, 0x01, 0x56,
-  0xae, 0x4c, 0x4c, 0x4c, 0x4a, 0x02, 0xf2, 0xf3,
-  0xd3, 0xd3, 0x8b, 0x8a, 0x80, 0xb7, 0x6f, 0x3d,
-  0x1e, 0xb7, 0x3b, 0x18, 0x7c, 0xf8, 0xb0, 0xb5,
-  0xf5, 0xc1, 0x03, 0x5d, 0x8f, 0xb7, 0x0a, 0x96,
-  0x3c, 0x89, 0xf9, 0x7c, 0x24, 0x84, 0x11, 0x88,
-  0x68, 0x46, 0x84, 0x52, 0x46, 0x44, 0x10, 0x24,
-  0x89, 0xd2, 0x08, 0xc1, 0xb5, 0x6b, 0x4d, 0xa6,
-  0xec, 0x6c, 0x60, 0xe3, 0x46, 0x93, 0x29, 0x3f,
-  0x1f, 0x78, 0xf4, 0xc8, 0xe1, 0x68, 0x6e, 0x0e,
-  0x04, 0x3e, 0x7c, 0x18, 0x19, 0x19, 0x1e, 0x7e,
-  0xfa, 0x94, 0xcd, 0x8b, 0xdd, 0xbb, 0xe3, 0xc5,
-  0x11, 0x83, 0xc0, 0xc2, 0xf4, 0x1d, 0x3e, 0xbc,
-  0x79, 0xf3, 0xd9, 0xb3, 0xb3, 0x57, 0x70, 0x80,
-  0x73, 0x35, 0x7f, 0xee, 0x74, 0x8e, 0x8e, 0x5e,
-  0xbd, 0x1a, 0x79, 0x9e, 0x9d, 0x9d, 0x9c, 0xbc,
-  0x73, 0x27, 0x90, 0x98, 0xa8, 0x28, 0x69, 0x69,
-  0xc0, 0x9d, 0x3b, 0x4d, 0x4d, 0x75, 0x75, 0x8a,
-  0xe2, 0xf3, 0x7d, 0xfa, 0x34, 0x35, 0x55, 0x53,
-  0xd3, 0xdd, 0x5d, 0x5b, 0xab, 0x69, 0xd7, 0xaf,
-  0xb3, 0x41, 0xf7, 0xee, 0xdd, 0xdc, 0x0f, 0x88,
-  0x45, 0x13, 0x10, 0xff, 0x7d, 0x3e, 0x3e, 0xce,
-  0xbe, 0x3d, 0x2c, 0x96, 0xdf, 0x39, 0xa2, 0x54,
-  0x92, 0x80, 0x50, 0xe8, 0xcc, 0x99, 0xa3, 0x47,
-  0x2b, 0x2b, 0x13, 0x12, 0x24, 0x89, 0x52, 0x59,
-  0x06, 0xb6, 0x6e, 0x4d, 0x49, 0xd9, 0xbf, 0x1f,
-  0xf0, 0xfb, 0xbf, 0x7e, 0xfd, 0xf1, 0xc3, 0x30,
-  0x1a, 0x1a, 0x5a, 0x5a, 0x6e, 0xdc, 0x08, 0x04,
-  0x3e, 0x7f, 0x7e, 0xf3, 0x46, 0x51, 0xce, 0x9d,
-  0x1b, 0x1c, 0x6c, 0x6d, 0xd5, 0x75, 0x97, 0x8b,
-  0x79, 0x49, 0x48, 0x58, 0xec, 0x4d, 0x88, 0x41,
-  0x80, 0x10, 0x36, 0x21, 0xb3, 0xb2, 0x98, 0x6d,
-  0x32, 0x31, 0x2d, 0xcb, 0xb1, 0x6c, 0x16, 0xb9,
-  0xae, 0x2e, 0xd6, 0xf9, 0x81, 0xbc, 0x3c, 0x8b,
-  0xa5, 0xa4, 0x04, 0xe8, 0xeb, 0xeb, 0xed, 0xed,
-  0xeb, 0x53, 0x55, 0x97, 0xab, 0xa3, 0xa3, 0xbd,
-  0x7d, 0x6a, 0x6a, 0x70, 0xd0, 0xe1, 0xd0, 0xb4,
-  0xb2, 0xb2, 0xf1, 0x71, 0xb7, 0xdb, 0x30, 0x86,
-  0x86, 0xd8, 0x7e, 0xde, 0x10, 0xb8, 0x66, 0x5d,
-  0xee, 0x0f, 0x08, 0xf0, 0xcd, 0x6c, 0x44, 0x2d,
-  0xb4, 0xb9, 0xd6, 0xb4, 0xb9, 0x1a, 0x08, 0x06,
-  0x43, 0xa1, 0x60, 0x10, 0x70, 0x3a, 0x5d, 0xae,
-  0xb6, 0x36, 0x45, 0xf1, 0x78, 0x3c, 0x9e, 0xfe,
-  0x7e, 0x8f, 0xa7, 0xb7, 0xb7, 0xbe, 0x5e, 0x55,
-  0x2b, 0x2b, 0x03, 0x81, 0xc9, 0x49, 0x60, 0x7a,
-  0x3a, 0xfa, 0xfe, 0x88, 0x9f, 0x3f, 0xcc, 0x00,
-  0x6b, 0x68, 0x91, 0x88, 0x84, 0xc3, 0x4c, 0xf3,
-  0xda, 0xe0, 0xf7, 0x93, 0xeb, 0x48, 0xb4, 0x1a,
-  0x1a, 0x9a, 0x9b, 0x6f, 0xde, 0x54, 0x14, 0xaf,
-  0xf7, 0xe3, 0x47, 0x9f, 0xaf, 0xb1, 0xf1, 0xf5,
-  0xeb, 0xba, 0x3a, 0x4d, 0xab, 0xae, 0x66, 0x53,
-  0x63, 0x3e, 0x71, 0x7e, 0x4e, 0x28, 0x34, 0xf7,
-  0x1c, 0xf6, 0x79, 0x6e, 0x18, 0x0b, 0x6b, 0x2f,
-  0x4e, 0x02, 0xfc, 0xa0, 0x60, 0xf0, 0xd7, 0x99,
-  0xe1, 0x40, 0x24, 0xc9, 0x30, 0x34, 0x0d, 0x78,
-  0xf9, 0x72, 0x78, 0xd8, 0xed, 0xf6, 0xf9, 0x6e,
-  0xdf, 0x76, 0xbb, 0xed, 0x76, 0x4d, 0x6b, 0x6b,
-  0x8b, 0x4e, 0x34, 0x16, 0x11, 0x4e, 0xc0, 0xe7,
-  0xab, 0xae, 0xb6, 0xdb, 0xab, 0xaa, 0xd2, 0xd2,
-  0x16, 0x62, 0x63, 0x7f, 0x68, 0xfe, 0xb3, 0x16,
-  0x97, 0x30, 0x49, 0x62, 0x9a, 0x17, 0x1b, 0xb7,
-  0x79, 0xd1, 0xf3, 0x8c, 0xf1, 0x4c, 0xc5, 0x1a,
-  0x46, 0xb1, 0xae, 0x22, 0x27, 0xc0, 0x03, 0xc7,
-  0x33, 0xc3, 0xd7, 0x45, 0xa1, 0xb3, 0x38, 0x02,
-  0xf3, 0x85, 0x03, 0x9c, 0x0f, 0x7c, 0x61, 0x51,
-  0xfe, 0x1a, 0xf8, 0xd2, 0x6b, 0xe0, 0x7f, 0x2f,
-  0xff, 0x00, 0xfd, 0x31, 0x98, 0x2a, 0xe9, 0xf5,
-  0x13, 0xc9, 0x00, 0x00, 0x00, 0x22, 0x7a, 0x54,
-  0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61,
-  0x72, 0x65, 0x00, 0x00, 0x78, 0xda, 0x2b, 0x2f,
-  0x2f, 0xd7, 0xcb, 0xcc, 0xcb, 0x2e, 0x4e, 0x4e,
-  0x2c, 0x48, 0xd5, 0xcb, 0x2f, 0x4a, 0x07, 0x00,
-  0x36, 0xd8, 0x06, 0x58, 0x10, 0x53, 0xca, 0x5c,
-  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
-  0xae, 0x42, 0x60, 0x82};
--- a/art/tango/go_next.h
+++ b/art/tango/go_next.h
@@ -1,274 +0,0 @@
-/* go_next.png - 676 bytes */
-static const unsigned char go_next_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
-  0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
-  0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
-  0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
-  0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
-  0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
-  0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
-  0x02, 0x36, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
-  0x95, 0x92, 0x4b, 0x48, 0x54, 0x61, 0x1c, 0xc5,
-  0x7f, 0xdf, 0xe3, 0xce, 0xc3, 0x46, 0xc3, 0x14,
-  0x52, 0xc4, 0x5e, 0x44, 0x20, 0x68, 0x14, 0x04,
-  0x85, 0xd3, 0x46, 0x68, 0xd1, 0x22, 0x82, 0x04,
-  0x5b, 0x46, 0x81, 0x42, 0xb8, 0xc9, 0x72, 0x8c,
-  0x36, 0x42, 0x2b, 0x37, 0x8d, 0x90, 0x8b, 0x28,
-  0x72, 0x13, 0x14, 0xbd, 0xa4, 0x45, 0x62, 0x3e,
-  0x70, 0x11, 0x2d, 0x66, 0xd0, 0x29, 0xa4, 0x14,
-  0x37, 0xd1, 0x22, 0x2c, 0x33, 0x9d, 0xb1, 0x81,
-  0x1e, 0xe3, 0x78, 0xef, 0xdc, 0xfb, 0xb5, 0x08,
-  0x5f, 0x33, 0x13, 0xd4, 0x81, 0xb3, 0xf9, 0xfe,
-  0x87, 0xc3, 0xf9, 0x9f, 0xff, 0x87, 0x31, 0x86,
-  0x7c, 0x86, 0xbb, 0x74, 0xac, 0xb1, 0x53, 0xb7,
-  0x15, 0x9b, 0xe5, 0x53, 0x52, 0x04, 0xc6, 0xa3,
-  0x71, 0x77, 0xf5, 0x81, 0xbe, 0x70, 0x97, 0x35,
-  0x10, 0x8e, 0x58, 0xa1, 0x62, 0x9a, 0x35, 0x14,
-  0x35, 0x00, 0xb8, 0xd2, 0xd2, 0x1b, 0x3c, 0x79,
-  0xf4, 0xec, 0x69, 0x04, 0xb3, 0xe1, 0x88, 0xd5,
-  0xf0, 0xdf, 0x06, 0x4a, 0x6a, 0x9a, 0x0e, 0x9f,
-  0xf1, 0xb5, 0x37, 0x5f, 0xaf, 0x0d, 0xfa, 0x43,
-  0x13, 0xe1, 0x88, 0xd5, 0x56, 0x4c, 0x27, 0x1a,
-  0x23, 0xfa, 0x2b, 0x86, 0x9d, 0x5b, 0x1e, 0x15,
-  0xd9, 0x9b, 0xed, 0x83, 0x81, 0xa9, 0xcf, 0x63,
-  0x54, 0x95, 0xed, 0xc3, 0x27, 0xb7, 0xf1, 0x78,
-  0xfc, 0xd6, 0xca, 0x87, 0xf9, 0x99, 0x61, 0x63,
-  0x38, 0x1f, 0x8b, 0x3a, 0x3f, 0x37, 0x0c, 0x3a,
-  0xb5, 0xe9, 0xb9, 0x78, 0x1f, 0x29, 0x14, 0x4a,
-  0x28, 0x84, 0x90, 0x08, 0x04, 0x00, 0x89, 0x4f,
-  0x43, 0x78, 0xb8, 0x94, 0xf9, 0x77, 0xb0, 0xab,
-  0xbc, 0x9e, 0xf8, 0xf4, 0xb8, 0x33, 0x36, 0x39,
-  0xb0, 0x80, 0x31, 0xa7, 0x62, 0x51, 0x67, 0x06,
-  0x40, 0x03, 0xb8, 0x5e, 0x8e, 0xd8, 0xc7, 0x67,
-  0x28, 0xa9, 0x51, 0x42, 0x81, 0x10, 0x08, 0x01,
-  0x42, 0x01, 0xc2, 0x63, 0xd9, 0x9e, 0x23, 0xbd,
-  0x34, 0xcf, 0xc1, 0xba, 0x23, 0x56, 0x4d, 0xd5,
-  0x9e, 0xda, 0xa7, 0x63, 0x77, 0x27, 0xc2, 0x11,
-  0xab, 0x23, 0x16, 0x75, 0xfa, 0x35, 0x40, 0xce,
-  0x5b, 0x25, 0x9d, 0x59, 0xc0, 0x76, 0xb3, 0xd8,
-  0x6e, 0x16, 0xa5, 0x34, 0xa5, 0x25, 0x65, 0x94,
-  0x04, 0x42, 0xf8, 0x2d, 0x3f, 0x46, 0xb8, 0xd8,
-  0x5e, 0x8e, 0x77, 0x4b, 0xa3, 0xd4, 0x84, 0xea,
-  0x44, 0x6b, 0x73, 0x57, 0xc9, 0xd0, 0xab, 0x47,
-  0x7d, 0xc7, 0xaf, 0x5a, 0xc7, 0x34, 0xc0, 0xd2,
-  0x8f, 0x39, 0xde, 0x27, 0x5f, 0xaf, 0x77, 0xa0,
-  0x7d, 0x82, 0x94, 0x23, 0xd1, 0x59, 0x89, 0xd6,
-  0x0a, 0xbf, 0x2f, 0x88, 0x4f, 0x06, 0x50, 0xf8,
-  0x29, 0xcd, 0x95, 0xa3, 0x4c, 0x90, 0xac, 0x9d,
-  0x31, 0xeb, 0x2b, 0x6c, 0x29, 0x50, 0x82, 0xd4,
-  0x02, 0x65, 0xc9, 0x3f, 0xf4, 0x81, 0xa7, 0xb2,
-  0xa0, 0x2c, 0x1a, 0x2a, 0x9a, 0x48, 0x2f, 0x66,
-  0xcc, 0x83, 0x97, 0x77, 0x56, 0xb2, 0xab, 0x99,
-  0x8d, 0x15, 0x00, 0x5a, 0x0e, 0x5d, 0x5b, 0x37,
-  0x50, 0x96, 0x40, 0x69, 0xc9, 0xc8, 0x5c, 0x2f,
-  0xda, 0x27, 0xa9, 0x0e, 0xed, 0xa7, 0x6e, 0xfb,
-  0x09, 0x26, 0xdf, 0xc4, 0xed, 0xc4, 0xdb, 0xf8,
-  0x57, 0xe3, 0xb2, 0xa9, 0x44, 0xc1, 0xe2, 0xed,
-  0x27, 0x3d, 0x5b, 0xce, 0x28, 0x2d, 0xb2, 0x97,
-  0xce, 0x75, 0x07, 0x94, 0x52, 0xd4, 0x57, 0x36,
-  0x51, 0xa1, 0xf7, 0x32, 0xf0, 0xfc, 0x61, 0x66,
-  0x31, 0xf9, 0x65, 0xc4, 0xb8, 0x79, 0x67, 0x34,
-  0xc6, 0x14, 0x7c, 0x8e, 0x70, 0xc4, 0x32, 0x97,
-  0x5b, 0xbb, 0xf9, 0xe5, 0x25, 0x49, 0xa6, 0x52,
-  0xe6, 0xc5, 0xe8, 0xe0, 0x8a, 0xed, 0xd8, 0x1d,
-  0xb1, 0x1b, 0x4e, 0x7f, 0xbe, 0xb6, 0xa0, 0x83,
-  0x35, 0x38, 0x39, 0x9b, 0xc4, 0x54, 0x62, 0x75,
-  0x7a, 0x76, 0x6a, 0xd1, 0xdb, 0x14, 0xb9, 0xa0,
-  0xb3, 0xbf, 0x25, 0xa8, 0x28, 0xaf, 0xcc, 0x7c,
-  0xfb, 0x9e, 0x1a, 0x36, 0x2e, 0x17, 0x36, 0x47,
-  0xfe, 0xa7, 0x04, 0x42, 0x12, 0x5f, 0x4e, 0xa7,
-  0xee, 0xc5, 0xa2, 0x85, 0x91, 0xf3, 0xf1, 0x1b,
-  0x41, 0xde, 0x09, 0xb4, 0x6e, 0x76, 0xe5, 0xb6,
-  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
-  0xae, 0x42, 0x60, 0x82};
-
-
-/* go_next.png - 1456 bytes */
-static const unsigned char go_next_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
-  0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
-  0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
-  0x0d, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x5d, 0x48, 0x53, 0x6d, 0x1c, 0xff, 0x9d,
-  0x9d, 0xb3, 0xb9, 0x2d, 0xf3, 0xa3, 0x90, 0x09,
-  0x49, 0x76, 0xd5, 0x97, 0x5e, 0x24, 0x18, 0x99,
-  0xf3, 0xc2, 0xa0, 0x8c, 0xae, 0x2a, 0x4a, 0xaa,
-  0x9b, 0x08, 0x0b, 0x91, 0xae, 0x14, 0x99, 0x08,
-  0x41, 0x50, 0x90, 0x44, 0x94, 0x17, 0xde, 0x04,
-  0x95, 0x88, 0xcb, 0x8b, 0x61, 0x25, 0x82, 0x12,
-  0x29, 0x96, 0x49, 0x93, 0x65, 0x51, 0x2a, 0x95,
-  0xf8, 0xd1, 0x87, 0xd5, 0x74, 0xd9, 0x9a, 0x34,
-  0xe7, 0xb6, 0xb3, 0xb3, 0xf3, 0x3c, 0xa7, 0x8b,
-  0xa7, 0xe7, 0x9d, 0x8e, 0x77, 0xac, 0xf7, 0xd5,
-  0x2e, 0xde, 0x97, 0xfe, 0x30, 0x7e, 0xfc, 0x9f,
-  0x3d, 0xcf, 0x7f, 0xbf, 0xdf, 0xff, 0xe3, 0x39,
-  0x67, 0xc0, 0x1f, 0xfb, 0x63, 0x2b, 0x32, 0x71,
-  0xb5, 0x03, 0x5a, 0xad, 0x36, 0x9b, 0x24, 0xf5,
-  0xf7, 0xe7, 0xe4, 0x14, 0x15, 0x09, 0x82, 0xcf,
-  0xe7, 0x76, 0xbb, 0x5c, 0x9a, 0x36, 0x39, 0xf9,
-  0xbb, 0x04, 0xe8, 0x56, 0x3b, 0xa0, 0xa6, 0x51,
-  0x0a, 0x94, 0x96, 0xe6, 0xe6, 0x5a, 0x2c, 0x9b,
-  0x37, 0xdf, 0xb9, 0x63, 0xb5, 0xda, 0x6c, 0x7a,
-  0x7d, 0x4d, 0xcd, 0x7f, 0x46, 0x00, 0xb7, 0xca,
-  0xca, 0x43, 0x87, 0xce, 0x9d, 0x33, 0x1a, 0xf3,
-  0xf2, 0x36, 0x6d, 0x2a, 0x2c, 0xbc, 0x74, 0xa9,
-  0xa4, 0xa4, 0xae, 0x4e, 0x14, 0x6f, 0xdc, 0x28,
-  0x2f, 0x2f, 0x2f, 0x07, 0xc4, 0x55, 0xab, 0xfc,
-  0x6f, 0x13, 0x20, 0x8a, 0xa2, 0xa8, 0xd7, 0x03,
-  0x87, 0x0f, 0x97, 0x96, 0x56, 0x54, 0x98, 0x4c,
-  0x45, 0x45, 0x79, 0x79, 0xfb, 0xf7, 0x9f, 0x3c,
-  0x39, 0x3b, 0x9b, 0x9b, 0x2b, 0x49, 0x7d, 0x7d,
-  0xa5, 0xa5, 0x67, 0xcf, 0x02, 0xa9, 0xa9, 0x2b,
-  0xfd, 0x1d, 0x29, 0xd9, 0x86, 0xe2, 0x62, 0x9b,
-  0x4d, 0x92, 0xbe, 0x7c, 0x01, 0x28, 0x05, 0x2c,
-  0x96, 0xa4, 0x19, 0xd1, 0x49, 0x92, 0x20, 0xc8,
-  0x32, 0xa5, 0x94, 0xaa, 0xaa, 0xd1, 0x38, 0x32,
-  0x32, 0x3b, 0xdb, 0xd7, 0x07, 0x94, 0x94, 0x14,
-  0x14, 0x94, 0x95, 0xa5, 0xa4, 0xa4, 0xa7, 0xa7,
-  0xa6, 0x66, 0x66, 0x5a, 0xad, 0x0f, 0x1e, 0xb8,
-  0x5c, 0x0e, 0xc7, 0xf0, 0xf0, 0xae, 0x5d, 0x75,
-  0x75, 0x84, 0xec, 0xd9, 0x33, 0x34, 0x74, 0xe5,
-  0x0a, 0xe0, 0x76, 0xff, 0x53, 0x01, 0x42, 0x72,
-  0x01, 0xb5, 0xb5, 0x92, 0xa4, 0x69, 0x0d, 0x0d,
-  0x55, 0x55, 0x76, 0x7b, 0xe2, 0x7d, 0x9a, 0xc6,
-  0xba, 0x5f, 0xd3, 0xd8, 0x87, 0x52, 0xe6, 0xf7,
-  0xf7, 0x4f, 0x4d, 0xb5, 0xb5, 0x01, 0x82, 0x00,
-  0xe8, 0x74, 0xc0, 0xf6, 0xed, 0xd9, 0xd9, 0x56,
-  0x2b, 0xe0, 0xf1, 0x78, 0xbd, 0x33, 0x33, 0x94,
-  0x76, 0x76, 0xf6, 0xf7, 0xdb, 0xed, 0xdf, 0xbf,
-  0xab, 0xaa, 0xaa, 0xaa, 0xea, 0xde, 0xbd, 0x2e,
-  0x57, 0x63, 0x63, 0x34, 0x3a, 0x3c, 0xbc, 0xea,
-  0x02, 0x2e, 0x5e, 0xac, 0xac, 0xbc, 0x75, 0x0b,
-  0x78, 0xf2, 0xe4, 0xdd, 0xbb, 0xf6, 0xf6, 0xe5,
-  0xc4, 0x63, 0xa4, 0x01, 0x42, 0x28, 0x25, 0x24,
-  0x26, 0x80, 0x52, 0x4d, 0x53, 0x55, 0xb6, 0xce,
-  0x90, 0xf9, 0x5b, 0xb7, 0x5a, 0x2c, 0xbb, 0x77,
-  0x03, 0x9a, 0xa6, 0x28, 0x3a, 0x1d, 0xd0, 0xd1,
-  0xf1, 0xf0, 0x61, 0x4b, 0x4b, 0x30, 0x18, 0x0e,
-  0xcb, 0x72, 0x20, 0x70, 0xe2, 0x84, 0xd3, 0x79,
-  0xf5, 0x2a, 0x21, 0x5d, 0x5d, 0x49, 0x2b, 0xfe,
-  0xab, 0x4a, 0x39, 0x81, 0x48, 0x44, 0x55, 0xc3,
-  0xe1, 0x18, 0x2a, 0x0a, 0x21, 0xb2, 0xcc, 0x7c,
-  0x59, 0x06, 0xa2, 0x51, 0x42, 0x22, 0x11, 0x86,
-  0xb2, 0x0c, 0x28, 0x0a, 0x5b, 0xe7, 0xfb, 0x14,
-  0x85, 0x9d, 0x7b, 0xf9, 0xf2, 0xf3, 0xe7, 0x9e,
-  0x1e, 0x60, 0x61, 0x81, 0x10, 0x8f, 0x07, 0x38,
-  0x7e, 0xfc, 0xc0, 0x81, 0xaa, 0xaa, 0x35, 0x6b,
-  0xd2, 0xd3, 0xd7, 0xae, 0xcd, 0xca, 0x72, 0x38,
-  0x58, 0xe2, 0x6a, 0x6b, 0x57, 0x4d, 0x80, 0xaa,
-  0x52, 0x1a, 0x8d, 0x02, 0xe1, 0x70, 0x34, 0x1a,
-  0x08, 0x00, 0xf3, 0xf3, 0xa1, 0x90, 0xc7, 0x03,
-  0xcc, 0xcd, 0x05, 0x02, 0xd3, 0xd3, 0x80, 0xd7,
-  0xbb, 0xb8, 0xf8, 0xe9, 0x13, 0xe0, 0xf7, 0x87,
-  0xc3, 0x5f, 0xbf, 0x02, 0xb2, 0xac, 0xaa, 0x81,
-  0x00, 0x10, 0x8d, 0x02, 0xb2, 0x0c, 0x10, 0x22,
-  0x08, 0x91, 0x08, 0x40, 0xa9, 0x20, 0x28, 0x4a,
-  0x0c, 0xc7, 0xc6, 0xe6, 0xe6, 0x9c, 0x4e, 0x60,
-  0x6a, 0xca, 0xe7, 0x1b, 0x1a, 0x02, 0x8e, 0x1e,
-  0xdd, 0xb7, 0xef, 0xd4, 0x29, 0xb3, 0x39, 0x27,
-  0xc7, 0x62, 0xd9, 0xb8, 0xf1, 0xc2, 0x05, 0xab,
-  0xd5, 0x66, 0x13, 0xc5, 0xa6, 0xa6, 0x44, 0xbc,
-  0x92, 0x0e, 0x31, 0xb7, 0x40, 0x40, 0x96, 0xe7,
-  0xe7, 0x81, 0xe9, 0x69, 0x9f, 0xef, 0xd5, 0xab,
-  0x58, 0xaf, 0xff, 0xd5, 0x8b, 0x82, 0x4e, 0x07,
-  0x00, 0xa2, 0xa8, 0xd7, 0xeb, 0x74, 0x80, 0x28,
-  0x52, 0x2a, 0x08, 0xcc, 0x17, 0x45, 0xc0, 0x60,
-  0x90, 0x24, 0x83, 0x81, 0x0d, 0xb9, 0x28, 0x02,
-  0x82, 0xc0, 0xbe, 0xa7, 0x54, 0x10, 0x08, 0x01,
-  0x34, 0x4d, 0x92, 0xb8, 0x40, 0xe6, 0x0b, 0x02,
-  0x9b, 0x1c, 0x41, 0x10, 0x84, 0x0d, 0x1b, 0x56,
-  0x2c, 0x20, 0x1a, 0xa5, 0x34, 0x12, 0x49, 0x4c,
-  0x5c, 0xaf, 0x4f, 0x49, 0xd1, 0xe9, 0x00, 0x49,
-  0x32, 0x18, 0x96, 0x22, 0xbb, 0x95, 0x00, 0x9d,
-  0x4e, 0x14, 0x55, 0x95, 0x57, 0x13, 0xa0, 0x94,
-  0x52, 0x4d, 0x03, 0xb6, 0x6c, 0xc9, 0xc8, 0x28,
-  0x2e, 0x06, 0xb2, 0xb3, 0x0d, 0x86, 0x6d, 0xdb,
-  0x80, 0x7b, 0xf7, 0x7a, 0x7a, 0x5a, 0x5b, 0x43,
-  0x21, 0xbf, 0x7f, 0x71, 0xd1, 0xe7, 0x6b, 0x6e,
-  0x1e, 0x1c, 0x34, 0x9b, 0x09, 0xa9, 0xae, 0x5e,
-  0xb1, 0x80, 0x44, 0x16, 0xcb, 0x38, 0x43, 0x49,
-  0x62, 0x42, 0xe2, 0x05, 0xc5, 0x84, 0x30, 0xc9,
-  0xf9, 0xf9, 0x99, 0x99, 0x65, 0x65, 0x80, 0x28,
-  0x86, 0x42, 0x69, 0x69, 0x80, 0xc3, 0xd1, 0xd5,
-  0xd5, 0xd2, 0x12, 0x0a, 0x2d, 0x2e, 0xfa, 0xfd,
-  0xc1, 0x60, 0x7d, 0xfd, 0xd3, 0xa7, 0x4d, 0x4d,
-  0x84, 0xdc, 0xbc, 0x99, 0xec, 0xf7, 0x93, 0x08,
-  0xd0, 0xeb, 0xe3, 0x57, 0xca, 0xcb, 0x0b, 0x0a,
-  0xea, 0xeb, 0x59, 0x71, 0x81, 0x18, 0xb1, 0x98,
-  0x10, 0xee, 0x33, 0xec, 0xed, 0xf5, 0x78, 0x1a,
-  0x1b, 0x01, 0xb3, 0xd9, 0x64, 0x32, 0x99, 0x80,
-  0x1d, 0x3b, 0xd6, 0xaf, 0x3f, 0x78, 0x10, 0xf0,
-  0x7a, 0xdd, 0x6e, 0xbf, 0x5f, 0xd3, 0x3a, 0x3b,
-  0xbb, 0xbb, 0xed, 0xf6, 0x60, 0x70, 0x7e, 0xfe,
-  0xc3, 0x87, 0x48, 0xe4, 0xf4, 0xe9, 0xd7, 0xaf,
-  0xdb, 0xdb, 0x29, 0x1d, 0x18, 0x60, 0xd1, 0xcd,
-  0xe6, 0x9f, 0x34, 0x7f, 0xf2, 0x8c, 0x44, 0x78,
-  0x3f, 0x24, 0x11, 0xc0, 0x0f, 0x18, 0x0c, 0xac,
-  0x5d, 0xbc, 0xde, 0xeb, 0xd7, 0x1d, 0x8e, 0x86,
-  0x86, 0xac, 0xac, 0xe4, 0x15, 0x91, 0x24, 0x41,
-  0x50, 0x94, 0x9a, 0x9a, 0x33, 0x67, 0xce, 0x9f,
-  0x37, 0x18, 0x8c, 0x46, 0x51, 0x4c, 0x4b, 0x03,
-  0x0a, 0x0b, 0xd7, 0xad, 0x3b, 0x72, 0x04, 0x18,
-  0x1f, 0x7f, 0xf3, 0x66, 0x7c, 0x9c, 0x90, 0xbe,
-  0xbe, 0xc7, 0x8f, 0x7b, 0x7b, 0x7d, 0xbe, 0xe9,
-  0xe9, 0xc1, 0x41, 0x4d, 0xab, 0xa8, 0x98, 0x99,
-  0x71, 0xb9, 0x28, 0x9d, 0x9a, 0x62, 0x51, 0x4c,
-  0x26, 0x9e, 0x9e, 0xe5, 0xd1, 0x79, 0xf3, 0x12,
-  0xc2, 0x90, 0x52, 0x29, 0x11, 0x0d, 0x8e, 0x2e,
-  0xd7, 0xb5, 0x6b, 0xaa, 0x9a, 0x9f, 0xcf, 0xfc,
-  0x94, 0x94, 0xe5, 0x68, 0x34, 0xc6, 0xaf, 0xb3,
-  0xeb, 0x6f, 0x70, 0x90, 0x52, 0x42, 0x34, 0x0d,
-  0xd8, 0xb9, 0x33, 0x23, 0xe3, 0xd8, 0x31, 0xc0,
-  0xe9, 0x1c, 0x18, 0x70, 0x3a, 0x15, 0xe5, 0xc5,
-  0x8b, 0xd1, 0xd1, 0x67, 0xcf, 0xde, 0xbf, 0x1f,
-  0x1b, 0xbb, 0x7b, 0x57, 0x55, 0xab, 0xab, 0x17,
-  0x16, 0xdc, 0x6e, 0xe0, 0xdb, 0x37, 0x9e, 0x30,
-  0x4e, 0x6c, 0x39, 0x51, 0x8e, 0x7c, 0x8a, 0x78,
-  0x82, 0x15, 0x65, 0xc5, 0x33, 0x90, 0xc8, 0x64,
-  0x39, 0x1c, 0x96, 0x65, 0xe0, 0xfe, 0xfd, 0x47,
-  0x8f, 0xba, 0xba, 0x14, 0x65, 0x62, 0x62, 0x62,
-  0x62, 0x62, 0xc2, 0xe9, 0x1c, 0x19, 0x69, 0x6d,
-  0xa5, 0xf4, 0xf2, 0x65, 0xf6, 0xb4, 0x08, 0x06,
-  0xff, 0x5d, 0x74, 0x2e, 0x30, 0x61, 0x0b, 0x25,
-  0x52, 0x1e, 0xab, 0x0c, 0xcf, 0x00, 0x43, 0x3e,
-  0x11, 0xb1, 0xfb, 0xa9, 0xbd, 0xbd, 0xbb, 0xbb,
-  0xad, 0x4d, 0x51, 0x3e, 0x7e, 0x9c, 0x9c, 0x9c,
-  0x99, 0x69, 0x6e, 0x1e, 0x1d, 0xbd, 0x7d, 0x9b,
-  0xd2, 0xb6, 0xb6, 0xe5, 0x71, 0x79, 0x2f, 0x73,
-  0xe4, 0xf1, 0x96, 0xde, 0x57, 0x7f, 0x87, 0xfc,
-  0x7c, 0x42, 0x01, 0x7c, 0x23, 0x37, 0x21, 0xee,
-  0x95, 0x23, 0xbe, 0xc4, 0xb1, 0xd2, 0x12, 0x12,
-  0x8d, 0x6a, 0xda, 0xf3, 0xe7, 0x6f, 0xdf, 0x0e,
-  0x0f, 0xbb, 0xdd, 0x76, 0xfb, 0xd8, 0x58, 0x47,
-  0x47, 0x6c, 0x28, 0xb9, 0x40, 0x7e, 0x3e, 0x9e,
-  0x58, 0xbc, 0x10, 0xee, 0x87, 0xc3, 0xbc, 0xae,
-  0xf1, 0x89, 0x4a, 0xfa, 0x2e, 0xb4, 0x5c, 0x00,
-  0xbf, 0x95, 0x78, 0xcf, 0x73, 0x9f, 0xf7, 0x64,
-  0x7c, 0x85, 0xf8, 0xb9, 0xf8, 0x0a, 0xc5, 0x0f,
-  0x63, 0x7c, 0x22, 0xf8, 0x6d, 0xc3, 0x31, 0x3e,
-  0xa1, 0x4b, 0x98, 0xfd, 0x9a, 0x80, 0x44, 0xc6,
-  0x89, 0xf2, 0xdb, 0x22, 0x5e, 0x40, 0xfc, 0x1f,
-  0x17, 0x9e, 0xf9, 0x44, 0x43, 0xca, 0x71, 0xe9,
-  0xa3, 0xf2, 0x7f, 0x6e, 0x3f, 0x00, 0x80, 0x18,
-  0xdc, 0x3e, 0x3f, 0x2f, 0xea, 0x05, 0x00, 0x00,
-  0x00, 0x22, 0x7a, 0x54, 0x58, 0x74, 0x53, 0x6f,
-  0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x00,
-  0x78, 0xda, 0x2b, 0x2f, 0x2f, 0xd7, 0xcb, 0xcc,
-  0xcb, 0x2e, 0x4e, 0x4e, 0x2c, 0x48, 0xd5, 0xcb,
-  0x2f, 0x4a, 0x07, 0x00, 0x36, 0xd8, 0x06, 0x58,
-  0x10, 0x53, 0xca, 0x5c, 0x00, 0x00, 0x00, 0x00,
-  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
--- a/art/tango/go_previous.h
+++ b/art/tango/go_previous.h
@@ -1,280 +0,0 @@
-/* go_previous.png - 655 bytes */
-static const unsigned char go_previous_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
-  0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
-  0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
-  0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
-  0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
-  0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
-  0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
-  0x02, 0x21, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
-  0x85, 0x93, 0x4f, 0x48, 0x14, 0x71, 0x14, 0xc7,
-  0xbf, 0x6f, 0x66, 0x7e, 0xb3, 0x3b, 0xbb, 0x52,
-  0x62, 0x6c, 0xad, 0x1b, 0xb5, 0x42, 0x08, 0x11,
-  0x09, 0x82, 0x95, 0x6e, 0x5b, 0x87, 0xdc, 0x22,
-  0x56, 0xd3, 0x4c, 0x44, 0x22, 0x88, 0x0e, 0x25,
-  0x74, 0xb2, 0xa2, 0x2d, 0xba, 0x7a, 0x89, 0x10,
-  0x03, 0x3b, 0xc4, 0x1e, 0x24, 0xf0, 0xd0, 0x25,
-  0x0a, 0x82, 0xb0, 0x6e, 0x1d, 0x24, 0x57, 0x8a,
-  0x8e, 0x15, 0x1e, 0x22, 0x4b, 0xf7, 0x50, 0xb9,
-  0x6c, 0x92, 0xbb, 0xed, 0xcc, 0xee, 0xcc, 0xef,
-  0xf7, 0xeb, 0x30, 0x99, 0xae, 0x8c, 0xee, 0x83,
-  0x77, 0x7a, 0x7f, 0xf8, 0xbc, 0xef, 0x7b, 0x0f,
-  0x52, 0x4a, 0xd4, 0xf2, 0xa3, 0x37, 0xb5, 0x2b,
-  0xf1, 0x5b, 0x5a, 0xc6, 0x2b, 0xa6, 0x61, 0x0b,
-  0x8b, 0xa7, 0x58, 0x1d, 0x11, 0x26, 0xa3, 0xe1,
-  0xe6, 0xae, 0x85, 0x1f, 0x9f, 0x0d, 0xaf, 0x1c,
-  0x65, 0x8b, 0xe2, 0x16, 0x10, 0x3e, 0x9d, 0x3c,
-  0xdc, 0xdf, 0x73, 0x6d, 0xe0, 0x9e, 0x67, 0x31,
-  0x00, 0x6f, 0x82, 0x78, 0x8a, 0x0d, 0x19, 0xbe,
-  0xba, 0xf1, 0x8b, 0xc9, 0x61, 0x63, 0xcf, 0xce,
-  0x66, 0x52, 0x68, 0x73, 0xd0, 0xaa, 0xc8, 0x2a,
-  0xf2, 0xbe, 0xc8, 0x81, 0xae, 0xc1, 0x53, 0x57,
-  0x0d, 0x93, 0xaf, 0xe0, 0xe3, 0xf7, 0x69, 0x1c,
-  0x89, 0xf6, 0x80, 0x54, 0x58, 0xf1, 0x14, 0x93,
-  0x55, 0xd5, 0x84, 0x9f, 0x24, 0xa5, 0x5c, 0x87,
-  0x4c, 0x53, 0x89, 0x43, 0x7d, 0x8d, 0x1d, 0x07,
-  0x3b, 0xd9, 0xd7, 0x5f, 0x1f, 0x50, 0xb0, 0xf2,
-  0xd0, 0x54, 0x86, 0x58, 0x53, 0x1f, 0x88, 0x14,
-  0x10, 0x00, 0x09, 0x40, 0x4a, 0x01, 0x21, 0x05,
-  0xee, 0xa4, 0x2f, 0xb8, 0x04, 0xf1, 0x14, 0x1b,
-  0x0a, 0x1a, 0xdb, 0x1f, 0xf4, 0x9f, 0xb8, 0xe4,
-  0xaf, 0xaf, 0x6f, 0xa0, 0xf7, 0x8b, 0xaf, 0xc0,
-  0xa5, 0x03, 0xa6, 0xe8, 0x10, 0x92, 0x63, 0x66,
-  0xfe, 0x19, 0x88, 0x08, 0x04, 0x82, 0x84, 0xab,
-  0x7e, 0x7b, 0xb4, 0xd7, 0x1d, 0xe1, 0xd8, 0x6d,
-  0xf6, 0xa8, 0xa9, 0x71, 0xff, 0xf9, 0xee, 0xe3,
-  0x83, 0x46, 0xae, 0xb4, 0x80, 0x77, 0xdf, 0xde,
-  0x80, 0x31, 0x1f, 0x74, 0x4d, 0x07, 0x57, 0x04,
-  0x2c, 0x51, 0x80, 0x69, 0x16, 0x50, 0xb4, 0x56,
-  0x50, 0xb6, 0x4b, 0x50, 0x48, 0x85, 0x9f, 0x05,
-  0xd1, 0xba, 0x3b, 0xb1, 0xa6, 0x01, 0xe7, 0x36,
-  0x2c, 0xfb, 0x0f, 0x4c, 0xe7, 0x37, 0x4a, 0x32,
-  0x0f, 0x70, 0x01, 0x87, 0x9b, 0xa8, 0x08, 0x13,
-  0x5c, 0x72, 0x48, 0x2e, 0xc1, 0x1d, 0x09, 0xc7,
-  0x16, 0xe0, 0x8e, 0x3b, 0x72, 0xae, 0x98, 0x75,
-  0xd7, 0x38, 0x33, 0x6a, 0x5f, 0xce, 0x2e, 0x7d,
-  0xb9, 0xfe, 0xf8, 0x65, 0xda, 0x84, 0xed, 0x93,
-  0xad, 0x7b, 0x13, 0x90, 0x7a, 0x19, 0x42, 0x2f,
-  0x81, 0x05, 0x00, 0x7f, 0x40, 0x85, 0x1e, 0x50,
-  0xc1, 0x0c, 0x05, 0xcc, 0xaf, 0x40, 0xd5, 0xa8,
-  0x5a, 0xc7, 0xf5, 0x22, 0x92, 0x82, 0xa9, 0xb6,
-  0x96, 0x58, 0xb8, 0xbd, 0x2d, 0xa6, 0xcf, 0x15,
-  0x5e, 0x23, 0x5f, 0x99, 0x87, 0x90, 0xc0, 0xe9,
-  0xc8, 0x0d, 0x88, 0x7f, 0x14, 0xdc, 0x76, 0x1d,
-  0x00, 0xd2, 0x4f, 0xee, 0xae, 0x35, 0xf8, 0xbf,
-  0x46, 0x15, 0x93, 0xbb, 0x76, 0x44, 0x92, 0xe7,
-  0xce, 0x0c, 0x04, 0x8a, 0x6c, 0x11, 0x73, 0xcb,
-  0xd3, 0xe8, 0x0c, 0x0d, 0xe3, 0xfe, 0xc4, 0x88,
-  0xc5, 0x2b, 0xf0, 0x6f, 0xba, 0xc6, 0x8d, 0x87,
-  0xc4, 0x74, 0x7d, 0xbc, 0xb7, 0xfb, 0xac, 0x11,
-  0x0e, 0x87, 0x28, 0xa8, 0x84, 0x30, 0xfa, 0x70,
-  0x04, 0x99, 0x31, 0x9b, 0x36, 0xe6, 0x7a, 0x9e,
-  0x72, 0x66, 0xcc, 0x9e, 0xb0, 0x2b, 0x95, 0x8e,
-  0xe7, 0x2f, 0x9e, 0x66, 0x67, 0x67, 0xdf, 0x96,
-  0xcb, 0xe5, 0x8a, 0x57, 0x5a, 0xb5, 0x06, 0x5e,
-  0xb6, 0x3a, 0x52, 0xc3, 0xb6, 0x50, 0x32, 0xbf,
-  0x9c, 0x0b, 0x78, 0x11, 0xd4, 0x7c, 0xe5, 0x5a,
-  0xef, 0xfc, 0x17, 0x6d, 0xf3, 0x34, 0x74, 0xec,
-  0xca, 0xcb, 0x09, 0x00, 0x00, 0x00, 0x00, 0x49,
-  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* go_previous.png - 1532 bytes */
-static const unsigned char go_previous_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
-  0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
-  0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
-  0x59, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x5d, 0x48, 0x54, 0x4d, 0x18, 0x7e, 0xcf,
-  0xcc, 0x9c, 0xb3, 0xee, 0xba, 0x7e, 0x91, 0x3f,
-  0x81, 0xa6, 0xd1, 0x0a, 0x65, 0x44, 0x60, 0x41,
-  0x99, 0xee, 0xae, 0x17, 0x6a, 0x65, 0x84, 0x49,
-  0xf6, 0x2f, 0x92, 0x17, 0x11, 0xdd, 0x78, 0x95,
-  0xba, 0x5d, 0xd8, 0x45, 0x42, 0x74, 0x13, 0x41,
-  0x60, 0xd4, 0x45, 0x7a, 0x63, 0x45, 0xe5, 0x85,
-  0xb5, 0x45, 0x04, 0x26, 0x59, 0xd0, 0x0f, 0x18,
-  0xae, 0x76, 0x21, 0x44, 0x52, 0x84, 0xf9, 0xb3,
-  0xe1, 0xe2, 0xcf, 0xba, 0xec, 0xae, 0x67, 0x77,
-  0xce, 0xcc, 0x77, 0x31, 0x0c, 0xa7, 0xf6, 0xfb,
-  0xb6, 0xcf, 0x72, 0xbb, 0xf9, 0xe8, 0x85, 0xe5,
-  0x61, 0x76, 0x66, 0xce, 0x79, 0x9f, 0xf7, 0x7d,
-  0xde, 0x77, 0xe6, 0x00, 0xfc, 0xb1, 0x3f, 0xb6,
-  0x22, 0x53, 0x7e, 0xf7, 0x0b, 0xca, 0xca, 0x5a,
-  0x5a, 0x08, 0xa9, 0xae, 0x56, 0x14, 0x45, 0x01,
-  0x68, 0x6b, 0xd3, 0x34, 0xbb, 0x9d, 0xd2, 0xaa,
-  0xaa, 0x17, 0x2f, 0xda, 0xdb, 0x01, 0x28, 0x5d,
-  0xe9, 0xf3, 0xd1, 0xef, 0x72, 0xdc, 0xed, 0xf6,
-  0x78, 0x54, 0xb5, 0xa9, 0x69, 0xed, 0xda, 0x9c,
-  0x1c, 0x87, 0xe3, 0xfe, 0x7d, 0x84, 0x14, 0x05,
-  0xe3, 0xf2, 0x72, 0x31, 0x4b, 0x48, 0xaa, 0xde,
-  0x93, 0x42, 0x02, 0xed, 0xed, 0x00, 0x08, 0x39,
-  0x9d, 0xad, 0xad, 0x18, 0x5f, 0xbb, 0xb6, 0x71,
-  0x63, 0x41, 0x41, 0x71, 0xf1, 0xa5, 0x4b, 0xa7,
-  0x4f, 0xd7, 0xd6, 0xb6, 0xb5, 0xd9, 0x6c, 0x18,
-  0x23, 0x44, 0x08, 0x63, 0xa9, 0x0e, 0xd4, 0x8a,
-  0x23, 0xb1, 0x67, 0x4f, 0x6b, 0x2b, 0x40, 0x7a,
-  0x7a, 0x38, 0x1c, 0x0e, 0x13, 0xe2, 0xf5, 0x96,
-  0x94, 0x6c, 0xde, 0x5c, 0x51, 0xe1, 0x76, 0xef,
-  0xda, 0x55, 0x52, 0x72, 0xe8, 0x50, 0x5a, 0x9a,
-  0xaa, 0x12, 0xa2, 0x69, 0xa9, 0x76, 0x3b, 0x05,
-  0x04, 0x5c, 0xae, 0xb3, 0x67, 0x01, 0xf2, 0xf2,
-  0x22, 0x11, 0xc6, 0x08, 0x79, 0xfe, 0xbc, 0xaa,
-  0x6a, 0xc7, 0x8e, 0xba, 0x3a, 0x87, 0x63, 0xdb,
-  0xb6, 0xa2, 0xa2, 0xb2, 0x32, 0x55, 0x1d, 0x19,
-  0x99, 0x9a, 0x7a, 0xfa, 0x14, 0xa0, 0xb4, 0x74,
-  0xfd, 0xfa, 0xda, 0x5a, 0x00, 0x84, 0x08, 0x01,
-  0x88, 0xc5, 0x74, 0x3d, 0x14, 0x22, 0x24, 0x1a,
-  0x75, 0x3a, 0x5b, 0x5a, 0x7e, 0xf4, 0x7c, 0x45,
-  0x41, 0x08, 0x20, 0x10, 0x50, 0xd5, 0xf4, 0x74,
-  0x4a, 0xf3, 0xf2, 0x92, 0xd5, 0xcc, 0x4f, 0x13,
-  0x70, 0x3a, 0x3d, 0x1e, 0x55, 0xdd, 0xba, 0x55,
-  0x68, 0xba, 0xbf, 0xbf, 0xb6, 0xb6, 0xb2, 0xb2,
-  0xa1, 0x61, 0xf5, 0xea, 0xdc, 0xdc, 0x9c, 0x9c,
-  0xfc, 0x7c, 0x8c, 0x07, 0x07, 0xc7, 0xc7, 0x1f,
-  0x3f, 0x16, 0x6b, 0x39, 0x07, 0x30, 0x0c, 0xc6,
-  0x0c, 0x03, 0xe0, 0xdc, 0xb9, 0xc6, 0xc6, 0xeb,
-  0xd7, 0xad, 0x56, 0x84, 0x84, 0x6b, 0x8a, 0x22,
-  0x7f, 0x62, 0x9c, 0x68, 0xe7, 0xcf, 0x77, 0x76,
-  0x9e, 0x3a, 0x95, 0x99, 0x09, 0x00, 0x40, 0xa9,
-  0xac, 0x99, 0x15, 0x10, 0x28, 0x2b, 0x6b, 0x6e,
-  0xc6, 0xb8, 0xa6, 0xc6, 0x66, 0xd3, 0x34, 0x9b,
-  0xed, 0xee, 0xdd, 0x03, 0x07, 0x2a, 0x2a, 0x4e,
-  0x9c, 0xb0, 0xdb, 0x11, 0xb2, 0x58, 0x38, 0x07,
-  0x18, 0x1c, 0x1c, 0x1f, 0x7f, 0xf4, 0x08, 0x40,
-  0x10, 0x03, 0xc0, 0x18, 0x21, 0x55, 0x05, 0x78,
-  0xf6, 0x6c, 0x6c, 0xac, 0xbb, 0x5b, 0xfc, 0x4f,
-  0x88, 0x40, 0x84, 0xc4, 0x3c, 0xc6, 0x82, 0x84,
-  0x20, 0x24, 0xfa, 0x94, 0xdb, 0x5d, 0x58, 0x78,
-  0xe4, 0xc8, 0xf2, 0x03, 0xfa, 0x9f, 0x04, 0x9c,
-  0xce, 0xd6, 0x56, 0x42, 0x9a, 0x9b, 0x57, 0xad,
-  0xb2, 0xdb, 0x33, 0x33, 0x2f, 0x5c, 0xa8, 0xab,
-  0xab, 0xaa, 0x6a, 0x6c, 0xb4, 0xd9, 0x66, 0x67,
-  0xa3, 0xd1, 0xf1, 0x71, 0x80, 0x8f, 0x1f, 0x27,
-  0x26, 0x86, 0x87, 0x4d, 0x87, 0x09, 0x11, 0xc8,
-  0x18, 0xe7, 0x8c, 0x01, 0x30, 0x26, 0x32, 0x20,
-  0x8a, 0xd8, 0x24, 0x48, 0x29, 0x63, 0x08, 0x99,
-  0x84, 0xa4, 0x19, 0x06, 0x63, 0xf1, 0xb8, 0xc8,
-  0x1e, 0xe7, 0x82, 0xe0, 0x2f, 0x11, 0x70, 0xb9,
-  0x3c, 0x1e, 0x8c, 0x3b, 0x3a, 0x72, 0x73, 0xb3,
-  0xb2, 0xf2, 0xf3, 0x4f, 0x9e, 0xac, 0xae, 0x76,
-  0xbb, 0x0f, 0x1f, 0xb6, 0xd9, 0xc6, 0xc6, 0x66,
-  0x67, 0xdf, 0xbe, 0x05, 0x98, 0x9a, 0x5a, 0x58,
-  0xf8, 0xf0, 0xe1, 0xdf, 0x1c, 0xe6, 0xdc, 0x30,
-  0x00, 0x54, 0x55, 0x51, 0xc4, 0x18, 0xe3, 0x58,
-  0x0c, 0x20, 0x16, 0x53, 0x14, 0x4a, 0x01, 0x0c,
-  0x83, 0xf3, 0x78, 0x5c, 0x0a, 0x4c, 0x34, 0x54,
-  0x4d, 0x03, 0xb0, 0x58, 0x30, 0xce, 0xc8, 0x00,
-  0xa0, 0x54, 0xcc, 0x73, 0xce, 0xb9, 0x58, 0xf1,
-  0xcb, 0x19, 0x40, 0x08, 0x20, 0x2f, 0x4f, 0x26,
-  0x58, 0xe8, 0x19, 0x20, 0x1e, 0xa7, 0x74, 0x69,
-  0x09, 0x40, 0xd7, 0x29, 0x8d, 0x44, 0x00, 0xe2,
-  0x71, 0x11, 0x51, 0x19, 0x31, 0x8c, 0xcd, 0x9e,
-  0x43, 0xa9, 0xd8, 0xcd, 0x39, 0x00, 0x42, 0x18,
-  0x0b, 0xcd, 0x23, 0xf4, 0x6d, 0x54, 0x39, 0x67,
-  0x4c, 0xec, 0x5d, 0x5a, 0x02, 0x00, 0x88, 0x44,
-  0x18, 0x9b, 0x9f, 0x5f, 0xbe, 0x84, 0x92, 0x9e,
-  0x03, 0xaf, 0x5f, 0x5b, 0xad, 0x86, 0x71, 0xf4,
-  0xe8, 0xf4, 0xf4, 0xcc, 0xcc, 0xe4, 0x64, 0x57,
-  0xd7, 0x83, 0x07, 0x03, 0x03, 0xb7, 0x6f, 0x87,
-  0xc3, 0x1b, 0x36, 0x64, 0x65, 0x95, 0x94, 0x00,
-  0x14, 0x15, 0xad, 0x59, 0xb3, 0x73, 0xa7, 0x49,
-  0x84, 0x31, 0x84, 0x84, 0x0b, 0x22, 0xe2, 0x84,
-  0x58, 0x2c, 0x00, 0x00, 0x9a, 0x66, 0xb5, 0x62,
-  0x0c, 0x60, 0xb1, 0xd8, 0x6c, 0x18, 0x03, 0xa4,
-  0xa5, 0xa5, 0xa7, 0x8b, 0xb1, 0x44, 0xf1, 0xbf,
-  0xaa, 0x5a, 0xad, 0x08, 0x01, 0x30, 0xa6, 0x28,
-  0xb1, 0x58, 0x0a, 0x08, 0x88, 0x83, 0x89, 0xb1,
-  0x37, 0x6f, 0x2e, 0x5f, 0xa6, 0xb4, 0xb9, 0x79,
-  0x6e, 0x2e, 0x10, 0x98, 0x9f, 0xf7, 0x78, 0x7a,
-  0x7b, 0xfb, 0xfa, 0xba, 0xbb, 0x23, 0x91, 0xcc,
-  0x4c, 0x4d, 0x2b, 0x28, 0x00, 0x28, 0x2d, 0x75,
-  0x38, 0xf6, 0xef, 0x07, 0x50, 0x55, 0x55, 0x55,
-  0x55, 0x00, 0x8c, 0x55, 0x15, 0x21, 0x00, 0x42,
-  0x34, 0x0d, 0x21, 0x00, 0x55, 0xb5, 0x58, 0x10,
-  0xfa, 0x96, 0xc8, 0x3f, 0x1d, 0xc7, 0x58, 0x10,
-  0x16, 0x35, 0x21, 0x32, 0x25, 0xe5, 0x13, 0x0a,
-  0x4d, 0x4f, 0x8b, 0x3c, 0xfe, 0xb4, 0x84, 0x00,
-  0x00, 0x54, 0x55, 0xa0, 0xc5, 0x32, 0x38, 0x78,
-  0xf5, 0x2a, 0xa5, 0x3d, 0x3d, 0x5b, 0xb6, 0x1c,
-  0x3f, 0x1e, 0x89, 0xf8, 0xfd, 0x5e, 0xaf, 0x61,
-  0xdc, 0xb9, 0x73, 0xf3, 0xe6, 0xee, 0xdd, 0x4e,
-  0x67, 0x4d, 0x8d, 0xdd, 0x5e, 0x5e, 0xee, 0x70,
-  0x1c, 0x3b, 0xa6, 0x28, 0x3e, 0x5f, 0x20, 0xf0,
-  0xf0, 0x21, 0x00, 0xe7, 0x08, 0xc5, 0x62, 0x00,
-  0xfb, 0xf6, 0x15, 0x16, 0x9e, 0x39, 0x03, 0x40,
-  0x08, 0x21, 0x84, 0x98, 0x04, 0xa5, 0xc6, 0x19,
-  0xa3, 0x54, 0xc8, 0x53, 0xa0, 0x1c, 0xcb, 0xf2,
-  0xf5, 0xfb, 0x87, 0x87, 0x01, 0x6c, 0x36, 0xe1,
-  0x87, 0xa8, 0x1e, 0x13, 0x93, 0x12, 0x90, 0x7d,
-  0x57, 0xea, 0x59, 0xa2, 0xc5, 0x32, 0x3a, 0x7a,
-  0xef, 0x9e, 0x61, 0xbc, 0x7b, 0xb7, 0x6e, 0x9d,
-  0xdb, 0x0d, 0x70, 0xf0, 0x60, 0x5f, 0x1f, 0xa5,
-  0x5e, 0xef, 0xad, 0x5b, 0x2e, 0xd7, 0xf6, 0xed,
-  0x95, 0x95, 0xd9, 0xd9, 0x6e, 0xf7, 0xa6, 0x4d,
-  0x0d, 0x0d, 0x84, 0x0c, 0x0d, 0x05, 0x02, 0xbd,
-  0xbd, 0x42, 0xe3, 0x00, 0x00, 0x57, 0xae, 0x74,
-  0x75, 0x5d, 0xbc, 0xa8, 0xeb, 0xba, 0x1e, 0x89,
-  0xc4, 0xe3, 0x42, 0x5e, 0x3f, 0x32, 0xe1, 0xfe,
-  0xc2, 0x42, 0x30, 0x38, 0x31, 0x61, 0x66, 0x40,
-  0xfa, 0x61, 0x18, 0x02, 0x19, 0x4b, 0x42, 0x00,
-  0xe3, 0xef, 0x51, 0x12, 0x32, 0xf1, 0xcb, 0x97,
-  0x57, 0xaf, 0x0c, 0xe3, 0xeb, 0xd7, 0x60, 0xf0,
-  0xf3, 0x67, 0x80, 0xfa, 0x7a, 0xc3, 0xa0, 0x74,
-  0x60, 0xa0, 0xa3, 0x23, 0x18, 0x5c, 0x5c, 0x0c,
-  0x06, 0x8b, 0x8a, 0x5c, 0xae, 0xd2, 0xd2, 0xfa,
-  0x7a, 0x4d, 0xe3, 0xdc, 0x30, 0x14, 0x05, 0x20,
-  0x1e, 0xd7, 0x75, 0xce, 0x55, 0xd5, 0xe7, 0xeb,
-  0xec, 0xa4, 0x74, 0xef, 0x5e, 0x5d, 0x5f, 0x5c,
-  0x04, 0x08, 0x85, 0xc4, 0xf3, 0x74, 0xfd, 0x7b,
-  0x14, 0xd5, 0x64, 0x8e, 0x13, 0xfd, 0x92, 0x7e,
-  0xc4, 0x62, 0x2b, 0xbe, 0xcc, 0x05, 0x83, 0x53,
-  0x53, 0x00, 0xa1, 0x90, 0xcf, 0x77, 0xe3, 0x86,
-  0x61, 0x34, 0x35, 0xf9, 0x7c, 0x3e, 0xdf, 0xd0,
-  0xd0, 0xc0, 0xc0, 0x93, 0x27, 0xfd, 0xfd, 0x5e,
-  0xaf, 0xae, 0x47, 0xa3, 0x91, 0x88, 0x74, 0x27,
-  0x75, 0x66, 0x5e, 0x0a, 0xf1, 0x8f, 0x12, 0x68,
-  0xa6, 0x2e, 0x19, 0x9a, 0xeb, 0x19, 0x13, 0x5d,
-  0xde, 0xef, 0x1f, 0x1e, 0xe6, 0xfc, 0xe5, 0x4b,
-  0x84, 0xb2, 0xb3, 0x83, 0xc1, 0x58, 0x6c, 0x72,
-  0x72, 0x6e, 0xee, 0xd3, 0xa7, 0xe2, 0xe2, 0xa5,
-  0x25, 0x5d, 0x0f, 0x87, 0x09, 0xf1, 0xfb, 0x47,
-  0x46, 0x0c, 0xa3, 0xb3, 0x53, 0x34, 0xe3, 0x68,
-  0x54, 0xec, 0x97, 0x9a, 0x96, 0xfd, 0x27, 0x51,
-  0xeb, 0x89, 0xf3, 0x66, 0x9f, 0x4a, 0x42, 0x40,
-  0x32, 0x94, 0xbd, 0x20, 0xf1, 0x3c, 0x4c, 0x9c,
-  0x97, 0x9a, 0x94, 0x77, 0x15, 0x4a, 0x67, 0x66,
-  0x46, 0x47, 0x39, 0x1f, 0x19, 0x51, 0x94, 0xbf,
-  0xfe, 0x0a, 0x87, 0xdf, 0xbf, 0xd7, 0xb4, 0x8c,
-  0x0c, 0xce, 0x73, 0x73, 0xa7, 0xa7, 0x87, 0x86,
-  0x38, 0xef, 0xe9, 0x11, 0xe7, 0xad, 0x24, 0x90,
-  0x28, 0x21, 0x89, 0xd2, 0x51, 0xb9, 0x4e, 0xe6,
-  0xd2, 0x3c, 0xe2, 0x96, 0xf9, 0x45, 0x26, 0x09,
-  0x98, 0x5d, 0xe9, 0xfb, 0xb1, 0xd4, 0x64, 0x62,
-  0xed, 0xc8, 0x7d, 0x12, 0xe5, 0x8b, 0x13, 0x89,
-  0x27, 0x06, 0x20, 0x91, 0x48, 0xf2, 0x2f, 0xb7,
-  0x15, 0x7e, 0x52, 0x4a, 0x47, 0xa5, 0xa4, 0x12,
-  0x09, 0xe0, 0x84, 0x0c, 0xcb, 0xcc, 0x49, 0x4c,
-  0x24, 0x20, 0x71, 0x39, 0x97, 0x88, 0xff, 0x89,
-  0xfd, 0x0d, 0x55, 0x2f, 0x8f, 0xd6, 0x11, 0x55,
-  0x75, 0x12, 0x00, 0x00, 0x00, 0x22, 0x7a, 0x54,
-  0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61,
-  0x72, 0x65, 0x00, 0x00, 0x78, 0xda, 0x2b, 0x2f,
-  0x2f, 0xd7, 0xcb, 0xcc, 0xcb, 0x2e, 0x4e, 0x4e,
-  0x2c, 0x48, 0xd5, 0xcb, 0x2f, 0x4a, 0x07, 0x00,
-  0x36, 0xd8, 0x06, 0x58, 0x10, 0x53, 0xca, 0x5c,
-  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
-  0xae, 0x42, 0x60, 0x82};
--- a/art/tango/go_up.h
+++ b/art/tango/go_up.h
@@ -1,266 +0,0 @@
-/* go_up.png - 652 bytes */
-static const unsigned char go_up_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
-  0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
-  0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
-  0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
-  0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
-  0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
-  0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
-  0x02, 0x1e, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
-  0x95, 0x93, 0x4f, 0x68, 0x13, 0x41, 0x14, 0xc6,
-  0xbf, 0x37, 0xbb, 0x33, 0xd9, 0x8d, 0x85, 0x7a,
-  0x68, 0x4c, 0xff, 0xd1, 0x82, 0x04, 0xed, 0xc1,
-  0x40, 0x2a, 0xa8, 0xd0, 0xd5, 0x8a, 0x68, 0x44,
-  0x62, 0x45, 0x2d, 0x14, 0x72, 0x6b, 0x4a, 0xc9,
-  0x49, 0x90, 0x62, 0x16, 0xc1, 0xab, 0xc7, 0x52,
-  0x91, 0xa0, 0x17, 0x0f, 0x45, 0x4f, 0x1e, 0xa5,
-  0x42, 0xf1, 0xe2, 0x4d, 0x2a, 0x5e, 0x44, 0x50,
-  0xd0, 0x43, 0x29, 0xb4, 0x2a, 0x95, 0x94, 0x34,
-  0x89, 0xa6, 0x9a, 0x26, 0xd9, 0xd9, 0x19, 0x0f,
-  0x51, 0xac, 0x21, 0xa9, 0xf6, 0x1d, 0xdf, 0xfb,
-  0xe6, 0xc7, 0x7c, 0xdf, 0x9b, 0x21, 0xad, 0x35,
-  0xda, 0xd5, 0xc9, 0x9b, 0x7c, 0x1e, 0x00, 0x96,
-  0x66, 0xbd, 0xe9, 0x76, 0x1a, 0xd6, 0x6e, 0xe0,
-  0xb8, 0x3c, 0xdd, 0xdf, 0x15, 0x49, 0xf6, 0x75,
-  0x1d, 0x4c, 0x3a, 0x2e, 0x4f, 0xef, 0x09, 0xe0,
-  0xb8, 0x3c, 0x1a, 0x10, 0xfb, 0xb2, 0x57, 0xce,
-  0x4c, 0x06, 0xc7, 0x46, 0x93, 0xc1, 0x80, 0x08,
-  0x66, 0x1d, 0x97, 0x47, 0xff, 0x0b, 0xe0, 0xb8,
-  0xbc, 0x03, 0x84, 0xc5, 0x89, 0x73, 0xd3, 0xd6,
-  0x96, 0x97, 0xc7, 0x96, 0xb7, 0x89, 0xf8, 0xc8,
-  0x25, 0x0b, 0x84, 0x45, 0xc7, 0xe5, 0x1d, 0xff,
-  0x04, 0x10, 0xe1, 0xd1, 0xe8, 0x70, 0xa2, 0xa7,
-  0x37, 0x34, 0x48, 0x9f, 0x4b, 0x1f, 0xf0, 0xb1,
-  0xf4, 0x1e, 0x9d, 0x9d, 0x9d, 0x14, 0x1b, 0x3a,
-  0xd1, 0x0d, 0xc2, 0xc3, 0x5d, 0x01, 0x8e, 0xcb,
-  0xd3, 0xfd, 0x07, 0x22, 0x89, 0xb3, 0x47, 0xc7,
-  0xf9, 0x4a, 0xfe, 0x0d, 0x0c, 0xc6, 0x61, 0x32,
-  0x8e, 0x57, 0x6b, 0x0b, 0x88, 0x0d, 0x1d, 0x17,
-  0xa1, 0xfd, 0x3d, 0x89, 0xe6, 0x3c, 0xd8, 0x8e,
-  0xc3, 0x51, 0xc1, 0xed, 0x6c, 0x2a, 0xe1, 0xda,
-  0xeb, 0xe5, 0x65, 0x68, 0xf2, 0x20, 0x84, 0x89,
-  0x3a, 0x7d, 0xc7, 0x36, 0x15, 0xf1, 0x2e, 0xff,
-  0x1c, 0x17, 0x4e, 0x5f, 0x0d, 0x9a, 0xa6, 0xf8,
-  0x2b, 0x0f, 0xb6, 0xd3, 0xf7, 0xd4, 0x58, 0xc6,
-  0x52, 0xe4, 0xa1, 0x22, 0x4b, 0x10, 0x01, 0x01,
-  0x1e, 0xe0, 0x28, 0xcb, 0x75, 0x08, 0xdb, 0x40,
-  0x41, 0xae, 0xa2, 0xa8, 0x56, 0x71, 0xfe, 0xd4,
-  0x45, 0x8b, 0xd8, 0x9f, 0x3c, 0xd8, 0x6f, 0xdf,
-  0xf1, 0x63, 0xe3, 0xdd, 0x87, 0xfa, 0x62, 0x94,
-  0xaf, 0xac, 0xc1, 0xe4, 0x06, 0x38, 0x37, 0x50,
-  0x51, 0x05, 0x54, 0x8d, 0xaf, 0x10, 0x36, 0x83,
-  0xb0, 0x19, 0x96, 0xbf, 0xbd, 0x40, 0xb8, 0x37,
-  0x44, 0x47, 0x0e, 0x0f, 0x87, 0x89, 0x35, 0xf2,
-  0xa0, 0x91, 0x8c, 0x99, 0x1e, 0xe8, 0x8e, 0x64,
-  0x6f, 0x4c, 0xdc, 0xb1, 0x05, 0x0f, 0x40, 0x41,
-  0xc2, 0x87, 0x87, 0xd7, 0xb9, 0x05, 0xbc, 0x2d,
-  0x3c, 0x83, 0x64, 0x15, 0x10, 0x23, 0x24, 0x06,
-  0x32, 0xd0, 0x5a, 0x43, 0x29, 0xa0, 0x5e, 0xaf,
-  0xe1, 0xf1, 0xd3, 0xf9, 0x4a, 0xb1, 0xb4, 0x39,
-  0x63, 0x12, 0x43, 0xea, 0x53, 0x6e, 0xc5, 0x9e,
-  0xb9, 0x77, 0xb9, 0xe1, 0x89, 0xa3, 0x7a, 0xf7,
-  0xfa, 0x13, 0xab, 0x2c, 0x73, 0xf0, 0x8d, 0x6d,
-  0x70, 0xc1, 0xc0, 0x4c, 0x82, 0xc1, 0x09, 0x73,
-  0x0f, 0x6e, 0x57, 0x65, 0x4d, 0x5b, 0xbf, 0xec,
-  0x07, 0x89, 0x21, 0x65, 0x2e, 0xcd, 0x7a, 0x4e,
-  0xd3, 0x26, 0xb4, 0xd6, 0x0a, 0xa5, 0xfa, 0x17,
-  0x30, 0x83, 0x60, 0x70, 0x06, 0x1e, 0x68, 0x40,
-  0x64, 0x4d, 0x5b, 0x2f, 0xe7, 0x3c, 0xda, 0xf5,
-  0x1d, 0x00, 0x80, 0xd2, 0x3e, 0x7e, 0xd4, 0x8b,
-  0x8d, 0x2b, 0xfb, 0x1a, 0xb2, 0xae, 0xa0, 0x55,
-  0xeb, 0x3f, 0x63, 0xb6, 0x6a, 0xfa, 0x4a, 0xa2,
-  0x5a, 0xdb, 0x86, 0x32, 0x35, 0xa0, 0x15, 0x7c,
-  0x49, 0xf0, 0xbd, 0x3d, 0x00, 0xa4, 0x2f, 0x11,
-  0x1f, 0xbc, 0x06, 0x62, 0x00, 0x31, 0x02, 0x11,
-  0xf6, 0x00, 0x20, 0x6c, 0xdc, 0xba, 0x3f, 0x19,
-  0x6e, 0x25, 0x26, 0xc2, 0x46, 0x73, 0xef, 0x27,
-  0x30, 0xf7, 0xc5, 0xdb, 0xb6, 0xd0, 0x9a, 0x22,
-  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
-  0xae, 0x42, 0x60, 0x82};
-
-
-/* go_up.png - 1418 bytes */
-static const unsigned char go_up_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
-  0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
-  0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
-  0xe7, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x4b, 0x4c, 0x13, 0x5b, 0x18, 0xfe, 0xce,
-  0x6b, 0xa0, 0xb4, 0x5c, 0xa2, 0x01, 0x04, 0x43,
-  0x45, 0x11, 0x44, 0x42, 0x34, 0x46, 0x2b, 0xa6,
-  0xad, 0x11, 0x8d, 0x29, 0x46, 0x03, 0x68, 0xa2,
-  0x18, 0x7c, 0xac, 0x94, 0xc0, 0xd2, 0x00, 0x81,
-  0xe8, 0xca, 0x85, 0xee, 0x8c, 0x8f, 0xb8, 0x30,
-  0xd1, 0x68, 0x22, 0x1b, 0x17, 0xb2, 0x20, 0x1a,
-  0x17, 0x86, 0x85, 0x92, 0x68, 0x1b, 0x5f, 0x1b,
-  0x5f, 0xc4, 0x88, 0x52, 0x5e, 0x4a, 0x0a, 0xad,
-  0x80, 0x50, 0x69, 0xcb, 0xcc, 0x9c, 0xbb, 0x98,
-  0x3b, 0xa9, 0x6d, 0xec, 0xbd, 0x12, 0xd1, 0x9b,
-  0xdc, 0xeb, 0xbf, 0xf9, 0x73, 0x26, 0x33, 0xe7,
-  0x7c, 0xdf, 0xff, 0x7f, 0xdf, 0x39, 0x67, 0x80,
-  0xdf, 0xf1, 0x3b, 0xfe, 0xdf, 0x41, 0x7e, 0xd6,
-  0xc4, 0x9b, 0x37, 0xb7, 0xb7, 0x33, 0x76, 0xe5,
-  0x0a, 0x00, 0x10, 0xb2, 0x74, 0x69, 0x7e, 0xbe,
-  0xdf, 0xaf, 0xaa, 0xbb, 0x77, 0x77, 0x76, 0x76,
-  0x76, 0x02, 0x9a, 0xb6, 0x50, 0xeb, 0xf0, 0x85,
-  0x06, 0xee, 0x76, 0xb7, 0xb7, 0x73, 0x7e, 0xe2,
-  0x44, 0x7e, 0x7e, 0x4e, 0xce, 0xb2, 0x65, 0x07,
-  0x0f, 0x02, 0x94, 0x02, 0x84, 0x8c, 0x8e, 0x4a,
-  0x39, 0x38, 0x78, 0xe9, 0x12, 0x00, 0x68, 0x5a,
-  0x53, 0xd3, 0x42, 0xad, 0xc7, 0x16, 0x6a, 0x22,
-  0x97, 0xab, 0xad, 0x8d, 0xb1, 0xbd, 0x7b, 0x17,
-  0x2d, 0xb2, 0xd9, 0x72, 0x72, 0xce, 0x9f, 0xaf,
-  0xae, 0xae, 0xac, 0xac, 0xaf, 0xb7, 0x5a, 0x8b,
-  0x8a, 0x0a, 0x0a, 0x4a, 0x4b, 0x85, 0x18, 0x18,
-  0xf8, 0xf8, 0xf1, 0xfd, 0xfb, 0xd5, 0xab, 0x97,
-  0x2c, 0x71, 0x38, 0x62, 0xb1, 0xa9, 0xa9, 0xa1,
-  0x21, 0x9f, 0x4f, 0xd7, 0x9f, 0x3e, 0xfd, 0xd7,
-  0x09, 0xb8, 0xdd, 0xcd, 0xcd, 0x42, 0x38, 0x1c,
-  0x56, 0xab, 0xc5, 0x62, 0xb3, 0xdd, 0xba, 0xb5,
-  0x6f, 0x9f, 0xc7, 0x73, 0xe4, 0x88, 0xd5, 0xda,
-  0xdb, 0x3b, 0x3e, 0xee, 0xf5, 0x02, 0x81, 0xc0,
-  0xf4, 0xb4, 0xdf, 0x0f, 0x38, 0x9d, 0x65, 0x65,
-  0x3b, 0x76, 0x28, 0x4a, 0x5f, 0xdf, 0xc0, 0x40,
-  0x6f, 0x6f, 0x65, 0x65, 0x6e, 0xee, 0xa6, 0x4d,
-  0x9a, 0xf6, 0xe4, 0xc9, 0xc8, 0x88, 0xcf, 0xa7,
-  0xeb, 0xfd, 0xfd, 0xbf, 0x9c, 0xc0, 0x96, 0x2d,
-  0x2d, 0x2d, 0x80, 0xdd, 0x4e, 0xa9, 0x10, 0x69,
-  0x69, 0x3e, 0x5f, 0x5d, 0x5d, 0x55, 0x55, 0x43,
-  0xc3, 0x1f, 0x7f, 0x04, 0x83, 0x91, 0x88, 0xdf,
-  0x0f, 0xf8, 0xfd, 0xa1, 0xd0, 0x8b, 0x17, 0xc0,
-  0xe7, 0xcf, 0xb3, 0xb3, 0xe3, 0xe3, 0x00, 0x63,
-  0x9c, 0x73, 0x0e, 0xac, 0x5b, 0x57, 0x5c, 0xec,
-  0x76, 0x2b, 0xca, 0xdb, 0xb7, 0x83, 0x83, 0xaf,
-  0x5e, 0xed, 0xd9, 0x63, 0xb7, 0xbb, 0x5c, 0x8c,
-  0x75, 0x75, 0x0d, 0x0f, 0x7b, 0xbd, 0x9a, 0x16,
-  0x0a, 0xcd, 0x17, 0x07, 0x9d, 0x7f, 0xc5, 0xdb,
-  0xdb, 0x81, 0xcc, 0x4c, 0x5d, 0xe7, 0x9c, 0xb1,
-  0x9e, 0x9e, 0xda, 0xda, 0xad, 0x5b, 0x0f, 0x1f,
-  0xce, 0xca, 0xd2, 0x75, 0xc6, 0xa2, 0x51, 0xa0,
-  0xbf, 0x3f, 0x14, 0x7a, 0xfe, 0x1c, 0xe0, 0x9c,
-  0x52, 0xce, 0x01, 0xc6, 0x28, 0x15, 0x02, 0xe8,
-  0xeb, 0x1b, 0x1b, 0x7b, 0xfa, 0x14, 0x08, 0x87,
-  0x35, 0x2d, 0x18, 0x04, 0x3c, 0x1e, 0x97, 0xab,
-  0xa6, 0x26, 0x33, 0x13, 0x90, 0x52, 0x55, 0xef,
-  0xdd, 0x73, 0x3a, 0x9b, 0x9b, 0x81, 0xc5, 0x8b,
-  0x7f, 0x1a, 0x81, 0xba, 0xba, 0xba, 0x3a, 0x80,
-  0x31, 0x29, 0x01, 0xce, 0xef, 0xdc, 0xa9, 0xaa,
-  0xaa, 0xa8, 0xd8, 0xbf, 0xdf, 0x6e, 0xcf, 0xcd,
-  0xcd, 0xce, 0xce, 0xcb, 0xa3, 0xf4, 0xcd, 0x9b,
-  0xb1, 0xb1, 0x47, 0x8f, 0xe2, 0x80, 0xbf, 0xce,
-  0x9c, 0x03, 0x00, 0x21, 0x84, 0x00, 0xcf, 0x9e,
-  0x0d, 0x0f, 0xdf, 0xbd, 0x0b, 0x58, 0xad, 0x36,
-  0x5b, 0x46, 0x06, 0x21, 0x6e, 0xf7, 0xfa, 0xf5,
-  0x1e, 0x4f, 0x6e, 0x2e, 0xa5, 0x42, 0x70, 0xde,
-  0xdd, 0xbd, 0x61, 0x43, 0x63, 0x23, 0x20, 0xc4,
-  0x82, 0x13, 0x18, 0x1d, 0x5d, 0xb1, 0x82, 0xb1,
-  0xcb, 0x97, 0x5d, 0xae, 0xf2, 0x72, 0x8f, 0xa7,
-  0xa2, 0xa2, 0xbc, 0xbc, 0xa4, 0xc4, 0xe1, 0x10,
-  0xe2, 0xf5, 0xeb, 0xd1, 0xd1, 0x07, 0x0f, 0x00,
-  0xc6, 0x08, 0x61, 0x0c, 0x10, 0x82, 0x73, 0x21,
-  0x80, 0xb4, 0x34, 0x45, 0x51, 0x14, 0x40, 0x08,
-  0x45, 0xa1, 0x14, 0x90, 0x92, 0xb1, 0x58, 0x0c,
-  0xa0, 0x54, 0x08, 0x29, 0x81, 0xc7, 0x8f, 0x87,
-  0x87, 0xbb, 0xba, 0x80, 0xc2, 0xc2, 0x82, 0x82,
-  0xa2, 0x22, 0xce, 0xd7, 0xac, 0x29, 0x2e, 0xde,
-  0xb8, 0xb1, 0xbc, 0xdc, 0x62, 0xc9, 0xca, 0x62,
-  0xac, 0xa3, 0xe3, 0x7b, 0x71, 0xfd, 0xa3, 0x07,
-  0x5c, 0xae, 0xd6, 0x56, 0xce, 0x5b, 0x5b, 0xcb,
-  0xca, 0x96, 0x2f, 0x77, 0x38, 0x8e, 0x1d, 0xdb,
-  0xb9, 0xd3, 0xed, 0xae, 0xaf, 0xb7, 0x58, 0x5e,
-  0xbe, 0xfc, 0xf0, 0xe1, 0xfe, 0x7d, 0x40, 0x55,
-  0x09, 0x89, 0x46, 0x0d, 0x8d, 0x13, 0x02, 0xc4,
-  0xeb, 0xcd, 0xb9, 0x94, 0x86, 0x64, 0x0c, 0x65,
-  0x33, 0xa6, 0x69, 0x00, 0x63, 0x8c, 0x11, 0x02,
-  0x00, 0x94, 0xea, 0x3a, 0x10, 0x08, 0xcc, 0xcc,
-  0xf4, 0xf7, 0x03, 0x4e, 0x67, 0x69, 0xe9, 0xae,
-  0x5d, 0x9c, 0x4f, 0x4c, 0x4c, 0x4e, 0x4e, 0x4c,
-  0xac, 0x5c, 0x69, 0xb3, 0xad, 0x5d, 0x3b, 0x39,
-  0xa9, 0xeb, 0x86, 0xc9, 0x1f, 0x3e, 0x4c, 0x85,
-  0x2f, 0xe5, 0x41, 0xe6, 0x74, 0xb6, 0xb4, 0x30,
-  0x56, 0x5d, 0x5d, 0x58, 0x98, 0x97, 0x57, 0x52,
-  0x72, 0xf3, 0xe6, 0xd1, 0xa3, 0x35, 0x35, 0xc7,
-  0x8f, 0x5b, 0x2c, 0x9c, 0x1b, 0x15, 0x96, 0x12,
-  0xd0, 0x75, 0x40, 0x4a, 0x42, 0x34, 0x0d, 0xe8,
-  0xe9, 0xf1, 0xfb, 0x3b, 0x3a, 0xe2, 0x84, 0x82,
-  0xc1, 0xd9, 0x59, 0xbf, 0x1f, 0x98, 0x9d, 0xd5,
-  0xb4, 0xe9, 0xe9, 0xaf, 0x67, 0x96, 0x12, 0x00,
-  0x6a, 0x6b, 0x57, 0xad, 0x6a, 0x6b, 0x03, 0xa4,
-  0xd4, 0x75, 0x29, 0x8d, 0x0c, 0x00, 0x91, 0x48,
-  0x2c, 0x16, 0x8d, 0x02, 0x5d, 0x5d, 0xdd, 0xdd,
-  0x37, 0x6e, 0x7c, 0xf9, 0x12, 0x0c, 0x86, 0x42,
-  0x23, 0x23, 0x07, 0x0e, 0x78, 0xbd, 0xe7, 0xce,
-  0x69, 0xda, 0xed, 0xdb, 0xc9, 0x38, 0x53, 0x1e,
-  0x64, 0x94, 0x32, 0x46, 0x48, 0x6b, 0xeb, 0xd0,
-  0x50, 0x20, 0xf0, 0xee, 0x9d, 0xc5, 0x72, 0xf2,
-  0xe4, 0xd5, 0xab, 0x0d, 0x0d, 0x5f, 0xb5, 0x8e,
-  0x09, 0x41, 0x48, 0x24, 0x72, 0xea, 0x54, 0x63,
-  0xe3, 0xb5, 0x6b, 0xe9, 0xe9, 0x42, 0x28, 0x0a,
-  0xe7, 0x40, 0x38, 0x1c, 0x8b, 0x05, 0x02, 0xc0,
-  0xdc, 0x1c, 0x63, 0xe1, 0x30, 0x20, 0x84, 0x10,
-  0xc6, 0x51, 0x66, 0xc2, 0x37, 0x08, 0x50, 0x6a,
-  0x74, 0xec, 0xe2, 0xc5, 0xeb, 0xd7, 0x4f, 0x9f,
-  0x8e, 0x44, 0x54, 0x35, 0x16, 0x93, 0x32, 0x3d,
-  0x3d, 0x11, 0x45, 0x46, 0x06, 0xc0, 0x39, 0x21,
-  0x2d, 0x2d, 0xc6, 0x78, 0x1e, 0x04, 0xbc, 0xde,
-  0x33, 0x67, 0x54, 0x75, 0xdb, 0xb6, 0xbf, 0x97,
-  0x96, 0x94, 0x94, 0x32, 0x66, 0x68, 0x5f, 0x51,
-  0x84, 0x00, 0x66, 0x66, 0xa2, 0xd1, 0xb1, 0x31,
-  0x40, 0x88, 0xb4, 0x34, 0x4a, 0x01, 0x4a, 0xe9,
-  0x5f, 0x3e, 0x33, 0x4c, 0x2c, 0xa5, 0x41, 0xc1,
-  0x94, 0x92, 0x09, 0xdc, 0xe7, 0x3b, 0x7b, 0x56,
-  0x55, 0xc9, 0xbc, 0xaf, 0x36, 0x3f, 0x7c, 0x95,
-  0xa0, 0x94, 0x52, 0x42, 0x80, 0x70, 0x58, 0x55,
-  0x3f, 0x7d, 0x32, 0xcc, 0xaa, 0xaa, 0x00, 0xe7,
-  0x8a, 0x62, 0x7a, 0x82, 0x10, 0x03, 0xbe, 0x41,
-  0xc0, 0x90, 0x0c, 0x21, 0xa6, 0x17, 0x7e, 0x2c,
-  0x16, 0x80, 0x80, 0xb1, 0xfb, 0x44, 0x22, 0xba,
-  0x3e, 0x35, 0x05, 0x10, 0x62, 0x54, 0xdc, 0x90,
-  0x20, 0xc0, 0xb9, 0x21, 0x21, 0x93, 0x88, 0xaa,
-  0xc6, 0x62, 0xba, 0x6e, 0xf6, 0xe3, 0x97, 0x11,
-  0x30, 0x17, 0x63, 0x2c, 0x31, 0xc7, 0x23, 0x12,
-  0x51, 0xd5, 0x70, 0x38, 0xfe, 0xae, 0x69, 0x4a,
-  0x5d, 0xd7, 0x34, 0xc3, 0xa4, 0x86, 0xf6, 0xa5,
-  0x34, 0x6f, 0xa2, 0xc6, 0x38, 0x31, 0x32, 0x32,
-  0x8c, 0x6c, 0xbe, 0x63, 0x66, 0x55, 0x9d, 0x27,
-  0x01, 0x13, 0xb0, 0x79, 0xa0, 0x70, 0x9e, 0x98,
-  0xe3, 0x07, 0x8d, 0x09, 0x6c, 0xfb, 0x76, 0xbb,
-  0xbd, 0xa9, 0xc9, 0xd8, 0x95, 0x74, 0xdd, 0xe8,
-  0x80, 0x31, 0x93, 0x59, 0xeb, 0xb8, 0x8d, 0x0d,
-  0x62, 0x86, 0x94, 0x12, 0x23, 0x33, 0x33, 0x11,
-  0xf0, 0xdc, 0x5c, 0xe2, 0x38, 0xf9, 0xb9, 0x94,
-  0x29, 0x08, 0x98, 0x40, 0xcd, 0x4a, 0x27, 0x03,
-  0x37, 0xc7, 0xc1, 0x60, 0x5b, 0xdb, 0x85, 0x0b,
-  0x87, 0x0e, 0x65, 0x67, 0x7f, 0x5f, 0x27, 0x53,
-  0x45, 0x30, 0x98, 0x5c, 0x98, 0x6f, 0x87, 0x49,
-  0x39, 0xde, 0xa1, 0x14, 0x3a, 0x34, 0xab, 0x95,
-  0x0a, 0x78, 0xf2, 0x38, 0x99, 0xa8, 0xb9, 0xf3,
-  0xc4, 0x77, 0xa0, 0x44, 0x00, 0x86, 0xbc, 0xe2,
-  0xd9, 0xac, 0x6c, 0xb2, 0x64, 0xcc, 0x4a, 0xc7,
-  0x62, 0x89, 0xd9, 0xfc, 0x6e, 0xde, 0x7f, 0x64,
-  0xa9, 0xbc, 0x60, 0xe6, 0x64, 0xe0, 0xc9, 0x5e,
-  0x31, 0x17, 0x4e, 0x26, 0x92, 0x0c, 0x3c, 0xd9,
-  0x27, 0xdf, 0xf2, 0xcb, 0x7f, 0x24, 0xfe, 0x04,
-  0xe4, 0x80, 0x1a, 0x0b, 0xa8, 0xf4, 0x5a, 0x14,
-  0x00, 0x00, 0x00, 0x22, 0x7a, 0x54, 0x58, 0x74,
-  0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65,
-  0x00, 0x00, 0x78, 0xda, 0x2b, 0x2f, 0x2f, 0xd7,
-  0xcb, 0xcc, 0xcb, 0x2e, 0x4e, 0x4e, 0x2c, 0x48,
-  0xd5, 0xcb, 0x2f, 0x4a, 0x07, 0x00, 0x36, 0xd8,
-  0x06, 0x58, 0x10, 0x53, 0xca, 0x5c, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
--- a/art/tango/image_missing.h
+++ b/art/tango/image_missing.h
@@ -1,177 +0,0 @@
-/* image_missing.png - 427 bytes */
-static const unsigned char image_missing_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x09, 0x1b, 0x14, 0x11, 0x2b, 0xe0,
-  0x65, 0x44, 0x2f, 0x00, 0x00, 0x01, 0x38, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xbd, 0x93, 0xdf,
-  0x2a, 0x84, 0x51, 0x14, 0xc5, 0x7f, 0x6b, 0xef,
-  0x3d, 0x26, 0x92, 0x28, 0xe5, 0x02, 0xa5, 0x0c,
-  0x29, 0xb9, 0xf0, 0x3c, 0xde, 0xc2, 0x3b, 0x4c,
-  0xa6, 0x09, 0x6f, 0xe1, 0x8d, 0x4c, 0xa1, 0xa1,
-  0xdc, 0x71, 0xa1, 0xa6, 0x41, 0x92, 0xf9, 0xbe,
-  0xed, 0x42, 0xf3, 0x8d, 0x0f, 0x25, 0x73, 0x61,
-  0xd5, 0xe9, 0xfc, 0xdb, 0x7b, 0xed, 0x75, 0xce,
-  0x59, 0x47, 0x9d, 0x6e, 0xfb, 0x04, 0x38, 0x64,
-  0x3a, 0x9c, 0xd2, 0xe9, 0xb6, 0xb3, 0x2c, 0xcb,
-  0xa9, 0x5a, 0xa7, 0xdb, 0xce, 0x00, 0xc8, 0x4c,
-  0x7a, 0xbd, 0xde, 0x9f, 0x4a, 0xb7, 0x5a, 0x2d,
-  0x00, 0x02, 0x40, 0x52, 0xb5, 0xf0, 0x57, 0x54,
-  0x0a, 0xae, 0x6f, 0x2f, 0xeb, 0x1b, 0xd1, 0x20,
-  0xdc, 0x71, 0x0f, 0xdc, 0x83, 0x88, 0x20, 0xcc,
-  0xf1, 0x68, 0xe0, 0x1e, 0x34, 0x1b, 0xcd, 0x09,
-  0xc1, 0x18, 0xab, 0x2b, 0xeb, 0xd5, 0x58, 0xd2,
-  0x47, 0x8f, 0x48, 0x92, 0x71, 0x21, 0x00, 0x37,
-  0xab, 0x2b, 0xa8, 0x41, 0x70, 0xb3, 0xb4, 0x0c,
-  0xc0, 0xf6, 0x70, 0xc0, 0xd5, 0xc2, 0x22, 0x00,
-  0x5b, 0xc3, 0x01, 0x59, 0x26, 0x99, 0x25, 0xf6,
-  0x89, 0xc0, 0xbe, 0xe6, 0x9b, 0x9c, 0xed, 0xe1,
-  0x00, 0xa0, 0x4a, 0xde, 0x79, 0x7a, 0xc4, 0xcd,
-  0x30, 0x33, 0x24, 0xab, 0x11, 0xd4, 0x14, 0x98,
-  0x09, 0x49, 0xb5, 0x00, 0x80, 0x70, 0xa7, 0xcc,
-  0x04, 0x25, 0x08, 0x24, 0xab, 0x8e, 0x53, 0x8b,
-  0x94, 0x0c, 0x93, 0x71, 0x31, 0xbf, 0x00, 0xc0,
-  0xde, 0xeb, 0x2b, 0x00, 0xe7, 0xb3, 0x73, 0x98,
-  0x19, 0x66, 0xc2, 0x10, 0xe6, 0x3f, 0x28, 0x18,
-  0x57, 0x95, 0xc4, 0xee, 0xcb, 0x33, 0x32, 0xc7,
-  0x4c, 0xec, 0x8f, 0x46, 0x94, 0x09, 0x99, 0x05,
-  0x59, 0x24, 0x32, 0xe1, 0x32, 0x0a, 0x8a, 0x3a,
-  0x81, 0x64, 0xdc, 0x3f, 0xdc, 0x11, 0x1e, 0xc4,
-  0xf8, 0xe9, 0xdc, 0xf1, 0x98, 0xcc, 0xdd, 0x83,
-  0xc6, 0xcc, 0x0c, 0xfa, 0xe9, 0x0e, 0x36, 0xd6,
-  0x36, 0x7f, 0x77, 0x4d, 0xc2, 0xe8, 0xad, 0x60,
-  0xf4, 0x56, 0x7c, 0x27, 0xe8, 0xf7, 0xfb, 0xff,
-  0x6b, 0xe5, 0x66, 0x73, 0xe2, 0xc4, 0xb3, 0xee,
-  0xf1, 0xd1, 0xc1, 0xb4, 0xdf, 0xf9, 0x1d, 0x01,
-  0x9f, 0x8d, 0x9b, 0x4e, 0xf5, 0x76, 0x91, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
-
-
-/* image_missing.png - 933 bytes */
-static const unsigned char image_missing_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x03,
-  0x30, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x4d, 0x4b, 0x32, 0x51, 0x14, 0x3e, 0xf7,
-  0x5e, 0x75, 0x4a, 0xc5, 0x85, 0x68, 0x23, 0x85,
-  0x43, 0x44, 0xb6, 0x28, 0xdc, 0xd4, 0x4f, 0x90,
-  0xda, 0xb8, 0xc9, 0xbe, 0x7e, 0x81, 0xbf, 0xa0,
-  0xa0, 0x22, 0x5b, 0x16, 0x84, 0xab, 0x3e, 0xb6,
-  0x1a, 0xd6, 0xae, 0x45, 0xfd, 0x86, 0x5a, 0xd4,
-  0xd6, 0x40, 0x89, 0x56, 0x21, 0x42, 0x30, 0x82,
-  0xd8, 0xe0, 0xe0, 0x30, 0xe2, 0x7c, 0xbc, 0x8b,
-  0xdb, 0x65, 0xd0, 0x92, 0x99, 0x7a, 0x45, 0xe1,
-  0xe5, 0x7d, 0x36, 0x87, 0x7b, 0xe7, 0xcc, 0x9d,
-  0xe7, 0x39, 0xe7, 0xcc, 0x3d, 0xf7, 0x02, 0xfc,
-  0xc7, 0x68, 0x81, 0x7a, 0x27, 0x4e, 0x4e, 0xb2,
-  0xd9, 0xe3, 0xe3, 0xad, 0x2d, 0x3a, 0xba, 0xb9,
-  0x19, 0x35, 0xc1, 0x6e, 0xec, 0xed, 0xed, 0xef,
-  0xef, 0xee, 0x66, 0x32, 0xd9, 0x6c, 0x5f, 0x17,
-  0x2a, 0xc0, 0x34, 0x45, 0x51, 0x14, 0x45, 0xd1,
-  0x1c, 0x39, 0x64, 0x59, 0x96, 0x65, 0xd9, 0x34,
-  0x19, 0xaf, 0x5e, 0xbe, 0xae, 0x7e, 0x42, 0x78,
-  0x9e, 0xe7, 0x79, 0x1e, 0xa0, 0x54, 0x2a, 0x95,
-  0x4a, 0xa5, 0x6f, 0x52, 0x87, 0x10, 0x42, 0xe8,
-  0xeb, 0xf8, 0xa7, 0xf3, 0x76, 0x7e, 0xb1, 0x58,
-  0x2c, 0x16, 0x8b, 0x59, 0xe3, 0x74, 0x3a, 0x9d,
-  0x4e, 0xa7, 0x31, 0xce, 0xe5, 0x72, 0xb9, 0x5c,
-  0xce, 0x30, 0xfa, 0x0a, 0x60, 0x88, 0xc7, 0xe3,
-  0xf1, 0x78, 0x7c, 0x68, 0x35, 0xe2, 0x10, 0x96,
-  0x44, 0x5b, 0x01, 0xe5, 0xf2, 0xeb, 0xeb, 0xf3,
-  0xb3, 0xfd, 0x72, 0x84, 0x60, 0x8c, 0x31, 0x00,
-  0xc6, 0xd4, 0x22, 0x84, 0x10, 0x1d, 0x13, 0x42,
-  0x08, 0x00, 0xc6, 0x34, 0xb2, 0xbd, 0x7e, 0x18,
-  0x63, 0xec, 0x72, 0x75, 0x8f, 0x11, 0xa2, 0xfe,
-  0x84, 0x00, 0x84, 0xc3, 0xa1, 0x10, 0xcf, 0xf7,
-  0xff, 0xb6, 0xad, 0x00, 0x86, 0xa9, 0x29, 0x9e,
-  0x8f, 0x46, 0x87, 0x17, 0x63, 0xd3, 0x04, 0x30,
-  0x0c, 0x7b, 0x3f, 0x3c, 0x3c, 0x4a, 0x3f, 0x03,
-  0xc6, 0x18, 0x13, 0x32, 0x44, 0x01, 0x6f, 0x6f,
-  0xc1, 0x60, 0x28, 0x64, 0x59, 0x45, 0xb9, 0xbf,
-  0x7f, 0x78, 0xb0, 0x9e, 0xbf, 0xbf, 0x2f, 0x2f,
-  0xaf, 0xac, 0x00, 0x54, 0x2a, 0xb3, 0xb3, 0x73,
-  0x73, 0xce, 0x04, 0x60, 0x07, 0xec, 0x6c, 0x5d,
-  0x10, 0xa2, 0x35, 0x69, 0x87, 0x89, 0x89, 0x7c,
-  0x3e, 0x97, 0xb3, 0xc6, 0xa2, 0xb8, 0xb6, 0xb6,
-  0xbe, 0x0e, 0xd0, 0x6c, 0x16, 0x0a, 0x57, 0x57,
-  0x00, 0xba, 0x5e, 0xab, 0xd5, 0x6a, 0x00, 0x5e,
-  0x6f, 0x22, 0x91, 0x48, 0x38, 0x13, 0x30, 0x90,
-  0x0c, 0x10, 0xe2, 0x6c, 0x21, 0xbf, 0x3f, 0x95,
-  0x5a, 0x5d, 0x05, 0x88, 0x44, 0xee, 0xee, 0x6e,
-  0x6f, 0xad, 0xf9, 0x7a, 0x7d, 0x7b, 0x7b, 0x67,
-  0x07, 0x40, 0xd7, 0x1b, 0x8d, 0x8f, 0x0f, 0x00,
-  0x8f, 0x67, 0x61, 0x61, 0x7e, 0xde, 0x99, 0x80,
-  0x81, 0x64, 0xc0, 0xe9, 0x42, 0x0c, 0x9a, 0x56,
-  0xa9, 0x54, 0x2a, 0x00, 0x1c, 0xb7, 0xb4, 0xb4,
-  0xb8, 0x68, 0xcd, 0x9b, 0xa6, 0xa2, 0x28, 0x0a,
-  0x00, 0xc6, 0x81, 0x40, 0x20, 0x60, 0xbf, 0x8e,
-  0xd3, 0xc0, 0x39, 0x12, 0xe0, 0x64, 0x21, 0x49,
-  0x3a, 0x3f, 0xbf, 0xb8, 0x00, 0x90, 0xa4, 0xd3,
-  0xd3, 0xb3, 0x33, 0x00, 0xc3, 0x90, 0x65, 0x59,
-  0x06, 0x10, 0x84, 0x97, 0x97, 0x72, 0xd9, 0xf2,
-  0x63, 0x19, 0x61, 0xa5, 0xd5, 0x0f, 0x08, 0xd1,
-  0xed, 0xd7, 0x0e, 0xb6, 0xdb, 0x68, 0xbf, 0x0c,
-  0x68, 0x9a, 0x28, 0x8a, 0x22, 0x40, 0xb3, 0x99,
-  0xcf, 0x5f, 0x5e, 0x02, 0xa8, 0xea, 0xe3, 0xe3,
-  0xd3, 0x13, 0x80, 0xdf, 0xbf, 0xb9, 0xb9, 0xb1,
-  0x41, 0x4b, 0x2a, 0x95, 0x02, 0x70, 0xb9, 0x22,
-  0x91, 0x48, 0x04, 0x60, 0x66, 0xa6, 0xd1, 0xa8,
-  0xd7, 0xed, 0x09, 0x59, 0x19, 0xa0, 0x7d, 0x64,
-  0x00, 0x02, 0x68, 0x43, 0xf9, 0xf2, 0xe2, 0x27,
-  0xb1, 0x60, 0x30, 0x93, 0x39, 0x38, 0x70, 0x4e,
-  0xcc, 0x29, 0x30, 0x26, 0x64, 0x20, 0x02, 0x08,
-  0xa1, 0x0b, 0x29, 0x8a, 0xaa, 0xd2, 0x1a, 0x66,
-  0x9d, 0x92, 0x96, 0x16, 0xeb, 0xac, 0x08, 0x59,
-  0x9d, 0x94, 0xce, 0xd3, 0x08, 0x22, 0x44, 0xdf,
-  0x67, 0x81, 0x60, 0xc4, 0xac, 0xe7, 0xbd, 0x9d,
-  0x99, 0xfa, 0x39, 0xd9, 0xf9, 0x1c, 0x09, 0x88,
-  0x46, 0x27, 0x27, 0xa7, 0xa7, 0x07, 0x1f, 0xe1,
-  0x41, 0xc1, 0x56, 0x40, 0xb5, 0x5a, 0xad, 0x56,
-  0xab, 0xbf, 0x3f, 0x4d, 0xfe, 0xed, 0x29, 0x35,
-  0x1c, 0x0e, 0x87, 0xc3, 0xe1, 0x5f, 0x08, 0xa8,
-  0xd5, 0x68, 0xe3, 0x11, 0x04, 0x41, 0x10, 0x84,
-  0xd1, 0x45, 0x98, 0xf1, 0xe8, 0x86, 0x75, 0x4a,
-  0xea, 0x23, 0xe0, 0xe8, 0xa8, 0x50, 0xb8, 0xbe,
-  0xce, 0xe7, 0x0f, 0x0f, 0x47, 0x47, 0xfd, 0x7b,
-  0x5e, 0xf4, 0x1e, 0x60, 0x5d, 0x6c, 0xfa, 0xfe,
-  0x2a, 0xc9, 0x64, 0x32, 0x99, 0x4c, 0x8e, 0x8f,
-  0x1b, 0x86, 0x61, 0x18, 0x06, 0xcf, 0x4b, 0x92,
-  0x24, 0x49, 0x92, 0xd7, 0xdb, 0x6a, 0xb5, 0x5a,
-  0xad, 0x96, 0xd7, 0xab, 0xaa, 0xaa, 0xaa, 0xaa,
-  0x5e, 0xaf, 0xa6, 0x69, 0x9a, 0xa6, 0x8d, 0x8d,
-  0xe9, 0xba, 0xae, 0xeb, 0x3a, 0xc7, 0x51, 0xeb,
-  0xf1, 0xd0, 0xfb, 0x94, 0xcb, 0x45, 0x2d, 0x21,
-  0xb4, 0x34, 0x4c, 0x93, 0x5a, 0x4d, 0xa3, 0x3f,
-  0x6d, 0xa7, 0x43, 0x08, 0x21, 0x84, 0xb4, 0xdb,
-  0x6e, 0xb7, 0xdb, 0xed, 0x76, 0x2b, 0x0a, 0xc7,
-  0x71, 0x1c, 0xc7, 0x29, 0x8a, 0xcf, 0xe7, 0xf3,
-  0xf9, 0x7c, 0xad, 0x56, 0xbb, 0xdd, 0x6e, 0xb7,
-  0xdb, 0xa2, 0x58, 0x2c, 0x16, 0x8b, 0xc5, 0xa2,
-  0x24, 0x39, 0xcc, 0x00, 0x43, 0xa7, 0x43, 0x2d,
-  0xdb, 0xc1, 0x5d, 0x9f, 0xfe, 0x6c, 0x63, 0x65,
-  0x04, 0xdd, 0x6e, 0x6a, 0x31, 0xee, 0xb6, 0x84,
-  0xd0, 0x00, 0xd0, 0xbd, 0x06, 0x63, 0x16, 0x39,
-  0x5d, 0xa7, 0xcf, 0x19, 0x11, 0x66, 0x35, 0xed,
-  0x7b, 0xab, 0x28, 0xbd, 0xc4, 0xff, 0x19, 0xfc,
-  0x01, 0x61, 0x10, 0xe0, 0xf6, 0xa1, 0x33, 0x75,
-  0x81, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
-  0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/list_add.h
+++ b/art/tango/list_add.h
@@ -1,109 +0,0 @@
-/* list_add.png - 323 bytes */
-static const unsigned char list_add_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd6, 0x01, 0x0b, 0x10, 0x00, 0x11, 0x94,
-  0x44, 0x78, 0xa1, 0x00, 0x00, 0x00, 0xd0, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xcd, 0x91, 0xbd,
-  0x0e, 0xc1, 0x60, 0x14, 0x86, 0x1f, 0xd2, 0xc5,
-  0x60, 0xb7, 0x72, 0x07, 0xd2, 0xba, 0x81, 0xc6,
-  0x60, 0x36, 0x5b, 0x3b, 0x74, 0x71, 0x07, 0x44,
-  0xd2, 0xc4, 0x64, 0x17, 0xb1, 0x5a, 0x0d, 0x26,
-  0x83, 0x84, 0x1b, 0xe8, 0x67, 0x37, 0x5a, 0x2c,
-  0x56, 0x69, 0xe2, 0xa7, 0xdf, 0x31, 0x10, 0x8a,
-  0xfa, 0x8b, 0x04, 0xef, 0x76, 0xf2, 0x9d, 0xbc,
-  0xf9, 0x9e, 0xe7, 0xc0, 0xaf, 0x93, 0xb8, 0xf7,
-  0x60, 0x39, 0x3d, 0x1f, 0x30, 0x8f, 0xa3, 0xf2,
-  0xbb, 0x15, 0x2b, 0x6e, 0x2f, 0xf9, 0xa0, 0xdc,
-  0xf4, 0x5c, 0x1b, 0xcf, 0xb5, 0x89, 0x14, 0xbd,
-  0x55, 0xf0, 0x52, 0x3e, 0x2e, 0x30, 0xee, 0x30,
-  0xc7, 0x39, 0x91, 0xc8, 0x78, 0x72, 0x62, 0x44,
-  0x99, 0x5b, 0xd5, 0x22, 0x5b, 0x2d, 0x24, 0x80,
-  0x6d, 0x78, 0xde, 0xf7, 0x5c, 0x1b, 0x11, 0x10,
-  0x39, 0x58, 0xaf, 0x77, 0xc6, 0xe6, 0xcd, 0x0f,
-  0x00, 0x56, 0xeb, 0x90, 0xf9, 0x32, 0x40, 0x04,
-  0xb4, 0x16, 0xb4, 0x40, 0xb0, 0x11, 0xc2, 0x50,
-  0xd8, 0x69, 0x41, 0x6b, 0xc8, 0x65, 0x52, 0xf1,
-  0x08, 0x80, 0x6a, 0x74, 0x26, 0x17, 0x08, 0xe5,
-  0x52, 0x01, 0x80, 0xc1, 0xc8, 0xbf, 0x26, 0x52,
-  0x4f, 0xe5, 0x58, 0x4e, 0x4f, 0x86, 0xd3, 0x85,
-  0x34, 0xfb, 0x33, 0xb9, 0xe2, 0xff, 0xf2, 0x19,
-  0xf3, 0xd9, 0xf4, 0x6b, 0x67, 0x8c, 0x89, 0xaa,
-  0xb5, 0x4f, 0xb6, 0x15, 0x7f, 0x9b, 0x3d, 0x54,
-  0x72, 0x4b, 0x0b, 0x8b, 0xb2, 0x77, 0x8e, 0x00,
-  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-  0x42, 0x60, 0x82};
-
-
-/* list_add.png - 494 bytes */
-static const unsigned char list_add_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x01,
-  0x79, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x56, 0xb1, 0x8a, 0xc2, 0x40, 0x10, 0x7d, 0x89,
-  0x27, 0x28, 0x36, 0x5a, 0x08, 0x56, 0x16, 0x56,
-  0xf6, 0x49, 0x29, 0x82, 0xe8, 0x67, 0xa4, 0xb1,
-  0x10, 0x0b, 0x41, 0xfc, 0x02, 0x89, 0x85, 0xd8,
-  0xf8, 0x03, 0xc1, 0xd6, 0x5f, 0xb0, 0xd5, 0xc2,
-  0xc2, 0x26, 0xdb, 0xd8, 0x5b, 0x58, 0xdb, 0x58,
-  0xa8, 0x28, 0x66, 0x77, 0xaf, 0x58, 0x82, 0x24,
-  0x27, 0x26, 0xf1, 0x92, 0xc3, 0x83, 0x7d, 0x45,
-  0x36, 0x3b, 0xc9, 0xcc, 0xbe, 0xb7, 0x99, 0x99,
-  0x2c, 0x20, 0x21, 0x21, 0xf1, 0xaf, 0xa1, 0xc4,
-  0x1d, 0x50, 0xd7, 0x3b, 0x9d, 0xf9, 0xdc, 0xb6,
-  0xc5, 0x4c, 0xd3, 0xbc, 0x4f, 0x09, 0xb1, 0xed,
-  0xd9, 0xcc, 0x30, 0x74, 0x3d, 0xae, 0xf5, 0xd4,
-  0x64, 0xf6, 0x45, 0xd3, 0x46, 0xa3, 0x6e, 0xb7,
-  0xd1, 0x00, 0x4c, 0x53, 0x8c, 0xcf, 0x05, 0x7d,
-  0xac, 0x80, 0xbf, 0x83, 0x14, 0x10, 0x04, 0xce,
-  0x93, 0x8d, 0xff, 0x15, 0xf6, 0xc5, 0xd7, 0xc5,
-  0xf9, 0x8a, 0xb8, 0x57, 0x82, 0x88, 0x13, 0x24,
-  0x2b, 0x7c, 0xb1, 0x87, 0x16, 0xe0, 0x12, 0x9f,
-  0x4e, 0xfb, 0xfd, 0x56, 0x0b, 0xb8, 0xdf, 0x19,
-  0xe3, 0x1c, 0x50, 0x7c, 0x7d, 0x4c, 0x55, 0x55,
-  0x55, 0x55, 0x81, 0xf3, 0xf9, 0x7a, 0x75, 0x1c,
-  0x80, 0x73, 0x41, 0x76, 0x32, 0xe9, 0xf5, 0x9a,
-  0x4d, 0xc0, 0x71, 0x84, 0x9f, 0x6b, 0x77, 0x47,
-  0x37, 0xce, 0x70, 0x68, 0x59, 0xcb, 0x65, 0xf8,
-  0x62, 0x8f, 0x28, 0x00, 0x38, 0x9d, 0x6e, 0x37,
-  0x4a, 0x81, 0xfd, 0xfe, 0x70, 0xb8, 0x5c, 0x1e,
-  0x04, 0x18, 0x13, 0xc4, 0xc4, 0x15, 0xa0, 0x54,
-  0xdc, 0x51, 0xca, 0x18, 0x20, 0x88, 0x0b, 0x3b,
-  0xa5, 0x9c, 0x3f, 0x84, 0x30, 0x26, 0xec, 0x95,
-  0x4a, 0xa9, 0x94, 0xcd, 0x46, 0x65, 0x13, 0x59,
-  0x00, 0x21, 0xa6, 0x69, 0x59, 0xab, 0x55, 0xf0,
-  0x0e, 0x0d, 0x06, 0x86, 0x51, 0xaf, 0x03, 0x84,
-  0xec, 0x76, 0xc7, 0x23, 0xb0, 0x5e, 0x6f, 0x36,
-  0xdb, 0x6d, 0xf8, 0x75, 0x62, 0x17, 0x10, 0x36,
-  0x27, 0xdd, 0x1c, 0x57, 0x94, 0x57, 0x71, 0x94,
-  0xd8, 0x7e, 0xa0, 0x89, 0x75, 0xa1, 0x7c, 0x3e,
-  0x97, 0x4b, 0xa7, 0x1f, 0x29, 0x95, 0x14, 0x12,
-  0x6c, 0xa3, 0xde, 0x22, 0xfd, 0x70, 0x01, 0xa9,
-  0x94, 0xdf, 0x52, 0x2e, 0x17, 0x8b, 0x99, 0x0c,
-  0x50, 0xab, 0x55, 0xab, 0x85, 0x42, 0x90, 0xff,
-  0xfb, 0x29, 0x15, 0xb9, 0x0b, 0x3d, 0x07, 0xa5,
-  0xde, 0x39, 0x21, 0xed, 0xf6, 0x78, 0xbc, 0x58,
-  0xfc, 0x3c, 0xcc, 0x3d, 0xf7, 0x7f, 0xff, 0x2b,
-  0xc5, 0x7c, 0x1a, 0x75, 0x77, 0xd2, 0x3f, 0xfa,
-  0x89, 0x8a, 0xd6, 0x29, 0x21, 0x21, 0xf1, 0x7b,
-  0x7c, 0x03, 0xa0, 0xdd, 0xbc, 0x3f, 0x8b, 0x9a,
-  0x1d, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
-  0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
--- a/art/tango/list_remove.h
+++ b/art/tango/list_remove.h
@@ -1,76 +0,0 @@
-/* list_remove.png - 247 bytes */
-static const unsigned char list_remove_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd6, 0x01, 0x0b, 0x0f, 0x3b, 0x22, 0x00,
-  0x5c, 0x12, 0xc2, 0x00, 0x00, 0x00, 0x84, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xed, 0x91, 0xb1,
-  0x09, 0x83, 0x50, 0x10, 0x86, 0xbf, 0x07, 0x69,
-  0xdc, 0xc0, 0x3a, 0x2b, 0xe8, 0x08, 0x19, 0x23,
-  0xad, 0x6d, 0x46, 0x08, 0x19, 0x20, 0x0b, 0x88,
-  0xad, 0x73, 0xc4, 0x05, 0x74, 0x88, 0xd4, 0xb6,
-  0x22, 0x44, 0xf3, 0xee, 0x4f, 0x21, 0xca, 0xb3,
-  0xb3, 0x33, 0x85, 0x1f, 0x1c, 0x1c, 0x07, 0xff,
-  0x77, 0x1c, 0x07, 0x07, 0xfb, 0xe3, 0xe6, 0x26,
-  0xcd, 0xca, 0x1a, 0x48, 0x36, 0xe6, 0x9a, 0xba,
-  0xb8, 0xa6, 0x00, 0xa7, 0x60, 0x98, 0x3c, 0x6f,
-  0x17, 0x46, 0x13, 0x0e, 0x18, 0xbd, 0x56, 0x09,
-  0x69, 0x2a, 0x07, 0xdc, 0xf3, 0xd7, 0xb2, 0x28,
-  0x14, 0xd0, 0x7d, 0x3c, 0xef, 0xb6, 0x47, 0x02,
-  0x33, 0x61, 0x82, 0x7e, 0x10, 0xde, 0x8b, 0xaf,
-  0x09, 0x33, 0x38, 0xc7, 0xd1, 0x4a, 0x1c, 0x0a,
-  0x9a, 0x47, 0x5e, 0x6d, 0x3e, 0xe1, 0xf8, 0xfe,
-  0x3f, 0xf1, 0x03, 0xac, 0x53, 0x2d, 0xdb, 0x46,
-  0xe4, 0x80, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x49,
-  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* list_remove.png - 306 bytes */
-static const unsigned char list_remove_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x00,
-  0xbd, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0xd2, 0xbb, 0x0d, 0x83, 0x30, 0x10, 0x06, 0xe0,
-  0x1f, 0x29, 0x0d, 0x1b, 0x50, 0xb3, 0x82, 0x3d,
-  0x02, 0x63, 0xd0, 0xd2, 0x32, 0x02, 0x62, 0x00,
-  0x16, 0xb0, 0x68, 0x99, 0x83, 0x2c, 0x60, 0x0f,
-  0x41, 0x4d, 0x8b, 0x90, 0x90, 0x7d, 0x76, 0x0a,
-  0x07, 0xa5, 0x0c, 0x96, 0x82, 0xd2, 0xdc, 0x57,
-  0xf8, 0xa5, 0xd3, 0xe9, 0xee, 0x64, 0x80, 0x31,
-  0xc6, 0x18, 0x63, 0xff, 0x93, 0x5d, 0x0d, 0x94,
-  0xb2, 0x69, 0xa6, 0x49, 0xeb, 0x78, 0x13, 0xe2,
-  0xde, 0xb2, 0x8c, 0xd1, 0x7a, 0x1c, 0xeb, 0x5a,
-  0xca, 0x6f, 0x91, 0x8f, 0xb4, 0xc4, 0x42, 0x0c,
-  0x43, 0xdb, 0x56, 0x15, 0x60, 0xad, 0xf7, 0x21,
-  0x00, 0xd9, 0x7b, 0x04, 0xd6, 0x12, 0x85, 0x70,
-  0x3d, 0x53, 0x08, 0x31, 0xfa, 0xdc, 0xcf, 0x3c,
-  0x5d, 0xa7, 0xd4, 0x3c, 0x5f, 0x1f, 0x50, 0x62,
-  0x03, 0xc0, 0xb6, 0x1d, 0x07, 0x11, 0xb0, 0x2c,
-  0xeb, 0xba, 0xef, 0x9f, 0x02, 0xbc, 0x8f, 0x0d,
-  0xc5, 0x15, 0x20, 0x8a, 0x27, 0x22, 0xef, 0x01,
-  0xc0, 0xb9, 0xb8, 0x13, 0xc5, 0x46, 0x9d, 0x3b,
-  0xe3, 0xe3, 0x7b, 0x59, 0x16, 0x45, 0x9e, 0xa7,
-  0x56, 0x93, 0xdc, 0x80, 0x31, 0x7d, 0xaf, 0xd4,
-  0xf3, 0x79, 0xff, 0x17, 0xba, 0x37, 0x3f, 0x63,
-  0x8c, 0x31, 0xc6, 0x7e, 0xe3, 0x05, 0xb5, 0x9e,
-  0x63, 0xa8, 0xa1, 0xbc, 0x32, 0xe6, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
--- a/art/tango/text_x_generic.h
+++ b/art/tango/text_x_generic.h
@@ -1,134 +0,0 @@
-/* text_x_generic.png - 333 bytes */
-static const unsigned char text_x_generic_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd5, 0x04, 0x16, 0x14, 0x0f, 0x38, 0xba,
-  0x60, 0x26, 0x42, 0x00, 0x00, 0x00, 0xda, 0x49,
-  0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x92, 0x3d,
-  0x6e, 0x84, 0x30, 0x10, 0x85, 0xbf, 0x07, 0x48,
-  0xbb, 0x5b, 0x21, 0x21, 0x9f, 0x81, 0x9f, 0xb3,
-  0x6c, 0x99, 0x22, 0xc7, 0x41, 0xe6, 0x16, 0x1c,
-  0x21, 0x51, 0xda, 0x1c, 0x06, 0x73, 0x01, 0x1a,
-  0xfa, 0xad, 0x4c, 0x8a, 0x88, 0x15, 0x24, 0x5e,
-  0x58, 0xa2, 0xbc, 0x6a, 0x2c, 0x7b, 0xde, 0x7c,
-  0x33, 0x1e, 0xb5, 0x6d, 0xfb, 0x31, 0x0c, 0xc3,
-  0x0b, 0xc7, 0xf4, 0x5a, 0xd7, 0xf5, 0x3b, 0x00,
-  0xd6, 0xda, 0xe9, 0xa8, 0xac, 0xb5, 0xd3, 0xec,
-  0x94, 0xcc, 0xc1, 0x38, 0x8e, 0x78, 0xef, 0x01,
-  0x90, 0x74, 0x2f, 0x35, 0xc7, 0x92, 0x88, 0xe3,
-  0x98, 0x34, 0x4d, 0x57, 0x28, 0x77, 0x03, 0xef,
-  0x3d, 0xce, 0xb9, 0x55, 0xc2, 0x52, 0x92, 0xa8,
-  0xaa, 0xea, 0x57, 0x2f, 0xc9, 0xf2, 0x50, 0x14,
-  0xc5, 0x26, 0x41, 0x48, 0xc9, 0xf2, 0xe1, 0x92,
-  0xe0, 0xa7, 0x9e, 0x22, 0xc8, 0xf3, 0x3c, 0x50,
-  0xf1, 0xc6, 0x34, 0x9d, 0x88, 0xa2, 0x68, 0x9b,
-  0x00, 0xa0, 0xef, 0xfb, 0xd5, 0x65, 0x59, 0x96,
-  0xc0, 0x05, 0xb8, 0x01, 0xe7, 0xfd, 0x16, 0x42,
-  0x04, 0x92, 0x90, 0x2e, 0x0f, 0x17, 0x62, 0x45,
-  0xe0, 0x9c, 0xdb, 0x1c, 0xde, 0x37, 0xd1, 0xce,
-  0x2f, 0x84, 0x09, 0xb4, 0x4f, 0x20, 0x89, 0xae,
-  0xeb, 0x82, 0x95, 0xe7, 0xe9, 0x87, 0x8c, 0x82,
-  0x04, 0x21, 0x93, 0xdd, 0x3d, 0xc8, 0xb2, 0x8c,
-  0xbf, 0x28, 0x31, 0xc6, 0x7c, 0x36, 0x4d, 0x73,
-  0x3d, 0x92, 0x64, 0x8c, 0x79, 0xe3, 0xbf, 0xf4,
-  0x05, 0x54, 0x51, 0x5f, 0xb9, 0xfc, 0xb9, 0x3f,
-  0xec, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
-  0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* text_x_generic.png - 687 bytes */
-static const unsigned char text_x_generic_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
-  0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
-  0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x02,
-  0x3a, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
-  0x57, 0x4b, 0x6b, 0xab, 0x50, 0x10, 0x1e, 0x5f,
-  0xab, 0xb6, 0x5b, 0x45, 0xfc, 0x03, 0x06, 0x15,
-  0x5f, 0x94, 0x44, 0xdb, 0x7f, 0xd3, 0x1f, 0x51,
-  0x0a, 0x69, 0x17, 0x7d, 0xd1, 0xc7, 0x0f, 0xeb,
-  0x8b, 0x82, 0x08, 0xa2, 0xb8, 0x11, 0xda, 0x2e,
-  0x04, 0x85, 0x42, 0xa1, 0x74, 0x51, 0xd4, 0x2e,
-  0x64, 0xae, 0xd4, 0xe4, 0x60, 0xbc, 0x89, 0x09,
-  0x17, 0xee, 0xb7, 0x19, 0xce, 0x19, 0xf5, 0x7c,
-  0xdf, 0xcc, 0x9c, 0x99, 0x04, 0xe0, 0x3f, 0x36,
-  0x0b, 0x8a, 0xe4, 0xb8, 0xba, 0xba, 0xb9, 0xb9,
-  0xb8, 0x38, 0x3d, 0xad, 0x57, 0xc7, 0xc7, 0x9b,
-  0x22, 0x58, 0x55, 0x55, 0x55, 0x55, 0x67, 0x67,
-  0x47, 0x47, 0x87, 0x87, 0xd3, 0xe9, 0xc9, 0xc9,
-  0xc2, 0x2f, 0xd6, 0x02, 0xaa, 0x8d, 0x03, 0x79,
-  0x90, 0x78, 0xb2, 0x8b, 0x0a, 0x4a, 0x92, 0x24,
-  0x49, 0x12, 0x00, 0x86, 0x61, 0x18, 0x86, 0xc1,
-  0xc8, 0x00, 0x50, 0x14, 0x45, 0x51, 0x54, 0x63,
-  0xff, 0xa4, 0x96, 0xb0, 0xdf, 0xf6, 0xcf, 0x8f,
-  0x38, 0x80, 0x24, 0x49, 0x92, 0x24, 0x75, 0xf3,
-  0x5a, 0x58, 0x00, 0x89, 0x50, 0x10, 0x04, 0x41,
-  0x10, 0x74, 0x13, 0xeb, 0x82, 0x61, 0x18, 0x86,
-  0x61, 0x34, 0x02, 0x16, 0xc5, 0xd2, 0x02, 0x54,
-  0x55, 0x55, 0x55, 0x15, 0x80, 0x65, 0x59, 0x96,
-  0x9d, 0xf3, 0xb5, 0xa2, 0x28, 0x8a, 0xa2, 0x20,
-  0xfb, 0x49, 0xe7, 0x0c, 0x2e, 0x00, 0xad, 0xef,
-  0xfb, 0xbe, 0xef, 0xf7, 0x0a, 0xf6, 0x5c, 0x98,
-  0xa6, 0x69, 0x9a, 0x26, 0x00, 0x4d, 0xd3, 0x34,
-  0x4d, 0x0f, 0x28, 0x00, 0x0f, 0xc0, 0x54, 0xeb,
-  0xba, 0xae, 0xeb, 0x7a, 0xf3, 0x1c, 0xc7, 0x71,
-  0x1c, 0xc7, 0x2d, 0x2f, 0x68, 0xe5, 0x02, 0x9e,
-  0x9e, 0x9e, 0x9f, 0x1f, 0x1f, 0x01, 0x1c, 0x67,
-  0x3c, 0x76, 0xdd, 0x46, 0x90, 0xe7, 0x79, 0x9e,
-  0xe7, 0x2d, 0x4f, 0xc4, 0x71, 0x1c, 0xc7, 0x71,
-  0x9a, 0x92, 0x5b, 0xb9, 0x80, 0xf1, 0x78, 0x77,
-  0x77, 0x32, 0x01, 0x10, 0x45, 0x51, 0x14, 0x45,
-  0x80, 0x34, 0x4d, 0xd3, 0x34, 0x05, 0xb0, 0x2c,
-  0xcb, 0xb2, 0xac, 0x1e, 0x07, 0xb6, 0xee, 0x02,
-  0xa9, 0x7b, 0xad, 0x5c, 0x00, 0x7e, 0x18, 0x89,
-  0xe3, 0x3a, 0x8e, 0xe3, 0x38, 0x8e, 0xfb, 0x45,
-  0x7b, 0x1e, 0x34, 0x4d, 0xd3, 0x34, 0x6d, 0x0d,
-  0x77, 0xa0, 0x6d, 0x65, 0x59, 0x96, 0x65, 0xb9,
-  0xc7, 0x81, 0xad, 0x0c, 0xe0, 0x5c, 0x41, 0x0c,
-  0xd6, 0x46, 0xdb, 0x42, 0x48, 0xc2, 0x30, 0x82,
-  0x24, 0xc1, 0x5d, 0x25, 0x32, 0x58, 0x09, 0xdd,
-  0xdf, 0x3f, 0x3c, 0xdc, 0xdd, 0x01, 0xec, 0xed,
-  0xb9, 0xee, 0xfe, 0x7e, 0x73, 0x50, 0x18, 0x86,
-  0x61, 0x18, 0xf6, 0x0d, 0xc3, 0x2c, 0xb0, 0x8d,
-  0xf6, 0xc5, 0xc2, 0x02, 0x1c, 0x67, 0x32, 0x71,
-  0x5d, 0x00, 0x9e, 0xe7, 0x79, 0x9e, 0x07, 0xc8,
-  0xf3, 0x3c, 0xcf, 0xf3, 0xd9, 0x12, 0xc2, 0x0c,
-  0xb4, 0x33, 0x81, 0x68, 0x97, 0x4c, 0x7b, 0xbf,
-  0x2c, 0xcb, 0xb2, 0x2c, 0x07, 0x10, 0x80, 0x44,
-  0xb2, 0x2c, 0xcb, 0xb2, 0xac, 0x59, 0x47, 0x51,
-  0x14, 0x45, 0xd1, 0x72, 0xd1, 0x07, 0x58, 0xc3,
-  0x20, 0x23, 0x61, 0x34, 0x1a, 0x8d, 0x46, 0xa3,
-  0xee, 0x01, 0xd6, 0x75, 0x57, 0x06, 0xcf, 0x40,
-  0x9b, 0x08, 0xe2, 0x6f, 0xef, 0x80, 0x6d, 0xdb,
-  0xb6, 0x6d, 0xaf, 0x71, 0x0e, 0x90, 0xa0, 0x28,
-  0x8a, 0xa2, 0x28, 0xb3, 0x91, 0x6d, 0x47, 0xb8,
-  0x6b, 0x8d, 0xed, 0x73, 0xb0, 0x36, 0x2a, 0x08,
-  0x82, 0x20, 0x08, 0xcb, 0xca, 0x5d, 0x3d, 0x88,
-  0x02, 0xea, 0x5a, 0x3c, 0x3f, 0xbf, 0xbe, 0xbe,
-  0xbd, 0xbd, 0xbc, 0x9c, 0x4e, 0x37, 0x45, 0xf0,
-  0xf5, 0xf5, 0xe5, 0xe5, 0xed, 0xed, 0xe0, 0x80,
-  0xe4, 0xef, 0xf9, 0xd7, 0x03, 0x67, 0xe8, 0xf6,
-  0x76, 0x6d, 0x77, 0x76, 0x7e, 0x5b, 0xdc, 0xdf,
-  0xda, 0xaa, 0x2d, 0xf6, 0x13, 0x6c, 0x9c, 0x58,
-  0x1c, 0xdf, 0xdf, 0xb5, 0xfd, 0xfa, 0xaa, 0xed,
-  0xfb, 0x7b, 0x6d, 0x3f, 0x3e, 0x6a, 0xfb, 0xf9,
-  0xf9, 0xdb, 0x8f, 0x3f, 0xef, 0xfa, 0x14, 0xd7,
-  0x3f, 0x82, 0x1f, 0x81, 0xd2, 0x60, 0x2a, 0xa4,
-  0x04, 0x28, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x49,
-  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,62 +1,146 @@
-dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
 dnl
 dnl This macro was generated by
-dnl Bakefile 0.2.9 (http://www.bakefile.org)
+dnl Bakefile 0.2.6 (http://www.bakefile.org)
 dnl Do not modify, all changes will be overwritten!

-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6"

 dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ###
 AC_BAKEFILE_PRECOMP_HEADERS
-dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_DEBUG[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_BUILD_DEBUG="#"
+    if test "x$BUILD" = "xdebug" ; then
+        COND_BUILD_DEBUG=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG)
+dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+        COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT)
+dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT)
+dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_BUILD_DEBUG_UNICODE_0="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_DEBUG_UNICODE_0=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG_UNICODE_0)
+dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_BUILD_DEBUG_UNICODE_1="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_DEBUG_UNICODE_1=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG_UNICODE_1)
+dnl ### begin block 20_COND_BUILD_RELEASE[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_BUILD_RELEASE="#"
+    if test "x$BUILD" = "xrelease" ; then
+        COND_BUILD_RELEASE=""
+    fi
+    AC_SUBST(COND_BUILD_RELEASE)
+dnl ### begin block 20_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
+    if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
+    fi
+    AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT)
+dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_0[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_BUILD_RELEASE_UNICODE_0="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_RELEASE_UNICODE_0=""
+    fi
+    AC_SUBST(COND_BUILD_RELEASE_UNICODE_0)
+dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_BUILD_RELEASE_UNICODE_1="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_RELEASE_UNICODE_1=""
+    fi
+    AC_SUBST(COND_BUILD_RELEASE_UNICODE_1)
+dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_BUILD_debug="#"
    if test "x$BUILD" = "xdebug" ; then
        COND_BUILD_debug=""
    fi
    AC_SUBST(COND_BUILD_debug)
-dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug_DEBUG_FLAG_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+    COND_BUILD_debug_DEBUG_FLAG_default="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+        COND_BUILD_debug_DEBUG_FLAG_default=""
+    fi
+    AC_SUBST(COND_BUILD_debug_DEBUG_FLAG_default)
+dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_BUILD_debug_DEBUG_INFO_default="#"
    if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
        COND_BUILD_debug_DEBUG_INFO_default=""
    fi
    AC_SUBST(COND_BUILD_debug_DEBUG_INFO_default)
-dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug_UNICODE_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+    COND_BUILD_debug_UNICODE_0="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_debug_UNICODE_0=""
+    fi
+    AC_SUBST(COND_BUILD_debug_UNICODE_0)
+dnl ### begin block 20_COND_BUILD_debug_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+    COND_BUILD_debug_UNICODE_1="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_debug_UNICODE_1=""
+    fi
+    AC_SUBST(COND_BUILD_debug_UNICODE_1)
+dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_BUILD_release="#"
    if test "x$BUILD" = "xrelease" ; then
        COND_BUILD_release=""
    fi
    AC_SUBST(COND_BUILD_release)
-dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_BUILD_release_DEBUG_INFO_default="#"
    if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
        COND_BUILD_release_DEBUG_INFO_default=""
    fi
    AC_SUBST(COND_BUILD_release_DEBUG_INFO_default)
-dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
-    COND_DEBUG_FLAG_0="#"
-    if test "x$DEBUG_FLAG" = "x0" ; then
-        COND_DEBUG_FLAG_0=""
+dnl ### begin block 20_COND_BUILD_release_UNICODE_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+    COND_BUILD_release_UNICODE_0="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_release_UNICODE_0=""
    fi
-    AC_SUBST(COND_DEBUG_FLAG_0)
-dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+    AC_SUBST(COND_BUILD_release_UNICODE_0)
+dnl ### begin block 20_COND_BUILD_release_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+    COND_BUILD_release_UNICODE_1="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_release_UNICODE_1=""
+    fi
+    AC_SUBST(COND_BUILD_release_UNICODE_1)
+dnl ### begin block 20_COND_DEBUG_FLAG_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+    COND_DEBUG_FLAG_1="#"
+    if test "x$DEBUG_FLAG" = "x1" ; then
+        COND_DEBUG_FLAG_1=""
+    fi
+    AC_SUBST(COND_DEBUG_FLAG_1)
+dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_DEBUG_INFO_0="#"
    if test "x$DEBUG_INFO" = "x0" ; then
        COND_DEBUG_INFO_0=""
    fi
    AC_SUBST(COND_DEBUG_INFO_0)
-dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_DEBUG_INFO_1="#"
    if test "x$DEBUG_INFO" = "x1" ; then
        COND_DEBUG_INFO_1=""
    fi
    AC_SUBST(COND_DEBUG_INFO_1)
-dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_DEPS_TRACKING_0="#"
    if test "x$DEPS_TRACKING" = "x0" ; then
        COND_DEPS_TRACKING_0=""
    fi
    AC_SUBST(COND_DEPS_TRACKING_0)
-dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_DEPS_TRACKING_1="#"
    if test "x$DEPS_TRACKING" = "x1" ; then
        COND_DEPS_TRACKING_1=""
@@ -74,7 +158,7 @@ dnl ### begin block 20_COND_ICC_PCH_1[../../tests/test.bkl,wx.bkl] ###
        COND_ICC_PCH_1=""
    fi
    AC_SUBST(COND_ICC_PCH_1)
-dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_MONOLITHIC_0="#"
    if test "x$MONOLITHIC" = "x0" ; then
        COND_MONOLITHIC_0=""
@@ -116,24 +200,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1[wx.bkl] ###
        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1[wx.bkl] ###
    COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#"
    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
        COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RIBBON" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1[wx.bkl] ###
    COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
@@ -152,7 +224,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_XRC_1[wx.bkl] ###
        COND_MONOLITHIC_0_SHARED_0_USE_XRC_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[wx.bkl] ###
    COND_MONOLITHIC_0_SHARED_1="#"
    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
        COND_MONOLITHIC_0_SHARED_1=""
@@ -188,24 +260,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1[wx.bkl] ###
        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1[wx.bkl] ###
    COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#"
    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then
        COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RIBBON" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1[wx.bkl] ###
    COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
@@ -248,7 +308,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_HTML_1[wx.bkl] ###
        COND_MONOLITHIC_0_USE_HTML_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_USE_HTML_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_MONOLITHIC_0_USE_MEDIA_1="#"
    if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
        COND_MONOLITHIC_0_USE_MEDIA_1=""
@@ -266,12 +326,6 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_QA_1[wx.bkl] ###
        COND_MONOLITHIC_0_USE_QA_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_USE_QA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_RIBBON_1[wx.bkl] ###
-    COND_MONOLITHIC_0_USE_RIBBON_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$USE_RIBBON" = "x1" ; then
-        COND_MONOLITHIC_0_USE_RIBBON_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_USE_RIBBON_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_USE_RICHTEXT_1[wx.bkl] ###
    COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
    if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
@@ -284,19 +338,13 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[wx.bkl] ###
        COND_MONOLITHIC_0_USE_STC_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_USE_STC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
-    COND_MONOLITHIC_0_USE_WEBVIEW_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then
-        COND_MONOLITHIC_0_USE_WEBVIEW_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_USE_WEBVIEW_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_USE_XRC_1[wx.bkl] ###
    COND_MONOLITHIC_0_USE_XRC_1="#"
    if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then
        COND_MONOLITHIC_0_USE_XRC_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_MONOLITHIC_1="#"
    if test "x$MONOLITHIC" = "x1" ; then
        COND_MONOLITHIC_1=""
@@ -314,19 +362,13 @@ dnl ### begin block 20_COND_MONOLITHIC_1_SHARED_1[wx.bkl] ###
        COND_MONOLITHIC_1_SHARED_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
-dnl ### begin block 20_COND_MONOLITHIC_1_USE_STC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
-    COND_MONOLITHIC_1_USE_STC_1="#"
-    if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then
-        COND_MONOLITHIC_1_USE_STC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_1_USE_STC_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
    if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
        COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
    fi
    AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
    if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
        COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
@@ -344,7 +386,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[wx.bkl] ###
        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
    fi
    AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_PLATFORM_MACOSX_1="#"
    if test "x$PLATFORM_MACOSX" = "x1" ; then
        COND_PLATFORM_MACOSX_1=""
@@ -356,36 +398,6 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0[../../samples/dia
        COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
    fi
    AC_SUBST(COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0[../../samples/dll/dll.bkl] ###
-    COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
-        COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
 dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1[wx.bkl] ###
    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
@@ -410,19 +422,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV
        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
    fi
    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0[wx.bkl] ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_GUI_1[../../samples/ipc/ipc.bkl,../../samples/sockets/sockets.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_GUI_1[../../samples/ipc/ipc.bkl,../../samples/sockets/sockets.bkl,../../tests/test.bkl,wx.bkl] ###
    COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
    if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
        COND_PLATFORM_MACOSX_1_USE_GUI_1=""
@@ -440,13 +440,19 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ###
        COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
    fi
    AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+    COND_PLATFORM_MACOS_1="#"
+    if test "x$PLATFORM_MACOS" = "x1" ; then
+        COND_PLATFORM_MACOS_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOS_1)
+dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
    COND_PLATFORM_MAC_0="#"
    if test "x$PLATFORM_MAC" = "x0" ; then
        COND_PLATFORM_MAC_0=""
    fi
    AC_SUBST(COND_PLATFORM_MAC_0)
-dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
    COND_PLATFORM_MAC_1="#"
    if test "x$PLATFORM_MAC" = "x1" ; then
        COND_PLATFORM_MAC_1=""
@@ -458,54 +464,42 @@ dnl ### begin block 20_COND_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ##
        COND_PLATFORM_MSDOS_0=""
    fi
    AC_SUBST(COND_PLATFORM_MSDOS_0)
-dnl ### begin block 20_COND_PLATFORM_MSDOS_1[wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MSDOS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_PLATFORM_MSDOS_1="#"
    if test "x$PLATFORM_MSDOS" = "x1" ; then
        COND_PLATFORM_MSDOS_1=""
    fi
    AC_SUBST(COND_PLATFORM_MSDOS_1)
-dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_PLATFORM_OS2_1="#"
    if test "x$PLATFORM_OS2" = "x1" ; then
        COND_PLATFORM_OS2_1=""
    fi
    AC_SUBST(COND_PLATFORM_OS2_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_PLATFORM_UNIX_0="#"
    if test "x$PLATFORM_UNIX" = "x0" ; then
        COND_PLATFORM_UNIX_0=""
    fi
    AC_SUBST(COND_PLATFORM_UNIX_0)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_PLATFORM_UNIX_1="#"
    if test "x$PLATFORM_UNIX" = "x1" ; then
        COND_PLATFORM_UNIX_1=""
    fi
    AC_SUBST(COND_PLATFORM_UNIX_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
-    COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
    fi
-    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL)
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
    fi
-    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
-    COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
-    fi
-    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
    COND_PLATFORM_UNIX_1_USE_GUI_1="#"
    if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
@@ -518,54 +512,18 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_PLUGINS_0[wx.bkl] ###
        COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
    fi
    AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_PLATFORM_WIN32_0="#"
    if test "x$PLATFORM_WIN32" = "x0" ; then
        COND_PLATFORM_WIN32_0=""
    fi
    AC_SUBST(COND_PLATFORM_WIN32_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
-    COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
-    if test "x$PLATFORM_WIN32" = "x0" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
-        COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_PLATFORM_WIN32_1="#"
    if test "x$PLATFORM_WIN32" = "x1" ; then
        COND_PLATFORM_WIN32_1=""
    fi
    AC_SUBST(COND_PLATFORM_WIN32_1)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1_SHARED_0[../../samples/dll/dll.bkl] ###
-    COND_PLATFORM_WIN32_1_SHARED_0="#"
-    if test "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
-        COND_PLATFORM_WIN32_1_SHARED_0=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_1_SHARED_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
-    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
-    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
-        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
-    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
-    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
-    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
-        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
-    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
 dnl ### begin block 20_COND_SHARED_0[wx.bkl] ###
    COND_SHARED_0="#"
    if test "x$SHARED" = "x0" ; then
@@ -638,7 +596,7 @@ dnl ### begin block 20_COND_SHARED_0_wxUSE_ZLIB_builtin[wx.bkl] ###
        COND_SHARED_0_wxUSE_ZLIB_builtin=""
    fi
    AC_SUBST(COND_SHARED_0_wxUSE_ZLIB_builtin)
-dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_SHARED_1="#"
    if test "x$SHARED" = "x1" ; then
        COND_SHARED_1=""
@@ -656,7 +614,7 @@ dnl ### begin block 20_COND_TOOLKIT_[wx.bkl] ###
        COND_TOOLKIT_=""
    fi
    AC_SUBST(COND_TOOLKIT_)
-dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
    COND_TOOLKIT_COCOA="#"
    if test "x$TOOLKIT" = "xCOCOA" ; then
        COND_TOOLKIT_COCOA=""
@@ -716,48 +674,6 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0[wx.
        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
    fi
    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1[wx.bkl] ###
    COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
@@ -776,12 +692,24 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1[wx.bkl] ###
        COND_TOOLKIT_GTK_USE_GUI_1=""
    fi
    AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_TOOLKIT_MAC="#"
    if test "x$TOOLKIT" = "xMAC" ; then
        COND_TOOLKIT_MAC=""
    fi
    AC_SUBST(COND_TOOLKIT_MAC)
+dnl ### begin block 20_COND_TOOLKIT_MGL[wx.bkl] ###
+    COND_TOOLKIT_MGL="#"
+    if test "x$TOOLKIT" = "xMGL" ; then
+        COND_TOOLKIT_MGL=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MGL)
+dnl ### begin block 20_COND_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
+    COND_TOOLKIT_MGL_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MGL_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1)
 dnl ### begin block 20_COND_TOOLKIT_MOTIF[wx.bkl] ###
    COND_TOOLKIT_MOTIF="#"
    if test "x$TOOLKIT" = "xMOTIF" ; then
@@ -800,7 +728,7 @@ dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
        COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
    fi
    AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_TOOLKIT_MSW="#"
    if test "x$TOOLKIT" = "xMSW" ; then
        COND_TOOLKIT_MSW=""
@@ -824,7 +752,7 @@ dnl ### begin block 20_COND_TOOLKIT_MSW_WXUNIV_0[wx.bkl] ###
        COND_TOOLKIT_MSW_WXUNIV_0=""
    fi
    AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
    COND_TOOLKIT_OSX_CARBON="#"
    if test "x$TOOLKIT" = "xOSX_CARBON" ; then
        COND_TOOLKIT_OSX_CARBON=""
@@ -836,7 +764,7 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON_USE_GUI_1[wx.bkl] ###
        COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
    fi
    AC_SUBST(COND_TOOLKIT_OSX_CARBON_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
    COND_TOOLKIT_OSX_COCOA="#"
    if test "x$TOOLKIT" = "xOSX_COCOA" ; then
        COND_TOOLKIT_OSX_COCOA=""
@@ -848,24 +776,12 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1[wx.bkl] ###
        COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
    fi
    AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl] ###
    COND_TOOLKIT_OSX_IPHONE="#"
    if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
        COND_TOOLKIT_OSX_IPHONE=""
    fi
    AC_SUBST(COND_TOOLKIT_OSX_IPHONE)
-dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE_USE_GUI_1[wx.bkl] ###
-    COND_TOOLKIT_OSX_IPHONE_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_OSX_IPHONE_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_OSX_IPHONE_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0[wx.bkl] ###
-    COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_PM[wx.bkl] ###
    COND_TOOLKIT_PM="#"
    if test "x$TOOLKIT" = "xPM" ; then
@@ -920,49 +836,31 @@ dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1[wx.bkl] ###
        COND_TOOLKIT_X11_USE_GUI_1=""
    fi
    AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1[wx.bkl] ###
-    COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
-    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
-        COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1)
-dnl ### begin block 20_COND_TOOLKIT_X11_WXUNIV_1[wx.bkl] ###
-    COND_TOOLKIT_X11_WXUNIV_1="#"
-    if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then
-        COND_TOOLKIT_X11_WXUNIV_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_X11_WXUNIV_1)
-dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_UNICODE_1="#"
    if test "x$UNICODE" = "x1" ; then
        COND_UNICODE_1=""
    fi
    AC_SUBST(COND_UNICODE_1)
-dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
-    COND_USE_CAIRO_1="#"
-    if test "x$USE_CAIRO" = "x1" ; then
-        COND_USE_CAIRO_1=""
-    fi
-    AC_SUBST(COND_USE_CAIRO_1)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_EXCEPTIONS_0="#"
    if test "x$USE_EXCEPTIONS" = "x0" ; then
        COND_USE_EXCEPTIONS_0=""
    fi
    AC_SUBST(COND_USE_EXCEPTIONS_0)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_EXCEPTIONS_1="#"
    if test "x$USE_EXCEPTIONS" = "x1" ; then
        COND_USE_EXCEPTIONS_1=""
    fi
    AC_SUBST(COND_USE_EXCEPTIONS_1)
-dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_GUI_0="#"
    if test "x$USE_GUI" = "x0" ; then
        COND_USE_GUI_0=""
    fi
    AC_SUBST(COND_USE_GUI_0)
-dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_GUI_1="#"
    if test "x$USE_GUI" = "x1" ; then
        COND_USE_GUI_1=""
@@ -986,19 +884,37 @@ dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_1[wx.bkl] ###
        COND_USE_GUI_1_WXUNIV_1=""
    fi
    AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
+dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
+dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
        COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
    fi
    AC_SUBST(COND_USE_GUI_1_wxUSE_LIBJPEG_builtin)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
        COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
    fi
    AC_SUBST(COND_USE_GUI_1_wxUSE_LIBPNG_builtin)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
        COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
@@ -1016,30 +932,30 @@ dnl ### begin block 20_COND_USE_PCH_1[../../tests/test.bkl,wx.bkl] ###
        COND_USE_PCH_1=""
    fi
    AC_SUBST(COND_USE_PCH_1)
-dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_PLUGINS_0="#"
    if test "x$USE_PLUGINS" = "x0" ; then
        COND_USE_PLUGINS_0=""
    fi
    AC_SUBST(COND_USE_PLUGINS_0)
-dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_RTTI_0="#"
    if test "x$USE_RTTI" = "x0" ; then
        COND_USE_RTTI_0=""
    fi
    AC_SUBST(COND_USE_RTTI_0)
-dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_RTTI_1="#"
    if test "x$USE_RTTI" = "x1" ; then
        COND_USE_RTTI_1=""
    fi
    AC_SUBST(COND_USE_RTTI_1)
-dnl ### begin block 20_COND_USE_SOTWOSYMLINKS_1[wx.bkl] ###
-    COND_USE_SOTWOSYMLINKS_1="#"
-    if test "x$USE_SOTWOSYMLINKS" = "x1" ; then
-        COND_USE_SOTWOSYMLINKS_1=""
+dnl ### begin block 20_COND_USE_SOSYMLINKS_1[wx.bkl] ###
+    COND_USE_SOSYMLINKS_1="#"
+    if test "x$USE_SOSYMLINKS" = "x1" ; then
+        COND_USE_SOSYMLINKS_1=""
    fi
-    AC_SUBST(COND_USE_SOTWOSYMLINKS_1)
+    AC_SUBST(COND_USE_SOSYMLINKS_1)
 dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1[wx.bkl] ###
    COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"
    if test "x$USE_SOVERCYGWIN" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
@@ -1058,12 +974,6 @@ dnl ### begin block 20_COND_USE_SOVERSION_0[wx.bkl] ###
        COND_USE_SOVERSION_0=""
    fi
    AC_SUBST(COND_USE_SOVERSION_0)
-dnl ### begin block 20_COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1[wx.bkl] ###
-    COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="#"
-    if test "x$USE_SOVERSION" = "x1" -a "x$USE_SOVERSOLARIS" = "x1" ; then
-        COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1=""
-    fi
-    AC_SUBST(COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1)
 dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[wx.bkl] ###
    COND_USE_SOVERSOLARIS_1="#"
    if test "x$USE_SOVERSOLARIS" = "x1" ; then
@@ -1076,25 +986,25 @@ dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
        COND_USE_STC_1=""
    fi
    AC_SUBST(COND_USE_STC_1)
-dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_THREADS_0="#"
    if test "x$USE_THREADS" = "x0" ; then
        COND_USE_THREADS_0=""
    fi
    AC_SUBST(COND_USE_THREADS_0)
-dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_THREADS_1="#"
    if test "x$USE_THREADS" = "x1" ; then
        COND_USE_THREADS_1=""
    fi
    AC_SUBST(COND_USE_THREADS_1)
-dnl ### begin block 20_COND_USE_XRC_1[../../utils/execmon/execmon.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_XRC_1[../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_USE_XRC_1="#"
    if test "x$USE_XRC" = "x1" ; then
        COND_USE_XRC_1=""
    fi
    AC_SUBST(COND_USE_XRC_1)
-dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../samples/dll/dll.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[wx.bkl] ###
    COND_WINDOWS_IMPLIB_1="#"
    if test "x$WINDOWS_IMPLIB" = "x1" ; then
        COND_WINDOWS_IMPLIB_1=""
@@ -1112,43 +1022,79 @@ dnl ### begin block 20_COND_WXUNIV_0[wx.bkl] ###
        COND_WXUNIV_0=""
    fi
    AC_SUBST(COND_WXUNIV_0)
-dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_WXUNIV_1="#"
    if test "x$WXUNIV" = "x1" ; then
        COND_WXUNIV_1=""
    fi
    AC_SUBST(COND_WXUNIV_1)
-dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUSE_EXPAT_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_WXUSE_EXPAT_BUILTIN="#"
+    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+        COND_WXUSE_EXPAT_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_EXPAT_BUILTIN)
+dnl ### begin block 20_COND_WXUSE_LIBJPEG_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_WXUSE_LIBJPEG_BUILTIN="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_WXUSE_LIBJPEG_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
+dnl ### begin block 20_COND_WXUSE_LIBPNG_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_WXUSE_LIBPNG_BUILTIN="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_WXUSE_LIBPNG_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
+dnl ### begin block 20_COND_WXUSE_LIBTIFF_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_WXUSE_LIBTIFF_BUILTIN="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_WXUSE_LIBTIFF_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block 20_COND_WXUSE_REGEX_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_WXUSE_REGEX_BUILTIN="#"
+    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_WXUSE_REGEX_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
+dnl ### begin block 20_COND_WXUSE_ZLIB_BUILTIN[../../samples/docvwmdi/docvwmdi.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ###
+    COND_WXUSE_ZLIB_BUILTIN="#"
+    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_WXUSE_ZLIB_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
+dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_wxUSE_EXPAT_builtin="#"
    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
        COND_wxUSE_EXPAT_builtin=""
    fi
    AC_SUBST(COND_wxUSE_EXPAT_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_wxUSE_LIBJPEG_builtin="#"
    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
        COND_wxUSE_LIBJPEG_builtin=""
    fi
    AC_SUBST(COND_wxUSE_LIBJPEG_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_wxUSE_LIBPNG_builtin="#"
    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
        COND_wxUSE_LIBPNG_builtin=""
    fi
    AC_SUBST(COND_wxUSE_LIBPNG_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_wxUSE_LIBTIFF_builtin="#"
    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
        COND_wxUSE_LIBTIFF_builtin=""
    fi
    AC_SUBST(COND_wxUSE_LIBTIFF_builtin)
-dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_wxUSE_REGEX_builtin="#"
    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
        COND_wxUSE_REGEX_builtin=""
    fi
    AC_SUBST(COND_wxUSE_REGEX_builtin)
-dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
    COND_wxUSE_ZLIB_builtin="#"
    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
        COND_wxUSE_ZLIB_builtin=""
--- a/build/aclocal/ac_raf_func_which_getservbyname_r.m4
+++ b/build/aclocal/ac_raf_func_which_getservbyname_r.m4
@@ -3,7 +3,7 @@ dnl
 dnl Provides a test to determine the correct way to call
 dnl getservbyname_r:
 dnl
-dnl  - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g. linux)
+dnl  - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux)
 dnl  - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris)
 dnl  - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1)
 dnl
--- a/build/aclocal/atomic_builtins.m4
+++ b/build/aclocal/atomic_builtins.m4
@@ -16,7 +16,7 @@ AC_DEFUN([WX_ATOMIC_BUILTINS],
          __sync_fetch_and_add(&value, 2);
          __sync_sub_and_fetch(&value, 1);
          /* but wxAtomicDec does, so mimic that: */
-          volatile unsigned int r2 = __sync_sub_and_fetch(&value, 1);
+          unsigned int r2 = __sync_sub_and_fetch(&value, 1);
        ],
        wx_cv_cc_gcc_atomic_builtins=yes,
        wx_cv_cc_gcc_atomic_builtins=no)
--- a/build/aclocal/ax_func_which_gethostbyname_r.m4
+++ b/build/aclocal/ax_func_which_gethostbyname_r.m4
@@ -45,15 +45,13 @@ ac_cv_func_which_gethostbyname_r=unknown
 # assuming an implicit prototype. In which case, we're out of luck.
 #
 AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-        [[#include <netdb.h>]],
-        [[
-            char *name = "www.gnu.org";
-            (void)gethostbyname_r(name) /* ; */
-        ]]
-    )],
-    ac_cv_func_which_gethostbyname_r=no
-    )
+    AC_LANG_PROGRAM(
+	[[#include <netdb.h>]],
+	[[
+	    char *name = "www.gnu.org";
+	    (void)gethostbyname_r(name) /* ; */
+	]]),
+    ac_cv_func_which_gethostbyname_r=no)

 #
 # SIX ARGUMENTS
@@ -63,19 +61,17 @@ AC_COMPILE_IFELSE(
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then

 AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-        [[#include <netdb.h>]],
-        [[
-            char *name = "www.gnu.org";
-            struct hostent ret, *retp;
-            char buf@<:@1024@:>@;
-            int buflen = 1024;
-            int my_h_errno;
-            (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
-        ]]
-    )],
-    ac_cv_func_which_gethostbyname_r=six
-    )
+    AC_LANG_PROGRAM(
+	[[#include <netdb.h>]],
+	[[
+	    char *name = "www.gnu.org";
+	    struct hostent ret, *retp;
+	    char buf@<:@1024@:>@;
+	    int buflen = 1024;
+	    int my_h_errno;
+	    (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
+	]]),
+    ac_cv_func_which_gethostbyname_r=six)

 fi

@@ -87,19 +83,17 @@ fi
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then

 AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
+    AC_LANG_PROGRAM(
 	[[#include <netdb.h>]],
-        [[
-            char *name = "www.gnu.org";
-            struct hostent ret;
-            char buf@<:@1024@:>@;
-            int buflen = 1024;
-            int my_h_errno;
-            (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
-        ]]
-    )],
-    ac_cv_func_which_gethostbyname_r=five
-    )
+	[[
+	    char *name = "www.gnu.org";
+	    struct hostent ret;
+	    char buf@<:@1024@:>@;
+	    int buflen = 1024;
+	    int my_h_errno;
+	    (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
+	]]),
+    ac_cv_func_which_gethostbyname_r=five)

 fi

@@ -111,17 +105,15 @@ fi
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then

 AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-        [[#include <netdb.h>]],
-        [[
-            char *name = "www.gnu.org";
-            struct hostent ret;
-            struct hostent_data data;
-            (void)gethostbyname_r(name, &ret, &data) /* ; */
-        ]]
-    )],
-    ac_cv_func_which_gethostbyname_r=three
-    )
+    AC_LANG_PROGRAM(
+	[[#include <netdb.h>]],
+	[[
+	    char *name = "www.gnu.org";
+	    struct hostent ret;
+	    struct hostent_data data;
+	    (void)gethostbyname_r(name, &ret, &data) /* ; */
+	]]),
+    ac_cv_func_which_gethostbyname_r=three)

 fi

--- a/build/aclocal/bakefile-lang.m4
+++ b/build/aclocal/bakefile-lang.m4
@@ -21,6 +21,8 @@ dnl  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 dnl  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 dnl  DEALINGS IN THE SOFTWARE.
 dnl
+dnl  $Id$
+dnl
 dnl  Compiler detection macros by David Elliott and Vadim Zeitlin
 dnl

@@ -238,7 +240,7 @@ dnl check for different proprietary compilers depending on target platform
 dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
 AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
 [
-    AC_REQUIRE([AC_PROG_$1])
+    AC_PROG_$1

    dnl Intel compiler can be used under several different OS and even
    dnl different architectures (x86, amd64 and Itanium) so it's easier to just
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -21,6 +21,8 @@ dnl  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 dnl  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 dnl  DEALINGS IN THE SOFTWARE.
 dnl
+dnl  $Id$
+dnl
 dnl  Support macros for makefiles generated by BAKEFILE.
 dnl

@@ -124,7 +126,8 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
                PLATFORM_BEOS=1
            ;;
            * )
-                AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
+                dnl wxWidgets-specific: allow unknown Unix systems
+                dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
            ;;
        esac
    fi
@@ -334,7 +337,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
        chmod +x shared-ld-sh

        SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
+        SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"

        dnl Most apps benefit from being fully binded (its faster and static
        dnl variables initialized at startup work).
@@ -441,7 +444,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
      ;;

      powerpc-apple-macos* | \
-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
      *-*-mirbsd* | \
      *-*-sunos4* | \
      *-*-osf* | \
@@ -487,13 +490,13 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
    USE_SOVERLINUX=0
    USE_SOVERSOLARIS=0
    USE_SOVERCYGWIN=0
-    USE_SOTWOSYMLINKS=0
+    USE_SOSYMLINKS=0
    USE_MACVERSION=0
    SONAME_FLAG=

    case "${BAKEFILE_HOST}" in
      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
-      *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
+      *-*-k*bsd*-gnu | *-*-mirbsd* )
        if test "x$SUNCXX" = "xyes"; then
            SONAME_FLAG="-h "
        else
@@ -501,19 +504,20 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
        fi
        USE_SOVERSION=1
        USE_SOVERLINUX=1
-        USE_SOTWOSYMLINKS=1
+        USE_SOSYMLINKS=1
      ;;

      *-*-solaris2* )
        SONAME_FLAG="-h "
        USE_SOVERSION=1
        USE_SOVERSOLARIS=1
+        USE_SOSYMLINKS=1
      ;;

      *-*-darwin* )
        USE_MACVERSION=1
        USE_SOVERSION=1
-        USE_SOTWOSYMLINKS=1
+        USE_SOSYMLINKS=1
      ;;

      *-*-cygwin* )
@@ -527,7 +531,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
    AC_SUBST(USE_SOVERSOLARIS)
    AC_SUBST(USE_SOVERCYGWIN)
    AC_SUBST(USE_MACVERSION)
-    AC_SUBST(USE_SOTWOSYMLINKS)
+    AC_SUBST(USE_SOSYMLINKS)
    AC_SUBST(SONAME_FLAG)
 ])

@@ -556,7 +560,16 @@ AC_DEFUN([AC_BAKEFILE_DEPS],

        if test "x$GCC" = "xyes"; then
            DEPSMODE=gcc
-            DEPSFLAG="-MMD"
+            case "${BAKEFILE_HOST}" in
+                *-*-darwin* )
+                    dnl -cpp-precomp (the default) conflicts with -MMD option
+                    dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html)
+                    DEPSFLAG="-no-cpp-precomp -MMD"
+                ;;
+                * )
+                    DEPSFLAG="-MMD"
+                ;;
+            esac
            AC_MSG_RESULT([gcc])
        elif test "x$MWCC" = "xyes"; then
            DEPSMODE=mwcc
@@ -626,15 +639,28 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
        AC_SUBST(AR)
    else
        AC_CHECK_TOOL(AR, ar, ar)
-        AROPTIONS=rc
+        AROPTIONS=rcu
    fi
    AC_SUBST(AROPTIONS)

    AC_CHECK_TOOL(STRIP, strip, :)
    AC_CHECK_TOOL(NM, nm, :)

-    dnl Don't use `install -d`, see http://trac.wxwidgets.org/ticket/13452
-    INSTALL_DIR="mkdir -p"
+    dnl This check is necessary because "install -d" doesn't exist on
+    dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80
+    AC_MSG_CHECKING([for command to install directories])
+    INSTALL_TEST_DIR=acbftest$$
+    $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
+    if test $? = 0 -a -d $INSTALL_TEST_DIR; then
+        rmdir $INSTALL_TEST_DIR
+        dnl we must refer to makefile's $(INSTALL) variable and not
+        dnl current value of shell variable, hence the single quoting:
+        INSTALL_DIR='$(INSTALL) -d'
+        AC_MSG_RESULT([$INSTALL -d])
+    else
+        INSTALL_DIR="mkdir -p"
+        AC_MSG_RESULT([mkdir -p])
+    fi
    AC_SUBST(INSTALL_DIR)

    LDFLAGS_GUI=
@@ -813,7 +839,7 @@ AC_DEFUN([AC_BAKEFILE],
    AC_SUBST(OBJCXXFLAGS)


-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.6"

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

-         /* At the time of Xcode 4.1 / Clang 3, Clang++ still didn't
-            have the bugs sorted out. These were fixed starting with
-            Xcode 4.6.0 / Apple Clang 4.2 (which is based on Clang 3.2 so
-            check for that version too). */
-         #ifdef __clang__
-            #ifdef __APPLE__
-                #if __clang_major__ < 4 \
-                    || (__clang_major__ == 4 && __clang_minor__ < 2)
-                    error Clang compiler version < 4.2 is broken w.r.t. visibility;
-                #endif
-            #else
-                #if __clang_major__ < 3 \
-                    || (__clang_major__ == 3 && __clang_minor__ < 2)
-                    error Clang compiler version < 3.2 is broken w.r.t. visibility;
-                #endif
-            #endif
-         #endif
-
         extern __attribute__((__visibility__("hidden"))) int hiddenvar;
         extern __attribute__((__visibility__("default"))) int exportedvar;
         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">

@@ -8,7 +9,7 @@
    Bakefiles.local.bkgen file in this directory and add <enable-formats>
    into it:
         <?xml version="1.0" ?>
-         <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
+         <bakefile-gen>
             <enable-formats>dmars</enable-formats>
         </bakefile-gen>

@@ -61,13 +62,10 @@
    <!-- WinCE can't have console apps: -->
    <del-formats files="../../samples/console/*">msevc4prj</del-formats>
    <del-formats files="../../samples/sockets/*">msevc4prj</del-formats>
-    <del-formats files="../../utils/execmon/*">msevc4prj</del-formats>
    <del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
    <del-formats files="../../utils/ifacecheck/src/*">msevc4prj</del-formats>
    <del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
    <del-formats files="../../tests/*">msevc4prj</del-formats>
-    <del-formats files="../../tests/benchmarks/*">msevc4prj</del-formats>
-

    <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
    <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
@@ -128,6 +126,8 @@
        -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
    </add-flags>

+    <add-formats files="wx.bkl">rpmspec</add-formats>
+

    <!-- Use different names for Visual C++ 200x project files: -->
    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"
@@ -143,11 +143,6 @@
        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc9.sln
    </add-flags>

-    <add-flags formats="msvs2005prj,msvs2008prj">
-        -DMSVS_PLATFORMS=win32,win64
-    </add-flags>
-
-
    <!-- Makefile specific settings: -->

    <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
--- a/build/bakefiles/README
+++ b/build/bakefiles/README
@@ -35,6 +35,7 @@ Note: the following files are generated using bakefile_gen:
    that contain "This makefile was generated by Bakefile" banner and
    VC++ project files in samples, demos and utils directories
  * 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)
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

@@ -7,7 +8,8 @@
    the library.
    -->

-    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'] and
+              TOOLKIT in ['PM','MSW','MGL','MOTIF']">

        <set var="BUILD_CFG_FILE" make_var="1">
            $(SETUPHDIR)$(DIRSEP)build.cfg
@@ -25,8 +27,6 @@
                @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
                @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
                @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
-                @echo TOOLKIT=$(TOOLKIT) >>$(BUILD_CFG_FILE)
-                @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE)
                @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)
                @echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
                @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)
@@ -36,22 +36,14 @@
                @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
                @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
                @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
-                @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)
                @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
-                @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)
                @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
                @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
                @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
                @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
                @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
-                @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)
-                @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)
-                @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
-                @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
-                @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
-                @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)
+                @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
                @echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
-                @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)
                @echo CC=$(CC) >>$(BUILD_CFG_FILE)
                @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
                @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -1,8 +1,9 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

-    <requires version="0.2.7"/>
+    <requires version="0.2.3"/>

    <!-- bakefile modules we need: -->
    <using module="datafiles"/>
@@ -21,6 +22,10 @@
        <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"/>
@@ -29,17 +34,6 @@
    <!-- wxWidgets version numbers logic: -->
    <include file="version.bkl"/>

-    <set var="ARCH_SUFFIX">
-        <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
-        <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORM=='win64'">_x64</if>
-        <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORM=='win64'">_x64</if>
-        <if cond="TARGET_CPU=='amd64'">_x64</if>
-        <if cond="TARGET_CPU=='AMD64'">_x64</if>
-        <if cond="TARGET_CPU=='ia64'">_ia64</if>
-        <if cond="TARGET_CPU=='IA64'">_ia64</if>
-        <if cond="TARGET_CPU=='x64'">_x64</if>
-        <if cond="TARGET_CPU=='X64'">_x64</if>
-    </set>

    <!-- ================================================================== -->
    <!--                     Names of libraries and DLLs:                   -->
@@ -54,26 +48,12 @@
        <if cond="TOOLKIT=='MAC'">_carbon</if>
    </set>

-    <!--
-        Optional compiler version, mainly for Windows compilers for which it is
-        supposed to be set on make command line for the official builds.
-     -->
-    <set var="COMPILER_VERSION" make_var="1">
-        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD</if>
-    </set>
-
    <set var="COMPILERORGCC">
        <if cond="isdefined('COMPILER')">$(COMPILER)</if>
        <if cond="not isdefined('COMPILER')">gcc</if>
    </set>
-
-    <!--
-        In the official builds we use not only the compiler name but also its
-        version and architecture we compile for in the libraries names.
-     -->
    <set var="WXCOMPILER">
-        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">_$(COMPILERORGCC)$(COMPILER_VERSION)$(ARCH_SUFFIX)</if>
-        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(COMPILERORGCC)</if>
+        <if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
    </set>

    <set var="VENDORTAG">
@@ -81,20 +61,16 @@
        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
    </set>

-    <!-- debug suffix used for Windows libraries which use debug CRT -->
    <set var="WXDEBUGFLAG">
-        <if cond="BUILD=='debug' and DEBUG_RUNTIME_LIBS=='default'">d</if>
-        <if cond="DEBUG_RUNTIME_LIBS=='1'">d</if>
+        <if cond="BUILD=='debug' and DEBUG_FLAG=='default'">d</if>
+        <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>
    </set>
-    <set var="WX_U_D_SUFFIX">
-        $(WXUNICODEFLAG)$(WXDEBUGFLAG)
-    </set>
    <set var="WXNAMESUFFIX">
-        $(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR)
+        $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
    </set>

    <set var="WXUNIVNAME">
@@ -169,9 +145,6 @@
    <set var="WXLIB_AUI">
        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
    </set>
-    <set var="WXLIB_RIBBON">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('ribbon')))</if>
-    </set>
    <set var="WXLIB_PROPGRID">
        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('propgrid')))</if>
    </set>
@@ -181,9 +154,7 @@
    <set var="WXLIB_STC">
        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
    </set>
-    <set var="WXLIB_WEBVIEW">
-        <if cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
-    </set>
+
    <set var="WXLIB_MONO">
        <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
    </set>
@@ -193,20 +164,28 @@
    <!--             Where to store built libraries and objects:         -->
    <!-- =============================================================== -->

+    <set var="DIR_SUFFIX_CPU">
+        <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+        <if cond="TARGET_CPU=='amd64'">_amd64</if>
+        <if cond="TARGET_CPU=='AMD64'">_amd64</if>
+        <if cond="TARGET_CPU=='ia64'">_ia64</if>
+        <if cond="TARGET_CPU=='IA64'">_ia64</if>
+    </set>
+
    <if cond="FORMAT!='autoconf'">
        <set var="WXDLLFLAG">
            <if cond="SHARED=='1'">dll</if>
        </set>
        <set var="CFG_NAME_PART">
-            $(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG)
+            $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
        </set>

-        <!-- NB: this is make_var so that it can be overridden on command line
+        <!-- NB: this is make_var so that it can be overriden on command line
                 like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
        <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>

        <set var="OBJS" make_var="1">
-            $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
+            $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
        </set>

        <set var="BUILDDIR">$(OBJS)</set>
@@ -222,13 +201,13 @@
    <set var="LIBDIRNAME" make_var="1">
        <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
        <if cond="FORMAT!='autoconf'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
        </if>
    </set>

    <if cond="FORMAT!='autoconf'">
        <set var="SETUPHDIR" make_var="1">
-            $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)
+            $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
        </set>
    </if>

@@ -278,13 +257,9 @@
    </set>

    <set var="DEBUG_DEFINE">
-        <if cond="DEBUG_FLAG=='0'">wxDEBUG_LEVEL=0</if>
+        <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
+        <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
    </set>
-    <set var="NDEBUG_DEFINE">
-        <if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">NDEBUG</if>
-        <if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='0'">NDEBUG</if>
-    </set>
-
    <!-- does not cover all cases, but better than nothing -->
    <set var="NO_VC_CRTDBG">
        <if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
@@ -306,23 +281,21 @@
    <set var="UNICOWS_LIB">
        <if cond="MSLU=='1'">unicows</if>
    </set>
-    <set var="CAIRO_LIB">
-        <if cond="USE_CAIRO=='1'">cairo</if>
-    </set>
-    <set var="CAIRO_LIBDIR">
-        <if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/lib</if>
-    </set>
-    <set var="CAIRO_INCLUDEDIR">
-        <if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/include/cairo</if>
-    </set>
+
+    <if cond="FORMAT!='autoconf'">
+        <set var="GDIPLUS_LIB">
+            <if cond="USE_GDIPLUS=='1'">gdiplus</if>
+        </set>
+        <set var="GFXCTX_DEFINE">
+            <if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
+        </set>
+    </if>

    <set var="LINK_TARGET_CPU">
-        <if cond="TARGET_CPU=='amd64'">/MACHINE:X64</if>
-        <if cond="TARGET_CPU=='AMD64'">/MACHINE:X64</if>
+        <if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if>
+        <if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
        <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
        <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
-        <if cond="TARGET_CPU=='x64'">/MACHINE:X64</if>
-        <if cond="TARGET_CPU=='X64'">/MACHINE:X64</if>
    </set>

    <template id="common_settings">
@@ -336,13 +309,6 @@
        <if cond="FORMAT!='autoconf'">
            <cppflags>$(EXTRACFLAGS)</cppflags>
        </if>
-        <!-- Suppress deprecation warnings for standard library calls -->
-        <if cond="FORMAT in ['msvc','msvs2005prj','msvs2008prj']">
-            <define>_CRT_SECURE_NO_DEPRECATE=1</define>
-            <define>_CRT_NON_CONFORMING_SWPRINTFS=1</define>
-            <define>_SCL_SECURE_NO_WARNINGS=1</define>
-        </if>
-
        <define>$(NO_VC_CRTDBG)</define>
        <define>$(WIN32_WINNT)</define>
        <if cond="FORMAT=='msvc'">
@@ -358,7 +324,7 @@

    <template id="3rdparty_lib" template="common_settings,anylib">
        <if cond="FORMAT=='autoconf'">
-            <libname>$(id)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
+            <libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
        </if>
        <if cond="FORMAT!='autoconf'">
            <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
@@ -369,22 +335,6 @@
        -->
        <install-if>SHARED=='0'</install-if>
        <pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
-
-        <!--
-            we don't want to have asserts in the 3rd party libraries code,
-            neither we nor wx users are interested in debugging them anyhow
-         -->
-        <define>NDEBUG</define>
-
-        <if cond="IS_MSVC">
-            <!--
-                we're not interested in deprecation warnings about the use of
-                standard C functions in the 3rd party libraries (these warnings
-                are only given by VC8+ but it's simpler to just always define
-                this symbol which disables them, even for previous VC versions)
-             -->
-            <define>_CRT_SECURE_NO_WARNINGS</define>
-        </if>
    </template>


@@ -399,14 +349,7 @@
    </define-tag>

    <set var="msvc_copy_setup_h_script">
-        <if cond="IS_MSVC_PRJ=='1' and FORMAT not in ['msvc6prj','msevc4prj']">
-Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\..\include\wx\%s
-
-"$(SETUPHDIR)\wx\setup.h" : 
-$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-        </if>
-        <if cond="IS_MSVC_PRJ=='1' and FORMAT in ['msvc6prj','msevc4prj']">
+        <if cond="IS_MSVC_PRJ">
 Creating $(SETUPHDIR)\wx\setup.h
 InputPath=..\..\include\wx\%s

@@ -442,15 +385,10 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                    univ/setup.h
                </msvc-headers-setup-h>
                <set var="_custom_build_include_wx_msw_setup_h">
-                    <if cond="WXUNIV=='0' and TOOLKIT=='MSW'">
+                    <if cond="WXUNIV=='0'">
                        $(msvc_copy_setup_h_script % 'msw\setup.h')
                    </if>
                </set>
-                <set var="_custom_build_include_wx_gtk_setup_h">
-                    <if cond="WXUNIV=='0' and TOOLKIT=='GTK'">
-                        $(msvc_copy_setup_h_script % 'gtk\setup.h')
-                    </if>
-                </set>
                <set var="_custom_build_include_wx_univ_setup_h">
                    <if cond="WXUNIV=='1'">
                        $(msvc_copy_setup_h_script % 'univ\setup.h')
@@ -508,7 +446,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             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_XML) $(EXTRALIBS_GUI)</if>
+        <if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_GUI)</if>
        <if cond="MONOLITHIC=='0'">$(EXTRALIBS)</if>
    </set>
    <set var="EXTRALIBS_FOR_GUI">
@@ -516,26 +454,31 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
        <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
    </set>

-    <!-- GTK+ under Windows requires -mms-bitfields gcc switch -->
-    <set var="CXXFLAGS_GTK_WINDOWS_GCC">
-        <if cond="TOOLKIT=='GTK' and FORMAT=='mingw'">-mms-bitfields</if>
-    </set>
+    <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
+        <set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
+        <set var="MGLPMLIBPATH">
+            <if cond="DOS32=='DOS4GW'">dos4gw</if>
+        </set>
+    </if>

    <template id="wx" template="common_settings">
        <set var="wxid">$(wxwin.mk_wxid(id))</set>
        <define>__WX$(TOOLKIT)__</define>
        <define>$(WXUNIV_DEFINE)</define>
        <define>$(DEBUG_DEFINE)</define>
-        <define>$(NDEBUG_DEFINE)</define>
        <define>$(EXCEPTIONS_DEFINE)</define>
        <define>$(RTTI_DEFINE)</define>
        <define>$(THREAD_DEFINE)</define>
        <define>$(UNICODE_DEFINE)</define>
        <define>$(MSLU_DEFINE)</define>
+        <if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if>
        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
-        <include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
        <lib-path>$(LIBDIRNAME)</lib-path>
+        <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
+            <lib-path>$(MGLLIBPATH)</lib-path>
+            <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
+        </if>

        <warnings>max</warnings>
        <cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
@@ -547,7 +490,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
        </cppflags-watcom>
        <cxxflags-mingw>
            -Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
-             $(CXXFLAGS_GTK_WINDOWS_GCC)
        </cxxflags-mingw>
    </template>

@@ -567,11 +509,17 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
            </if>
        </if>

+        <!-- system libraries on mgl: -->
+        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
+            <sys-lib>mgl</sys-lib>
+            <sys-lib>mglcpp</sys-lib>
+            <sys-lib>pm</sys-lib>
+        </if>
+
        <!-- system libraries on windows: -->
        <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
            <sys-lib>$(UNICOWS_LIB)</sys-lib>
-            <sys-lib>$(CAIRO_LIB)</sys-lib>
-            <lib-path>$(CAIRO_LIBDIR)</lib-path>
+            <sys-lib>$(GDIPLUS_LIB)</sys-lib>
            <if cond="FORMAT=='borland'">
                <sys-lib>ole2w32</sys-lib>
            </if>
@@ -608,38 +556,23 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
        </if>
    </template>

-    <set var="LIB_GTK">
-        <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1' and TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib glib-2.0.lib</if>
-    </set>

    <!-- for GUI libs/samples: -->
    <template id="wx_append_nomono" template_append="wx_append_base_nomono">
        <sys-lib>$(LIB_TIFF)</sys-lib>
        <sys-lib>$(LIB_JPEG)</sys-lib>
        <sys-lib>$(LIB_PNG)</sys-lib>
-        <ldlibs>$(LIB_GTK)</ldlibs>
        <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
    </template>

-    <set var="LIB_PNG_IF_MONO">
-        <if cond="MONOLITHIC=='1'">$(LIB_PNG)</if>
-    </set>
-
-    <set var="LIB_SCINTILLA_IF_MONO">
-        <if cond="MONOLITHIC=='1' and USE_STC=='1'">$(LIB_SCINTILLA)</if>
-    </set>

    <template id="wx_append_base" template_append="wx_append_base_nomono">
-        <!-- Always link against the full wx library in monolithic build and
-             also against the PNG one as core code references it for Tango
-             icons and so it is pulled in even by the console programs. -->
+        <!-- Always link against the wxWin library in monolithic build: -->
        <sys-lib>$(WXLIB_MONO)</sys-lib>
-        <sys-lib>$(LIB_PNG_IF_MONO)</sys-lib>
    </template>
    <template id="wx_append" template_append="wx_append_nomono">
        <!-- Always link against the wxWin library in monolithic build: -->
        <sys-lib>$(WXLIB_MONO)</sys-lib>
-        <sys-lib>$(LIB_SCINTILLA_IF_MONO)</sys-lib>
    </template>


@@ -652,7 +585,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
        <define>WXBUILDING</define>

        <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf'">
+            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
                <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
                <precomp-headers-gen>
                    $(WXTOPDIR)src/common/dummy.cpp
@@ -664,20 +597,16 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
            <precomp-headers-file>wxprec_$(id)</precomp-headers-file>
            <precomp-headers-exclude>
                src/common/extended.c
-                src/gtk/eggtrayicon.c
-                src/gtk/treeentry_gtk.c
            </precomp-headers-exclude>
        </if>

        <if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
            <msvc-file-group>Common Sources:src/common/*</msvc-file-group>
-            <msvc-file-group>GTK+ Sources:src/gtk/*</msvc-file-group>
            <msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
            <msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
            <msvc-file-group>wxUniv Sources:src/univ/*</msvc-file-group>
            <msvc-file-group>wxHTML Sources:src/html/*</msvc-file-group>
            <msvc-file-group>Setup Headers:*/setup.h</msvc-file-group>
-            <msvc-file-group>GTK+ Headers:*wx/gtk/*.h</msvc-file-group>
            <msvc-file-group>MSW Headers:*wx/msw/*.h</msvc-file-group>
            <msvc-file-group>Generic Headers:*wx/generic/*.h</msvc-file-group>
            <msvc-file-group>wxUniv Headers:*wx/univ/*.h</msvc-file-group>
@@ -710,12 +639,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
            <res-include>$(TOP_SRCDIR)include</res-include>
            <postlink-command>$(DYLIB_RPATH_POSTLINK)</postlink-command>
        </if>
-        <if cond="FORMAT=='borland'">
-            <!-- path to windows.h for this compiler -->
-            <res-include>$(DOLLAR)(BCCDIR)\include\windows\sdk</res-include>
-        </if>
        <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
-
+        
    </template>

    <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
@@ -733,6 +658,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
    </template>

    <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
+        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
+            <include>$(DOLLAR)(%SCITECH)/include</include>
+        </if>
        <include>$(INC_TIFF_BUILD)</include>
        <include>$(INC_TIFF)</include>
        <include>$(INC_JPEG)</include>
@@ -784,6 +712,13 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
    </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>
@@ -791,7 +726,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
    <define-rule name="wx-base-plugin" extends="module">
        <template>
            <dllname>
-                $(id)$(WX_U_D_SUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
+                $(id)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
            </dllname>
            <define>WXUSINGDLL</define>
            <define>wxUSE_GUI=0</define>
@@ -802,7 +737,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
    <define-rule name="wx-gui-plugin" extends="module">
        <template template="wx">
            <dllname>
-                $(id)_$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
+                $(id)_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
            </dllname>
            <define>WXUSINGDLL</define>
            <install-to>$(PLUGINS_INST_DIR)</install-to>
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>
    
--- a/build/bakefiles/common_samples_intree.bkl
+++ b/build/bakefiles/common_samples_intree.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

@@ -29,10 +30,6 @@
            <res-include>$(RCDEFDIR)</res-include>
            <res-include>$(TOP_SRCDIR)include</res-include>
        </if>
-        <if cond="FORMAT=='borland'">
-            <!-- path to windows.h for this compiler -->
-            <res-include>$(DOLLAR)(BCCDIR)\include\windows\sdk</res-include>
-        </if>

        <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
        <if cond="FORMAT=='autoconf'">
--- a/build/bakefiles/common_samples_outoftree.bkl
+++ b/build/bakefiles/common_samples_outoftree.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>
    
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -1,14 +1,11 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

    <set var="IS_MSVC_PRJ">
        $(FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'])
    </set>
-    <set var="IS_MSVC">
-        $(IS_MSVC_PRJ=='1' or FORMAT=='msvc')
-    </set>
-

    <set var="BUILDING_LIB" overwrite="0">0</set>

@@ -44,53 +41,14 @@
        </description>
    </option>

-    <if cond="FORMAT!='autoconf'">
-        <option name="TOOLKIT">
-            <values>MSW,GTK</values>
-            <values-description>,GTK+</values-description>
-            <default-value>MSW</default-value>
-            <description>
-                Used toolkit
-            </description>
-        </option>
-
-        <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
-            <option name="TOOLKIT_VERSION">
-                <values>,2</values>
-                <values-description>,2</values-description>
-                <default-value></default-value>
-                <description>
-                    GTK+ toolkit version
-                </description>
-            </option>
-        </if>
-
-        <!-- We must make TOOLKIT a constant under Windows -->
-        <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
-            <set var="TOOLKIT">MSW</set>
-        </if>
-    </if>
-
-    <!--
-        Don't include wxUniversal configurations in project files, they
-        confuse people who don't know what "Universal" means and double the
-        number of configurations. If you do need to build wxUniversal, either
-        use the make files or comment out the 3 lines below and rerun
-        bakefile_gen to regenerate the projects with them.
-     -->
-    <if cond="IS_MSVC_PRJ=='1'">
-        <set var="WXUNIV">0</set>
-    </if>
-    <if cond="IS_MSVC_PRJ=='0'">
-        <option name="WXUNIV">
-            <values>0,1</values>
-            <values-description>,Universal</values-description>
-            <default-value>0</default-value>
-            <description>
-                Build wxUniversal instead of native port?
-            </description>
-        </option>
-    </if>
+    <option name="WXUNIV">
+        <values>0,1</values>
+        <values-description>,Universal</values-description>
+        <default-value>0</default-value>
+        <description>
+            Build wxUniversal instead of native port?
+        </description>
+    </option>

    <!-- don't include ANSI configuration in project files, it's going to be
         eventually removed anyway and it only doubles the number of build
@@ -141,8 +99,7 @@ your environment is set up appropriately with the correct compiler in the
 PATH. Rather it affects some options passed to some of the common build
 utilities such as the resource compiler and the linker.

-Accepted values: IA64, X64
-(AMD64 accepted as synonym for X64 but should not be used any more).
+Accepted values: AMD64, IA64.
            </description>
        </option>
    </if>
@@ -150,15 +107,9 @@ Accepted values: IA64, X64
        <set var="TARGET_CPU"/>
    </if>

-    <!--
-        For MSVC enable debug information in all builds: it is needed to be
-        able to debug the crash dumps produced by wxDebugReport and as it
-        generates it in separate PDB files it doesn't cost us much to enable it
-        (except for disk space...).
-     -->
    <set var="DEBUG_INFO_DEFAULT">
-        <if cond="IS_MSVC=='1'">1</if>
-        <if cond="IS_MSVC=='0'">default</if>
+        <if cond="IS_MSVC_PRJ=='1'">1</if>
+        <if cond="IS_MSVC_PRJ=='0'">default</if>
    </set>

    <option name="DEBUG_INFO">
@@ -173,11 +124,10 @@ and not included if BUILD=release.

    <option name="DEBUG_FLAG">
        <values>0,1,default</values>
-        <default-value>1</default-value>
+        <default-value>default</default-value>
        <description>
-Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all
-but expensive assert checks are enabled, use 0 to completely remove debugging
-code.
+Should __WXDEBUG__ be defined? The default value "default" means that it will
+be defined if BUILD=debug and not defined if BUILD=release.
        </description>
    </option>

@@ -186,8 +136,8 @@ code.
            <values>0,1,default</values>
            <default-value>default</default-value>
            <description>
-Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL?
-Default is to use debug CRT if and only if BUILD==debug.
+Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
+Acts according to BUILD by default.
            </description>
        </option>
    </if>
@@ -239,14 +189,6 @@ Default is to use debug CRT if and only if BUILD==debug.
        </description>
    </option>

-    <option name="USE_WEBVIEW">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Build wxWebView library (USE_GUI must be 1)?
-        </description>
-    </option>
-
    <option name="USE_MEDIA">
        <values>0,1</values>
        <default-value>1</default-value>
@@ -271,14 +213,6 @@ Default is to use debug CRT if and only if BUILD==debug.
        </description>
    </option>

-    <option name="USE_RIBBON">
-        <values>0,1</values>
-        <default-value>1</default-value>
-        <description>
-            Build wxRibbon library (USE_GUI must be 1)?
-        </description>
-    </option>
-
    <option name="USE_PROPGRID">
        <values>0,1</values>
        <default-value>1</default-value>
@@ -305,7 +239,7 @@ Default is to use debug CRT if and only if BUILD==debug.

    <option name="USE_OPENGL">
        <values>0,1</values>
-        <default-value>1</default-value>
+        <default-value>0</default-value>
        <description>
            Build OpenGL canvas library (USE_GUI must be 1)?
        </description>
@@ -348,13 +282,15 @@ Default is to use debug CRT if and only if BUILD==debug.
        </description>
    </option>

-    <option name="USE_CAIRO">
-        <values>0,1</values>
-        <default-value>0</default-value>
-        <description>
-            Enable wxCairoContext for platforms other than Linux/GTK.
-        </description>
-    </option>
+    <if cond="FORMAT!='autoconf'">
+        <option name="USE_GDIPLUS">
+            <values>0,1</values>
+            <default-value>0</default-value>
+            <description>
+                Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
+            </description>
+	</option>
+    </if>

    <option name="OFFICIAL_BUILD">
        <values>0,1</values>
@@ -423,7 +359,7 @@ to run the tests, include CppUnit library here.
        <option name="EXTRALIBS_GUI"/>
        <option name="EXTRALIBS_OPENGL"/>
        <option name="EXTRALIBS_SDL"/>
-        <option name="EXTRALIBS_WEBVIEW"/>
+        <option name="EXTRALIBS_GNOMEPRINT"/>
        <option name="CXXWARNINGS"/>
        <option name="HOST_SUFFIX"/>
        <option name="DYLIB_RPATH_INSTALL"/>
@@ -435,7 +371,7 @@ 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 overridden on bakefile cmd line -->
+        <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->

        <option name="WITH_PLUGIN_SDL">
            <values>0,1</values>
@@ -460,40 +396,20 @@ it if SHARED=1 unless you know what you are doing.
            </description>
        </option>

-        <set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->
-
-        <set var="WIN32_TOOLKIT">
-            <if cond="TOOLKIT=='MSW'">MSW</if>
-            <if cond="TOOLKIT=='GTK'">GTK</if>
-        </set>
-        <set var="WIN32_TOOLKIT_LOWERCASE">
-            <if cond="TOOLKIT=='MSW'">msw</if>
-            <if cond="TOOLKIT=='GTK'">gtk</if>
-        </set>
+        <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->

        <set var="TOOLKIT" overwrite="0">
            <if cond="FORMAT=='msevc4prj'">WINCE</if>
            <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003'">WINCE</if>
            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='pocketpc2003'">WINCE</if>
-            <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if>
-            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT)</if>
-            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT)</if>
+            <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">MSW</if>
+            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">MSW</if>
+            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">MSW</if>
+            <if cond="PLATFORM_MSDOS=='1'">MGL</if>
            <if cond="PLATFORM_OS2=='1'">PM</if>
        </set>
-        <set var="TOOLKIT_LOWERCASE">
-            <if cond="FORMAT=='msevc4prj'">wince</if>
-            <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003'">wince</if>
-            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='pocketpc2003'">wince</if>
-            <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if>
-            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32,win64'">$(WIN32_TOOLKIT_LOWERCASE)</if>
-            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT_LOWERCASE)</if>
-            <if cond="PLATFORM_OS2=='1'">pm</if>
-        </set>
-        <if cond="FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
-            <set var="TOOLKIT_VERSION">
-                <if cond="PLATFORM_WIN32=='1' and TOOLKIT=='GTK'">2</if>
-            </set>
-        </if>
+        <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
+        <set var="TOOLKIT_VERSION"/>
        <set var="HOST_SUFFIX"/>
        <set var="EXTRACFLAGS"/>
        <set var="EXTRALIBS"/>
@@ -507,7 +423,7 @@ it if SHARED=1 unless you know what you are doing.
            <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
        </set>
        <set var="EXTRALIBS_SDL"/>
-        <set var="EXTRALIBS_WEBVIEW"/>
+        <set var="EXTRALIBS_GNOMEPRINT"/>

        <set var="WITH_PLUGIN_SDL">0</set>

@@ -527,13 +443,6 @@ Set the version of your Mingw installation here.
    "2.95" ... for Mingw 1.1 or any of the older versions
            </description>
        </option>
-        <option name="WINDRES">
-            <default-value>windres --use-temp-file</default-value>
-            <description>
-Windows resource compiler to use, possibly including extra options.
-For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
-            </description>
-        </option>
        <set var="GCCFLAGS">
            <if cond="GCC_VERSION=='2.95'">-fvtable-thunks</if>
        </set>
@@ -549,12 +458,10 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
        <set var="RUNTIME_LIBS">dynamic</set>
        <set var="OFFICIAL_BUILD">0</set>
        <set var="USE_AUI">1</set>
-        <set var="USE_RIBBON">1</set>
        <set var="USE_PROPGRID">1</set>
        <set var="USE_RICHTEXT">1</set>
        <set var="USE_STC">1</set>
        <set var="USE_HTML">1</set>
-        <set var="USE_WEBVIEW">1</set>
        <set var="USE_MEDIA">1</set>
        <set var="USE_XRC">1</set>
        <set var="USE_OPENGL">1</set>
@@ -564,7 +471,7 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
        <set var="USE_EXCEPTIONS">1</set>
        <set var="USE_RTTI">1</set>
        <set var="USE_THREADS">1</set>
-        <set var="USE_CAIRO">0</set>
+        <if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
        <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
        <set var="DEBUG_FLAG">default</set>
        <set var="MSLU">0</set>
@@ -598,4 +505,11 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
        </if>
    </if>

+    <!-- Need for wxUniv within wxMGL: -->
+    <if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
+        <set var="WXUNIV">1</set>
+        <set var="USE_THREADS">0</set>
+        <set var="RUNTIME_LIBS">static</set>
+    </if>
+
 </makefile>
--- a/build/bakefiles/expat.bkl
+++ b/build/bakefiles/expat.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

@@ -27,9 +28,6 @@
        <dirname>$(LIBDIRNAME)</dirname>
        <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
        <include cond="FORMAT=='autoconf'">$(BUILDDIR)/src/expat</include>
-        <define cond="FORMAT=='autoconf'">
-            HAVE_EXPAT_CONFIG_H
-        </define>
        <define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
            COMPILED_FROM_DSP
        </define>
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
--- a/build/bakefiles/formats/FORMATS.bkmanifest
+++ b/build/bakefiles/formats/FORMATS.bkmanifest
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<bakefile-manifest xmlns="http://www.bakefile.org/schema/bakefile-formats">
+    
+    <format id="rpmspec">
+        <description>
+            wxBase headers list in wx{GTK,Motif,X11}.spec
+        </description>
+        <default-filename>xxx.spec</default-filename>
+    </format>
+    
+</bakefile-manifest>
--- a/build/bakefiles/formats/README
+++ b/build/bakefiles/formats/README
@@ -0,0 +1,4 @@
+
+This directory contains misc Bakefile backends that are wxWidgets-specific:
+
+rpmspec     - generates part of .spec files with list of wxBase headers
--- a/build/bakefiles/formats/rpmspec.bkl
+++ b/build/bakefiles/formats/rpmspec.bkl
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+
+    <include file="presets/fake.bkl"/>
+
+    <set var="EOL_STYLE">unix</set>
+    <set var="COMPILER">gcc</set>
+
+    <!-- fake.bkl defaults to win32 platform -->
+    <set var="PLATFORM_UNIX">1</set>
+    <set var="PLATFORM_WIN32">0</set>
+
+    <set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>
+
+    <output file="../../wxGTK.spec"
+            writer="rpmspec.empy" method="insertBetweenMarkers"/>
+    <output file="../../wxX11.spec"
+            writer="rpmspec.empy" method="insertBetweenMarkers"/>
+    <output file="../../wxMotif.spec"
+            writer="rpmspec.empy" method="insertBetweenMarkers"/>
+    
+</makefile>
--- a/build/bakefiles/formats/rpmspec.empy
+++ b/build/bakefiles/formats/rpmspec.empy
@@ -0,0 +1,5 @@
+# --- wxBase headers list begins here ---
+cat <<EOF >wxbase-headers.files
+@('\n'.join(ALL_BASE_HEADERS.split()))
+EOF
+# --- wxBase headers list ends here ---
--- a/build/bakefiles/mac_bundles.bkl
+++ b/build/bakefiles/mac_bundles.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

@@ -58,10 +59,10 @@
                    $(BUNDLE_PLIST) >$(BUNDLE)/Info.plist

                <!-- PkgInfo: -->
-                /bin/echo "APPL????" >$(BUNDLE)/PkgInfo
+                echo -n "APPL????" >$(BUNDLE)/PkgInfo

                <!-- move the binary: -->
-                ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
+                cp $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)

                <!-- copy the application icon: -->
                cp -f $(BUNDLE_ICON) $(BUNDLE)/Resources/wxmac.icns
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -15,7 +15,6 @@ COMMDIR  = $(WXDIR)/src/common
 HTMLDIR  = $(WXDIR)/src/html
 RICHTEXTDIR = $(WXDIR)/src/richtext
 AUIDIR =   $(WXDIR)/src/aui
-RIBBONDIR = $(WXDIR)/src/ribbon
 PROPGRIDDIR = $(WXDIR)/src/propgrid
 STCDIR =   $(WXDIR)/src/stc
 UNIXDIR  = $(WXDIR)/src/unix
@@ -29,6 +28,7 @@ GTKDIR   = $(WXDIR)/src/gtk
 GTK1DIR  = $(WXDIR)/src/gtk1
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
+MGLDIR   = $(WXDIR)/src/mgl
 MOTIFDIR = $(WXDIR)/src/motif
 MSDOSDIR = $(WXDIR)/src/msdos
 MSWDIR   = $(WXDIR)/src/msw
@@ -95,6 +95,7 @@ ALL_DIST: distrib_clean
 	$(CP_P) $(WXDIR)/setup.h_vms $(DISTDIR)
 	$(CP_P) $(WXDIR)/descrip.mms $(DISTDIR)
 	$(CP_P) $(WXDIR)/Makefile.in $(DISTDIR)
+	$(CP_P) $(WXDIR)/wxBase.spec $(DISTDIR)
 	$(CP_P) $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
 	$(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
 	$(CP_P) $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
@@ -136,7 +137,6 @@ ALL_DIST: distrib_clean
 	mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
-	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/wx_presets.py $(DISTDIR)/build/bakefiles/wxpresets/presets
 	mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample
@@ -162,12 +162,9 @@ ALL_GUI_DIST: ALL_DIST
 	fi
 	mkdir $(DISTDIR)/include/wx/meta
 	mkdir $(DISTDIR)/include/wx/generic
-	mkdir $(DISTDIR)/include/wx/generic/private
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
 	mkdir $(DISTDIR)/include/wx/aui
-	mkdir $(DISTDIR)/include/wx/ribbon
-	mkdir $(DISTDIR)/include/wx/persist
 	mkdir $(DISTDIR)/include/wx/propgrid
 	mkdir $(DISTDIR)/include/wx/stc
 	mkdir $(DISTDIR)/include/wx/protocol
@@ -179,19 +176,16 @@ ALL_GUI_DIST: ALL_DIST
 	$(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
 	$(CP_P) $(INCDIR)/wx/meta/*.h $(DISTDIR)/include/wx/meta
 	$(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
-	$(CP_P) $(INCDIR)/wx/generic/private/*.h $(DISTDIR)/include/wx/generic/private
 	$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
 	$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
-	$(CP_P) $(INCDIR)/wx/ribbon/*.h $(DISTDIR)/include/wx/ribbon
-	$(CP_P) $(INCDIR)/wx/persist/*.h $(DISTDIR)/include/wx/persist
 	$(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid
 	$(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
-	$(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
 	$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	$(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private
 	$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
 	$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
+	$(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol

 	mkdir $(DISTDIR)/art
 	mkdir $(DISTDIR)/art/gtk
@@ -226,9 +220,6 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/aui
 	$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui

-	mkdir $(DISTDIR)/src/ribbon
-	$(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon
-
 	mkdir $(DISTDIR)/src/propgrid
 	$(CP_P) $(PROPGRIDDIR)/*.cpp $(DISTDIR)/src/propgrid

@@ -293,14 +284,13 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/include/wx/html
 	mkdir $(DISTDIR)/include/wx/richtext
 	mkdir $(DISTDIR)/include/wx/aui
-	mkdir $(DISTDIR)/include/wx/ribbon
-	mkdir $(DISTDIR)/include/wx/persist
 	mkdir $(DISTDIR)/include/wx/propgrid
 	mkdir $(DISTDIR)/include/wx/stc
 	mkdir $(DISTDIR)/include/wx/osx
 	mkdir $(DISTDIR)/include/wx/osx/carbon
 	mkdir $(DISTDIR)/include/wx/osx/core
 	mkdir $(DISTDIR)/include/wx/os2
+	mkdir $(DISTDIR)/include/wx/palmos
 	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/osx
 	mkdir $(DISTDIR)/src/osx/core
@@ -308,6 +298,7 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/src/msdos
 	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/os2
+	mkdir $(DISTDIR)/src/palmos
 	$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
@@ -334,6 +325,7 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mv $(DISTDIR) $(BASEDISTDIR)

 GTK_DIST: UNIV_DIST
+	$(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR)
 	$(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
 	$(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk
 	$(CP_P) $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
@@ -348,8 +340,6 @@ GTK_DIST: UNIV_DIST
 	$(CP_P) $(GTK1DIR)/*.c $(DISTDIR)/src/gtk1
 	$(CP_P) $(GTK1DIR)/*.xbm $(DISTDIR)/src/gtk1
 	$(CP_P) $(GTK1DIR)/*.mms $(DISTDIR)/src/gtk1
-	mkdir $(DISTDIR)/include/wx/x11/private
-	$(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private

 	mkdir $(DISTDIR)/include/wx/gtk/gnome
 	mkdir $(DISTDIR)/src/gtk/gnome
@@ -369,9 +359,8 @@ GTK_DIST: UNIV_DIST
 	$(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core

 X11_DIST: UNIV_DIST
+	$(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
 	$(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
-	mkdir $(DISTDIR)/include/wx/x11/private
-	$(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
 	mkdir $(DISTDIR)/include/wx/gtk/private
 	$(CP_P) $(INCDIR)/wx/gtk/private/string.h $(DISTDIR)/include/wx/gtk/private
 	$(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
@@ -385,6 +374,7 @@ X11_DIST: UNIV_DIST
 	$(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core

 MOTIF_DIST: ALL_GUI_DIST
+	$(CP_P) $(WXDIR)/wxMotif.spec $(DISTDIR)
 	$(CP_P) $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
 	$(CP_P) $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
 	$(CP_P) $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
@@ -400,8 +390,6 @@ MOTIF_DIST: ALL_GUI_DIST
 	$(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
 		$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
 		$(DISTDIR)/include/wx/x11
-	mkdir $(DISTDIR)/include/wx/x11/private
-	$(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private

 OSX_CARBON_DIST: ALL_GUI_DIST
 	$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
@@ -498,6 +486,16 @@ UNIV_DIST: ALL_GUI_DIST
 	$(CP_P) $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
 	$(CP_P) $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes

+MGL_DIST: UNIV_DIST
+	$(CP_P) $(WXDIR)/wxMGL.spec $(DISTDIR)
+	$(CP_P) $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
+	mkdir $(DISTDIR)/include/wx/msdos
+	$(CP_P) $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
+	$(CP_P) $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
+	$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
+	mkdir $(DISTDIR)/src/msdos
+	$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
+
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	$(CP_P) $(DEMODIR)/Makefile.in $(DISTDIR)/demos
@@ -563,12 +561,9 @@ SAMPLES_DIST: ALL_GUI_DIST
 	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples

-	# copy files common to all samples in a general way (samples without
-	# Makefile.in in them are Windows-specific and shouldn't be included in
-	# Unix distribution)
+	# copy files common to all samples in a general way
 	for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
 		    -mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
-	    if [ ! -f $$s/Makefile.in ]; then continue; fi; \
 	    t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
 	    mkdir -p $$t; \
 	    $(CP_P) $$s/Makefile.in \
@@ -589,6 +584,8 @@ SAMPLES_DIST: ALL_GUI_DIST
 	$(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/animate
 	$(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate

+	$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
+
 	$(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs

 	$(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd
@@ -644,6 +641,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	$(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc
 	$(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc
 	$(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc
+	$(CP_P) $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc

 UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
@@ -707,6 +705,7 @@ INTL_DIST:
 	mkdir $(DISTDIR)/locale
 	$(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale
 	$(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale
+	-$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale
 	subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
 	for dir in "$$subdirs"; do                                   \
 	    mkdir $(DISTDIR)/locale/$$dir;                           \
@@ -736,12 +735,10 @@ MANUAL_DIST:
 	mkdir $(DISTDIR)/interface
 	mkdir $(DISTDIR)/interface/wx
 	mkdir $(DISTDIR)/interface/wx/aui
-	mkdir $(DISTDIR)/interface/wx/ribbon
 	mkdir $(DISTDIR)/interface/wx/generic
 	mkdir $(DISTDIR)/interface/wx/html
 	mkdir $(DISTDIR)/interface/wx/msw
 	mkdir $(DISTDIR)/interface/wx/msw/ole
-	mkdir $(DISTDIR)/interface/wx/persist
 	mkdir $(DISTDIR)/interface/wx/protocol
 	mkdir $(DISTDIR)/interface/wx/propgrid
 	mkdir $(DISTDIR)/interface/wx/richtext
@@ -750,12 +747,10 @@ MANUAL_DIST:
 	mkdir $(DISTDIR)/interface/wx/xrc
 	$(CP_P) $(IFACEDIR)/wx/*.h $(DISTDIR)/interface/wx
 	$(CP_P) $(IFACEDIR)/wx/aui/*.h $(DISTDIR)/interface/wx/aui
-	$(CP_P) $(IFACEDIR)/wx/ribbon/*.h $(DISTDIR)/interface/wx/ribbon
 	$(CP_P) $(IFACEDIR)/wx/generic/*.h $(DISTDIR)/interface/wx/generic
 	$(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html
 	$(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw
 	$(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole
-	$(CP_P) $(IFACEDIR)/wx/persist/*.h $(DISTDIR)/interface/wx/persist
 	$(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol
 	$(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid
 	$(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext
@@ -871,3 +866,56 @@ win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DI
 	@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.cur
 	@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_P) $(WXDIR)/debian/* $(DISTDIR)/debian
+	$(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs
+	$(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
+	$(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs
+	rm -f $(DISTDIR)/*.spec
+
+	@# now prune away a lot of the crap included by using cp -R
+	@# in other dist targets.  Ugly and hardly portable but it
+	@# will run on any Debian box and that's enough for now.
+
+	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
+			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
+			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
+			   -o -name "*.pro"  \
+			   -o -name "*.vpj"  \
+			   -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)
+
+
+debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
+
+debian-msw-dirs:
+	mkdir $(DISTDIR)/include/wx/msw
+	mkdir $(DISTDIR)/src/msw
+
+
+RPMTOP=_dist_dir/_rpm_top
+
+rpm: bzip-dist
+	@echo "*** Building RPMs ***"
+	-mkdir $(RPMTOP)
+	-mkdir $(RPMTOP)/SOURCES
+	-mkdir $(RPMTOP)/SPECS
+	-mkdir $(RPMTOP)/BUILD
+	-mkdir $(RPMTOP)/RPMS
+	-mkdir $(RPMTOP)/SRPMS
+	cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
+	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
+	mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` .
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -1,40 +1,50 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
 <makefile>

    <set var="MONOLIB_GUI_SRC">
        <if cond="USE_GUI=='1'">
-            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC)
-            $(QA_SRC) $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC)
-            $(RICHTEXT_SRC) $(STC_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(QA_SRC)
+            $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RICHTEXT_SRC) $(STC_SRC)
        </if>
    </set>
    <set var="MONOLIB_SRC">
        $(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
    </set>

-    <!-- settings common to mono{dll,lib} below -->
-    <template id="wx_monolib_or_dll" template="wxscintilla_cppflags">
-        <define>wxUSE_BASE=1</define>
-        <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
-        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
-    </template>
-
-    <dll id="monodll" template="wx_dll,wx_monolib_or_dll"
+    <dll id="monodll" template="wx_dll"
         cond="SHARED=='1' and MONOLITHIC=='1'">
+        <define>wxUSE_BASE=1</define>
        <define>WXMAKINGDLL</define>
+        <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
        <ldlibs>$(EXTRALIBS_XML)</ldlibs>
        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
        <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
-        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
+        <!-- STC stuff, should this be conditionalized? -->
+        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
+        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
+        <define>__WX__</define>
+        <define>SCI_LEXER</define>
+        <define>LINK_LEXERS</define>
        <library>$(wxscintilla_library_link)</library>
    </dll>

-    <lib id="monolib" template="wx_lib,wx_monolib_or_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>
+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
        <if cond="FORMAT=='watcom'">
            <set var="LIB_PAGESIZE" overwrite="1">8192</set>
        </if>
+        <!-- STC stuff, should this be conditionalized? -->
+        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
+        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
+        <define>__WX__</define>
+        <define>SCI_LEXER</define>
+        <define>LINK_LEXERS</define>
    </lib>


--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

@@ -172,31 +173,6 @@

    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>

-    <!-- ================================================================ -->
-    <!--                               wxWEBVIEW                          -->
-    <!-- ================================================================ -->
-
-    <dll id="webviewdll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_WEBVIEW</define>
-        <sources>$(WEBVIEW_SRC)</sources>
-        <library>coredll</library>
-        <library>basedll</library>
-        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
-        <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
-    </dll>
-
-    <lib id="webviewlib" template="wx_lib"
-         cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
-        <sources>$(WEBVIEW_SRC)</sources>
-        <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
-    </lib>
-
-    <wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
-
    <!-- ================================================================ -->
    <!--                             OpenGL                               -->
    <!-- ================================================================ -->
@@ -306,31 +282,6 @@
    <wxshortcut id="wxaui" cond="MONOLITHIC=='0' and USE_AUI=='1'"/>

    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
-    
-    <!-- ================================================================ -->
-    <!--                            RIBBON                                -->
-    <!-- ================================================================ -->
-
-    <dll id="ribbondll" template="wx_dll"
-         cond="SHARED=='1' and USE_RIBBON=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_RIBBON</define>
-        <sources>$(RIBBON_SRC)</sources>
-        <library>advdll</library>
-        <library>coredll</library>
-        <library>basedll</library>
-        <msvc-headers>$(RIBBON_HDR)</msvc-headers>
-    </dll>
-
-    <lib id="ribbonlib" template="wx_lib"
-         cond="SHARED=='0' and USE_RIBBON=='1' and MONOLITHIC=='0'">
-        <sources>$(RIBBON_SRC)</sources>
-        <msvc-headers>$(RIBBON_HDR)</msvc-headers>
-    </lib>
-    
-    <wxshortcut id="wxribbon" cond="MONOLITHIC=='0' and USE_RIBBON=='1'"/>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">ribbon=ribbonlib+ribbondll</set>

    <!-- ================================================================ -->
    <!--                            PROPGRID                              -->
@@ -388,7 +339,13 @@
    <!--                            STC                                   -->
    <!-- ================================================================ -->

-    <template id="stc_base" template="wxscintilla_cppflags">
+    <template id="stc_base">
+        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
+        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
+        <define>__WX__</define>
+        <define>SCI_LEXER</define>
+        <define>LINK_LEXERS</define>
+        <cppflags-borland>-w-8027</cppflags-borland>
        <library>wxscintilla</library>
    </template>

--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -1,18 +1,19 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>
-
+    
    <!-- ================================================================= -->
    <!--                         OpenGL canvas library                     -->
    <!-- ================================================================= -->
-
+    
    <set var="WXLIBGLDEP_CORE">
        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
    </set>
    <set var="WXLIBGLDEP_BASE">
        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
    </set>
-
+    
    <dll id="gldll" template="wx_dll"
         cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
        <define>WXUSINGDLL</define>
@@ -20,7 +21,7 @@
        <sources>$(OPENGL_SRC)</sources>
        <msvc-headers>$(OPENGL_HDR)</msvc-headers>

-        <!-- link against base and core libs in multilib build: -->
+        <!-- link against base and core libs in multilib build: --> 
        <sys-lib>$(WXLIBGLDEP_CORE)</sys-lib>
        <sys-lib>$(WXLIBGLDEP_BASE)</sys-lib>
        <depends>basedll</depends>
@@ -31,7 +32,7 @@

        <ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
    </dll>
-
+    
    <lib id="gllib" template="wx_lib"
         cond="SHARED=='0' and USE_GUI=='1' and USE_OPENGL=='1'">
        <sources>$(OPENGL_SRC)</sources>
--- a/build/bakefiles/plugins.bkl
+++ b/build/bakefiles/plugins.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>
     
--- a/build/bakefiles/plugins_deps.bkl
+++ b/build/bakefiles/plugins_deps.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -30,6 +30,7 @@
        <sources>
            src/png/png.c
            src/png/pngerror.c
+            src/png/pnggccrd.c
            src/png/pngget.c
            src/png/pngmem.c
            src/png/pngpread.c
@@ -39,6 +40,7 @@
            src/png/pngrutil.c
            src/png/pngset.c
            src/png/pngtrans.c
+            src/png/pngvcrd.c
            src/png/pngwio.c
            src/png/pngwrite.c
            src/png/pngwtran.c
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -29,156 +29,111 @@
        </fragment>
    </if>

-    <template id="wxscintilla_cppflags">
+    <lib id="wxscintilla" template="3rdparty_lib"
+         cond="USE_STC=='1' and BUILDING_LIB=='1'">
        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
-        <include>$(TOP_SRCDIR)src/stc/scintilla/lexlib</include>
        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
        <define>__WX__</define>
        <define>SCI_LEXER</define>
        <define>LINK_LEXERS</define>
-        <cppflags-borland>-w-8027</cppflags-borland>
-    </template>
-
-    <set var="wxscintilla_usingdll">
-        <if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
-    </set>
-
-    <lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags,msvc_setup_h"
-         cond="USE_STC=='1' and BUILDING_LIB=='1'">
-        <if cond="FORMAT!='autoconf'">
-            <include>$(SETUPHDIR)</include>
-            <include>$(TOP_SRCDIR)include</include>
-        </if>
-        <define>$(wxscintilla_usingdll)</define>
-        <define>__WX$(TOOLKIT)__</define>
-        <define>$(WXUNIV_DEFINE)</define>
-        <define>$(DEBUG_DEFINE)</define>
-        <define>$(UNICODE_DEFINE)</define>
        <dirname>$(LIBDIRNAME)</dirname>
        <sources>
-            src/stc/scintilla/lexers/LexA68k.cxx
-            src/stc/scintilla/lexers/LexAbaqus.cxx
-            src/stc/scintilla/lexers/LexAda.cxx
-            src/stc/scintilla/lexers/LexAPDL.cxx
-            src/stc/scintilla/lexers/LexAsm.cxx
-            src/stc/scintilla/lexers/LexAsn1.cxx
-            src/stc/scintilla/lexers/LexASY.cxx
-            src/stc/scintilla/lexers/LexAU3.cxx
-            src/stc/scintilla/lexers/LexAVE.cxx
-            src/stc/scintilla/lexers/LexAVS.cxx
-            src/stc/scintilla/lexers/LexBaan.cxx
-            src/stc/scintilla/lexers/LexBash.cxx
-            src/stc/scintilla/lexers/LexBasic.cxx
-            src/stc/scintilla/lexers/LexBullant.cxx
-            src/stc/scintilla/lexers/LexCaml.cxx
-            src/stc/scintilla/lexers/LexCLW.cxx
-            src/stc/scintilla/lexers/LexCmake.cxx
-            src/stc/scintilla/lexers/LexCOBOL.cxx
-            src/stc/scintilla/lexers/LexCoffeeScript.cxx
-            src/stc/scintilla/lexers/LexConf.cxx
-            src/stc/scintilla/lexers/LexCPP.cxx
-            src/stc/scintilla/lexers/LexCrontab.cxx
-            src/stc/scintilla/lexers/LexCsound.cxx
-            src/stc/scintilla/lexers/LexCSS.cxx
-            src/stc/scintilla/lexers/LexD.cxx
-            src/stc/scintilla/lexers/LexECL.cxx
-            src/stc/scintilla/lexers/LexEiffel.cxx
-            src/stc/scintilla/lexers/LexErlang.cxx
-            src/stc/scintilla/lexers/LexEScript.cxx
-            src/stc/scintilla/lexers/LexFlagship.cxx
-            src/stc/scintilla/lexers/LexForth.cxx
-            src/stc/scintilla/lexers/LexFortran.cxx
-            src/stc/scintilla/lexers/LexGAP.cxx
-            src/stc/scintilla/lexers/LexGui4Cli.cxx
-            src/stc/scintilla/lexers/LexHaskell.cxx
-            src/stc/scintilla/lexers/LexHTML.cxx
-            src/stc/scintilla/lexers/LexInno.cxx
-            src/stc/scintilla/lexers/LexKix.cxx
-            src/stc/scintilla/lexers/LexLisp.cxx
-            src/stc/scintilla/lexers/LexLout.cxx
-            src/stc/scintilla/lexers/LexLua.cxx
-            src/stc/scintilla/lexers/LexMagik.cxx
-            src/stc/scintilla/lexers/LexMarkdown.cxx
-            src/stc/scintilla/lexers/LexMatlab.cxx
-            src/stc/scintilla/lexers/LexMetapost.cxx
-            src/stc/scintilla/lexers/LexMMIXAL.cxx
-            src/stc/scintilla/lexers/LexModula.cxx
-            src/stc/scintilla/lexers/LexMPT.cxx
-            src/stc/scintilla/lexers/LexMSSQL.cxx
-            src/stc/scintilla/lexers/LexMySQL.cxx
-            src/stc/scintilla/lexers/LexNimrod.cxx
-            src/stc/scintilla/lexers/LexNsis.cxx
-            src/stc/scintilla/lexers/LexOpal.cxx
-            src/stc/scintilla/lexers/LexOScript.cxx
-            src/stc/scintilla/lexers/LexOthers.cxx
-            src/stc/scintilla/lexers/LexPascal.cxx
-            src/stc/scintilla/lexers/LexPB.cxx
-            src/stc/scintilla/lexers/LexPerl.cxx
-            src/stc/scintilla/lexers/LexPLM.cxx
-            src/stc/scintilla/lexers/LexPOV.cxx
-            src/stc/scintilla/lexers/LexPowerPro.cxx
-            src/stc/scintilla/lexers/LexPowerShell.cxx
-            src/stc/scintilla/lexers/LexProgress.cxx
-            src/stc/scintilla/lexers/LexPS.cxx
-            src/stc/scintilla/lexers/LexPython.cxx
-            src/stc/scintilla/lexers/LexR.cxx
-            src/stc/scintilla/lexers/LexRebol.cxx
-            src/stc/scintilla/lexers/LexRuby.cxx
-            src/stc/scintilla/lexers/LexScriptol.cxx
-            src/stc/scintilla/lexers/LexSmalltalk.cxx
-            src/stc/scintilla/lexers/LexSML.cxx
-            src/stc/scintilla/lexers/LexSorcus.cxx
-            src/stc/scintilla/lexers/LexSpecman.cxx
-            src/stc/scintilla/lexers/LexSpice.cxx
-            src/stc/scintilla/lexers/LexSQL.cxx
-            src/stc/scintilla/lexers/LexTACL.cxx
-            src/stc/scintilla/lexers/LexTADS3.cxx
-            src/stc/scintilla/lexers/LexTAL.cxx
-            src/stc/scintilla/lexers/LexTCL.cxx
-            src/stc/scintilla/lexers/LexTCMD.cxx
-            src/stc/scintilla/lexers/LexTeX.cxx
-            src/stc/scintilla/lexers/LexTxt2tags.cxx
-            src/stc/scintilla/lexers/LexVB.cxx
-            src/stc/scintilla/lexers/LexVerilog.cxx
-            src/stc/scintilla/lexers/LexVHDL.cxx
-            src/stc/scintilla/lexers/LexVisualProlog.cxx
-            src/stc/scintilla/lexers/LexYAML.cxx
-            src/stc/scintilla/lexlib/Accessor.cxx
-            src/stc/scintilla/lexlib/CharacterSet.cxx
-            src/stc/scintilla/lexlib/LexerBase.cxx
-            src/stc/scintilla/lexlib/LexerModule.cxx
-            src/stc/scintilla/lexlib/LexerNoExceptions.cxx
-            src/stc/scintilla/lexlib/LexerSimple.cxx
-            src/stc/scintilla/lexlib/PropSetSimple.cxx
-            src/stc/scintilla/lexlib/StyleContext.cxx
-            src/stc/scintilla/lexlib/WordList.cxx
            src/stc/scintilla/src/AutoComplete.cxx
            src/stc/scintilla/src/CallTip.cxx
-            src/stc/scintilla/src/Catalogue.cxx
            src/stc/scintilla/src/CellBuffer.cxx
            src/stc/scintilla/src/CharClassify.cxx
            src/stc/scintilla/src/ContractionState.cxx
            src/stc/scintilla/src/Decoration.cxx
            src/stc/scintilla/src/Document.cxx
+            src/stc/scintilla/src/DocumentAccessor.cxx
            src/stc/scintilla/src/Editor.cxx
            src/stc/scintilla/src/ExternalLexer.cxx
            src/stc/scintilla/src/Indicator.cxx
            src/stc/scintilla/src/KeyMap.cxx
+            src/stc/scintilla/src/KeyWords.cxx
+            src/stc/scintilla/src/LexAPDL.cxx
+            src/stc/scintilla/src/LexAU3.cxx
+            src/stc/scintilla/src/LexASY.cxx
+            src/stc/scintilla/src/LexAVE.cxx
+            src/stc/scintilla/src/LexAbaqus.cxx
+            src/stc/scintilla/src/LexAda.cxx
+            src/stc/scintilla/src/LexAsm.cxx
+            src/stc/scintilla/src/LexAsn1.cxx
+            src/stc/scintilla/src/LexBaan.cxx
+            src/stc/scintilla/src/LexBash.cxx
+            src/stc/scintilla/src/LexBasic.cxx
+            src/stc/scintilla/src/LexBullant.cxx
+            src/stc/scintilla/src/LexCLW.cxx
+            src/stc/scintilla/src/LexCmake.cxx
+            src/stc/scintilla/src/LexCPP.cxx
+            src/stc/scintilla/src/LexCSS.cxx
+            src/stc/scintilla/src/LexCaml.cxx
+            src/stc/scintilla/src/LexCsound.cxx
+            src/stc/scintilla/src/LexConf.cxx
+            src/stc/scintilla/src/LexCrontab.cxx
+            src/stc/scintilla/src/LexD.cxx
+            src/stc/scintilla/src/LexEScript.cxx
+            src/stc/scintilla/src/LexEiffel.cxx
+            src/stc/scintilla/src/LexErlang.cxx
+            src/stc/scintilla/src/LexFlagship.cxx
+            src/stc/scintilla/src/LexForth.cxx
+            src/stc/scintilla/src/LexFortran.cxx
+            src/stc/scintilla/src/LexGAP.cxx
+            src/stc/scintilla/src/LexGui4Cli.cxx
+            src/stc/scintilla/src/LexHTML.cxx
+            src/stc/scintilla/src/LexHaskell.cxx
+            src/stc/scintilla/src/LexInno.cxx
+            src/stc/scintilla/src/LexKix.cxx
+            src/stc/scintilla/src/LexLisp.cxx
+            src/stc/scintilla/src/LexLout.cxx
+            src/stc/scintilla/src/LexLua.cxx
+            src/stc/scintilla/src/LexMMIXAL.cxx
+            src/stc/scintilla/src/LexMPT.cxx
+            src/stc/scintilla/src/LexMSSQL.cxx
+            src/stc/scintilla/src/LexMatlab.cxx
+            src/stc/scintilla/src/LexMetapost.cxx
+            src/stc/scintilla/src/LexNsis.cxx
+            src/stc/scintilla/src/LexOpal.cxx
+            src/stc/scintilla/src/LexOthers.cxx
+            src/stc/scintilla/src/LexPB.cxx
+            src/stc/scintilla/src/LexPLM.cxx
+            src/stc/scintilla/src/LexPOV.cxx
+            src/stc/scintilla/src/LexProgress.cxx
+            src/stc/scintilla/src/LexPS.cxx
+            src/stc/scintilla/src/LexPascal.cxx
+            src/stc/scintilla/src/LexPerl.cxx
+            src/stc/scintilla/src/LexPython.cxx
+            src/stc/scintilla/src/LexR.cxx
+            src/stc/scintilla/src/LexRebol.cxx
+            src/stc/scintilla/src/LexRuby.cxx
+            src/stc/scintilla/src/LexSQL.cxx
+            src/stc/scintilla/src/LexSmalltalk.cxx
+            src/stc/scintilla/src/LexTADS3.cxx
+            src/stc/scintilla/src/LexScriptol.cxx
+            src/stc/scintilla/src/LexSpecman.cxx
+            src/stc/scintilla/src/LexSpice.cxx
+            src/stc/scintilla/src/LexTCL.cxx
+            src/stc/scintilla/src/LexTeX.cxx
+            src/stc/scintilla/src/LexVB.cxx
+            src/stc/scintilla/src/LexVHDL.cxx
+            src/stc/scintilla/src/LexVerilog.cxx
+            src/stc/scintilla/src/LexYAML.cxx
            src/stc/scintilla/src/LineMarker.cxx
-            src/stc/scintilla/src/PerLine.cxx
            src/stc/scintilla/src/PositionCache.cxx
+            src/stc/scintilla/src/PropSet.cxx
            src/stc/scintilla/src/RESearch.cxx
            src/stc/scintilla/src/RunStyles.cxx
            src/stc/scintilla/src/ScintillaBase.cxx
-            src/stc/scintilla/src/Selection.cxx
            src/stc/scintilla/src/Style.cxx
+            src/stc/scintilla/src/StyleContext.cxx
            src/stc/scintilla/src/UniConversion.cxx
            src/stc/scintilla/src/ViewStyle.cxx
+            src/stc/scintilla/src/WindowAccessor.cxx
            src/stc/scintilla/src/XPM.cxx
        </sources>
    </lib>

-    <!-- used to conditionally link against wxscintilla only if it's enabled -->
+    <!-- use this to conditonally link against wxscintilla with <library>: -->
    <set var="wxscintilla_library_link">
        <if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>
    </set>
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

@@ -38,6 +39,8 @@
        <if cond="PLATFORM_MACOSX=='1'">src/tiff/libtiff/tif_unix.c</if>
        <if cond="PLATFORM_OS2=='1'">src/tiff/libtiff/tif_unix.c</if>
        <if cond="PLATFORM_WIN32=='1'">src/tiff/libtiff/tif_win32.c</if>
+        <if cond="PLATFORM_MACOS=='1'">src/tiff/libtiff/tif_apple.c</if>
+        <if cond="PLATFORM_MSDOS=='1'">src/tiff/libtiff/tif_msdos.c</if>
    </set>

    <lib id="wxtiff" template="3rdparty_lib"
@@ -52,16 +55,6 @@
        <cflags-watcom>-wcd=124</cflags-watcom>
        <define cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">OS2_32</define>
        <define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
-        <if cond="IS_MSVC">
-            <!--
-                define this to get rid of a warning about using POSIX lfind():
-                confusingly enough, we do define lfind as _lfind for MSVC but
-                doing this results in a just more confusing warning, see:
-                http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101278
-             -->
-            <define>_CRT_NONSTDC_NO_WARNINGS</define>
-        </if>
-
        <sources>
            $(TIFF_PLATFORM_SRC)
            src/tiff/libtiff/tif_aux.c
@@ -80,11 +73,8 @@
            src/tiff/libtiff/tif_fax3sm.c
            src/tiff/libtiff/tif_flush.c
            src/tiff/libtiff/tif_getimage.c
-            src/tiff/libtiff/tif_jbig.c
            src/tiff/libtiff/tif_jpeg.c
-            src/tiff/libtiff/tif_jpeg_12.c
            src/tiff/libtiff/tif_luv.c
-            src/tiff/libtiff/tif_lzma.c
            src/tiff/libtiff/tif_lzw.c
            src/tiff/libtiff/tif_next.c
            src/tiff/libtiff/tif_ojpeg.c
--- a/build/bakefiles/version.bkl
+++ b/build/bakefiles/version.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

@@ -22,9 +23,9 @@
       3. Else, i.e. if there were no changes at all to API but only internal
          changes, change C:R:A to C:R+1:A
    -->
-    <set var="WX_CURRENT">3</set>
+    <set var="WX_CURRENT">0</set>
    <set var="WX_REVISION">0</set>
-    <set var="WX_AGE">3</set>
+    <set var="WX_AGE">0</set>


    <!-- ================================================================== -->
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->


 <!-- Master bakefile for wxWidgets -->
@@ -39,7 +40,7 @@
    <subproject id="samples">
        <installable>no</installable>
        <dir cond="FORMAT=='autoconf'">samples</dir>
-        <dir cond="FORMAT!='autoconf'">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir>
    </subproject>

    <if cond="FORMAT=='autoconf'">
@@ -86,7 +87,7 @@

        <data-files>
            <srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>
-            <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py</files>
+            <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl</files>
            <install-to>$(DATADIR)/bakefile/presets</install-to>
        </data-files>

@@ -96,7 +97,7 @@
                $(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) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
            </command>
        </action>

@@ -177,7 +178,7 @@


    <!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
-    <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0'">
+    <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
        <mkdir id="libdir">
            <dir>$(LIBDIRNAME)</dir>
        </mkdir>
@@ -193,8 +194,8 @@

        <set var="SETUP_H_SUBDIR">
            <if cond="WXUNIV=='1'">univ</if>
-            <if cond="WXUNIV=='0' and PLATFORM_OS2!='1'">$(TOOLKIT_LOWERCASE)</if>
-            <if cond="WXUNIV=='0' and PLATFORM_OS2=='1'">os2</if>
+            <if cond="WXUNIV=='0' and TOOLKIT!='PM'">$(TOOLKIT_LOWERCASE)</if>
+            <if cond="WXUNIV=='0' and TOOLKIT=='PM'">os2</if>
        </set>

        <copy-file-to-file-if-not-exist id="master_setup.h">
@@ -211,7 +212,7 @@


    <!-- create rcdefs.h on Windows: -->
-    <if cond="FORMAT in ['borland','mingw','msvc','watcom']">
+    <if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">

        <mkdir id="libdir_setup_wx_msw">
            <depends>libdir_setup_wx</depends>
@@ -253,7 +254,7 @@
@echo " wxWidgets comes with no guarantees and doesn't claim"
@echo " to be suitable for any purpose."
@echo " "
-@echo " Read the wxWindows Licence on licencing conditions."
+@echo " Read the wxWidgets Licence on licencing conditions."
@echo " "
@echo " ------------------------------------------------------"
@echo " "
--- a/build/bakefiles/wxpresets/bakefile_quickstart.txt
+++ b/build/bakefiles/wxpresets/bakefile_quickstart.txt
@@ -5,7 +5,7 @@ The 10-minute, do-it-yourself wx project baking guide (with free sample recipes!
 Status: DRAFT
 Author: Kevin Ollivier
 Date: 2/13/04
-Licence: wxWindows Licence
+License: wxWidgets License
 -----------------------------------------------------------------------

 Supporting many different platforms can be a difficult challenge. The
@@ -70,6 +70,7 @@ source tree. Here is the minimal.bkl Bakefile used in the sample:
 minimal.bkl
 -------------------------------------------------------------
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

--- a/build/bakefiles/wxpresets/libsample/libsample.bkl
+++ b/build/bakefiles/wxpresets/libsample/libsample.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

--- a/build/bakefiles/wxpresets/libsample/libsample.cpp
+++ b/build/bakefiles/wxpresets/libsample/libsample.cpp
@@ -4,6 +4,7 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     26/11/06
+// RCS-ID:      $Id$
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
--- a/build/bakefiles/wxpresets/presets/wx.bkl
+++ b/build/bakefiles/wxpresets/presets/wx.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <!--
    Presets for building wxWidgets applications.
@@ -9,7 +10,7 @@

    - WX_* : used to let the user of the generated makefile choose a wxWidgets
             build among those available; you can use them in your project to
-             e.g. build a target only if WX_SHARED is 0 or if WX_PORT is "msw".
+             e.g. build a target only if WX_DEBUG is 0 or if WX_PORT is "msw".


    VARIABLES:
@@ -23,8 +24,7 @@

    - wx, wx-lib: templates to be used respectively for <dll>/<exe> and <lib>
                  targets; they add all the wxWidgets-related settings (e.g. the
-                  include and library search paths, the necessary preprocessor
-                  symbols, etc).
+                  include and library search paths, the __WXDEBUG__ symbol, etc).

    - wxgui: to be used when building GUI-mode applications.

@@ -33,7 +33,7 @@
                 need it when compiling wxBase-only code).

    - wxlike: this template should be combined with "wx" or "wx-lib" and will
-              make your project build with the same Unicode & shared
+              make your project build with the same Unicode, debug & shared
              config as the wxWidgets build selected using the WX_* options.


@@ -88,10 +88,8 @@
 NOTE: as a reference here is a list of all wxWidgets libraries satisfying
       the dependency constraints mentioned in <wx-lib> description:

-        <wx-lib>webview</wx-lib>
        <wx-lib>richtext</wx-lib>
        <wx-lib>aui</wx-lib>
-        <wx-lib>ribbon</wx-lib>
        <wx-lib>propgrid</wx-lib>
        <wx-lib>stc</wx-lib>
        <wx-lib>qa</wx-lib>
@@ -112,7 +110,6 @@

    <requires version="0.2.2"/>

-    <using module="wx_presets"/>

    <!-- this variable identifies the version of the wx presets.
         this is changed only when major changes to wxpresets take place.
@@ -124,7 +121,7 @@
                         tag definitions.
    -->
    <set var="WX_LIB_LIST">
-        base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview
+        base core net xml xrc html adv media gl qa aui propgrid richtext stc
    </set>

    <!-- if you define this variable to 0 before including wx presets, the
@@ -179,6 +176,7 @@
    <!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
    <if cond="FORMAT=='gnu'">
        <set var="WX_UNICODE"/>
+        <set var="WX_DEBUG"/>
        <set var="WX_SHARED"/>
        <set var="WX_PORT"/>
        <set var="WX_VERSION"/>
@@ -221,13 +219,13 @@
            <values-description>Release,Debug</values-description>
            <default-value>$(WX_DEBUG_DEFAULT)</default-value>
            <description>
-                Use debug build of wxWidgets (linked with debug CRT)?
+                Use debug build of wxWidgets (define __WXDEBUG__)?
            </description>
        </option>
    </if>

    <if cond="not isdefined('WX_VERSION')">
-        <set var="WX_VERSION_DEFAULT" overwrite="0">30</set>
+        <set var="WX_VERSION_DEFAULT" overwrite="0">29</set>
        <option name="WX_VERSION">
            <default-value>$(WX_VERSION_DEFAULT)</default-value>
            <description>
@@ -273,10 +271,6 @@
        <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
    </set>

-    <if cond="FORMAT!='autoconf'">
-        <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
-    </if>
-



@@ -390,8 +384,8 @@
    </define-tag>

    <!-- Sets as output folder for the current target a directory
-         called "$(value)/$(COMPILER_PREFIX)_lib|dll", just like wxWidgets does.
-         This makes it possible to keep separated the libraries/exes compiled with
+         called "$(value)/$(COMPILER)_lib|dll", just like wxWidgets does.
+         This makes it possible to keep separed the libraries/exes compiled with
         different compilers and with a different value for WX_SHARED.
    -->
    <define-tag name="wxlike-dirname" rules="lib,dll,exe,module">
@@ -401,7 +395,7 @@
                <if cond="WX_SHARED=='1'">dll</if>
            </set>
            <set var="_DIRNAME">
-                $(value)/$(COMPILER_PREFIX)_$(_DIRNAME_SHARED_SUFFIX)
+                $(value)/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX)
            </set>

            <dirname>$(_DIRNAME)</dirname>
@@ -472,7 +466,7 @@
    <!--                                                            -->

    <!-- Sets the BUILDDIR variable using the same rules used by wxWidgets itself.
-         This makes it possible to keep separated the object files compiled with
+         This makes it possible to keep separed the object files compiled with
         different configuration settings.
    -->
    <define-global-tag name="set-wxlike-builddir">
@@ -484,7 +478,7 @@
            </set>

            <set var="BUILDDIR">
-                $(COMPILER_PREFIX)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
+                $(COMPILER)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
            </set>
        </if>
    </define-global-tag>
--- a/build/bakefiles/wxpresets/presets/wx_presets.py
+++ b/build/bakefiles/wxpresets/presets/wx_presets.py
@@ -1,11 +0,0 @@
-
-# We use 'COMPILER_PREFIX' option in places where bakefile doesn't like it, so
-# we must register a substitution function for it that provides additional
-# knowledge about the option (in this case that it does not contain dir
-# separators and so utils.nativePaths() doesn't have to do anything with it):
-
-from utils import addSubstituteCallback
-
-def __noopSubst(name, func, caller):
-    return '$(%s)' % name
-addSubstituteCallback('COMPILER_PREFIX', __noopSubst)
--- a/build/bakefiles/wxpresets/presets/wx_unix.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_unix.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <!--
 Presents for building wxWidgets applications using Autoconf or GNU toosets.
@@ -66,6 +67,7 @@ Format-specific notes:
             of the WX_* options in wx.bkl -->
        <unset var="WX_SHARED"/>
        <unset var="WX_UNICODE"/>
+        <unset var="WX_DEBUG"/>
        <unset var="WX_PORT"/>
        <unset var="WX_VERSION"/>

@@ -76,10 +78,10 @@ Format-specific notes:
        </option>

        <set var="WX_PORT_DEFAULT" overwrite="0">
-            $(DOLLAR)(shell $(WX_CONFIG) --query-toolkit)
+            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
        </set>
        <option name="WX_PORT">
-            <values>gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb</values>
+            <values>gtk1,gtk2,msw,x11,motif,mgl,mac,dfb</values>
            <default-value force="1">$(WX_PORT_DEFAULT)</default-value>
            <description>
                Port of the wx library to build against
@@ -87,7 +89,7 @@ Format-specific notes:
        </option>

        <set var="WX_SHARED_DEFAULT" overwrite="0">
-            $(DOLLAR)(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
+            $(DOLLAR)(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
        </set>
        <option name="WX_SHARED">
            <values>0,1</values>
@@ -99,7 +101,7 @@ Format-specific notes:
        </option>

        <set var="WX_UNICODE_DEFAULT" overwrite="0">
-            $(DOLLAR)(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
+            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
        </set>
        <option name="WX_UNICODE">
            <values>0,1</values>
@@ -110,8 +112,20 @@ Format-specific notes:
            </description>
        </option>

+        <set var="WX_DEBUG_DEFAULT" overwrite="0">
+            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+        </set>
+        <option name="WX_DEBUG">
+            <values>0,1</values>
+            <values-description>Release,Debug</values-description>
+            <default-value force="1">$(WX_DEBUG_DEFAULT)</default-value>
+            <description>
+                Use debug build of wxWidgets (define __WXDEBUG__)?
+            </description>
+        </option>
+
        <set var="WX_VERSION_DEFAULT" overwrite="0">
-            $(DOLLAR)(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
+            $(DOLLAR)(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
        </set>
        <option name="WX_VERSION">
            <default-value>$(WX_VERSION_DEFAULT)</default-value>
@@ -134,10 +148,14 @@ Format-specific notes:
            a win32 makefile: i.e. a makefile where you can select the wanted
            wxWidgets build using the WX_* options.

-            The difference with win32 makefiles is that WX_PORT, WX_UNICODE and
+            The difference with win32 makefiles is that WX_DEBUG, WX_UNICODE and
            WX_SHARED options have a smart default value which is created using
            the installed wx-config or the wx-config given using WX_CONFIG option
        -->
+        <set var="WX_CONFIG_DEBUG_FLAG">
+            <if cond="WX_DEBUG=='0'">--debug=no</if>
+            <if cond="WX_DEBUG=='1'">--debug=yes</if>
+        </set>
        <set var="WX_CONFIG_UNICODE_FLAG">
            <if cond="WX_UNICODE=='0'">--unicode=no</if>
            <if cond="WX_UNICODE=='1'">--unicode=yes</if>
@@ -154,11 +172,10 @@ Format-specific notes:
        </set>

        <set var="WX_CONFIG_FLAGS" make_var="1">
-            $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG)
+            $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) 
            $(WX_CONFIG_PORT_FLAG) $(WX_CONFIG_VERSION_FLAG)
        </set>

-        <set var="DEFAULT_CXX">`$(DOLLAR)(WX_CONFIG) --cxx`</set>
        <set var="WX_CFLAGS">`$(DOLLAR)(WX_CONFIG) --cflags $(WX_CONFIG_FLAGS)`</set>
        <set var="WX_CXXFLAGS">`$(DOLLAR)(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)`</set>
        <set var="WX_CPPFLAGS">`$(DOLLAR)(WX_CONFIG) --cppflags $(WX_CONFIG_FLAGS)`</set>
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <!-- Original source: http://wiki.wxwidgets.org/wiki.pl?Bakefile    -->
 <!-- Modified by: Francesco Montorsi <frm@users.sourceforge.net>    -->
@@ -6,69 +7,32 @@
                  into Bakefile's presets                           -->
 <!-- Creation date: 6/9/2004                                        -->
 <!-- Last revision: 22/1/2005 off-CVS                               -->
+<!--                $Id$ -->


 <makefile>


-    <!--                                                            -->
    <!--                        OPTIONS                             -->
    <!--                                                            -->
-
-    <set var="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL">
-        <!-- 'NORMAL' here refers to the fact that the formats for which
-             FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL==1 only need
-             additional compiler and/or linker flags (see e.g. WXMACHINE_FLAG)
-         -->
-        <if cond="FORMAT in ['msvc']">1</if>
-        <if cond="FORMAT not in ['msvc']">0</if>
-    </set>
-    <set var="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS">
-        <!-- the formats for which FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS==1 
-             need special handling: see the docs of the MSVS_PLATFORMS variable in Bakefile docs.
-         -->
-        <if cond="FORMAT in ['msvs2005prj','msvs2008prj']">1</if>
-        <if cond="FORMAT not in ['msvs2005prj','msvs2008prj']">0</if>
-    </set>
-    <set var="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES">
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1'">1</if>
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS=='1'">1</if>
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='0' and FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS=='0'">0</if>
-    </set>
-    
-    <!--    This is a standard option that determines               -->
-    <!--    the architecture for which the lib/exe/dll later        -->
-    <!--    declared are meant.                                     -->
-    <if cond="not isdefined('TARGET_CPU') and FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1'">
-        <set var="TARGET_CPU_DEFAULT" overwrite="0">X86</set>
-        <option name="TARGET_CPU">
-            <values>X86,AMD64,IA64</values>
-            <values-description>i386-compatible,AMD 64 bit,Itanium 64 bit</values-description>
-            <default-value>$(TARGET_CPU_DEFAULT)</default-value>
-            <description>
-                Architecture of the CPU for which to build the executables and libraries
-            </description>
-        </option>
-    </if>
-    <if cond="not isdefined('TARGET_CPU') and FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS=='1'">
-        <!-- defining TARGET_CPU also for the formats using the MSVS_PLATFORM variable allows to write
-             easier tests in user bakefiles; e.g.:
-             
-            <set var="MY_ARCH_DEPENDENT_VARIABLE">
-                <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='0'">value1</if>
-                <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='X86'">value2</if>
-                <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">value3</if>
-                <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">value4</if>
-            </set>
-        -->
-        <set var="TARGET_CPU">
-            <if cond="MSVS_PLATFORM=='win32'">X86</if>
-            <if cond="MSVS_PLATFORM=='win64'">AMD64</if>
-            <if cond="MSVS_PLATFORM=='ia64'">IA64</if>
-                <!-- MSVS_PLATFORM currently does not support ia64 but this line is still needed by bakefile 
-                     to correctly set the TARGET_CPU variable -->
-        </set>
-    </if>
+    <!--    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.                                     -->
+    <!--    Also note that for 'autoconf' format these options      -->
+    <!--    are only useful when used together with wxpresets.m4    -->
+    <!--    macro file which contains macros for detecting the      -->
+    <!--    option values for wx-based projects. See wxpresets.m4   -->
+    <!--    comments for more info.    -->



@@ -99,22 +63,13 @@

    <set var="WXCPU">
        <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">_x64</if>
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">_ia64</if>
    </set>
-    
-    <set var="WXMACHINE_FLAG">
-        <!-- add the /MACHINE linker flag to formats with "normal" multiple-arch support when building in 64bit mode
-             (formats using the MSVS_PLATFORM variable don't need the /MACHINE linker flag!): -->
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='IA64'">/MACHINE:IA64</if>
-    </set>
-    
+
    <set var="WXLIBPATH">
-        <if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_lib</if>
-        <if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_dll</if>
+        <if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_lib</if>
+        <if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_dll</if>
    </set>
-    
+
    <!-- under Unix this is an option (detected at configure-time);
         under Windows this is not an user option! -->
    <set var="WX_PORT">
@@ -168,11 +123,9 @@
    <define-wxlib-name>adv</define-wxlib-name>
    <define-wxlib-name>qa</define-wxlib-name>
    <define-wxlib-name>aui</define-wxlib-name>
-    <define-wxlib-name>ribbon</define-wxlib-name>
    <define-wxlib-name>propgrid</define-wxlib-name>
    <define-wxlib-name>stc</define-wxlib-name>
    <define-wxlib-name>richtext</define-wxlib-name>
-    <define-wxlib-name>webview</define-wxlib-name>

    <!-- NOTE: The GL lib is not part of the monolithic build; treat it as a contrib! -->

@@ -210,10 +163,8 @@
        <if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
        <if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
        <if cond="value=='aui'"><sys-lib>$(WXLIB_AUI_NAME)</sys-lib></if>
-        <if cond="value=='ribbon'"><sys-lib>$(WXLIB_RIBBON_NAME)</sys-lib></if>
        <if cond="value=='propgrid'"><sys-lib>$(WXLIB_PROPGRID_NAME)</sys-lib></if>
        <if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
-        <if cond="value=='webview'"><sys-lib>$(WXLIB_WEBVIEW_NAME)</sys-lib></if>

        <!-- The GL lib isn't part of the monolithic build, treat it as a contrib: -->
        <if cond="value=='gl'">
@@ -313,8 +264,6 @@
            <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
        </if>

-        <ldflags>$(WXMACHINE_FLAG)</ldflags>
-            
        <!-- 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/>
--- a/build/bakefiles/wxpresets/presets/wx_xrc.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_xrc.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <!--

--- a/build/bakefiles/wxpresets/sample/minimal.bkl
+++ b/build/bakefiles/wxpresets/sample/minimal.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->

 <makefile>

--- a/build/bakefiles/wxpresets/sample/minimal.cpp
+++ b/build/bakefiles/wxpresets/sample/minimal.cpp
@@ -4,6 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
+// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -114,7 +115,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
    // create the main application window
-    MyFrame *frame = new MyFrame(wxT("Minimal wxWindows App"));
+    MyFrame *frame = new MyFrame(_T("Minimal wxWindows App"));

    // and show it (the frames, unlike simple controls, are not shown when
    // created initially)
@@ -142,14 +143,14 @@ MyFrame::MyFrame(const wxString& title)

    // the "About" item should be in the help menu
    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(Minimal_About, wxT("&About\tF1"), wxT("Show about dialog"));
+    helpMenu->Append(Minimal_About, _T("&About...\tF1"), _T("Show about dialog"));

-    menuFile->Append(Minimal_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
+    menuFile->Append(Minimal_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));

    // now append the freshly created menu to the menu bar...
    wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(menuFile, wxT("&File"));
-    menuBar->Append(helpMenu, wxT("&Help"));
+    menuBar->Append(menuFile, _T("&File"));
+    menuBar->Append(helpMenu, _T("&Help"));

    // ... and attach this menu bar to the frame
    SetMenuBar(menuBar);
@@ -158,7 +159,7 @@ MyFrame::MyFrame(const wxString& title)
 #if wxUSE_STATUSBAR
    // create a status bar just for fun (by default with 1 pane only)
    CreateStatusBar(2);
-    SetStatusText(wxT("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWindows!"));
 #endif // wxUSE_STATUSBAR
 }

@@ -174,8 +175,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
    wxString msg;
-    msg.Printf( wxT("This is the About dialog of the minimal sample.\n")
-                wxT("Welcome to %s"), wxVERSION_STRING);
+    msg.Printf( _T("This is the About dialog of the minimal sample.\n")
+                _T("Welcome to %s"), wxVERSION_STRING);

-    wxMessageBox(msg, wxT("About Minimal"), wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(msg, _T("About Minimal"), wxOK | wxICON_INFORMATION, this);
 }
--- a/Show More
+++ b/Show More