Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_4_3@34198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2005-05-20 12:37:27 +00:00
parent 86118733af
commit fdd1c93b80
3802 changed files with 342981 additions and 164335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@@ -29,6 +29,8 @@ UnivRelease
UnivDebug UnivDebug
BaseRelease BaseRelease
BaseDebug BaseDebug
BaseReleaseDLL
BaseDebugDLL
robert robert
stamp-h.in stamp-h.in
Makefile Makefile

57
BuildCVS.txt
View File

@@ -19,30 +19,29 @@ varaibles and PATH entries.
Continue with item c) below. Continue with item c) below.
b) If using the GNU Mingw32 or GNU Cygwin32 compilers b) If using the MinGW or Cygwin compilers
You can get Mingw32 from http://www.mingw.org You can get MinGW from http://www.mingw.org/
Cygwin32 is available at http://www.cygwin.com Cygwin is available at http://sources.redhat.com/cygwin/
The makefile might have small problems with Cygwin's tools The makefile might have small problems with Cygwin's tools
so it is recommended to use Mingw32 and its toolchain instead so it is recommended to use MinGW and its toolchain instead
if possible. if possible.
-> Set your path so that it includes the directory -> Set your path so that it includes the directory
where your compiler and tools reside where your compiler and tools reside
-> If your are using an old Mingw32 version (gcc-2.95 or older), -> If your are using an old MinGW version (gcc-2.95 or older),
you might need to fix some headers with the patches contained you might need to fix some headers with the patches contained
in the wxWin\Mingw32-gcc295.patches file. PLEASE APPLY THESE in the wxWin\Mingw32-gcc295.patches file. PLEASE APPLY THESE
PATCHES BY HAND! There are apparently a few different versions PATCHES BY HAND! There are apparently a few different versions
of the headers floating around. Note that these patches are of the headers floating around. Note that these patches are
not needed if you are using Mingw32 gcc-2.95.2 or newer. not needed if you are using MinGW gcc-2.95.2 or newer.
-> Edit wx/src/makeg95.env and set the MINGW32 variable at the top of -> Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
the file to either 1 (you have Mingw32) or 0 (you have Cygwin32). the file to either 1 (you have MinGW) or 0 (you have Cygwin).
If using MINGW32, also set the MINGW32VERSION variable Also set the MINGW32VERSION variable appropiately.
appropiately.
c) Build instructions c) Build instructions
@@ -51,19 +50,8 @@ c) Build instructions
into c:\wxWin into c:\wxWin
-> Copy c:\wxWin\include\wx\msw\setup0.h -> Copy c:\wxWin\include\wx\msw\setup0.h
to c:\wxWin\include\wx\msw\setup.h to c:\wxWin\include\wx\msw\setup.h
-> Edit c:\wxWin\include\wx\msw\setup.h so that -> Edit c:\wxWin\include\wx\msw\setup.h to choose
most features are enabled (i.e. defined to 1), for example: the features you would like to compile wxWindows with[out].
#define wxUSE_ODBC 0
#define wxUSE_SOCKETS 1
#define wxUSE_HTML 1
#define wxUSE_THREADS 1
#define wxUSE_FS_INET 0
#define wxUSE_FS_ZIP 1
#define wxUSE_BUSYINFO 1
#define wxUSE_DYNLIB_CLASS 1
#define wxUSE_ZIPSTREAM 1
#define wxUSE_LIBJPEG 1
#define wxUSE_LIBPNG 1
and std iostreams are disabled with and std iostreams are disabled with
#define wxUSE_STD_IOSTREAM 0 #define wxUSE_STD_IOSTREAM 0
@@ -72,6 +60,8 @@ c) Build instructions
-> type: make -f makefile.g95 (if using GNU tools) -> type: make -f makefile.g95 (if using GNU tools)
or type: nmake -f makefile.vc (if using MS VC++) or type: nmake -f makefile.vc (if using MS VC++)
See also docs/msw/install.txt for additional compilation options.
d) Borland (including free command line tools) d) Borland (including free command line tools)
Download tools from http://www.borland.com/downloads/ Download tools from http://www.borland.com/downloads/
@@ -117,11 +107,10 @@ yet complete).
III) Windows using configure III) Windows using configure
---------------------------------------- ----------------------------------------
Take a look at Unix->Windows cross compiling. With minor wxWindows can be built on Windows using MSYS (see
modifications, this should work in Windows if you've got the cygnus http://www.mingw.org/), which is a POSIX build environment
utilities (bash, GNU make, etc) and either mingw32 or cygwin32 installed. for Windows. With MSYS you can just ./configure && make (see also VII,
See http://www.cygnus.com for these programs, or go straight to their Unix->Windows cross-compiling using configure).
ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
Of course, you can also build the library using plain makefiles (see Of course, you can also build the library using plain makefiles (see
section I). section I).
@@ -168,17 +157,17 @@ VI) OS/2
VII) Unix->Windows cross-compiling using configure VII) Unix->Windows cross-compiling using configure
-------------------------------------------------- --------------------------------------------------
First you'll need a cross-compiler; linux glibc binaries of mingw32 and First you'll need a cross-compiler; linux glibc binaries of MinGW and
cygwin32 (both based on egcs) can be found at Cygwin (both based on egcs) can be found at
ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries, ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
based on the latest MinGW release can be found at based on the latest MinGW release can be found at
http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
Otherwise you can compile one yourself. Otherwise you can compile one yourself.
[ A Note about cygwin32 and mingw32: the main difference is that cygwin32 [ A Note about Cygwin and MinGW: the main difference is that Cygwin
binaries are always linked against cygwin.dll. This dll encapsulates most binaries are always linked against cygwin.dll. This dll encapsulates most
standard Unix C extensions, which is very handy if you're porting unix standard Unix C extensions, which is very handy if you're porting unix
software to windows. However, wxMSW doesn't need this, so mingw32 is software to windows. However, wxMSW doesn't need this, so MinGW is
preferable if you write portable C(++). ] preferable if you write portable C(++). ]
You might want to build both Unix and Windows binaries in the same source You might want to build both Unix and Windows binaries in the same source
@@ -203,7 +192,7 @@ yourself:
DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \ DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
../configure --host=i586-mingw32 --with-mingw ../configure --host=i586-mingw32 --with-mingw
(all assuming you're using mingw32) (all assuming you're using MinGW)
By default this will compile a DLL, if you want a static library, By default this will compile a DLL, if you want a static library,
specify --disable-shared. specify --disable-shared.
@@ -215,7 +204,7 @@ will be a compile error :-)
NB: if you are using a very old compiler you risk to get quite a few warnings 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 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) where va_arg macro is used. This is due to a bug in (some versions of)
mingw32 headers which may be corrected by upgrading your compier, MinGW headers which may be corrected by upgrading your compier,
otherwise you might edit the file otherwise you might edit the file
${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
@@ -238,7 +227,7 @@ typedef void *__gnuc_va_list;
__gnuc_va_list is char *. __gnuc_va_list is char *.
If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib 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 ). (or just libwx_msw.a if you opted for a static build).
Now try building the minimal sample: Now try building the minimal sample:
-> cd samples/minimal -> cd samples/minimal

288
Makefile.in
View File

