Cleanup GSEAL issues and deprecated GtkTooltips

(bzr r10826)

63 files changed, 121 insertions, 181 deletions

diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 0565402a2..3c340d41f 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -81,11 +81,11 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
 
     SPDesktop *desktop = dtw->desktop;
 
-    gdk_window_get_pointer(GTK_WIDGET(dtw->canvas)->window, &wx, &wy, NULL);
+    gdk_window_get_pointer(gtk_widget_get_window (GTK_WIDGET(dtw->canvas)), &wx, &wy, NULL);
     Geom::Point const event_win(wx, wy);
 
     gint width, height;
-    gdk_window_get_geometry(GTK_WIDGET(dtw->canvas)->window, NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/);
+    gdk_window_get_geometry(gtk_widget_get_window (GTK_WIDGET(dtw->canvas)), NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/);
 
     switch (event->type) {
     case GDK_BUTTON_PRESS:
@@ -135,7 +135,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
 
                 guide = sp_guideline_new(desktop->guides, NULL, event_dt, normal);
                 sp_guideline_set_color(SP_GUIDELINE(guide), desktop->namedview->guidehicolor);
-                gdk_pointer_grab(widget->window, FALSE,
+                gdk_pointer_grab(gtk_widget_get_window (widget), FALSE,
                                  (GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
                                  NULL, NULL,
                                  event->button.time);
@@ -448,7 +448,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
             if ((event->crossing.state & GDK_SHIFT_MASK) && (drag_type != SP_DRAG_MOVE_ORIGIN)) {
                 GdkCursor *guide_cursor;
                 guide_cursor = gdk_cursor_new (GDK_EXCHANGE);
-                gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, guide_cursor);
+                gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(sp_desktop_canvas(desktop))), guide_cursor);
                 gdk_cursor_unref(guide_cursor);
             }
 
@@ -461,7 +461,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
             sp_guideline_set_color(SP_GUIDELINE(item), guide->color);
 
             // restore event context's cursor
-            gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, desktop->event_context->cursor);
+            gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(sp_desktop_canvas(desktop))), desktop->event_context->cursor);
 
             desktop->guidesMessageContext()->clear();
             break;
@@ -483,7 +483,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                     if (drag_type != SP_DRAG_MOVE_ORIGIN) {
                         GdkCursor *guide_cursor;
                         guide_cursor = gdk_cursor_new (GDK_EXCHANGE);
-                        gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, guide_cursor);
+                        gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(sp_desktop_canvas(desktop))), guide_cursor);
                         gdk_cursor_unref(guide_cursor);
                         ret = TRUE;
                         break;
@@ -500,7 +500,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                 case GDK_Shift_R:
                     GdkCursor *guide_cursor;
                     guide_cursor = gdk_cursor_new (GDK_EXCHANGE);
-                    gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, guide_cursor);
+                    gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(sp_desktop_canvas(desktop))), guide_cursor);
                     gdk_cursor_unref(guide_cursor);
                     break;
                 default:
@@ -526,21 +526,21 @@ static void init_extended()
     if ( devices ) {
         for ( GList* curr = devices; curr; curr = g_list_next(curr) ) {
             GdkDevice* dev = reinterpret_cast<GdkDevice*>(curr->data);
-            if ( dev->name
-                 && (avoidName != dev->name)
-                 && (dev->source != GDK_SOURCE_MOUSE) ) {
+            if ( gdk_device_get_name (dev)
+                 && (avoidName != gdk_device_get_name (dev))
+                 && (gdk_device_get_source (dev) != GDK_SOURCE_MOUSE) ) {
 //                 g_message("Adding '%s' as [%d]", dev->name, dev->source);
 
                 // Set the initial tool for the device
-                switch ( dev->source ) {
+                switch ( gdk_device_get_source (dev)) {
                     case GDK_SOURCE_PEN:
-                        toolToUse[dev->name] = TOOLS_CALLIGRAPHIC;
+                        toolToUse[gdk_device_get_name (dev)] = TOOLS_CALLIGRAPHIC;
                         break;
                     case GDK_SOURCE_ERASER:
-                        toolToUse[dev->name] = TOOLS_ERASER;
+                        toolToUse[gdk_device_get_name (dev)] = TOOLS_ERASER;
                         break;
                     case GDK_SOURCE_CURSOR:
-                        toolToUse[dev->name] = TOOLS_SELECT;
+                        toolToUse[gdk_device_get_name (dev)] = TOOLS_SELECT;
                         break;
                     default:
                         ; // do not add
@@ -563,8 +563,8 @@ void snoop_extended(GdkEvent* event, SPDesktop *desktop)
         {
             GdkEventMotion* event2 = reinterpret_cast<GdkEventMotion*>(event);
             if ( event2->device ) {
-                source = event2->device->source;
-                name = event2->device->name;
+                source = gdk_device_get_source (event2->device);
+                name = gdk_device_get_name (event2->device);
             }
         }
         break;
@@ -576,8 +576,8 @@ void snoop_extended(GdkEvent* event, SPDesktop *desktop)
         {
             GdkEventButton* event2 = reinterpret_cast<GdkEventButton*>(event);
             if ( event2->device ) {
-                source = event2->device->source;
-                name = event2->device->name;
+                source = gdk_device_get_source (event2->device);
+                name = gdk_device_get_name (event2->device);
             }
         }
         break;
@@ -586,8 +586,8 @@ void snoop_extended(GdkEvent* event, SPDesktop *desktop)
         {
             GdkEventScroll* event2 = reinterpret_cast<GdkEventScroll*>(event);
             if ( event2->device ) {
-                source = event2->device->source;
-                name = event2->device->name;
+                source = gdk_device_get_source (event2->device);
+                name = gdk_device_get_name (event2->device);
             }
         }
         break;
@@ -597,8 +597,8 @@ void snoop_extended(GdkEvent* event, SPDesktop *desktop)
         {
             GdkEventProximity* event2 = reinterpret_cast<GdkEventProximity*>(event);
             if ( event2->device ) {
-                source = event2->device->source;
-                name = event2->device->name;
+                source = gdk_device_get_source (event2->device);
+                name = gdk_device_get_name (event2->device);
             }
         }
         break;
diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 1bb6b75d0..927f00233 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -1494,7 +1494,7 @@ static void clonetiler_value_changed(GtkAdjustment *adj, gpointer data)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     const gchar *pref = (const gchar *) data;
-    prefs->setDouble(prefs_path + pref, adj->value);
+    prefs->setDouble(prefs_path + pref, gtk_adjustment_get_value (adj));
 }
 
 static GtkWidget * clonetiler_spinbox(const char *tip, const char *attr, double lower, double upper, const gchar *suffix, bool exponent = false)
@@ -1555,7 +1555,7 @@ static void clonetiler_xy_changed(GtkAdjustment *adj, gpointer data)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     const gchar *pref = (const gchar *) data;
-    prefs->setInt(prefs_path + pref, (int) floor(adj->value + 0.5));
+    prefs->setInt(prefs_path + pref, (int) floor(gtk_adjustment_get_value (adj) + 0.5));
 }
 
 static void clonetiler_keep_bbox_toggled(GtkToggleButton *tb, gpointer /*data*/)
@@ -1706,7 +1706,7 @@ static void clonetiler_switch_to_fill(GtkToggleButton */*tb*/, GtkWidget *dlg)
 
 static void clonetiler_fill_width_changed(GtkAdjustment *adj, GtkWidget *u)
 {
-    gdouble const raw_dist = adj->value;
+    gdouble const raw_dist = gtk_adjustment_get_value (adj);
     SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
     gdouble const pixels = sp_units_get_pixels (raw_dist, unit);
 
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 4cad2c8a1..51c16bf3b 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -1022,7 +1022,7 @@ create_progress_dialog (GtkObject *base, gchar *progress_text) {
 
     gtk_progress_bar_set_orientation ( (GtkProgressBar *) prg,
                                        GTK_PROGRESS_LEFT_TO_RIGHT);
-    gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dlg)->vbox,
+    gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area((GtkDialog *) dlg),
                         prg, FALSE, FALSE, 4 );
     btn = gtk_dialog_add_button ( GTK_DIALOG (dlg),
                                   GTK_STOCK_CANCEL,
@@ -1992,7 +1992,7 @@ static float sp_export_value_get( GtkObject *base, const gchar *key )
 
     adj = (GtkAdjustment *)g_object_get_data (G_OBJECT(base), key);
 
-    return adj->value;
+    return gtk_adjustment_get_value (adj);
 }
 
 /**
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 7dc52bea0..19cb9678a 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -181,7 +181,10 @@ static void sp_event_context_dispose(GObject *object) {
  */
 void sp_event_context_update_cursor(SPEventContext *ec) {
     GtkWidget *w = GTK_WIDGET(sp_desktop_canvas(ec->desktop));
-    if (w->window) {
+    if (gtk_widget_get_window (w)) {
+	
+        GtkStyle *style = gtk_widget_get_style(w);
+
         /* fixme: */
         if (ec->cursor_shape) {
             GdkDisplay *display = gdk_display_get_default();
@@ -191,9 +194,10 @@ void sp_event_context_update_cursor(SPEventContext *ec) {
                 guint32 strokeColor = sp_desktop_get_color_tool(ec->desktop, ec->tool_url, false, &strokeHasColor);
                 double fillOpacity = fillHasColor ? sp_desktop_get_opacity_tool(ec->desktop, ec->tool_url, true) : 0;
                 double strokeOpacity = strokeHasColor ? sp_desktop_get_opacity_tool(ec->desktop, ec->tool_url, false) : 0;
+
                 GdkPixbuf *pixbuf = sp_cursor_pixbuf_from_xpm(
                     ec->cursor_shape,
-                    w->style->black, w->style->white,
+                    style->black, style->white,
                     SP_RGBA32_U_COMPOSE(SP_RGBA32_R_U(fillColor),SP_RGBA32_G_U(fillColor),SP_RGBA32_B_U(fillColor),SP_COLOR_F_TO_U(fillOpacity)),
                     SP_RGBA32_U_COMPOSE(SP_RGBA32_R_U(strokeColor),SP_RGBA32_G_U(strokeColor),SP_RGBA32_B_U(strokeColor),SP_COLOR_F_TO_U(strokeOpacity))
                     );
@@ -211,14 +215,14 @@ void sp_event_context_update_cursor(SPEventContext *ec) {
                     if (ec->cursor)
                         gdk_cursor_unref(ec->cursor);
                     ec->cursor = gdk_cursor_new_from_pixmap(bitmap, mask,
-                            &w->style->black, &w->style->white, ec->hot_x,
+                            &style->black, &style->white, ec->hot_x,
                             ec->hot_y);
                     g_object_unref(bitmap);
                     g_object_unref(mask);
                 }
             }
         }
-        gdk_window_set_cursor(w->window, ec->cursor);
+        gdk_window_set_cursor(gtk_widget_get_window (w), ec->cursor);
         gdk_flush();
     }
     ec->desktop->waiting_cursor = false;
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index f0b266df0..0008d22bf 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -25,7 +25,6 @@
 #include <gtkmm/label.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/table.h>
-#include <gtkmm/tooltips.h>
 
 #include "inkscape.h"
 #include "extension/implementation/implementation.h"
@@ -638,7 +637,6 @@ Extension::error_file_close (void)
 
 /** \brief  A widget to represent the inside of an AutoGUI widget */
 class AutoGUI : public Gtk::VBox {
-    Gtk::Tooltips _tooltips;
 public:
     /** \brief  Create an AutoGUI object */
     AutoGUI (void) : Gtk::VBox() {};
@@ -654,7 +652,7 @@ public:
         if (widg == NULL) return;
         this->pack_start(*widg, false, false, 2);
         if (tooltip != NULL) {
-            _tooltips.set_tip(*widg, Glib::ustring(_(tooltip)));
+            widg->set_tooltip_text(Glib::ustring(_(tooltip)));
         }
         return;
     };
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index 80042febc..d65ec3927 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -21,7 +21,6 @@
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/notebook.h>
-#include <gtkmm/tooltips.h>
 
 #include <glibmm/i18n.h>
 
@@ -52,7 +51,6 @@ private:
     GSList * parameters; /**< A table to store the parameters for this page.
                               This only gets created if there are parameters on this
                               page */
-    Gtk::Tooltips * _tooltips;
 
 public:
     static ParamNotebookPage * makepage (Inkscape::XML::Node * in_repr, Inkscape::Extension::Extension * in_ext);
@@ -67,8 +65,7 @@ public:
 
 
 ParamNotebookPage::ParamNotebookPage (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) :
-    Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext),
-    _tooltips(NULL)
+    Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext)
 {
     parameters = NULL;
 
@@ -94,7 +91,6 @@ ParamNotebookPage::ParamNotebookPage (const gchar * name, const gchar * guitext,
 
 ParamNotebookPage::~ParamNotebookPage (void)
 {
-    if (_tooltips) delete _tooltips;
     //destroy parameters
     for (GSList * list = parameters; list != NULL; list = g_slist_next(list)) {
         Parameter * param = reinterpret_cast<Parameter *>(list->data);
@@ -203,10 +199,6 @@ Gtk::Widget * ParamNotebookPage::get_widget(SPDocument * doc, Inkscape::XML::Nod
         return NULL;
     }
 
-    if (!_tooltips) {
-        _tooltips = new Gtk::Tooltips();
-    }
-
     Gtk::VBox * vbox = Gtk::manage(new Gtk::VBox);
     vbox->set_border_width(5);
 
@@ -218,7 +210,7 @@ Gtk::Widget * ParamNotebookPage::get_widget(SPDocument * doc, Inkscape::XML::Nod
 //        printf("Tip: '%s'\n", tip);
         vbox->pack_start(*widg, false, false, 2);
         if (tip != NULL) {
-            _tooltips->set_tip(*widg, Glib::ustring(tip));
+            widg->set_tooltip_text(Glib::ustring(tip));
         }
     }
 
diff --git a/src/interface.cpp b/src/interface.cpp
index 646400dd6..3a4db9f6f 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -1209,10 +1209,10 @@ sp_ui_drag_data_received(GtkWidget *widget,
             Geom::Point const button_dt(desktop->w2d(where));
             Geom::Point const button_doc(desktop->dt2doc(button_dt));
 
-            if ( data->length == 8 ) {
+            if ( gtk_selection_data_get_length (data) == 8 ) {
                 gchar colorspec[64] = {0};
                 // Careful about endian issues.
-                guint16* dataVals = (guint16*)data->data;
+                guint16* dataVals = (guint16*)gtk_selection_data_get_data (data);
                 sp_svg_write_color( colorspec, sizeof(colorspec),
                                     SP_RGBA32_U_COMPOSE(
                                         0x0ff & (dataVals[0] >> 8),
@@ -1241,7 +1241,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
                 //}
 
                 if (!consumed && item) {
-                    bool fillnotstroke = (drag_context->action != GDK_ACTION_MOVE);
+                    bool fillnotstroke = (gdk_drag_context_get_actions (drag_context) != GDK_ACTION_MOVE);
                     if (fillnotstroke &&
                         (SP_IS_SHAPE(item) || SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item))) {
                         Path *livarot_path = Path_for_item(item, true, true);
@@ -1285,12 +1285,12 @@ sp_ui_drag_data_received(GtkWidget *widget,
         {
             bool worked = false;
             Glib::ustring colorspec;
-            if ( data->format == 8 ) {
+            if ( gtk_selection_data_get_format (data) == 8 ) {
                 ege::PaintDef color;
                 worked = color.fromMIMEData("application/x-oswb-color",
-                                            reinterpret_cast<char*>(data->data),
-                                            data->length,
-                                            data->format);
+                                            reinterpret_cast<char const *>(gtk_selection_data_get_data (data)),
+                                            gtk_selection_data_get_length (data),
+                                            gtk_selection_data_get_format (data));
                 if ( worked ) {
                     if ( color.getType() == ege::PaintDef::CLEAR ) {
                         colorspec = ""; // TODO check if this is sufficient
@@ -1344,7 +1344,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
                 }
 
                 if (!consumed && item) {
-                    bool fillnotstroke = (drag_context->action != GDK_ACTION_MOVE);
+                    bool fillnotstroke = (gdk_drag_context_get_actions (drag_context) != GDK_ACTION_MOVE);
                     if (fillnotstroke &&
                         (SP_IS_SHAPE(item) || SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item))) {
                         Path *livarot_path = Path_for_item(item, true, true);
@@ -1386,9 +1386,9 @@ sp_ui_drag_data_received(GtkWidget *widget,
 
         case SVG_DATA:
         case SVG_XML_DATA: {
-            gchar *svgdata = (gchar *)data->data;
+            gchar *svgdata = (gchar *)gtk_selection_data_get_data (data);
 
-            Inkscape::XML::Document *rnewdoc = sp_repr_read_mem(svgdata, data->length, SP_SVG_NS_URI);
+            Inkscape::XML::Document *rnewdoc = sp_repr_read_mem(svgdata, gtk_selection_data_get_length (data), SP_SVG_NS_URI);
 
             if (rnewdoc == NULL) {
                 sp_ui_error_dialog(_("Could not parse SVG data"));
@@ -1435,7 +1435,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
         }
 
         case URI_LIST: {
-            gchar *uri = (gchar *)data->data;
+            gchar *uri = (gchar *)gtk_selection_data_get_data (data);
             sp_ui_import_files(uri);
             break;
         }
@@ -1457,7 +1457,10 @@ sp_ui_drag_data_received(GtkWidget *widget,
             ext->set_gui(false);
 
             gchar *filename = g_build_filename( g_get_tmp_dir(), "inkscape-dnd-import", NULL );
-            g_file_set_contents(filename, reinterpret_cast<gchar const *>(data->data), data->length, NULL);
+            g_file_set_contents(filename, 
+			    reinterpret_cast<gchar const *>(gtk_selection_data_get_data (data)), 
+			    gtk_selection_data_get_length (data), 
+			    NULL);
             file_import(doc, filename, ext);
             g_free(filename);
 
@@ -1585,7 +1588,7 @@ sp_ui_overwrite_file(gchar const *filename)
 static void
 sp_ui_menu_item_set_name(GtkWidget *data, Glib::ustring const &name)
 {
-    void *child = GTK_BIN (data)->child;
+    void *child = gtk_bin_get_child (GTK_BIN (data));
     //child is either
     //- a GtkHBox, whose first child is a label displaying name if the menu
     //item has an accel key
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);
diff --git a/src/text-context.cpp b/src/text-context.cpp
index d2bf8c5f5..e3ddb8cca 100644
--- a/src/text-context.cpp
+++ b/src/text-context.cpp
@@ -228,7 +228,8 @@ sp_text_context_setup(SPEventContext *ec)
          * entered.
          */
         gtk_im_context_set_use_preedit(tc->imc, FALSE);
-        gtk_im_context_set_client_window(tc->imc, canvas->window);
+        gtk_im_context_set_client_window(tc->imc, 
+			gtk_widget_get_window (canvas));
 
         g_signal_connect(G_OBJECT(canvas), "focus_in_event", G_CALLBACK(sptc_focus_in), tc);
         g_signal_connect(G_OBJECT(canvas), "focus_out_event", G_CALLBACK(sptc_focus_out), tc);
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 3d3ea867e..80ab49494 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -102,7 +102,6 @@ Dialog::Dialog(Behavior::BehaviorFactory behavior_factory, const char *prefs_pat
       _verb_num(verb_num),
       _title(),
       _apply_label(apply_label),
-      tooltips(),
       _behavior(0)
 {
     gchar title[500];
diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h
index 307257b52..92de83187 100644
--- a/src/ui/dialog/dialog.h
+++ b/src/ui/dialog/dialog.h
@@ -92,11 +92,6 @@ protected:
     Glib::ustring  _title;
     Glib::ustring  _apply_label;
 
-    /**
-     * Tooltips object for all descendants to use
-     */
-    Gtk::Tooltips tooltips;
-
     virtual void   _handleResponse(int response_id);
 
     virtual bool   _onDeleteEvent (GdkEventAny*);
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index fa392cccc..4f7388a97 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -128,7 +128,6 @@ DocumentProperties::DocumentProperties()
       _grids_button_remove(C_("Grid", "_Remove"), _("Remove selected grid.")),
       _grids_label_def("", Gtk::ALIGN_LEFT)
 {
-    _tt.enable();
     _getContents()->set_spacing (4);
     _getContents()->pack_start(_notebook, true, true);
 
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index 8f922d6fd..0cba6e802 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -80,7 +80,6 @@ protected:
     void _handleDeactivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
 
     Inkscape::XML::SignalObserver _emb_profiles_observer, _scripts_observer;
-    Gtk::Tooltips _tt;
     Gtk::Notebook  _notebook;
 
     UI::Widget::NotebookPage   _page_page;
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index f5a5041e2..3c70674fd 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -110,7 +110,7 @@ public:
           _true_val(tv), _false_val(fv)
     {
         signal_toggled().connect(signal_attr_changed().make_slot());
-        if (tip_text) _tt.set_tip(*this, tip_text);
+        if (tip_text) set_tooltip_text(tip_text);
     }
 
     Glib::ustring get_as_attribute() const
@@ -142,7 +142,7 @@ public:
         : Inkscape::UI::Widget::SpinButton(climb_rate, digits),
           AttrWidget(a, def)
     {
-        if (tip_text) _tt.set_tip(*this, tip_text);
+        if (tip_text) set_tooltip_text(tip_text);
         set_range(lower, upper);
         set_increments(step_inc, 0);
 
@@ -176,7 +176,7 @@ public:
     ComboWithTooltip<T>(T default_value, const Util::EnumDataConverter<T>& c, const SPAttributeEnum a = SP_ATTR_INVALID, char* tip_text = NULL)
     {
         if (tip_text) {
-            _tt.set_tip(*this, tip_text);
+            set_tooltip_text(tip_text);
         }
         combo = new ComboBoxEnum<T>(default_value, c, a, false);
         add(*combo);
@@ -193,7 +193,6 @@ public:
         return combo;
     }
 private:
-    Gtk::Tooltips _tt;
     ComboBoxEnum<T>* combo;
 };
 
@@ -235,8 +234,8 @@ public:
         : AttrWidget(a, def), //TO-DO: receive default num-opt-num as parameter in the constructor
           _s1(climb_rate, digits), _s2(climb_rate, digits)
     {
-        if (tt1) _tt.set_tip(_s1, tt1);
-        if (tt2) _tt.set_tip(_s2, tt2);
+        if (tt1) _s1.set_tooltip_text(tt1);
+        if (tt2) _s2.set_tooltip_text(tt2);
         _s1.set_range(lower, upper);
         _s2.set_range(lower, upper);
         _s1.set_increments(step_inc, 0);
@@ -296,7 +295,7 @@ public:
         : AttrWidget(a, def)
     {
         signal_color_set().connect(signal_attr_changed().make_slot());
-        if (tip_text) _tt.set_tip(*this, tip_text);
+        if (tip_text) set_tooltip_text(tip_text);
 
         Gdk::Color col;
         col.set_rgb(65535, 65535, 65535);
@@ -344,7 +343,7 @@ public:
         _tree.show();
         add(_tree);
         set_shadow_type(Gtk::SHADOW_IN);
-        if (tip_text) _tt.set_tip(_tree, tip_text);
+        if (tip_text) _tree.set_tooltip_text(tip_text);
     }
 
     std::vector<double> get_values() const
@@ -899,8 +898,6 @@ public:
         return combo->get_attrwidget();
     }
 private:
-    Gtk::Tooltips _tt;
-
     void add_attr_widget(AttrWidget* a)
     {
         _attrwidgets[_current_type].push_back(a);
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index a2b952677..fd2eb3aaf 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -189,7 +189,7 @@ IconPreviewPanel::IconPreviewPanel() :
             buttons[i]->set_icon_widget(*images[i]);
         }
 
-        tips.set_tip((*buttons[i]), label);
+        buttons[i]->set_tooltip_text(label);
 
         buttons[i]->signal_clicked().connect( sigc::bind<int>( sigc::mem_fun(*this, &IconPreviewPanel::on_button_clicked), i) );
 
@@ -234,7 +234,7 @@ IconPreviewPanel::IconPreviewPanel() :
 
     selectionButton = new Gtk::CheckButton(C_("Icon preview window", "Sele_ction"), true);//selectionButton = (Gtk::ToggleButton*) gtk_check_button_new_with_mnemonic(_("_Selection")); // , GTK_RESPONSE_APPLY
     magBox->pack_start( *selectionButton, Gtk::PACK_SHRINK );
-    tips.set_tip((*selectionButton), _("Selection only or whole document"));
+    selectionButton->set_tooltip_text(_("Selection only or whole document"));
     selectionButton->signal_clicked().connect( sigc::mem_fun(*this, &IconPreviewPanel::modeToggled) );
 
     gint val = prefs->getBool("/iconpreview/selectionOnly");
diff --git a/src/ui/dialog/icon-preview.h b/src/ui/dialog/icon-preview.h
index ec4b3cac4..42f9176b0 100644
--- a/src/ui/dialog/icon-preview.h
+++ b/src/ui/dialog/icon-preview.h
@@ -65,8 +65,6 @@ private:
     bool pending;
     gdouble minDelay;
 
-    Gtk::Tooltips   tips;
-
     Gtk::VBox       iconBox;
     Gtk::HPaned     splitter;
 
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index b71130b20..b5d406bf5 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -96,7 +96,7 @@ void LayersPanel::_styleButton( Gtk::Button& btn, SPDesktop *desktop, unsigned i
             }
 
             if ( action && action->tip ) {
-                _tips.set_tip( btn, action->tip );
+                btn.set_tooltip_text (action->tip);
             }
         }
     }
diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h
index 018357425..7de1df520 100644
--- a/src/ui/dialog/layers.h
+++ b/src/ui/dialog/layers.h
@@ -14,7 +14,6 @@
 
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
-#include <gtkmm/tooltips.h>
 #include <gtkmm/scale.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/box.h>
@@ -112,7 +111,6 @@ private:
     std::vector<Gtk::Widget*> _watchingNonTop;
     std::vector<Gtk::Widget*> _watchingNonBottom;
 
-    Gtk::Tooltips _tips;
     Gtk::TreeView _tree;
     Gtk::HButtonBox _buttonsRow;
     Gtk::ScrolledWindow _scroller;
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 44a92bfae..4ddacb1b3 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -192,7 +192,7 @@ LivePathEffectEditor::showParams(LivePathEffect::Effect& effect)
     }
 
     explain_label.set_markup("<b>" + effect.getName() + "</b>");
-    effectwidget = effect.newWidget(&tooltips);
+    effectwidget = effect.newWidget();
     if (effectwidget) {
         effectcontrol_vbox.pack_start(*effectwidget, true, true);
     }
diff --git a/src/ui/dialog/livepatheffect-editor.h b/src/ui/dialog/livepatheffect-editor.h
index 7880d726b..42d217387 100644
--- a/src/ui/dialog/livepatheffect-editor.h
+++ b/src/ui/dialog/livepatheffect-editor.h
@@ -17,7 +17,6 @@
 #include <gtkmm/label.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/frame.h>
-#include <gtkmm/tooltips.h>
 #include "ui/widget/combo-enums.h"
 #include "live_effects/effect-enum.h"
 #include <gtkmm/liststore.h>
@@ -99,7 +98,6 @@ private:
     Gtk::HBox effectapplication_hbox;
     Gtk::VBox effectcontrol_vbox;
     Gtk::VBox effectlist_vbox;
-    Gtk::Tooltips tooltips;
     ModelColumns columns;
     Gtk::ScrolledWindow scrolled_window;
     Gtk::TreeView effectlist_view;
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 570120bcd..2b12806a6 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -153,14 +153,14 @@ Transformation::Transformation()
 
     resetButton = addResponseButton(Gtk::Stock::CLEAR, 0);
     if (resetButton) {
-        _tooltips.set_tip((*resetButton), _("Reset the values on the current tab to defaults"));
+        resetButton->set_tooltip_text(_("Reset the values on the current tab to defaults"));
         resetButton->set_sensitive(true);
         resetButton->signal_clicked().connect(sigc::mem_fun(*this, &Transformation::onClear));
     }
 
     applyButton = addResponseButton(Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY);
     if (applyButton) {
-        _tooltips.set_tip((*applyButton), _("Apply transformation to selection"));
+        applyButton->set_tooltip_text(_("Apply transformation to selection"));
         applyButton->set_sensitive(false);
     }
 
diff --git a/src/ui/widget/attr-widget.h b/src/ui/widget/attr-widget.h
index 94906c8e8..e874f4d52 100644
--- a/src/ui/widget/attr-widget.h
+++ b/src/ui/widget/attr-widget.h
@@ -156,9 +156,6 @@ protected:
         return 0;
     }
 
-protected:
-    Gtk::Tooltips _tt;
-
 private:
     const SPAttributeEnum _attr;
     DefaultValueHolder _default;
diff --git a/src/ui/widget/button.cpp b/src/ui/widget/button.cpp
index ae1dbbe98..1ba531ddf 100644
--- a/src/ui/widget/button.cpp
+++ b/src/ui/widget/button.cpp
@@ -18,19 +18,17 @@ namespace UI {
 namespace Widget {
 
 Button::Button(Glib::ustring const &label, Glib::ustring const &tooltip)
-    : _tooltips()
 {
     set_use_underline (true);
     set_label (label);
-    _tooltips.set_tip(*this, tooltip);
+    set_tooltip_text(tooltip);
 }
 
 CheckButton::CheckButton(Glib::ustring const &label, Glib::ustring const &tooltip)
-    : _tooltips()
 {
     set_use_underline (true);
     set_label (label);
-    _tooltips.set_tip(*this, tooltip);
+    set_tooltip_text(tooltip);
 }
 
 } // namespace Widget
diff --git a/src/ui/widget/button.h b/src/ui/widget/button.h
index 1ed88a2da..8dc9d73cb 100644
--- a/src/ui/widget/button.h
+++ b/src/ui/widget/button.h
@@ -26,8 +26,6 @@ class Button : public Gtk::Button
 public:
     Button();
     Button(Glib::ustring const &label, Glib::ustring const &tooltip);
-protected:
-    Gtk::Tooltips _tooltips;
 };
 
 /**
@@ -38,8 +36,6 @@ class CheckButton : public Gtk::CheckButton
 public:
     CheckButton();
     CheckButton(Glib::ustring const &label, Glib::ustring const &tooltip);
-protected:
-    Gtk::Tooltips _tooltips;
 };
 
 } // namespace Widget
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index f32e25885..429aba6e8 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -36,7 +36,7 @@ ColorPicker::ColorPicker (const Glib::ustring& title, const Glib::ustring& tip,
     set_relief (Gtk::RELIEF_NONE);
     _preview.show();
     add (_preview);
-    _tt.set_tip (*this, tip);
+    set_tooltip_text (tip);
 }
 
 ColorPicker::~ColorPicker()
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index 346ce5121..7559dcae0 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -56,7 +56,6 @@ protected:
     virtual void on_changed (guint32);
 
     ColorPreview        _preview;
-    Gtk::Tooltips       _tt;
 
     /*const*/ Glib::ustring _title;
     sigc::signal<void,guint32> _changed_signal;
@@ -69,7 +68,6 @@ protected:
     //Inkscape::UI::Dialog::Dialog _colorSelectorDialog;
     Gtk::Dialog _colorSelectorDialog;
     SPColorSelector *_colorSelector;
-
 };
 
 }//namespace Widget
diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp
index 0a13d6347..ae3a4c744 100644
--- a/src/ui/widget/labelled.cpp
+++ b/src/ui/widget/labelled.cpp
@@ -28,8 +28,7 @@ Labelled::Labelled(Glib::ustring const &label, Glib::ustring const &tooltip,
                    bool mnemonic)
     : _widget(widget),
       _label(new Gtk::Label(label, 1.0, 0.5, mnemonic)),
-      _suffix(new Gtk::Label(suffix, 0.0, 0.5)),
-      _tooltips()
+      _suffix(new Gtk::Label(suffix, 0.0, 0.5))
 {
     g_assert(g_utf8_validate(icon.c_str(), -1, NULL));
     if (icon != "") {
@@ -41,7 +40,7 @@ Labelled::Labelled(Glib::ustring const &label, Glib::ustring const &tooltip,
     if (mnemonic) {
         _label->set_mnemonic_widget(*_widget);
     }
-    _tooltips.set_tip(*_widget, tooltip);
+    widget->set_tooltip_text(tooltip);
 }
 
 
diff --git a/src/ui/widget/labelled.h b/src/ui/widget/labelled.h
index 8c2ec8939..0232129bd 100644
--- a/src/ui/widget/labelled.h
+++ b/src/ui/widget/labelled.h
@@ -59,7 +59,6 @@ protected:
     Gtk::Label   *_label;
     Gtk::Label   *_suffix;
     Gtk::Widget  *_icon;
-    Gtk::Tooltips _tooltips;
 };
 
 } // namespace Widget
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 0b18f1039..e3dbddd43 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -369,7 +369,7 @@ PageSizer::PageSizer(Registry & _wr)
     _fitPageButtonAlign.add(_fitPageButton);
     _fitPageButton.set_use_underline();
     _fitPageButton.set_label(_("_Resize page to drawing or selection"));
-    _tips.set_tip(_fitPageButton, _("Resize the page to fit the current selection, or the entire drawing if there is no selection"));
+    _fitPageButton.set_tooltip_text(_("Resize the page to fit the current selection, or the entire drawing if there is no selection"));
 
 }
 
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index 7f165266c..61fb425bc 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -162,8 +162,6 @@ protected:
  
     void fire_fit_canvas_to_selection_or_drawing();
     
-    Gtk::Tooltips _tips;
-    
     //### The Paper Size selection list
     Gtk::HBox _paperSizeListBox;
     Gtk::Label _paperSizeListLabel;
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index d51d942dd..1ed693037 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -94,9 +94,6 @@ protected:
     void _addResponseButton(Gtk::Button *button, int response_id);
     Inkscape::Selection *_getSelection();
 
-    /** Tooltips object for all descendants to use */
-    Gtk::Tooltips _tooltips;
-
     Glib::ustring const _prefs_path;
 
     bool _menu_desired;
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 001d2277d..fd68247cf 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -110,7 +110,7 @@ void DialogPage::add_line(bool indent, Glib::ustring const &label, Gtk::Widget &
 
     if (tip != "")
     {
-        _tooltips.set_tip (widget, tip);
+        widget.set_tooltip_text (tip);
     }
 
 }
@@ -131,7 +131,7 @@ void DialogPage::add_group_header(Glib::ustring name)
 
 void DialogPage::set_tip(Gtk::Widget& widget, Glib::ustring const &tip)
 {
-    _tooltips.set_tip (widget, tip);
+    widget.set_tooltip_text (tip);
 }
 
 void PrefCheckButton::init(Glib::ustring const &label, Glib::ustring const &prefs_path,
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index ea5c377a3..b6542e574 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -254,8 +254,6 @@ public:
     void add_line(bool indent, Glib::ustring const &label, Gtk::Widget& widget, Glib::ustring const &suffix, Glib::ustring const &tip, bool expand = true);
     void add_group_header(Glib::ustring name);
     void set_tip(Gtk::Widget &widget, Glib::ustring const &tip);
-protected:
-    Gtk::Tooltips _tooltips;
 };
 
 
diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp
index 03cea7d5a..e8c84a780 100644
--- a/src/ui/widget/random.cpp
+++ b/src/ui/widget/random.cpp
@@ -77,7 +77,7 @@ void Random::addReseedButton()
     pButton->add(*pIcon);
     pButton->show();
     pButton->signal_clicked().connect(sigc::mem_fun(*this, &Random::onReseedButtonClick));
-    _tooltips.set_tip(*pButton, _("Reseed the random number generator; this creates a different sequence of random numbers."));
+    pButton->set_tooltip_text(_("Reseed the random number generator; this creates a different sequence of random numbers."));
 
     pack_start(*pButton, Gtk::PACK_SHRINK, 0);
 }
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index f923a7c9c..747de4681 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -56,7 +56,7 @@ RegisteredCheckButton::RegisteredCheckButton (const Glib::ustring& label, const
 
     setProgrammatically = false;
 
-    _tt.set_tip (*this, tip);
+    set_tooltip_text (tip);
     Gtk::Label *l = new Gtk::Label (label);
     l->set_use_underline (true);
     add (*manage (l));
@@ -434,8 +434,8 @@ RegisteredRadioButtonPair::RegisteredRadioButtonPair (const Glib::ustring& label
     _rb2 = manage (new Gtk::RadioButton (group, label2, true));
     add (*_rb2);
     _rb2->set_active();
-    _tt.set_tip (*_rb1, tip1);
-    _tt.set_tip (*_rb2, tip2);
+    _rb1->set_tooltip_text(tip1);
+    _rb2->set_tooltip_text(tip2);
     _changed_connection = _rb1->signal_toggled().connect (sigc::mem_fun (*this, &RegisteredRadioButtonPair::on_value_changed));
 }
 
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index df2377464..67cb8549c 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -154,7 +154,6 @@ public:
                                 // if a callback checks it, it must reset it back to false
 
 protected:
-    Gtk::Tooltips     _tt;
     sigc::connection  _toggled_connection;
     void on_toggled();
 };
@@ -286,7 +285,6 @@ public:
                                     // if a callback checks it, it must reset it back to false
 protected:
     Gtk::RadioButton *_rb1, *_rb2;
-    Gtk::Tooltips     _tt;
     sigc::connection _changed_connection;
     void on_value_changed();
 };
diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp
index bbc0a0039..a8c321d7d 100644
--- a/src/ui/widget/rendering-options.cpp
+++ b/src/ui/widget/rendering-options.cpp
@@ -40,12 +40,12 @@ RenderingOptions::RenderingOptions () :
             false)
 {
     // set up tooltips
-    _tt.set_tip (_radio_vector, Glib::ustring(
+    _radio_vector.set_tooltip_text (Glib::ustring(
                         _("Render using Cairo vector operations.  "
                         "The resulting image is usually smaller in file "
                         "size and can be arbitrarily scaled, but some "
                         "filter effects will not be correctly rendered.")));
-    _tt.set_tip (_radio_bitmap, Glib::ustring(
+    _radio_bitmap.set_tooltip_text (Glib::ustring(
                         _("Render everything as bitmap.  The resulting image "
                         "is usually larger in file size and cannot be "
                         "arbitrarily scaled without quality loss, but all "
diff --git a/src/ui/widget/rendering-options.h b/src/ui/widget/rendering-options.h
index 241683fe6..b29c4bfae 100644
--- a/src/ui/widget/rendering-options.h
+++ b/src/ui/widget/rendering-options.h
@@ -43,9 +43,6 @@ protected:
     Gtk::Frame       _frame_bitmap;
     Scalar           _dpi; // DPI of bitmap to render
 
-    // Tooltip manager
-    Gtk::Tooltips    _tt;
-
     // callback for bitmap button
     void _toggled();
 };
diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index d159ecc15..9490ac8d9 100644
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -27,8 +27,8 @@ SpinSlider::SpinSlider(double value, double lower, double upper, double step_inc
     pack_start(_scale);
     pack_start(_spin, false, false);
     if (tip_text){
-        _tt.set_tip(_scale, tip_text);
-        _tt.set_tip(_spin, tip_text);
+        _scale.set_tooltip_text(tip_text);
+        _spin.set_tooltip_text(tip_text);
     }
 
     _scale.set_draw_value(false);
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index aa749fb39..5846a0c64 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -79,7 +79,7 @@ void ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& la
     _hscale->set_size_request (100, -1);
     _old_val = 10;
     _hscale->set_value (_old_val);
-    _tt.set_tip (*_hscale, tip1);
+    _hscale->set_tooltip_text (tip1);
     _hbox->add (*_hscale);    
     
     
@@ -91,8 +91,8 @@ void ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& la
     _radio_button_group = _button1->get_group();
     _button2 = manage (new Gtk::RadioButton);
     _button2->set_group(_radio_button_group);    
-    _tt.set_tip (*_button1, tip2);
-    _tt.set_tip (*_button2, tip3);    
+    _button1->set_tooltip_text (tip2);
+    _button2->set_tooltip_text (tip3);    
     _button1->add (*theLabel3);
     _button1->set_alignment (0.0, 0.5);    
     _button2->add (*theLabel2);
diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h
index 6865ec769..59e63bd25 100644
--- a/src/ui/widget/tolerance-slider.h
+++ b/src/ui/widget/tolerance-slider.h
@@ -59,7 +59,6 @@ protected:
     Gtk::RadioButtonGroup _radio_button_group;
     Gtk::RadioButton  *_button1;
     Gtk::RadioButton  *_button2;
-    Gtk::Tooltips      _tt;
     Registry          *_wr;
     Glib::ustring      _key;
     sigc::connection   _scale_changed_connection;
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 6b22bd396..fcf66a33a 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -55,10 +55,8 @@ SPDashSelector::SPDashSelector() {
     // TODO: find something more sensible here!!
     init_dashes();
 
-    Gtk::Tooltips *tt = new Gtk::Tooltips();
-
     dash = new Gtk::OptionMenu();
-    tt->set_tip(*dash, _("Dash pattern"));
+    dash->set_tooltip_text(_("Dash pattern"));
     dash->show();
     this->pack_start(*dash, false, false, 0);
 
@@ -73,7 +71,7 @@ SPDashSelector::SPDashSelector() {
 
     offset = new Gtk::Adjustment(0.0, 0.0, 10.0, 0.1, 1.0, 0.0);
     Inkscape::UI::Widget::SpinButton *sb = new Inkscape::UI::Widget::SpinButton(*offset, 0.1, 2);
-    tt->set_tip(*sb, _("Pattern offset"));
+    sb->set_tooltip_text(_("Pattern offset"));
 
     sp_dialog_defocus_on_enter_cpp(sb);
     sb->show();