Cleanup GSEAL issues and deprecated GtkTooltips

(bzr r10826)

22 files changed, 31 insertions, 44 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index e040eec32..fbd3c90bd 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -551,7 +551,7 @@ Effect::addCanvasIndicators(SPLPEItem */*lpeitem*/, std::vector<Geom::PathVector
  * This *creates* a new widget, management of deletion should be done by the caller
  */
 Gtk::Widget *
-Effect::newWidget(Gtk::Tooltips * tooltips)
+Effect::newWidget()
 {
     // use manage here, because after deletion of Effect object, others might still be pointing to this widget.
     Gtk::VBox * vbox = Gtk::manage( new Gtk::VBox() );
@@ -562,12 +562,12 @@ Effect::newWidget(Gtk::Tooltips * tooltips)
     while (it != param_vector.end()) {
         if ((*it)->widget_is_visible) {
             Parameter * param = *it;
-            Gtk::Widget * widg = param->param_newWidget(tooltips);
+            Gtk::Widget * widg = param->param_newWidget();
             Glib::ustring * tip = param->param_getTooltip();
             if (widg) {
                 vbox->pack_start(*widg, true, true, 2);
                 if (tip != NULL) {
-                    tooltips->set_tip(*widg, *tip);
+                    widg->set_tooltip_text(*tip);
                 }
             }
         }
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 48577c225..b80625c9f 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -33,7 +33,6 @@ struct SPCurve;
 namespace Gtk {
     class Widget;
     class VBox;
-    class Tooltips;
 }
 
 namespace Inkscape {
@@ -84,7 +83,7 @@ public:
 
     virtual void doEffect (SPCurve * curve);
 
-    virtual Gtk::Widget * newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * newWidget();
 
     /**
      * Sets all parameters to their default values and writes them to SVG.
diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index 45db19e7f..a600f0257 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -13,8 +13,6 @@
 
 #include <glib.h>
 
-#include <gtkmm/tooltips.h>
-
 #include "live_effects/parameter/parameter.h"
 
 #include "svg/svg.h"
@@ -46,7 +44,7 @@ public:
         return _vector;
     }
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * /*tooltips*/) {
+    virtual Gtk::Widget * param_newWidget() {
         return NULL;
     }
 
diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index 505a70493..c38a5864f 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -53,7 +53,7 @@ BoolParam::param_getSVGValue() const
 }
 
 Gtk::Widget *
-BoolParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
+BoolParam::param_newWidget()
 {
     Inkscape::UI::Widget::RegisteredCheckButton * checkwdg = Gtk::manage(
         new Inkscape::UI::Widget::RegisteredCheckButton( param_label,
diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h
index 851476f13..d7aa299aa 100644
--- a/src/live_effects/parameter/bool.h
+++ b/src/live_effects/parameter/bool.h
@@ -28,7 +28,7 @@ public:
                bool default_value = false);
     virtual ~BoolParam();
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * param_newWidget();
 
     virtual bool param_readSVGValue(const gchar * strvalue);
     virtual gchar * param_getSVGValue() const;
diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h
index 2d2268ea9..40d29b7a7 100644
--- a/src/live_effects/parameter/enum.h
+++ b/src/live_effects/parameter/enum.h
@@ -12,7 +12,6 @@
 #include <glib.h>
 
 #include "ui/widget/registered-enums.h"
-#include <gtkmm/tooltips.h>
 
 #include "live_effects/effect.h"
 #include "live_effects/parameter/parameter.h"
@@ -40,7 +39,7 @@ public:
 
     virtual ~EnumParam() { };
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * /*tooltips*/) {
+    virtual Gtk::Widget * param_newWidget() {
         Inkscape::UI::Widget::RegisteredEnum<E> *regenum = Gtk::manage ( 
             new Inkscape::UI::Widget::RegisteredEnum<E>( param_label, param_tooltip,
                        param_key, *enumdataconv, *param_wr, param_effect->getRepr(), param_effect->getSPDoc() ) );
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index cc8982860..8c08ca684 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -125,7 +125,7 @@ ScalarParam::param_make_integer(bool yes)
 }
 
 Gtk::Widget *
-ScalarParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
+ScalarParam::param_newWidget()
 {
     Inkscape::UI::Widget::RegisteredScalar *rsu = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalar(
         param_label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc() ) );
diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index 92c2c8b41..4785d5455 100644
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -20,7 +20,6 @@ class SPItem;
 
 namespace Gtk {
     class Widget;
-    class Tooltips;
 }
 
 namespace Inkscape {
@@ -55,7 +54,7 @@ public:
     virtual void param_set_default() = 0;
 
     // This creates a new widget (newed with Gtk::manage(new ...);)
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips) = 0;
+    virtual Gtk::Widget * param_newWidget() = 0;
 
     virtual Glib::ustring * param_getTooltip() { return &param_tooltip; };
 
@@ -111,7 +110,7 @@ public:
 
     void addSlider(bool add_slider_widget) { add_slider = add_slider_widget; };
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * param_newWidget();
 
     inline operator gdouble()
         { return value; };
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 32da0a426..8188ea19a 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -140,13 +140,13 @@ PathParam::param_getSVGValue() const
 }
 
 Gtk::Widget *
-PathParam::param_newWidget(Gtk::Tooltips * tooltips)
+PathParam::param_newWidget()
 {
     Gtk::HBox * _widget = Gtk::manage(new Gtk::HBox());
 
     Gtk::Label* pLabel = Gtk::manage(new Gtk::Label(param_label));
     static_cast<Gtk::HBox*>(_widget)->pack_start(*pLabel, true, true);
-    tooltips->set_tip(*pLabel, param_tooltip);
+    pLabel->set_tooltip_text(param_tooltip);
 
     Gtk::Widget*  pIcon = Gtk::manage( sp_icon_get_icon( "tool-node-editor", Inkscape::ICON_SIZE_BUTTON) );
     Gtk::Button * pButton = Gtk::manage(new Gtk::Button());
@@ -156,7 +156,7 @@ PathParam::param_newWidget(Gtk::Tooltips * tooltips)
     pButton->show();
     pButton->signal_clicked().connect(sigc::mem_fun(*this, &PathParam::on_edit_button_click));
     static_cast<Gtk::HBox*>(_widget)->pack_start(*pButton, true, true);
-    tooltips->set_tip(*pButton, _("Edit on-canvas"));
+    pButton->set_tooltip_text(_("Edit on-canvas"));
 
     pIcon = Gtk::manage( sp_icon_get_icon( GTK_STOCK_COPY, Inkscape::ICON_SIZE_BUTTON) );
     pButton = Gtk::manage(new Gtk::Button());
@@ -166,7 +166,7 @@ PathParam::param_newWidget(Gtk::Tooltips * tooltips)
     pButton->show();
     pButton->signal_clicked().connect(sigc::mem_fun(*this, &PathParam::on_copy_button_click));
     static_cast<Gtk::HBox*>(_widget)->pack_start(*pButton, true, true);
-    tooltips->set_tip(*pButton, _("Copy path"));
+    pButton->set_tooltip_text(_("Copy path"));
 
     pIcon = Gtk::manage( sp_icon_get_icon( GTK_STOCK_PASTE, Inkscape::ICON_SIZE_BUTTON) );
     pButton = Gtk::manage(new Gtk::Button());
@@ -176,7 +176,7 @@ PathParam::param_newWidget(Gtk::Tooltips * tooltips)
     pButton->show();
     pButton->signal_clicked().connect(sigc::mem_fun(*this, &PathParam::on_paste_button_click));
     static_cast<Gtk::HBox*>(_widget)->pack_start(*pButton, true, true);
-    tooltips->set_tip(*pButton, _("Paste path"));
+    pButton->set_tooltip_text(_("Paste path"));
 
     pIcon = Gtk::manage( sp_icon_get_icon( "edit-clone", Inkscape::ICON_SIZE_BUTTON) );
     pButton = Gtk::manage(new Gtk::Button());
@@ -186,7 +186,7 @@ PathParam::param_newWidget(Gtk::Tooltips * tooltips)
     pButton->show();
     pButton->signal_clicked().connect(sigc::mem_fun(*this, &PathParam::on_link_button_click));
     static_cast<Gtk::HBox*>(_widget)->pack_start(*pButton, true, true);
-    tooltips->set_tip(*pButton, _("Link to path"));
+    pButton->set_tooltip_text(_("Link to path"));
 
     static_cast<Gtk::HBox*>(_widget)->show_all_children();
 
diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h
index 0a35014ab..854c29708 100644
--- a/src/live_effects/parameter/path.h
+++ b/src/live_effects/parameter/path.h
@@ -12,8 +12,6 @@
 #include <glib.h>
 #include <2geom/path.h>
 
-#include <gtkmm/tooltips.h>
-
 #include "live_effects/parameter/parameter.h"
 #include "live_effects/parameter/path-reference.h"
 #include <stddef.h>
@@ -36,7 +34,7 @@ public:
     std::vector<Geom::Path> const & get_pathvector();
     Geom::Piecewise<Geom::D2<Geom::SBasis> > const & get_pwd2();
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * param_newWidget();
 
     virtual bool param_readSVGValue(const gchar * strvalue);
     virtual gchar * param_getSVGValue() const;
diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index 550a8517c..c7dc4b5cd 100644
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -73,7 +73,7 @@ PointParam::param_getSVGValue() const
 }
 
 Gtk::Widget *
-PointParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
+PointParam::param_newWidget()
 {
     Inkscape::UI::Widget::RegisteredTransformedPoint * pointwdg = Gtk::manage(
         new Inkscape::UI::Widget::RegisteredTransformedPoint( param_label,
diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h
index 9ea06bce8..f2397753e 100644
--- a/src/live_effects/parameter/point.h
+++ b/src/live_effects/parameter/point.h
@@ -12,8 +12,6 @@
 #include <glib.h>
 #include <2geom/point.h>
 
-#include <gtkmm/tooltips.h>
-
 #include "live_effects/parameter/parameter.h"
 
 #include "knot-holder-entity.h"
@@ -34,7 +32,7 @@ public:
 		Geom::Point default_value = Geom::Point(0,0) ); // tip for automatically associated on-canvas handle
     virtual ~PointParam();
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * param_newWidget();
 
     bool param_readSVGValue(const gchar * strvalue);
     gchar * param_getSVGValue() const;
diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp
index fccbad7e5..566030f31 100644
--- a/src/live_effects/parameter/powerstrokepointarray.cpp
+++ b/src/live_effects/parameter/powerstrokepointarray.cpp
@@ -42,7 +42,7 @@ PowerStrokePointArrayParam::~PowerStrokePointArrayParam()
 }
 
 Gtk::Widget *
-PowerStrokePointArrayParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
+PowerStrokePointArrayParam::param_newWidget()
 {
     return NULL;
 /*
diff --git a/src/live_effects/parameter/powerstrokepointarray.h b/src/live_effects/parameter/powerstrokepointarray.h
index b00e69e76..785f86498 100644
--- a/src/live_effects/parameter/powerstrokepointarray.h
+++ b/src/live_effects/parameter/powerstrokepointarray.h
@@ -12,8 +12,6 @@
 #include <glib.h>
 #include <2geom/point.h>
 
-#include <gtkmm/tooltips.h>
-
 #include "live_effects/parameter/array.h"
 
 #include "knot-holder-entity.h"
@@ -34,7 +32,7 @@ public:
                 const gchar *handle_tip = NULL); // tip for automatically associated on-canvas handle
     virtual ~PowerStrokePointArrayParam();
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * param_newWidget();
 
     virtual void param_transform_multiply(Geom::Affine const& /*postmul*/, bool /*set*/);
 
diff --git a/src/live_effects/parameter/random.cpp b/src/live_effects/parameter/random.cpp
index d5a6e9291..847a946a0 100644
--- a/src/live_effects/parameter/random.cpp
+++ b/src/live_effects/parameter/random.cpp
@@ -115,7 +115,7 @@ RandomParam::resetRandomizer()
 
 
 Gtk::Widget *
-RandomParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
+RandomParam::param_newWidget()
 {
     Inkscape::UI::Widget::RegisteredRandom* regrandom = Gtk::manage(
         new Inkscape::UI::Widget::RegisteredRandom( param_label,
diff --git a/src/live_effects/parameter/random.h b/src/live_effects/parameter/random.h
index 4417a8126..b72f6f976 100644
--- a/src/live_effects/parameter/random.h
+++ b/src/live_effects/parameter/random.h
@@ -33,7 +33,7 @@ public:
     virtual gchar * param_getSVGValue() const;
     virtual void param_set_default();
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * param_newWidget();
 
     void param_set_value(gdouble val, long newseed);
     void param_make_integer(bool yes = true);
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 2c17a23a5..8b77427c4 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -92,7 +92,7 @@ TextParam::param_getSVGValue() const
 }
 
 Gtk::Widget *
-TextParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
+TextParam::param_newWidget()
 {
     Inkscape::UI::Widget::RegisteredText *rsu = Gtk::manage(new Inkscape::UI::Widget::RegisteredText(
         param_label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc()));
diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h
index 82654303b..85833885e 100644
--- a/src/live_effects/parameter/text.h
+++ b/src/live_effects/parameter/text.h
@@ -34,7 +34,7 @@ public:
                const Glib::ustring default_value = "");
     virtual ~TextParam() {}
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * param_newWidget();
 
     virtual bool param_readSVGValue(const gchar * strvalue);
     virtual gchar * param_getSVGValue() const;
@@ -71,7 +71,7 @@ public:
     TextParamInternal(Effect* effect) :
         TextParam("", "", "", NULL, effect) {}
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * /*tooltips*/) { return NULL; }
+    virtual Gtk::Widget * param_newWidget() { return NULL; }
 };
 
 } //namespace LivePathEffect
diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp
index 1ec15e337..2fba6412a 100644
--- a/src/live_effects/parameter/unit.cpp
+++ b/src/live_effects/parameter/unit.cpp
@@ -64,7 +64,7 @@ UnitParam::get_abbreviation()
 }
 
 Gtk::Widget *
-UnitParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
+UnitParam::param_newWidget()
 {
     Inkscape::UI::Widget::RegisteredUnitMenu* unit_menu = Gtk::manage(
         new Inkscape::UI::Widget::RegisteredUnitMenu(param_label,
diff --git a/src/live_effects/parameter/unit.h b/src/live_effects/parameter/unit.h
index 15192b074..3d417fcd6 100644
--- a/src/live_effects/parameter/unit.h
+++ b/src/live_effects/parameter/unit.h
@@ -32,7 +32,7 @@ public:
     void param_set_value(SPUnit const *val);
     const gchar *get_abbreviation();
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * param_newWidget();
 
     operator SPUnit const *() { return unit; }
 
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index 6d0824ae0..c5232c360 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -84,7 +84,7 @@ VectorParam::param_getSVGValue() const
 }
 
 Gtk::Widget *
-VectorParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
+VectorParam::param_newWidget()
 {
     Inkscape::UI::Widget::RegisteredVector * pointwdg = Gtk::manage(
         new Inkscape::UI::Widget::RegisteredVector( param_label,
diff --git a/src/live_effects/parameter/vector.h b/src/live_effects/parameter/vector.h
index 8afc05699..5d6d1c932 100644
--- a/src/live_effects/parameter/vector.h
+++ b/src/live_effects/parameter/vector.h
@@ -12,8 +12,6 @@
 #include <glib.h>
 #include <2geom/point.h>
 
-#include <gtkmm/tooltips.h>
-
 #include "live_effects/parameter/parameter.h"
 
 #include "knot-holder-entity.h"
@@ -33,7 +31,7 @@ public:
                 Geom::Point default_vector = Geom::Point(1,0) );
     virtual ~VectorParam();
 
-    virtual Gtk::Widget * param_newWidget(Gtk::Tooltips * tooltips);
+    virtual Gtk::Widget * param_newWidget();
     inline const gchar *handleTip() const { return param_tooltip.c_str(); }
 
     virtual bool param_readSVGValue(const gchar * strvalue);