remove check for missing gtk_icon_size_lookup, since it is for GTK+ 2.1, and 2.4...

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

diff --git a/configure b/configure
index fc39feac0f6654b09b760408af6acd2d787b43b9..da578ad21216d678aa629090b6d8ac0746892887 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 50135 2007-11-21 14:24:40Z VZ .
+# From configure.in Id: configure.in 50205 2007-11-24 01:56:13Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -28841,80 +28841,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
             CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
             LIBS="$LIBS $wx_cv_libs_gtk"
 
-                                                            { echo "$as_me:$LINENO: checking whether gtk_icon_size_lookup is declared" >&5
-echo $ECHO_N "checking whether gtk_icon_size_lookup is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_gtk_icon_size_lookup+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <gtk/gtk.h>
-
-int
-main ()
-{
-#ifndef gtk_icon_size_lookup
-  (void) gtk_icon_size_lookup;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_gtk_icon_size_lookup=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_have_decl_gtk_icon_size_lookup=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_icon_size_lookup" >&5
-echo "${ECHO_T}$ac_cv_have_decl_gtk_icon_size_lookup" >&6; }
-if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 0
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
-#define NEED_GTK_ICON_SIZE_LOOKUP 1
-_ACEOF
-
-fi
-
-
-
-
                         { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
 echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; }
             cat >conftest.$ac_ext <<_ACEOF

diff --git a/configure.in b/configure.in
index 0111e0580d555faa3e6bcf2cc40005814dfb8eaa..04ea8251478a35fce974e5a670478550933679b8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2777,15 +2777,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
             CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
             LIBS="$LIBS $wx_cv_libs_gtk"
 
-            dnl gtk_icon_size_lookup is not available in the GTK+ headers
-            dnl that have shipped with some versions of Sun's JDS. Not using
-            dnl AC_CHECK_FUNCS here since it only checks the function exists
-            dnl in the lib (not the header).
-            AC_CHECK_DECLS([gtk_icon_size_lookup], [],
-                           [AC_DEFINE(NEED_GTK_ICON_SIZE_LOOKUP)],
-                           [#include <gtk/gtk.h>])
-
-
             dnl test if we have at least GTK+ 2.10:
             AC_MSG_CHECKING([if GTK+ is version >= 2.10])
             AC_TRY_COMPILE([

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index fa140d1cd3827afac309b3ef65a17b304faea780..3c690c0d6b0f4066c1cf353810e7cadf2230e384 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -127,15 +127,6 @@ void wxRemoveGrab(wxWindow* window);
 // Escapes string so that it is valid Pango markup XML string:
 WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str);
 
-// The declaration for gtk_icon_size_lookup was accidentally ifdefed out in
-// GTK+ 2.1.0 which Sun seem to have shipped with some versions of JDS
-// for Solaris 9 x86.
-#ifdef NEED_GTK_ICON_SIZE_LOOKUP
-extern "C" gboolean gtk_icon_size_lookup  (GtkIconSize  size,
-                                           gint         *width,
-                                           gint         *height);
-#endif
-
 #ifdef __WXGTK20__
 #include <gdk/gdktypes.h>
 

diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h
index 753c7508f20b5ece3d4bb9d2d719cf1d90a02cbc..d6ef5bb882c4b0e99290ce9dfa48aa827f45afa8 100644 (file)
--- a/include/wx/gtk1/private.h
+++ b/include/wx/gtk1/private.h
@@ -92,14 +92,5 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
 void wxAddGrab(wxWindow* window);
 void wxRemoveGrab(wxWindow* window);
 
-// The declaration for gtk_icon_size_lookup was accidentally ifdefed out in
-// GTK+ 2.1.0 which Sun seem to have shipped with some versions of JDS
-// for Solaris 9 x86.
-#ifdef NEED_GTK_ICON_SIZE_LOOKUP
-extern "C" gboolean gtk_icon_size_lookup  (GtkIconSize  size,
-                                           gint         *width,
-                                           gint         *height);
-#endif
-
 #endif // _WX_GTK_PRIVATE_H_
 

diff --git a/setup.h.in b/setup.h.in
index 62e68e9d92f04ebcef62b7f156b2e2d84987a4a7..256003a673a9949f6162bd03ebce84b84fe416e0 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1082,9 +1082,6 @@
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
-/* Define if gtk_icon_size_lookup is missing from the GTK+ headers */
-#undef NEED_GTK_ICON_SIZE_LOOKUP
-
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT