This commit was manufactured by cvs2svn to create tag

'wxPy_2_3_3_pre'. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_3_3_pre@16847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-28 20:02:20 +00:00
2190 changed files with 68189 additions and 103683 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -391,19 +391,11 @@ afminstall: preinstall
 	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
 	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
 	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-
+        
 m4datainstall: preinstall
 	$(INSTALL) -d $(datadir)/aclocal
 	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal

-win32install: preinstall
-	$(INSTALL) -d $(includedir)/wx/msw
-	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/*.cur \
-			$(top_srcdir)/include/wx/msw/*.ico \
-			$(top_srcdir)/include/wx/msw/*.bmp \
-			$(top_srcdir)/include/wx/msw/wx.rc \
-				$(includedir)/wx/msw
-
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
 preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
@@ -470,7 +462,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
 	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@

-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
 	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@@ -501,7 +493,7 @@ uninstall:
 	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
 	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
 	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*
-	# FIXME: wxBase doesnt install these next 3 dirs.
+# 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)
@@ -510,7 +502,6 @@ uninstall:
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(RM) $(includedir)/wx/$$p; \
 	done
-	# TODO: uninstall the files installed by win32install
 	@echo " Removing i18n files..."
 	@-for p in $(WX_LINGUAS); do \
 	  $(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
@@ -545,7 +536,6 @@ ALL_DIST: distclean
 	cp $(WXDIR)/install-sh $(DISTDIR)
 	cp $(WXDIR)/mkinstalldirs $(DISTDIR)
 	cp $(WXDIR)/wx-config.in $(DISTDIR)
-	cp $(WXDIR)/version-script.in $(DISTDIR)
 	cp $(WXDIR)/setup.h.in $(DISTDIR)
 	cp $(WXDIR)/setup.h_vms $(DISTDIR)
 	cp $(WXDIR)/descrip.mms $(DISTDIR)
@@ -553,16 +543,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
@@ -590,8 +577,7 @@ ALL_GUI_DIST: ALL_DIST
 	if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
 	  cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
 	cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt
-	if test -f $(DOCDIR)/$(TOOLKITDIR)/todo.txt ; then \
-	  cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt ; fi
+	cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
@@ -612,6 +598,7 @@ ALL_GUI_DIST: ALL_DIST
 	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/$(TOOLKITDIR)
@@ -663,6 +650,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)
@@ -671,7 +659,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
@@ -705,16 +692,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
@@ -788,8 +765,6 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(SRCDIR)/*.??? $(DISTDIR)/src
 	cp $(SRCDIR)/*.?? $(DISTDIR)/src
 	cp $(MSWDIR)/?ake*.* $(DISTDIR)/src/msw
-	mkdir $(DISTDIR)/contrib
-	cp -R $(WXDIR)/contrib $(DISTDIR)

 UNIV_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/include/wx/univ
@@ -800,15 +775,6 @@ UNIV_DIST: ALL_GUI_DIST
 	cp $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
 	cp $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes

-MGL_DIST: UNIV_DIST
-	cp $(WXDIR)/wxMGL.spec $(DISTDIR)
-	cp $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
-	cp $(SRCDIR)/mgl/files.lst $(DISTDIR)/src/mgl
-	cp $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
-	cp $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
-	mkdir $(DISTDIR)/contrib
-	cp -R $(WXDIR)/contrib $(DISTDIR)
-
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
@@ -864,13 +830,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/configure $(DISTDIR)/samples
 	cp $(SAMPDIR)/configure.in $(DISTDIR)/samples

-	mkdir $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/Makefile.in $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/makefile.unx $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/*.cpp $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/*.h $(DISTDIR)/samples/artprov
-	cp $(SAMPDIR)/artprov/*.xpm $(DISTDIR)/samples/artprov
-
 	mkdir $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
 	cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
@@ -1082,10 +1041,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
 	cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest

-	mkdir $(DISTDIR)/samples/keyboard
-	cp $(SAMPDIR)/keyboard/Makefile.in $(DISTDIR)/samples/keyboard
-	cp $(SAMPDIR)/keyboard/*.cpp $(DISTDIR)/samples/keyboard
-
 	mkdir $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
@@ -1143,11 +1098,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	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/mobile/styles
-	cp $(SAMPDIR)/mobile/styles/Makefile.in $(DISTDIR)/samples/mobile/styles
-	cp $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles
-	cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
-	cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
    
 	mkdir $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
@@ -1343,18 +1293,6 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
 	cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src

-	mkdir $(DISTDIR)/utils/emulator
-	mkdir $(DISTDIR)/utils/emulator/src
-	mkdir $(DISTDIR)/utils/emulator/docs
-	cp $(UTILSDIR)/emulator/*.in $(DISTDIR)/utils/emulator
-	cp $(UTILSDIR)/emulator/src/*.h $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/src/*.in $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/src/*.cpp $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/src/*.jpg $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/src/*.wxe $(DISTDIR)/utils/emulator/src
-	cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs
-	cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
-
 	mkdir $(DISTDIR)/utils/makegen
 	mkdir $(DISTDIR)/utils/makegen/templates
 	cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen
@@ -1369,29 +1307,7 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
 	cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src

-	mkdir $(DISTDIR)/utils/dialoged
-	mkdir $(DISTDIR)/utils/dialoged/src
-	mkdir $(DISTDIR)/utils/dialoged/src/bitmaps
-	mkdir $(DISTDIR)/utils/dialoged/docs
-	cp $(UTILSDIR)/dialoged/Makefile.in $(DISTDIR)/utils/dialoged
-	cp $(UTILSDIR)/dialoged/src/*.h $(DISTDIR)/utils/dialoged/src
-	cp $(UTILSDIR)/dialoged/src/*.cpp $(DISTDIR)/utils/dialoged/src
-	cp $(UTILSDIR)/dialoged/src/Makefile.in $(DISTDIR)/utils/dialoged/src
-	cp $(UTILSDIR)/dialoged/src/makefile.unx $(DISTDIR)/utils/dialoged/src
-	cp $(UTILSDIR)/dialoged/src/bitmaps/*.xpm $(DISTDIR)/utils/dialoged/src/bitmaps
-	cp $(UTILSDIR)/dialoged/docs/*.tex $(DISTDIR)/utils/dialoged/docs
-	cp $(UTILSDIR)/dialoged/docs/*.ini $(DISTDIR)/utils/dialoged/docs
-	cp $(UTILSDIR)/dialoged/docs/*.gif $(DISTDIR)/utils/dialoged/docs
-
-	mkdir $(DISTDIR)/utils/helpview
-	mkdir $(DISTDIR)/utils/helpview/src
-	mkdir $(DISTDIR)/utils/helpview/src/bitmaps
-	cp $(UTILSDIR)/helpview/Makefile.in $(DISTDIR)/utils/helpview
-	cp $(UTILSDIR)/helpview/src/*.h $(DISTDIR)/utils/helpview/src
-	cp $(UTILSDIR)/helpview/src/*.cpp $(DISTDIR)/utils/helpview/src
-	cp $(UTILSDIR)/helpview/src/Makefile.in $(DISTDIR)/utils/helpview/src
-	cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src
-	cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
+	cp -R $(UTILSDIR)/dialoged $(DISTDIR)/utils/dialoged

 MISC_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/misc
@@ -1571,7 +1487,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
--- a/acinclude.m4
+++ b/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
 ])

@@ -340,15 +336,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],
                        [
@@ -382,57 +373,6 @@ AC_DEFUN([WX_ARG_ENABLE],
        ])


-dnl ===========================================================================
-dnl Linker features test
-dnl ===========================================================================
-
-dnl ---------------------------------------------------------------------------
-dnl WX_VERSIONED_SYMBOLS checks whether the linker can create versioned
-dnl symbols. If it can, sets LDFLAGS_VERSIONING to $CXX flags needed to use
-dnl version script file named versionfile
-dnl
-dnl call WX_VERSIONED_SYMBOLS(versionfile)
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_VERSIONED_SYMBOLS],
-[
-  found_versioning=no
-
-  dnl Check for known non-gcc cases:
-  case "${host}" in
-    *-*-solaris2* )
-      if test "x$GCC" != "xyes" ; then
-          LDFLAGS_VERSIONING="-M $1"
-          found_versioning=yes
-      fi
-    ;;
-  esac
-  
-  dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
-  if test $found_versioning = no ; then
-      AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
-      [
-        echo "VER_1 { *; };" >conftest.sym
-        echo "int main() { return 0; }" >conftest.cpp
-  
-        if AC_TRY_COMMAND([
-                $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
-          if test -s conftest.stderr ; then
-              wx_cv_version_script=no
-          else
-              wx_cv_version_script=yes
-          fi
-        else
-          wx_cv_version_script=no
-        fi
-        rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
-      ])
-      if test $wx_cv_version_script = yes ; then
-        LDFLAGS_VERSIONING="-Wl,--version-script,$1"
-      fi
-  fi
-])
-

 dnl ===========================================================================
 dnl "3rd party" macros included here because they are not widely available
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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
 ])

@@ -352,15 +348,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],
                        [
@@ -394,57 +385,6 @@ AC_DEFUN([WX_ARG_ENABLE],
        ])


-dnl ===========================================================================
-dnl Linker features test
-dnl ===========================================================================
-
-dnl ---------------------------------------------------------------------------
-dnl WX_VERSIONED_SYMBOLS checks whether the linker can create versioned
-dnl symbols. If it can, sets LDFLAGS_VERSIONING to $CXX flags needed to use
-dnl version script file named versionfile
-dnl
-dnl call WX_VERSIONED_SYMBOLS(versionfile)
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_VERSIONED_SYMBOLS],
-[
-  found_versioning=no
-
-  dnl Check for known non-gcc cases:
-  case "${host}" in
-    *-*-solaris2* )
-      if test "x$GCC" != "xyes" ; then
-          LDFLAGS_VERSIONING="-M $1"
-          found_versioning=yes
-      fi
-    ;;
-  esac
-  
-  dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
-  if test $found_versioning = no ; then
-      AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
-      [
-        echo "VER_1 { *; };" >conftest.sym
-        echo "int main() { return 0; }" >conftest.cpp
-  
-        if AC_TRY_COMMAND([
-                $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
-          if test -s conftest.stderr ; then
-              wx_cv_version_script=no
-          else
-              wx_cv_version_script=yes
-          fi
-        else
-          wx_cv_version_script=no
-        fi
-        rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
-      ])
-      if test $wx_cv_version_script = yes ; then
-        LDFLAGS_VERSIONING="-Wl,--version-script,$1"
-      fi
-  fi
-])
-

 dnl ===========================================================================
 dnl "3rd party" macros included here because they are not widely available
@@ -788,6 +728,64 @@ 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

@@ -983,61 +981,3 @@ 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
-])
-
-
-
--- a/art/wxwin.ico
+++ b/art/wxwin.ico
--- a/art/wxwin16x16.png
+++ b/art/wxwin16x16.png
--- a/art/wxwin16x16.xpm
+++ b/art/wxwin16x16.xpm
@@ -1,25 +0,0 @@
-/* XPM */
-static char *wxwin16x16_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #000000",
-"X	c #000084",
-"o	c #FFFFFF",
-"O	c #FFFF00",
-"+	c #FF0000",
-"                ",
-"                ",
-"                ",
-"    .......     ",
-"    .XXXXX.     ",
-"    .oXXXX.     ",
-"    .oXXX.......",
-".....oXXX.OOOOO.",
-".+++.XXXX.oOOOO.",
-".o++......oOOOO.",
-".o++++.  .oOOOO.",
-".o++++.  .OOOOO.",
-".+++++.  .......",
-".......         ",
-"                ",
-"                "};
--- a/art/wxwin32x32.png
+++ b/art/wxwin32x32.png
--- a/art/wxwin32x32.xpm
+++ b/art/wxwin32x32.xpm
@@ -1,41 +0,0 @@
-/* XPM */
-static char *wxwin32x32_xpm[] = {
-"32 32 6 1",
-" 	c None",
-".	c #000000",
-"X	c #000084",
-"o	c #FFFFFF",
-"O	c #FFFF00",
-"+	c #FF0000",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"        ..............          ",
-"        .XXXXXXXXXXXX.          ",
-"        .XXXXXXXXXXXX.          ",
-"        .XooXXXXXXXXX.          ",
-"        .XooXXXXXXXXX.          ",
-"        .XooXXXXXXXXX.          ",
-"        .XooXXXXXX..............",
-"        .XooXXXXXX.OOOOOOOOOOOO.",
-".........XooXXXXXX.OOOOOOOOOOOO.",
-".+++++++.XooXXXXXX.OooOOOOOOOOO.",
-".+++++++.XooXXXXXX.OooOOOOOOOOO.",
-".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
-".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
-".+oo++++...........OooOOOOOOOOO.",
-".+oo+++++++++.    .OooOOOOOOOOO.",
-".+oo+++++++++.    .OooOOOOOOOOO.",
-".+oo+++++++++.    .OooOOOOOOOOO.",
-".+oo+++++++++.    .OOOOOOOOOOOO.",
-".+oo+++++++++.    .OOOOOOOOOOOO.",
-".++++++++++++.    ..............",
-".++++++++++++.                  ",
-"..............                  ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.

-timestamp='2002-09-03'
+timestamp='2001-09-04'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,9 +24,8 @@ timestamp='2002-09-03'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -88,40 +87,30 @@ if test $# != 0; then
  exit 1
 fi

-trap 'exit 1' 1 2 15

-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15

+# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.

-# This shell variable is my proudest work .. or something. --bje
-
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
+	for c in cc gcc c89 ; do
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+	  if test $? = 0 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $files ;
+	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
 ,,*)   CC_FOR_BUILD=$CC ;;
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;
-unset files'
+esac'

 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -138,30 +127,29 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
