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/ui/dialog/layers.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/ui/dialog/layers.cpp')

diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 1c022ecad..77ced6d71 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -866,12 +866,8 @@ LayersPanel::LayersPanel() :
     _scroller.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC );
     _scroller.set_shadow_type(Gtk::SHADOW_IN);
     Gtk::Requisition sreq;
-#if WITH_GTKMM_3_0
     Gtk::Requisition sreq_natural;
     _scroller.get_preferred_size(sreq_natural, sreq);
-#else
-    sreq = _scroller.size_request();
-#endif
     int minHeight = 70;
     if (sreq.height < minHeight) {
         // Set a min height to see the layers when used with Ubuntu liboverlay-scrollbar
-- 
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/dialog/layers.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/ui/dialog/layers.cpp')

diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 1c022ecad..c75c631d7 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -10,16 +10,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include "config.h"
 #endif
 
 #include "layers.h"
-#include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/separatormenuitem.h>
-
-#include <glibmm/i18n.h>
 #include <glibmm/main.h>
 
 #include "desktop.h"
@@ -27,19 +24,14 @@
 #include "document.h"
 #include "document-undo.h"
 #include "helper/action.h"
-#include "helper/action-context.h"
 #include "inkscape.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
-#include "preferences.h"
-#include "sp-item.h"
-#include "sp-object.h"
 #include "svg/css-ostringstream.h"
 #include "ui/icon-names.h"
 #include "ui/widget/imagetoggler.h"
 #include "verbs.h"
 #include "widgets/icon.h"
-#include "xml/repr.h"
 #include "sp-root.h"
 #include "ui/tools/tool-base.h"
 #include "selection-chemistry.h"
-- 
cgit v1.2.3