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/ui/widget/panel.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/ui/widget/panel.cpp')

diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index ab13577d7..6ccd8b81a 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -12,20 +12,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
 #include <gtkmm/menu.h>
 #include <gtkmm/stock.h>
-#include <gtkmm/radiobutton.h>
-#include <gtkmm/radiomenuitem.h>
-#include <gtkmm/separatormenuitem.h>
 
 #include <glibmm/i18n.h>
 
-#include <gtk/gtk.h>
-
 #include "panel.h"
 #include "icon-size.h"
 #include "preferences.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/ui/widget/panel.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/ui/widget/panel.cpp')

diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 6ccd8b81a..ab13577d7 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -12,15 +12,20 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
 #include <gtkmm/menu.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/radiobutton.h>
+#include <gtkmm/radiomenuitem.h>
+#include <gtkmm/separatormenuitem.h>
 
 #include <glibmm/i18n.h>
 
+#include <gtk/gtk.h>
+
 #include "panel.h"
 #include "icon-size.h"
 #include "preferences.h"
-- 
cgit v1.2.3


From 58111034d09da960cf9982b703c6ab2647422e0b Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 28 Jul 2016 13:19:42 +0100
Subject: ui/widgets: Drop GTK2 fallbacks

(bzr r15023.2.6)
---
 src/ui/widget/panel.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/ui/widget/panel.cpp')

diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index ab13577d7..8f695013d 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -74,9 +74,7 @@ Panel::Panel(Glib::ustring const &label, gchar const *prefs_path,
     _fillable(0)
 {
     set_name( "InkscapePanel" );
-#if WITH_GTKMM_3_0
     set_orientation( Gtk::ORIENTATION_VERTICAL );
-#endif
     _init();
 }
 
@@ -598,13 +596,9 @@ void Panel::_addResponseButton(Gtk::Button *button, int response_id, bool pack_s
 {
     // Create a button box for the response buttons if it's the first button to be added
     if (!_action_area) {
-#if WITH_GTKMM_3_0
         _action_area = new Gtk::ButtonBox();
         _action_area->set_layout(Gtk::BUTTONBOX_END);
         _action_area->set_spacing(6);
-#else
-        _action_area = new Gtk::HButtonBox(Gtk::BUTTONBOX_END, 6);
-#endif
         _action_area->set_border_width(4);
         pack_end(*_action_area, Gtk::PACK_SHRINK, 0);
     }
-- 
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/ui/widget/panel.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/ui/widget/panel.cpp')

diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index ab13577d7..98d9d41f3 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -12,20 +12,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
 #include <gtkmm/menu.h>
 #include <gtkmm/stock.h>
-#include <gtkmm/radiobutton.h>
+#include <gtkmm/checkmenuitem.h>
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/separatormenuitem.h>
 
 #include <glibmm/i18n.h>
 
-#include <gtk/gtk.h>
-
 #include "panel.h"
 #include "icon-size.h"
 #include "preferences.h"
-- 
cgit v1.2.3