+	# Netbsd (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
 	# compatibility and a consistent mechanism for selecting the
 	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	# Determine the machine/vendor (is the vendor relevant).
+	case "${UNAME_MACHINE}" in
+	    amiga) machine=m68k-unknown ;;
+	    arm32) machine=arm-unknown ;;
+	    atari*) machine=m68k-atari ;;
+	    sun3*) machine=m68k-sun ;;
+	    mac68k) machine=m68k-apple ;;
+	    macppc) machine=powerpc-apple ;;
+	    hp3[0-9][05]) machine=m68k-hp ;;
+	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	case "${UNAME_MACHINE}" in
+	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
@@ -184,45 +172,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
    alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -231,7 +180,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	eval $set_cc_for_build
 	cat <<EOF >$dummy.s
 	.data
 \$Lformat:
@@ -257,9 +205,10 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
+	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		case `$dummy` in
+		case `./$dummy` in
 			0-0)
 				UNAME_MACHINE="alpha"
 				;;
@@ -281,12 +230,9 @@ EOF
 			2-1307)
 				UNAME_MACHINE="alphaev68"
 				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
 		esac
 	fi
-	rm -f $dummy.s $dummy && rmdir $tmpdir
+	rm -f $dummy.s $dummy
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
    Alpha\ *:Windows_NT*:*)
@@ -301,11 +247,29 @@ EOF
    Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit 0;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
    *:OS/390:*:*)
 	echo i370-ibm-openedition
@@ -327,10 +291,6 @@ EOF
    NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
    sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -359,7 +319,7 @@ EOF
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
@@ -373,6 +333,12 @@ EOF
    aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
+    sparc*:NetBSD:*)
+	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    # The situation for MiNT is a little confusing.  The machine name
    # can be virtually everything (everything which is not
    # "atarist" or "atariste" at least should have a processor
@@ -399,6 +365,18 @@ EOF
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
        echo m68k-unknown-mint${UNAME_RELEASE}
        exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -438,20 +416,14 @@ EOF
 	}
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
    Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
 	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS)
-	echo powerpc-harris-powermax
-	exit 0 ;;
    Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -524,8 +496,8 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-		rm -f $dummy.c $dummy && rmdir $tmpdir
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -534,7 +506,7 @@ EOF
 	fi
 	exit 0 ;;
    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
@@ -574,8 +546,10 @@ EOF
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+              case "${HPUX_REV}" in
+                11.[0-9][0-9])
+                  if [ -x /usr/bin/getconf ]; then
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                    case "${sc_cpu_version}" in
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -584,13 +558,13 @@ EOF
                        case "${sc_kernel_bits}" in
                          32) HP_ARCH="hppa2.0n" ;;
                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                        esac ;;
                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+                  fi ;;
+              esac
+              if [ "${HP_ARCH}" = "" ]; then
+	      eval $set_cc_for_build
+              sed 's/^              //' << EOF >$dummy.c

              #define _HPUX_SOURCE
              #include <stdlib.h>
@@ -623,10 +597,10 @@ EOF
                  exit (0);
              }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy && rmdir $tmpdir
-		fi ;;
+	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+	    rm -f $dummy.c $dummy
+	fi ;;
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
@@ -661,8 +635,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -690,6 +664,9 @@ EOF
    parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
+    hppa*:OpenBSD:*:*)
+	echo hppa-unknown-openbsd
+	exit 0 ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
        exit 0 ;;
@@ -708,6 +685,9 @@ EOF
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
        exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
    CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
@@ -729,12 +709,18 @@ EOF
    CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -745,19 +731,10 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -768,9 +745,6 @@ EOF
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
-	exit 0 ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -796,30 +770,16 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
    m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
