From 2c9a5721cf6dd4f10ebfb2a06eb7663c4fc120d9 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 22 May 2012 23:27:35 +0100
Subject: Drop deprecated GtkNotebookPage usage

(bzr r11401)
---
 src/extension/param/notebook.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/extension/param/notebook.cpp')

diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index ee7f15004..b4d4cbd16 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -352,7 +352,11 @@ public:
         // hook function
         this->signal_switch_page().connect(sigc::mem_fun(this, &ParamNotebookWdg::changed_page));
     };
+#if WITH_GTKMM_3_0
+    void changed_page(Gtk::Widget *page, guint pagenum);
+#else
     void changed_page(GtkNotebookPage *page, guint pagenum);
+#endif
     bool activated;
 };
 
@@ -363,8 +367,11 @@ public:
  * is actually visible. This to exclude 'fake' changes when the
  * notebookpages are added or removed.
  */
-void ParamNotebookWdg::changed_page(GtkNotebookPage */*page*/,
-                                    guint pagenum)
+#if WITH_GTKMM_3_0
+void ParamNotebookWdg::changed_page(Gtk::Widget * /*page*/, guint pagenum)
+#else
+void ParamNotebookWdg::changed_page(GtkNotebookPage * /*page*/, guint pagenum)
+#endif
 {
     if (get_visible()) {
         _pref->set((int)pagenum, _doc, _node);
-- 
cgit v1.2.3


From 945ac20edd7d4bf9dd14799bc555e202e9379791 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sun, 16 Dec 2012 10:24:39 +0100
Subject: Extensions. Fix for Bug #1089814 (INX: hidden parameter inside a
 notebook page triggers crash).

(bzr r11956)
---
 src/extension/param/notebook.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/extension/param/notebook.cpp')

diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index b4d4cbd16..85cb5d04c 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -206,14 +206,16 @@ Gtk::Widget * ParamNotebookPage::get_widget(SPDocument * doc, Inkscape::XML::Nod
     for (GSList * list = parameters; list != NULL; list = g_slist_next(list)) {
         Parameter * param = reinterpret_cast<Parameter *>(list->data);
         Gtk::Widget * widg = param->get_widget(doc, node, changeSignal);
-        gchar const * tip = param->get_tooltip();
-//        printf("Tip: '%s'\n", tip);
-        vbox->pack_start(*widg, false, false, 2);
-        if (tip) {
-            widg->set_tooltip_text(tip);
-        } else {
-            widg->set_tooltip_text("");
-            widg->set_has_tooltip(false);
+        if (widg) {
+            gchar const * tip = param->get_tooltip();
+    //        printf("Tip: '%s'\n", tip);
+            vbox->pack_start(*widg, false, false, 2);
+            if (tip) {
+                widg->set_tooltip_text(tip);
+            } else {
+                widg->set_tooltip_text("");
+                widg->set_has_tooltip(false);
+            }
         }
     }
 
-- 
cgit v1.2.3


From 3c82e8251460b21c8046a418a9fefb700db0a164 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Tue, 4 Jun 2013 01:52:40 -0700
Subject: Correct to compile against recent gtkmm, including updated macports
 versions. Fixes bug #1179338.

Fixed bugs:
  - https://launchpad.net/bugs/1179338

(bzr r12346.1.1)
---
 src/extension/param/notebook.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/extension/param/notebook.cpp')

diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index 85cb5d04c..b887be717 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -16,6 +16,7 @@
 # include "config.h"
 #endif
 
+#include <glibmm/threads.h>
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-- 
cgit v1.2.3


From 72d8e897c6b67e46b2a613c4743ef9c13de25059 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Thu, 6 Jun 2013 06:44:11 -0700
Subject: Added configure/ifdef guards to only bring in the needed #include if
 glibmm has it.

(bzr r12353)
---
 src/extension/param/notebook.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/extension/param/notebook.cpp')

diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index b887be717..97002e33f 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -16,7 +16,9 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-- 
cgit v1.2.3