From e77e650354daef5ced80adddf6d5a334bb6216d3 Mon Sep 17 00:00:00 2001
From: Alexander Valavanis <valavanisalex@gmail.com>
Date: Sat, 19 Jan 2019 13:58:46 +0000
Subject: derive all toolbars from Inkscape::Toolbar

---
 src/widgets/toolbox.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/widgets/toolbox.h')

diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index 4a61a7892..2236a7ab1 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -84,7 +84,10 @@ public:
      * @param callback function to invoke when changes are pushed.
      * @param cbData data to be passed on to the callback function.
      */
-    PrefPusher( GtkToggleAction *act, Glib::ustring const &path, void (*callback)(GObject*) = nullptr, GObject *cbData = nullptr );
+    PrefPusher( GtkToggleAction       *act,
+                Glib::ustring const &  path,
+                void (*callback)(gpointer) = nullptr,
+                gpointer cbData = nullptr );
 
     /**
      * Destructor that unregisters the preference callback.
@@ -112,8 +115,8 @@ private:
     void handleToggled();
 
     GtkToggleAction *act;
-    void (*callback)(GObject*);
-    GObject *cbData;
+    void (*callback)(gpointer);
+    gpointer cbData;
     bool freeze;
 };
 
-- 
cgit v1.2.3