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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-11-24 19:11:19 +00:00
parent 0903bd055a
commit 04109b2296
5 changed files with 1 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
configure vendored
View File

@@ -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

9
configure.in
View File

@@ -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([

9
include/wx/gtk/private.h
View File

@@ -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>

9
include/wx/gtk1/private.h
View File

@@ -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_

3
setup.h.in
View File

@@ -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