@@ -321,10 +321,18 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS) $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
# NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line # NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line
# but this seems to result in problems with libwx_gtk being linked in twice # but this seems to result in problems with libwx_gtk being linked in twice.
# RL: This is another example of why sonames exist, and what happens when you
# ignore them. Broken linking like this is now an rc bug in Debian, so we
# add them back again (to SONAME_FLAGS_GL) in configure if --enable-soname
# is used. Removing the explicit -L /usr/lib from LDFLAGS would probably
# help with the above problem, but building without the soname is broken in
# so many other ways that I'm not going to touch that case in 2.4 anymore
# if I can help it.
#
$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
@$(INSTALL) -d $(build_libdir) @$(INSTALL) -d $(build_libdir)
$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS) $(SHARED_LD) $@ glcanvas.o $(SONAME_FLAGS_GL) $(LDFLAGS_GL) $(OPENGLLIBS) $(EXTRALIBS)
$(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
@$(INSTALL) -d $(build_libdir) @$(INSTALL) -d $(build_libdir)
@@ -383,19 +391,18 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
afminstall: preinstall
@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
$(INSTALL) -d $(datadir)/wx
$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
m4datainstall: preinstall m4datainstall: preinstall
$(INSTALL) -d $(datadir)/aclocal $(INSTALL) -d $(datadir)/aclocal
$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
win32install: preinstall
$(INSTALL) -d $(includedir)/wx/msw
$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/*.cur \
$(top_srcdir)/include/wx/msw/*.ico \
$(top_srcdir)/include/wx/msw/*.bmp \
$(top_srcdir)/include/wx/msw/wx.rc \
$(includedir)/wx/msw
# this is the real install target: copies the library, wx-config and the # this is the real install target: copies the library, wx-config and the
# headers to the installation directory # headers to the installation directory
preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
@@ -462,7 +469,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall install: @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
@echo " " @echo " "
@echo " The installation of wxWindows is finished. On certain" @echo " The installation of wxWindows is finished. On certain"
@echo " platforms (e.g. Linux) you'll now have to run ldconfig" @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@@ -491,17 +498,14 @@ uninstall:
@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
@$(RM) $(bindir)/wx-config @$(RM) $(bindir)/wx-config
@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
@$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/* # FIXME: wxBase doesnt install these next 3 dirs.
@$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*
# FIXME: wxBase doesnt install these next 3 dirs.
@-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm
@-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm
@-rmdir $(datadir)/wx/$(VER_MAJMIN) @-rmdir $(datadir)/wx/$(VER_MAJMIN)
@-rmdir $(datadir)/wx @-rmdir $(datadir)/wx
@echo " Removing headers..." @echo " Removing headers..."
@list='$(HEADERS)'; for p in $$list; do \ @list='$(HEADERS)'; for p in $$list; do \
$(RM) $(includedir)/wx/$$p; \ $(RM) $(includedir)/wx/$$p; \
done done
# TODO: uninstall the files installed by win32install
@echo " Removing i18n files..." @echo " Removing i18n files..."
@-for p in $(WX_LINGUAS); do \ @-for p in $(WX_LINGUAS); do \
$(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \ $(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
@@ -536,6 +540,7 @@ ALL_DIST: distclean
cp $(WXDIR)/install-sh $(DISTDIR) cp $(WXDIR)/install-sh $(DISTDIR)
cp $(WXDIR)/mkinstalldirs $(DISTDIR) cp $(WXDIR)/mkinstalldirs $(DISTDIR)
cp $(WXDIR)/wx-config.in $(DISTDIR) cp $(WXDIR)/wx-config.in $(DISTDIR)
cp $(WXDIR)/version-script.in $(DISTDIR)
cp $(WXDIR)/setup.h.in $(DISTDIR) cp $(WXDIR)/setup.h.in $(DISTDIR)
cp $(WXDIR)/setup.h_vms $(DISTDIR) cp $(WXDIR)/setup.h_vms $(DISTDIR)
cp $(WXDIR)/descrip.mms $(DISTDIR) cp $(WXDIR)/descrip.mms $(DISTDIR)
@@ -580,7 +585,8 @@ ALL_GUI_DIST: ALL_DIST
if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \ if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt
cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt if test -f $(DOCDIR)/$(TOOLKITDIR)/todo.txt ; then \
cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt ; fi
mkdir $(DISTDIR)/include mkdir $(DISTDIR)/include
mkdir $(DISTDIR)/include/wx mkdir $(DISTDIR)/include/wx
mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR) mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
@@ -732,19 +738,12 @@ MACX_DIST: ALL_GUI_DIST
MSW_DIST: ALL_GUI_DIST MSW_DIST: ALL_GUI_DIST
cp $(WXDIR)/wxWINE.spec $(DISTDIR) cp $(WXDIR)/wxWINE.spec $(DISTDIR)
mkdir $(DISTDIR)/include/wx/msw/ctl3d
mkdir $(DISTDIR)/include/wx/msw/gnuwin32
mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
mkdir $(DISTDIR)/include/wx/msw/ole mkdir $(DISTDIR)/include/wx/msw/ole
cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
mkdir $(DISTDIR)/src/msw/ole mkdir $(DISTDIR)/src/msw/ole
cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw
@@ -756,16 +755,9 @@ MSW_DIST: ALL_GUI_DIST
MSW_ZIP_TEXT_DIST: ALL_GUI_DIST MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
cp $(WXDIR)/wxWINE.spec $(DISTDIR) cp $(WXDIR)/wxWINE.spec $(DISTDIR)
mkdir $(DISTDIR)/include/wx/msw mkdir $(DISTDIR)/include/wx/msw
mkdir $(DISTDIR)/include/wx/msw/ctl3d
mkdir $(DISTDIR)/include/wx/msw/gnuwin32
mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
mkdir $(DISTDIR)/include/wx/msw/ole mkdir $(DISTDIR)/include/wx/msw/ole
cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
mkdir $(DISTDIR)/src/msw mkdir $(DISTDIR)/src/msw
mkdir $(DISTDIR)/src/msw/ole mkdir $(DISTDIR)/src/msw/ole
@@ -777,16 +769,28 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
cp $(SRCDIR)/*.??? $(DISTDIR)/src cp $(SRCDIR)/*.??? $(DISTDIR)/src
cp $(SRCDIR)/*.?? $(DISTDIR)/src cp $(SRCDIR)/*.?? $(DISTDIR)/src
cp $(MSWDIR)/?ake*.* $(DISTDIR)/src/msw cp $(MSWDIR)/?ake*.* $(DISTDIR)/src/msw
mkdir $(DISTDIR)/contrib
cp -R $(WXDIR)/contrib $(DISTDIR)
UNIV_DIST: ALL_GUI_DIST UNIV_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/include/wx/univ mkdir $(DISTDIR)/include/wx/univ
mkdir $(DISTDIR)/src/univ mkdir $(DISTDIR)/src/univ
mkdir $(DISTDIR)/src/univ/themes mkdir $(DISTDIR)/src/univ/themes
cp $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ cp $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ
cp $(INCDIR)/wx/univ/setup0.h $(DISTDIR)/include/wx/univ/setup.h
cp $(SRCDIR)/univ/files.lst $(DISTDIR)/src/univ cp $(SRCDIR)/univ/files.lst $(DISTDIR)/src/univ
cp $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ cp $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
cp $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes cp $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
MGL_DIST: UNIV_DIST
cp $(WXDIR)/wxMGL.spec $(DISTDIR)
cp $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
cp $(SRCDIR)/mgl/files.lst $(DISTDIR)/src/mgl
cp $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
cp $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
mkdir $(DISTDIR)/contrib
cp -R $(WXDIR)/contrib $(DISTDIR)
DEMOS_DIST: ALL_GUI_DIST DEMOS_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/demos mkdir $(DISTDIR)/demos
cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
@@ -842,6 +846,13 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/configure $(DISTDIR)/samples cp $(SAMPDIR)/configure $(DISTDIR)/samples
cp $(SAMPDIR)/configure.in $(DISTDIR)/samples cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
mkdir $(DISTDIR)/samples/artprov
cp $(SAMPDIR)/artprov/Makefile.in $(DISTDIR)/samples/artprov
cp $(SAMPDIR)/artprov/makefile.unx $(DISTDIR)/samples/artprov
cp $(SAMPDIR)/artprov/*.cpp $(DISTDIR)/samples/artprov
cp $(SAMPDIR)/artprov/*.h $(DISTDIR)/samples/artprov
cp $(SAMPDIR)/artprov/*.xpm $(DISTDIR)/samples/artprov
mkdir $(DISTDIR)/samples/calendar mkdir $(DISTDIR)/samples/calendar
cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
@@ -1018,7 +1029,7 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
cp $(SAMPDIR)/image/*.mms $(DISTDIR)/samples/image cp $(SAMPDIR)/image/*.mms $(DISTDIR)/samples/image
cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image cp $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image
cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
@@ -1053,6 +1064,10 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
mkdir $(DISTDIR)/samples/keyboard
cp $(SAMPDIR)/keyboard/Makefile.in $(DISTDIR)/samples/keyboard
cp $(SAMPDIR)/keyboard/*.cpp $(DISTDIR)/samples/keyboard
mkdir $(DISTDIR)/samples/layout mkdir $(DISTDIR)/samples/layout
cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
@@ -1110,6 +1125,11 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/mobile/wxedit/Makefile.in $(DISTDIR)/samples/mobile/wxedit cp $(SAMPDIR)/mobile/wxedit/Makefile.in $(DISTDIR)/samples/mobile/wxedit
cp $(SAMPDIR)/mobile/wxedit/*.cpp $(DISTDIR)/samples/mobile/wxedit cp $(SAMPDIR)/mobile/wxedit/*.cpp $(DISTDIR)/samples/mobile/wxedit
cp $(SAMPDIR)/mobile/wxedit/*.h $(DISTDIR)/samples/mobile/wxedit cp $(SAMPDIR)/mobile/wxedit/*.h $(DISTDIR)/samples/mobile/wxedit
mkdir $(DISTDIR)/samples/mobile/styles
cp $(SAMPDIR)/mobile/styles/Makefile.in $(DISTDIR)/samples/mobile/styles
cp $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles
cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
mkdir $(DISTDIR)/samples/dialup mkdir $(DISTDIR)/samples/dialup
cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
@@ -1162,7 +1182,6 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
mkdir $(DISTDIR)/samples/resource mkdir $(DISTDIR)/samples/resource
cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
@@ -1175,7 +1194,7 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate
mkdir $(DISTDIR)/samples/richedit mkdir $(DISTDIR)/samples/richedit
cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
@@ -1214,6 +1233,12 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
mkdir $(DISTDIR)/samples/shaped
cp $(SAMPDIR)/shaped/Makefile.in $(DISTDIR)/samples/shaped
cp $(SAMPDIR)/shaped/makefile.unx $(DISTDIR)/samples/shaped
cp $(SAMPDIR)/shaped/*.cpp $(DISTDIR)/samples/shaped
cp $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped
mkdir $(DISTDIR)/samples/sockets mkdir $(DISTDIR)/samples/sockets
cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
@@ -1305,6 +1330,19 @@ UTILS_DIST: ALL_GUI_DIST
cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
mkdir $(DISTDIR)/utils/emulator
mkdir $(DISTDIR)/utils/emulator/src
mkdir $(DISTDIR)/utils/emulator/docs
cp $(UTILSDIR)/emulator/*.in $(DISTDIR)/utils/emulator
cp $(UTILSDIR)/emulator/src/*.h $(DISTDIR)/utils/emulator/src
cp $(UTILSDIR)/emulator/src/*.in $(DISTDIR)/utils/emulator/src
cp $(UTILSDIR)/emulator/src/*.cpp $(DISTDIR)/utils/emulator/src
cp $(UTILSDIR)/emulator/src/*.jpg $(DISTDIR)/utils/emulator/src
cp $(UTILSDIR)/emulator/src/*.xpm $(DISTDIR)/utils/emulator/src
cp $(UTILSDIR)/emulator/src/*.wxe $(DISTDIR)/utils/emulator/src
cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs
cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
mkdir $(DISTDIR)/utils/makegen mkdir $(DISTDIR)/utils/makegen
mkdir $(DISTDIR)/utils/makegen/templates mkdir $(DISTDIR)/utils/makegen/templates
cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen
@@ -1319,14 +1357,31 @@ UTILS_DIST: ALL_GUI_DIST
cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src
cp -R $(UTILSDIR)/dialoged $(DISTDIR)/utils/dialoged mkdir $(DISTDIR)/utils/dialoged
mkdir $(DISTDIR)/utils/dialoged/src
mkdir $(DISTDIR)/utils/dialoged/src/bitmaps
mkdir $(DISTDIR)/utils/dialoged/docs
cp $(UTILSDIR)/dialoged/Makefile.in $(DISTDIR)/utils/dialoged
cp $(UTILSDIR)/dialoged/src/*.h $(DISTDIR)/utils/dialoged/src
cp $(UTILSDIR)/dialoged/src/*.cpp $(DISTDIR)/utils/dialoged/src
cp $(UTILSDIR)/dialoged/src/Makefile.in $(DISTDIR)/utils/dialoged/src
cp $(UTILSDIR)/dialoged/src/makefile.unx $(DISTDIR)/utils/dialoged/src
cp $(UTILSDIR)/dialoged/src/bitmaps/*.xpm $(DISTDIR)/utils/dialoged/src/bitmaps
cp $(UTILSDIR)/dialoged/docs/*.tex $(DISTDIR)/utils/dialoged/docs
cp $(UTILSDIR)/dialoged/docs/*.ini $(DISTDIR)/utils/dialoged/docs
cp $(UTILSDIR)/dialoged/docs/*.gif $(DISTDIR)/utils/dialoged/docs
mkdir $(DISTDIR)/utils/helpview
mkdir $(DISTDIR)/utils/helpview/src
mkdir $(DISTDIR)/utils/helpview/src/bitmaps
cp $(UTILSDIR)/helpview/Makefile.in $(DISTDIR)/utils/helpview
cp $(UTILSDIR)/helpview/src/*.h $(DISTDIR)/utils/helpview/src
cp $(UTILSDIR)/helpview/src/*.cpp $(DISTDIR)/utils/helpview/src
cp $(UTILSDIR)/helpview/src/Makefile.in $(DISTDIR)/utils/helpview/src
cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src
cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
MISC_DIST: ALL_GUI_DIST MISC_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/misc
mkdir $(DISTDIR)/misc/afm
cp $(MISCDIR)/afm/*.afm $(DISTDIR)/misc/afm
mkdir $(DISTDIR)/misc/gs_afm
cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm
INTL_DIST: INTL_DIST:
mkdir $(DISTDIR)/locale mkdir $(DISTDIR)/locale
@@ -1347,62 +1402,78 @@ MANUAL_DIST:
# this target does not generate a complete wxPython dist, it only includes # this target does not generate a complete wxPython dist, it only includes
# those files needed for the Debian source package. # those files needed for the Debian source package.
# see utils/wxPython/distrib for scripts to make a proper wxPython dist. # see wxPython/distrib for scripts to make a proper wxPython dist.
#
# first copy everything and then clean up the CVS stuff and etc...
PYTHON_DIST: PYTHON_DIST:
mkdir $(DISTDIR)/wxPython for dir in \
mkdir $(DISTDIR)/wxPython/contrib wxPython \
mkdir $(DISTDIR)/wxPython/contrib/dllwidget wxPython/contrib \
mkdir $(DISTDIR)/wxPython/contrib/gizmos wxPython/contrib/dllwidget \
mkdir $(DISTDIR)/wxPython/contrib/glcanvas wxPython/contrib/gizmos \
mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk wxPython/contrib/glcanvas \
mkdir $(DISTDIR)/wxPython/contrib/ogl wxPython/contrib/glcanvas/gtk \
mkdir $(DISTDIR)/wxPython/contrib/stc wxPython/contrib/ogl \
mkdir $(DISTDIR)/wxPython/contrib/stc/gtk wxPython/contrib/stc \
mkdir $(DISTDIR)/wxPython/contrib/xrc wxPython/contrib/stc/gtk \
mkdir $(DISTDIR)/wxPython/demo wxPython/contrib/xrc \
mkdir $(DISTDIR)/wxPython/demo/bitmaps wxPython/demo \
mkdir $(DISTDIR)/wxPython/demo/bmp_source wxPython/demo/bitmaps \
mkdir $(DISTDIR)/wxPython/demo/data wxPython/demo/bmp_source \
mkdir $(DISTDIR)/wxPython/demo/dllwidget wxPython/demo/data \
mkdir $(DISTDIR)/wxPython/src wxPython/demo/dllwidget \
mkdir $(DISTDIR)/wxPython/src/gtk wxPython/distrib \
mkdir $(DISTDIR)/wxPython/scripts wxPython/distutils \
mkdir $(DISTDIR)/wxPython/wxPython wxPython/distutils/command \
mkdir $(DISTDIR)/wxPython/wxPython/lib wxPython/docs \
mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust wxPython/docs/screenshots \
mkdir $(DISTDIR)/wxPython/wxPython/lib/editor wxPython/samples/StyleEditor \
mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins wxPython/samples/doodle \
mkdir $(DISTDIR)/wxPython/wxPython/tools wxPython/samples/embedded \
mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed wxPython/samples/frogedit \
wxPython/samples/hangman \
cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython wxPython/samples/pySketch \
cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython wxPython/samples/pySketch/images \
cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython wxPython/samples/wxProject \
cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython wxPython/samples/wx_examples \
cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget wxPython/samples/wx_examples/basic \
cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos wxPython/samples/wx_examples/hello \
-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas wxPython/scripts \
cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk wxPython/src \
-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl wxPython/src/gtk \
-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc wxPython/wx \
-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk wxPython/wx/lib \
-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc wxPython/wx/lib/colourchooser \
-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo wxPython/wx/lib/editor \
-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps wxPython/wx/lib/mixins \
-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source wxPython/wx/py \
-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data wxPython/wx/tools \
-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget wxPython/wx/tools/XRCed \
-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget wxPython/wxPython \
-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts wxPython/wxPython/lib \
-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src wxPython/wxPython/lib/PyCrust \
cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk wxPython/wxPython/lib/colourchooser \
cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk wxPython/wxPython/lib/editor \
cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib wxPython/wxPython/lib/mixins \
cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust wxPython/wxPython/tools \
cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor wxPython/wxPython/tools/XRCed \
cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins wxPython/wxPython/tools/XRCed/src-images \
cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools wxPython/wxPython/py \
cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed wxPython/wxPython/py/tests \
wxPython/wxPython/py/wxd \
; do \
echo "Copying dir: $$dir..."; \
mkdir -p $(DISTDIR)/$$dir; \
cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
done; \
\
find $(DISTDIR)/wxPython -name "*~" > RM_FILES; \
find $(DISTDIR)/wxPython -name "*.pyc" >> RM_FILES; \
find $(DISTDIR)/wxPython -name "*.bat" >> RM_FILES; \
find $(DISTDIR)/wxPython -name "core" >> RM_FILES; \
find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
for f in `cat RM_FILES`; do rm $$f; done; \
rm RM_FILES
distclean: distclean:
$(RM) -r _dist_dir $(RM) -r _dist_dir
@@ -1426,6 +1497,11 @@ dist-only:
dist: @GUIDIST@ dist: @GUIDIST@
@echo "*** Creating wxWindows distribution in $(DISTDIR)..." @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
@# now prune away a lot of the crap included by using cp -R
@# in other dist targets.
find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-print0 | xargs -0 rm -rf
@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE); @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
@if test "$(USE_GUI)" = 1; then \ @if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \ cd $(DISTDIR); \
@@ -1491,20 +1567,32 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
@# in other dist targets. Ugly and hardly portable but it @# in other dist targets. Ugly and hardly portable but it
@# will run on any Debian box and that's enough for now. @# 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 "makefile.*" -a ! -name "makefile.unx" \) \) \ find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \
-print0 | xargs -0 rm -rf -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \
-o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \
-o -name "*.bkl" -o -name "*.pro" -o -name "*.def" \
-o -name "*.vpj" -o -name "*.sc" \
-o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
\) -print0 | xargs -0 rm -rf
rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
@IF_GNU_MAKE@debian-native-dist: $(filter-out DEMOS_DIST,@GUIDIST@) MANUAL_DIST PYTHON_DIST
cp $(SRCDIR)/files.lst $(DISTDIR)/src
debian-msw-dirs: debian-msw-dirs:
mkdir $(DISTDIR)/include/wx/msw mkdir $(DISTDIR)/include/wx/msw
mkdir $(DISTDIR)/src/msw mkdir $(DISTDIR)/src/msw
# This is to keep non-gnu make's happy.
# ... but is of course stupid and useless here, so make it a noop at least.
@IF_NOT_GNU_MAKE@debian-native-dist:
clean: clean:
$(RM) *.o $(RM) *.o
$(RM) *.d $(RM) *.d

63
acinclude.m4
View File

@@ -19,7 +19,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_INCLUDES], AC_DEFUN([WX_PATH_FIND_INCLUDES],
[ [
ac_find_includes= ac_find_includes=
for ac_dir in $1; for ac_dir in $1 /usr/include;
do do
if test -f "$ac_dir/$2"; then if test -f "$ac_dir/$2"; then
ac_find_includes=$ac_dir ac_find_includes=$ac_dir
@@ -35,7 +35,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES], AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[ [
ac_find_libraries= ac_find_libraries=
for ac_dir in $1; for ac_dir in $1 /usr/lib;
do do
for ac_extension in a so sl dylib; do for ac_extension in a so sl dylib; do
if test -f "$ac_dir/lib$2.$ac_extension"; then if test -f "$ac_dir/lib$2.$ac_extension"; then
@@ -51,7 +51,10 @@ dnl Path to include, already defined
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_INCLUDE_PATH_EXIST], AC_DEFUN([WX_INCLUDE_PATH_EXIST],
[ [
ac_path_to_include=$1 dnl never add -I/usr/include to the CPPFLAGS
if test "x$1" = "x/usr/include"; then
ac_path_to_include=""
else
echo "$2" | grep "\-I$1" > /dev/null echo "$2" | grep "\-I$1" > /dev/null
result=$? result=$?
if test $result = 0; then if test $result = 0; then
@@ -59,6 +62,7 @@ AC_DEFUN([WX_INCLUDE_PATH_EXIST],
else else
ac_path_to_include=" -I$1" ac_path_to_include=" -I$1"
fi fi
fi
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -378,6 +382,59 @@ AC_DEFUN([WX_ARG_ENABLE],
]) ])
dnl ===========================================================================
dnl Linker features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_VERSIONED_SYMBOLS checks whether the linker can create versioned
dnl symbols. If it can, sets LDFLAGS_VERSIONING to $CXX flags needed to use
dnl version script file named versionfile
dnl
dnl call WX_VERSIONED_SYMBOLS(versionfile)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_VERSIONED_SYMBOLS],
[
found_versioning=no
dnl FIXME - doesn't work, Solaris linker doesn't accept wildcards
dnl in the script.
dnl dnl Check for known non-gcc cases:
dnl case "${host}" in
dnl *-*-solaris2* )
dnl if test "x$GCC" != "xyes" ; then
dnl LDFLAGS_VERSIONING="-M $1"
dnl found_versioning=yes
dnl fi
dnl ;;
dnl esac
dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
if test $found_versioning = no ; then
AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
[
echo "VER_1 { *; };" >conftest.sym
echo "int main() { return 0; }" >conftest.cpp
if AC_TRY_COMMAND([
$CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
if test -s conftest.stderr ; then
wx_cv_version_script=no
else
wx_cv_version_script=yes
fi
else
wx_cv_version_script=no
fi
rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
])
if test $wx_cv_version_script = yes ; then
LDFLAGS_VERSIONING="-Wl,--version-script,$1"
fi
fi
])
dnl =========================================================================== dnl ===========================================================================
dnl "3rd party" macros included here because they are not widely available dnl "3rd party" macros included here because they are not widely available

185
aclocal.m4 vendored
View File

@@ -1,4 +1,4 @@
dnl aclocal.m4 generated automatically by aclocal 1.4-p5 dnl aclocal.m4 generated automatically by aclocal 1.4-p6
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
@@ -31,7 +31,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_INCLUDES], AC_DEFUN([WX_PATH_FIND_INCLUDES],
[ [
ac_find_includes= ac_find_includes=
for ac_dir in $1; for ac_dir in $1 /usr/include;
do do
if test -f "$ac_dir/$2"; then if test -f "$ac_dir/$2"; then
ac_find_includes=$ac_dir ac_find_includes=$ac_dir
@@ -47,7 +47,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES], AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[ [
ac_find_libraries= ac_find_libraries=
for ac_dir in $1; for ac_dir in $1 /usr/lib;
do do
for ac_extension in a so sl dylib; do for ac_extension in a so sl dylib; do
if test -f "$ac_dir/lib$2.$ac_extension"; then if test -f "$ac_dir/lib$2.$ac_extension"; then
@@ -63,7 +63,10 @@ dnl Path to include, already defined
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_INCLUDE_PATH_EXIST], AC_DEFUN([WX_INCLUDE_PATH_EXIST],
[ [
ac_path_to_include=$1 dnl never add -I/usr/include to the CPPFLAGS
if test "x$1" = "x/usr/include"; then
ac_path_to_include=""
else
echo "$2" | grep "\-I$1" > /dev/null echo "$2" | grep "\-I$1" > /dev/null
result=$? result=$?
if test $result = 0; then if test $result = 0; then
@@ -71,6 +74,7 @@ AC_DEFUN([WX_INCLUDE_PATH_EXIST],
else else
ac_path_to_include=" -I$1" ac_path_to_include=" -I$1"
fi fi
fi
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -349,6 +353,10 @@ AC_DEFUN([WX_ARG_WITH],
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring) dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
dnl
dnl enablestring is a hack and allows to show "checking for --disable-foo"
dnl message when running configure instead of the default "checking for
dnl --enable-foo" one whih is useful for the options enabled by default
AC_DEFUN([WX_ARG_ENABLE], AC_DEFUN([WX_ARG_ENABLE],
[ [
enablestring=$4 enablestring=$4
@@ -386,6 +394,59 @@ AC_DEFUN([WX_ARG_ENABLE],
]) ])
dnl ===========================================================================
dnl Linker features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_VERSIONED_SYMBOLS checks whether the linker can create versioned
dnl symbols. If it can, sets LDFLAGS_VERSIONING to $CXX flags needed to use
dnl version script file named versionfile
dnl
dnl call WX_VERSIONED_SYMBOLS(versionfile)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_VERSIONED_SYMBOLS],
[
found_versioning=no
dnl FIXME - doesn't work, Solaris linker doesn't accept wildcards
dnl in the script.
dnl dnl Check for known non-gcc cases:
dnl case "${host}" in
dnl *-*-solaris2* )
dnl if test "x$GCC" != "xyes" ; then
dnl LDFLAGS_VERSIONING="-M $1"
dnl found_versioning=yes
dnl fi
dnl ;;
dnl esac
dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
if test $found_versioning = no ; then
AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
[
echo "VER_1 { *; };" >conftest.sym
echo "int main() { return 0; }" >conftest.cpp
if AC_TRY_COMMAND([
$CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
if test -s conftest.stderr ; then
wx_cv_version_script=no
else
wx_cv_version_script=yes
fi
else
wx_cv_version_script=no
fi
rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
])
if test $wx_cv_version_script = yes ; then
LDFLAGS_VERSIONING="-Wl,--version-script,$1"
fi
fi
])
dnl =========================================================================== dnl ===========================================================================
dnl "3rd party" macros included here because they are not widely available dnl "3rd party" macros included here because they are not widely available
@@ -729,64 +790,6 @@ main ()
rm -f conf.gtktest rm -f conf.gtktest
]) ])
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN(PKG_CHECK_MODULES, [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])
# Configure paths for GTK+ # Configure paths for GTK+
# Owen Taylor 97-11-3 # Owen Taylor 97-11-3
@@ -982,3 +985,61 @@ main ()
rm -f conf.gtktest rm -f conf.gtktest
]) ])
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN(PKG_CHECK_MODULES, [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])

39
art/addbookm.xpm
View File

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

29
art/back.xpm
View File

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

110
art/deffile.xpm
View File

@@ -1,31 +1,83 @@
/* XPM */ /* XPM */
static char * deffile_xpm[] = { static char *deffile_xpm[] = {
"16 16 12 1", /* columns rows colors chars-per-pixel */
"16 16 61 1",
"% c #E8E8EC",
"k c #D9D9E0",
"= c #E8E8ED",
"V c #CACAD4",
"8 c #D9D9E1",
"h c #D2D2DA",
"y c #E1E1E7",
"l c #D2D2DB",
"< c #E9E9ED",
"t c #E9E9EE",
"e c #DADAE1",
"x c #E2E2E7",
"+ c #F1F1F4",
"m c #D3D3DB",
"1 c #E2E2E8",
"C c #D3D3DC",
"$ c #EAEAEE",
"4 c #DBDBE2",
"M c #CCCCD6",
"q c #E3E3E8",
"f c #D4D4DC",
"a c #E3E3E9",
"v c #D4D4DD",
"7 c #DCDCE2",
": c #EBEBEF",
"w c #DCDCE3",
" c None", " c None",
". c #000000", "O c #F3F3F5",
"+ c #808080", "> c #E4E4E9",
"@ c #FFFFFF", "& c #F3F3F6",
"# c #282829", "n c #D5D5DD",
"$ c #505052", "6 c #E4E4EA",
"% c #78787B", ". c #C6C6D5",
"& c #A0A0A4", "g c #DDDDE3",
"* c #404040", "# c #ECECF0",
"= c #1F1F1F", "b c #CECED7",
"- c #3F3F3F", "j c #DDDDE4",
"; c #2F2F2F", "B c #CECED8",
" ", "0 c #E5E5EA",
" ....... ", "p c #D6D6DE",
" .+@@@@@@# ", "; c #EDEDF0",
" .+@@@@@@$% ", "3 c #DEDEE4",
" .+@@@@@@$&% ", ", c #EDEDF1",
" .+@@@@@@#$$# ", "Z c #CFCFD8",
" .+@@@@@@@@@@. ", "u c #DEDEE5",
" .+@@@@@@@@@@. ", "o c #F5F5F7",
" .+@@@@@@@@@@. ", "c c #D7D7DE",
" .+@@@@@@@@@@. ", "- c #E6E6EB",
" .+@@@@@@@@@@. ", "r c #D7D7DF",
" .+@@@@@@@@@@. ", "A c #C8C8D3",
" .*++++++++++. ", "s c #DFDFE5",
" .=---=;-----. ", "@ c #EEEEF2",
" ", "z c #D0D0D9",
" "}; "X c #9494AD",
"5 c #E7E7EB",
"i c #D8D8DF",
"9 c #E7E7EC",
"d c #D8D8E0",
"* c #EFEFF2",
"2 c #E0E0E6",
"N c #D1D1DA",
/* pixels */
" ........X ",
" .oO+@#$%XX ",
" .&+*#$=-XXX ",
" .+*;:=->XXXX ",
" .*,:<->1234X ",
" .,:<5612378X ",
" .:<90q23werX ",
" .t90qyuweipX ",
" .90ayswedpfX ",
" .-aysg4dpfhX ",
" .>ysj4kpflzX ",
" .xsj4kcvlzbX ",
" .234krnmzbMX ",
" .378rnmNBMVX ",
" .wernCNZMVAX ",
" XXXXXXXXXXXX "
};

43
art/delbookm.xpm
View File

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

35
art/down.xpm
View File

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

145
art/exefile.xpm
View File

@@ -1,76 +1,73 @@
/* XPM */ /* XPM */
static char * exefile_xpm[] = { static char *exefile_xpm[] = {
"16 16 57 1", /* columns rows colors chars-per-pixel */
"16 16 51 1",
"% c #E8E8EC",
"= c #E8E8ED",
"z c #CACAD4",
"8 c #D9D9E1",
"p c #D2D2DA",
"u c #E1E1E7",
"a c #D2D2DB",
"< c #E9E9ED",
"q c #DADAE1",
"+ c #F1F1F4",
"g c #D3D3DB",
"1 c #E2E2E8",
"x c #D3D3DC",
"5 c #00A5FF",
"$ c #EAEAEE",
"4 c #DBDBE2",
"h c #CCCCD6",
"y c #D4D4DC",
"r c #E3E3E9",
"d c #D4D4DD",
"7 c #DCDCE2",
": c #EBEBEF",
"0 c #DCDCE3",
" c None", " c None",
". c #000000", "O c #F3F3F5",
"+ c #808080", "> c #E4E4E9",
"@ c #650000", "& c #F3F3F6",
"# c #CB0000", "j c #D5D5DD",
"$ c #700000", "6 c #E4E4EA",
"% c #CDCDCD", ". c #C6C6D5",
"& c #D2D2D2", "# c #ECECF0",
"* c #D7D7D7", "f c #CECED7",
"= c #282829", "l c #CECED8",
"- c #FF0000", "e c #D6D6DE",
"; c #E60000", "; c #EDEDF0",
"> c #FFFFFF", "3 c #DEDEE4",
", c #505052", ", c #EDEDF1",
"' c #78787B", "c c #CFCFD8",
") c #CC0000", "o c #F5F5F7",
"! c #F70000", "- c #E6E6EB",
"~ c #A0A0A4", "w c #D7D7DF",
"{ c #8C4848", "v c #C8C8D3",
"] c #FFA0A0", "i c #DFDFE5",
"^ c #A95959", "@ c #EEEEF2",
"/ c #DBDBDB", "s c #D0D0D9",
"( c #F7F7F7", "X c #9494AD",
"_ c #0000C8", "9 c #D8D8DF",
": c #0000F4", "t c #D8D8E0",
"< c #ECECEC", "* c #EFEFF2",
"[ c #1010BC", "2 c #E0E0E6",
"} c #1313E8", "k c #D1D1DA",
"| c #EDEDED", /* pixels */
"1 c #8B8B8B", " ........X ",
"2 c #AFAFAF", " .oO+@#$%XX ",
"3 c #C4C4C4", " .&+*#$=-XXX ",
"4 c #FDFDFD", " .+*;:=->XXXX ",
"5 c #E8E8E8", " .*,:<->1234X ",
"6 c #FFFF00", " .,5:5612378X ",
"7 c #007300", " 5,5559530qwX ",
"8 c #00B200", " 55555550q9eX ",
"9 c #BFBFBF", " 5555r5555teyX ",
"0 c #CBCBCB", " 55rui559eypX ",
"a c #DEDEDE", " 5555i5555yasX ",
"b c #00A800", " 5555555dasfX ",
"c c #00FF00", " 5355595gsfhX ",
"d c #BEBEBE", " .3595jgklhzX ",
"e c #FCFCFC", " .0qwjxkchzvX ",
"f c #7D7D7D", " XXXXXXXXXXXX "
"g c #F8F8F8", };
"h c #888888",
"i c #F8F800",
"j c #F7F700",
"k c #006200",
"l c #00A100",
"m c #757575",
"n c #959595",
"o c #404040",
"p c #1F1F1F",
"q c #3F3F3F",
"r c #2F2F2F",
" ",
" ........ ",
" .+@#$%&*= ",
" .+#-;>>>,' ",
" .+)-!>>>,~' ",
" .+{]^>>>=,,= ",
" .+/>(>>>>>_:. ",
" .+<>>>>>>>[}. ",
" .+|>>>>>>>12. ",
" .+|>>>>>>>34. ",
" .+/>56667894. ",
" .+0>a666bcde. ",
" .+fghiijklmn. ",
" .o++++++++++. ",
" .pqqqpprqqqq. ",
" "};

29
art/forward.xpm
View File

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

556
art/gtk/error.xpm
View File

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

509
art/gtk/info.xpm
View File

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

174
art/gtk/question.xpm
View File

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

324
art/gtk/warning.xpm
View File

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

46
art/home.xpm
View File

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

57
art/htmbook.xpm
View File

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

45
art/htmfoldr.xpm
View File

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

3
art/htmoptns.xpm
View File

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

42
art/htmpage.xpm
View File

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

59
art/htmsidep.xpm
View File

@@ -1,35 +1,28 @@
/* XPM */ /* XPM */
static char * htmsidep_xpm[] = { static char *htmsidep_xpm[] = {
"16 15 17 1", /* columns rows colors chars-per-pixel */
"16 16 6 1",
". c Black",
"X c #FFFFFF",
"+ c #808080",
" c None", " c None",
". c #000000", "O c #0000C0",
"+ c #800000", "o c #C0C0C0",
"@ c #008000", /* pixels */
"# c #808000", " ",
"$ c #000080", " .............. ",
"% c #800080", " .XXXX.ooooooo. ",
"& c #008080", " .XOXX.oo...oo. ",
"* c #C0C0C0", " .XXOX.ooooooo. ",
"= c #808080", " .OOOO.o...+.o. ",
"- c #FF0000", " .XXOX.ooooooo. ",
"; c #00FF00", " .XOXX.ooooooo. ",
"> c #FFFF00", " .XXXX.o..+ooo. ",
", c #0000FF", " .XXOX.ooooooo. ",
"' c #FF00FF", " .XOXX.o...+.o. ",
") c #00FFFF", " .OOOO.ooooooo. ",
"! c #FFFFFF", " .XOXX.o.+...o. ",
"****************", " .XXOX.ooooooo. ",
"*..............*", " .............. ",
"*.************.*", " "
"*..............*", };
"*.****.!!!!!!!.*",
"*.****.!====*!.*",
"*.****.!!!!!!!.*",
"*.****.!===*!!.*",
"*.****.!!!!!!!.*",
"*.****.!====*!.*",
"*.****.!!!!!!!.*",
"*.****.!===*!!.*",
"*.****.!!!!!!!.*",
"*..............*",
"****************"};

50
art/listview.xpm
View File

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

177
art/motif/error.xpm
View File

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

259
art/motif/info.xpm
View File

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

277
art/motif/question.xpm
View File

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

241
art/motif/warning.xpm
View File

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

40
art/tick.xpm
View File

@@ -1,32 +1,18 @@
/* XPM */ /* XPM */
static char *tick_xpm[] = { static char *tick_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"10 10 16 1", "10 10 2 1",
" c Gray0", ". c Gray0",
". c #bf0000", " c None",
"X c #00bf00",
"o c #bfbf00",
"O c #0000bf",
"+ c #bf00bf",
"@ c #00bfbf",
"# c None",
"$ c #808080",
"% c Red",
"& c Green",
"* c Yellow",
"= c Blue",
"- c Magenta",
"; c Cyan",
": c Gray100",
/* pixels */ /* pixels */
"##########", " ",
"######## #", " ..",
"####### ", " ...",
"###### ", " ... ",
"##### #", ".. ... ",
" ## ##", "... ... ",
" ###", " ..... ",
"# ####", " ... ",
"## #####", " . ",
"### ######" " ",
}; };

