[gnote] Bump to Gtkmm 3.4
- From: Aurimas Äernius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Bump to Gtkmm 3.4
- Date: Sat, 23 Jun 2012 12:33:30 +0000 (UTC)
commit 3281ba6d5d600783842640d23b95e830a966a5a1
Author: Aurimas Äernius <aurisc4 gmail com>
Date: Tue Jun 19 20:12:09 2012 +0300
Bump to Gtkmm 3.4
configure.ac | 7 +------
src/recentchanges.hpp | 11 ++---------
2 files changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 153bc1c..4ad44cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl if one is harcoded elsewhere, it is a bug
GTK_VERSION=3.0
LIBGLIBMM_VERSION=2.28
-LIBGTKMM_VERSION=3.0
+LIBGTKMM_VERSION=3.4
GTKSPELL_VERSION=2.0.9
BOOST_VERSION=1.34
GNOME_KEYRING_VERSION=3.0
@@ -65,11 +65,6 @@ AC_LANG_COMPILER_REQUIRE
PKG_CHECK_MODULES(LIBGLIBMM, [glibmm-2.4])
PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_VERSION])
PKG_CHECK_MODULES(LIBGTKMM, [gtkmm-3.0 >= $LIBGTKMM_VERSION])
-# Check for gtkmm 3.4 or higher for extra features
-PKG_CHECK_EXISTS(gtkmm-3.0 >= 3.4,
- [
- AC_DEFINE(HAVE_GTKMM_3_4, 1, [Define to 1 if gtkmm version is at least 3.4])
- ])
# Check for glib 2.32 or higher, which have certain incompatibilities with older ones
PKG_CHECK_EXISTS(glib-2.0 >= 2.32,
[
diff --git a/src/recentchanges.hpp b/src/recentchanges.hpp
index d161de9..6fa0e85 100644
--- a/src/recentchanges.hpp
+++ b/src/recentchanges.hpp
@@ -44,10 +44,7 @@
#include <gtkmm/treemodelsort.h>
#include <gtkmm/treepath.h>
#include <gtkmm/treeview.h>
-
-#if HAVE_GTKMM_3_4
- #include <gtkmm/applicationwindow.h>
-#endif
+#include <gtkmm/applicationwindow.h>
#include "note.hpp"
#include "tag.hpp"
@@ -60,11 +57,7 @@ namespace gnote {
}
class NoteManager;
-#if HAVE_GTKMM_3_4
- typedef utils::ForcedPresentWindow<Gtk::ApplicationWindow> NoteRecentChangesParent;
-#else
- typedef utils::ForcedPresentWindow<Gtk::Window> NoteRecentChangesParent;
-#endif
+typedef utils::ForcedPresentWindow<Gtk::ApplicationWindow> NoteRecentChangesParent;
class NoteRecentChanges
: public NoteRecentChangesParent
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]