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

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

.cvsignore

@@ -57,4 +57,3 @@ win32-release
 *tags
 log
 univtags.cmd
-.DS_Store

BuildCVS.txt

@@ -78,6 +78,9 @@ d) Borland (including free command line tools)
    See docs/msw/install.txt for details; in brief
 
 -> type set WXWIN=c:\wxwindows
+-> type set BCCDIR=c:\progra~1\borland\cb4
+-> type cd %WXWIN%\include\wx
+-> type copy msw\setup0.h setup.h
 -> type cd %WXWIN%\src\msw
 -> type make -f makefile.b32
 

Makefile.in

@@ -126,7 +126,6 @@ WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
 WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
 WXSAMPLES=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
 WXDEMOS=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
-WXARCHIVE_ZIP=wxMSW-$(VER_SUFFIX).zip
 
 WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2
 WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
@@ -179,22 +178,20 @@ ZLIBOBJS = \
 
 PNGOBJS = \
 		png.o \
-		pngerror.o \
-		pnggccrd.o \
-		pngget.o \
-		pngmem.o \
-		pngpread.o \
 		pngread.o \
-		pngrio.o \
 		pngrtran.o \
 		pngrutil.o \
-		pngset.o \
+		pngpread.o \
 		pngtrans.o \
-		pngvcrd.o \
-		pngwio.o \
 		pngwrite.o \
 		pngwtran.o \
-		pngwutil.o
+		pngwutil.o \
+		pngerror.o \
+		pngmem.o \
+		pngwio.o \
+		pngrio.o \
+		pngget.o \
+		pngset.o
 
 JPEGOBJS = \
 		jcomapi.o \
@@ -304,29 +301,27 @@ SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
 
 all: @WX_ALL@
 
-$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 	@$(INSTALL) -d $(build_libdir)
 	@$(RM) $@
 	$(AR) $(AROPTIONS) $@ $(OBJECTS)
 	$(RANLIB) $@
 
-$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
 	@$(INSTALL) -d $(build_libdir)
 	@$(RM) $@
 	$(AR) $(AROPTIONS) $@ glcanvas.o
 	$(RANLIB) $@
 
-$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
+$(build_libdir)/@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
 	@$(INSTALL) -d $(build_libdir)
 	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
-# 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
-$(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)
-	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)
+	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
 
