Hackfest2019: Get rid of deprecated InkSelectOneAction

2 files changed, 18 insertions, 13 deletions

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index c48d6fbd5..2b5abd0b6 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -60,7 +60,6 @@
 #include "ui/uxmanager.h"
 #include "ui/widget/button.h"
 #include "ui/widget/dock.h"
-#include "ui/widget/ink-select-one-action.h"
 #include "ui/widget/layer-selector.h"
 #include "ui/widget/selected-style.h"
 #include "ui/widget/spin-button-tool-item.h"
@@ -1513,6 +1512,22 @@ void SPDesktopWidget::layoutWidgets()
     }
 }
 
+Gtk::Toolbar *
+SPDesktopWidget::get_toolbar_by_name(const Glib::ustring& name)
+{
+    // The name is actually attached to the GtkGrid that contains
+    // the toolbar, so we need to get the grid first
+    auto widget = sp_search_by_name_recursive(Glib::wrap(aux_toolbox), name);
+    auto grid = dynamic_cast<Gtk::Grid*>(widget);
+
+    if (!grid) return nullptr;
+
+    auto child = grid->get_child_at(0,0);
+    auto tb = dynamic_cast<Gtk::Toolbar*>(child);
+
+    return tb;
+}
+
 void
 SPDesktopWidget::setToolboxFocusTo (const gchar* label)
 {
@@ -1551,15 +1566,6 @@ SPDesktopWidget::setToolboxAdjustmentValue (gchar const *id, double value)
     else g_warning ("Could not find GtkAdjustment for %s\n", id);
 }
 
-void
-SPDesktopWidget::setToolboxSelectOneValue (gchar const *id, int value)
-{
-    gpointer hb = sp_search_by_data_recursive(aux_toolbox, (gpointer) id);
-    if (static_cast<InkSelectOneAction*>(hb)) {
-        static_cast<InkSelectOneAction*>(hb)->set_active( value );
-    }
-}
-
 
 bool
 SPDesktopWidget::isToolboxButtonActive (const gchar* id)
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index f0b42222d..65e41fa39 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -218,11 +218,10 @@ public:
         void updateZoom() override { _dtw->update_zoom(); }
         void letZoomGrabFocus() override { _dtw->letZoomGrabFocus(); }
         void updateRotation() override { _dtw->update_rotation(); }
+        Gtk::Toolbar* get_toolbar_by_name(const Glib::ustring& name) override {return _dtw->get_toolbar_by_name(name);}
         void setToolboxFocusTo(const gchar *id) override { _dtw->setToolboxFocusTo(id); }
         void setToolboxAdjustmentValue(const gchar *id, double val) override
         { _dtw->setToolboxAdjustmentValue (id, val); }
-        void setToolboxSelectOneValue (gchar const *id, int val) override
-        { _dtw->setToolboxSelectOneValue (id, val); }
         bool isToolboxButtonActive (gchar const* id) override
         { return _dtw->isToolboxButtonActive (id); }
         void setCoordinateStatus (Geom::Point p) override
@@ -255,9 +254,9 @@ public:
     void presentWindow();
     bool showInfoDialog( Glib::ustring const &message );
     bool warnDialog (Glib::ustring const &text);
+    Gtk::Toolbar* get_toolbar_by_name(const Glib::ustring& name);
     void setToolboxFocusTo (gchar const *);
     void setToolboxAdjustmentValue (gchar const * id, double value);
-    void setToolboxSelectOneValue (gchar const * id, gint value);
     bool isToolboxButtonActive (gchar const *id);
     void setToolboxPosition(Glib::ustring const& id, GtkPositionType pos);
     void setCoordinateStatus(Geom::Point p);