35
art/toparent.xpm
View File

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

35
art/up.xpm
View File

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

BIN
art/wxwin.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
art/wxwin16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

25
art/wxwin16x16.xpm Normal file
View File

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

BIN
art/wxwin32x32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

41
art/wxwin32x32.xpm Normal file
View File

@@ -0,0 +1,41 @@
/* XPM */
static char *wxwin32x32_xpm[] = {
"32 32 6 1",
" c None",
". c #000000",
"X c #000084",
"o c #FFFFFF",
"O c #FFFF00",
"+ c #FF0000",
" ",
" ",
" ",
" ",
" ",
" .............. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXX..............",
" .XooXXXXXX.OOOOOOOOOOOO.",
".........XooXXXXXX.OOOOOOOOOOOO.",
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
".+oo++++...........OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OOOOOOOOOOOO.",
".+oo+++++++++. .OOOOOOOOOOOO.",
".++++++++++++. ..............",
".++++++++++++. ",
".............. ",
" ",
" ",
" ",
" ",
" "};

572
config.guess vendored
View File

@@ -1,9 +1,9 @@
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# Free Software Foundation, Inc. # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
timestamp='2001-09-04' timestamp='2004-03-12'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@ timestamp='2001-09-04'
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# Written by Per Bothner <bothner@cygnus.com>. # Originally written by Per Bothner <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>. # Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
# #
# This script attempts to guess a canonical system name similar to # This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and # config.sub. If it succeeds, it prints the system name on stdout, and
@@ -87,30 +88,42 @@ if test $# != 0; then
exit 1 exit 1
fi fi
trap 'exit 1' 1 2 15
dummy=dummy-$$ # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 # compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.
# CC_FOR_BUILD -- compiler used by this script.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated. # use `HOST_CC' if defined, but it is deprecated.
set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in # Portable tmp directory creation inspired by the Autoconf team.
,,) echo "int dummy(){}" > $dummy.c ;
for c in cc gcc c89 ; do set_cc_for_build='
($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
if test $? = 0 ; then trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int x;" > $dummy.c ;
for c in cc gcc c89 c99 ; do
if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ; CC_FOR_BUILD="$c"; break ;
fi ; fi ;
done ; done ;
rm -f $dummy.c $dummy.o $dummy.rel ;
if test x"$CC_FOR_BUILD" = x ; then if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ; CC_FOR_BUILD=no_compiler_found ;
fi fi
;; ;;
,,*) CC_FOR_BUILD=$CC ;; ,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;;
esac' esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe. # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24) # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -127,29 +140,30 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*) *:NetBSD:*:*)
# Netbsd (nbsd) targets should (where applicable) match one or # NetBSD (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old # switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward # object file format. This provides both forward
# compatibility and a consistent mechanism for selecting the # compatibility and a consistent mechanism for selecting the
# object file format. # object file format.
# Determine the machine/vendor (is the vendor relevant). #
case "${UNAME_MACHINE}" in # Note: NetBSD doesn't particularly care about the vendor
amiga) machine=m68k-unknown ;; # portion of the name. We always set it to "unknown".
arm32) machine=arm-unknown ;; sysctl="sysctl -n hw.machine_arch"
atari*) machine=m68k-atari ;; UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
sun3*) machine=m68k-sun ;; /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
mac68k) machine=m68k-apple ;; case "${UNAME_MACHINE_ARCH}" in
macppc) machine=powerpc-apple ;; armeb) machine=armeb-unknown ;;
hp3[0-9][05]) machine=m68k-hp ;; arm*) machine=arm-unknown ;;
ibmrt|romp-ibm) machine=romp-ibm ;; sh3el) machine=shl-unknown ;;
*) machine=${UNAME_MACHINE}-unknown ;; sh3eb) machine=sh-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac esac
# The Operating System including object format, if it has switched # The Operating System including object format, if it has switched
# to ELF recently, or will in the future. # to ELF recently, or will in the future.
case "${UNAME_MACHINE}" in case "${UNAME_MACHINE_ARCH}" in
i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null | grep __ELF__ >/dev/null
@@ -166,74 +180,135 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;; ;;
esac esac
# The OS release # The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
case "${UNAME_VERSION}" in
Debian*)
release='-gnu'
;;
*)
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form: # contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}" echo "${machine}-${os}${release}"
exit 0 ;; exit 0 ;;
amd64:OpenBSD:*:*)
echo x86_64-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
arc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
cats:OpenBSD:*:*)
echo arm-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
macppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme88k:OpenBSD:*:*)
echo m88k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pegasos:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sgi:OpenBSD:*:*)
echo mipseb-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sun3:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit 0 ;;
macppc:MirBSD:*:*)
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
exit 0 ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit 0 ;;
alpha:OSF1:*:*) alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then case $UNAME_RELEASE in
*4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
fi ;;
*5.*)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
# types through head -n 1, so we only detect the type of CPU 0.
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
case "$ALPHA_CPU_TYPE" in
"EV4 (21064)")
UNAME_MACHINE="alpha" ;;
"EV4.5 (21064)")
UNAME_MACHINE="alpha" ;;
"LCA4 (21066/21068)")
UNAME_MACHINE="alpha" ;;
"EV5 (21164)")
UNAME_MACHINE="alphaev5" ;;
"EV5.6 (21164A)")
UNAME_MACHINE="alphaev56" ;;
"EV5.6 (21164PC)")
UNAME_MACHINE="alphapca56" ;;
"EV5.7 (21164PC)")
UNAME_MACHINE="alphapca57" ;;
"EV6 (21264)")
UNAME_MACHINE="alphaev6" ;;
"EV6.7 (21264A)")
UNAME_MACHINE="alphaev67" ;;
"EV6.8CB (21264C)")
UNAME_MACHINE="alphaev68" ;;
"EV6.8AL (21264B)")
UNAME_MACHINE="alphaev68" ;;
"EV6.8CX (21264D)")
UNAME_MACHINE="alphaev68" ;;
"EV6.9A (21264/EV69A)")
UNAME_MACHINE="alphaev69" ;;
"EV7 (21364)")
UNAME_MACHINE="alphaev7" ;;
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
# A Pn.n version is a patched version.
# A Vn.n version is a released version. # A Vn.n version is a released version.
# A Tn.n version is a released field test version. # A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel. # A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r. # 1.2 uses "1.2" for uname -r.
cat <<EOF >$dummy.s echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
.data exit 0 ;;
\$Lformat: Alpha*:OpenVMS:*:*)
.byte 37,100,45,37,120,10,0 # "%d-%x\n" echo alpha-hp-vms
.text
.globl main
.align 4
.ent main
main:
.frame \$30,16,\$26,0
ldgp \$29,0(\$27)
.prologue 1
.long 0x47e03d80 # implver \$0
lda \$2,-1
.long 0x47e20c21 # amask \$2,\$1
lda \$16,\$Lformat
mov \$0,\$17
not \$1,\$18
jsr \$26,printf
ldgp \$29,0(\$26)
mov 0,\$16
jsr \$26,exit
.end main
EOF
eval $set_cc_for_build
$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
if test "$?" = 0 ; then
case `./$dummy` in
0-0)
UNAME_MACHINE="alpha"
;;
1-0)
UNAME_MACHINE="alphaev5"
;;
1-1)
UNAME_MACHINE="alphaev56"
;;
1-101)
UNAME_MACHINE="alphapca56"
;;
2-303)
UNAME_MACHINE="alphaev6"
;;
2-307)
UNAME_MACHINE="alphaev67"
;;
2-1307)
UNAME_MACHINE="alphaev68"
;;
esac
fi
rm -f $dummy.s $dummy
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;; exit 0 ;;
Alpha\ *:Windows_NT*:*) Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem? # How do we know it's Interix rather than the generic POSIX subsystem?
@@ -247,33 +322,18 @@ EOF
Amiga*:UNIX_System_V:4.0:*) Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4 echo m68k-unknown-sysv4
exit 0;; exit 0;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:[Aa]miga[Oo][Ss]:*:*) *:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;; exit 0 ;;
arc64:OpenBSD:*:*) *:[Mm]orph[Oo][Ss]:*:*)
echo mips64el-unknown-openbsd${UNAME_RELEASE} echo ${UNAME_MACHINE}-unknown-morphos
exit 0 ;;
arc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
hkmips:OpenBSD:*:*)
echo mips-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sgi:OpenBSD:*:*)
echo mips-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:OS/390:*:*) *:OS/390:*:*)
echo i370-ibm-openedition echo i370-ibm-openedition
exit 0 ;; exit 0 ;;
*:OS400:*:*)
echo powerpc-ibm-os400
exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE} echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;; exit 0;;
@@ -291,6 +351,13 @@ EOF
NILE*:*:*:dcosx) NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4 echo pyramid-pyramid-svr4
exit 0 ;; exit 0 ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
exit 0 ;;
DRS?6000:UNIX_SV:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
esac ;;
sun4H:SunOS:5.*:*) sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;; exit 0 ;;
@@ -319,7 +386,7 @@ EOF
echo m68k-sun-sunos${UNAME_RELEASE} echo m68k-sun-sunos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
sun*:*:4.2BSD:*) sun*:*:4.2BSD:*)
UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in case "`/bin/arch`" in
sun3) sun3)
@@ -333,12 +400,6 @@ EOF
aushp:SunOS:*:*) aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE} echo sparc-auspex-sunos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
sparc*:NetBSD:*)
echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
exit 0 ;;
atari*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
# The situation for MiNT is a little confusing. The machine name # The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not # can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor # "atarist" or "atariste" at least should have a processor
@@ -365,17 +426,8 @@ EOF
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE} echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
sun3*:OpenBSD:*:*) m68k:machten:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE} echo m68k-apple-machten${UNAME_RELEASE}
exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme88k:OpenBSD:*:*)
echo m88k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
powerpc:machten:*:*) powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE} echo powerpc-apple-machten${UNAME_RELEASE}
@@ -415,15 +467,20 @@ EOF
exit (-1); exit (-1);
} }
EOF EOF
$CC_FOR_BUILD $dummy.c -o $dummy \ $CC_FOR_BUILD -o $dummy $dummy.c \
&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
&& rm -f $dummy.c $dummy && exit 0 && exit 0
rm -f $dummy.c $dummy
echo mips-mips-riscos${UNAME_RELEASE} echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
Motorola:PowerMAX_OS:*:*) Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax echo powerpc-motorola-powermax
exit 0 ;; exit 0 ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
exit 0 ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
exit 0 ;;
Night_Hawk:Power_UNIX:*:*) Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix echo powerpc-harris-powerunix
exit 0 ;; exit 0 ;;
@@ -496,8 +553,7 @@ EOF
exit(0); exit(0);
} }
EOF EOF
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
rm -f $dummy.c $dummy
echo rs6000-ibm-aix3.2.5 echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4 echo rs6000-ibm-aix3.2.4
@@ -506,7 +562,7 @@ EOF
fi fi
exit 0 ;; exit 0 ;;
*:AIX:*:[45]) *:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000 IBM_ARCH=rs6000
else else
@@ -546,8 +602,6 @@ EOF
9000/31? ) HP_ARCH=m68000 ;; 9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;; 9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9]) 9000/[678][0-9][0-9])
case "${HPUX_REV}" in
11.[0-9][0-9])
if [ -x /usr/bin/getconf ]; then if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
@@ -558,10 +612,10 @@ EOF
case "${sc_kernel_bits}" in case "${sc_kernel_bits}" in
32) HP_ARCH="hppa2.0n" ;; 32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;; 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;; esac ;;
esac esac
fi ;; fi
esac
if [ "${HP_ARCH}" = "" ]; then if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c sed 's/^ //' << EOF >$dummy.c
@@ -597,11 +651,21 @@ EOF
exit (0); exit (0);
} }
EOF EOF
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi test -z "$HP_ARCH" && HP_ARCH=hppa
rm -f $dummy.c $dummy
fi ;; fi ;;
esac esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
# avoid double evaluation of $set_cc_for_build
test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
HP_ARCH="hppa64"
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV} echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;; exit 0 ;;
ia64:HP-UX:*:*) ia64:HP-UX:*:*)
@@ -635,8 +699,7 @@ EOF
exit (0); exit (0);
} }
EOF EOF
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
rm -f $dummy.c $dummy
echo unknown-hitachi-hiuxwe2 echo unknown-hitachi-hiuxwe2
exit 0 ;; exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -664,9 +727,6 @@ EOF
parisc*:Lites*:*:*) parisc*:Lites*:*:*)
echo hppa1.1-hp-lites echo hppa1.1-hp-lites
exit 0 ;; exit 0 ;;
hppa*:OpenBSD:*:*)
echo hppa-unknown-openbsd
exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd echo c1-convex-bsd
exit 0 ;; exit 0 ;;
@@ -685,9 +745,6 @@ EOF
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd echo c4-convex-bsd
exit 0 ;; exit 0 ;;
CRAY*X-MP:*:*:*)
echo xmp-cray-unicos
exit 0 ;;
CRAY*Y-MP:*:*:*) CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
@@ -700,17 +757,14 @@ EOF
CRAY*TS:*:*:*) CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
CRAY*T3D:*:*:*)
echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*T3E:*:*:*) CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
CRAY*SV1:*:*:*) CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
CRAY-2:*:*:*) *:UNICOS/mp:*:*)
echo cray2-cray-unicos echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -718,8 +772,10 @@ EOF
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;; exit 0 ;;
hp300:OpenBSD:*:*) 5000:UNIX_System_V:4.*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE} FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;; exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -731,10 +787,21 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:FreeBSD:*:*) *:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` # Determine whether the default compiler uses glibc.
exit 0 ;; eval $set_cc_for_build
*:OpenBSD:*:*) sed 's/^ //' << EOF >$dummy.c
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` #include <features.h>
#if __GLIBC__ >= 2
LIBC=gnu
#else
LIBC=
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
# FreeBSD's kernel, but not the complete OS.
case ${LIBC} in gnu) kernel_only='k' ;; esac
echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
exit 0 ;; exit 0 ;;
i*:CYGWIN*:*) i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin echo ${UNAME_MACHINE}-pc-cygwin
@@ -745,11 +812,17 @@ EOF
i*:PW*:*) i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32 echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;; exit 0 ;;
x86:Interix*:[34]*)
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
exit 0 ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*) i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem? # How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386? # UNAME_MACHINE based on the output of uname instead of i386?
echo i386-pc-interix echo i586-pc-interix
exit 0 ;; exit 0 ;;
i*:UWIN*:*) i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin echo ${UNAME_MACHINE}-pc-uwin
@@ -761,25 +834,68 @@ EOF
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;; exit 0 ;;
*:GNU:*:*) *:GNU:*:*)
# the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;; exit 0 ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit 0 ;;
i*86:Minix:*:*) i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix echo ${UNAME_MACHINE}-pc-minix
exit 0 ;; exit 0 ;;
arm*:Linux:*:*) arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;; exit 0 ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit 0 ;;
ia64:Linux:*:*) ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;; exit 0 ;;
m68*:Linux:*:*) m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;; exit 0 ;;
mips:Linux:*:*) mips:Linux:*:*)
case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in eval $set_cc_for_build
big) echo mips-unknown-linux-gnu && exit 0 ;; sed 's/^ //' << EOF >$dummy.c
little) echo mipsel-unknown-linux-gnu && exit 0 ;; #undef CPU
esac #undef mips
#undef mipsel
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mipsel
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips
#else
CPU=
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;;
mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
#undef mips64
#undef mips64el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mips64el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips64
#else
CPU=
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;; ;;
ppc:Linux:*:*) ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu echo powerpc-unknown-linux-gnu
@@ -815,6 +931,9 @@ EOF
s390:Linux:*:* | s390x:Linux:*:*) s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux echo ${UNAME_MACHINE}-ibm-linux
exit 0 ;; exit 0 ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
sh*:Linux:*:*) sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;; exit 0 ;;
@@ -828,7 +947,8 @@ EOF
# The BFD linker knows what the default object file format is, so # The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent # first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path. # problems with other programs or directories called `ld' in the path.
ld_supported_targets=`cd /; ld --help 2>&1 \ # Set LC_ALL=C to ensure ld outputs messages in English.
ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
| sed -ne '/supported targets:/!d | sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g s/[ ][ ]*/ /g
s/.*supported targets: *// s/.*supported targets: *//
@@ -852,32 +972,31 @@ EOF
esac esac
# Determine whether the default compiler is a.out or elf # Determine whether the default compiler is a.out or elf
eval $set_cc_for_build eval $set_cc_for_build
cat >$dummy.c <<EOF sed 's/^ //' << EOF >$dummy.c
#include <features.h> #include <features.h>
#ifdef __cplusplus #ifdef __ELF__
#include <stdio.h> /* for printf() prototype */ # ifdef __GLIBC__
int main (int argc, char *argv[]) { # if __GLIBC__ >= 2
#else LIBC=gnu
int main (argc, argv) int argc; char *argv[]; { # else
#endif LIBC=gnulibc1
#ifdef __ELF__ # endif
# ifdef __GLIBC__ # else
# if __GLIBC__ >= 2 LIBC=gnulibc1
printf ("%s-pc-linux-gnu\n", argv[1]); # endif
# else #else
printf ("%s-pc-linux-gnulibc1\n", argv[1]); #ifdef __INTEL_COMPILER
# endif LIBC=gnu
# else #else
printf ("%s-pc-linux-gnulibc1\n", argv[1]); LIBC=gnuaout
# endif #endif
#else #endif
printf ("%s-pc-linux-gnuaout\n", argv[1]); #ifdef __dietlibc__
#endif LIBC=dietlibc
return 0; #endif
}
EOF EOF
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
rm -f $dummy.c $dummy test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;; ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)
@@ -894,6 +1013,26 @@ EOF
# Use sysv4.2uw... so that sysv4* matches it. # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;; exit 0 ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
exit 0 ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
exit 0 ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
exit 0 ;;
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -915,22 +1054,19 @@ EOF
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586 && UNAME_MACHINE=i586
(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
&& UNAME_MACHINE=i686 && UNAME_MACHINE=i686
(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686 && UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else else
echo ${UNAME_MACHINE}-pc-sysv32 echo ${UNAME_MACHINE}-pc-sysv32
fi fi
exit 0 ;; exit 0 ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit 0 ;;
pc:*:*:*) pc:*:*:*)
# Left here for compatibility: # Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -954,9 +1090,15 @@ EOF
# "miniframe" # "miniframe"
echo m68010-convergent-sysv echo m68010-convergent-sysv
exit 0 ;; exit 0 ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
exit 0 ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
exit 0 ;;
M68*:*:R3V[567]*:*) M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
OS_REL='' OS_REL=''
test -r /etc/.relid \ test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -973,9 +1115,6 @@ EOF
mc68030:UNIX_System_V:4.*:*) mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4 echo m68k-atari-sysv4
exit 0 ;; exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
TSUNAMI:LynxOS:2.*:*) TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE} echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
@@ -1047,6 +1186,9 @@ EOF
SX-5:SUPER-UX:*:*) SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE} echo sx5-nec-superux${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit 0 ;;
Power*:Rhapsody:*:*) Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE} echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
@@ -1054,18 +1196,24 @@ EOF
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:Darwin:*:*) *:Darwin:*:*)
echo `uname -p`-apple-darwin${UNAME_RELEASE} case `uname -p` in
*86) UNAME_PROCESSOR=i686 ;;
powerpc) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*) *:procnto*:*:* | *:QNX:[0123456789]*:*)
if test "${UNAME_MACHINE}" = "x86pc"; then UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc UNAME_MACHINE=pc
fi fi
echo `uname -p`-${UNAME_MACHINE}-nto-qnx echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:QNX:*:4*) *:QNX:*:4*)
echo i386-pc-qnx echo i386-pc-qnx
exit 0 ;; exit 0 ;;
NSR-[KW]:NONSTOP_KERNEL:*:*) NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE} echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:NonStop-UX:*:*) *:NonStop-UX:*:*)
@@ -1088,11 +1236,6 @@ EOF
fi fi
echo ${UNAME_MACHINE}-unknown-plan9 echo ${UNAME_MACHINE}-unknown-plan9
exit 0 ;; exit 0 ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
exit 0 ;;
*:TOPS-10:*:*) *:TOPS-10:*:*)
echo pdp10-unknown-tops10 echo pdp10-unknown-tops10
exit 0 ;; exit 0 ;;
@@ -1111,11 +1254,11 @@ EOF
*:ITS:*:*) *:ITS:*:*)
echo pdp10-unknown-its echo pdp10-unknown-its
exit 0 ;; exit 0 ;;
i*86:XTS-300:*:STOP) SEI:*:*:SEIUX)
echo ${UNAME_MACHINE}-unknown-stop echo mips-sei-seiux${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
i*86:atheos:*:*) *:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-atheos echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;; exit 0 ;;
esac esac
@@ -1237,8 +1380,7 @@ main ()
} }
EOF EOF
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
rm -f $dummy.c $dummy
# Apollos put the system type in the environment. # Apollos put the system type in the environment.

324
config.sub vendored
View File

@@ -1,9 +1,9 @@
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# Free Software Foundation, Inc. # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
timestamp='2001-09-07' timestamp='2004-03-12'
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-09-07'
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# Please send patches to <config-patches@gnu.org>. # Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
# #
# Configuration subroutine to validate and canonicalize a configuration type. # Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument. # Supply the specified configuration type as an argument.
@@ -117,7 +118,8 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations. # Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in case $maybe_os in
nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;; ;;
@@ -226,32 +228,46 @@ case $basic_machine in
1750a | 580 \ 1750a | 580 \
| a29k \ | a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| c4x | clipper \ | c4x | clipper \
| d10v | d30v | dsp16xx \ | d10v | d30v | dlx | dsp16xx \
| fr30 \ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \ | i370 | i860 | i960 | ia64 \
| m32r | m68000 | m68k | m88k | mcore \ | ip2k | iq2000 \
| mips16 | mips64 | mips64el | mips64orion | mips64orionel \ | m32r | m32rle | m68000 | m68k | m88k | mcore \
| mips64vr4100 | mips64vr4100el | mips64vr4300 \ | mips | mipsbe | mipseb | mipsel | mipsle \
| mips64vr4300el | mips64vr5000 | mips64vr5000el \ | mips16 \
| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ | mips64 | mips64el \
| mipsisa32 \ | mips64vr | mips64vrel \
| mips64orion | mips64orionel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \ | mn10200 | mn10300 \
| msp430 \
| ns16k | ns32k \ | ns16k | ns32k \
| openrisc \ | openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \ | pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \ | pyramid \
| s390 | s390x \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh | sh[34] | sh[34]eb | shbe | shle \ | sh64 | sh64le \
| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
| stormy16 | strongarm \ | strongarm \
| tahoe | thumb | tic80 | tron \ | tahoe | thumb | tic4x | tic80 | tron \
| v850 \ | v850 | v850e \
| we32k \ | we32k \
| x86 | xscale \ | x86 | xscale | xstormy16 | xtensa \
| z8k) | z8k)
basic_machine=$basic_machine-unknown basic_machine=$basic_machine-unknown
;; ;;
@@ -278,38 +294,56 @@ case $basic_machine in
580-* \ 580-* \
| a29k-* \ | a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alphapca5[67]-* | arc-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| arm-* | armbe-* | armle-* | armv*-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
| bs2000-* \ | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c54x-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | cray2-* | cydra-* \ | clipper-* | cydra-* \
| d10v-* | d30v-* \ | d10v-* | d30v-* | dlx-* \
| elxsi-* \ | elxsi-* \
| f30[01]-* | f700-* | fr30-* | fx80-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \ | h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \ | i*86-* | i860-* | i960-* | ia64-* \
| m32r-* \ | ip2k-* | iq2000-* \
| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \ | m88110-* | m88k-* | mcore-* \
| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ | mips16-* \
| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ | mips64-* | mips64el-* \
| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ | mips64vr-* | mips64vrel-* \
| none-* | np1-* | ns16k-* | ns32k-* \ | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| msp430-* \
| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
| orion-* \ | orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \ | pyramid-* \
| romp-* | rs6000-* \ | romp-* | rs6000-* \
| s390-* | s390x-* \ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc86x-* | sparclite-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ | tahoe-* | thumb-* \
| v850-* | vax-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \ | we32k-* \
| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
| xtensa-* \
| ymp-* \ | ymp-* \
| z8k-*) | z8k-*)
;; ;;
@@ -329,6 +363,9 @@ case $basic_machine in
basic_machine=a29k-amd basic_machine=a29k-amd
os=-udi os=-udi
;; ;;
abacus)
basic_machine=abacus-unknown
;;
adobe68k) adobe68k)
basic_machine=m68010-adobe basic_machine=m68010-adobe
os=-scout os=-scout
@@ -343,6 +380,12 @@ case $basic_machine in
basic_machine=a29k-none basic_machine=a29k-none
os=-bsd os=-bsd
;; ;;
amd64)
basic_machine=x86_64-pc
;;
amd64-*)
basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
amdahl) amdahl)
basic_machine=580-amdahl basic_machine=580-amdahl
os=-sysv os=-sysv
@@ -374,6 +417,10 @@ case $basic_machine in
basic_machine=ns32k-sequent basic_machine=ns32k-sequent
os=-dynix os=-dynix
;; ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
convex-c1) convex-c1)
basic_machine=c1-convex basic_machine=c1-convex
os=-bsd os=-bsd
@@ -394,17 +441,13 @@ case $basic_machine in
basic_machine=c38-convex basic_machine=c38-convex
os=-bsd os=-bsd
;; ;;
cray | ymp) cray | j90)
basic_machine=ymp-cray basic_machine=j90-cray
os=-unicos os=-unicos
;; ;;
cray2) cr16c)
basic_machine=cray2-cray basic_machine=cr16c-unknown
os=-unicos os=-elf
;;
[cjt]90)
basic_machine=${basic_machine}-cray
os=-unicos
;; ;;
crds | unos) crds | unos)
basic_machine=m68k-crds basic_machine=m68k-crds
@@ -412,12 +455,24 @@ case $basic_machine in
cris | cris-* | etrax*) cris | cris-* | etrax*)
basic_machine=cris-axis basic_machine=cris-axis
;; ;;
crx)
basic_machine=crx-unknown
os=-elf
;;
da30 | da30-*) da30 | da30-*)
basic_machine=m68k-da30 basic_machine=m68k-da30
;; ;;
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec basic_machine=mips-dec
;; ;;
decsystem10* | dec10*)
basic_machine=pdp10-dec
os=-tops10
;;
decsystem20* | dec20*)
basic_machine=pdp10-dec
os=-tops20
;;
delta | 3300 | motorola-3300 | motorola-delta \ delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola) | 3300-motorola | delta-motorola)
basic_machine=m68k-motorola basic_machine=m68k-motorola
@@ -598,14 +653,6 @@ case $basic_machine in
basic_machine=m68k-atari basic_machine=m68k-atari
os=-mint os=-mint
;; ;;
mipsel*-linux*)
basic_machine=mipsel-unknown
os=-linux-gnu
;;
mips*-linux*)
basic_machine=mips-unknown
os=-linux-gnu
;;
mips3*-*) mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;; ;;
@@ -620,6 +667,10 @@ case $basic_machine in
basic_machine=m68k-rom68k basic_machine=m68k-rom68k
os=-coff os=-coff
;; ;;
morphos)
basic_machine=powerpc-unknown
os=-morphos
;;
msdos) msdos)
basic_machine=i386-pc basic_machine=i386-pc
os=-msdos os=-msdos
@@ -692,6 +743,10 @@ case $basic_machine in
np1) np1)
basic_machine=np1-gould basic_machine=np1-gould
;; ;;
nv1)
basic_machine=nv1-cray
os=-unicosmp
;;
nsr-tandem) nsr-tandem)
basic_machine=nsr-tandem basic_machine=nsr-tandem
;; ;;
@@ -699,6 +754,14 @@ case $basic_machine in
basic_machine=hppa1.1-oki basic_machine=hppa1.1-oki
os=-proelf os=-proelf
;; ;;
or32 | or32-*)
basic_machine=or32-unknown
os=-coff
;;
os400)
basic_machine=powerpc-ibm
os=-os400
;;
OSE68000 | ose68000) OSE68000 | ose68000)
basic_machine=m68000-ericsson basic_machine=m68000-ericsson
os=-ose os=-ose
@@ -724,24 +787,30 @@ case $basic_machine in
pc532 | pc532-*) pc532 | pc532-*)
basic_machine=ns32k-pc532 basic_machine=ns32k-pc532
;; ;;
pentium | p5 | k5 | k6 | nexgen) pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc basic_machine=i586-pc
;; ;;
pentiumpro | p6 | 6x86 | athlon) pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc basic_machine=i686-pc
;; ;;
pentiumii | pentium2) pentiumii | pentium2 | pentiumiii | pentium3)
basic_machine=i686-pc basic_machine=i686-pc
;; ;;
pentium-* | p5-* | k5-* | k6-* | nexgen-*) pentium4)
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
pentiumpro-* | p6-* | 6x86-* | athlon-*) pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
pentiumii-* | pentium2-*) pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
pentium4-*)
basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn) pn)
basic_machine=pn-gould basic_machine=pn-gould
;; ;;
@@ -784,10 +853,26 @@ case $basic_machine in
rtpc | rtpc-*) rtpc | rtpc-*)
basic_machine=romp-ibm basic_machine=romp-ibm
;; ;;
s390 | s390-*)
basic_machine=s390-ibm
;;
s390x | s390x-*)
basic_machine=s390x-ibm
;;
sa29200) sa29200)
basic_machine=a29k-amd basic_machine=a29k-amd
os=-udi os=-udi
;; ;;
sb1)
basic_machine=mipsisa64sb1-unknown
;;
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
sei)
basic_machine=mips-sei
os=-seiux
;;
sequent) sequent)
basic_machine=i386-sequent basic_machine=i386-sequent
;; ;;
@@ -795,7 +880,10 @@ case $basic_machine in
basic_machine=sh-hitachi basic_machine=sh-hitachi
os=-hms os=-hms
;; ;;
sparclite-wrs) sh64)
basic_machine=sh64-unknown
;;
sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs basic_machine=sparclite-wrs
os=-vxworks os=-vxworks
;; ;;
@@ -862,22 +950,42 @@ case $basic_machine in
os=-dynix os=-dynix
;; ;;
t3e) t3e)
basic_machine=t3e-cray basic_machine=alphaev5-cray
os=-unicos
;;
t90)
basic_machine=t90-cray
os=-unicos os=-unicos
;; ;;
tic54x | c54x*) tic54x | c54x*)
basic_machine=tic54x-unknown basic_machine=tic54x-unknown
os=-coff os=-coff
;; ;;
tic55x | c55x*)
basic_machine=tic55x-unknown
os=-coff
;;
tic6x | c6x*)
basic_machine=tic6x-unknown
os=-coff
;;
tx39) tx39)
basic_machine=mipstx39-unknown basic_machine=mipstx39-unknown
;; ;;
tx39el) tx39el)
basic_machine=mipstx39el-unknown basic_machine=mipstx39el-unknown
;; ;;
toad1)
basic_machine=pdp10-xkl
os=-tops20
;;
tower | tower-32) tower | tower-32)
basic_machine=m68k-ncr basic_machine=m68k-ncr
;; ;;
tpf)
basic_machine=s390x-ibm
os=-tpf
;;
udi29k) udi29k)
basic_machine=a29k-amd basic_machine=a29k-amd
os=-udi os=-udi
@@ -921,17 +1029,13 @@ case $basic_machine in
basic_machine=hppa1.1-winbond basic_machine=hppa1.1-winbond
os=-proelf os=-proelf
;; ;;
windows32)
basic_machine=i386-pc
os=-windows32-msvcrt
;;
xmp)
basic_machine=xmp-cray
os=-unicos
;;
xps | xps100) xps | xps100)
basic_machine=xps100-honeywell basic_machine=xps100-honeywell
;; ;;
ymp)
basic_machine=ymp-cray
os=-unicos
;;
z8k-*-coff) z8k-*-coff)
basic_machine=z8k-unknown basic_machine=z8k-unknown
os=-sim os=-sim
@@ -952,13 +1056,6 @@ case $basic_machine in
op60c) op60c)
basic_machine=hppa1.1-oki basic_machine=hppa1.1-oki
;; ;;
mips)
if [ x$os = x-linux-gnu ]; then
basic_machine=mips-unknown
else
basic_machine=mips-mips
fi
;;
romp) romp)
basic_machine=romp-ibm basic_machine=romp-ibm
;; ;;
@@ -978,10 +1075,13 @@ case $basic_machine in
we32k) we32k)
basic_machine=we32k-att basic_machine=we32k-att
;; ;;
sh3 | sh4 | sh3eb | sh4eb) sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown basic_machine=sh-unknown
;; ;;
sparc | sparcv9 | sparcv9b) sh64)
basic_machine=sh64-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun basic_machine=sparc-sun
;; ;;
cydra) cydra)
@@ -999,10 +1099,6 @@ case $basic_machine in
pmac | pmac-mpw) pmac | pmac-mpw)
basic_machine=powerpc-apple basic_machine=powerpc-apple
;; ;;
c4x*)
basic_machine=c4x-none
os=-coff
;;
*-unknown) *-unknown)
# Make sure to match an already-canonicalized machine name. # Make sure to match an already-canonicalized machine name.
;; ;;
@@ -1058,17 +1154,20 @@ case $os in
| -aos* \ | -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos*) | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
# Remember, each alternative MUST END IN *, to match a version number. # Remember, each alternative MUST END IN *, to match a version number.
;; ;;
-qnx*) -qnx*)
@@ -1080,8 +1179,10 @@ case $os in
;; ;;
esac esac
;; ;;
-nto-qnx*)
;;
-nto*) -nto*)
os=-nto-qnx os=`echo $os | sed -e 's|nto|nto-qnx|'`
;; ;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1090,6 +1191,9 @@ case $os in
-mac*) -mac*)
os=`echo $os | sed -e 's|mac|macos|'` os=`echo $os | sed -e 's|mac|macos|'`
;; ;;
-linux-dietlibc)
os=-linux-dietlibc
;;
-linux*) -linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'` os=`echo $os | sed -e 's|linux|linux-gnu|'`
;; ;;
@@ -1102,6 +1206,9 @@ case $os in
-opened*) -opened*)
os=-openedition os=-openedition
;; ;;
-os400*)
os=-os400
;;
-wince*) -wince*)
os=-wince os=-wince
;; ;;
@@ -1120,12 +1227,21 @@ case $os in
-acis*) -acis*)
os=-aos os=-aos
;; ;;
-atheos*)
os=-atheos
;;
-syllable*)
os=-syllable
;;
-386bsd) -386bsd)
os=-bsd os=-bsd
;; ;;
-ctix* | -uts*) -ctix* | -uts*)
os=-sysv os=-sysv
;; ;;
-nova*)
os=-rtmk-nova
;;
-ns2 ) -ns2 )
os=-nextstep2 os=-nextstep2
;; ;;
@@ -1139,6 +1255,9 @@ case $os in
-sinix*) -sinix*)
os=-sysv4 os=-sysv4
;; ;;
-tpf*)
os=-tpf
;;
-triton*) -triton*)
os=-sysv3 os=-sysv3
;; ;;
@@ -1169,6 +1288,12 @@ case $os in
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint os=-mint
;; ;;
-aros*)
os=-aros
;;
-kaos*)
os=-kaos
;;
-none) -none)
;; ;;
*) *)
@@ -1200,6 +1325,10 @@ case $basic_machine in
arm*-semi) arm*-semi)
os=-aout os=-aout
;; ;;
c4x-* | tic4x-*)
os=-coff
;;
# This must come before the *-dec entry.
pdp10-*) pdp10-*)
os=-tops20 os=-tops20
;; ;;
@@ -1230,6 +1359,9 @@ case $basic_machine in
mips*-*) mips*-*)
os=-elf os=-elf
;; ;;
or32-*)
os=-coff
;;
*-tti) # must be before sparc entry or we get the wrong os. *-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3 os=-sysv3
;; ;;
@@ -1374,10 +1506,16 @@ case $basic_machine in
-mvs* | -opened*) -mvs* | -opened*)
vendor=ibm vendor=ibm
;; ;;
-os400*)
vendor=ibm
;;
-ptx*) -ptx*)
vendor=sequent vendor=sequent
;; ;;
-vxsim* | -vxworks*) -tpf*)
vendor=ibm
;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs vendor=wrs
;; ;;
-aux*) -aux*)

3006
configure vendored
View File

File diff suppressed because it is too large Load Diff

749
configure.in
View File

File diff suppressed because it is too large Load Diff

3979
contrib/configure vendored
View File

File diff suppressed because it is too large Load Diff

18
contrib/configure.in
View File

@@ -26,11 +26,21 @@ dnl Final subst
PATH_IFS=$wx_cv_path_ifs PATH_IFS=$wx_cv_path_ifs
WX_TARGET_LIBRARY=$wx_cv_target_library WX_TARGET_LIBRARY=$wx_cv_target_library
WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
WX_LIBRARY_BASENAME=$wx_cv_library_basename
WX_RELEASE=$wx_cv_release
WX_CURRENT=$wx_cv_current
WX_REVISION=$wx_cv_revision
WX_AGE=$wx_cv_age
AC_SUBST(PATH_IFS) AC_SUBST(PATH_IFS)
AC_SUBST(ESD_LINK) AC_SUBST(ESD_LINK)
AC_SUBST(WX_TARGET_LIBRARY) AC_SUBST(WX_TARGET_LIBRARY)
AC_SUBST(WX_TARGET_LIBRARY_TYPE) AC_SUBST(WX_TARGET_LIBRARY_TYPE)
AC_SUBST(WX_LIBRARY_BASENAME)
AC_SUBST(WX_RELEASE)
AC_SUBST(WX_CURRENT)
AC_SUBST(WX_REVISION)
AC_SUBST(WX_AGE)
dnl ----------- dnl -----------
dnl File output dnl File output
@@ -49,21 +59,25 @@ AC_OUTPUT([
src/applet/Makefile src/applet/Makefile
src/fl/Makefile src/fl/Makefile
src/net/Makefile src/net/Makefile
src/animate/Makefile
samples/Makefile samples/Makefile
samples/animate/Makefile
samples/mmedia/Makefile samples/mmedia/Makefile
samples/ogl/Makefile samples/ogl/Makefile
samples/ogl/ogledit/Makefile samples/ogl/ogledit/Makefile
samples/ogl/studio/Makefile samples/ogl/studio/Makefile
samples/stc/Makefile samples/stc/Makefile
samples/svg/Makefile
samples/canvas/Makefile samples/canvas/Makefile
samples/canvas/test/Makefile samples/canvas/test/Makefile
samples/canvas/simple/Makefile samples/canvas/simple/Makefile
samples/gizmos/Makefile samples/gizmos/Makefile
samples/gizmos/multicell/Makefile
samples/gizmos/splittree/Makefile
samples/gizmos/editlbox/Makefile samples/gizmos/editlbox/Makefile
samples/gizmos/dynsash/Makefile samples/gizmos/dynsash/Makefile
samples/gizmos/dynsash_switch/Makefile samples/gizmos/dynsash_switch/Makefile
samples/gizmos/multicell/Makefile
samples/gizmos/splittree/Makefile
samples/gizmos/led/Makefile
samples/xrc/Makefile samples/xrc/Makefile
samples/plot/Makefile samples/plot/Makefile
samples/applet/Makefile samples/applet/Makefile

BIN
contrib/docs/latex/fl/books.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
contrib/docs/latex/fl/books.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 440 B

BIN
contrib/docs/latex/fl/contents.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 996 B

After

Width:  |  Height:  |  Size: 996 B

BIN
contrib/docs/latex/fl/shelves.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 630 B

3
contrib/docs/latex/fl/tex2rtf.ini
View File

@@ -29,9 +29,6 @@ htmlFaceName = "Arial, Lucida, Helvetica"
htmlWorkshopFiles = true htmlWorkshopFiles = true
htmlIndex = true htmlIndex = true
;\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
;\htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
;\sethotspotcolour{on}\sethotspotunderline{on}}
\overview [2] {\helpref{#1}{#2}} \overview [2] {\helpref{#1}{#2}}
\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}} \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
%\wxheading [1]{{\bf \fcol{blue}{#1}}} %\wxheading [1]{{\bf \fcol{blue}{#1}}}

BIN
contrib/docs/latex/gizmos/books.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
contrib/docs/latex/gizmos/books.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 440 B

BIN
contrib/docs/latex/gizmos/contents.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 996 B

After

Width:  |  Height:  |  Size: 996 B

BIN
contrib/docs/latex/gizmos/shelves.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 630 B

3
contrib/docs/latex/gizmos/tex2rtf.ini
View File

@@ -29,9 +29,6 @@ htmlFaceName = "Arial, Lucida, Helvetica"
htmlWorkshopFiles = true htmlWorkshopFiles = true
htmlIndex = true htmlIndex = true
;\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
;\htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
;\sethotspotcolour{on}\sethotspotunderline{on}}
\overview [2] {\helpref{#1}{#2}} \overview [2] {\helpref{#1}{#2}}
\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}} \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
%\wxheading [1]{{\bf \fcol{blue}{#1}}} %\wxheading [1]{{\bf \fcol{blue}{#1}}}

BIN
contrib/docs/latex/mmedia/books.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
contrib/docs/latex/mmedia/books.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 440 B

BIN
contrib/docs/latex/mmedia/contents.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 996 B

2
contrib/docs/latex/mmedia/tex2rtf.ini
View File

@@ -16,7 +16,7 @@ winHelpContents = yes
winHelpTitle = "MMedia Manual" winHelpTitle = "MMedia Manual"
truncateFilenames = no truncateFilenames = no
combineSubSections = yes combineSubSections = yes
\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}} \overview [2] {\helpref{#1}{#2}}
\htmlonly{\image{}{books.gif}}\helpref{#1}{#2} \htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
\sethotspotcolour{on}\sethotspotunderline{on}} \sethotspotcolour{on}\sethotspotunderline{on}}
\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}} \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}

BIN
contrib/docs/latex/ogl/books.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
contrib/docs/latex/ogl/books.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 440 B

BIN
contrib/docs/latex/ogl/contents.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 996 B

After

Width:  |  Height:  |  Size: 996 B

2
contrib/docs/latex/ogl/tex2rtf.ini
View File

@@ -16,7 +16,7 @@ winHelpContents = yes
winHelpTitle = "OGL Manual" winHelpTitle = "OGL Manual"
truncateFilenames = yes truncateFilenames = yes
combineSubSections = yes combineSubSections = yes
\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}} \overview [2] {\helpref{#1}{#2}}
\htmlonly{\image{}{books.gif}}\helpref{#1}{#2} \htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
\sethotspotcolour{on}\sethotspotunderline{on}} \sethotspotcolour{on}\sethotspotunderline{on}}
\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}} \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}