-$(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
+$(build_libdir)/@WX_RESOURCES_MACOSX@: $(MACRESOURCES)
 	@$(INSTALL) -d $(build_libdir)
 	$(RESCOMP) -d __UNIX__ -useDF $^ -o $@
 
@@ -447,13 +442,12 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
 	done
 
-preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@
+preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@
 	@echo " "
 	@echo " Installing wxWindows Mac resource ..."
 	@echo " "
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
-	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(libdir)/@WX_RESOURCES_MACOSX_ASCII@
-	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ $(libdir)/@WX_RESOURCES_MACOSX_DATA@
+	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@ $(libdir)/@WX_RESOURCES_MACOSX_COMPILED@
 
 preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
 	@echo " "
@@ -491,12 +485,11 @@ uninstall:
 	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 	@$(RM) $(bindir)/wx-config
 	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
-	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
-	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*
+	@$(RM) $(datadir)/wx/afm/*
+	@$(RM) $(datadir)/wx/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/gs_afm
+	@-rmdir $(datadir)/wx/afm
 	@-rmdir $(datadir)/wx
 	@echo " Removing headers..."
 	@list='$(HEADERS)'; for p in $$list; do \
@@ -543,16 +536,13 @@ ALL_DIST: distclean
 	cp $(WXDIR)/wxBase.spec $(DISTDIR)
 	cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
 	cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
+	cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	mkdir $(DISTDIR)/lib
 	cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
 	cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
 	mkdir $(DISTDIR)/src
-	# temp hack for common/execcmn.cpp: it's not supported by tmake
-	# yet (it's a header-like file but in src/common directory and it
-	# shouldn't be distributed...)
-	mkdir $(DISTDIR)/src/common
-	cp $(SRCDIR)/common/execcmn.cpp $(DISTDIR)/src/common
+	cp $(SRCDIR)/files.lst $(DISTDIR)/src/
 	mkdir $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
 	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
@@ -563,7 +553,6 @@ ALL_DIST: distclean
 	cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/README $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
@@ -592,17 +581,14 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
+	cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
 	cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
-	mkdir $(DISTDIR)/art
-	mkdir $(DISTDIR)/art/gtk
-	mkdir $(DISTDIR)/art/motif
-	cp $(WXDIR)/art/*.xpm $(DISTDIR)/art
-	cp $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
-	cp $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
+	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/generic
 	mkdir $(DISTDIR)/src/html
+	mkdir $(DISTDIR)/src/html/bitmaps
 	mkdir $(DISTDIR)/src/$(TOOLKITDIR)
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
@@ -623,6 +609,7 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
 	cp $(GENDIR)/*.mms $(DISTDIR)/src/generic
 	cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
+	cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
 	cp $(PNGDIR)/*.c $(DISTDIR)/src/png
 	cp $(PNGDIR)/README $(DISTDIR)/src/png
@@ -652,6 +639,7 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/msw
+	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/msw
 	cp @PORT_FILES@ $(DISTDIR)
@@ -660,7 +648,6 @@ BASE_DIST: ALL_DIST
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
-	cp $(SRCDIR)/files.lst $(DISTDIR)/src
 	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
 	cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common
@@ -686,6 +673,7 @@ BASE_DIST: ALL_DIST
 GTK_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
 	cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
+	cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
 	cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
@@ -694,16 +682,6 @@ GTK_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/contrib
 	cp -R $(WXDIR)/contrib $(DISTDIR)
 
-X11_DIST: ALL_GUI_DIST UNIV_DIST
-	cp $(WXDIR)/wxX11.spec $(DISTDIR)
-	cp $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
-	cp $(X11DIR)/files.lst $(DISTDIR)/src/x11
-	cp $(X11DIR)/*.cpp $(DISTDIR)/src/x11
-	cp $(X11DIR)/*.c $(DISTDIR)/src/x11
-	cp $(X11DIR)/*.xbm $(DISTDIR)/src/x11
-	mkdir $(DISTDIR)/contrib
-	cp -R $(WXDIR)/contrib $(DISTDIR)
-
 MOTIF_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxMotif.spec $(DISTDIR)
 	cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
@@ -746,37 +724,13 @@ MSW_DIST: ALL_GUI_DIST
 	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
-	mkdir $(DISTDIR)/src/msw/ole
-	cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw
-	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
-	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
-	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
-	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
-MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
-	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
-	mkdir $(DISTDIR)/include/wx/msw
-	mkdir $(DISTDIR)/include/wx/msw/ctl3d
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
-	mkdir $(DISTDIR)/include/wx/msw/ole
-	cp $(INCDIR)/wx/msw/*.h $(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
-	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
-	cp $(SRCDIR)/*.??? $(DISTDIR)/src
-	cp $(SRCDIR)/*.?? $(DISTDIR)/src
-	cp $(MSWDIR)/?ake*.* $(DISTDIR)/src/msw
 
 UNIV_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/include/wx/univ
@@ -1104,13 +1058,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
 
-	mkdir $(DISTDIR)/samples/mobile
-	cp $(SAMPDIR)/mobile/Makefile.in $(DISTDIR)/samples/mobile
-	mkdir $(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/*.h $(DISTDIR)/samples/mobile/wxedit
-    
 	mkdir $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
@@ -1256,6 +1203,8 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
+	mkdir $(DISTDIR)/samples/treectrl/bitmaps
+	cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps
 
 	mkdir $(DISTDIR)/samples/treelay
 	cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
@@ -1366,14 +1315,11 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/demo/dllwidget
 	mkdir $(DISTDIR)/wxPython/src
 	mkdir $(DISTDIR)/wxPython/src/gtk
-	mkdir $(DISTDIR)/wxPython/scripts
 	mkdir $(DISTDIR)/wxPython/wxPython
 	mkdir $(DISTDIR)/wxPython/wxPython/lib
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
-	mkdir $(DISTDIR)/wxPython/wxPython/tools
-	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
 	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
 	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
@@ -1393,7 +1339,6 @@ PYTHON_DIST:
 	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
 	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
 	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
-	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
 	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
 	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
@@ -1401,8 +1346,6 @@ PYTHON_DIST:
 	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
 	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
 	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
-	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
-	cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
 distclean:
 	$(RM) -r _dist_dir
@@ -1467,18 +1410,6 @@ bzip-dist: @GUIDIST@
 	mv wxDemos demos; \
 	fi
 
-# RR: Copy text and binary data separatly
-win-dist: MSW_ZIP_TEXT_DIST
-	@echo "*** Creating wxWindows ZIP distribution in $(DISTDIR)..."
-	@cd _dist_dir && mv $(DISTDIRNAME) wxMSW
-	@cd _dist_dir && zip -r -l  ../$(WXARCHIVE_ZIP) *
-	cp $(INCDIR)/wx/msw/*.cur _dist_dir/wxMSW/include/wx/msw
-	cp $(INCDIR)/wx/msw/*.ico _dist_dir/wxMSW/include/wx/msw
-	cp $(INCDIR)/wx/msw/*.bmp _dist_dir/wxMSW/include/wx/msw
-	@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.cur
-	@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico
-	@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp
-
 debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	mkdir $(DISTDIR)/debian
 	-cp $(WXDIR)/debian/* $(DISTDIR)/debian
@@ -1499,7 +1430,6 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	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
-	cp $(SRCDIR)/files.lst $(DISTDIR)/src
 
 debian-msw-dirs:
 	mkdir $(DISTDIR)/include/wx/msw

acinclude.m4

@@ -19,7 +19,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_INCLUDES],
 [
 ac_find_includes=
-for ac_dir in $1 /usr/include;
+for ac_dir in $1;
   do
     if test -f "$ac_dir/$2"; then
       ac_find_includes=$ac_dir
@@ -35,7 +35,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_LIBRARIES],
 [
 ac_find_libraries=
-for ac_dir in $1 /usr/lib;
+for ac_dir in $1;
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/lib$2.$ac_extension"; then
@@ -51,17 +51,13 @@ dnl Path to include, already defined
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_INCLUDE_PATH_EXIST],
 [
-  dnl never add -I/usr/include to the CPPFLAGS
-  if test "x$1" = "x/usr/include"; then
+  ac_path_to_include=$1
+  echo "$2" | grep "\-I$1" > /dev/null
+  result=$?
+  if test $result = 0; then
     ac_path_to_include=""
   else
-    echo "$2" | grep "\-I$1" > /dev/null
-    result=$?
-    if test $result = 0; then
-      ac_path_to_include=""
-    else
-      ac_path_to_include=" -I$1"
-    fi
+    ac_path_to_include=" -I$1"
   fi
 ])
 
@@ -148,53 +144,6 @@ AC_DEFUN([WX_CPP_BOOL],
   fi
 ])
 
-dnl ---------------------------------------------------------------------------
-dnl WX_CPP_EXPLICIT checks whether the C++ compiler support the explicit
-dnl keyword and defines HAVE_EXPLICIT if this is the case
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([WX_CPP_EXPLICIT],
-[
-  AC_CACHE_CHECK([if C++ compiler supports the explicit keyword],
-                 wx_cv_explicit,
-  [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-
-    dnl do the test in 2 steps: first check that the compiler knows about the
-    dnl explicit keyword at all and then verify that it really honours it
-    AC_TRY_COMPILE(
-      [
-        class Foo { public: explicit Foo(int) {} };
-      ],
-      [
-        return 0;
-      ],
-      [
-        AC_TRY_COMPILE(
-            [
-                class Foo { public: explicit Foo(int) {} };
-                static void TakeFoo(const Foo& foo) { }
-            ],
-            [
-                TakeFoo(17);
-                return 0;
-            ],
-            wx_cv_explicit=no,
-            wx_cv_explicit=yes
-        )
-      ],
-      wx_cv_explicit=no
-    )
-
-    AC_LANG_RESTORE
-  ])
-
-  if test "$wx_cv_explicit" = "yes"; then
-    AC_DEFINE(HAVE_EXPLICIT)
-  fi
-])
-
 dnl ---------------------------------------------------------------------------
 dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
 dnl ---------------------------------------------------------------------------
@@ -340,15 +289,10 @@ AC_DEFUN([WX_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
-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
+dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name)
 AC_DEFUN([WX_ARG_ENABLE],
         [
-	  enablestring=$4
-          AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
+          AC_MSG_CHECKING([for --enable-$1])
           no_cache=0
           AC_ARG_ENABLE($1, [$2],
                         [
@@ -387,6 +331,7 @@ dnl ===========================================================================
 dnl "3rd party" macros included here because they are not widely available
 dnl ===========================================================================
 
+
 dnl ---------------------------------------------------------------------------
 dnl test for availability of iconv()
 dnl ---------------------------------------------------------------------------
@@ -465,65 +410,199 @@ size_t iconv();
   AC_SUBST(LIBICONV)
 ])
 
+
 dnl ---------------------------------------------------------------------------
-dnl AC_SYS_LARGEFILE (partly based on the code from autoconf 2.5x)
+dnl test for GTK+ 2.0
 dnl ---------------------------------------------------------------------------
 
-dnl WX_SYS_LARGEFILE_TEST
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
-dnl NB: original autoconf test was checking if compiler supported 6 bit off_t
-dnl     arithmetic properly but this failed miserably with gcc under Linux
-dnl     whereas the system still supports 64 bit files, so now simply check
-dnl     that off_t is big enough
-define(WX_SYS_LARGEFILE_TEST,
-[typedef struct {
-    unsigned int field: sizeof(off_t) == 8;
-} wxlf;
-])
-
-
-dnl WX_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR)
-define(WX_SYS_LARGEFILE_MACRO_VALUE,
-[
-    AC_CACHE_CHECK([for $1 value needed for large files], [$3],
-        [
-          AC_TRY_COMPILE([#define $1 $2
-                          #include <sys/types.h>],
-                         WX_SYS_LARGEFILE_TEST,
-                         [$3=$2],
-                         [$3=no])
-        ]
-    )
-
-    if test "$$3" != no; then
-        wx_largefile=yes
-        AC_DEFINE_UNQUOTED([$1], [$$3])
-    fi
-])
-
-
-dnl AC_SYS_LARGEFILE
-dnl ----------------
-dnl By default, many hosts won't let programs access large files;
-dnl one must use special compiler options to get large-file access to work.
-dnl For more details about this brain damage please see:
-dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
-AC_DEFUN([AC_SYS_LARGEFILE],
-[AC_ARG_ENABLE(largefile,
-               [  --disable-largefile     omit support for large files])
-if test "$enable_largefile" != no; then
-    dnl _FILE_OFFSET_BITS==64 is needed for Linux, Solaris, ...
-    dnl _LARGE_FILES -- for AIX
-    wx_largefile=no
-    WX_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, ac_cv_sys_file_offset_bits)
-    if test "x$wx_largefile" != "xyes"; then
-        WX_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files)
-    fi
-
-    AC_MSG_CHECKING(if large file support is available)
-    if test "x$wx_largefile" = "xyes"; then
-        AC_DEFINE(HAVE_LARGEFILE_SUPPORT)
-    fi
-    AC_MSG_RESULT($wx_largefile)
-fi
+AC_DEFUN(AM_PATH_GTK_2_0,
+[dnl
+dnl Get the cflags and libraries from the gtk-config-2.0 script
+dnl
+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+            gtk_config_prefix="$withval", gtk_config_prefix="")
+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
+                    , enable_gtktest=yes)
+
+  for module in . $4
+  do
+      case "$module" in
+         gthread)
+             gtk_config_args="$gtk_config_args gthread"
+         ;;
+      esac
+  done
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG_2_0+set} != xset ; then
+        GTK_CONFIG_2_0=$gtk_config_exec_prefix/bin/gtk-config-2.0
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG_2_0+set} != xset ; then
+        GTK_CONFIG_2_0=$gtk_config_prefix/bin/gtk-config-2.0
+     fi
+  fi
+
+  AC_PATH_PROG(GTK_CONFIG_2_0, gtk-config-2.0, no)
+  min_gtk_version=ifelse([$1], ,1.3.1,$1)
+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+  no_gtk=""
+  if test "$GTK_CONFIG_2_0" = "no" ; then
+    no_gtk=yes
+  else
+    GTK_CFLAGS=`$GTK_CONFIG_2_0 $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG_2_0 $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config-2.0 to some extent
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If gtk-config-2.0 was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtk-config-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
+      printf("*** to point to the correct copy of gtk-config-2.0, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    }
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+           (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+               major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtk-config-2.0 shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG_2_0 environment to point to the\n");
+        printf("*** correct copy of gtk-config-2.0. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+     ifelse([$2], , :, [$2])
+  else
+     AC_MSG_RESULT(no)
+     if test "$GTK_CONFIG_2_0" = "no" ; then
+       echo "*** The gtk-config-2.0 script installed by GTK could not be found"
+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
+       echo "*** full path to gtk-config-2.0."
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK test program, checking why..."
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK or finding the wrong"
+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+          echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+          echo "*** may want to edit the gtk-config-2.0 script: $GTK_CONFIG_2_0" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
 ])

aclocal.m4

@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -31,7 +31,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_INCLUDES],
 [
 ac_find_includes=
-for ac_dir in $1 /usr/include;
+for ac_dir in $1;
   do
     if test -f "$ac_dir/$2"; then
       ac_find_includes=$ac_dir
@@ -47,7 +47,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_PATH_FIND_LIBRARIES],
 [
 ac_find_libraries=
-for ac_dir in $1 /usr/lib;
+for ac_dir in $1;
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/lib$2.$ac_extension"; then
@@ -63,17 +63,13 @@ dnl Path to include, already defined
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([WX_INCLUDE_PATH_EXIST],
 [
-  dnl never add -I/usr/include to the CPPFLAGS
-  if test "x$1" = "x/usr/include"; then
+  ac_path_to_include=$1
+  echo "$2" | grep "\-I$1" > /dev/null
+  result=$?
+  if test $result = 0; then
     ac_path_to_include=""
   else
-    echo "$2" | grep "\-I$1" > /dev/null
-    result=$?
-    if test $result = 0; then
-      ac_path_to_include=""
-    else
-      ac_path_to_include=" -I$1"
-    fi
+    ac_path_to_include=" -I$1"
   fi
 ])
 
@@ -160,53 +156,6 @@ AC_DEFUN([WX_CPP_BOOL],
   fi
 ])
 
-dnl ---------------------------------------------------------------------------
-dnl WX_CPP_EXPLICIT checks whether the C++ compiler support the explicit
-dnl keyword and defines HAVE_EXPLICIT if this is the case
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([WX_CPP_EXPLICIT],
-[
-  AC_CACHE_CHECK([if C++ compiler supports the explicit keyword],
-                 wx_cv_explicit,
-  [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-
-    dnl do the test in 2 steps: first check that the compiler knows about the
-    dnl explicit keyword at all and then verify that it really honours it
-    AC_TRY_COMPILE(
-      [
-        class Foo { public: explicit Foo(int) {} };
-      ],
-      [
-        return 0;
-      ],
-      [
-        AC_TRY_COMPILE(
-            [
-                class Foo { public: explicit Foo(int) {} };
-                static void TakeFoo(const Foo& foo) { }
-            ],
-            [
-                TakeFoo(17);
-                return 0;
-            ],
-            wx_cv_explicit=no,
-            wx_cv_explicit=yes
-        )
-      ],
-      wx_cv_explicit=no
-    )
-
-    AC_LANG_RESTORE
-  ])
-
-  if test "$wx_cv_explicit" = "yes"; then
-    AC_DEFINE(HAVE_EXPLICIT)
-  fi
-])
-
 dnl ---------------------------------------------------------------------------
 dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
 dnl ---------------------------------------------------------------------------
@@ -352,11 +301,10 @@ AC_DEFUN([WX_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)
 AC_DEFUN([WX_ARG_ENABLE],
         [
-	  enablestring=$4
-          AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
+          AC_MSG_CHECKING([for --enable-$1])
           no_cache=0
           AC_ARG_ENABLE($1, [$2],
                         [
@@ -395,6 +343,7 @@ dnl ===========================================================================
 dnl "3rd party" macros included here because they are not widely available
 dnl ===========================================================================
 
+
 dnl ---------------------------------------------------------------------------
 dnl test for availability of iconv()
 dnl ---------------------------------------------------------------------------
@@ -473,134 +422,61 @@ size_t iconv();
   AC_SUBST(LIBICONV)
 ])
 
+
 dnl ---------------------------------------------------------------------------
-dnl AC_SYS_LARGEFILE (partly based on the code from autoconf 2.5x)
+dnl test for GTK+ 2.0
 dnl ---------------------------------------------------------------------------
 
-dnl WX_SYS_LARGEFILE_TEST
-dnl
-dnl NB: original autoconf test was checking if compiler supported 6 bit off_t
-dnl     arithmetic properly but this failed miserably with gcc under Linux
-dnl     whereas the system still supports 64 bit files, so now simply check
-dnl     that off_t is big enough
-define(WX_SYS_LARGEFILE_TEST,
-[typedef struct {
-    unsigned int field: sizeof(off_t) == 8;
-} wxlf;
-])
-
-
-dnl WX_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR)
-define(WX_SYS_LARGEFILE_MACRO_VALUE,
-[
-    AC_CACHE_CHECK([for $1 value needed for large files], [$3],
-        [
-          AC_TRY_COMPILE([#define $1 $2
-                          #include <sys/types.h>],
-                         WX_SYS_LARGEFILE_TEST,
-                         [$3=$2],
-                         [$3=no])
-        ]
-    )
-
-    if test "$$3" != no; then
-        wx_largefile=yes
-        AC_DEFINE_UNQUOTED([$1], [$$3])
-    fi
-])
-
-
-dnl AC_SYS_LARGEFILE
-dnl ----------------
-dnl By default, many hosts won't let programs access large files;
-dnl one must use special compiler options to get large-file access to work.
-dnl For more details about this brain damage please see:
-dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
-AC_DEFUN([AC_SYS_LARGEFILE],
-[AC_ARG_ENABLE(largefile,
-               [  --disable-largefile     omit support for large files])
-if test "$enable_largefile" != no; then
-    dnl _FILE_OFFSET_BITS==64 is needed for Linux, Solaris, ...
-    dnl _LARGE_FILES -- for AIX
-    wx_largefile=no
-    WX_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, ac_cv_sys_file_offset_bits)
-    if test "x$wx_largefile" != "xyes"; then
-        WX_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files)
-    fi
-
-    AC_MSG_CHECKING(if large file support is available)
-    if test "x$wx_largefile" = "xyes"; then
-        AC_DEFINE(HAVE_LARGEFILE_SUPPORT)
-    fi
-    AC_MSG_RESULT($wx_largefile)
-fi
-])
-
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
 dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
-dnl pass to pkg-config
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
 AC_DEFUN(AM_PATH_GTK_2_0,
-[dnl 
-dnl Get the cflags and libraries from pkg-config
+[dnl
+dnl Get the cflags and libraries from the gtk-config-2.0 script
 dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+            gtk_config_prefix="$withval", gtk_config_prefix="")
+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
+                    , enable_gtktest=yes)
 
-  pkg_config_args=gtk+-2.0
   for module in . $4
   do
       case "$module" in
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
+         gthread)
+             gtk_config_args="$gtk_config_args gthread"
          ;;
       esac
   done
 
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG_2_0+set} != xset ; then
+        GTK_CONFIG_2_0=$gtk_config_exec_prefix/bin/gtk-config-2.0
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG_2_0+set} != xset ; then
+        GTK_CONFIG_2_0=$gtk_config_prefix/bin/gtk-config-2.0
+     fi
+  fi
+
+  AC_PATH_PROG(GTK_CONFIG_2_0, gtk-config-2.0, no)
+  min_gtk_version=ifelse([$1], ,1.3.1,$1)
+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
   no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo *** pkg-config too old; version 0.7 or better required.
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
+  if test "$GTK_CONFIG_2_0" = "no" ; then
     no_gtk=yes
-  fi
-
-  min_gtk_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+  else
+    GTK_CFLAGS=`$GTK_CONFIG_2_0 $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG_2_0 $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+    gtk_config_minor_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+    gtk_config_micro_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
     if test "x$enable_gtktest" = "xyes" ; then
       ac_save_CFLAGS="$CFLAGS"
@@ -608,8 +484,8 @@ AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run
       CFLAGS="$CFLAGS $GTK_CFLAGS"
       LIBS="$GTK_LIBS $LIBS"
 dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config-2.0 to some extent
 dnl
       rm -f conf.gtktest
       AC_TRY_RUN([
@@ -617,7 +493,7 @@ dnl
 #include <stdio.h>
 #include <stdlib.h>
 
-int 
+int
 main ()
 {
   int major, minor, micro;
@@ -636,26 +512,29 @@ main ()
       (gtk_minor_version != $gtk_config_minor_version) ||
       (gtk_micro_version != $gtk_config_micro_version))
     {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+      printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
              gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** was found! If gtk-config-2.0 was correct, then it is best\n");
       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
       printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
+      printf("*** If gtk-config-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
+      printf("*** to point to the correct copy of gtk-config-2.0, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    }
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_minor_version != GTK_MINOR_VERSION) ||
            (gtk_micro_version != GTK_MICRO_VERSION))
     {
       printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
       printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
     }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
   else
     {
       if ((gtk_major_version > major) ||
@@ -669,14 +548,14 @@ main ()
         printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
                gtk_major_version, gtk_minor_version, gtk_micro_version);
         printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
+               major, minor, micro);
         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
         printf("***\n");
         printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** probably means that the wrong copy of the gtk-config-2.0 shell script is\n");
         printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG_2_0 environment to point to the\n");
+        printf("*** correct copy of gtk-config-2.0. (In this case, you will have to\n");
         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
         printf("*** so that the correct libraries are found at run-time))\n");
       }
@@ -690,19 +569,19 @@ main ()
   fi
   if test "x$no_gtk" = x ; then
      AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])     
+     ifelse([$2], , :, [$2])
   else
      AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
+     if test "$GTK_CONFIG_2_0" = "no" ; then
+       echo "*** The gtk-config-2.0 script installed by GTK could not be found"
+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
+       echo "*** full path to gtk-config-2.0."
      else
        if test -f conf.gtktest ; then
         :
        else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
+          echo "*** Could not run GTK test program, checking why..."
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           AC_TRY_LINK([
@@ -710,16 +589,23 @@ main ()
 #include <stdio.h>
 ],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
         [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+          echo "*** that the run-time linker is not finding GTK or finding the wrong"
+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
           echo "*** is required on your system"
-	  echo "***"
+          echo "***"
           echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+          echo "*** may want to edit the gtk-config-2.0 script: $GTK_CONFIG_2_0" ])
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
@@ -733,64 +619,6 @@ main ()
   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+
 # Owen Taylor     97-11-3
 

art/addbookm.xpm

@@ -1,21 +0,0 @@
-/* XPM */
-static char * addbookm_xpm[] = {
-"16 15 3 1",
-" 	c None",
-".	c #000000",
-"+	c #C3F9BD",
-"   ..           ",
-"   ..           ",
-"   ..      .    ",
-"........  .+.   ",
-"........ .+++.  ",
-"   ..   .+++++. ",
-"   ..  .+++++.  ",
-"   .. .+++++.   ",
-"     .+++++.    ",
-"    .+++++.     ",
-"   .+++++.      ",
-"  ....++.       ",
-"     .+.        ",
-"     ..         ",
-"     .          "};

art/delbookm.xpm

@@ -1,23 +0,0 @@
-/* XPM */
-static char * delbookm_xpm[] = {
-"16 15 5 1",
-" 	c None",
-".	c #808080",
-"+	c #000000",
-"@	c #FFFFFF",
-"#	c #F4D4D6",
-" .+++++.        ",
-".+@+++@+.       ",
-"+@@@+@@@+  +    ",
-"++@@@@@++ +#+   ",
-"+++@@@++++###+  ",
-"++@@@@@++#####+ ",
-"+@@@+@@@+####+  ",
-".+@+++@+.###+   ",
-" .+++++.###+    ",
-"    +#####+     ",
-"   +#####+      ",
-"  ++++##+       ",
-"     +#+        ",
-"     ++         ",
-"     +          "};

art/gtk/error.xpm

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

art/gtk/info.xpm

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

art/gtk/question.xpm

@@ -1,125 +0,0 @@
-/* XPM */
-static char * question_xpm[] = {
-"48 48 74 1",
-" 	c None",
-".	c #000000",
-"+	c #A27F3B",
-"@	c #B89243",
-"#	c #D8AB4E",
-"$	c #9D7D3A",
-"%	c #A6823C",
-"&	c #7C622D",
-"*	c #F7D899",
-"=	c #F7E2B8",
-"-	c #D8BA7B",
-";	c #BE9B53",
-">	c #F7C35A",
-",	c #F7DFAF",
-"'	c #F7E5C0",
-")	c #F7D48C",
-"!	c #F7CF7E",
-"~	c #D8B15F",
-"{	c #6E5526",
-"]	c #F7DCA5",
-"^	c #A8843D",
-"/	c #937435",
-"(	c #AA863E",
-"_	c #D8B66E",
-":	c #BEA363",
-"<	c #947536",
-"[	c #927335",
-"}	c #F7C96D",
-"|	c #80632D",
-"1	c #C39F57",
-"2	c #A38E55",
-"3	c #A48B5A",
-"4	c #D2A64D",
-"5	c #82662F",
-"6	c #654F24",
-"7	c #DCB463",
-"8	c #BE9544",
-"9	c #C3A466",
-"0	c #8C6D31",
-"a	c #D2B06C",
-"b	c #D8BE86",
-"c	c #715929",
-"d	c #B99344",
-"e	c #B38D40",
-"f	c #D8B56E",
-"g	c #D8AC58",
-"h	c #997A3B",
-"i	c #000001",
-"j	c #6B5527",
-"k	c #C39F55",
-"l	c #DCC494",
-"m	c #DAB872",
-"n	c #C9AC73",
-"o	c #BFA16A",
-"p	c #19150D",
-"q	c #876A31",
-"r	c #C9A45B",
-"s	c #C6A76A",
-"t	c #7F6941",
-"u	c #977737",
-"v	c #D8B165",
-"w	c #D8AC5B",
-"x	c #BEA272",
-"y	c #C09745",
-"z	c #D8B163",
-"A	c #927C52",
-"B	c #735F3B",
-"C	c #A68748",
-"D	c #1A1A1A",
-"E	c #393939",
-"F	c #221C12",
-"G	c #DDBC74",
-"H	c #D2A64C",
-"I	c #705627",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                   ........                     ",
-"                 ...+@#$%&...                   ",
-"                ..#**=*---;%...                 ",
-"               ..>,'*)>>>!-~%{..                ",
-"               .>,]>^//(>>!_~%..                ",
-"              .:*=><....[>>}~~|..               ",
-"              .}'!<..   .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..                     ",
-"                    .!**#..                     ",
-"                    .))~8..                     ",
-"                    .)_#8..                     ",
-"                    .H~8I..                     ",
-"                     ......                     ",
-"                      ....                      ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "};

art/gtk/warning.xpm

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

art/htmsidep.xpm

@@ -1,35 +0,0 @@
-/* XPM */
-static char * htmsidep_xpm[] = {
-"16 15 17 1",
-" 	c None",
-".	c #000000",
-"+	c #800000",
-"@	c #008000",
-"#	c #808000",
-"$	c #000080",
-"%	c #800080",
-"&	c #008080",
-"*	c #C0C0C0",
-"=	c #808080",
-"-	c #FF0000",
-";	c #00FF00",
-">	c #FFFF00",
-",	c #0000FF",
-"'	c #FF00FF",
-")	c #00FFFF",
-"!	c #FFFFFF",
-"****************",
-"*..............*",
-"*.************.*",
-"*..............*",
-"*.****.!!!!!!!.*",
-"*.****.!====*!.*",
-"*.****.!!!!!!!.*",
-"*.****.!===*!!.*",
-"*.****.!!!!!!!.*",
-"*.****.!====*!.*",
-"*.****.!!!!!!!.*",
-"*.****.!===*!!.*",
-"*.****.!!!!!!!.*",
-"*..............*",
-"****************"};

contrib/configure

@@ -816,7 +816,6 @@ trap 'rm -fr `echo "
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
-            src/svg/Makefile	    
             src/xrc/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
@@ -830,7 +829,6 @@ trap 'rm -fr `echo "
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
-            samples/svg/Makefile	    
             samples/canvas/Makefile
             samples/canvas/test/Makefile
             samples/canvas/simple/Makefile
@@ -935,7 +933,6 @@ CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
-            src/svg/Makefile	    
             src/xrc/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
@@ -949,7 +946,6 @@ CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
-            samples/svg/Makefile	    
             samples/canvas/Makefile
             samples/canvas/test/Makefile
             samples/canvas/simple/Makefile

contrib/configure.in

@@ -41,7 +41,6 @@ AC_OUTPUT([
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
-            src/svg/Makefile	    
             src/xrc/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile

contrib/docs/latex/fl/faq.tex

@@ -1,23 +0,0 @@
-\section{FAQ}\label{faq}
-
-\subsection{A row of all non-fixed bars don't position properly}
-
-By Julian Smart.
-
-I found that if I added all non-fixed bars, bars would overlap.
-This seems to be because the proportional resizing doesn't work
-before the window is laid out. I worked around this by setting
-pane sizes {\it before} the bars are added:
-
-\begin{verbatim}
-    wxSize sz = GetClientSize();
-
-    // Set width for panes to help it do the calculations
-    int i;
-    for (i = 0; i < 2; i++)
-    {
-        cbDockPane& pane = * (m_frameLayout->GetPane(i));
-        pane.SetPaneWidth(sz.x);
-    }
-\end{verbatim}
-

contrib/docs/latex/fl/topics.tex

@@ -6,5 +6,4 @@ This chapter contains a selection of topic overviews, first things first:
 
 \input tusage.tex
 \input tevents.tex
-\input faq.tex
 

contrib/docs/latex/ogl/ogl.hpj

@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=c:\wx2dev\wxwind~1\contrib\docs\latex\ogl
+BMROOT=d:\wx2\wxwind~1\contrib\docs\latex\ogl ; Assume that bitmaps are where the source is
 TITLE=OGL Manual
 CONTENTS=Contents
 COMPRESS=HIGH

contrib/docs/latex/svg/dcsvg.tex

@@ -1,748 +0,0 @@
-\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}%
-%\input{psbox.tex}
-\newcommand{\commandref}[2]{\helpref{{\tt $\backslash$#1}}{#2}}%
-\newcommand{\commandrefn}[2]{\helprefn{{\tt $\backslash$#1}}{#2}\index{#1}}%
-\newcommand{\commandpageref}[2]{\latexignore{\helprefn{{\tt $\backslash$#1}}{#2}}\latexonly{{\tt $\backslash$#1} {\it page \pageref{#2}}}\index{#1}}%
-\newcommand{\indexit}[1]{#1\index{#1}}%
-\newcommand{\inioption}[1]{{\bf {\tt #1}}\index{#1}}%
-\parskip=10pt%
-\parindent=0pt%
-%\backgroundcolour{255;255;255}\textcolour{0;0;0}% Has an effect in HTML only
-\winhelpignore{\title{Manual for wxSVGFileDC}%
-\author{Chris Elliott}%
-\date{June 2002}%
-}%
-\winhelponly{\title{Manual for wxSVGFileDC}%
-\author{by Chris Elliott}%
-}%
-\makeindex%
-\begin{document}%
-\maketitle%
-\pagestyle{fancyplain}%
-\bibliographystyle{plain}%
-\pagenumbering{roman}%
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\tableofcontents%
-
-\chapter*{Copyright notice}%
-\setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\chapter*{wxSVGFileDC}%
-\setheader{{\it wxSVGFileDC}}{}{}{}{}{{\it wxSVGFileDC}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\section{\class{wxSVGFileDC}}\label{wxSVGFileDC}
-
-A wxSVGFileDC is a {\it device context} onto which graphics and text can be drawn, and the output
-produced as a vector file, in the SVG format (see http://www.w3.org/TR/2001/REC-SVG-20010904/ ).
-This format can be read by a range of programs, including a Netscape plugin (Adobe), full details at 
-http://www.w3.org/Graphics/SVG/SVG-Implementations.htm8 Vector formats may often be smaller 
-than raster formats.
-
-The intention behind wxSVGFileDC is that it can be used to produce a file corresponding 
-to the screen display context, wxSVGFileDC, by passing the wxSVGFileDC as a parameter instead of a wxSVGFileDC. Thus
-the wxSVGFileDC is a write-only class.
-
-As the wxSVGFileDC is a vector format, raster operations like GetPixel are unlikely to be supported.
-However, the SVG specification allows for PNG format raster files to be embedded in the SVG, and so 
-bitmaps, icons and blit operations into the wxSVGFileDC are supported.
-
-A more substantial SVG library (for reading and writing) is available at 
-http://www.xs4all.nl/~kholwerd/wxstuff/canvas/htmldocbook/aap.html
-
-\wxheading{Derived from}
-
-\helpref{wxDCBase}{wxDCBase}
-
-\wxheading{Include files}
-
-<wx/dcsvg.h>
-
-\wxheading{See also}
-
-%\helpref{Overview}{dcoverview}
-
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxSVGFileDC::wxSVGFileDC}
-
-\func{}{wxSVGFileDC}{\param{wxString}{ f}}  \rtfsp
-\func{}{wxSVGFileDC}{\param{wxString}{ f}, \param{int}{ Width},\param{int}{ Height}}  \rtfsp
-\func{}{wxSVGFileDC}{\param{wxString}{ f}, \param{int}{ Width},\param{int}{ Height},\param{float}{ dpi}} \rtfsp
-
-Constructors: 
-a filename {\it f} with default size 340x240 at 72.0 dots per inch (a frequent screen resolution).
-a filename {\it f} with size {\it Width} by {\it Height} at 72.0 dots per inch 
-a filename {\it f} with size {\it Width} by {\it Height} at {\it dpi} resolution.
-
-\membersection{wxSVGFileDC::\destruct{wxSVGFileDC}}
-
-\func{}{\destruct{wxSVGFileDC}}{\void}
-
-Destructor.
-
-\membersection{wxSVGFileDC::BeginDrawing}\label{wxdcbegindrawing}
-
-Does nothing
-
-\membersection{wxSVGFileDC::Blit}\label{wxdcblit}
-
-\func{bool}{Blit}{\param{wxCoord}{ xdest}, \param{wxCoord}{ ydest}, \param{wxCoord}{ width}, \param{wxCoord}{ height},
-  \param{wxSVGFileDC* }{source}, \param{wxCoord}{ xsrc}, \param{wxCoord}{ ysrc}, \param{int}{ logicalFunc = wxCOPY},
-  \param{bool }{useMask = FALSE}, \param{wxCoord}{ xsrcMask = -1}, \param{wxCoord}{ ysrcMask = -1}}
-
-As wxDC: Copy from a source DC to this DC, specifying the destination
-coordinates, size of area to copy, source DC, source coordinates,
-logical function, whether to use a bitmap mask, and mask source position.
-
-\membersection{wxSVGFileDC::CalcBoundingBox}\label{wxdccalcboundingbox}
-
-\func{void}{CalcBoundingBox}{\param{wxCoord }{x}, \param{wxCoord }{y}}
-
-Adds the specified point to the bounding box which can be retrieved with 
-\helpref{MinX}{wxdcminx}, \helpref{MaxX}{wxdcmaxx} and 
-\helpref{MinY}{wxdcminy}, \helpref{MaxY}{wxdcmaxy} functions.
-
-
-\membersection{wxSVGFileDC::Clear}\label{wxdcclear}
-
-\func{void}{Clear}{\void}
-
-This makes no sense in wxSVGFileDC and does nothing
-
-
-\membersection{wxSVGFileDC::CrossHair}\label{wxdccrosshair}
-
-\func{void}{CrossHair}{\param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Not Implemented
-
-\membersection{wxSVGFileDC::DestroyClippingRegion}\label{wxdcdestroyclippingregion}
-
-\func{void}{DestroyClippingRegion}{\void}
-
-Not Implemented
-
-\membersection{wxSVGFileDC::DeviceToLogicalX}\label{wxdcdevicetologicalx}
-
-\func{wxCoord}{DeviceToLogicalX}{\param{wxCoord}{ x}}
-
-Convert device X coordinate to logical coordinate, using the current
-mapping mode.
-
-\membersection{wxSVGFileDC::DeviceToLogicalXRel}\label{wxdcdevicetologicalxrel}
-
-\func{wxCoord}{DeviceToLogicalXRel}{\param{wxCoord}{ x}}
-
-Convert device X coordinate to relative logical coordinate, using the current
-mapping mode but ignoring the x axis orientation.
-Use this function for converting a width, for example.
-
-\membersection{wxSVGFileDC::DeviceToLogicalY}\label{wxdcdevicetologicaly}
-
-\func{wxCoord}{DeviceToLogicalY}{\param{wxCoord}{ y}}
-
-Converts device Y coordinate to logical coordinate, using the current
-mapping mode.
-
-\membersection{wxSVGFileDC::DeviceToLogicalYRel}\label{wxdcdevicetologicalyrel}
-
-\func{wxCoord}{DeviceToLogicalYRel}{\param{wxCoord}{ y}}
-
-Convert device Y coordinate to relative logical coordinate, using the current
-mapping mode but ignoring the y axis orientation.
-Use this function for converting a height, for example.
-
-\membersection{wxSVGFileDC::DrawArc}\label{wxdcdrawarc}
-
-\func{void}{DrawArc}{\param{wxCoord}{ x1}, \param{wxCoord}{ y1}, \param{wxCoord}{ x2}, \param{wxCoord}{ y2}, \param{double}{ xc}, \param{double}{ yc}}
-
-Draws an arc of a circle, centred on ({\it xc, yc}), with starting point ({\it x1, y1})
-and ending at ({\it x2, y2}).   The current pen is used for the outline
-and the current brush for filling the shape.
-
-The arc is drawn in an anticlockwise direction from the start point to the end point.
-
-\membersection{wxSVGFileDC::DrawBitmap}\label{wxdcdrawbitmap}
-
-\func{void}{DrawBitmap}{\param{const wxBitmap\&}{ bitmap}, \param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{bool}{ transparent}}
-
-Draw a bitmap on the device context at the specified point. If {\it transparent} is TRUE and the bitmap has
-a transparency mask, the bitmap will be drawn transparently.
-
-When drawing a mono-bitmap, the current text foreground colour will be used to draw the foreground
-of the bitmap (all bits set to 1), and the current text background colour to draw the background
-(all bits set to 0). See also \helpref{SetTextForeground}{wxdcsettextforeground}, 
-\helpref{SetTextBackground}{wxdcsettextbackground} and \helpref{wxMemoryDC}{wxmemorydc}.
-
-\membersection{wxSVGFileDC::DrawCheckMark}\label{wxdcdrawcheckmark}
-
-\func{void}{DrawCheckMark}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}}
-
-\func{void}{DrawCheckMark}{\param{const wxRect \&}{rect}}
-
-Draws a check mark inside the given rectangle.
-
-\membersection{wxSVGFileDC::DrawCircle}\label{wxdcdrawcircle}
-
-\func{void}{DrawCircle}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ radius}}
-
-\func{void}{DrawCircle}{\param{const wxPoint\&}{ pt}, \param{wxCoord}{ radius}}
-
-Draws a circle with the given centre and radius.
-
-\wxheading{See also}
-
-\helpref{DrawEllipse}{wxdcdrawellipse}
-
-\membersection{wxSVGFileDC::DrawEllipse}\label{wxdcdrawellipse}
-
-\func{void}{DrawEllipse}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}}
-
-\func{void}{DrawEllipse}{\param{const wxPoint\&}{ pt}, \param{const wxSize\&}{ size}}
-
-\func{void}{DrawEllipse}{\param{const wxRect\&}{ rect}}
-
-Draws an ellipse contained in the rectangle specified either with the given top
-left corner and the given size or directly. The current pen is used for the
-outline and the current brush for filling the shape.
-
-\wxheading{See also}
-
-\helpref{DrawCircle}{wxdcdrawcircle}
-
-\membersection{wxSVGFileDC::DrawEllipticArc}\label{wxdcdrawellipticarc}
-
-\func{void}{DrawEllipticArc}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height},
- \param{double}{ start}, \param{double}{ end}}
-
-Draws an arc of an ellipse. The current pen is used for drawing the arc and
-the current brush is used for drawing the pie.
-
-{\it x} and {\it y} specify the x and y coordinates of the upper-left corner of the rectangle that contains
-the ellipse.
-
-{\it width} and {\it height} specify the width and height of the rectangle that contains
-the ellipse.
-
-{\it start} and {\it end} specify the start and end of the arc relative to the three-o'clock
-position from the center of the rectangle. Angles are specified
-in degrees (360 is a complete circle). Positive values mean
-counter-clockwise motion. If {\it start} is equal to {\it end}, a
-complete ellipse will be drawn.
-
-\membersection{wxSVGFileDC::DrawIcon}\label{wxdcdrawicon}
-
-\func{void}{DrawIcon}{\param{const wxIcon\&}{ icon}, \param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Draw an icon on the display (does nothing if the device context is PostScript).
-This can be the simplest way of drawing bitmaps on a window.
-
-\membersection{wxSVGFileDC::DrawLine}\label{wxdcdrawline}
-
-\func{void}{DrawLine}{\param{wxCoord}{ x1}, \param{wxCoord}{ y1}, \param{wxCoord}{ x2}, \param{wxCoord}{ y2}}
-
-Draws a line from the first point to the second. The current pen is used
-for drawing the line.
-
-\membersection{wxSVGFileDC::DrawLines}\label{wxdcdrawlines}
-
-\func{void}{DrawLines}{\param{int}{ n}, \param{wxPoint}{ points[]}, \param{wxCoord}{ xoffset = 0}, \param{wxCoord}{ yoffset = 0}}
-
-\func{void}{DrawLines}{\param{wxList *}{points}, \param{wxCoord}{ xoffset = 0}, \param{wxCoord}{ yoffset = 0}}
-
-Draws lines using an array of {\it points} of size {\it n}, or list of
-pointers to points, adding the optional offset coordinate. The current
-pen is used for drawing the lines.  The programmer is responsible for
-deleting the list of points.
-
-\membersection{wxSVGFileDC::DrawPolygon}\label{wxdcdrawpolygon}
-
-\func{void}{DrawPolygon}{\param{int}{ n}, \param{wxPoint}{ points[]}, \param{wxCoord}{ xoffset = 0}, \param{wxCoord}{ yoffset = 0},\\
-  \param{int }{fill\_style = wxODDEVEN\_RULE}}
-
-\func{void}{DrawPolygon}{\param{wxList *}{points}, \param{wxCoord}{ xoffset = 0}, \param{wxCoord}{ yoffset = 0},\\
-  \param{int }{fill\_style = wxODDEVEN\_RULE}}
-
-Draws a filled polygon using an array of {\it points} of size {\it n},
-or list of pointers to points, adding the optional offset coordinate.
-
-The last argument specifies the fill rule: {\bf wxODDEVEN\_RULE} (the
-default) or {\bf wxWINDING\_RULE}.
-
-The current pen is used for drawing the outline, and the current brush
-for filling the shape.  Using a transparent brush suppresses filling.
-The programmer is responsible for deleting the list of points.
-
-Note that wxWindows automatically closes the first and last points.
-
-
-\membersection{wxSVGFileDC::DrawPoint}\label{wxdcdrawpoint}
-
-\func{void}{DrawPoint}{\param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Draws a point using the current pen.
-
-\membersection{wxSVGFileDC::DrawRectangle}\label{wxdcdrawrectangle}
-
-\func{void}{DrawRectangle}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}}
-
-Draws a rectangle with the given top left corner, and with the given
-size.  The current pen is used for the outline and the current brush
-for filling the shape.
-
-\membersection{wxSVGFileDC::DrawRotatedText}\label{wxdcdrawrotatedtext}
-
-\func{void}{DrawRotatedText}{\param{const wxString\& }{text}, \param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{double}{ angle}}
-
-Draws the text rotated by {\it angle} degrees.
-
-The wxMSW wxDC and wxSVGFileDC rotate the text around slightly different points, depending on the size of the font
-
-\membersection{wxSVGFileDC::DrawRoundedRectangle}\label{wxdcdrawroundedrectangle}
-
-\func{void}{DrawRoundedRectangle}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}, \param{double}{ radius = 20}}
-
-Draws a rectangle with the given top left corner, and with the given
-size.  The corners are quarter-circles using the given radius. The
-current pen is used for the outline and the current brush for filling
-the shape.
-
-If {\it radius} is positive, the value is assumed to be the
-radius of the rounded corner. If {\it radius} is negative,
-the absolute value is assumed to be the {\it proportion} of the smallest
-dimension of the rectangle. This means that the corner can be
-a sensible size relative to the size of the rectangle, and also avoids
-the strange effects X produces when the corners are too big for
-the rectangle.
-
-\membersection{wxSVGFileDC::DrawSpline}\label{wxdcdrawspline}
-
-\func{void}{DrawSpline}{\param{wxList *}{points}}
-
-Draws a spline between all given control points, using the current
-pen.  Doesn't delete the wxList and contents. The spline is drawn
-using a series of lines, using an algorithm taken from the X drawing
-program `XFIG'.
-
-\func{void}{DrawSpline}{\param{wxCoord}{ x1}, \param{wxCoord}{ y1}, \param{wxCoord}{ x2}, \param{wxCoord}{ y2}, \param{wxCoord}{ x3}, \param{wxCoord}{ y3}}
-
-Draws a three-point spline using the current pen.
-
-\membersection{wxSVGFileDC::DrawText}\label{wxdcdrawtext}
-
-\func{void}{DrawText}{\param{const wxString\& }{text}, \param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Draws a text string at the specified point, using the current text font,
-and the current text foreground and background colours.
-
-The coordinates refer to the top-left corner of the rectangle bounding
-the string. See \helpref{wxSVGFileDC::GetTextExtent}{wxdcgettextextent} for how
-to get the dimensions of a text string, which can be used to position the
-text more precisely.
-
-
-
-\membersection{wxSVGFileDC::EndDoc}\label{wxdcenddoc}
-
-\func{void}{EndDoc}{\void}
-
-Does nothing
-
-\membersection{wxSVGFileDC::EndDrawing}\label{wxdcenddrawing}
-
-\func{void}{EndDrawing}{\void}
-
-Does nothing
-
-\membersection{wxSVGFileDC::EndPage}\label{wxdcendpage}
-
-\func{void}{EndPage}{\void}
-
-Does nothing
-
-\membersection{wxSVGFileDC::FloodFill}\label{wxdcfloodfill}
-
-\func{void}{FloodFill}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{const wxColour\&}{ colour}, \param{int}{ style=wxFLOOD\_SURFACE}}
-
-Not implemented
-
-\membersection{wxSVGFileDC::GetBackground}\label{wxdcgetbackground}
-
-\func{wxBrush\&}{GetBackground}{\void}
-
-\constfunc{const wxBrush\&}{GetBackground}{\void}
-
-Gets the brush used for painting the background (see \helpref{wxSVGFileDC::SetBackground}{wxdcsetbackground}).
-
-\membersection{wxSVGFileDC::GetBackgroundMode}\label{wxdcgetbackgroundmode}
-
-\constfunc{int}{GetBackgroundMode}{\void}
-
-Returns the current background mode: {\tt wxSOLID} or {\tt wxTRANSPARENT}.
-
-\wxheading{See also}
-
-\helpref{SetBackgroundMode}{wxdcsetbackgroundmode}
-
-\membersection{wxSVGFileDC::GetBrush}\label{wxdcgetbrush}
-
-\func{wxBrush\&}{GetBrush}{\void}
-
-\constfunc{const wxBrush\&}{GetBrush}{\void}
-
-Gets the current brush (see \helpref{wxSVGFileDC::SetBrush}{wxdcsetbrush}).
-
-\membersection{wxSVGFileDC::GetCharHeight}\label{wxdcgetcharheight}
-
-\func{wxCoord}{GetCharHeight}{\void}
-
-Gets the character height of the currently set font.
-
-\membersection{wxSVGFileDC::GetCharWidth}\label{wxdcgetcharwidth}
-
-\func{wxCoord}{GetCharWidth}{\void}
-
-Gets the average character width of the currently set font.
-
-\membersection{wxSVGFileDC::GetClippingBox}\label{wxdcgetclippingbox}
-
-\func{void}{GetClippingBox}{\param{wxCoord}{ *x}, \param{wxCoord}{ *y}, \param{wxCoord}{ *width}, \param{wxCoord}{ *height}}
-
-Not implemented
-
-\membersection{wxSVGFileDC::GetFont}\label{wxdcgetfont}
-
-\func{wxFont\&}{GetFont}{\void}
-
-\constfunc{const wxFont\&}{GetFont}{\void}
-
-Gets the current font (see \helpref{wxSVGFileDC::SetFont}{wxdcsetfont}).
-
-\membersection{wxSVGFileDC::GetLogicalFunction}\label{wxdcgetlogicalfunction}
-
-\func{int}{GetLogicalFunction}{\void}
-
-Gets the current logical function (see \helpref{wxSVGFileDC::SetLogicalFunction}{wxdcsetlogicalfunction}).
-
-\membersection{wxSVGFileDC::GetMapMode}\label{wxdcgetmapmode}
-
-\func{int}{GetMapMode}{\void}
-
-Gets the {\it mapping mode} for the device context (see \helpref{wxSVGFileDC::SetMapMode}{wxdcsetmapmode}).
-
-\membersection{wxSVGFileDC::GetOptimization}\label{wxdcgetoptimization}
-
-\func{bool}{GetOptimization}{\void}
-
-Always returns TRUE, with an assertion in debug mode that optimisation is not implemented
-
-\membersection{wxSVGFileDC::GetPen}\label{wxdcgetpen}
-
-\func{wxPen\&}{GetPen}{\void}
-
-\constfunc{const wxPen\&}{GetPen}{\void}
-
-Gets the current pen (see \helpref{wxSVGFileDC::SetPen}{wxdcsetpen}).
-
-\membersection{wxSVGFileDC::GetPixel}\label{wxdcgetpixel}
-
-\func{bool}{GetPixel}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxColour *}{colour}}
-
-Not implemented
-
-\membersection{wxSVGFileDC::GetSize}\label{wxdcgetsize}
-
-\func{void}{GetSize}{\param{wxCoord *}{width}, \param{wxCoord *}{height}}
-
-
-For a Windows printer device context, this gets the horizontal and vertical
-resolution. 
-
-\membersection{wxSVGFileDC::GetTextBackground}\label{wxdcgettextbackground}
-
-\func{wxColour\&}{GetTextBackground}{\void}
-
-\constfunc{const wxColour\&}{GetTextBackground}{\void}
-
-Gets the current text background colour (see \helpref{wxSVGFileDC::SetTextBackground}{wxdcsettextbackground}).
-
-\membersection{wxSVGFileDC::GetTextExtent}\label{wxdcgettextextent}
-
-\func{void}{GetTextExtent}{\param{const wxString\& }{string}, \param{wxCoord *}{w}, \param{wxCoord *}{h},\\
-  \param{wxCoord *}{descent = NULL}, \param{wxCoord *}{externalLeading = NULL}, \param{wxFont *}{font = NULL}}
-
-Gets the dimensions of the string using the currently selected font.
-\rtfsp{\it string} is the text string to measure, {\it w} and {\it h} are
-the total width and height respectively, {\it descent} is the
-dimension from the baseline of the font to the bottom of the
-descender, and {\it externalLeading} is any extra vertical space added
-to the font by the font designer (usually is zero).
-
-The optional parameter {\it font} specifies an alternative
-to the currently selected font: but note that this does not
-yet work under Windows, so you need to set a font for
-the device context first.
-
-See also \helpref{wxFont}{wxfont}, \helpref{wxSVGFileDC::SetFont}{wxdcsetfont}.
-
-\membersection{wxSVGFileDC::GetTextForeground}\label{wxdcgettextforeground}
-
-\func{wxColour\&}{GetTextForeground}{\void}
-
-\constfunc{const wxColour\&}{GetTextForeground}{\void}
-
-Gets the current text foreground colour (see \helpref{wxSVGFileDC::SetTextForeground}{wxdcsettextforeground}).
-
-
-\membersection{wxSVGFileDC::GetUserScale}\label{wxdcgetuserscale}
-
-\func{void}{GetUserScale}{\param{double}{ *x}, \param{double}{ *y}}
-
-Gets the current user scale factor (set by \helpref{SetUserScale}{wxdcsetuserscale}).
-
-\membersection{wxSVGFileDC::LogicalToDeviceX}\label{wxdclogicaltodevicex}
-
-\func{wxCoord}{LogicalToDeviceX}{\param{wxCoord}{ x}}
-
-Converts logical X coordinate to device coordinate, using the current
-mapping mode.
-
-\membersection{wxSVGFileDC::LogicalToDeviceXRel}\label{wxdclogicaltodevicexrel}
-
-\func{wxCoord}{LogicalToDeviceXRel}{\param{wxCoord}{ x}}
-
-Converts logical X coordinate to relative device coordinate, using the current
-mapping mode but ignoring the x axis orientation.
-Use this for converting a width, for example.
-
-\membersection{wxSVGFileDC::LogicalToDeviceY}\label{wxdclogicaltodevicey}
-
-\func{wxCoord}{LogicalToDeviceY}{\param{wxCoord}{ y}}
-
-Converts logical Y coordinate to device coordinate, using the current
-mapping mode.
-
-\membersection{wxSVGFileDC::LogicalToDeviceYRel}\label{wxdclogicaltodeviceyrel}
-
-\func{wxCoord}{LogicalToDeviceYRel}{\param{wxCoord}{ y}}
-
-Converts logical Y coordinate to relative device coordinate, using the current
-mapping mode but ignoring the y axis orientation.
-Use this for converting a height, for example.
-
-\membersection{wxSVGFileDC::MaxX}\label{wxdcmaxx}
-
-\func{wxCoord}{MaxX}{\void}
-
-Gets the maximum horizontal extent used in drawing commands so far.
-
-\membersection{wxSVGFileDC::MaxY}\label{wxdcmaxy}
-
-\func{wxCoord}{MaxY}{\void}
-
-Gets the maximum vertical extent used in drawing commands so far.
-
-\membersection{wxSVGFileDC::MinX}\label{wxdcminx}
-
-\func{wxCoord}{MinX}{\void}
-
-Gets the minimum horizontal extent used in drawing commands so far.
-
-\membersection{wxSVGFileDC::MinY}\label{wxdcminy}
-
-\func{wxCoord}{MinY}{\void}
-
-Gets the minimum vertical extent used in drawing commands so far.
-
-\membersection{wxSVGFileDC::Ok}\label{wxdcok}
-
-\func{bool}{Ok}{\void}
-
-Returns TRUE if the DC is ok to use; False values arise from being unable to 
-write the file
-
-\membersection{wxSVGFileDC::ResetBoundingBox}\label{wxdcresetboundingbox}
-
-\func{void}{ResetBoundingBox}{\void}
-
-Resets the bounding box: after a call to this function, the bounding box
-doesn't contain anything.
-
-\wxheading{See also}
-
-\helpref{CalcBoundingBox}{wxdccalcboundingbox}
-
-\membersection{wxSVGFileDC::SetAxisOrientation}\label{wxdcsetaxisorientation}
-
-\func{void}{SetAxisOrientation}{\param{bool}{ xLeftRight},
-                                \param{bool}{ yBottomUp}}
-
-Sets the x and y axis orientation (i.e., the direction from lowest to
-highest values on the axis). The default orientation is the natural
-orientation, e.g. x axis from left to right and y axis from bottom up.
-
-\wxheading{Parameters}
-
-\docparam{xLeftRight}{True to set the x axis orientation to the natural
-left to right orientation, false to invert it.}
-
-\docparam{yBottomUp}{True to set the y axis orientation to the natural
-bottom up orientation, false to invert it.}
-
-\membersection{wxSVGFileDC::SetDeviceOrigin}\label{wxdcsetdeviceorigin}
-
-\func{void}{SetDeviceOrigin}{\param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Sets the device origin (i.e., the origin in pixels after scaling has been
-applied).
-
-This function may be useful in Windows printing
-operations for placing a graphic on a page.
-
-\membersection{wxSVGFileDC::SetBackground}\label{wxdcsetbackground}
-
-\func{void}{SetBackground}{\param{const wxBrush\& }{brush}}
-
-Sets the current background brush for the DC.
-
-\membersection{wxSVGFileDC::SetBackgroundMode}\label{wxdcsetbackgroundmode}
-
-\func{void}{SetBackgroundMode}{\param{int}{ mode}}
-
-{\it mode} may be one of wxSOLID and wxTRANSPARENT. This setting determines
-whether text will be drawn with a background colour or not.
-
-\membersection{wxSVGFileDC::SetClippingRegion}\label{wxdcsetclippingregion}
-
-\func{void}{SetClippingRegion}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}}
-
-\func{void}{SetClippingRegion}{\param{const wxPoint\& }{pt}, \param{const wxSize\& }{sz}}
-
-\func{void}{SetClippingRegion}{\param{const wxRect\&}{ rect}}
-
-\func{void}{SetClippingRegion}{\param{const wxRegion\&}{ region}}
-
-Not implemented 
-
-
-\membersection{wxSVGFileDC::SetPalette}\label{wxdcsetpalette}
-
-\func{void}{SetPalette}{\param{const wxPalette\& }{palette}}
-
-Not implemented 
-
-\membersection{wxSVGFileDC::SetBrush}\label{wxdcsetbrush}
-
-\func{void}{SetBrush}{\param{const wxBrush\& }{brush}}
-
-Sets the current brush for the DC.
-
-If the argument is wxNullBrush, the current brush is selected out of the device
-context, and the original brush restored, allowing the current brush to
-be destroyed safely.
-
-See also \helpref{wxBrush}{wxbrush}.
-
-See also \helpref{wxMemoryDC}{wxmemorydc} for the interpretation of colours
-when drawing into a monochrome bitmap.
-
-\membersection{wxSVGFileDC::SetFont}\label{wxdcsetfont}
-
-\func{void}{SetFont}{\param{const wxFont\& }{font}}
-
-Sets the current font for the DC. It must be a valid font, in particular you
-should not pass {\tt wxNullFont} to this method.
-
-See also \helpref{wxFont}{wxfont}.
-
-\membersection{wxSVGFileDC::SetLogicalFunction}\label{wxdcsetlogicalfunction}
-
-\func{void}{SetLogicalFunction}{\param{int}{ function}}
-
-
-Only wxCOPY is avalaible; trying to set one of the othe values will fail
-
-\membersection{wxSVGFileDC::SetMapMode}\label{wxdcsetmapmode}
-
-\func{void}{SetMapMode}{\param{int}{ int}}
-
-The {\it mapping mode} of the device context defines the unit of
-measurement used to convert logical units to device units. Note that
-in X, text drawing isn't handled consistently with the mapping mode; a
-font is always specified in point size. However, setting the {\it
-user scale} (see \helpref{wxSVGFileDC::SetUserScale}{wxdcsetuserscale}) scales the text appropriately. In
-Windows, scaleable TrueType fonts are always used; in X, results depend
-on availability of fonts, but usually a reasonable match is found.
-
-Note that the coordinate origin should ideally be selectable, but for
-now is always at the top left of the screen/printer.
-
-Drawing to a Windows printer device context under UNIX
-uses the current mapping mode, but mapping mode is currently ignored for
-PostScript output.
-
-The mapping mode can be one of the following:
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{wxMM\_TWIPS}{Each logical unit is 1/20 of a point, or 1/1440 of
-  an inch.}
-\twocolitem{wxMM\_POINTS}{Each logical unit is a point, or 1/72 of an inch.}
-\twocolitem{wxMM\_METRIC}{Each logical unit is 1 mm.}
-\twocolitem{wxMM\_LOMETRIC}{Each logical unit is 1/10 of a mm.}
-\twocolitem{wxMM\_TEXT}{Each logical unit is 1 pixel.}
-\end{twocollist}
-
-\membersection{wxSVGFileDC::SetOptimization}\label{wxsetoptimization}
-
-\func{void}{SetOptimization}{\param{bool }{optimize}}
-
-Does nothing
-
-\membersection{wxSVGFileDC::SetPen}\label{wxdcsetpen}
-
-\func{void}{SetPen}{\param{const wxPen\& }{pen}}
-
-Sets the current pen for the DC.
-
-If the argument is wxNullPen, the current pen is selected out of the device
-context, and the original pen restored.
-
-See also \helpref{wxMemoryDC}{wxmemorydc} for the interpretation of colours
-when drawing into a monochrome bitmap.
-
-\membersection{wxSVGFileDC::SetTextBackground}\label{wxdcsettextbackground}
-
-\func{void}{SetTextBackground}{\param{const wxColour\& }{colour}}
-
-Sets the current text background colour for the DC.
-
-\membersection{wxSVGFileDC::SetTextForeground}\label{wxdcsettextforeground}
-
-\func{void}{SetTextForeground}{\param{const wxColour\& }{colour}}
-
-Sets the current text foreground colour for the DC.
-
-See also \helpref{wxMemoryDC}{wxmemorydc} for the interpretation of colours
-when drawing into a monochrome bitmap.
-
-\membersection{wxSVGFileDC::SetUserScale}\label{wxdcsetuserscale}
-
-\func{void}{SetUserScale}{\param{double}{ xScale}, \param{double}{ yScale}}
-
-Sets the user scaling factor, useful for applications which require
-`zooming'.
-
-\membersection{wxSVGFileDC::StartDoc}\label{wxdcstartdoc}
-
-\func{bool}{StartDoc}{\param{const wxString\& }{message}}
-
-Does nothing
-
-\membersection{wxSVGFileDC::StartPage}\label{wxdcstartpage}
-
-\func{bool}{StartPage}{\void}
-
-Does nothing

contrib/docs/latex/svg/tex2rtf.ini

@@ -1,35 +0,0 @@
-;    Last change:  JAC  13 Oct 100    5:11 pm
-runTwice = yes
-titleFontSize = 12
-authorFontSize = 10
-chapterFontSize = 12
-sectionFontSize = 12
-subsectionFontSize = 12
-headerRule = yes
-footerRule = yes
-useHeadingStyles = yes
-listItemIndent=40
-generateHPJ = yes
-htmlBrowseButtons = bitmap
-winHelpVersion = 3
-winHelpContents = yes
-winHelpTitle = "SVG Manual"
-truncateFilenames = yes
-combineSubSections = yes
-\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}}
-\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
-\wxheading [1]{{\bf \htmlignore{\fcol{blue}{#1}}\htmlonly{\fcol{red}{#1}}}}
-\const [0] {{\bf const}}
-\constfunc [3] {{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
-\windowstyle [1] {{\bf #1}\index{#1}}
-
-;;
-;; These two are for generating MS HTML Help project, contents and index files.
-;;
-;;htmlWorkshopFiles = true
-;;htmlIndex = true
-;;\pythonnote [1] {{\bf \fcol{blue}{wxPython note:}} #1}
-;;%\pythonnote [1] {}
-

contrib/docs/latex/svg/texhelp.sty

@@ -1,298 +0,0 @@
-% LaTeX style file
-% Name:   texhelp.sty
-% Author: Julian Smart
-%
-% Purpose
-% -------
-% Style file to enable the simultaneous preparation of printed LaTeX and on-line
-% hypertext manuals.
-% Use in conjunction with Tex2RTF (see Tex2RTF documentation).
-%
-% Note that if a non-ASCII character starts a newline and there should be a space
-% between the last word on the previous line and the first word on this line,
-% you need to use \rtfsp to generate a space in Windows Help. \rtfsp is ignored
-% in all other formats.
-%
-% Julian Smart
-% Artificial Intelligence Applications Institute
-%
-%
-% ============== C++/CLIPS Documentation Facilities ==============
-%
-% Each class definition should be typeset with e.g.
-%
-% \section{\class{Name}: Parent}
-%
-% followed by a description of the class.
-% Each member should follow:
-%
-% \membersection{wxName::Member}
-%
-% with a description of what this member does.
-% Then, one (or more if overloaded) member (function) in detail:
-%
-% \func{return type}{name}{args}
-% or
-% \member{type}{name}
-%
-% where args is a list of \param{type}{name}, ...
-
-% Function, e.g.
-% e.g. to typeset
-%
-% void DoIt(char *string);
-%
-% write:
-%
-% \func{void}{DoIt}{\param{char *}{string}}
-%
-
-\newcommand{\func}[3]{\hangafter=1\noindent\hangindent=10mm
-{{\it #1} {\bf #2}\index{#2}}(#3)}
-
-% For function/type definition where the name is a pointer,
-% e.g. to typeset
-%
-% typedef void (*wxFunction)(wxObject&)
-%
-% write:
-%
-% \pfunc{typedef void}{wxFunction}{param{wxObject&}}
-
-\newcommand{\pfunc}[3]{\hangafter=1\noindent\hangindent=10mm
-{{\it #1} ({\bf *#2})\index{#2}}(#3)}
-
-% Use an ordinary \section command for class name definitions.
-
-% This is used for a member, such as wxBitmap: GetDepth
-\newcommand{\membersection}[1]{\subsection*{#1}\index{#1}}
-
-% CLIPS function
-\newcommand{\clipsfunc}[3]{\hangafter=1\noindent\hangindent=10mm
-{{\bf #1} ({\bf #2}\index{#2}}#3)}
-
-\newcommand{\clipssection}[1]{\chapter{#1}}
-
-% This is used for a CLIPS function name
-\newcommand{\functionsection}[1]{\subsection*{#1}}
-
-% Member: a type and a name
-\newcommand{\member}[2]{{\bf #1 \it #2}}
-
-% C++ Parameter: a type and a name (no intervening space)
-\newcommand{\param}[2]{{\it #1}{\bf #2}}
-
-% CLIPS Parameter: a type and a name (one intervening space)
-\newcommand{\cparam}[2]{{\bf #1} {\it #2}}
-
-% Class: puts in index
-\newcommand{\class}[1]{#1\index{#1}}
-
-%\newcommand{\docparam}[2]{\parskip=0pt {\it #1}\par\parskip=10pt\begin{indented}{1cm}{#2}\end{indented}}
-
-% Void type
-\newcommand{\void}{{\it void}}
-
-% Typeset destructor
-\newcommand{\destruct}[1]{{$\sim$}#1}
-
-% Typeset insert/extract operators
-\newcommand{\cinsert}{$<<$}
-\newcommand{\cextract}{$>>$}
-
-
-% =================== Hypertext facilities ===================
-%
-% To insert hyperlinks (or references, in Latex), \label the sections
-% or membersections \label{ref-label} immediately after the section, on the same line,
-% and use \helpref{text-to-show}{ref-label} to make a reference.
-%
-
-% Type text with section reference
-\newcommand{\helpref}[2]{{\it #1} (p.\ \pageref{#2}) }
-
-% Type text with URL in verbatim mode
-\newcommand{\urlref}[2]{#1 (\verb$#2$)}
-
-% Don't typeset section number in LaTeX
-\newcommand{\helprefn}[2]{{\it #1}}
-
-% Like helpref, but popup text in WinHelp instead of hyperlinked
-\newcommand{\popref}[2]{{\it #1}}
-
-% Like footnote, but popup text.
-\newcommand{\footnotepopup}[2]{{\it #1}\footnote{#2}}
-
-% =================== On-line help specific macros ===================
-%
-
-% Global document font size/family, help only.
-\newcommand{\helpfontsize}[1]{}
-\newcommand{\helpfontfamily}[1]{}
-
-% Ignore in all on-line help
-\newcommand{\helpignore}[1]{#1}
-% Only print in all on-line help
-\newcommand{\helponly}[1]{}
-
-% Ignore in LaTeX
-\newcommand{\latexignore}[1]{}
-% Only print in LaTeX
-\newcommand{\latexonly}[1]{#1}
-
-% Ignore in linear RTF
-\newcommand{\rtfignore}[1]{#1}
-% Only print in linear RTF
-\newcommand{\rtfonly}[1]{}
-
-% Ignore in WinHelp RTF
-\newcommand{\winhelpignore}[1]{#1}
-% Only print in WinHelp RTF
-\newcommand{\winhelponly}[1]{}
-
-% Ignore in wxHelp
-\newcommand{\xlpignore}[1]{#1}
-% Only print in wxHelp
-\newcommand{\xlponly}[1]{}
-
-% Ignore in HTML
-\newcommand{\htmlignore}[1]{#1}
-% Only print in HTML
-\newcommand{\htmlonly}[1]{}
-
-% Input a file only for help system (binder thickness is not a limitation
-% in help systems!)
-\newcommand{\helpinput}[1]{}
-
-\newcommand{\rtfsp}{ } % Force a space in RTF, ignore in Latex
-
-% =================== Miscellaneous macros ===================
-%
-% Headings consistent with generated ones
-\newcommand{\myheading}[1]{\vspace*{25pt}
-\begin{flushleft}
-{\LARGE \bf #1}
-\end{flushleft}
-\vskip 20pt
-}
-
-% Heading with entry in contents page.
-\newcommand{\chapterheading}[1]{\myheading{#1}
-\addcontentsline{toc}{chapter}{#1}}
-
-\newcommand{\sectionheading}[1]{\myheading{#1}
-\addcontentsline{toc}{section}{#1}}
-
-% Glossary environment
-\newenvironment{helpglossary}{\newpage\chapterheading{Glossary}\begin{description}}{\end{description}}
-
-% Glossary entry
-\newcommand{\gloss}[1]{\item[#1]\index{#1}}
-
-% Image: EPS in Latex, BMP or MF (whatever's available) in RTF. Requires psbox.
-\newcommand{\image}[2]{\psboxto(#1){#2}}
-
-% Image, left aligned (HTML)
-\newcommand{\imager}[2]{\psboxto(#1){#2}}
-
-% Image, right aligned (HTML)
-\newcommand{\imagel}[2]{\psboxto(#1){#2}}
-
-% Imagemap: principally for HTML only. In Latex,
-% acts like \image.
-\newcommand{\imagemap}[3]{\psboxto(#1){#2}}
-
-% Headers and footers
-% \setheader{EvenPageLeft}{EvenPageCentre}{EvenPageRight}
-% {OddPageLeft}{OddPageCentre}{OddPageRight}
-\newcommand{\setheader}[6]{
-\lhead[\fancyplain{}{#1}]{\fancyplain{}{#4}}
-\chead[\fancyplain{}{#2}]{\fancyplain{}{#5}}
-\rhead[\fancyplain{}{#3}]{\fancyplain{}{#6}}
-}
-
-% \setfooter{EvenPageLeft}{EvenPageCentre}{EvenPageRight}
-% {OddPageLeft}{OddPageCentre}{OddPageRight}
-\newcommand{\setfooter}[6]{
-\lfoot[\fancyplain{#1}{#1}]{\fancyplain{#4}{#4}}
-\cfoot[\fancyplain{#2}{#2}]{\fancyplain{#5}{#5}}
-\rfoot[\fancyplain{#3}{#3}]{\fancyplain{#6}{#6}}
-}
-
-% Needed for telling RTF where margin paragraph should go
-% in mirrored margins mode.
-\newcommand{\marginpareven}[1]{\hspace*{0pt}\marginpar{#1}}
-\newcommand{\marginparodd}[1]{\hspace*{0pt}\marginpar{#1}}
-
-% Environment for two-column table popular in WinHelp and manuals.
-\newcommand{\twocolwidtha}[1]{\def\twocolwidthaval{#1}}
-\newcommand{\twocolwidthb}[1]{\def\twocolwidthbval{#1}}
-\newcommand{\twocolspacing}[1]{\def\twocolspacingval{#1}}
-
-\twocolwidtha{3cm}
-\twocolwidthb{8.5cm}
-\twocolspacing{2}
-
-\newcommand{\twocolitem}[2]{#1 & #2\\}
-\newcommand{\twocolitemruled}[2]{#1 & #2\\\hline}
-
-\newenvironment{twocollist}{\renewcommand{\arraystretch}{\twocolspacingval}\begin{tabular}{lp{\twocolwidthbval}}}%
-{\end{tabular}\renewcommand{\arraystretch}{1}}
-
-% Specifying table rows for RTF compatibility
-\newcommand{\row}[1]{#1\\}
-
-% Use for the last ruled row for correct RTF generation.
-\newcommand{\ruledrow}[1]{#1\\\hline}
-
-% Indentation environment. Arg1 is left margin size
-\newenvironment{indented}[1]{\begin{list}{}{\leftmargin=#1}\item[]}%
-{\end{list}}
-
-% Framed box of text, normal formatting.
-\newcommand{\normalbox}[1]{\fbox{\vbox{#1}}}
-% Double-framed box of text.
-\newcommand{\normalboxd}[1]{\fbox{\fbox{\vbox{#1}}}}
-
-% WITHDRAWN -- can't do in RTF, easily.
-% Framed box of text, horizontally centred. Ragged right within box.
-% \newcommand{\centeredbox}[2]{\begin{center}\fbox{\parbox{#1}{\raggedright#2}}\end{center}}
-% Double-framed box of text, horizontally centred. Ragged right within box.
-% \newcommand{\centeredboxd}[2]{\begin{center}\fbox{\fbox{\parbox{#1}{\raggedright#2}}}\end{center}}
-
-% toocomplex environment: simply prints the argument in LaTeX,
-% comes out verbatim in all generated formats.
-\newenvironment{toocomplex}{}{}
-
-% Colour: dummy commands since LaTeX doesn't support colour.
-% \definecolour{name}{red}{blue}{green}
-% \fcol{name}{text} ; Foreground
-% \bcol{name}{text} ; Background
-\newcommand{\definecolour}[4]{}
-\newcommand{\definecolor}[4]{}
-\newcommand{\fcol}[2]{#2}
-\newcommand{\bcol}[2]{#2}
-\newcommand{\sethotspotcolour}[1]{}
-\newcommand{\sethotspotunderline}[1]{}
-\newcommand{\settransparency}[1]{}
-\newcommand{\backslashraw}[0]{}
-\newcommand{\lbraceraw}[0]{}
-\newcommand{\rbraceraw}[0]{}
-\newcommand{\registered}[0]{(r)}
-\newcommand{\background}[1]{}
-\newcommand{\textcolour}[1]{}
-\newcommand{\overview}[2]{See \helpref{#1}{#2}.}
-\newcommand{\docparam}[2]{{\it #1}\begin{list}{}{\leftmargin=1cm}\item[]
-#2%
-\end{list}}
-\newcommand{\wxheading}[1]{{\bf #1}}
-\newcommand{\const}[0]{{\bf const}}
-\newcommand{\constfunc}[3]{{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
-\newcommand{\windowstyle}[1]{{\bf #1}\index{#1}}
-
-\addtolength{\textwidth}{1in}
-\addtolength{\oddsidemargin}{-0.5in}
-\addtolength{\topmargin}{-0.5in}
-\addtolength{\textheight}{1in}
-\sloppy
-

contrib/include/wx/animate/animate.h

@@ -12,7 +12,7 @@
 #ifndef _WX_ANIMATEH__
 #define _WX_ANIMATEH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "animate.h"
 #endif
 

contrib/include/wx/canvas/bbox.h

@@ -1,7 +1,7 @@
 #ifndef __WXBOUNDINGBOX_H__
 #define __WXBOUNDINGBOX_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "bbox.cpp"
 #endif
 

contrib/include/wx/canvas/canvas.h

@@ -9,7 +9,7 @@
 #ifndef __WXCANVAS_H__
 #define __WXCANVAS_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "canvas.cpp"
 #endif
 
@@ -54,7 +54,6 @@ enum wxDRAG_MODE
 // alteration of a  wxCanvasObject functionality
 class wxCanvasObject: public wxEvtHandler
 {
-    DECLARE_CLASS(wxCanvasObject)
 public:
 
     wxCanvasObject();
@@ -215,7 +214,6 @@ protected:
 // The group has a matrix to position/rotate/scale the group.
 class wxCanvasObjectGroup: public wxCanvasObject
 {
-    DECLARE_CLASS(wxCanvasObjectGroup)
 public:
     wxCanvasObjectGroup(double x, double y);
     virtual ~wxCanvasObjectGroup();
@@ -284,7 +282,6 @@ protected:
 // The position/matrix of the referenced Object is accumulated with the one here.
 class wxCanvasObjectRef: public wxCanvasObject
 {
-    DECLARE_CLASS(wxCanvasObjectRef)
 public:
     wxCanvasObjectRef(double x, double y,wxCanvasObject* obj);
 
@@ -335,7 +332,6 @@ protected:
 // wxCanvasRect
 class wxCanvasRect: public wxCanvasObject
 {
-    DECLARE_CLASS(wxCanvasRect)
 public:
     wxCanvasRect( double x, double y, double w, double h , double radius=0 );
     void SetBrush( const wxBrush& brush)  { m_brush = brush; };

contrib/include/wx/canvas/liner.h

@@ -8,7 +8,7 @@
 #ifndef __WXLINER_H
 #define __WXLINER_H
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "liner.cpp"
 #endif
 

contrib/include/wx/canvas/polygon.h

@@ -9,7 +9,7 @@
 #ifndef __WXPOLYGON_H__
 #define __WXPOLYGON_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "polygon.cpp"
 #endif
 

contrib/include/wx/fl/antiflickpl.h

@@ -12,7 +12,7 @@
 #ifndef __ANTIFLICKPL_G__
 #define __ANTIFLICKPL_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "antiflickpl.h"
 #endif
 

contrib/include/wx/fl/bardragpl.h

@@ -12,7 +12,7 @@
 #ifndef __BARDRAGPL_G__
 #define __BARDRAGPL_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "bardragpl.h"
 #endif
 

contrib/include/wx/fl/barhintspl.h

@@ -12,7 +12,7 @@
 #ifndef __DRAGHINTSPL_G__
 #define __DRAGHINTSPL_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "barhintspl.h"
 #endif
 

contrib/include/wx/fl/cbcustom.h

@@ -12,7 +12,7 @@
 #ifndef __CBCUSTOM_G__
 #define __CBCUSTOM_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "cbcustom.h"
 #endif
 

contrib/include/wx/fl/controlbar.h

@@ -13,7 +13,7 @@
 #ifndef __CONTROLBAR_G__
 #define __CONTROLBAR_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "controlbar.h"
 #endif
 
@@ -1026,14 +1026,6 @@ class cbCommonPaneProperties : public wxObject
         // Default constructor.
 
     cbCommonPaneProperties(void);
-
-        // Copy constructor
-    
-    cbCommonPaneProperties(const cbCommonPaneProperties&);
-
-        // Assignment operator
-    
-    cbCommonPaneProperties& operator=(const cbCommonPaneProperties&);
 };
 
 /*

contrib/include/wx/fl/dynbarhnd.h

@@ -12,7 +12,7 @@
 #ifndef __DYNBARHND_G__
 #define __DYNBARHND_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "dynbarhnd.h"
 #endif
 

contrib/include/wx/fl/dyntbar.h

@@ -12,7 +12,7 @@
 #ifndef __DYNTBAR_G__
 #define __DYNTBAR_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "dyntbar.h"
 #endif
 
@@ -100,6 +100,8 @@ wxDynamicToolBar manages containment and layout of tool windows.
 
 class wxDynamicToolBar : public wxToolBarBase
 {
+    DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
+
 protected:
     friend class wxDynamicToolBarSerializer;
 
@@ -245,21 +247,18 @@ public:
         // Creates a toolbar tool.
 
     virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled,
-                                          wxItemKind kind,
+                                          const wxBitmap& bitmap1,
+                                          const wxBitmap& bitmap2,
+                                          bool toggle,
                                           wxObject *clientData,
-                                          const wxString& shortHelp,
-                                          const wxString& longHelp);
+                                          const wxString& shortHelpString,
+                                          const wxString& longHelpString);
 
         // Creates a toolbar tool.
 
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
-private:
     DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
 };
 
 #endif /* __DYNTBAR_G__ */

contrib/include/wx/fl/dyntbarhnd.h

@@ -12,7 +12,7 @@
 #ifndef __DYNTBARHND_G__
 #define __DYNTBARHND_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "dyntbarhnd.h"
 #endif
 

contrib/include/wx/fl/frmview.h

@@ -12,7 +12,7 @@
 #ifndef __FRMVIEW_G__
 #define __FRMVIEW_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "frmview.h"
 #endif
 

contrib/include/wx/fl/garbagec.h

@@ -12,7 +12,7 @@
 #ifndef __GARBAGEC_G__
 #define __GARBAGEC_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "garbagec.h"
 #endif
 

contrib/include/wx/fl/gcupdatesmgr.h

@@ -12,7 +12,7 @@
 #ifndef __GCUPDATESMGR_G__
 #define __GCUPDATESMGR_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "gcupdatesmgr.h"
 #endif
 

contrib/include/wx/fl/hintanimpl.h

@@ -12,7 +12,7 @@
 #ifndef __HINTANIMPL_G__
 #define __HINTANIMPL_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "hintanimpl.h"
 #endif
 

contrib/include/wx/fl/newbmpbtn.h

@@ -12,16 +12,13 @@
 #ifndef __NEWBMPBTN_G__
 #define __NEWBMPBTN_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "newbmpbtn.h"
 #endif
 
 #include "wx/button.h"
 #include "wx/string.h"
 
-// defaults
-#define NB_DEFAULT_MARGIN 2
-
 // button label-text alignment types
 
 #define NB_ALIGN_TEXT_RIGHT  0
@@ -114,8 +111,8 @@ public:
                        bool  isFlat                = TRUE,
                        // this is the default type of fired events
                        int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
-                       int marginX        = NB_DEFAULT_MARGIN,
-                       int marginY        = NB_DEFAULT_MARGIN,
+                       int marginX        = 2,
+                       int marginY        = 2,
                        int textToLabelGap = 2,
                        bool isSticky      = FALSE
                      );
@@ -128,8 +125,8 @@ public:
                            bool  isFlat                   = TRUE,
                            // this is the default type of fired events
                            int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
-                           int marginX        = NB_DEFAULT_MARGIN,
-                           int marginY        = NB_DEFAULT_MARGIN,
+                           int marginX        = 2,
+                           int marginY        = 2,
                            int textToLabelGap = 2,
                            bool isSticky      = FALSE
                              );
@@ -146,8 +143,8 @@ public:
 
         // Sets the text alignment and margins.
     virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,
-                                int marginX        = NB_DEFAULT_MARGIN,
-                                int marginY        = NB_DEFAULT_MARGIN,
+                                int marginX        = 2,
+                                int marginY        = 2,
                                 int textToLabelGap = 2);
 
         // Draws the decorations.
@@ -176,6 +173,9 @@ public:
         // Responds to a left mouse button up event.
     void OnLButtonUp( wxMouseEvent& event );
 
+        // Responds to a left mouse button double click.
+    void OnLButtonDClick( wxMouseEvent& event );
+
         // Responds to mouse enter to window.
     void OnMouseEnter( wxMouseEvent& event );
 
@@ -194,11 +194,6 @@ public:
         // Responds to a kill focus 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()
 };
 

contrib/include/wx/fl/panedrawpl.h

@@ -12,7 +12,7 @@
 #ifndef __PANEDRAWPL_G__
 #define __PANEDRAWPL_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "panedrawpl.h"
 #endif
 

contrib/include/wx/fl/rowdragpl.h

@@ -12,7 +12,7 @@
 #ifndef __ROWDRAGPL_G__
 #define __ROWDRAGPL_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "rowdragpl.h"
 #endif
 

contrib/include/wx/fl/rowlayoutpl.h

@@ -12,7 +12,7 @@
 #ifndef __ROWLAYOUTPL_G__
 #define __ROWLAYOUTPL_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "rowlayoutpl.h"
 #endif
 

contrib/include/wx/fl/toolwnd.h

@@ -13,7 +13,7 @@
 #ifndef __TOOLWND_G__
 #define __TOOLWND_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "toolwnd.h"
 #endif
 

contrib/include/wx/fl/updatesmgr.h

@@ -12,7 +12,7 @@
 #ifndef __UPDATESMGR_G__
 #define __UPDATESMGR_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "updatesmgr.h"
 #endif
 

contrib/include/wx/gizmos/editlbox.h

@@ -11,7 +11,7 @@
 #ifndef __WX_EDITLBOX_H__
 #define __WX_EDITLBOX_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 	#pragma interface "editlbox.h"
 #endif
 
@@ -50,17 +50,11 @@ public:
     void SetStrings(const wxArrayString& strings);
     void GetStrings(wxArrayString& strings);
 
-    wxListCtrl* GetListCtrl()       { return m_listCtrl; }
-    wxBitmapButton* GetDelButton()  { return m_bDel; }
-    wxBitmapButton* GetNewButton()  { return m_bNew; }
-    wxBitmapButton* GetUpButton()   { return m_bUp; }
-    wxBitmapButton* GetDownButton() { return m_bDown; }
-    wxBitmapButton* GetEditButton() { return m_bEdit; }
-
 protected:
     wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit;
     wxListCtrl *m_listCtrl;
     int m_selection;
+    bool m_edittingNew;
     long m_style;
 
     void OnItemSelected(wxListEvent& event);

contrib/include/wx/gizmos/ledctrl.h

@@ -1,7 +1,7 @@
 #ifndef _WX_LEDNUMBERCTRL_H_
 #define _WX_LEDNUMBERCTRL_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "wxLEDNumberCtrl.h"
 #endif
 

contrib/include/wx/gizmos/multicell.h

@@ -15,7 +15,7 @@
 #ifndef __WX_MULTICELL_H__
 #define __WX_MULTICELL_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 	#pragma interface "multicell.h"
 #endif
 

contrib/include/wx/gizmos/splittree.h

@@ -14,7 +14,7 @@
 #ifndef _WX_SPLITTREE_H_
 #define _WX_SPLITTREE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
     #pragma interface "splittree.h"
 #endif
 

contrib/include/wx/mmedia/cdbase.h

@@ -10,7 +10,7 @@
 #ifndef __CDA_base_H__
 #define __CDA_base_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "cdbase.h"
 #endif
 

contrib/include/wx/mmedia/cdunix.h

@@ -10,7 +10,7 @@
 #ifndef __CDUNIXH__
 #define __CDUNIXH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "cdunix.h"
 #endif
 

contrib/include/wx/net/email.h

@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "email.h"
 #endif
 

contrib/include/wx/net/msg.h

@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "msg.h"
 #endif
 

contrib/include/wx/net/smapi.h

@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "smapi.h"
 #endif
 
@@ -53,4 +53,4 @@ protected:
 };
 
 
-#endif //_WX_SMAPI_H_
+#endif //_WX_SMAPI_H_

contrib/include/wx/net/web.h

@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "web.h"
 #endif
 

contrib/include/wx/ogl/basic.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_BASIC_H_
 #define _OGL_BASIC_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "basic.h"
 #endif
 

contrib/include/wx/ogl/basicp.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_BASICP_H_
 #define _OGL_BASICP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "basicp.h"
 #endif
 

contrib/include/wx/ogl/bmpshape.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_BITMAP_H_
 #define _OGL_BITMAP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "bmpshape.h"
 #endif
 

contrib/include/wx/ogl/canvas.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_CANVAS_H_
 #define _OGL_CANVAS_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "canvas.h"
 #endif
 
@@ -23,8 +23,6 @@
 #define StartDraggingRight     3
 #define ContinueDraggingRight  4
 
-extern wxChar* wxShapeCanvasNameStr;
-
 // When drag_count reaches 0, process drag message
 
 class wxDiagram;
@@ -33,11 +31,8 @@ class wxShapeCanvas: public wxScrolledWindow
 {
  DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
  public:
-  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = -1,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxBORDER | wxRETAINED,
-                const wxString& name = wxShapeCanvasNameStr);
+  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+               long style = wxBORDER | wxRETAINED);
   ~wxShapeCanvas();
 
   inline void SetDiagram(wxDiagram *diag) { m_shapeDiagram = diag; }
@@ -59,7 +54,7 @@ class wxShapeCanvas: public wxScrolledWindow
   virtual wxShape *FindShape(double x, double y, int *attachment, wxClassInfo *info = NULL, wxShape *notImage = NULL);
   wxShape *FindFirstSensitiveShape(double x, double y, int *new_attachment, int op);
   wxShape *FindFirstSensitiveShape1(wxShape *image, int op);
-
+  
   // Redirect to wxDiagram object
   virtual void AddShape(wxShape *object, wxShape *addAfter = NULL);
   virtual void InsertShape(wxShape *object);

contrib/include/wx/ogl/composit.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_COMPOSIT_H_
 #define _OGL_COMPOSIT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "composit.h"
 #endif
 

contrib/include/wx/ogl/constrnt.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_CONSTRNT_H_
 #define _OGL_CONSTRNT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "constrnt.h"
 #endif
 

contrib/include/wx/ogl/divided.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_DIVIDED_H_
 #define _OGL_DIVIDED_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "basic.h"
 #endif
 

contrib/include/wx/ogl/drawn.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_DRAWN_H_
 #define _OGL_DRAWN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "drawn.h"
 #endif
 

contrib/include/wx/ogl/drawnp.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_DRAWNP_H_
 #define _OGL_DRAWNP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "drawnp.h"
 #endif
 
@@ -22,7 +22,7 @@
  * Drawing operations
  *
  */
-
+ 
 #define  DRAWOP_SET_PEN             1
 #define  DRAWOP_SET_BRUSH           2
 #define  DRAWOP_SET_FONT            3
@@ -54,7 +54,7 @@
  * Base, virtual class
  *
  */
-
+ 
 class wxDrawOp: public wxObject
 {
 public:
@@ -91,7 +91,7 @@ protected:
  * Set font, brush, text colour
  *
  */
-
+ 
 class wxOpSetGDI: public wxDrawOp
 {
  public:
@@ -114,7 +114,7 @@ public:
  * Set/destroy clipping
  *
  */
-
+ 
 class wxOpSetClipping: public wxDrawOp
 {
 public:
@@ -137,12 +137,12 @@ public:
  * Draw line, rectangle, rounded rectangle, ellipse, point, arc, text
  *
  */
-
+ 
 class wxOpDraw: public wxDrawOp
 {
  public:
   wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
-         double radius = 0.0, wxChar *s = NULL);
+         double radius = 0.0, char *s = NULL);
   ~wxOpDraw();
   void Do(wxDC& dc, double xoffset, double yoffset);
   void Scale(double scaleX, double scaleY);
@@ -160,7 +160,7 @@ public:
   double     m_x3;
   double     m_y3;
   double     m_radius;
-  wxChar*    m_textString;
+  char*     m_textString;
 
 };
 
@@ -196,7 +196,7 @@ public:
 public:
   wxRealPoint*  m_points;
   int           m_noPoints;
-
+  
 };
 
 #endif

contrib/include/wx/ogl/lines.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_LINES_H_
 #define _OGL_LINES_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "lines.h"
 #endif
 

contrib/include/wx/ogl/linesp.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_LINESP_H_
 #define _OGL_LINESP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "linesp.h"
 #endif
 

contrib/include/wx/ogl/mfutils.h

@@ -13,7 +13,7 @@
 #ifndef _MFUTILS_H_
 #define _MFUTILS_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "mfutils.h"
 #endif
 
@@ -169,9 +169,9 @@ class wxMetaRecord: public wxObject
   long param6;
   long param7;
   long param8;
-  wxChar *stringParam;
+  char *stringParam;
   wxRealPoint *points;
-
+  
   wxMetaRecord(int fun)
   {
     metaFunction = fun; points = NULL; stringParam = NULL;
@@ -197,7 +197,7 @@ class wxXMetaFile: public wxObject
                      // referenced by position in list by SelectObject
   wxXMetaFile(char *file = NULL);
   ~wxXMetaFile(void);
-
+  
   // After this is called, the metafile cannot be used for anything
   // since it is now owned by the clipboard.
   bool SetClipboard(int width = 0, int height = 0);

contrib/include/wx/ogl/misc.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_MISC_H_
 #define _OGL_MISC_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "misc.h"
 #endif
 

contrib/include/wx/ogl/ogldiag.h

@@ -12,7 +12,7 @@
 #ifndef _OGL_OGLDIAG_H_
 #define _OGL_OGLDIAG_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "ogldiag.h"
 #endif
 

contrib/include/wx/plot/plot.h

@@ -12,7 +12,7 @@
 #ifndef _WX_PLOT_H_
 #define _WX_PLOT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "plot.h"
 #endif
 

contrib/include/wx/svg/dcsvg.h

@@ -1,323 +0,0 @@
-#ifndef __DCSVG_H
-#define __DCSVG_H
-#include <wx/wfstream.h>
-#include <wx/string.h>
-
-#define wxSVGVersion wxT("v0100")
-#ifdef __BORLANDC__
-#pragma warn -rch
-#pragma warn -ccc
-#endif
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#define mm2inches        0.0393700787402
-#define inches2mm        25.4
-#define mm2twips         56.6929133859
-#define twips2mm         0.0176388888889
-#define mm2pt            2.83464566929
-#define pt2mm            0.352777777778
-
-class wxSVGFileDC : public wxDC
-{
-
-    private:
-        wxFileOutputStream * m_outfile ;
-        wxString m_filename ;
-        //holds number of png format images we have
-        int m_sub_images ;
-        bool m_OK, m_graphics_changed ;
-        int m_width, m_height ;
- 
-        double       
-            m_logicalScaleX,
-            m_logicalScaleY,
-            m_userScaleX,
-            m_userScaleY,
-            m_scaleX,
-            m_scaleY,
-	    m_OriginX,	
-            m_OriginY,
-            m_mm_to_pix_x,
-            m_mm_to_pix_y;
-
-        bool         
-	        m_needComputeScaleX,
-            m_needComputeScaleY; // not yet used
-            
-
-        bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const 
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return TRUE ; };
-
-        virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, class wxDC *,
-            wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1) ;
-
-        void DoCrossHair(wxCoord, wxCoord)            
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return  ; };
-
-        void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
-
-        void DoDrawBitmap(const class wxBitmap &, wxCoord, wxCoord, bool = 0) ;
-
-        void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
-
-        void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
-
-        void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) ;
-
-        void DoDrawIcon(const class wxIcon &, wxCoord, wxCoord) ;
-
-        void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ;
-
-        void DoDrawPoint(wxCoord, wxCoord) ;
-
-        void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) ;
-
-        void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
-
-        void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) ;
-
-        void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20)  ;
-
-        void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-
-        bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             int style = wxFLOOD_SURFACE)
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return FALSE ; };
-
-        void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; } ;
-
-        void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) const ;
-
-        void DoSetClippingRegionAsRegion(const class wxRegion &)            
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return  ; };
-
-       void Init (wxString f, int Width, int Height, float dpi);
-
-       void NewGraphics () ;
-
-#ifdef XDEV2LOG
-#undef XDEV2LOG
-#endif
-        wxCoord XDEV2LOG(wxCoord x) const
-        {
-            wxCoord new_x = x - m_deviceOriginX;
-            if (new_x > 0)
-                return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
-            else
-                return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
-        }
-#ifdef XDEV2LOGREL
-#undef XDEV2LOGREL
-#endif
-        wxCoord XDEV2LOGREL(wxCoord x) const
-        {
-            if (x > 0)
-                return (wxCoord)((double)(x) / m_scaleX + 0.5);
-            else
-                return (wxCoord)((double)(x) / m_scaleX - 0.5);
-        }
-#ifdef YDEV2LOG
-#undef YDEV2LOG
-#endif
-        wxCoord YDEV2LOG(wxCoord y) const
-        {
-            wxCoord new_y = y - m_deviceOriginY;
-            if (new_y > 0)
-                return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
-            else
-                return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
-        }
-#ifdef YDEV2LOGREL
-#undef YDEV2LOGREL
-#endif
-        wxCoord YDEV2LOGREL(wxCoord y) const
-        {
-            if (y > 0)
-                return (wxCoord)((double)(y) / m_scaleY + 0.5);
-            else
-                return (wxCoord)((double)(y) / m_scaleY - 0.5);
-        }
-#ifdef XLOG2DEV
-#undef XLOG2DEV
-#endif
-        wxCoord XLOG2DEV(wxCoord x) const
-        {
-            wxCoord new_x = x - m_logicalOriginX;
-            if (new_x > 0)
-                return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
-            else
-                return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
-        }
-#ifdef XLOG2DEVREL
-#undef XLOG2DEVREL
-#endif
-        wxCoord XLOG2DEVREL(wxCoord x) const
-        {
-            if (x > 0)
-                return (wxCoord)((double)(x) * m_scaleX + 0.5);
-            else
-                return (wxCoord)((double)(x) * m_scaleX - 0.5);
-        }
-#ifdef YLOG2DEV
-#undef YLOG2DEV
-#endif
-        wxCoord YLOG2DEV(wxCoord y) const
-        {
-            wxCoord new_y = y - m_logicalOriginY;
-            if (new_y > 0)
-                return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
-            else
-                return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
-        }
-#ifdef YLOG2DEVREL
-#undef YLOG2DEVREL
-#endif
-        wxCoord YLOG2DEVREL(wxCoord y) const
-        {
-            if (y > 0)
-                return (wxCoord)((double)(y) * m_scaleY + 0.5);
-            else
-                return (wxCoord)((double)(y) * m_scaleY - 0.5);
-        }
-
-
-    public:
-
-        wxSVGFileDC (wxString f);
-        wxSVGFileDC (wxString f, int Width, int Height);
-        wxSVGFileDC (wxString f, int Width, int Height, float dpi);
-        ~wxSVGFileDC();
-
-
-        bool CanDrawBitmap() const { return TRUE ; };
-
-        bool CanGetTextExtent() const { return TRUE ; };
-
-        int GetDepth() const
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; };
- 
-        void BeginDrawing() { return;};
-
-        bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = FALSE)
-            { return DoBlit(xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask); };
-
-        void Clear()
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; };
-
-        void CrossHair(wxCoord x, wxCoord y)
-            { DoCrossHair (x,y); return; };
-
-        void ComputeScaleAndOrigin() ;
-
-        void DestroyClippingRegion()
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; };
-
-        wxCoord DeviceToLogicalX(wxCoord x) const ;
-
-        wxCoord DeviceToLogicalXRel(wxCoord x)  const ;
-
-        wxCoord DeviceToLogicalY(wxCoord y)  const ;
-
-        wxCoord DeviceToLogicalYRel(wxCoord y)  const ;
-
-        void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent)
-            {  DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;};
-
- 
-        void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
-            {DoDrawIcon(icon, x, y) ; return ; };
-
-        void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ;
-
-        void EndDoc()
-            { return ; };
-
-        void EndDrawing()
-            { return ; };
-
-        void EndPage()
-            {  return ; };
-
-        void FloodFill(wxCoord x, wxCoord y, wxColour *colour, int style=wxFLOOD_SURFACE)
-            { DoFloodFill (x, y, *colour, style); return ;} ;
-
-        wxCoord GetCharHeight() const;
-
-        wxCoord GetCharWidth() const;
-
-        void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height)
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; };
-
-        int GetLogicalFunction()
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetLogicalFunction()  Call not implemented")); return wxCOPY ; };
-
-        int GetMapMode() ;
-
-        bool GetOptimization()
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetOptimization()  No optimization code used")); return TRUE ; };
-
-        bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)
-            { return DoGetPixel (x, y, colour) ; } ;
-
-        void GetUserScale(double *x, double *y) const ;
-
-        wxCoord LogicalToDeviceX(wxCoord x)  const ;
-
-        wxCoord LogicalToDeviceXRel(wxCoord x)  const ;
-
-        wxCoord LogicalToDeviceY(wxCoord y)  const ;
-
-        wxCoord LogicalToDeviceYRel(wxCoord y)  const ;
-
-        bool Ok() const {return m_OK;};
-
-        void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
-
-        void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; };
-
-        void SetPalette(const wxPalette& palette)
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; };
-
-        void SetBackground( const wxBrush &brush ) ;
-
-        void SetBackgroundMode( int mode ) ;
-
-        void SetBrush(const wxBrush& brush) ;
-
-        void SetFont(const wxFont& font) ;
-
-        void SetLogicalFunction(int function)
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; };
-
-        void SetLogicalScale( double x, double y ) ;
-
-        void SetLogicalOrigin( wxCoord x, wxCoord y ) ;
-
-        void SetDeviceOrigin( wxCoord x, wxCoord y ) ;
-
-        void SetMapMode(int anint) ;
-
-        void SetOptimization(bool optimize) { return ; };
-
-        void SetPen(const wxPen& pen)  ;
-
-        void SetUserScale(double xScale, double yScale) ;
-
-        bool StartDoc(const wxString& message)
-            {  return FALSE; };
-
-        void StartPage()
-            {  return ; };
-
-
-};
-
-#ifdef __BORLANDC__
-#pragma warn .rch
-#pragma warn .ccc
-#endif
-#endif

contrib/include/wx/xrc/xh_bmp.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_BMP_H_
 #define _WX_XH_BMP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_bmp.h"
 #endif
 

contrib/include/wx/xrc/xh_bmpbt.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_BMPBT_H_
 #define _WX_XH_BMPBT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_bmpbt.h"
 #endif
 

contrib/include/wx/xrc/xh_bttn.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_BTTN_H_
 #define _WX_XH_BTTN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_bttn.h"
 #endif
 

contrib/include/wx/xrc/xh_cald.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_CALD_H_
 #define _WX_XH_CALD_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_cald.h"
 #endif
 

contrib/include/wx/xrc/xh_chckb.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_CHCKB_H_
 #define _WX_XH_CHCKB_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_chckb.h"
 #endif
 

contrib/include/wx/xrc/xh_chckl.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_CHCKL_H_
 #define _WX_XH_CHCKL_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_chckl.h"
 #endif
 

contrib/include/wx/xrc/xh_choic.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_CHOIC_H_
 #define _WX_XH_CHOIC_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_choic.h"
 #endif
 

contrib/include/wx/xrc/xh_combo.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_COMBO_H_
 #define _WX_XH_COMBO_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_combo.h"
 #endif
 

contrib/include/wx/xrc/xh_dlg.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_DLG_H_
 #define _WX_XH_DLG_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_dlg.h"
 #endif
 

contrib/include/wx/xrc/xh_frame.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_FRAME_H_
 #define _WX_XH_FRAME_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_frame.h"
 #endif
 

contrib/include/wx/xrc/xh_gauge.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_GAUGE_H_
 #define _WX_XH_GAUGE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_gauge.h"
 #endif
 

contrib/include/wx/xrc/xh_gdctl.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_GDCTL_H_
 #define _WX_XH_GDCTL_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_gdctl.h"
 #endif
 

contrib/include/wx/xrc/xh_html.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_HTML_H_
 #define _WX_XH_HTML_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_html.h"
 #endif
 

contrib/include/wx/xrc/xh_listb.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_LISTB_H_
 #define _WX_XH_LISTB_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_listb.h"
 #endif
 

contrib/include/wx/xrc/xh_listc.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_LISTC_H_
 #define _WX_XH_LISTC_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_listc.h"
 #endif
 

contrib/include/wx/xrc/xh_menu.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_MENU_H_
 #define _WX_XH_MENU_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_menu.h"
 #endif
 

contrib/include/wx/xrc/xh_notbk.h

@@ -10,7 +10,7 @@
 #ifndef _WX_XH_NOTBK_H_
 #define _WX_XH_NOTBK_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_notbk.h"
 #endif
 

contrib/include/wx/xrc/xh_panel.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_PANEL_H_
 #define _WX_XH_PANEL_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_panel.h"
 #endif
 

contrib/include/wx/xrc/xh_radbt.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_RADBT_H_
 #define _WX_XH_RADBT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_radbt.h"
 #endif
 

contrib/include/wx/xrc/xh_radbx.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_RADBX_H_
 #define _WX_XH_RADBX_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_radbx.h"
 #endif
 

contrib/include/wx/xrc/xh_scrol.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_SCROL_H_
 #define _WX_XH_SCROL_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_scrol.h"
 #endif
 

contrib/include/wx/xrc/xh_sizer.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_SIZER_H_
 #define _WX_XH_SIZER_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_sizer.h"
 #endif
 

contrib/include/wx/xrc/xh_slidr.h

@@ -11,7 +11,7 @@
 #ifndef _WX_XH_SLIDR_H_
 #define _WX_XH_SLIDR_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_slidr.h"
 #endif