[nemiver] Require and properly detect gtkmm24 version 2.16
- From: Dodji Seketeli <dodji src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nemiver] Require and properly detect gtkmm24 version 2.16
- Date: Sat, 27 Feb 2010 19:28:32 +0000 (UTC)
commit dee3fa1c2a87f5d7ee52d1ca6db3033e6523cfd9
Author: Thorsten Vollmer <thorsten thvo de>
Date: Sat Feb 27 20:26:38 2010 +0100
Require and properly detect gtkmm24 version 2.16
* configure.ac: Define HAVE_GTKMM_2_16 if we have at least
gtkmm24 version 2.16.
* src/uicommon/nmv-ui-utils.h: Use Gtk::Action::set_is_important
only if HAVE_GTKMM_2_16 is defined.
configure.ac | 2 ++
src/uicommon/nmv-ui-utils.h | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7cf9e0f..ed432f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,6 +293,8 @@ NEMIVERUICOMMON_LIBS="$NEMIVERUICOMMON_LIBS $CPPUNIT_LIBS"
AC_SUBST(NEMIVERUICOMMON_LIBS)
AC_SUBST(NEMIVERUICOMMON_CFLAGS)
+PKG_CHECK_EXISTS([gtkmm-2.4 >= 2.16], [AC_DEFINE([HAVE_GTKMM_2_16], [1], [gtkmm is at least 2.16])])
+
dnl library dependencies for the nemiver workbench module
dnl dependencies list already declared above
diff --git a/src/uicommon/nmv-ui-utils.h b/src/uicommon/nmv-ui-utils.h
index 29a7395..3af255b 100644
--- a/src/uicommon/nmv-ui-utils.h
+++ b/src/uicommon/nmv-ui-utils.h
@@ -28,7 +28,7 @@
#ifndef __NEMIVER_UI_UTILS_H__
#define __NEMIVER_UI_UTILS_H__
-#include <gtk/gtk.h>
+#include "config.h"
#include <gtkmm.h>
#include <libglademm.h>
#include "common/nmv-env.h"
@@ -120,7 +120,7 @@ public:
default:
THROW ("should never reach this point");
}
-#if (GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 16)
+#ifdef HAVE_GTKMM_2_16
if (result)
result->set_is_important (m_is_important);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]