BIN
contrib/docs/latex/svg/contents.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 996 B

After

Width:  |  Height:  |  Size: 996 B

2
contrib/docs/latex/svg/tex2rtf.ini
View File

@@ -16,7 +16,7 @@ winHelpContents = yes
winHelpTitle = "SVG Manual" winHelpTitle = "SVG Manual"
truncateFilenames = yes truncateFilenames = yes
combineSubSections = yes combineSubSections = yes
\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}} \overview [2] {\helpref{#1}{#2}}
\htmlonly{\image{}{books.gif}}\helpref{#1}{#2} \htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
\sethotspotcolour{on}\sethotspotunderline{on}} \sethotspotcolour{on}\sethotspotunderline{on}}
\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}} \docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}

3
contrib/include/wx/animate/animate.h
View File

@@ -21,6 +21,7 @@
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/list.h> #include <wx/list.h>
#include <wx/timer.h> #include <wx/timer.h>
#include <wx/control.h>
//#define ANIMDLLEXPORT WXDLLEXPORT //#define ANIMDLLEXPORT WXDLLEXPORT
#define ANIMDLLEXPORT #define ANIMDLLEXPORT
@@ -138,7 +139,7 @@ public:
//// Implementation //// Implementation
// Play the frame // Play the frame
virtual bool PlayFrame(int frame, wxWindow& window, wxPoint& pos); virtual bool PlayFrame(int frame, wxWindow& window, const wxPoint& pos);
virtual bool PlayFrame(); virtual bool PlayFrame();
virtual void DrawFrame(int frame, wxDC& dc, const wxPoint& pos); virtual void DrawFrame(int frame, wxDC& dc, const wxPoint& pos);
virtual void DrawBackground(wxDC& dc, const wxPoint& pos, const wxColour& colour); virtual void DrawBackground(wxDC& dc, const wxPoint& pos, const wxColour& colour);

