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/style-swatch.cpp | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'src/ui/widget/style-swatch.cpp')

diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 188be705d..21701c4c0 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -34,11 +34,7 @@
 #include "verbs.h"
 #include <glibmm/i18n.h>
 
-#if WITH_GTKMM_3_0
-# include <gtkmm/grid.h>
-#else
-# include <gtkmm/table.h>
-#endif
+#include <gtkmm/grid.h>
 
 enum {
     SS_FILL,
@@ -117,11 +113,7 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
       _css(NULL),
       _tool_obs(NULL),
       _style_obs(NULL),
-#if WITH_GTKMM_3_0
       _table(Gtk::manage(new Gtk::Grid())),
-#else
-      _table(Gtk::manage(new Gtk::Table(2, 6))),
-#endif
       _sw_unit(NULL)
 {
     set_name("StyleSwatch");
@@ -139,13 +131,8 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
     _opacity_value.set_alignment(0.0, 0.5);
     _opacity_value.set_padding(0, 0);
 
-#if WITH_GTKMM_3_0
     _table->set_column_spacing(2);
     _table->set_row_spacing(0);
-#else
-    _table->set_col_spacings(2);
-    _table->set_row_spacings(0);
-#endif
 
     _stroke.pack_start(_place[SS_STROKE]);
     _stroke_width_place.add(_stroke_width);
@@ -153,19 +140,11 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
     
     _opacity_place.add(_opacity_value);
 
-#if WITH_GTKMM_3_0
     _table->attach(_label[SS_FILL],   0, 0, 1, 1);
     _table->attach(_label[SS_STROKE], 0, 1, 1, 1);
     _table->attach(_place[SS_FILL],   1, 0, 1, 1);
     _table->attach(_stroke,           1, 1, 1, 1);
     _table->attach(_opacity_place,    2, 0, 1, 2);
-#else
-    _table->attach(_label[SS_FILL], 0,1, 0,1, Gtk::FILL, Gtk::SHRINK);
-    _table->attach(_label[SS_STROKE], 0,1, 1,2, Gtk::FILL, Gtk::SHRINK);
-    _table->attach(_place[SS_FILL], 1,2, 0,1);
-    _table->attach(_stroke, 1,2, 1,2);
-    _table->attach(_opacity_place, 2,3, 0,2, Gtk::SHRINK, Gtk::SHRINK);
-#endif
 
     _swatch.add(*_table);
     pack_start(_swatch, true, true, 0);
-- 
cgit v1.2.3