+	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
+	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
+	esac
 	;;
    ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -868,8 +828,7 @@ EOF
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+	ld_supported_targets=`cd /; ld --help 2>&1 \
 			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
 				    s/.*supported targets: *//
@@ -881,7 +840,7 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit 0 ;;		
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0 ;;
@@ -893,29 +852,32 @@ EOF
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
+	cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-pc-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
    i*86:DYNIX/ptx:4*:*)
@@ -953,13 +915,13 @@ EOF
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
@@ -992,12 +954,9 @@ EOF
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1088,9 +1047,6 @@ EOF
    SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
 	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
    Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
@@ -1101,17 +1057,15 @@ EOF
 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
+	if test "${UNAME_MACHINE}" = "x86pc"; then
 		UNAME_MACHINE=pc
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 	exit 0 ;;
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
    *:NonStop-UX:*:*)
@@ -1283,8 +1237,8 @@ main ()
 }
 EOF

-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy

 # Apollos put the system type in the environment.

--- a/29467
+++ b/29467
--- a/configure.in
+++ b/configure.in
@@ -48,7 +48,7 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)

 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=4
+WX_RELEASE_NUMBER=3

 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -187,15 +187,15 @@ case "${host}" in
  *-*-openbsd*)
    USE_BSD=1
    USE_OPENBSD=1
+    AC_DEFINE(__FREEBSD__)
    AC_DEFINE(__OPENBSD__)
-    AC_DEFINE(__BSD__)
    DEFAULT_DEFAULT_wxUSE_GTK=1
  ;;
  *-*-netbsd*)
    USE_BSD=1
    USE_NETBSD=1
+    AC_DEFINE(__FREEBSD__)
    AC_DEFINE(__NETBSD__)
-    AC_DEFINE(__BSD__)
    DEFAULT_DEFAULT_wxUSE_GTK=1
  ;;
  *-*-osf* )
@@ -224,11 +224,8 @@ case "${host}" in
    USE_AIX=1
    USE_SYSV=1
    USE_SVR4=1
-    dnl quoting from http://www-1.ibm.com/servers/esdd/articles/gnu.html:
-    dnl
-    dnl     Both archive libraries and shared libraries on AIX have an .a
-    dnl     extension. This will explain why you can't link with an .so and
-    dnl     why it works with the name changed to .a. 
+    dnl Irvin Probst <irvin.probst@fr.thalesgroup.com> reports that the shared
+    dnl libraries under AIX have the same suffix as the normal ones
    SO_SUFFIX=a
    AC_DEFINE(__AIX__)
    AC_DEFINE(__SYSV__)
@@ -260,6 +257,7 @@ case "${host}" in
    AC_DEFINE(__EMX__)
    PROGRAM_EXT=".exe"
    DEFAULT_DEFAULT_wxUSE_PM=1
+    LIBS="$LIBS -lstdcpp"
  ;;

  powerpc-*-darwin* )
@@ -356,8 +354,6 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_FONTMAP=no
  DEFAULT_wxUSE_STREAMS=no
  DEFAULT_wxUSE_SOCKETS=no
-  DEFAULT_wxUSE_OLE=no
-  DEFAULT_wxUSE_DATAOBJ=no
  DEFAULT_wxUSE_DIALUP_MANAGER=no
  DEFAULT_wxUSE_JOYSTICK=no
  DEFAULT_wxUSE_DYNLIB_CLASS=no
@@ -531,8 +527,6 @@ else
  DEFAULT_wxUSE_FONTMAP=yes
  DEFAULT_wxUSE_STREAMS=yes
  DEFAULT_wxUSE_SOCKETS=yes
-  DEFAULT_wxUSE_OLE=yes
-  DEFAULT_wxUSE_DATAOBJ=yes
  DEFAULT_wxUSE_DIALUP_MANAGER=yes
  DEFAULT_wxUSE_JOYSTICK=yes
  DEFAULT_wxUSE_DYNLIB_CLASS=yes
@@ -555,8 +549,8 @@ else
  DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
  DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes

-  DEFAULT_wxUSE_PROLOGIO=no
-  DEFAULT_wxUSE_RESOURCES=no
+  DEFAULT_wxUSE_PROLOGIO=yes
+  DEFAULT_wxUSE_RESOURCES=yes
  DEFAULT_wxUSE_CONSTRAINTS=yes
  DEFAULT_wxUSE_IPC=yes
  DEFAULT_wxUSE_HELP=yes
@@ -718,8 +712,8 @@ WX_ARG_ENABLE(soname,      [  --enable-soname         set the DT_SONAME field in
 WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
 WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)

-dnl allow the precompiled header option to be disabled under Mac OS X/Darwin
-WX_ARG_ENABLE(precomp,     [  --enable-precomp        enable use of precompiled headers (Mac OS X/Darwin)], wxUSE_PRECOMP)
+dnl allow the precompiled header option to be disabled under Mac OS X
+WX_ARG_ENABLE(precomp,     [  --enable-precomp        enable use of precompiled headers (Mac OS X)], wxUSE_PRECOMP)

 if test "$wxUSE_DEBUG" = "yes"; then
  DEFAULT_wxUSE_DEBUG_FLAG=yes
@@ -741,7 +735,7 @@ WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregardin
 WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)

 WX_ARG_ENABLE(compat20,      [  --enable-compat20       enable wxWindows 2.0 compatibility], WXWIN_COMPATIBILITY_2)
-WX_ARG_ENABLE(compat22,      [  --disable-compat22      disable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2, disable)
+WX_ARG_ENABLE(compat22,      [  --disable-compat22      disable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)

 AC_ARG_ENABLE(rpath,         [  --enable-rpath=DIR      output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])

@@ -762,8 +756,6 @@ WX_ARG_ENABLE(ftp,           [  --enable-ftp            use wxFTP (requires wxPr
 WX_ARG_ENABLE(http,          [  --enable-http           use wxHTTP (requires wxProtocol], wxUSE_PROTOCOL_HTTP)
 WX_ARG_ENABLE(fileproto,     [  --enable-fileproto      use wxFileProto class (requires wxProtocol], wxUSE_PROTOCOL_FILE)
 WX_ARG_ENABLE(sockets,       [  --enable-sockets        use socket/network classes], wxUSE_SOCKETS)
-WX_ARG_ENABLE(ole,           [  --enable-ole            use OLE classes], wxUSE_OLE)
-WX_ARG_ENABLE(dataobj,       [  --enable-dataobj        use data object classes], wxUSE_DATAOBJ)

 WX_ARG_ENABLE(ipc,           [  --enable-ipc            use interprocess communication (wxSocket etc.)], wxUSE_IPC)

@@ -1043,9 +1035,7 @@ dnl Path separator; ':' for unix, ';' for OS/2
 dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise
 case "${host}" in
  *-pc-os2_emx | *-pc-os2-emx )
-    PATH_IFS=';'
-dnl Really ought to text for this as meanwhile there are flex versions using
-dnl lex.yy as well due to FAT support being more and more dropped...
+    dnl PATH_IFS is autodetected by OS/2's configure (usually ';')
    LEX_STEM="lexyy"
  ;;
  *)
@@ -1134,6 +1124,7 @@ dnl ---------------------------------------------------------------------------
 dnl When we are using Cygwin with Motif/GTK+, we want it to appear like
 dnl 'just' a POSIX platform, so the Win32 API must not be available
 dnl ---------------------------------------------------------------------------
+
 dnl (Windows-only piece)
 wants_win32=0
 doesnt_want_win32=0
@@ -1205,7 +1196,7 @@ dnl   defines GCC empty if not using gcc
 dnl   defines CFLAGS
 dnl
 dnl this magic incantation is needed to prevent AC_PROG_CC from setting the
-dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
+dnl default CFLAGS (something like "-g -O2") - we don't need this as add
 dnl -g and -O flags ourselves below
 CFLAGS=${CFLAGS:=}
 AC_PROG_CC
@@ -1339,27 +1330,6 @@ AC_PROG_LEX
 dnl needed for making link to setup.h
 AC_PROG_LN_S

-dnl ---------------------------------------------------------------------------
-dnl When we are using gcc on OS/2, we want to be either using resources (PM)
-dnl or a more complete POSIX emulation for Motif/GTK+/X11
-dnl ---------------------------------------------------------------------------
-dnl (OS/2-only piece)
-case "${host}" in
-  *-pc-os2_emx | *-pc-os2-emx )
-      dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
-      LIBS="$LIBS -lstdcpp"
-      if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
-          dnl More complete Unix emulation for unix-like ports
-          dnl by linking in POSIX/2's cExt (if available).
-          AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
-      else
-          dnl Include resources for the "native" port (wxPM).
-          RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
-      fi
-  ;;
-esac
-dnl (end of OS/2-only piece)
-
 dnl ------------------------------------------------------------------------
 dnl Check for headers
 dnl ------------------------------------------------------------------------
@@ -1426,13 +1396,6 @@ case "${host}" in
    arm-*-linux* )
        AC_CHECK_SIZEOF(long long, 8)
    ;;
-    *-hp-hpux* )
-        AC_CHECK_SIZEOF(long long, 0)
-        if test "$ac_cv_sizeof_long_long" != "0"; then
-            dnl HPUX 10.20 headers need this define in order to use long long definitions
-            CPPFLAGS="$CPPFLAGS -D_INCLUDE_LONGLONG"
-        fi
-    ;;
    * )
        AC_CHECK_SIZEOF(long long, 0)
 esac
@@ -1444,10 +1407,6 @@ AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
 [
    AC_TRY_RUN(
        [
-            /* DJGPP only has fake wchar_t: */
-            #ifdef __DJGPP__
-            #  error "fake wchar_t"
-            #endif
            #ifdef HAVE_WCHAR_H
            #  ifdef __CYGWIN__
            #    include <stddef.h>
@@ -1468,16 +1427,7 @@ AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
        ],
        wx_cv_sizeof_wchar_t=`cat conftestval`,
        wx_cv_sizeof_wchar_t=0,
-        [
-            case "${host}" in
-              *-pc-msdosdjgpp )
-                wx_cv_sizeof_wchar_t=0
-                ;;
-              * )
-                wx_cv_sizeof_wchar_t=4
-                ;;
-            esac
-        ]
+        wx_cv_sizeof_wchar_t=4
    )
 ])

@@ -1486,20 +1436,6 @@ AC_DEFINE_UNQUOTED(SIZEOF_WCHAR_T, $wx_cv_sizeof_wchar_t)
 dnl check for large file support
 AC_SYS_LARGEFILE

-dnl we need to define _FILE_OFFSET_BITS or _LARGE_FILES on the compiler command
-dnl line because otherwise the system headers risk being included before
-dnl wx/defs.h which defines these constants leading to inconsistent
-dnl sizeof(off_t) in different source files of the same program and linking
-dnl problems
-if test "x$wx_largefile" = "xyes"; then
-    if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
-        WX_LARGEFILE_FLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
-    else
-        WX_LARGEFILE_FLAGS="-D_LARGE_FILES"
-    fi
-    CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"
-fi
-
 dnl check for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling)
 WX_C_BIGENDIAN

@@ -1517,9 +1453,10 @@ dnl Define search path for includes and libraries: all headers and libs will be
 dnl looked for in all directories of this path
 dnl ---------------------------------------------------------------------------

-dnl Notice that /usr/include should *not* be in this list, otherwise it breaks
-dnl compilation on Solaris/AIX/... with gcc because standard (non ANSI C)
-dnl headers are included instead of the "fixed" (ANSI-fied) gcc ones.
+dnl notice that /usr/include should not be in this list, otherwise it breaks
+dnl compilation on Solaris/gcc because standard headers are included instead
+dnl of the gcc ones (correction: it *is* needed for broken AIX compiler - but
+dnl do put it last!)
 dnl
 dnl Also try to put all directories which may contain X11R6 before those which
 dnl may contain X11R5/4 - we want to use R6 on machines which have both!
@@ -1586,7 +1523,9 @@ SEARCH_INCLUDE="\
    /usr/local/x11r5/include  \
    /usr/lpp/Xamples/include  \
                              \
-    /usr/openwin/share/include"
+    /usr/openwin/share/include \
+                               \
+    /usr/include"

 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "

@@ -1758,7 +1697,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
                fi
            else
                dnl we are using the system library
-                wxUSE_LIBPNG=sys
+                wxUSE_LIBPNG=yes
            fi
        fi
    fi
@@ -1835,24 +1774,15 @@ dnl ------------------------------------------------------------------------

 TIFF_INCLUDE=
 TIFF_LINK=
-TIFF_PREREQ_LINKS=-lm
 if test "$wxUSE_LIBTIFF" != "no" ; then
    AC_DEFINE(wxUSE_LIBTIFF)

    if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
-        dnl libtiff may depend on libjpeg and libz so use them in the test
-        dnl below or it would fail
-        if test "$wxUSE_LIBJPEG" = "sys"; then
-            TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
-        fi
-        if test "$wxUSE_ZLIB" = "sys"; then
-            TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
-        fi
        AC_CHECK_HEADER(tiffio.h,
                        AC_CHECK_LIB(tiff, TIFFError,
                                     TIFF_LINK=" -ltiff",
                                     ,
-                                     $TIFF_PREREQ_LINKS)
+                                     -lm)
                       )

        if test "x$TIFF_LINK" = "x" ; then
@@ -1878,7 +1808,6 @@ dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------

 AFMINSTALL=
-WIN32INSTALL=

 TOOLKIT=
 TOOLKIT_INCLUDE=
@@ -1934,19 +1863,6 @@ if test "$USE_WIN32" = 1 ; then

    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
    RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
-
-    dnl install Win32-specific files in "make install"
-    WIN32INSTALL=win32install
-fi
-
-if test "$USE_DARWIN" = 1; then
-    dnl Mac OS X/Darwin GCC uses precompiled headers by default
-    dnl this can cause problems both when compiling wxMac and wxBase
-    if test "$wxUSE_PRECOMP" = "yes"; then
-        CPPFLAGS="$CPPFLAGS -cpp-precomp"
-    else
-        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
-    fi
 fi

 if test "$wxUSE_GUI" = "yes"; then
@@ -1989,17 +1905,17 @@ if test "$wxUSE_GUI" = "yes"; then
                    GTK_MODULES=gthread
                fi

-                dnl note that if we fail to find GTK2 we abort and don't fall
-                dnl back to GTK1.x
                wx_cv_lib_gtk=
                if test "x$wxUSE_GTK2" = "xyes"; then
                    AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
-                else
-                    AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
+                fi

-                    if test -z "$wx_cv_lib_gtk"; then
-                        AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
-                    fi
+                if test -z "$wx_cv_lib_gtk"; then
+                    AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
+                fi
+
+                if test -z "$wx_cv_lib_gtk"; then
+                    AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
                fi

                if test -z "$wx_cv_lib_gtk"; then
@@ -2022,7 +1938,6 @@ if test "$wxUSE_GUI" = "yes"; then

        case "$wx_cv_lib_gtk" in
            2.0)    WXGTK20=1
-                    TOOLKIT_VERSION=2
                    ;;
            1.2.7)  WXGTK127=1
                    WXGTK12=1
@@ -2051,17 +1966,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                    ]
                )
            fi
-        else
-            if test "$wxUSE_UNICODE" = "yes"; then
-                AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x])
-                wxUSE_UNICODE=no
-            fi
-        fi
-
-        dnl we need poll() in src/gtk/app.cpp (we know that Darwin doesn't
-        dnl have it but we do the check for the others)
-        if test "$USE_DARWIN" != 1; then
-            AC_CHECK_FUNCS(poll)
        fi

        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
@@ -2088,7 +1992,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
        dnl FIXME_MGL - test for MGL variants for freebsd etc.
        case "${host}" in
            *-*-linux* )
-              mgl_os="linux/gcc/glibc*"
+              mgl_os=linux/gcc/glibc
              ;;
            *-pc-msdosdjgpp )
              mgl_os=dos32/dj2
@@ -2207,37 +2111,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
            )
        fi

-        if test "$wxUSE_UNICODE" = "yes"; then
-                PKG_CHECK_MODULES(PANGOX, pangox,
-                    [
-                        CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
-                        LIBS="$LIBS $PANGOX_LIBS"
-                    ],
-                    [
-                        AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
-                    ]
-                )
-                PKG_CHECK_MODULES(PANGOFT2, pangoft2,
-                    [
-                        CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
-                        LIBS="$LIBS $PANGOFT2_LIBS"
-                    ],
-                    [
-                        AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
-                        wxUSE_PRINTING_ARCHITECTURE="no"
-                    ]
-                )
-                PKG_CHECK_MODULES(PANGOXFT, pangoxft,
-                    [
-                        CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
-                        LIBS="$LIBS $PANGOXFT_LIBS"
-                    ],
-                    [
-                        AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
-                    ]
-                )
-        fi
-
        wxUSE_UNIVERSAL="yes"

        if test "$wxUSE_NANOX" = "yes"; then
@@ -2280,9 +2153,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
            mesa_link=" -lMesaGL"
            AC_MSG_RESULT(found at $ac_find_libraries)
        else
-            mesa_link=""
-            AC_MSG_RESULT(no)
-            AC_MSG_WARN(library will be compiled without Mesa support)
+            AC_MSG_ERROR(no)
        fi

        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
@@ -2300,10 +2171,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
          AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
        fi

-        dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE to
-        dnl X_LIBS and X_CFLAGS respectively -- what for??
-        GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
-        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
+        GUI_TK_LIBRARY="$X_LIBS"
+        TOOLKIT_INCLUDE="$X_CFLAGS"
        AFMINSTALL=afminstall
        COMPILED_X_PROGRAM=0

@@ -2414,7 +2283,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
        for libp in "" " -lXp"; do
            if test "$libs_found" = "0"; then
                for libsm_ice in " -lSM -lICE"; do
-                    if test "$libs_found" = "0"; then
+                    if test "$libs_found" = "0"; then                
                        save_LIBS="$LIBS"
                        LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                        save_CFLAGS=$CFLAGS
@@ -2459,7 +2328,14 @@ equivalent variable and GTK+ is version 1.2.3 or above.
    fi

    if test "$wxUSE_MAC" = 1; then
-        CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefile -I/Developer/Headers/FlatCarbon"
+        if test "$wxUSE_PRECOMP" = "yes"; then
+            CPPFLAGS="$CPPFLAGS -cpp-precomp"
+        else
+            CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
+        fi
+        CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
+        CFLAGS="$CFLAGS -fpascal-strings"
+        CXXFLAGS="$CXXFLAGS -fpascal-strings"

        TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
        TOOLKIT=MAC
@@ -2470,11 +2346,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
    if test "$wxUSE_PM" = 1; then
        TOOLKIT=PM
        GUIDIST=GTK_DIST
-        AC_MSG_WARN([OS/2 PM requires old resource format, re-enabled])
-	wxUSE_PROLOGIO="yes"
-	wxUSE_RESOURCES="yes"
-        AC_MSG_WARN([OS/2 threads are not yet supported... disabled])
-	wxUSE_THREADS="no"
    fi

    dnl the name of the directory where the files for this toolkit live
@@ -2651,10 +2522,8 @@ if test "$wxUSE_DEBUG_FLAG" = "yes"; then
    lib_debug_suffix=d
 fi

-WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
-
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
-TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"

 if test "$cross_compiling" = "yes"; then
    TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
@@ -2664,7 +2533,6 @@ fi
 dnl library link name
 WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
 WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
-WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"

 dnl the name of the shared library
 WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
@@ -2751,19 +2619,14 @@ if test "$wxUSE_SHARED" = "yes"; then
        PIC_FLAG="-fPIC"
    fi

-
-    dnl use versioned symbols if available on the platform
-    WX_VERSIONED_SYMBOLS([\$(top_builddir)/version-script])
-
    dnl the command to use for creating the shared library
    SHARED_LD="${CXX} -shared -o"

    case "${host}" in
      *-hp-hpux* )
        dnl default settings are good for gcc but not for the native HP-UX
-        if test "$GCC" = "yes"; then
-            dnl -o flag must be after PIC flag
-            SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"
+        if test "$GCC" == "yes"; then
+            SHARED_LD="${SHARED_LD} ${PIC_FLAG}"
        else
            dnl no idea why it wants it, but it does
            LDFLAGS="$LDFLAGS -L/usr/lib"
@@ -2824,9 +2687,8 @@ if test "$wxUSE_SHARED" = "yes"; then
      *-*-darwin* )
        dnl For Unix to MacOS X porting instructions, see:
        dnl http://fink.sourceforge.net/doc/porting/porting.html
-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL"
-        CFLAGS="$CFLAGS -fno-common"
-        CXXFLAGS="$CXXFLAGS -fno-common"
+        CFLAGS="$CFLAGS -fno-common -DWXMAKINGDLL"
+        CXXFLAGS="$CXXFLAGS -fno-common -DWXMAKINGDLL"
        dnl wxWindows must be fully binded (lazy binding breaks RTTI classinfo)
        dnl this can be done either with the exe linker flag -Wl,-bind_at_load
        dnl or with a double stage link in order to create a single module
@@ -2838,18 +2700,16 @@ if test "$wxUSE_SHARED" = "yes"; then
      ;;

      *-*-aix* )
-        dnl default settings are ok for gcc
-        if test "$GCC" != "yes"; then
-            dnl the abs path below used to be hardcoded here so I guess it must
-            dnl be some sort of standard location under AIX?
-            AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
-                          makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
+        dnl the abs path below used to be hardcoded here so I guess it must
+        dnl be some sort of standard location under AIX?
+        AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
+                      makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)

-            SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
-        fi
+        SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
      ;;

      *-*-cygwin* | *-*-mingw32* )
+
        WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"

        SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
@@ -2872,15 +2732,9 @@ if test "$wxUSE_SHARED" = "yes"; then
        SHARED_LD="${LD} -shared -o"
      ;;

-      *-*-irix* )
-        dnl default settings are ok for gcc
-        if test "$GCC" != "yes"; then
-            PIC_FLAG="-KPIC"
-        fi
-      ;;
-
      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
      *-*-sunos4* | \
+      *-*-irix5* | *-*-irix6* | \
      *-*-osf* | \
      *-*-dgux5* | \
      *-*-sysv5* )
@@ -2927,12 +2781,6 @@ if test "$wxUSE_SHARED" = "no"; then

    WX_TARGET_LIBRARY_TYPE="a"
    INSTALL_LIBRARY='$(INSTALL_DATA)'
-
-    dnl wx-config should assume the --static flag by default if we don't have
-    dnl any shared libs anyhow
-    STATIC_FLAG="yes"
-else
-    STATIC_FLAG="no"
 fi

 if test "$wxUSE_MAC" = 1; then
@@ -2943,10 +2791,15 @@ if test "$wxUSE_MAC" = 1; then
    AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
    AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
    MACOSX_BUNDLE="bundle"
-    dnl resources are bundled both with shared library and applications
-    dnl since the carb resource *must* be included in the application
-    LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
-    LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+    if test "$wxUSE_SHARED" = "yes"; then
+        dnl resources are bundled with shared library, not with applications
+        LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r -o \$(BIN_PROGRAM)"
+        LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r -o"
+    else
+        dnl resources are bundled with applications, not with static library
+        LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
+        LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+    fi
 else
    if test "$wxUSE_PM" = 1; then
        LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
@@ -3092,15 +2945,6 @@ AC_CHECK_FUNCS(vsnprintf)
 if test "$wxUSE_UNICODE" = yes; then
    dnl also look if we have wide char IO functions
    AC_CHECK_FUNCS(fputwc wprintf vswprintf)
-    dnl MinGW has a vswprintf with a different prototype, and
-    dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS
-    dnl finds it even if it is not declared in some versions...
-    AC_MSG_CHECKING([for _vsnwprintf])
-    AC_TRY_COMPILE([#include <wchar.h>],
-                   [&_vsnwprintf;],
-                   [AC_MSG_RESULT([yes])
-                    AC_DEFINE(HAVE__VSNWPRINTF)],
-                   [AC_MSG_RESULT([no])]);
 fi

 AC_LANG_RESTORE
@@ -3152,6 +2996,9 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
    fi
 fi

+dnl check for vfork() (even if it's the same as fork() in modern Unices)
+AC_CHECK_FUNCS(vfork)
+
 dnl check for the function for temp files creation
 AC_CHECK_FUNCS(mkstemp mktemp, break)

@@ -3242,7 +3089,7 @@ if test "$USE_BEOS" = 1; then
 fi

 if test "$USE_DARWIN" = 1; then
-    dnl Mac OS X/Darwin has both nanosleep and usleep
+    dnl Mac OS X has both nanosleep and usleep
    dnl but only usleep is defined in unistd.h
    AC_DEFINE(HAVE_USLEEP)
    HAVE_SOME_SLEEP_FUNC=1
@@ -3323,10 +3170,10 @@ dnl flush the cache
 AC_CACHE_SAVE

 dnl ---------------------------------------------------------------------------
-dnl thread support for Unix (for Win32 see past the next matching "else")
+dnl thread support for Unix (always available under Win32)
 dnl ---------------------------------------------------------------------------

-dnl under MSW (except mingw32) we always have thread support
+dnl under MSW we always have thread support
 CPP_MT_FLAG=
 if test "$TOOLKIT" != "MSW"; then

@@ -3442,28 +3289,14 @@ if test "$TOOLKIT" != "MSW"; then
      else
          dnl yes, these special compiler flags should be used with the
          dnl linker as well
-          LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
-          LIBS="$THREADS_LINK $LIBS"
+          LIBS="$THREADS_LINK $THREADS_CFLAGS $LIBS"

          AC_MSG_CHECKING([if more special flags are required for pthreads])
          flag=no
          case "${host}" in
-            *-aix*)
-                dnl again quoting from
-                dnl http://www-1.ibm.com/servers/esdd/articles/gnu.html:
-                dnl
-                dnl     When compiling and linking with -pthread, the library
-                dnl     search path should include -L/usr/lib/threads at the
-                dnl     beginning of the path.
-                LDFLAGS="-L/usr/lib/threads $LDFLAGS"
+            *-aix* | *-freebsd*)
                flag="-D_THREAD_SAFE"
                ;;
-            *-freebsd*)
-                flag="-D_THREAD_SAFE"
-                ;;
-            *-hp-hpux* )
-                flag="-D_REENTRANT"
-                ;;
            *solaris* | alpha*-osf*)
                flag="-D_REENTRANT"
                ;;
@@ -3597,35 +3430,6 @@ if test "$TOOLKIT" != "MSW"; then
    fi

 dnl from if !MSW
-else
-    if test "$wxUSE_THREADS" = "yes" ; then
-      case "${host}" in
-        *-*-mingw32* )
-            dnl check if the compiler accepts -mthreads
-            AC_CACHE_CHECK([if compiler supports -mthreads],
-                wx_cv_cflags_mthread,
-                [
-                    CFLAGS_OLD="$CFLAGS"
-                    CFLAGS="$CFLAGS -mthreads"
-                    AC_TRY_COMPILE([], [],
-                        wx_cv_cflags_mthread=yes,
-                        wx_cv_cflags_mthread=no
-                    )
-                ]
-            )
-
-            if test "$wx_cv_cflags_mthread" = "yes"; then
-                dnl it does, use it
-                CXXFLAGS="$CXXFLAGS -mthreads"
-                TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -mthreads"
-                LDFLAGS="$LDFLAGS -mthreads"
-            else
-                dnl it doesn't
-                CFLAGS="$CFLAGS_OLD"
-            fi
-        ;;
-      esac
-    fi
 fi

 if test "$wxUSE_THREADS" = "yes"; then
@@ -3720,19 +3524,11 @@ if test "$GCC" = "yes" ; then
    dnl for each subroutine by default -- using the switch below only creates
    dnl one entry per file instead at the price of minor performance penalty
    dnl
-    dnl As of wx2.4 a bug in the hppa gcc compiler causes a similar problem
-    dnl without -ffunction-sections.  No idea how long we'll need to maintain
-    dnl this, or even the extent of gcc/wx version combinations affected, but
-    dnl also as above, this 'fix' does not come without side effects.
-    dnl
    dnl TODO: test for the gcc version here (how?)
    case "${host}" in
      powerpc*-*-aix* )
        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -mminimal-toc"
        ;;
-      *-hppa* )
-        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections"
-        ;;
    esac
 fi

@@ -4074,7 +3870,7 @@ dnl ------------------------------------------------------------------------
 dnl wxSocket
 dnl ------------------------------------------------------------------------

-dnl VZ: the GUI hooks wxSocket needs are not implemented yet in wxMGL
+dnl VZ: the GUI hooks wxSocket needs are not implemented yet in wxX11
 if test "$wxUSE_SOCKETS" = "yes"; then
    if test "$wxUSE_MGL" = "1"; then
        AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
@@ -4341,7 +4137,7 @@ fi

 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then

-dnl     There is now experimental generic MDI support
+dnl     There is now experimental generic MDI support 
 dnl     if test "$wxUSE_UNIVERSAL" = "yes"; then
 dnl         AC_MSG_WARN(MDI not yet supported for wxUniversal... disabled)
 dnl         wxUSE_MDI_ARCHITECTURE=no
@@ -4392,18 +4188,14 @@ fi

 if test "$wxUSE_PROLOGIO" = "yes" ; then
    AC_DEFINE(wxUSE_PROLOGIO)
-    ALL_OBJECTS="$ALL_OBJECTS parser.o"
 fi

 if test "$wxUSE_RESOURCES" = "yes" ; then
    if test "$wxUSE_NANOX" = "yes"; then
        AC_MSG_WARN([Cannot use resource database functions in NanoX])
-    else
-        AC_DEFINE(wxUSE_RESOURCES)
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
-    fi
-    if test "$wxUSE_PROLOGIO" != "yes" ; then
-        ALL_OBJECTS="$ALL_OBJECTS parser.o"
+	else
+		AC_DEFINE(wxUSE_RESOURCES)
+		SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
    fi
 fi

@@ -4419,7 +4211,6 @@ dnl check for ole headers and disable a few features requiring it if not
 dnl present (earlier versions of mingw32 don't have ole2.h)
 if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
                          -o "$wxUSE_CLIPBOARD"     = "yes" \
-                          -o "$wxUSE_OLE"     = "yes" \
                          -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
    AC_CHECK_HEADERS(ole2.h)

@@ -4450,51 +4241,6 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
        wxUSE_CLIPBOARD=no
        wxUSE_DRAG_AND_DROP=no
        wxUSE_DATAOBJ=no
-        wxUSE_OLE=no
-    fi
-
-    if test "$wxUSE_METAFILE" = "yes"; then
-        AC_DEFINE(wxUSE_METAFILE)
-
-        dnl this one should probably be made separately configurable
-        AC_DEFINE(wxUSE_ENH_METAFILE)
-    fi
-fi
-
-if test "$wxUSE_WINE" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
-                          -o "$wxUSE_CLIPBOARD"     = "yes" \
-                          -o "$wxUSE_OLE"     = "yes" \
-                          -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
-    AC_CHECK_HEADERS(ole2.h)
-
-    if test "$ac_cv_header_ole2_h" = "yes" ; then
-        if test "$GCC" = yes ; then
-            AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-
-            AC_MSG_CHECKING([if g++ requires -fvtable-thunks])
-            AC_TRY_COMPILE([#include <windows.h>
-                            #include <ole2.h>],
-                           [],
-                           [AC_MSG_RESULT(no)],
-                           [AC_MSG_RESULT(yes)
-                            CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"])
-            AC_LANG_RESTORE
-            ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
-            LIBS=" -lwine_uuid$LIBS"
-            AC_DEFINE(wxUSE_OLE)
-
-        fi
-
-        dnl for OLE clipboard and dnd
-        AC_DEFINE(wxUSE_DATAOBJ)
-    else
-        AC_MSG_WARN([Some features disabled because OLE headers not found])
-
-        wxUSE_CLIPBOARD=no
-        wxUSE_DRAG_AND_DROP=no
-        wxUSE_DATAOBJ=no
-        wxUSE_OLE=no
    fi

    if test "$wxUSE_METAFILE" = "yes"; then
@@ -5076,48 +4822,7 @@ dnl FIXME: should this be covered by the conditional above
 dnl given the -lm comment there?  Or should that comment (and
 dnl this one) be removed..   [ 7 Nov 2001 ]

-LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
-
-dnl Only add the -lm library if floating point functions cannot be used
-dnl without it.  This check is important on cygwin because of the bizarre
-dnl way that they have organized functions into libraries.  On cygwin, both
-dnl libc.a and libm.a are symbolic links to a single lib libcygwin.a.  This
-dnl means that
-dnl   1) linking with -lm is not necessary, and
-dnl   2) linking with -lm is dangerous if the order of libraries is wrong
-dnl In particular, if you compile any program with -mno-cygwin and link with
-dnl -lm, it will crash instantly when it is run.  This happens because the
-dnl linker incorrectly links the Cygwin libm.a (==libcygwin.a), which replaces
-dnl the ___main function instead of allowing it to be defined by
-dnl /usr/lib/mingw/libmingw32.a as it should be.
-dnl
-dnl On MacOS X, this test will find that -lm is unnecessary and leave it out.
-dnl
-dnl Just check a few floating point functions. If they are all found without
-dnl -lm, then we must not need -lm.
-have_cos=0
-have_floor=0
-AC_CHECK_FUNCS(cos, have_cos=1)
-AC_CHECK_FUNCS(floor, have_floor=1)
-AC_MSG_CHECKING(if floating point functions link without -lm)
-if test "$have_cos" = 1 -a "$have_floor" = 1; then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT(no)
-    LIBS="$LIBS -lm"
-    # use different functions to avoid configure caching
-    have_sin=0
-    have_ceil=0
-    AC_CHECK_FUNCS(sin, have_sin=1)
-    AC_CHECK_FUNCS(ceil, have_ceil=1)
-    AC_MSG_CHECKING(if floating point functions link with -lm)
-    if test "$have_sin" = 1 -a "$have_ceil" = 1; then
-        AC_MSG_RESULT(yes)
-    else
-        AC_MSG_RESULT(no)
-        # not sure we should warn the user, crash, etc.
-    fi
-fi
+LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK -lm $LIBS"

 if test "$wxUSE_GUI" = "yes"; then

@@ -5173,10 +4878,9 @@ if test "$GXX" = yes ; then
    fi
 fi

-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"

 dnl remove the extra white space from the cc/c++/ld options
-CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
 CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
 CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 LIBS=`echo $LIBS | sed 's/ \+/ /g'`
@@ -5203,7 +4907,6 @@ AC_SUBST(WX_MINOR_VERSION_NUMBER)
 AC_SUBST(WX_RELEASE_NUMBER)
 AC_SUBST(WX_LIBRARY_NAME_STATIC)
 AC_SUBST(WX_LIBRARY_NAME_SHARED)
-AC_SUBST(WX_LIBRARY_BASENAME)
 AC_SUBST(WX_LIBRARY_IMPORTLIB)
 AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_LIBRARY_LINK1)
@@ -5231,15 +4934,12 @@ AC_SUBST(SONAME_FLAGS_GL)
 AC_SUBST(WX_TARGET_LIBRARY_SONAME)
 AC_SUBST(WX_TARGET_LIBRARY_TYPE)

-AC_SUBST(STATIC_FLAG)
-
 dnl debugging options
 AC_SUBST(WXDEBUG_DEFINE)

 dnl toolkit options
 AC_SUBST(USE_GUI)
 AC_SUBST(AFMINSTALL)
-AC_SUBST(WIN32INSTALL)
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DIR)
 AC_SUBST(TOOLKIT_VPATH)
@@ -5256,7 +4956,6 @@ AC_SUBST(WXCONFIG_LIBS_STATIC)
 AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
 AC_SUBST(WXCONFIG_INCLUDE)
 AC_SUBST(WXCONFIG_RPATH)
-AC_SUBST(WX_LARGEFILE_FLAGS)

 dnl the list of files to compile/install
 AC_SUBST(ALL_OBJECTS)
@@ -5274,12 +4973,10 @@ AC_SUBST(SAMPLES_SUBDIRS)
 dnl additional libraries and linker settings
 AC_SUBST(LDFLAGS)
 AC_SUBST(LDFLAGS_GL)
-AC_SUBST(LDFLAGS_VERSIONING)
 AC_SUBST(LDFLAGS_EXE)
 AC_SUBST(OPENGL_LIBS)
 AC_SUBST(DMALLOC_LIBS)
 AC_SUBST(EXTRADEFS)
-AC_SUBST(WX_VERSION_TAG)

 dnl additional resurces settings
 AC_SUBST(RESCOMP)
@@ -5295,8 +4992,7 @@ AC_SUBST(LIBWXMACRES)
 AC_SUBST(LIBWXMACRESCOMP)
 AC_SUBST(LIBWXMACRESWXCONFIG)

-dnl other tools
-AC_SUBST(GCC)
+dnl These seem to be missing
 AC_SUBST(DLLTOOL)
 AC_SUBST(AS)
 AC_SUBST(NM)
@@ -5327,16 +5023,9 @@ wx_cv_program_ext=$PROGRAM_EXT
 wx_cv_target_library=$WX_TARGET_LIBRARY
 wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
 wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
-wx_cv_library_basename=${WX_LIBRARY_BASENAME}
-wx_cv_release=${WX_RELEASE}
-wx_cv_current=${WX_CURRENT}
-wx_cv_revision=${WX_REVISION}
-wx_cv_age=${WX_AGE}
 export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
       wx_cv_path_ifs wx_cv_program_ext \
-       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
-       wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age
-
+       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype

 AC_CONFIG_SUBDIRS(demos samples utils contrib)

@@ -5345,7 +5034,6 @@ dnl (the original file name may be overriden by appending another name after a
 dnl colon)
 AC_OUTPUT([
            wx-config
-            version-script
            src/make.env
            src/makeprog.env
            src/makelib.env
@@ -5390,23 +5078,4 @@ AC_OUTPUT([
          ]
         )

-dnl report on what we decided to do
-echo
-echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
-echo ""
-echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT:-base only}"
-
-echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
-echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"
-echo "  Should wxWindows be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
-
-echo "  Which libraries should wxWindows use?"
-echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
-echo "                                       png                ${wxUSE_LIBPNG-none}"
-echo "                                       regex              ${wxUSE_REGEX}"
-echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
-echo "                                       zlib               ${wxUSE_ZLIB}"
-
-echo ""
-
-dnl vi: set et sts=4 sw=4 com=\:dnl:
+dnl vi: set et sts=4 sw=4:
--- a/contrib/configure
+++ b/contrib/configure
@@ -691,16 +691,6 @@ fi
 PATH_IFS=$wx_cv_path_ifs
 WX_TARGET_LIBRARY=$wx_cv_target_library
 WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
-WX_LIBRARY_BASENAME=$wx_cv_library_basename
-WX_RELEASE=$wx_cv_release
-WX_CURRENT=$wx_cv_current
-WX_REVISION=$wx_cv_revision
-WX_AGE=$wx_cv_age
-
-
-
-
-



@@ -840,17 +830,16 @@ trap 'rm -fr `echo "
            samples/ogl/ogledit/Makefile
            samples/ogl/studio/Makefile
            samples/stc/Makefile
-            samples/svg/Makefile
+            samples/svg/Makefile	    
            samples/canvas/Makefile
            samples/canvas/test/Makefile
            samples/canvas/simple/Makefile
            samples/gizmos/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
            samples/gizmos/editlbox/Makefile
            samples/gizmos/dynsash/Makefile
            samples/gizmos/dynsash_switch/Makefile
-            samples/gizmos/multicell/Makefile
-            samples/gizmos/splittree/Makefile
-            samples/gizmos/led/Makefile
            samples/xrc/Makefile
            samples/plot/Makefile
            samples/applet/Makefile
@@ -901,11 +890,6 @@ s%@PATH_IFS@%$PATH_IFS%g
 s%@ESD_LINK@%$ESD_LINK%g
 s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
 s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
-s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g
-s%@WX_RELEASE@%$WX_RELEASE%g
-s%@WX_CURRENT@%$WX_CURRENT%g
-s%@WX_REVISION@%$WX_REVISION%g
-s%@WX_AGE@%$WX_AGE%g

 CEOF
 EOF
@@ -965,17 +949,16 @@ CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
            samples/ogl/ogledit/Makefile
            samples/ogl/studio/Makefile
            samples/stc/Makefile
-            samples/svg/Makefile
+            samples/svg/Makefile	    
            samples/canvas/Makefile
            samples/canvas/test/Makefile
            samples/canvas/simple/Makefile
            samples/gizmos/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
            samples/gizmos/editlbox/Makefile
            samples/gizmos/dynsash/Makefile
            samples/gizmos/dynsash_switch/Makefile
