More deprecated GtkTooltips

(bzr r10827)

19 files changed, 63 insertions, 116 deletions

diff --git a/src/ui/widget/attr-widget.h b/src/ui/widget/attr-widget.h
index e874f4d52..7c7235386 100644
--- a/src/ui/widget/attr-widget.h
+++ b/src/ui/widget/attr-widget.h
@@ -14,7 +14,6 @@
 #include "attributes.h"
 #include "sp-object.h"
 #include "xml/node.h"
-#include <gtkmm/tooltips.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/button.h b/src/ui/widget/button.h
index 8dc9d73cb..a7d7dfb95 100644
--- a/src/ui/widget/button.h
+++ b/src/ui/widget/button.h
@@ -10,9 +10,7 @@
 #ifndef INKSCAPE_UI_WIDGET_BUTTON_H
 #define INKSCAPE_UI_WIDGET_BUTTON_H
 
-#include <gtkmm/button.h>
-#include <gtkmm/checkbutton.h>
-#include <gtkmm/tooltips.h>
+#include <gtkmm.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index 7559dcae0..f2d67c341 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -15,9 +15,7 @@
 
 #include <stddef.h>
 #include <sigc++/sigc++.h>
-#include <gtkmm/button.h>
-#include <gtkmm/dialog.h>
-#include <gtkmm/tooltips.h>
+#include <gtkmm.h>
 #include "widgets/sp-color-selector.h"
 #include "ui/widget/color-preview.h"
 //#include "ui/dialog/dialog.h"
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index aaf67a7a2..9605571d1 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -37,17 +37,17 @@ namespace Widget {
 //---------------------------------------------------
 
 EntityEntry*
-EntityEntry::create (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr)
+EntityEntry::create (rdf_work_entity_t* ent, Registry& wr)
 {
     g_assert (ent);
     EntityEntry* obj = 0;
     switch (ent->format)
     {
         case RDF_FORMAT_LINE: 
-            obj = new EntityLineEntry (ent, tt, wr);
+            obj = new EntityLineEntry (ent, wr);
             break;
         case RDF_FORMAT_MULTILINE: 
-            obj = new EntityMultiLineEntry (ent, tt, wr);
+            obj = new EntityMultiLineEntry (ent, wr);
             break;
         default:
             g_warning ("An unknown RDF format was requested.");
@@ -58,9 +58,9 @@ EntityEntry::create (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr)
     return obj;
 }
 
-EntityEntry::EntityEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr)
+EntityEntry::EntityEntry (rdf_work_entity_t* ent, Registry& wr)
 : _label(Glib::ustring(_(ent->title)), 1.0, 0.5), _packable(0), 
-  _entity(ent), _tt(&tt), _wr(&wr)
+  _entity(ent), _wr(&wr)
 {
 }
 
@@ -69,11 +69,11 @@ EntityEntry::~EntityEntry()
     _changed_connection.disconnect();
 }
 
-EntityLineEntry::EntityLineEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr)
-: EntityEntry (ent, tt, wr)
+EntityLineEntry::EntityLineEntry (rdf_work_entity_t* ent, Registry& wr)
+: EntityEntry (ent, wr)
 {
     Gtk::Entry *e = new Gtk::Entry;
-    tt.set_tip (*e, _(ent->tip));
+    e->set_tooltip_text (_(ent->tip));
     _packable = e;
     _changed_connection = e->signal_changed().connect (sigc::mem_fun (*this, &EntityLineEntry::on_changed));
 }
@@ -109,8 +109,8 @@ EntityLineEntry::on_changed()
     _wr->setUpdating (false);
 }
 
