From cebbe5b970cba85a5e21f8347f0a20e78351d394 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 28 Jul 2016 11:22:07 +0100
Subject: extensions: Drop GTKMM2 fallbacks

(bzr r15023.2.5)
---
 src/extension/extension.cpp | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

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

diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 6f7539360..5d150b703 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -22,12 +22,7 @@
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <gtkmm/frame.h>
-
-#if WITH_GTKMM_3_0
-# include <gtkmm/grid.h>
-#else
-# include <gtkmm/table.h>
-#endif
+#include <gtkmm/grid.h>
 
 #include <glibmm/i18n.h>
 #include "inkscape.h"
@@ -766,11 +761,7 @@ Extension::get_info_widget(void)
     Gtk::Frame * info = Gtk::manage(new Gtk::Frame("General Extension Information"));
     retval->pack_start(*info, true, true, 5);
 
-#if WITH_GTKMM_3_0
-    Gtk::Grid * table = Gtk::manage(new Gtk::Grid());
-#else
-    Gtk::Table * table = Gtk::manage(new Gtk::Table());
-#endif
+    auto table = Gtk::manage(new Gtk::Grid());
 
     info->add(*table);
 
@@ -784,11 +775,7 @@ Extension::get_info_widget(void)
     return retval;
 }
 
-#if WITH_GTKMM_3_0
 void Extension::add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Grid * table, int * row)
-#else
-void Extension::add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Table * table, int * row)
-#endif
 {
     Gtk::Label * label;
     Gtk::Label * value;
@@ -797,13 +784,8 @@ void Extension::add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Tab
     label = Gtk::manage(new Gtk::Label(labelstr));
     value = Gtk::manage(new Gtk::Label(valuestr));
 
-#if WITH_GTKMM_3_0
     table->attach(*label, 0, (*row) - 1, 1, 1);
     table->attach(*value, 1, (*row) - 1, 1, 1);
-#else
-    table->attach(*label, 0, 1, (*row) - 1, *row);
-    table->attach(*value, 1, 2, (*row) - 1, *row);
-#endif
 
     label->show();
     value->show();
-- 
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/extension/extension.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 6f7539360..56ff0a5f4 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
 #endif
 
 #include <gtkmm/box.h>
-- 
cgit v1.2.3