2
contrib/include/wx/canvas/bbox.h
View File

@@ -21,7 +21,7 @@ class wxBoundingBox
{ {
public: public:
wxBoundingBox(); wxBoundingBox();
wxBoundingBox(wxBoundingBox&); wxBoundingBox(const wxBoundingBox&);
wxBoundingBox(const wxPoint2DDouble&); wxBoundingBox(const wxPoint2DDouble&);
wxBoundingBox(double xmin, double ymin, double xmax, double ymax); wxBoundingBox(double xmin, double ymin, double xmax, double ymax);

2
contrib/include/wx/fl/antiflickpl.h
View File

@@ -26,7 +26,7 @@ antiflicker plugins within the application.
Locking for multithreaded applications is not yet implemented. Locking for multithreaded applications is not yet implemented.
*/ */
class cbAntiflickerPlugin : public cbPluginBase class WXFL_DECLSPEC cbAntiflickerPlugin : public cbPluginBase
{ {
DECLARE_DYNAMIC_CLASS( cbAntiflickerPlugin ) DECLARE_DYNAMIC_CLASS( cbAntiflickerPlugin )
protected: protected:

2
contrib/include/wx/fl/bardragpl.h
View File

@@ -23,7 +23,7 @@
Plugin class implementing bar dragging. Plugin class implementing bar dragging.
*/ */
class cbBarDragPlugin : public cbPluginBase class WXFL_DECLSPEC cbBarDragPlugin : public cbPluginBase
{ {
DECLARE_DYNAMIC_CLASS( cbBarDragPlugin ) DECLARE_DYNAMIC_CLASS( cbBarDragPlugin )
protected: protected:

2
contrib/include/wx/fl/barhintspl.h
View File

@@ -24,7 +24,7 @@ This class intercepts bar-decoration and sizing events, and draws 3D hints
around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x
*/ */
class cbBarHintsPlugin : public cbPluginBase class WXFL_DECLSPEC cbBarHintsPlugin : public cbPluginBase
{ {
DECLARE_DYNAMIC_CLASS( cbBarHintsPlugin ) DECLARE_DYNAMIC_CLASS( cbBarHintsPlugin )

2
contrib/include/wx/fl/cbcustom.h
View File

@@ -24,7 +24,7 @@ menu and handling basic customization such as floating
and horizontal/vertical alignment of the bar. and horizontal/vertical alignment of the bar.
*/ */
class cbSimpleCustomizationPlugin : public cbPluginBase class WXFL_DECLSPEC cbSimpleCustomizationPlugin : public cbPluginBase
{ {
public: public:
DECLARE_DYNAMIC_CLASS( cbSimpleCustomizationPlugin ) DECLARE_DYNAMIC_CLASS( cbSimpleCustomizationPlugin )

41
contrib/include/wx/fl/controlbar.h
View File

@@ -21,30 +21,31 @@
#include "wx/string.h" #include "wx/string.h"
#include "wx/window.h" #include "wx/window.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/fl/fldefs.h"
#define WXCONTROLBAR_VERSION 1.3 #define WXCONTROLBAR_VERSION 1.3
// forward declarations // forward declarations
class wxFrameLayout; class WXFL_DECLSPEC wxFrameLayout;
class cbDockPane; class WXFL_DECLSPEC cbDockPane;
class cbUpdatesManagerBase; class WXFL_DECLSPEC cbUpdatesManagerBase;
class cbBarDimHandlerBase; class WXFL_DECLSPEC cbBarDimHandlerBase;
class cbPluginBase; class WXFL_DECLSPEC cbPluginBase;
class cbPluginEvent; class WXFL_DECLSPEC cbPluginEvent;
class cbPaneDrawPlugin; class WXFL_DECLSPEC cbPaneDrawPlugin;
class cbBarInfo; class WXFL_DECLSPEC cbBarInfo;
class cbRowInfo; class WXFL_DECLSPEC cbRowInfo;
class cbDimInfo; class WXFL_DECLSPEC cbDimInfo;
class cbCommonPaneProperties; class WXFL_DECLSPEC cbCommonPaneProperties;
typedef cbBarInfo* BarInfoPtrT; typedef cbBarInfo* BarInfoPtrT;
typedef cbRowInfo* RowInfoPtrT; typedef cbRowInfo* RowInfoPtrT;
WX_DEFINE_ARRAY( BarInfoPtrT, BarArrayT ); WXFL_DEFINE_ARRAY( BarInfoPtrT, BarArrayT );
WX_DEFINE_ARRAY( RowInfoPtrT, RowArrayT ); WXFL_DEFINE_ARRAY( RowInfoPtrT, RowArrayT );
// control bar states // control bar states
@@ -97,7 +98,7 @@ Helper class, used for spying for unhandled mouse events on control bars
and forwarding them to the frame layout. and forwarding them to the frame layout.
*/ */
class cbBarSpy : public wxEvtHandler class WXFL_DECLSPEC cbBarSpy : public wxEvtHandler
{ {
public: public:
DECLARE_DYNAMIC_CLASS( cbBarSpy ) DECLARE_DYNAMIC_CLASS( cbBarSpy )
@@ -129,7 +130,7 @@ which can be docked along the top, bottom, right, or left side of the
parent frame. parent frame.
*/ */
class wxFrameLayout : public wxEvtHandler class WXFL_DECLSPEC wxFrameLayout : public wxEvtHandler
{ {
public: public:
// Default constructor, used only for serialization. // Default constructor, used only for serialization.
@@ -238,7 +239,7 @@ public:
int alignment = FL_ALIGN_TOP, int alignment = FL_ALIGN_TOP,
int rowNo = 0, int rowNo = 0,
int columnPos = 0, int columnPos = 0,
const wxString& name="bar", const wxString& name = wxT("bar"),
bool spyEvents = FALSE, bool spyEvents = FALSE,
int state = wxCBAR_DOCKED_HORIZONTALLY int state = wxCBAR_DOCKED_HORIZONTALLY
); );
@@ -647,7 +648,7 @@ used by any particular updates-manager to store
auxiliary information to be used by its updating algorithm. auxiliary information to be used by its updating algorithm.
*/ */
class cbUpdateMgrData : public wxObject class WXFL_DECLSPEC cbUpdateMgrData : public wxObject
{ {
DECLARE_DYNAMIC_CLASS( cbUpdateMgrData ) DECLARE_DYNAMIC_CLASS( cbUpdateMgrData )
public: public:
@@ -687,7 +688,7 @@ to adjust the values in cbDimInfo::mSizes accordingly.
Specific handlers can be hooked up to specific types of bar. Specific handlers can be hooked up to specific types of bar.
*/ */
class cbBarDimHandlerBase : public wxObject class WXFL_DECLSPEC cbBarDimHandlerBase : public wxObject
{ {
DECLARE_ABSTRACT_CLASS( cbBarDimHandlerBase ) DECLARE_ABSTRACT_CLASS( cbBarDimHandlerBase )
@@ -725,7 +726,7 @@ Helper class used internally by the wxFrameLayout class.
Holds and manages information about bar dimensions. Holds and manages information about bar dimensions.
*/ */
class cbDimInfo : public wxObject class WXFL_DECLSPEC cbDimInfo : public wxObject
{ {
DECLARE_DYNAMIC_CLASS( cbDimInfo ) DECLARE_DYNAMIC_CLASS( cbDimInfo )
public: public:
@@ -824,7 +825,7 @@ public:
}; };
// FIXME: this array definition compiles but probably doesn't do what was intended (GD) // FIXME: this array definition compiles but probably doesn't do what was intended (GD)
WX_DEFINE_ARRAY_LONG(float, cbArrayFloat); WXFL_DEFINE_ARRAY_LONG(float, cbArrayFloat);
/* /*
Helper class used internally by the wxFrameLayout class. Helper class used internally by the wxFrameLayout class.

23
contrib/include/wx/fl/dyntbar.h
View File

@@ -18,12 +18,13 @@
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/fl/fldefs.h"
/* /*
Tool layout item. Tool layout item.
*/ */
class wxToolLayoutItem : public wxObject class WXFL_DECLSPEC wxToolLayoutItem : public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxToolLayoutItem) DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
@@ -32,19 +33,19 @@ public:
bool mIsSeparator; bool mIsSeparator;
}; };
class wxDynToolInfo; class WXFL_DECLSPEC wxDynToolInfo;
typedef wxToolLayoutItem* wxToolLayoutItemPtrT; typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
typedef wxDynToolInfo* wxDynToolInfoPtrT; typedef wxDynToolInfo* wxDynToolInfoPtrT;
WX_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT ); WXFL_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT );
WX_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT ); WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT );
/* /*
This is a base class for layout algorithm implementations. This is a base class for layout algorithm implementations.
*/ */
class LayoutManagerBase class WXFL_DECLSPEC LayoutManagerBase
{ {
public: public:
// Constructor. // Constructor.
@@ -63,7 +64,7 @@ BagLayout lays out items in left-to-right order from
top to bottom. top to bottom.
*/ */
class BagLayout : public LayoutManagerBase class WXFL_DECLSPEC BagLayout : public LayoutManagerBase
{ {
public: public:
// Constructor. // Constructor.
@@ -78,7 +79,7 @@ public:
This class holds dynamic toolbar item information. This class holds dynamic toolbar item information.
*/ */
class wxDynToolInfo : public wxToolLayoutItem class WXFL_DECLSPEC wxDynToolInfo : public wxToolLayoutItem
{ {
DECLARE_DYNAMIC_CLASS(wxDynToolInfo) DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
@@ -98,7 +99,7 @@ public:
wxDynamicToolBar manages containment and layout of tool windows. wxDynamicToolBar manages containment and layout of tool windows.
*/ */
class wxDynamicToolBar : public wxToolBarBase class WXFL_DECLSPEC wxDynamicToolBar : public wxToolBarBase
{ {
protected: protected:
friend class wxDynamicToolBarSerializer; friend class wxDynamicToolBarSerializer;
@@ -147,12 +148,12 @@ public:
virtual void AddTool( int toolIndex, virtual void AddTool( int toolIndex,
const wxString& imageFileName, const wxString& imageFileName,
wxBitmapType imageFileType = wxBITMAP_TYPE_BMP, wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
const wxString& labelText = "", bool alignTextRight = FALSE, const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
bool isFlat = TRUE ); bool isFlat = TRUE );
// Adds a tool. See the documentation for wxToolBar for details. // Adds a tool. See the documentation for wxToolBar for details.
virtual void AddTool( int toolIndex, wxBitmap labelBmp, virtual void AddTool( int toolIndex, wxBitmap labelBmp,
const wxString& labelText = "", bool alignTextRight = FALSE, const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
bool isFlat = TRUE ); bool isFlat = TRUE );
// Method from wxToolBarBase (for compatibility), only // Method from wxToolBarBase (for compatibility), only
@@ -161,7 +162,7 @@ public:
virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL, const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
const wxString& helpString1 = "", const wxString& helpString2 = ""); const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
// Adds a separator. See the documentation for wxToolBar for details. // Adds a separator. See the documentation for wxToolBar for details.

2
contrib/include/wx/fl/dyntbarhnd.h
View File

@@ -23,7 +23,7 @@
Dynamic toolbar dimension handler. Dynamic toolbar dimension handler.
*/ */
class cbDynToolBarDimHandler : public cbBarDimHandlerBase class WXFL_DECLSPEC cbDynToolBarDimHandler : public cbBarDimHandlerBase
{ {
DECLARE_DYNAMIC_CLASS( cbDynToolBarDimHandler ) DECLARE_DYNAMIC_CLASS( cbDynToolBarDimHandler )
public: public:

50
contrib/include/wx/fl/fldefs.h Normal file
View File

@@ -0,0 +1,50 @@
/////////////////////////////////////////////////////////////////////////////
// Name: fldefs.h
// Purpose: Declaration of global types and defines.
// Author: David M. Falkinder (david_falkinder@hp.com)
// Modified by:
// Created: 18/09/2002
// RCS-ID: $Id$
// Copyright: (c) David M. Falkinder
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __fldefs_H_INCLUDED__
#define __fldefs_H_INCLUDED__
#include "wx/defs.h"
/*
* If we're using wx in Dynamic Library format do we
* want FL to be in DLL form as well?
*/
#if defined(WXUSINGDLL) && \
(defined(WXMAKING_FL_DLL) || defined(WXUSING_FL_DLL))
#if defined(WXMAKING_FL_DLL)
// When building the DLL WXFLDECLSPEC exports classes
# define WXFL_DECLSPEC WXEXPORT
#elif defined(WXUSING_FL_DLL)
// When building the DLL WXFLDECLSPEC imports classes
# define WXFL_DECLSPEC WXIMPORT
#endif // defined(WXBUILD_FL_DLL)
#else
// When building the static library nullify the effect of WXFL_DECLSPEC
#define WXFL_DECLSPEC
#endif // WXUSINGDLL && (WXMAKING_FL_DLL || WXUSING_FL_DLL)
///////////////////////////////////////////////////////////////////////////////
// Override some of the wxArray functions to
// include our definitions
///////////////////////////////////////////////////////////////////////////////
#define WXFL_DEFINE_ARRAY(c,l) \
class WXFL_DECLSPEC l; \
WX_DEFINE_ARRAY(c,l)
#define WXFL_DEFINE_ARRAY_LONG(t,l) \
class WXFL_DECLSPEC l; \
WX_DEFINE_ARRAY_LONG(t,l)
#endif // __fldefs_H_INCLUDED__

4
contrib/include/wx/fl/frmview.h
View File

@@ -32,7 +32,7 @@ class wxFrameManager;
It is not clear what this class does. It is not used elsewhere in FL. It is not clear what this class does. It is not used elsewhere in FL.
*/ */
class wxFrameView : public wxEvtHandler class WXFL_DECLSPEC wxFrameView : public wxEvtHandler
{ {
protected: protected:
wxStringList mTopMenus; wxStringList mTopMenus;
@@ -87,7 +87,7 @@ class wxFrame;
It is not clear what this class does. It is not used elsewhere in FL. It is not clear what this class does. It is not used elsewhere in FL.
*/ */
class wxFrameManager : wxObject class WXFL_DECLSPEC wxFrameManager : wxObject
{ {
protected: protected:
wxList mViews; wxList mViews;

3
contrib/include/wx/fl/garbagec.h
View File

@@ -17,6 +17,7 @@
#endif #endif
#include "wx/list.h" #include "wx/list.h"
#include "wx/fl/fldefs.h"
struct GCItem struct GCItem
{ {
@@ -33,7 +34,7 @@ inline void* gc_node_to_obj( wxNode* pGCNode )
This class implements an extremely slow but simple garbage collection algorithm. This class implements an extremely slow but simple garbage collection algorithm.
*/ */
class GarbageCollector class WXFL_DECLSPEC GarbageCollector
{ {
protected: protected:
wxList mAllNodes; wxList mAllNodes;

2
contrib/include/wx/fl/gcupdatesmgr.h
View File

@@ -93,7 +93,7 @@ to avoid dirty non-client areas of moved windows
in some special cases of 'overlapping anomalies'. in some special cases of 'overlapping anomalies'.
*/ */
class cbGCUpdatesMgr : public cbSimpleUpdatesMgr class WXFL_DECLSPEC cbGCUpdatesMgr : public cbSimpleUpdatesMgr
{ {
DECLARE_DYNAMIC_CLASS( cbGCUpdatesMgr ) DECLARE_DYNAMIC_CLASS( cbGCUpdatesMgr )
protected: protected:

8
contrib/include/wx/fl/hintanimpl.h
View File

@@ -20,13 +20,13 @@
#include "wx/timer.h" #include "wx/timer.h"
class cbHintAnimTimer; class WXFL_DECLSPEC cbHintAnimTimer;
/* /*
A plugin to draw animated hints when the user drags a pane. A plugin to draw animated hints when the user drags a pane.
*/ */
class cbHintAnimationPlugin : public cbPluginBase class WXFL_DECLSPEC cbHintAnimationPlugin : public cbPluginBase
{ {
DECLARE_DYNAMIC_CLASS( cbHintAnimationPlugin ) DECLARE_DYNAMIC_CLASS( cbHintAnimationPlugin )
protected: protected:
@@ -101,7 +101,7 @@ public:
A private helper class. A private helper class.
*/ */
struct MorphInfoT struct WXFL_DECLSPEC MorphInfoT
{ {
wxPoint mFrom; wxPoint mFrom;
wxPoint mTill; wxPoint mTill;
@@ -111,7 +111,7 @@ struct MorphInfoT
A private helper class. A private helper class.
*/ */
class cbHintAnimTimer : public wxTimer class WXFL_DECLSPEC cbHintAnimTimer : public wxTimer
{ {
protected: protected:

16
contrib/include/wx/fl/newbmpbtn.h
View File

@@ -18,6 +18,7 @@
#include "wx/button.h" #include "wx/button.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/fl/fldefs.h"
// defaults // defaults
#define NB_DEFAULT_MARGIN 2 #define NB_DEFAULT_MARGIN 2
@@ -31,8 +32,8 @@
// classes declared in this header file // classes declared in this header file
class wxNewBitmapButton; class WXFL_DECLSPEC wxNewBitmapButton;
class wxBorderLessBitmapButton; class WXFL_DECLSPEC wxBorderLessBitmapButton;
/* /*
This is an alternative class to wxBitmapButton. It is used This is an alternative class to wxBitmapButton. It is used
@@ -109,7 +110,7 @@ public:
// Constructor. // Constructor.
wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap, wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
const wxString& labelText = "", const wxString& labelText = wxT(""),
int alignText = NB_ALIGN_TEXT_BOTTOM, int alignText = NB_ALIGN_TEXT_BOTTOM,
bool isFlat = TRUE, bool isFlat = TRUE,
// this is the default type of fired events // this is the default type of fired events
@@ -123,7 +124,7 @@ public:
// Use this constructor if buttons have to be persistant // Use this constructor if buttons have to be persistant
wxNewBitmapButton( const wxString& bitmapFileName, wxNewBitmapButton( const wxString& bitmapFileName,
const wxBitmapType bitmapFileType = wxBITMAP_TYPE_BMP, const wxBitmapType bitmapFileType = wxBITMAP_TYPE_BMP,
const wxString& labelText = "", const wxString& labelText = wxT(""),
int alignText = NB_ALIGN_TEXT_BOTTOM, int alignText = NB_ALIGN_TEXT_BOTTOM,
bool isFlat = TRUE, bool isFlat = TRUE,
// this is the default type of fired events // this is the default type of fired events
@@ -142,7 +143,7 @@ public:
virtual void Reshape(); virtual void Reshape();
// Sets the label and optionally label text. // Sets the label and optionally label text.
virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = "" ); virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = wxT("") );
// Sets the text alignment and margins. // Sets the text alignment and margins.
virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM, virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,
@@ -194,11 +195,6 @@ public:
// Responds to a kill focus event. // Responds to a kill focus event.
void OnKillFocus( wxFocusEvent& event ); void OnKillFocus( wxFocusEvent& event );
// Maps bitmap to current system colours on Windows
#ifdef __WXMSW__
WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
#endif
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

2
contrib/include/wx/fl/panedrawpl.h
View File

@@ -27,7 +27,7 @@ would be enough for the frame layout to function properly
(they are plugged in automatically by the wxFrameLayout class). (they are plugged in automatically by the wxFrameLayout class).
*/ */
class cbPaneDrawPlugin : public cbPluginBase class WXFL_DECLSPEC cbPaneDrawPlugin : public cbPluginBase
{ {
public: public:
DECLARE_DYNAMIC_CLASS( cbPaneDrawPlugin ) DECLARE_DYNAMIC_CLASS( cbPaneDrawPlugin )

4
contrib/include/wx/fl/rowdragpl.h
View File

@@ -25,7 +25,7 @@ The behaviour and appearance resembles drag and drop positioning
of the toolbar rows in Netscape Communicator 4.xx. of the toolbar rows in Netscape Communicator 4.xx.
*/ */
class cbRowDragPlugin : public cbPluginBase class WXFL_DECLSPEC cbRowDragPlugin : public cbPluginBase
{ {
DECLARE_DYNAMIC_CLASS( cbRowDragPlugin ) DECLARE_DYNAMIC_CLASS( cbRowDragPlugin )
public: public:
@@ -217,7 +217,7 @@ public:
Internal helper class. Internal helper class.
*/ */
class cbHiddenBarInfo : public wxObject class WXFL_DECLSPEC cbHiddenBarInfo : public wxObject
{ {
DECLARE_DYNAMIC_CLASS( cbHiddenBarInfo ) DECLARE_DYNAMIC_CLASS( cbHiddenBarInfo )
public: public:

2
contrib/include/wx/fl/rowlayoutpl.h
View File

@@ -23,7 +23,7 @@ Simple implementation of a plugin which handles row layout
requests sent from a frame layout. requests sent from a frame layout.
*/ */
class cbRowLayoutPlugin : public cbPluginBase class WXFL_DECLSPEC cbRowLayoutPlugin : public cbPluginBase
{ {
DECLARE_DYNAMIC_CLASS( cbRowLayoutPlugin ) DECLARE_DYNAMIC_CLASS( cbRowLayoutPlugin )
protected: protected:

15
contrib/include/wx/fl/toolwnd.h
View File

@@ -19,6 +19,7 @@
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/fl/fldefs.h"
// fixed settings // fixed settings
@@ -26,18 +27,18 @@
#define BTN_BOX_WIDTH 12 #define BTN_BOX_WIDTH 12
#define BTN_X_WIEGHT 2 #define BTN_X_WIEGHT 2
class cbMiniButton; class WXFL_DECLSPEC cbMiniButton;
typedef cbMiniButton* cbMinitButtonPtrT; typedef cbMiniButton* cbMinitButtonPtrT;
WX_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT ); WXFL_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT );
/* /*
A tool window is a special kind of frame that paints its own title, and A tool window is a special kind of frame that paints its own title, and
can be used to implement small floating windows. can be used to implement small floating windows.
*/ */
class wxToolWindow : public wxFrame class WXFL_DECLSPEC wxToolWindow : public wxFrame
{ {
DECLARE_DYNAMIC_CLASS( wxToolWindow ) DECLARE_DYNAMIC_CLASS( wxToolWindow )
@@ -221,7 +222,7 @@ public:
cbCloseBox is a window close button, used in a wxToolWindow titlebar. cbCloseBox is a window close button, used in a wxToolWindow titlebar.
*/ */
class cbCloseBox : public cbMiniButton class WXFL_DECLSPEC cbCloseBox : public cbMiniButton
{ {
public: public:
// Draws the close button appearance. // Draws the close button appearance.
@@ -232,7 +233,7 @@ public:
cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar. cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar.
*/ */
class cbCollapseBox : public cbMiniButton class WXFL_DECLSPEC cbCollapseBox : public cbMiniButton
{ {
public: public:
bool mIsAtLeft; bool mIsAtLeft;
@@ -245,7 +246,7 @@ public:
cbDockBox is a window dock button, used in a wxToolWindow titlebar. cbDockBox is a window dock button, used in a wxToolWindow titlebar.
*/ */
class cbDockBox : public cbMiniButton class WXFL_DECLSPEC cbDockBox : public cbMiniButton
{ {
public: public:
// Draws the dock button appearance. // Draws the dock button appearance.
@@ -257,7 +258,7 @@ cbFloatedBarWindow is a kind of wxToolWindow,
implementing floating toolbars. implementing floating toolbars.
*/ */
class cbFloatedBarWindow : public wxToolWindow class WXFL_DECLSPEC cbFloatedBarWindow : public wxToolWindow
{ {
DECLARE_DYNAMIC_CLASS( cbFloatedBarWindow ) DECLARE_DYNAMIC_CLASS( cbFloatedBarWindow )
protected: protected:

2
contrib/include/wx/fl/updatesmgr.h
View File

@@ -23,7 +23,7 @@ This class implements slightly optimized logic for refreshing
the areas of frame layout that actually need to be updated. the areas of frame layout that actually need to be updated.
*/ */
class cbSimpleUpdatesMgr : public cbUpdatesManagerBase class WXFL_DECLSPEC cbSimpleUpdatesMgr : public cbUpdatesManagerBase
{ {
DECLARE_DYNAMIC_CLASS( cbSimpleUpdatesMgr ) DECLARE_DYNAMIC_CLASS( cbSimpleUpdatesMgr )
protected: protected:

6
contrib/include/wx/gizmos/dynamicsash.h
View File

@@ -142,19 +142,21 @@ typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashSplit
/* /*
wxDynamicSashWindow. See above. wxDynamicSashWindow. See above.
*/ */
extern const wxChar* GIZMODLLEXPORT wxDynamicSashWindowNameStr;
class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow { class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow {
public: public:
wxDynamicSashWindow(); wxDynamicSashWindow();
wxDynamicSashWindow(wxWindow *parent, wxWindowID id, wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER, long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
const wxString& name = "dynamicSashWindow"); const wxString& name = wxDynamicSashWindowNameStr);
virtual ~wxDynamicSashWindow(); virtual ~wxDynamicSashWindow();
virtual bool Create(wxWindow *parent, wxWindowID id, virtual bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER, long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
const wxString& name = "dynamicSashWindow"); const wxString& name = wxDynamicSashWindowNameStr);
virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const; virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const; virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;

2
contrib/include/wx/gizmos/multicell.h
View File

@@ -40,7 +40,7 @@
enum wxResizable enum wxResizable
{ {
wxNOT_RESIZABLE = 0x00, wxNOT_RESIZABLE = 0x00,
wxHORIZENTAL_RESIZABLE = 0x01, wxHORIZONTAL_RESIZABLE = 0x01,
wxVERTICAL_RESIZABLE = 0x10, wxVERTICAL_RESIZABLE = 0x10,
wxRESIZABLE = 0x11 wxRESIZABLE = 0x11
}; };

2
contrib/include/wx/mmedia/sndaiff.h
View File

@@ -3,7 +3,9 @@
// Purpose: // Purpose:
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// License: wxWindows license
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDAIFF_H #ifndef _WX_SNDAIFF_H
#define _WX_SNDAIFF_H #define _WX_SNDAIFF_H

1
contrib/include/wx/mmedia/sndbase.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDBASE_H #ifndef _WX_SNDBASE_H
#define _WX_SNDBASE_H #define _WX_SNDBASE_H

1
contrib/include/wx/mmedia/sndcodec.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDCODEC_H #ifndef _WX_SNDCODEC_H
#define _WX_SNDCODEC_H #define _WX_SNDCODEC_H

1
contrib/include/wx/mmedia/sndcpcm.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDCPCM_H #ifndef _WX_SNDCPCM_H
#define _WX_SNDCPCM_H #define _WX_SNDCPCM_H

1
contrib/include/wx/mmedia/sndesd.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDESD_H #ifndef _WX_SNDESD_H
#define _WX_SNDESD_H #define _WX_SNDESD_H

1
contrib/include/wx/mmedia/sndfile.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDFILE_H #ifndef _WX_SNDFILE_H
#define _WX_SNDFILE_H #define _WX_SNDFILE_H

1
contrib/include/wx/mmedia/sndg72x.h
View File

@@ -4,6 +4,7 @@
// Date: 08/26/1999 // Date: 08/26/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDG72X_H #ifndef _WX_SNDG72X_H
#define _WX_SNDG72X_H #define _WX_SNDG72X_H

1
contrib/include/wx/mmedia/sndmsad.h
View File

@@ -4,6 +4,7 @@
// Date: 25/02/2000 // Date: 25/02/2000
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 2000 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 2000
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDMSAD_H #ifndef _WX_SNDMSAD_H
#define _WX_SNDMSAD_H #define _WX_SNDMSAD_H

1
contrib/include/wx/mmedia/sndoss.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDOSS_H #ifndef _WX_SNDOSS_H
#define _WX_SNDOSS_H #define _WX_SNDOSS_H

1
contrib/include/wx/mmedia/sndpcm.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDPCM_H #ifndef _WX_SNDPCM_H
#define _WX_SNDPCM_H #define _WX_SNDPCM_H

1
contrib/include/wx/mmedia/sndulaw.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDULAW_H #ifndef _WX_SNDULAW_H
#define _WX_SNDULAW_H #define _WX_SNDULAW_H

1
contrib/include/wx/mmedia/sndwav.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDWAV_H #ifndef _WX_SNDWAV_H
#define _WX_SNDWAV_H #define _WX_SNDWAV_H

1
contrib/include/wx/mmedia/sndwin.h
View File

@@ -4,6 +4,7 @@
// Date: 08/11/1999 // Date: 08/11/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// License: wxWindows license
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifndef _WX_SNDWIN_H #ifndef _WX_SNDWIN_H
#define _WX_SNDWIN_H #define _WX_SNDWIN_H

19
contrib/include/wx/ogl/basic.h
View File

@@ -22,11 +22,6 @@
#define DEFAULT_MOUSE_TOLERANCE 3 #define DEFAULT_MOUSE_TOLERANCE 3
#endif #endif
// Edit these lines if you positively don't want PROLOGIO support
#ifndef PROLOGIO
#define PROLOGIO
#endif
// Key identifiers // Key identifiers
#define KEY_SHIFT 1 #define KEY_SHIFT 1
#define KEY_CTRL 2 #define KEY_CTRL 2
@@ -110,7 +105,7 @@ class wxControlPoint;
class wxShapeRegion; class wxShapeRegion;
class wxShape; class wxShape;
#ifdef PROLOGIO #if wxUSE_PROLOGIO
class WXDLLEXPORT wxExpr; class WXDLLEXPORT wxExpr;
class WXDLLEXPORT wxExprDatabase; class WXDLLEXPORT wxExprDatabase;
#endif #endif
@@ -358,7 +353,7 @@ class wxShape: public wxShapeEvtHandler
virtual int GetRegionId(const wxString& name); virtual int GetRegionId(const wxString& name);
// Construct names for regions, unique even for children of a composite. // Construct names for regions, unique even for children of a composite.
virtual void NameRegions(const wxString& parentName = ""); virtual void NameRegions(const wxString& parentName = wxEmptyString);
// Get list of regions // Get list of regions
inline wxList& GetRegions() const { return (wxList&) m_regions; } inline wxList& GetRegions() const { return (wxList&) m_regions; }
@@ -381,7 +376,7 @@ class wxShape: public wxShapeEvtHandler
virtual void ClearText(int regionId = 0); virtual void ClearText(int regionId = 0);
void RemoveLine(wxLineShape *line); void RemoveLine(wxLineShape *line);
#ifdef PROLOGIO #if wxUSE_PROLOGIO
// I/O // I/O
virtual void WriteAttributes(wxExpr *clause); virtual void WriteAttributes(wxExpr *clause);
virtual void ReadAttributes(wxExpr *clause); virtual void ReadAttributes(wxExpr *clause);
@@ -613,7 +608,7 @@ class wxPolygonShape: public wxShape
// Recalculates the centre of the polygon // Recalculates the centre of the polygon
virtual void CalculatePolygonCentre(); virtual void CalculatePolygonCentre();
#ifdef PROLOGIO #if wxUSE_PROLOGIO
void WriteAttributes(wxExpr *clause); void WriteAttributes(wxExpr *clause);
void ReadAttributes(wxExpr *clause); void ReadAttributes(wxExpr *clause);
#endif #endif
@@ -652,7 +647,7 @@ class wxRectangleShape: public wxShape
void SetSize(double x, double y, bool recursive = TRUE); void SetSize(double x, double y, bool recursive = TRUE);
void SetCornerRadius(double rad); // If > 0, rounded corners void SetCornerRadius(double rad); // If > 0, rounded corners
#ifdef PROLOGIO #if wxUSE_PROLOGIO
void WriteAttributes(wxExpr *clause); void WriteAttributes(wxExpr *clause);
void ReadAttributes(wxExpr *clause); void ReadAttributes(wxExpr *clause);
#endif #endif
@@ -682,7 +677,7 @@ class wxTextShape: public wxRectangleShape
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
#ifdef PROLOGIO #if wxUSE_PROLOGIO
void WriteAttributes(wxExpr *clause); void WriteAttributes(wxExpr *clause);
#endif #endif
@@ -704,7 +699,7 @@ class wxEllipseShape: public wxShape
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
void SetSize(double x, double y, bool recursive = TRUE); void SetSize(double x, double y, bool recursive = TRUE);
#ifdef PROLOGIO #if wxUSE_PROLOGIO
void WriteAttributes(wxExpr *clause); void WriteAttributes(wxExpr *clause);
void ReadAttributes(wxExpr *clause); void ReadAttributes(wxExpr *clause);
#endif #endif

5
contrib/include/wx/ogl/basicp.h
View File

@@ -22,7 +22,7 @@ class wxShapeTextLine: public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxShapeTextLine) DECLARE_DYNAMIC_CLASS(wxShapeTextLine)
public: public:
wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = ""); wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = wxEmptyString);
~wxShapeTextLine(); ~wxShapeTextLine();
inline double GetX() const { return m_x; } inline double GetX() const { return m_x; }
@@ -136,7 +136,8 @@ class wxShapeRegion: public wxObject
~wxShapeRegion(); ~wxShapeRegion();
// Accessors // Accessors
inline void SetText(const wxString& s) { m_regionText = s; } inline void SetText(const wxString& s)
{ m_regionText = s; m_formattedText.Append(new wxShapeTextLine(0,0,s));}
void SetFont(wxFont *f); void SetFont(wxFont *f);
void SetMinSize(double w, double h); void SetMinSize(double w, double h);
void SetSize(double w, double h); void SetSize(double w, double h);

2
contrib/include/wx/ogl/bmpshape.h
View File

@@ -27,7 +27,7 @@ class wxBitmapShape: public wxRectangleShape
void OnDraw(wxDC& dc); void OnDraw(wxDC& dc);
#ifdef PROLOGIO #if wxUSE_PROLOGIO
// I/O // I/O
void WriteAttributes(wxExpr *clause); void WriteAttributes(wxExpr *clause);
void ReadAttributes(wxExpr *clause); void ReadAttributes(wxExpr *clause);

4
contrib/include/wx/ogl/composit.h
View File

@@ -77,7 +77,7 @@ public:
// Calculates size and position of composite object based on children // Calculates size and position of composite object based on children
void CalculateSize(); void CalculateSize();
#ifdef PROLOGIO #if wxUSE_PROLOGIO
void WriteAttributes(wxExpr *clause); void WriteAttributes(wxExpr *clause);
void ReadAttributes(wxExpr *clause); void ReadAttributes(wxExpr *clause);
// In case the object has constraints it needs to read in in a different pass // In case the object has constraints it needs to read in in a different pass
@@ -152,7 +152,7 @@ class wxDivisionShape: public wxCompositeShape
void MakeMandatoryControlPoints(); void MakeMandatoryControlPoints();
void ResetMandatoryControlPoints(); void ResetMandatoryControlPoints();
#ifdef PROLOGIO #if wxUSE_PROLOGIO
void WriteAttributes(wxExpr *clause); void WriteAttributes(wxExpr *clause);
void ReadAttributes(wxExpr *clause); void ReadAttributes(wxExpr *clause);
#endif #endif

Some files were not shown because too many files have changed in this diff Show More