-EntityMultiLineEntry::EntityMultiLineEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr)
-: EntityEntry (ent, tt, wr)
+EntityMultiLineEntry::EntityMultiLineEntry (rdf_work_entity_t* ent, Registry& wr)
+: EntityEntry (ent, wr)
 {
     Gtk::ScrolledWindow *s = new Gtk::ScrolledWindow;
     s->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
@@ -120,7 +120,7 @@ EntityMultiLineEntry::EntityMultiLineEntry (rdf_work_entity_t* ent, Gtk::Tooltip
     _v.set_wrap_mode (Gtk::WRAP_WORD);
     _v.set_accepts_tab (false);
     s->add (_v);
-    tt.set_tip (_v, _(ent->tip));
+    _v.set_tooltip_text (_(ent->tip));
     _changed_connection = _v.get_buffer()->signal_changed().connect (sigc::mem_fun (*this, &EntityMultiLineEntry::on_changed));
 }
 
diff --git a/src/ui/widget/entity-entry.h b/src/ui/widget/entity-entry.h
index c96f3351d..0e031bb0a 100644
--- a/src/ui/widget/entity-entry.h
+++ b/src/ui/widget/entity-entry.h
@@ -11,7 +11,6 @@
 #define INKSCAPE_UI_WIDGET_ENTITY_ENTRY__H
 
 #include <gtkmm/textview.h>
-#include <gtkmm/tooltips.h>
 
 struct rdf_work_entity_t;
 class SPDocument;
@@ -28,7 +27,7 @@ class Registry;
 
 class EntityEntry {
 public:
-    static EntityEntry* create (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
+    static EntityEntry* create (rdf_work_entity_t* ent, Registry& wr);
     virtual ~EntityEntry() = 0;
     virtual void update (SPDocument *doc) = 0;
     virtual void on_changed() = 0;
@@ -36,16 +35,15 @@ public:
     Gtk::Widget *_packable;
 
 protected: 
-    EntityEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
+    EntityEntry (rdf_work_entity_t* ent, Registry& wr);
     sigc::connection _changed_connection;
     rdf_work_entity_t *_entity;
-    Gtk::Tooltips *_tt;
     Registry *_wr;
 };
 
 class EntityLineEntry : public EntityEntry {
 public:
-    EntityLineEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
+    EntityLineEntry (rdf_work_entity_t* ent, Registry& wr);
     ~EntityLineEntry();
     void update (SPDocument *doc);
 
@@ -55,7 +53,7 @@ protected:
 
 class EntityMultiLineEntry : public EntityEntry {
 public:
-    EntityMultiLineEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
+    EntityMultiLineEntry (rdf_work_entity_t* ent, Registry& wr);
     ~EntityMultiLineEntry();
     void update (SPDocument *doc);
 
diff --git a/src/ui/widget/entry.h b/src/ui/widget/entry.h
index 3338f0888..98c861272 100644
--- a/src/ui/widget/entry.h
+++ b/src/ui/widget/entry.h
@@ -10,10 +10,7 @@
 #ifndef INKSCAPE_UI_WIDGET_ENTRY__H
 #define INKSCAPE_UI_WIDGET_ENTRY__H
 
-#include <gtkmm/entry.h>
-#include <gtkmm/tooltips.h>
-#include <gtkmm/label.h>
-#include <gtkmm/box.h>
+#include <gtkmm.h>
 #include "labelled.h"
 
 namespace Inkscape {
diff --git a/src/ui/widget/labelled.h b/src/ui/widget/labelled.h
index 0232129bd..b0e6b6d4d 100644
--- a/src/ui/widget/labelled.h
+++ b/src/ui/widget/labelled.h
@@ -11,10 +11,7 @@
 #ifndef INKSCAPE_UI_WIDGET_LABELLED_H
 #define INKSCAPE_UI_WIDGET_LABELLED_H
 
-#include <gtkmm/box.h>
-#include <gtkmm/label.h>
-#include <gtkmm/image.h>
-#include <gtkmm/tooltips.h>
+#include <gtkmm.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index de482fb74..08534059b 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -112,7 +112,7 @@ LayerSelector::LayerSelector(SPDesktop *desktop)
 
     _visibility_toggle.set_relief(Gtk::RELIEF_NONE);
     shrink_wrap_button(_visibility_toggle);
-    _tooltips.set_tip(_visibility_toggle, _("Toggle current layer visibility"));
+    _visibility_toggle.set_tooltip_text(_("Toggle current layer visibility"));
     pack_start(_visibility_toggle, Gtk::PACK_EXPAND_PADDING);
 
     label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_DECORATION,
@@ -133,10 +133,10 @@ LayerSelector::LayerSelector(SPDesktop *desktop)
 
     _lock_toggle.set_relief(Gtk::RELIEF_NONE);
     shrink_wrap_button(_lock_toggle);
-    _tooltips.set_tip(_lock_toggle, _("Lock or unlock current layer"));
+    _lock_toggle.set_tooltip_text(_("Lock or unlock current layer"));
     pack_start(_lock_toggle, Gtk::PACK_EXPAND_PADDING);
 
-    _tooltips.set_tip(_selector, _("Current layer"));
+    _selector.set_tooltip_text(_("Current layer"));
     pack_start(_selector, Gtk::PACK_EXPAND_WIDGET);
 
     _layer_model = Gtk::ListStore::create(_model_columns);
diff --git a/src/ui/widget/layer-selector.h b/src/ui/widget/layer-selector.h
index 8bfa52ad7..6fbdc9857 100644
--- a/src/ui/widget/layer-selector.h
+++ b/src/ui/widget/layer-selector.h
@@ -15,7 +15,6 @@
 #include <gtkmm/box.h>
 #include <gtkmm/combobox.h>
 #include <gtkmm/togglebutton.h>
-#include <gtkmm/tooltips.h>
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/liststore.h>
@@ -60,7 +59,6 @@ private:
 
     SPDesktop *_desktop;
 
-    Gtk::Tooltips _tooltips;
     Gtk::ComboBox _selector;
     Gtk::ToggleButton _visibility_toggle;
     Gtk::ToggleButton _lock_toggle;
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 7caf732a4..28b140036 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -82,11 +82,11 @@ Licensor::~Licensor()
     if (_eentry) delete _eentry;
 }
 
-void Licensor::init (Gtk::Tooltips& tt, Registry& wr)
+void Licensor::init (Registry& wr)
 {
     /* add license-specific metadata entry areas */
     rdf_work_entity_t* entity = rdf_find_entity ( "license_uri" );
-    _eentry = EntityEntry::create (entity, tt, wr);
+    _eentry = EntityEntry::create (entity, wr);
 
     LicenseItem *i;
     wr.setUpdating (true);
diff --git a/src/ui/widget/licensor.h b/src/ui/widget/licensor.h
index 3c503b5ba..ab6abd0a4 100644
--- a/src/ui/widget/licensor.h
+++ b/src/ui/widget/licensor.h
@@ -14,10 +14,6 @@
 
 class SPDocument;
 
-namespace Gtk {
-    class Tooltips;
-}
-
 namespace Inkscape {
     namespace UI {
         namespace Widget {
@@ -34,7 +30,7 @@ class Licensor : public Gtk::VBox {
 public:
     Licensor();
     virtual ~Licensor();
-    void init (Gtk::Tooltips&, Registry&);
+    void init (Registry&);
     void update (SPDocument *doc);
 
 protected: 
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index 1ed693037..7f0f7ff3d 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -13,17 +13,7 @@
 #define SEEN_INKSCAPE_UI_WIDGET_PANEL_H
 
 #include <vector>
-#include <gtkmm/arrow.h>
-#include <gtkmm/box.h>
-#include <gtkmm/button.h>
-#include <gtkmm/buttonbox.h>
-#include <gtkmm/eventbox.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/label.h>
-#include <gtkmm/menu.h>
-#include <gtkmm/optionmenu.h>
-#include <gtkmm/table.h>
-#include <gtkmm/tooltips.h>
+#include <gtkmm.h>
 
 #include "inkscape.h"
 #include "ui/previewfillable.h"
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index b6542e574..8ddf8b596 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -17,17 +17,8 @@
 
 #include <iostream>
 #include <vector>
-#include <gtkmm/table.h>
-#include <gtkmm/comboboxtext.h>
+#include <gtkmm.h>
 #include "ui/widget/spinbutton.h"
-#include <gtkmm/tooltips.h>
-#include <gtkmm/treeview.h>
-#include <gtkmm/radiobutton.h>
-#include <gtkmm/box.h>
-#include <gtkmm/scale.h>
-#include <gtkmm/drawingarea.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/filechooserbutton.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <glibmm/i18n.h>
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index 67cb8549c..c9d37d037 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -12,10 +12,7 @@
 #ifndef INKSCAPE_UI_WIDGET_REGISTERED_WIDGET__H_
 #define INKSCAPE_UI_WIDGET_REGISTERED_WIDGET__H_
 
-#include <gtkmm/box.h>
-#include <gtkmm/adjustment.h>
-#include <gtkmm/tooltips.h>
-#include <gtkmm/togglebutton.h>
+#include <gtkmm.h>
 #include <2geom/affine.h>
 #include "xml/node.h"
 #include "registry.h"
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index b6722f4cf..35d92db7b 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -132,10 +132,7 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
       _popup_pt(_sw_group),
       _popup_mm(_sw_group),
 
-      _sw_unit(NULL),
-
-      _tooltips ()
-
+      _sw_unit(NULL)
 {
     _drop[0] = _drop[1] = 0;
     _dropEnabled[0] = _dropEnabled[1] = false;
@@ -326,10 +323,10 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
     _opacity_sb.signal_value_changed().connect(sigc::mem_fun(*this, &SelectedStyle::on_opacity_changed));
 
     _fill_place.add(_na[SS_FILL]);
-    _tooltips.set_tip(_fill_place, __na[SS_FILL]);
+    _fill_place.set_tooltip_text(__na[SS_FILL]);
 
     _stroke_place.add(_na[SS_STROKE]);
-    _tooltips.set_tip(_stroke_place, __na[SS_STROKE]);
+    _stroke_place.set_tooltip_text(__na[SS_STROKE]);
 
     _stroke.pack_start(_stroke_place);
     _stroke_width_place.add(_stroke_width);
@@ -907,8 +904,8 @@ SelectedStyle::update()
         place->remove();
         flag_place->remove();
 
-        _tooltips.unset_tip(*place);
-        _tooltips.unset_tip(*flag_place);
+        place->set_tooltip_text(0);
+        flag_place->set_tooltip_text(0);
 
         _mode[i] = SS_NA;
         _paintserver_id[i].clear();
@@ -921,7 +918,7 @@ SelectedStyle::update()
         switch (result) {
         case QUERY_STYLE_NOTHING:
             place->add(_na[i]);
-            _tooltips.set_tip(*place, __na[i]);
+            place->set_tooltip_text(__na[i]);
             _mode[i] = SS_NA;
             if ( _dropEnabled[i] ) {
                 gtk_drag_dest_unset( GTK_WIDGET((i==SS_FILL) ? _fill_place.gobj():_stroke_place.gobj()) );
@@ -957,17 +954,17 @@ SelectedStyle::update()
                         SPGradient *vector = SP_GRADIENT(server)->getVector();
                         sp_gradient_image_set_gradient ((SPGradientImage *) _gradient_preview_l[i], vector);
                         place->add(_gradient_box_l[i]);
-                        _tooltips.set_tip(*place, __lgradient[i]);
+                        place->set_tooltip_text(__lgradient[i]);
                         _mode[i] = SS_LGRADIENT;
                     } else if (SP_IS_RADIALGRADIENT (server)) {
                         SPGradient *vector = SP_GRADIENT(server)->getVector();
                         sp_gradient_image_set_gradient ((SPGradientImage *) _gradient_preview_r[i], vector);
                         place->add(_gradient_box_r[i]);
-                        _tooltips.set_tip(*place, __rgradient[i]);
+                        place->set_tooltip_text(__rgradient[i]);
                         _mode[i] = SS_RGRADIENT;
                     } else if (SP_IS_PATTERN (server)) {
                         place->add(_pattern[i]);
-                        _tooltips.set_tip(*place, __pattern[i]);
+                        place->set_tooltip_text(__pattern[i]);
                         _mode[i] = SS_PATTERN;
                     }
                 } else {
@@ -983,30 +980,30 @@ SelectedStyle::update()
                 place->add(*_color_preview[i]);
                 gchar c_string[64];
                 g_snprintf (c_string, 64, "%06x/%.3g", color >> 8, SP_RGBA32_A_F(color));
-                _tooltips.set_tip(*place, __color[i] + ": " + c_string + _(", drag to adjust"));
+                place->set_tooltip_text(__color[i] + ": " + c_string + _(", drag to adjust"));
                 _mode[i] = SS_COLOR;
                 _popup_copy[i].set_sensitive(true);
 
             } else if (paint->set && paint->isNone()) {
                 place->add(_none[i]);
-                _tooltips.set_tip(*place, __none[i]);
+                place->set_tooltip_text(__none[i]);
                 _mode[i] = SS_NONE;
             } else if (!paint->set) {
                 place->add(_unset[i]);
-                _tooltips.set_tip(*place, __unset[i]);
+                place->set_tooltip_text(__unset[i]);
                 _mode[i] = SS_UNSET;
             }
             if (result == QUERY_STYLE_MULTIPLE_AVERAGED) {
                 flag_place->add(_averaged[i]);
-                _tooltips.set_tip(*flag_place, __averaged[i]);
+                flag_place->set_tooltip_text(__averaged[i]);
             } else if (result == QUERY_STYLE_MULTIPLE_SAME) {
                 flag_place->add(_multiple[i]);
-                _tooltips.set_tip(*flag_place, __multiple[i]);
+                flag_place->set_tooltip_text(__multiple[i]);
             }
             break;
         case QUERY_STYLE_MULTIPLE_DIFFERENT:
             place->add(_many[i]);
-            _tooltips.set_tip(*place, __many[i]);
+            place->set_tooltip_text(__many[i]);
             _mode[i] = SS_MANY;
             break;
         default:
@@ -1015,22 +1012,22 @@ SelectedStyle::update()
     }
 
 // Now query opacity
-    _tooltips.unset_tip(_opacity_place);
-    _tooltips.unset_tip(_opacity_sb);
+    _opacity_place.set_tooltip_text(0);
+    _opacity_sb.set_tooltip_text(0);
 
     int result = sp_desktop_query_style (_desktop, query, QUERY_STYLE_PROPERTY_MASTEROPACITY);
 
     switch (result) {
     case QUERY_STYLE_NOTHING:
-        _tooltips.set_tip(_opacity_place, _("Nothing selected"));
-        _tooltips.set_tip(_opacity_sb, _("Nothing selected"));
+        _opacity_place.set_tooltip_text(_("Nothing selected"));
+        _opacity_sb.set_tooltip_text(_("Nothing selected"));
         _opacity_sb.set_sensitive(false);
         break;
     case QUERY_STYLE_SINGLE:
     case QUERY_STYLE_MULTIPLE_AVERAGED:
     case QUERY_STYLE_MULTIPLE_SAME:
-        _tooltips.set_tip(_opacity_place, _("Opacity (%)"));
-        _tooltips.set_tip(_opacity_sb, _("Opacity (%)"));
+        _opacity_place.set_tooltip_text(_("Opacity (%)"));
+        _opacity_sb.set_tooltip_text(_("Opacity (%)"));
         if (_opacity_blocked) break;
         _opacity_blocked = true;
         _opacity_sb.set_sensitive(true);
@@ -1069,7 +1066,7 @@ SelectedStyle::update()
                                          _sw_unit? sp_unit_get_abbreviation(_sw_unit) : "px",
                                          (result_sw == QUERY_STYLE_MULTIPLE_AVERAGED)?
                                          _(" (averaged)") : "");
-            _tooltips.set_tip(_stroke_width_place, str);
+            _stroke_width_place.set_tooltip_text(str);
             g_free (str);
         }
         break;
diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h
index 916cbe6d1..07f457e9d 100644
--- a/src/ui/widget/selected-style.h
+++ b/src/ui/widget/selected-style.h
@@ -259,8 +259,6 @@ protected:
 
     SPUnit *_sw_unit;
 
-    Gtk::Tooltips _tooltips;
-
     void *_drop[2];
     bool _dropEnabled[2];
 };
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 41366f749..1fdeb39df 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -112,8 +112,7 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
       _tool_obs(NULL),
       _style_obs(NULL),
       _table(2, 6),
-      _sw_unit(NULL),
-      _tooltips ()
+      _sw_unit(NULL)
 {
     _label[SS_FILL].set_markup(_("Fill:"));
     _label[SS_STROKE].set_markup(_("Stroke:"));
@@ -161,7 +160,7 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
 
     _swatch.signal_button_press_event().connect(sigc::mem_fun(*this, &StyleSwatch::on_click));
 
-    _tooltips.set_tip(_swatch, main_tip);
+    _swatch.set_tooltip_text(main_tip);
 }
 
 void StyleSwatch::setClickVerb(sp_verb_t verb_t) {
@@ -269,15 +268,15 @@ StyleSwatch::setStyle(SPStyle *query)
             if (SP_IS_LINEARGRADIENT (server)) {
                 _value[i].set_markup(_("L Gradient"));
                 place->add(_value[i]);
-                _tooltips.set_tip(*place, (i == SS_FILL)? (_("Linear gradient fill")) : (_("Linear gradient stroke")));
+                place->set_tooltip_text((i == SS_FILL)? (_("Linear gradient fill")) : (_("Linear gradient stroke")));
             } else if (SP_IS_RADIALGRADIENT (server)) {
                 _value[i].set_markup(_("R Gradient"));
                 place->add(_value[i]);
-                _tooltips.set_tip(*place, (i == SS_FILL)? (_("Radial gradient fill")) : (_("Radial gradient stroke")));
+                place->set_tooltip_text((i == SS_FILL)? (_("Radial gradient fill")) : (_("Radial gradient stroke")));
             } else if (SP_IS_PATTERN (server)) {
                 _value[i].set_markup(_("Pattern"));
                 place->add(_value[i]);
-                _tooltips.set_tip(*place, (i == SS_FILL)? (_("Pattern fill")) : (_("Pattern stroke")));
+                place->set_tooltip_text((i == SS_FILL)? (_("Pattern fill")) : (_("Pattern stroke")));
             }
 
         } else if (paint->set && paint->isColor()) {
@@ -291,17 +290,17 @@ StyleSwatch::setStyle(SPStyle *query)
             } else {
                 tip = g_strdup_printf (_("Stroke: %06x/%.3g"), color >> 8, SP_RGBA32_A_F(color));
             }
-            _tooltips.set_tip(*place, tip);
+            place->set_tooltip_text(tip);
             g_free (tip);
         } else if (paint->set && paint->isNone()) {
             _value[i].set_markup(_("<i>None</i>"));
             place->add(_value[i]);
-            _tooltips.set_tip(*place, (i == SS_FILL)? (_("No fill")) : (_("No stroke")));
+            place->set_tooltip_text((i == SS_FILL)? (_("No fill")) : (_("No stroke")));
             if (i == SS_STROKE) has_stroke = false;
         } else if (!paint->set) {
             _value[i].set_markup(_("<b>Unset</b>"));
             place->add(_value[i]);
-            _tooltips.set_tip(*place, (i == SS_FILL)? (_("Unset fill")) : (_("Unset stroke")));
+            place->set_tooltip_text((i == SS_FILL)? (_("Unset fill")) : (_("Unset stroke")));
             if (i == SS_STROKE) has_stroke = false;
         }
     }
@@ -324,11 +323,11 @@ StyleSwatch::setStyle(SPStyle *query)
             gchar *str = g_strdup_printf(_("Stroke width: %.5g%s"),
                                          w,
                                          _sw_unit? sp_unit_get_abbreviation(_sw_unit) : "px");
-            _tooltips.set_tip(_stroke_width_place, str);
+            _stroke_width_place.set_tooltip_text(str);
             g_free (str);
         }
     } else {
-        _tooltips.unset_tip(_stroke_width_place);
+        _stroke_width_place.set_tooltip_text(0);
         _stroke_width.set_markup ("");
     }
 
@@ -345,11 +344,11 @@ StyleSwatch::setStyle(SPStyle *query)
         }
         {
             gchar *str = g_strdup_printf(_("Opacity: %.3g"), op);
-            _tooltips.set_tip(_opacity_place, str);
+            _opacity_place.set_tooltip_text(str);
             g_free (str);
         }
     } else {
-        _tooltips.unset_tip(_opacity_place);
+        _opacity_place.set_tooltip_text(0);
         _opacity_value.set_markup ("");
     }
 
diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h
index dfbbe13d3..a3c115c19 100644
--- a/src/ui/widget/style-swatch.h
+++ b/src/ui/widget/style-swatch.h
@@ -77,8 +77,6 @@ private:
 
     SPUnit *_sw_unit;
 
-    Gtk::Tooltips _tooltips;
-    
 friend class ToolObserver;
 };
 
diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h
index 59e63bd25..e3bd385cc 100644
--- a/src/ui/widget/tolerance-slider.h
+++ b/src/ui/widget/tolerance-slider.h
@@ -10,11 +10,7 @@
 #ifndef INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_
 #define INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_
 
-#include <gtkmm/box.h>
-#include <gtkmm/tooltips.h>
-#include <gtkmm/checkbutton.h>
-#include <gtkmm/radiobutton.h>
-#include <gtkmm/scale.h>
+#include <gtkmm.h>
 
 namespace Inkscape {
 namespace UI {