Patch by Magliocchetti Riccardo:

gtk frontend: require gtk 2.6 at configure time and removed
some compatibility code for older versions.
This commit is contained in:
yabause 2008-11-04 22:03:26 +00:00
parent 9e8b6fedef
commit 735aac6a18
2 changed files with 5 additions and 5 deletions

View File

@ -57,6 +57,7 @@ AC_CHECK_HEADERS([GL/glu.h])
dnl - Check for GTK and/or libglade
GLIB_VER=2.8
GTK_VER=2.6
AC_CHECK_TOOL(HAVE_PKG, pkg-config)
AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [
if test ! "x$HAVE_PKG" = "x" ; then
@ -69,9 +70,12 @@ AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [
fi
PKG_CHECK_MODULES(GTK,
"gtk+-2.0",
gtk+-2.0 >= $GTK_VER,
HAVE_GTK=yes,
HAVE_GTK=no)
if test "$HAVE_GTK" = "no"; then
AC_MSG_ERROR([gtk-2.0 >= $GTK_VER is required to build desmume gtk frontend])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)

View File

@ -1771,11 +1771,7 @@ common_gtk_main( struct configured_features *my_config)
pMenu = gtk_menu_new();
#if ((GTK_MAJOR_VERSION >= 2) && (GTK_MINOR_VERSION >= 6))
pMenuItem = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT,NULL);
#else
pMenuItem = gtk_menu_item_new_with_label("About");
#endif
g_signal_connect(G_OBJECT(pMenuItem), "activate", G_CALLBACK(About), (GtkWidget*) pWindow);
gtk_menu_shell_append(GTK_MENU_SHELL(pMenu), pMenuItem);