From e90a304edc7c8c9f808733bbaedd579162928752 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 12 Apr 2012 00:00:15 +0100
Subject: Clean up a few Gtkmm orientables

(bzr r11230)
---
 src/extension/param/bool.cpp          | 5 +++++
 src/ui/dialog/layers.h                | 4 ++++
 src/ui/dialog/livepatheffect-editor.h | 4 ++++
 src/ui/dialog/spellcheck.h            | 4 ++++
 src/ui/widget/panel.h                 | 1 +
 5 files changed, 18 insertions(+)

diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index ef0a06222..f7c4e6c0c 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -129,7 +129,12 @@ Gtk::Widget *ParamBool::get_widget(SPDocument * doc, Inkscape::XML::Node * node,
         return NULL;
     }
 
+#if WITH_GTKMM_3_0
+    Gtk::Box * hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 4));
+    hbox->set_homogeneous(false);
+#else
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
+#endif
 
 #if WITH_GTKMM_2_22
     Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h
index 0a6f683dd..7959d0e6e 100644
--- a/src/ui/dialog/layers.h
+++ b/src/ui/dialog/layers.h
@@ -109,7 +109,11 @@ private:
     std::vector<Gtk::Widget*> _watchingNonBottom;
 
     Gtk::TreeView _tree;
+#if WITH_GTKMM_3_0
+    Gtk::ButtonBox _buttonsRow;
+#else
     Gtk::HButtonBox _buttonsRow;
+#endif
     Gtk::ScrolledWindow _scroller;
     Gtk::Menu _popupMenu;
     Inkscape::UI::Widget::SpinButton _spinBtn;
diff --git a/src/ui/dialog/livepatheffect-editor.h b/src/ui/dialog/livepatheffect-editor.h
index 11ab8ea89..beebbc698 100644
--- a/src/ui/dialog/livepatheffect-editor.h
+++ b/src/ui/dialog/livepatheffect-editor.h
@@ -102,7 +102,11 @@ private:
 
     void on_visibility_toggled( Glib::ustring const& str );
 
+#if WITH_GTKMM_3_0
+    Gtk::ButtonBox toolbar_hbox;
+#else
     Gtk::HButtonBox toolbar_hbox;
+#endif
     Gtk::Button button_add;
     Gtk::Button button_remove;
     Gtk::Button button_up;
diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h
index 74d5b76e6..8eb240097 100644
--- a/src/ui/dialog/spellcheck.h
+++ b/src/ui/dialog/spellcheck.h
@@ -221,7 +221,11 @@ private:
      *  Dialogs widgets
      */
     Gtk::Label          banner_label;
+#if WITH_GTKMM_3_0
+    Gtk::ButtonBox      banner_hbox;
+#else
     Gtk::HButtonBox     banner_hbox;
+#endif
     Gtk::ScrolledWindow scrolled_window;
     Gtk::TreeView       tree_view;
     Glib::RefPtr<Gtk::ListStore> model;
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index 7b471c2ce..2d92d65c9 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -20,6 +20,7 @@
 #include <gtkmm/label.h>
 #include "enums.h"
 #include <vector>
+#include <map>
 
 class SPDesktop;
 class SPDocument;
-- 
cgit v1.2.3