-            samples/gizmos/multicell/Makefile
-            samples/gizmos/splittree/Makefile
-            samples/gizmos/led/Makefile
            samples/xrc/Makefile
            samples/plot/Makefile
            samples/applet/Makefile
--- a/contrib/configure.in
+++ b/contrib/configure.in
@@ -26,21 +26,11 @@ dnl Final subst
 PATH_IFS=$wx_cv_path_ifs
 WX_TARGET_LIBRARY=$wx_cv_target_library
 WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
-WX_LIBRARY_BASENAME=$wx_cv_library_basename
-WX_RELEASE=$wx_cv_release
-WX_CURRENT=$wx_cv_current
-WX_REVISION=$wx_cv_revision
-WX_AGE=$wx_cv_age

 AC_SUBST(PATH_IFS)
 AC_SUBST(ESD_LINK)
 AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_TARGET_LIBRARY_TYPE)
-AC_SUBST(WX_LIBRARY_BASENAME)
-AC_SUBST(WX_RELEASE)
-AC_SUBST(WX_CURRENT)
-AC_SUBST(WX_REVISION)
-AC_SUBST(WX_AGE)

 dnl -----------
 dnl File output
@@ -65,17 +55,15 @@ AC_OUTPUT([
            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
            samples/gizmos/Makefile
+            samples/gizmos/multicell/Makefile
+            samples/gizmos/splittree/Makefile
            samples/gizmos/editlbox/Makefile
            samples/gizmos/dynsash/Makefile
            samples/gizmos/dynsash_switch/Makefile
-            samples/gizmos/multicell/Makefile
-            samples/gizmos/splittree/Makefile
-            samples/gizmos/led/Makefile
            samples/xrc/Makefile
            samples/plot/Makefile
            samples/applet/Makefile
--- a/contrib/include/wx/animate/animate.h
+++ b/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

--- a/contrib/include/wx/canvas/bbox.h
+++ b/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

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

--- a/contrib/include/wx/canvas/canvas.h
+++ b/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

--- a/contrib/include/wx/canvas/liner.h
+++ b/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

--- a/contrib/include/wx/canvas/polygon.h
+++ b/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

--- a/contrib/include/wx/fl/antiflickpl.h
+++ b/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

@@ -26,7 +26,7 @@ antiflicker plugins within the application.
 Locking for multithreaded applications is not yet implemented.
 */

-class WXFL_DECLSPEC cbAntiflickerPlugin : public cbPluginBase
+class cbAntiflickerPlugin : public cbPluginBase
 {
    DECLARE_DYNAMIC_CLASS( cbAntiflickerPlugin )
 protected:
--- a/contrib/include/wx/fl/bardragpl.h
+++ b/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

@@ -23,7 +23,7 @@
 Plugin class implementing bar dragging.
 */

-class WXFL_DECLSPEC cbBarDragPlugin : public cbPluginBase
+class cbBarDragPlugin : public cbPluginBase
 {
    DECLARE_DYNAMIC_CLASS( cbBarDragPlugin )
 protected:
--- a/contrib/include/wx/fl/barhintspl.h
+++ b/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

@@ -24,7 +24,7 @@ This class intercepts bar-decoration and sizing events, and draws 3D hints
 around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x
 */

-class WXFL_DECLSPEC cbBarHintsPlugin : public cbPluginBase
+class cbBarHintsPlugin : public cbPluginBase
 {
    DECLARE_DYNAMIC_CLASS( cbBarHintsPlugin )

--- a/contrib/include/wx/fl/cbcustom.h
+++ b/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

@@ -24,7 +24,7 @@ menu and handling basic customization such as floating
 and horizontal/vertical alignment of the bar.
 */

-class WXFL_DECLSPEC cbSimpleCustomizationPlugin : public cbPluginBase
+class cbSimpleCustomizationPlugin : public cbPluginBase
 {
 public:
    DECLARE_DYNAMIC_CLASS( cbSimpleCustomizationPlugin )
--- a/contrib/include/wx/fl/controlbar.h
+++ b/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

@@ -21,31 +21,30 @@
 #include "wx/string.h"
 #include "wx/window.h"
 #include "wx/dynarray.h"
-#include "wx/fl/fldefs.h"

 #define WXCONTROLBAR_VERSION      1.3

 // forward declarations

-class  WXFL_DECLSPEC wxFrameLayout;
+class  wxFrameLayout;

-class  WXFL_DECLSPEC cbDockPane;
-class  WXFL_DECLSPEC cbUpdatesManagerBase;
-class  WXFL_DECLSPEC cbBarDimHandlerBase;
-class  WXFL_DECLSPEC cbPluginBase;
-class  WXFL_DECLSPEC cbPluginEvent;
-class  WXFL_DECLSPEC cbPaneDrawPlugin;
+class  cbDockPane;
+class  cbUpdatesManagerBase;
+class  cbBarDimHandlerBase;
+class  cbPluginBase;
+class  cbPluginEvent;
+class  cbPaneDrawPlugin;

-class WXFL_DECLSPEC cbBarInfo;
-class WXFL_DECLSPEC cbRowInfo;
-class WXFL_DECLSPEC cbDimInfo;
-class WXFL_DECLSPEC cbCommonPaneProperties;
+class cbBarInfo;
+class cbRowInfo;
+class cbDimInfo;
+class cbCommonPaneProperties;

 typedef cbBarInfo* BarInfoPtrT;
 typedef cbRowInfo* RowInfoPtrT;

-WXFL_DEFINE_ARRAY( BarInfoPtrT, BarArrayT );
-WXFL_DEFINE_ARRAY( RowInfoPtrT, RowArrayT );
+WX_DEFINE_ARRAY( BarInfoPtrT, BarArrayT );
+WX_DEFINE_ARRAY( RowInfoPtrT, RowArrayT );

 // control bar states

@@ -98,7 +97,7 @@ Helper class, used for spying for unhandled mouse events on control bars
 and forwarding them to the frame layout.
 */

-class WXFL_DECLSPEC cbBarSpy : public wxEvtHandler
+class cbBarSpy : public wxEvtHandler
 {
 public:
    DECLARE_DYNAMIC_CLASS( cbBarSpy )
@@ -130,7 +129,7 @@ which can be docked along the top, bottom, right, or left side of the
 parent frame.
 */

-class WXFL_DECLSPEC wxFrameLayout : public wxEvtHandler
+class wxFrameLayout : public wxEvtHandler
 {
 public:
        // Default constructor, used only for serialization.
@@ -648,7 +647,7 @@ used by any particular updates-manager to store
 auxiliary information to be used by its updating algorithm.
 */

-class WXFL_DECLSPEC cbUpdateMgrData : public wxObject
+class cbUpdateMgrData : public wxObject
 {
    DECLARE_DYNAMIC_CLASS( cbUpdateMgrData )
 public:
@@ -688,7 +687,7 @@ to adjust the values in cbDimInfo::mSizes accordingly.
 Specific handlers can be hooked up to specific types of bar.
 */

-class WXFL_DECLSPEC cbBarDimHandlerBase : public wxObject
+class cbBarDimHandlerBase : public wxObject
 {
    DECLARE_ABSTRACT_CLASS( cbBarDimHandlerBase )

@@ -726,7 +725,7 @@ Helper class used internally by the wxFrameLayout class.
 Holds and manages information about bar dimensions.
 */

-class WXFL_DECLSPEC cbDimInfo : public wxObject
+class cbDimInfo : public wxObject
 {
    DECLARE_DYNAMIC_CLASS( cbDimInfo )
 public:
@@ -825,7 +824,7 @@ public:
 };

 // FIXME: this array definition compiles but probably doesn't do what was intended (GD)
-WXFL_DEFINE_ARRAY_LONG(float, cbArrayFloat);
+WX_DEFINE_ARRAY_LONG(float, cbArrayFloat);

 /*
 Helper class used internally by the wxFrameLayout class.
--- a/contrib/include/wx/fl/dynbarhnd.h
+++ b/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

--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -12,19 +12,18 @@
 #ifndef __DYNTBAR_G__
 #define __DYNTBAR_G__

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
    #pragma interface "dyntbar.h"
 #endif

 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
-#include "wx/fl/fldefs.h"

 /*
 Tool layout item.
 */

-class WXFL_DECLSPEC wxToolLayoutItem : public wxObject
+class wxToolLayoutItem : public wxObject
 {
    DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)

@@ -33,19 +32,19 @@ public:
    bool      mIsSeparator;
 };

-class WXFL_DECLSPEC wxDynToolInfo;
+class wxDynToolInfo;

 typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
 typedef wxDynToolInfo*    wxDynToolInfoPtrT;

-WXFL_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
-WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );
+WX_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
+WX_DEFINE_ARRAY( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );

 /*
 This is a base class for layout algorithm implementations.
 */

-class WXFL_DECLSPEC LayoutManagerBase
+class LayoutManagerBase
 {
 public:
        // Constructor.
@@ -64,7 +63,7 @@ BagLayout lays out items in left-to-right order from
 top to bottom.
 */

-class WXFL_DECLSPEC BagLayout : public LayoutManagerBase
+class BagLayout : public LayoutManagerBase
 {
 public:
        // Constructor.
@@ -79,7 +78,7 @@ public:
 This class holds dynamic toolbar item information.
 */

-class WXFL_DECLSPEC wxDynToolInfo : public wxToolLayoutItem
+class wxDynToolInfo : public wxToolLayoutItem
 {
    DECLARE_DYNAMIC_CLASS(wxDynToolInfo)

@@ -99,7 +98,7 @@ public:
 wxDynamicToolBar manages containment and layout of tool windows.
 */

-class WXFL_DECLSPEC wxDynamicToolBar : public wxToolBarBase
+class wxDynamicToolBar : public wxToolBarBase
 {
 protected:
    friend class wxDynamicToolBarSerializer;
--- a/contrib/include/wx/fl/dyntbarhnd.h
+++ b/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

@@ -23,7 +23,7 @@
 Dynamic toolbar dimension handler.
 */

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

@@ -32,7 +32,7 @@ class wxFrameManager;
 It is not clear what this class does. It is not used elsewhere in FL.
 */

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

-class WXFL_DECLSPEC wxFrameManager : wxObject
+class wxFrameManager : wxObject
 {
 protected:
    wxList       mViews;
--- a/contrib/include/wx/fl/garbagec.h
+++ b/contrib/include/wx/fl/garbagec.h
@@ -12,12 +12,11 @@
 #ifndef __GARBAGEC_G__
 #define __GARBAGEC_G__

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
    #pragma interface "garbagec.h"
 #endif

 #include "wx/list.h"
-#include "wx/fl/fldefs.h"

 struct GCItem
 {
@@ -34,7 +33,7 @@ inline void* gc_node_to_obj( wxNode* pGCNode )
 This class implements an extremely slow but simple garbage collection algorithm.
 */

-class WXFL_DECLSPEC GarbageCollector
+class GarbageCollector
 {
 protected:
    wxList mAllNodes;
--- a/contrib/include/wx/fl/gcupdatesmgr.h
+++ b/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

@@ -93,7 +93,7 @@ to avoid dirty non-client areas of moved windows
 in some special cases of 'overlapping anomalies'.
 */

-class WXFL_DECLSPEC cbGCUpdatesMgr : public cbSimpleUpdatesMgr
+class cbGCUpdatesMgr : public cbSimpleUpdatesMgr
 {
    DECLARE_DYNAMIC_CLASS( cbGCUpdatesMgr )
 protected:
--- a/contrib/include/wx/fl/hintanimpl.h
+++ b/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

@@ -20,13 +20,13 @@

 #include "wx/timer.h"

-class WXFL_DECLSPEC cbHintAnimTimer;
+class cbHintAnimTimer;

 /*
 A plugin to draw animated hints when the user drags a pane.
 */

-class WXFL_DECLSPEC cbHintAnimationPlugin : public cbPluginBase
+class cbHintAnimationPlugin : public cbPluginBase
 {
    DECLARE_DYNAMIC_CLASS( cbHintAnimationPlugin )
 protected:
@@ -101,7 +101,7 @@ public:
 A private helper class.
 */

-struct WXFL_DECLSPEC MorphInfoT
+struct MorphInfoT
 {
    wxPoint mFrom;
    wxPoint mTill;
@@ -111,7 +111,7 @@ struct WXFL_DECLSPEC MorphInfoT
 A private helper class.
 */

-class WXFL_DECLSPEC cbHintAnimTimer : public wxTimer 
+class cbHintAnimTimer : public wxTimer 
 {
 protected:

--- a/contrib/include/wx/fl/newbmpbtn.h
+++ b/contrib/include/wx/fl/newbmpbtn.h
@@ -12,13 +12,12 @@
 #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"
-#include "wx/fl/fldefs.h"

 // defaults
 #define NB_DEFAULT_MARGIN 2
@@ -32,8 +31,8 @@

 // classes declared in this header file

-class WXFL_DECLSPEC wxNewBitmapButton;
-class WXFL_DECLSPEC wxBorderLessBitmapButton;
+class wxNewBitmapButton;
+class wxBorderLessBitmapButton;

 /*
 This is an alternative class to wxBitmapButton. It is used
@@ -195,6 +194,11 @@ 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()
 };

--- a/contrib/include/wx/fl/panedrawpl.h
+++ b/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

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

-class WXFL_DECLSPEC cbPaneDrawPlugin : public cbPluginBase
+class cbPaneDrawPlugin : public cbPluginBase
 {
 public:
    DECLARE_DYNAMIC_CLASS( cbPaneDrawPlugin )
--- a/contrib/include/wx/fl/rowdragpl.h
+++ b/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

@@ -25,7 +25,7 @@ The behaviour and appearance resembles drag and drop positioning
 of the toolbar rows in Netscape Communicator 4.xx.
 */

-class WXFL_DECLSPEC cbRowDragPlugin : public cbPluginBase
+class cbRowDragPlugin : public cbPluginBase
 {
    DECLARE_DYNAMIC_CLASS( cbRowDragPlugin )
 public:
@@ -217,7 +217,7 @@ public:
 Internal helper class.
 */

-class WXFL_DECLSPEC cbHiddenBarInfo : public wxObject
+class cbHiddenBarInfo : public wxObject
 {
    DECLARE_DYNAMIC_CLASS( cbHiddenBarInfo )
 public:
--- a/contrib/include/wx/fl/rowlayoutpl.h
+++ b/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

@@ -23,7 +23,7 @@ Simple implementation of a plugin which handles row layout
 requests sent from a frame layout.
 */

-class WXFL_DECLSPEC cbRowLayoutPlugin : public cbPluginBase
+class cbRowLayoutPlugin : public cbPluginBase
 {
    DECLARE_DYNAMIC_CLASS( cbRowLayoutPlugin )
 protected:
--- a/contrib/include/wx/fl/toolwnd.h
+++ b/contrib/include/wx/fl/toolwnd.h
@@ -13,13 +13,12 @@
 #ifndef __TOOLWND_G__
 #define __TOOLWND_G__

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
    #pragma interface "toolwnd.h"
 #endif

 #include "wx/frame.h"
 #include "wx/dynarray.h"
-#include "wx/fl/fldefs.h"

 // fixed settings

@@ -27,18 +26,18 @@
 #define BTN_BOX_WIDTH        12
 #define BTN_X_WIEGHT         2

-class WXFL_DECLSPEC cbMiniButton;
+class cbMiniButton;

 typedef cbMiniButton* cbMinitButtonPtrT;

-WXFL_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT );
+WX_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT );

 /*
 A tool window is a special kind of frame that paints its own title, and
 can be used to implement small floating windows.
 */

-class WXFL_DECLSPEC wxToolWindow : public wxFrame
+class wxToolWindow : public wxFrame
 {
    DECLARE_DYNAMIC_CLASS( wxToolWindow )

@@ -222,7 +221,7 @@ public:
 cbCloseBox is a window close button, used in a wxToolWindow titlebar.
 */

-class WXFL_DECLSPEC cbCloseBox : public cbMiniButton
+class cbCloseBox : public cbMiniButton
 {
 public:
        // Draws the close button appearance.
@@ -233,7 +232,7 @@ public:
 cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar.
 */

-class WXFL_DECLSPEC cbCollapseBox  : public cbMiniButton
+class cbCollapseBox  : public cbMiniButton
 {
 public:
    bool mIsAtLeft;
@@ -246,7 +245,7 @@ public:
 cbDockBox is a window dock button, used in a wxToolWindow titlebar.
 */

-class WXFL_DECLSPEC cbDockBox : public cbMiniButton
+class cbDockBox : public cbMiniButton
 {
 public:
        // Draws the dock button appearance.
@@ -258,7 +257,7 @@ cbFloatedBarWindow is a kind of wxToolWindow,
 implementing floating toolbars.
 */

-class WXFL_DECLSPEC cbFloatedBarWindow : public wxToolWindow
+class cbFloatedBarWindow : public wxToolWindow
 {
    DECLARE_DYNAMIC_CLASS( cbFloatedBarWindow )
 protected:
--- a/contrib/include/wx/fl/updatesmgr.h
+++ b/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

@@ -23,7 +23,7 @@ This class implements slightly optimized logic for refreshing
 the areas of frame layout that actually need to be updated.
 */

-class WXFL_DECLSPEC cbSimpleUpdatesMgr : public cbUpdatesManagerBase
+class cbSimpleUpdatesMgr : public cbUpdatesManagerBase
 {
    DECLARE_DYNAMIC_CLASS( cbSimpleUpdatesMgr )
 protected:
--- a/contrib/include/wx/gizmos/dynamicsash.h
+++ b/contrib/include/wx/gizmos/dynamicsash.h
@@ -142,21 +142,19 @@ typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashSplit
 /*
    wxDynamicSashWindow.  See above.
 */
-extern const wxChar* GIZMODLLEXPORT wxDynamicSashWindowNameStr;
-
 class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow {
 public:
    wxDynamicSashWindow();
    wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
-                        const wxString& name = wxDynamicSashWindowNameStr);
+                        const wxString& name = "dynamicSashWindow");
    virtual ~wxDynamicSashWindow();

    virtual bool Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
-                        const wxString& name = wxDynamicSashWindowNameStr);
+                        const wxString& name = "dynamicSashWindow");
    virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
    virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;

--- a/contrib/include/wx/gizmos/editlbox.h
+++ b/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

--- a/contrib/include/wx/gizmos/ledctrl.h
+++ b/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

--- a/contrib/include/wx/gizmos/multicell.h
+++ b/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

--- a/contrib/include/wx/gizmos/splittree.h
+++ b/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

--- a/contrib/include/wx/mmedia/cdbase.h
+++ b/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

--- a/contrib/include/wx/mmedia/cdunix.h
+++ b/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

--- a/contrib/include/wx/net/email.h
+++ b/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

--- a/contrib/include/wx/net/msg.h
+++ b/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

--- a/contrib/include/wx/net/smapi.h
+++ b/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_
--- a/contrib/include/wx/net/web.h
+++ b/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

--- a/contrib/include/wx/ogl/basic.h
+++ b/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

@@ -22,6 +22,11 @@
 #define DEFAULT_MOUSE_TOLERANCE 3
 #endif

+// Edit these lines if you positively don't want PROLOGIO support
+#ifndef PROLOGIO
+#define PROLOGIO
+#endif
+
 // Key identifiers
 #define KEY_SHIFT 1
 #define KEY_CTRL  2
@@ -105,7 +110,7 @@ class wxControlPoint;
 class wxShapeRegion;
 class wxShape;

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
 class WXDLLEXPORT wxExpr;
 class WXDLLEXPORT wxExprDatabase;
 #endif
@@ -353,7 +358,7 @@ class wxShape: public wxShapeEvtHandler
  virtual int GetRegionId(const wxString& name);

  // Construct names for regions, unique even for children of a composite.
-  virtual void NameRegions(const wxString& parentName = wxEmptyString);
+  virtual void NameRegions(const wxString& parentName = "");

  // Get list of regions
  inline wxList& GetRegions() const { return (wxList&) m_regions; }
@@ -376,7 +381,7 @@ class wxShape: public wxShapeEvtHandler
  virtual void ClearText(int regionId = 0);
  void RemoveLine(wxLineShape *line);

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  // I/O
  virtual void WriteAttributes(wxExpr *clause);
  virtual void ReadAttributes(wxExpr *clause);
@@ -608,7 +613,7 @@ class wxPolygonShape: public wxShape
  // Recalculates the centre of the polygon
  virtual void CalculatePolygonCentre();

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  void WriteAttributes(wxExpr *clause);
  void ReadAttributes(wxExpr *clause);
 #endif
@@ -647,7 +652,7 @@ class wxRectangleShape: public wxShape
  void SetSize(double x, double y, bool recursive = TRUE);
  void SetCornerRadius(double rad); // If > 0, rounded corners

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  void WriteAttributes(wxExpr *clause);
  void ReadAttributes(wxExpr *clause);
 #endif
@@ -677,8 +682,8 @@ class wxTextShape: public wxRectangleShape

  void OnDraw(wxDC& dc);

-#if wxUSE_PROLOGIO
-    void WriteAttributes(wxExpr *clause);
+#ifdef PROLOGIO
+  void WriteAttributes(wxExpr *clause);
 #endif

  // Does the copying for this object
@@ -699,7 +704,7 @@ class wxEllipseShape: public wxShape
  void OnDraw(wxDC& dc);
  void SetSize(double x, double y, bool recursive = TRUE);

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  void WriteAttributes(wxExpr *clause);
  void ReadAttributes(wxExpr *clause);
 #endif
--- a/contrib/include/wx/ogl/basicp.h
+++ b/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

@@ -22,7 +22,7 @@ class wxShapeTextLine: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxShapeTextLine)
 public:
-   wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = wxEmptyString);
+   wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = "");
   ~wxShapeTextLine();

   inline double GetX() const { return m_x; }
@@ -136,8 +136,7 @@ class wxShapeRegion: public wxObject
  ~wxShapeRegion();

  // Accessors
-  inline void SetText(const wxString& s)
-    { m_regionText = s; m_formattedText.Append(new wxShapeTextLine(0,0,s));}
+  inline void SetText(const wxString& s) { m_regionText = s; }
  void SetFont(wxFont *f);
  void SetMinSize(double w, double h);
  void SetSize(double w, double h);
--- a/contrib/include/wx/ogl/bmpshape.h
+++ b/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

@@ -27,7 +27,7 @@ class wxBitmapShape: public wxRectangleShape

  void OnDraw(wxDC& dc);

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  // I/O
  void WriteAttributes(wxExpr *clause);
  void ReadAttributes(wxExpr *clause);
--- a/contrib/include/wx/ogl/canvas.h
+++ b/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

--- a/contrib/include/wx/ogl/composit.h
+++ b/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

@@ -77,7 +77,7 @@ public:
  // Calculates size and position of composite object based on children
  void CalculateSize();

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  void WriteAttributes(wxExpr *clause);
  void ReadAttributes(wxExpr *clause);
  // In case the object has constraints it needs to read in in a different pass
@@ -152,7 +152,7 @@ class wxDivisionShape: public wxCompositeShape
  void MakeMandatoryControlPoints();
  void ResetMandatoryControlPoints();

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  void WriteAttributes(wxExpr *clause);
  void ReadAttributes(wxExpr *clause);
 #endif
--- a/contrib/include/wx/ogl/constrnt.h
+++ b/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

@@ -25,8 +25,7 @@ class wxOGLConstraintType: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxOGLConstraintType)
 public:
-  wxOGLConstraintType(int type = 0, const wxString& name = wxEmptyString,
-                      const wxString& phrase = wxEmptyString);
+  wxOGLConstraintType(int type = 0, const wxString& name = "", const wxString& phrase = "");
  ~wxOGLConstraintType();

 public:
@@ -61,10 +60,8 @@ class wxOGLConstraint: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxOGLConstraint)
 public:
-  wxOGLConstraint() {
-     m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0;
-     m_constraintName = wxEmptyString; m_constraintId = 0;
-     m_constrainingObject = NULL; }
+  wxOGLConstraint() { m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0; m_constraintName = ""; m_constraintId = 0;
+                        m_constrainingObject = NULL; }
  wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
  ~wxOGLConstraint();

--- a/contrib/include/wx/ogl/divided.h
+++ b/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

@@ -46,7 +46,7 @@ class wxDividedShape: public wxRectangleShape
  void MakeMandatoryControlPoints();
  void ResetMandatoryControlPoints();

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  void WriteAttributes(wxExpr *clause);
  void ReadAttributes(wxExpr *clause);
 #endif
--- a/contrib/include/wx/ogl/drawn.h
+++ b/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

@@ -32,7 +32,7 @@ class wxPseudoMetaFile: public wxObject

  void Draw(wxDC& dc, double xoffset, double yoffset);

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  void WriteAttributes(wxExpr *clause, int whichAngle);
  void ReadAttributes(wxExpr *clause, int whichAngle);
 #endif
@@ -48,7 +48,7 @@ class wxPseudoMetaFile: public wxObject
  // Rotate about the given axis by theta radians from the x axis.
  void Rotate(double x, double y, double theta);

-  bool LoadFromMetaFile(const wxString& filename, double *width, double *height);
+  bool LoadFromMetaFile(char *filename, double *width, double *height);

  void GetBounds(double *minX, double *minY, double *maxX, double *maxY);

@@ -139,7 +139,7 @@ class wxDrawnShape: public wxRectangleShape

  void OnDraw(wxDC& dc);

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  // I/O
  void WriteAttributes(wxExpr *clause);
  void ReadAttributes(wxExpr *clause);
@@ -157,7 +157,7 @@ class wxDrawnShape: public wxRectangleShape
  inline double GetRotation() const { return m_rotation; }

  void SetSize(double w, double h, bool recursive = TRUE);
-  bool LoadFromMetaFile(const wxString& filename);
+  bool LoadFromMetaFile(char *filename);

  inline void SetSaveToFile(bool save) { m_saveToFile = save; }
  inline wxPseudoMetaFile& GetMetaFile(int which = 0) const { return (wxPseudoMetaFile&) m_metafiles[which]; }
--- a/contrib/include/wx/ogl/drawnp.h
+++ b/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

@@ -65,10 +65,9 @@ public:
  inline virtual void Rotate(double x, double y, double theta, double sinTheta, double cosTheta) {};
  virtual void Do(wxDC& dc, double xoffset, double yoffset) = 0;
  virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;
-#if wxUSE_PROLOGIO
  virtual wxExpr *WriteExpr(wxPseudoMetaFile *image) = 0;
  virtual void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;
-#endif
+
  inline int GetOp() const { return m_op; }

  // Draw an outline using the current operation. By default, return FALSE (not drawn)
@@ -99,10 +98,8 @@ class wxOpSetGDI: public wxDrawOp
  wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);
  void Do(wxDC& dc, double xoffset, double yoffset);
  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
-#if wxUSE_PROLOGIO
  wxExpr *WriteExpr(wxPseudoMetaFile *image);
  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
-#endif

 public:
  int               m_mode;
@@ -126,10 +123,8 @@ public:
  void Scale(double xScale, double yScale);
  void Translate(double x, double y);
  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
-#if wxUSE_PROLOGIO
  wxExpr *WriteExpr(wxPseudoMetaFile *image);
  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
-#endif

 public:
  double     m_x1;
@@ -154,10 +149,8 @@ class wxOpDraw: public wxDrawOp
  void Translate(double x, double y);
  void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
-#if wxUSE_PROLOGIO
  wxExpr *WriteExpr(wxPseudoMetaFile *image);
  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
-#endif

 public:
  double     m_x1;
@@ -186,10 +179,8 @@ public:
  void Translate(double x, double y);
  void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
-#if wxUSE_PROLOGIO
  wxExpr *WriteExpr(wxPseudoMetaFile *image);
  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
-#endif

  // Draw an outline using the current operation.
  virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,
--- a/contrib/include/wx/ogl/lines.h
+++ b/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

@@ -51,7 +51,7 @@ class wxArrowHead: public wxObject
 DECLARE_DYNAMIC_CLASS(wxArrowHead)

 public:
-  wxArrowHead(WXTYPE type = 0, int end = 0, double size = 0.0, double dist = 0.0, const wxString& name = wxEmptyString, wxPseudoMetaFile *mf = NULL,
+  wxArrowHead(WXTYPE type = 0, int end = 0, double size = 0.0, double dist = 0.0, const wxString& name = "", wxPseudoMetaFile *mf = NULL,
            long arrowId = -1);
  ~wxArrowHead();
  wxArrowHead(wxArrowHead& toCopy);
@@ -188,7 +188,7 @@ class wxLineShape: public wxShape

  bool HitTest(double x, double y, int *attachment, double *distance);

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  // I/O
  virtual void WriteAttributes(wxExpr *clause);
  virtual void ReadAttributes(wxExpr *clause);
@@ -210,9 +210,8 @@ class wxLineShape: public wxShape

  // Add an arrowhead.
  wxArrowHead *AddArrow(WXTYPE type, int end = ARROW_POSITION_END,
-                        double arrowSize = 10.0, double xOffset = 0.0,
-                        const wxString& name = wxEmptyString,
-                        wxPseudoMetaFile *mf = NULL, long arrowId = -1);
+                double arrowSize = 10.0, double xOffset = 0.0, const wxString& name = "",
+                wxPseudoMetaFile *mf = NULL, long arrowId = -1);

  // Add an arrowhead in the position indicated by the reference
  // list of arrowheads, which contains all legal arrowheads for this
--- a/contrib/include/wx/ogl/linesp.h
+++ b/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

--- a/contrib/include/wx/ogl/mfutils.h
+++ b/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

@@ -195,7 +195,7 @@ class wxXMetaFile: public wxObject
  wxList metaRecords;
  wxList gdiObjects; // List of wxMetaRecord objects created with Create...,
                     // referenced by position in list by SelectObject
-  wxXMetaFile(const wxChar* file = NULL);
+  wxXMetaFile(char *file = NULL);
  ~wxXMetaFile(void);

  // After this is called, the metafile cannot be used for anything
@@ -204,7 +204,7 @@ class wxXMetaFile: public wxObject

  bool Play(wxDC *dc);
  inline bool Ok(void) const { return ok; }
-  bool ReadFile(const wxChar *file);
+  bool ReadFile(char *file);
 };

 #endif
--- a/contrib/include/wx/ogl/misc.h
+++ b/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

--- a/contrib/include/wx/ogl/ogldiag.h
+++ b/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

@@ -67,7 +67,7 @@ public:
  // Make sure all text that should be centred, is centred.
  void RecentreAll(wxDC& dc);

-#if wxUSE_PROLOGIO
+#ifdef PROLOGIO
  virtual bool SaveFile(const wxString& filename);
  virtual bool LoadFile(const wxString& filename);

--- a/contrib/include/wx/plot/plot.h
+++ b/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

--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
--- a/contrib/include/wx/xrc/xh_all.h
+++ b/contrib/include/wx/xrc/xh_all.h
@@ -46,6 +46,5 @@
 #include "wx/xrc/xh_unkwn.h"
 #include "wx/xrc/xh_gdctl.h"
 #include "wx/xrc/xh_frame.h"
-#include "wx/xrc/xh_scwin.h"

 #endif // _WX_XMLRES_H_
--- a/contrib/include/wx/xrc/xh_bmp.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_bmpbt.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_bttn.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_cald.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_chckb.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_chckl.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_choic.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_combo.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_dlg.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_frame.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_gauge.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_gdctl.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_html.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_listb.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_listc.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_menu.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_notbk.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_panel.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_radbt.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_radbx.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_scrol.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_scwin.h
+++ b/contrib/include/wx/xrc/xh_scwin.h
@@ -1,32 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_scwin.h
-// Purpose:     XML resource handler for wxScrolledWindow
-// Author:      Vaclav Slavik
-// Created:     2002/10/18
-// RCS-ID:      $Id$
-// Copyright:   (c) 2002 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SCWIN_H_
-#define _WX_XH_SCWIN_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_scwin.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
-
-
-
-class WXXMLDLLEXPORT wxScrolledWindowXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxScrolledWindowXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-
-#endif // _WX_XH_SCWIN_H_
--- a/contrib/include/wx/xrc/xh_sizer.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_slidr.h
+++ b/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

--- a/contrib/include/wx/xrc/xh_spin.h
+++ b/contrib/include/wx/xrc/xh_spin.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_SPIN_H_
 #define _WX_XH_SPIN_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_spin.h"
 #endif

--- a/contrib/include/wx/xrc/xh_stbmp.h
+++ b/contrib/include/wx/xrc/xh_stbmp.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_STBMP_H_
 #define _WX_XH_STBMP_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_stbmp.h"
 #endif

--- a/contrib/include/wx/xrc/xh_stbox.h
+++ b/contrib/include/wx/xrc/xh_stbox.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_STBOX_H_
 #define _WX_XH_STBOX_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_stbox.h"
 #endif

--- a/contrib/include/wx/xrc/xh_stlin.h
+++ b/contrib/include/wx/xrc/xh_stlin.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_STLIN_H_
 #define _WX_XH_STLIN_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_stlin.h"
 #endif

--- a/contrib/include/wx/xrc/xh_sttxt.h
+++ b/contrib/include/wx/xrc/xh_sttxt.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_STTXT_H_
 #define _WX_XH_STTXT_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_sttxt.h"
 #endif

--- a/contrib/include/wx/xrc/xh_text.h
+++ b/contrib/include/wx/xrc/xh_text.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_TEXT_H_
 #define _WX_XH_TEXT_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_text.h"
 #endif

--- a/contrib/include/wx/xrc/xh_toolb.h
+++ b/contrib/include/wx/xrc/xh_toolb.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_TOOLB_H_
 #define _WX_XH_TOOLB_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_toolb.h"
 #endif

--- a/contrib/include/wx/xrc/xh_tree.h
+++ b/contrib/include/wx/xrc/xh_tree.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_TREE_H_
 #define _WX_XH_TREE_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_tree.h"
 #endif

--- a/contrib/include/wx/xrc/xh_unkwn.h
+++ b/contrib/include/wx/xrc/xh_unkwn.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_UNKWN_H_
 #define _WX_XH_UNKWN_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xh_unkwn.h"
 #endif

--- a/contrib/include/wx/xrc/xml.h
+++ b/contrib/include/wx/xrc/xml.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XML_H_
 #define _WX_XML_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xml.h"
 #endif

--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XMLRES_H_
 #define _WX_XMLRES_H_

-#if defined(__GNUG__) && !defined(__APPLE__)
+#ifdef __GNUG__
 #pragma interface "xmlres.h"
 #endif

@@ -37,9 +37,6 @@ class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;

 class WXXMLDLLEXPORT wxXmlResourceHandler;
-class WXXMLDLLEXPORT wxXmlSubclassFactory;
-class WXXMLDLLEXPORT wxXmlSubclassFactoriesList;
-class wxXmlResourceModule;


 // These macros indicate current version of XML resources (this information is
@@ -136,11 +133,6 @@ public:

    // Removes all handlers
    void ClearHandlers();
-    
-    // Registers subclasses factory for use in XRC. This function is not meant
-    // for public use, please see the comment above wxXmlSubclassFactory
-    // definition.
-    static void AddSubclassFactory(wxXmlSubclassFactory *factory);

    // Loads menu from resource. Returns NULL on failure.
    wxMenu *LoadMenu(const wxString& name);
@@ -223,11 +215,6 @@ public:
    // Sets the global resources object and returns a pointer to the previous one (may be NULL).
    static wxXmlResource *Set(wxXmlResource *res);

-    // Returns flags, which may be a bitlist of wxXRC_USE_LOCALE and wxXRC_NO_SUBCLASSING.
-    int GetFlags() const { return m_flags; }
-    // Set flags after construction.
-    void SetFlags(int flags) { m_flags = flags; }
-
 protected:
    // Scans the resources list for unloaded files and loads them. Also reloads
    // files that have been modified since last loading.
@@ -242,6 +229,9 @@ protected:
    // Creates a resource from information in the given node.
    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);

+    // Returns flags, which may be a bitlist of wxXRC_USE_LOCALE and wxXRC_NO_SUBCLASSING.
+    int GetFlags() { return m_flags; }
+
 private:
    long m_version;

@@ -254,9 +244,6 @@ private:
 #endif

    friend class wxXmlResourceHandler;
-    friend class wxXmlResourceModule;
-
-    static wxXmlSubclassFactoriesList *ms_subclassFactories;

    // singleton instance:
    static wxXmlResource *ms_instance;
@@ -451,20 +438,6 @@ protected:
 void wxXmlInitResourceModule();


-// This class is used to create instances of XRC "object" nodes with "subclass"
-// property. It is _not_ supposed to be used by XRC users, you should instead
-// register your subclasses via wxWindows' RTTI mechanism. This class is useful
-// only for language bindings developer who need a way to implement subclassing
-// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
-class WXXMLDLLEXPORT wxXmlSubclassFactory
-{
-public:
-    // Try to create instance of given class and return it, return NULL on failure:
-    virtual wxObject *Create(const wxString& className) = 0;
-    virtual ~wxXmlSubclassFactory() {}
-};
-
-
 /* -------------------------------------------------------------------------
   Backward compatibility macros. Do *NOT* use, they may disappear in future
   versions of the XRC library!
--- a/Show More
+++ b/Show More