From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Thu, 28 Jul 2016 12:06:06 +0200
Subject: Removed unused includes, decrease compilation time

(bzr r15025)
---
 src/widgets/sp-attribute-widget.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/widgets/sp-attribute-widget.cpp')

diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index fb7eb1420..de44cdbb4 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -16,7 +16,6 @@
 
 #include <glibmm/i18n.h>
 #include <gtkmm/entry.h>
-#include <gtkmm/label.h>
 
 #if WITH_GTKMM_3_0
 # include <gtkmm/grid.h>
@@ -24,9 +23,6 @@
 # include <gtkmm/table.h>
 #endif
 
-#include <sigc++/functors/ptr_fun.h>
-#include <sigc++/adaptors/bind.h>
-
 #include "sp-object.h"
 #include "xml/repr.h"
 #include "macros.h"
-- 
cgit v1.2.3


From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Thu, 28 Jul 2016 13:26:17 +0200
Subject: Reverted changes to r15024 after many building problems

(bzr r15027)
---
 src/widgets/sp-attribute-widget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/widgets/sp-attribute-widget.cpp')

diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index de44cdbb4..fb7eb1420 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -16,6 +16,7 @@
 
 #include <glibmm/i18n.h>
 #include <gtkmm/entry.h>
+#include <gtkmm/label.h>
 
 #if WITH_GTKMM_3_0
 # include <gtkmm/grid.h>
@@ -23,6 +24,9 @@
 # include <gtkmm/table.h>
 #endif
 
+#include <sigc++/functors/ptr_fun.h>
+#include <sigc++/adaptors/bind.h>
+
 #include "sp-object.h"
 #include "xml/repr.h"
 #include "macros.h"
-- 
cgit v1.2.3


From dcd91f59f597ab4af07cee5929ce0e2e1f9104d5 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 28 Jul 2016 16:16:18 +0100
Subject: Drop remaining GTKMM 2 fallback support

(bzr r15023.2.7)
---
 src/widgets/sp-attribute-widget.cpp | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'src/widgets/sp-attribute-widget.cpp')

diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index fb7eb1420..2e782cf16 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -17,12 +17,7 @@
 #include <glibmm/i18n.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
-
-#if WITH_GTKMM_3_0
-# include <gtkmm/grid.h>
-#else
-# include <gtkmm/table.h>
-#endif
+#include <gtkmm/grid.h>
 
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
@@ -156,11 +151,7 @@ void SPAttributeTable::set_object(SPObject *object,
         release_connection  = object->connectRelease (sigc::bind<1>(sigc::ptr_fun(&sp_attribute_table_object_release), this));
 
         // Create table
-#if WITH_GTKMM_3_0
         table = new Gtk::Grid();
-#else
-        table = new Gtk::Table(attributes.size(), 2, false);
-#endif
 
         if (!(parent == NULL))
             gtk_container_add(GTK_CONTAINER(parent), (GtkWidget*)table->gobj());
@@ -171,27 +162,17 @@ void SPAttributeTable::set_object(SPObject *object,
             Gtk::Label *ll = new Gtk::Label (_(labels[i].c_str()));
             ll->show();
             ll->set_alignment (1.0, 0.5);
-
-#if WITH_GTKMM_3_0
             ll->set_vexpand();
             ll->set_margin_left(XPAD);
             ll->set_margin_right(XPAD);
             ll->set_margin_top(XPAD);
             ll->set_margin_bottom(XPAD);
             table->attach(*ll, 0, i, 1, 1);
-#else
-            table->attach (*ll, 0, 1, i, i + 1,
-                               Gtk::FILL,
-                               (Gtk::EXPAND | Gtk::FILL),
-                               XPAD, YPAD );
-#endif
 
             Gtk::Entry *ee = new Gtk::Entry();
             ee->show();
             const gchar *val = object->getRepr()->attribute(attributes[i].c_str());
             ee->set_text (val ? val : (const gchar *) "");
-
-#if WITH_GTKMM_3_0
             ee->set_hexpand();
             ee->set_vexpand();
             ee->set_margin_left(XPAD);
@@ -199,12 +180,6 @@ void SPAttributeTable::set_object(SPObject *object,
             ee->set_margin_top(XPAD);
             ee->set_margin_bottom(XPAD);
             table->attach(*ee, 1, i, 1, 1);
-#else
-            table->attach (*ee, 1, 2, i, i + 1,
-                               (Gtk::EXPAND | Gtk::FILL),
-                               (Gtk::EXPAND | Gtk::FILL),
-                               XPAD, YPAD );
-#endif
 
             _entries.push_back(ee);
             g_signal_connect ( ee->gobj(), "changed",
-- 
cgit v1.2.3


From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Wed, 3 Aug 2016 15:29:38 +0200
Subject: Removed unused includes, decreased compilation time. Once again

(bzr r15034)
---
 src/widgets/sp-attribute-widget.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/widgets/sp-attribute-widget.cpp')

diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index fb7eb1420..de44cdbb4 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -16,7 +16,6 @@
 
 #include <glibmm/i18n.h>
 #include <gtkmm/entry.h>
-#include <gtkmm/label.h>
 
 #if WITH_GTKMM_3_0
 # include <gtkmm/grid.h>
@@ -24,9 +23,6 @@
 # include <gtkmm/table.h>
 #endif
 
-#include <sigc++/functors/ptr_fun.h>
-#include <sigc++/adaptors/bind.h>
-
 #include "sp-object.h"
 #include "xml/repr.h"
 #include "macros.h"
-- 
cgit v1.2.3