[gtk-mac-integration] Enable BUILT_UI in test-integration while suppressing gtk deprecated warnings
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-mac-integration] Enable BUILT_UI in test-integration while suppressing gtk deprecated warnings
- Date: Fri, 11 Oct 2013 21:58:39 +0000 (UTC)
commit 8980826cfce2d687fdd07b9bd838278ff57a7cc4
Author: John Ralls <jralls ceridwen us>
Date: Fri Oct 11 14:58:00 2013 -0700
Enable BUILT_UI in test-integration while suppressing gtk deprecated warnings
configure.ac | 4 ++--
src/Makefile.am | 3 +++
src/test-integration.c | 6 +++---
3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4854ef4..9a4d5e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,9 +64,9 @@ AS_IF([test "x$with_gtk" = xgtk+-3.0],
[test "x$with_gtk" = xgtk+-2.0],
[PKG_CHECK_MODULES(MAC, [gtk+-2.0 >= 2.10], GTK_MAJOR="gtk+-2.0",
AC_MSG_ERROR([GTK+-2.0 specified but not found]))],
- [PKG_CHECK_MODULES(MAC, [gtk+-3.0 >= 2.90],GTK_MAJOR="gtk+-3.0",
+ [PKG_CHECK_MODULES(MAC, [gtk+-3.0 >= 3.2],GTK_MAJOR="gtk+-3.0",
PKG_CHECK_MODULES(MAC, [gtk+-2.0 >= 2.10], GTK_MAJOR="gtk+-2.0",
- AC_MSG_ERROR([GTK+-2.0 Wersion 2.10 or higher or GTK+-3.0 Version 2.90.0 or higher is required to
build gtk-mac-integration])))])
+ AC_MSG_ERROR([GTK+-2.0 Wersion 2.10 or higher or GTK+-3.0 Version 3.2.0 or higher is required to
build gtk-mac-integration])))])
AC_MSG_CHECKING([GTK+ Version])
diff --git a/src/Makefile.am b/src/Makefile.am
index 0a6d27f..5e1120b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,6 +56,9 @@ test_integration_LDADD = $(MAC_LIBS) libgtkmacintegration.la
EXTRA_DIST = testui.xml
if INTROSPECTION
+
+test_integration_CFLAGS += -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_2
+
if HAVE_INTROSPECTION
GtkosxApplication-1.0.gir: $(INTROSPECTION_SCANNER) libgtkmacintegration.la
GtkosxApplication_1_0_gir_SCANNERFLAGS = \
diff --git a/src/test-integration.c b/src/test-integration.c
index f7c4c9a..7277207 100644
--- a/src/test-integration.c
+++ b/src/test-integration.c
@@ -62,10 +62,10 @@
/* Uncomment ONE of these to test menu-mangling: */
//#define GTKMACINTEGRATION
#define GTKOSXAPPLICATION
+
/* These others are optional */
-#if ! GTK_CHECK_VERSION (3, 10, 0)
-//#define BUILT_UI //The built UI uses deprecated functions
-#endif
+#define GTK_DISABLE_DEPRECATION_WARNINGS 1
+#define BUILT_UI //The built UI uses deprecated functions
//#define QUARTZ_HANDLERS
/* GTKMACINTEGRATION uses Carbon, which isn't available for 64-bit builds. */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]