From bcfec16e05533d0fd11134c7712ca213835d5f84 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Mon, 26 Dec 2016 19:19:37 +0000
Subject: frame: Gtk3 fixes

(bzr r15361)
---
 src/ui/dialog/text-edit.h |  1 +
 src/ui/widget/frame.cpp   | 30 +++++++++++++++++++-----------
 src/ui/widget/frame.h     |  3 ---
 3 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h
index e974874d2..1fc0099fb 100644
--- a/src/ui/dialog/text-edit.h
+++ b/src/ui/dialog/text-edit.h
@@ -22,6 +22,7 @@
 # include <config.h>
 #endif
 
+#include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/button.h>
diff --git a/src/ui/widget/frame.cpp b/src/ui/widget/frame.cpp
index 65d10dcc4..6593d9c7c 100644
--- a/src/ui/widget/frame.cpp
+++ b/src/ui/widget/frame.cpp
@@ -21,26 +21,20 @@ namespace UI {
 namespace Widget {
 
 Frame::Frame(Glib::ustring const &label_text /*= ""*/, gboolean label_bold /*= TRUE*/ )
-    : _label(label_text, 1.0, 0.5, TRUE),
-      _alignment()
+    : _label(label_text, 1.0, 0.5, TRUE)
 {
     set_shadow_type(Gtk::SHADOW_NONE);
 
-    //Put an indented GtkAlignment inside the frame.
-    //Further children should be children of this GtkAlignment:
-    Gtk::Frame::add(_alignment);
-    set_padding(4, 0, 8, 0);
-
     set_label_widget(_label);
     set_label(label_text, label_bold);
-
-    show_all_children();
 }
 
 void
 Frame::add(Widget& widget)
 {
-    _alignment.add(widget);
+    Gtk::Frame::add(widget);
+    set_padding(4, 0, 8, 0);
+    show_all_children();
 }
 
 void
@@ -56,7 +50,21 @@ Frame::set_label(const Glib::ustring &label_text, gboolean label_bold /*= TRUE*/
 void
 Frame::set_padding (guint padding_top, guint padding_bottom, guint padding_left, guint padding_right)
 {
-    _alignment.set_padding(padding_top, padding_bottom, padding_left, padding_right);
+    auto child = get_child();
+
+    if(child)
+    {
+        child->set_margin_top(padding_top);
+        child->set_margin_bottom(padding_bottom);
+
+#if GTK_CHECK_VERSION(3,12,0)
+        child->set_margin_start(padding_left);
+        child->set_margin_end(padding_right);
+#else
+        child->set_margin_left(padding_left);
+        child->set_margin_right(padding_right);
+#endif
+    }
 }
 
 Gtk::Label const *
diff --git a/src/ui/widget/frame.h b/src/ui/widget/frame.h
index a04666651..24dd716e6 100644
--- a/src/ui/widget/frame.h
+++ b/src/ui/widget/frame.h
@@ -10,7 +10,6 @@
 #ifndef INKSCAPE_UI_WIDGET_FRAME_H
 #define INKSCAPE_UI_WIDGET_FRAME_H
 
-#include <gtkmm/alignment.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/label.h>
 
@@ -55,8 +54,6 @@ public:
 
 protected:
     Gtk::Label   _label;
-    Gtk::Alignment _alignment;
-
 };
 
 } // namespace Widget
-- 
cgit v1.2.3