More deprecated GtkTooltips

(bzr r10827)

12 files changed, 47 insertions, 100 deletions

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 708013b5d..2647cd569 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -60,7 +60,6 @@ public :
            const Glib::ustring &tiptext,
            guint row, guint column,
            Gtk::Table &parent,
-           Gtk::Tooltips &tooltips,
            AlignAndDistribute &dialog):
         _dialog(dialog),
         _id(id),
@@ -75,7 +74,7 @@ public :
 
         pButton->signal_clicked()
             .connect(sigc::mem_fun(*this, &Action::on_button_click));
-        tooltips.set_tip(*pButton, tiptext);
+        pButton->set_tooltip_text(tiptext);
         parent.attach(*pButton, column, column+1, row, row+1, Gtk::FILL, Gtk::FILL);
     }
     virtual ~Action(){}
@@ -102,7 +101,7 @@ public :
                 AlignAndDistribute &dialog,
                 guint coeffIndex):
         Action(id, tiptext, row, column,
-               dialog.align_table(), dialog.tooltips(), dialog),
+               dialog.align_table(), dialog),
         _index(coeffIndex),
         _dialog(dialog)
     {}
@@ -292,7 +291,7 @@ public :
                      double kBegin, double kEnd
         ):
         Action(id, tiptext, row, column,
-               dialog.distribute_table(), dialog.tooltips(), dialog),
+               dialog.distribute_table(), dialog),
         _dialog(dialog),
         _onInterSpace(onInterSpace),
         _orientation(orientation),
@@ -419,7 +418,7 @@ public :
                AlignAndDistribute &dialog,
                Geom::Dim2 orientation, bool distribute):
         Action(id, tiptext, 0, column,
-               dialog.nodes_table(), dialog.tooltips(), dialog),
+               dialog.nodes_table(), dialog),
         _orientation(orientation),
         _distribute(distribute)
     {}
@@ -457,7 +456,7 @@ public:
                          guint column,
                          AlignAndDistribute &dialog) :
         Action(id, tiptext, row, column + 4,
-               dialog.removeOverlap_table(), dialog.tooltips(), dialog)
+               dialog.removeOverlap_table(), dialog)
     {
         dialog.removeOverlap_table().set_col_spacings(3);
 
@@ -466,8 +465,7 @@ public:
         removeOverlapXGap.set_increments(1.0, 0);
         removeOverlapXGap.set_range(-1000.0, 1000.0);
         removeOverlapXGap.set_value(0);
-        dialog.tooltips().set_tip(removeOverlapXGap,
-                                  _("Minimum horizontal gap (in px units) between bounding boxes"));
+        removeOverlapXGap.set_tooltip_text(_("Minimum horizontal gap (in px units) between bounding boxes"));
         //TRANSLATORS: "H:" stands for horizontal gap
         removeOverlapXGapLabel.set_text_with_mnemonic(C_("Gap", "_H:"));
         removeOverlapXGapLabel.set_mnemonic_widget(removeOverlapXGap);
@@ -477,8 +475,7 @@ public:
         removeOverlapYGap.set_increments(1.0, 0);
         removeOverlapYGap.set_range(-1000.0, 1000.0);
         removeOverlapYGap.set_value(0);
-        dialog.tooltips().set_tip(removeOverlapYGap,
-                                  _("Minimum vertical gap (in px units) between bounding boxes"));
+        removeOverlapYGap.set_tooltip_text(_("Minimum vertical gap (in px units) between bounding boxes"));
         /* TRANSLATORS: Vertical gap */
         removeOverlapYGapLabel.set_text_with_mnemonic(C_("Gap", "_V:"));
         removeOverlapYGapLabel.set_mnemonic_widget(removeOverlapYGap);
@@ -522,7 +519,7 @@ public:
                          guint column,
                          AlignAndDistribute &dialog) :
         Action(id, tiptext, row, column,
-               dialog.rearrange_table(), dialog.tooltips(), dialog)
+               dialog.rearrange_table(), dialog)
     {}
 
 private :
@@ -559,7 +556,7 @@ public:
                          guint column,
                          AlignAndDistribute &dialog, SortOrder order = None) :
         Action(id, tiptext, row, column,
-               dialog.rearrange_table(), dialog.tooltips(), dialog),
+               dialog.rearrange_table(), dialog),
         sortOrder(order)
     {};
 
@@ -649,7 +646,7 @@ public :
                guint column,
                AlignAndDistribute &dialog):
         Action(id, tiptext, row, column,
-               dialog.rearrange_table(), dialog.tooltips(), dialog)
+               dialog.rearrange_table(), dialog)
     {}
 
 private :
@@ -680,7 +677,7 @@ public :
                guint column,
                AlignAndDistribute &dialog):
         Action(id, tiptext, row, column,
-               dialog.rearrange_table(), dialog.tooltips(), dialog)
+               dialog.rearrange_table(), dialog)
     {}
 
 private :
@@ -770,7 +767,7 @@ public :
                Gtk::Table &table,
                Geom::Dim2 orientation, bool distribute):
         Action(id, tiptext, row, column,
-               table, dialog.tooltips(), dialog),
+               table, dialog),
         _orientation(orientation),
         _distribute(distribute)
     {}
diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h
index 88d934f87..4fdb448a9 100644
--- a/src/ui/dialog/align-and-distribute.h
+++ b/src/ui/dialog/align-and-distribute.h
@@ -20,7 +20,6 @@
 
 #include <list>
 #include <gtkmm/frame.h>
-#include <gtkmm/tooltips.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/table.h>
 #include <gtkmm/buttonbox.h>
@@ -55,7 +54,6 @@ public:
     Gtk::Table &rearrange_table(){return _rearrangeTable;}
     Gtk::Table &removeOverlap_table(){return _removeOverlapTable;}
     Gtk::Table &nodes_table(){return _nodesTable;}
-    Gtk::Tooltips &tooltips(){return _tooltips;}
 
     std::list<SPItem *>::iterator find_master(std::list <SPItem *> &list, bool horizontal);
     void setMode(bool nodeEdit);
@@ -105,7 +103,6 @@ protected:
     Gtk::Label _selgrpLabel;
     Gtk::CheckButton _selgrp;
     Gtk::ComboBoxText _combo;
-    Gtk::Tooltips _tooltips;
 
 private:
     AlignAndDistribute(AlignAndDistribute const &d);
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index f245cec37..ccab8c9e1 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -584,7 +584,7 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS
         Gtk::Widget* newBlot = btn;
 */
 
-        tips.set_tip((*newBlot), def.descr);
+        newBlot->set_tooltip_text(def.descr);
 
 /*
         newBlot->signal_clicked().connect( sigc::mem_fun(*this, &ColorItem::buttonClicked) );
diff --git a/src/ui/dialog/color-item.h b/src/ui/dialog/color-item.h
index d06082f2e..e6f5c7b76 100644
--- a/src/ui/dialog/color-item.h
+++ b/src/ui/dialog/color-item.h
@@ -13,7 +13,6 @@
 #define SEEN_DIALOGS_COLOR_ITEM_H
 
 #include <boost/ptr_container/ptr_vector.hpp>
-#include <gtkmm/tooltips.h>
 
 #include "widgets/ege-paint-def.h"
 #include "ui/previewable.h"
@@ -93,7 +92,6 @@ private:
     void _linkTint( ColorItem& other, int percent );
     void _linkTone( ColorItem& other, int percent, int grayLevel );
 
-    Gtk::Tooltips tips;
     std::vector<Gtk::Widget*> _previews;
 
     bool _isFill;
diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h
index 92de83187..0afd5ee72 100644
--- a/src/ui/dialog/dialog.h
+++ b/src/ui/dialog/dialog.h
@@ -13,8 +13,7 @@
 #ifndef INKSCAPE_DIALOG_H
 #define INKSCAPE_DIALOG_H
 
-#include <gtkmm/dialog.h>
-#include <gtkmm/tooltips.h>
+#include <gtkmm.h>
 
 #include "dock-behavior.h"
 #include "floating-behavior.h"
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index 2aebef997..2b2661bfe 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -67,7 +67,6 @@ DocumentMetadata::DocumentMetadata()
       _page_metadata1(1, 1), _page_metadata2(1, 1)
 {
     hide();
-    _tt.enable();
     _getContents()->set_spacing (4);
     _getContents()->pack_start(_notebook, true, true);
 
@@ -161,7 +160,7 @@ DocumentMetadata::build_metadata()
     int row = 1;
     for (entity = rdf_work_entities; entity && entity->name; entity++, row++) {
         if ( entity->editable == RDF_EDIT_GENERIC ) {
-            EntityEntry *w = EntityEntry::create (entity, _tt, _wr);
+            EntityEntry *w = EntityEntry::create (entity, _wr);
             _rdflist.push_back (w);
             Gtk::HBox *space = manage (new Gtk::HBox);
             space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
@@ -180,7 +179,7 @@ DocumentMetadata::build_metadata()
     _page_metadata2.table().attach (*llabel, 0,3, row, row+1, Gtk::FILL, (Gtk::AttachOptions)0,0,0);
     /* add license selector pull-down and URI */
     ++row;
-    _licensor.init (_tt, _wr);
+    _licensor.init (_wr);
     Gtk::HBox *space = manage (new Gtk::HBox);
     space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
     _page_metadata2.table().attach (*space, 0,1, row, row+1, Gtk::FILL, (Gtk::AttachOptions)0,0,0);
diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h
index 8194b9920..e9e1789af 100644
--- a/src/ui/dialog/document-metadata.h
+++ b/src/ui/dialog/document-metadata.h
@@ -52,7 +52,6 @@ protected:
     void _handleActivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
     void _handleDeactivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
 
-    Gtk::Tooltips _tt;
     Gtk::Notebook  _notebook;
 
     UI::Widget::NotebookPage _page_metadata1;
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 3c70674fd..8a0808bd8 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -19,15 +19,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtkmm/cellrenderertext.h>
-#include <gtkmm/colorbutton.h>
-#include <gtkmm/messagedialog.h>
-#include <gtkmm/paned.h>
-#include <gtkmm/scale.h>
-#include <gtkmm/scrolledwindow.h>
+#include <gtkmm.h>
 #include "ui/widget/spinbutton.h"
-#include <gtkmm/stock.h>
-#include <gtkmm/tooltips.h>
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 61bb93415..22c765631 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -15,18 +15,7 @@
 
 #include <memory>
 
-#include <gtkmm/adjustment.h>
-#include <gtkmm/alignment.h>
-#include <gtkmm/box.h>
-#include <gtkmm/buttonbox.h>
-#include <gtkmm/comboboxtext.h>
-#include <gtkmm/drawingarea.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/liststore.h>
-#include <gtkmm/menu.h>
-#include <gtkmm/notebook.h>
-#include <gtkmm/sizegroup.h>
-#include <gtkmm/treeview.h>
+#include <gtkmm.h>
 
 #include "attributes.h"
 #include "ui/widget/panel.h"
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 9d1e314f7..50b63f701 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -668,7 +668,7 @@ TileDialog::TileDialog()
     NoOfRowsSpinner.set_range(1.0, 10000.0);
     NoOfRowsSpinner.set_value(PerCol);
     NoOfRowsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_col_spinbutton_changed));
-    tips.set_tip(NoOfRowsSpinner, _("Number of rows"));
+    NoOfRowsSpinner.set_tooltip_text(_("Number of rows"));
     NoOfRowsBox.pack_start(NoOfRowsSpinner, false, false, MARGIN);
     gtk_size_group_add_widget(_col1, (GtkWidget *) NoOfRowsBox.gobj());
 
@@ -683,7 +683,7 @@ TileDialog::TileDialog()
 
     NoOfRowsBox.pack_start(RowHeightButton, false, false, MARGIN);
 
-    tips.set_tip(RowHeightButton, _("If not set, each row has the height of the tallest object in it"));
+    RowHeightButton.set_tooltip_text(_("If not set, each row has the height of the tallest object in it"));
     RowHeightButton.signal_toggled().connect(sigc::mem_fun(*this, &TileDialog::on_RowSize_checkbutton_changed));
 
  {
@@ -740,7 +740,7 @@ TileDialog::TileDialog()
     NoOfColsSpinner.set_range(1.0, 10000.0);
     NoOfColsSpinner.set_value(PerRow);
     NoOfColsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_row_spinbutton_changed));
-    tips.set_tip(NoOfColsSpinner, _("Number of columns"));
+    NoOfColsSpinner.set_tooltip_text(_("Number of columns"));
     NoOfColsBox.pack_start(NoOfColsSpinner, false, false, MARGIN);
     gtk_size_group_add_widget(_col3, (GtkWidget *) NoOfColsBox.gobj());
 
@@ -754,7 +754,7 @@ TileDialog::TileDialog()
     ColumnWidthButton.set_active(AutoColSize);
     NoOfColsBox.pack_start(ColumnWidthButton, false, false, MARGIN);
 
-    tips.set_tip(ColumnWidthButton, _("If not set, each column has the width of the widest object in it"));
+    ColumnWidthButton.set_tooltip_text(_("If not set, each column has the width of the widest object in it"));
     ColumnWidthButton.signal_toggled().connect(sigc::mem_fun(*this, &TileDialog::on_ColSize_checkbutton_changed));
 
 
@@ -853,7 +853,7 @@ TileDialog::TileDialog()
     //## The OK button
     TileOkButton = addResponseButton(C_("Rows and columns dialog","_Arrange"), GTK_RESPONSE_APPLY);
     TileOkButton->set_use_underline(true);
-    tips.set_tip((*TileOkButton), _("Arrange selected objects"));
+    TileOkButton->set_tooltip_text(_("Arrange selected objects"));
 
     show_all_children();
 }
diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h
index fe77a9098..650239232 100644
--- a/src/ui/dialog/tile.h
+++ b/src/ui/dialog/tile.h
@@ -17,7 +17,6 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/notebook.h>
-#include <gtkmm/tooltips.h>
 #include <gtkmm/button.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/checkbutton.h>
@@ -78,7 +77,6 @@ private:
     bool updating;
 
     Gtk::Notebook   notebook;
-    Gtk::Tooltips   tips;
 
     Gtk::VBox             TileBox;
     Gtk::Button           *TileOkButton;
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 597c9a217..920ff0d2c 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -85,7 +85,6 @@ class TraceDialogImpl : public TraceDialog
     //############ General items
 
     Gtk::HBox             mainHBox;
-    Gtk::Tooltips         tips;
 
     Gtk::Button           *mainOkButton;
     Gtk::Button           *mainCancelButton;
@@ -408,16 +407,14 @@ TraceDialogImpl::TraceDialogImpl() :
     modeGroup = modeBrightnessRadioButton.get_group();
     modeBrightnessRadioButton.set_use_underline(true);
     modeBrightnessBox.pack_start(modeBrightnessRadioButton, false, false, MARGIN);
-    tips.set_tip(modeBrightnessRadioButton,
-                 _("Trace by a given brightness level"));
+    modeBrightnessRadioButton.set_tooltip_text(_("Trace by a given brightness level"));
 
     modeBrightnessSpinner.set_digits(3);
     modeBrightnessSpinner.set_increments(0.01, 0);
     modeBrightnessSpinner.set_range(0.0, 1.0);
     modeBrightnessSpinner.set_value(0.45);
     modeBrightnessBox.pack_end(modeBrightnessSpinner, false, false, MARGIN);
-    tips.set_tip(modeBrightnessSpinner,
-                 _("Brightness cutoff for black/white"));
+    modeBrightnessSpinner.set_tooltip_text(_("Brightness cutoff for black/white"));
 
     modeBrightnessSpinnerLabel.set_label(_("_Threshold:"));
     modeBrightnessSpinnerLabel.set_use_underline(true);
@@ -435,8 +432,7 @@ TraceDialogImpl::TraceDialogImpl() :
     modeCannyRadioButton.set_group(modeGroup);
     modeCannyRadioButton.set_use_underline(true);
     modeCannyBox.pack_start(modeCannyRadioButton, false, false, MARGIN);
-    tips.set_tip(modeCannyRadioButton,
-                 _("Trace with optimal edge detection by J. Canny's algorithm"));
+    modeCannyRadioButton.set_tooltip_text(_("Trace with optimal edge detection by J. Canny's algorithm"));
     /*
     modeCannyBox.pack_start(modeCannySeparator);
     modeCannyLoSpinnerLabel.set_label(_("Low"));
@@ -452,8 +448,7 @@ TraceDialogImpl::TraceDialogImpl() :
     modeCannyHiSpinner.set_range(0.0, 1.0);
     modeCannyHiSpinner.set_value(0.65);
     modeCannyBox.pack_end(modeCannyHiSpinner, false, false, MARGIN);
-    tips.set_tip(modeCannyHiSpinner,
-                 _("Brightness cutoff for adjacent pixels (determines edge thickness)"));
+    modeCannyHiSpinner.set_tooltip_text(_("Brightness cutoff for adjacent pixels (determines edge thickness)"));
 
     modeCannyHiSpinnerLabel.set_label(_("T_hreshold:"));
     modeCannyHiSpinnerLabel.set_use_underline(true);
@@ -471,16 +466,14 @@ TraceDialogImpl::TraceDialogImpl() :
     modeQuantRadioButton.set_group(modeGroup);
     modeQuantRadioButton.set_use_underline(true);
     modeQuantBox.pack_start(modeQuantRadioButton, false, false, MARGIN);
-    tips.set_tip(modeQuantRadioButton,
-                 _("Trace along the boundaries of reduced colors"));
+    modeQuantRadioButton.set_tooltip_text(_("Trace along the boundaries of reduced colors"));
 
     modeQuantNrColorSpinner.set_digits(0);
     modeQuantNrColorSpinner.set_increments(1.0, 0);
     modeQuantNrColorSpinner.set_range(2.0, 64.0);
     modeQuantNrColorSpinner.set_value(8.0);
     modeQuantBox.pack_end(modeQuantNrColorSpinner, false, false, MARGIN);
-    tips.set_tip(modeQuantNrColorSpinner,
-                 _("The number of reduced colors"));
+    modeQuantNrColorSpinner.set_tooltip_text(_("The number of reduced colors"));
 
     modeQuantNrColorLabel.set_label(_("_Colors:"));
     modeQuantNrColorLabel.set_mnemonic_widget(modeQuantNrColorSpinner);
@@ -495,8 +488,7 @@ TraceDialogImpl::TraceDialogImpl() :
     modeInvertButton.set_use_underline(true);
     modeInvertBox.pack_start(modeInvertButton, false, false, MARGIN);
     modeBrightnessVBox.pack_start(modeInvertBox, false, false, MARGIN);
-    tips.set_tip(modeInvertButton,
-                 _("Invert black and white regions"));
+    modeInvertButton.set_tooltip_text(_("Invert black and white regions"));
 
     modeBrightnessFrame.add(modeBrightnessVBox);
     modePageBox.pack_start(modeBrightnessFrame, false, false, 0);
@@ -509,8 +501,7 @@ TraceDialogImpl::TraceDialogImpl() :
     modeMultiScanBrightnessRadioButton.set_group(modeGroup);
     modeMultiScanBrightnessRadioButton.set_use_underline(true);
     modeMultiScanHBox1.pack_start(modeMultiScanBrightnessRadioButton, false, false, MARGIN);
-    tips.set_tip(modeMultiScanBrightnessRadioButton,
-                 _("Trace the given number of brightness levels"));
+    modeMultiScanBrightnessRadioButton.set_tooltip_text(_("Trace the given number of brightness levels"));
 
     modeMultiScanNrColorSpinner.set_digits(0);
     modeMultiScanNrColorSpinner.set_increments(1.0, 0);
@@ -521,8 +512,7 @@ TraceDialogImpl::TraceDialogImpl() :
     modeMultiScanNrColorLabel.set_use_underline(true);
     modeMultiScanNrColorLabel.set_mnemonic_widget(modeMultiScanNrColorSpinner);
     modeMultiScanHBox1.pack_end(modeMultiScanNrColorLabel, false, false, MARGIN);
-    tips.set_tip(modeMultiScanNrColorSpinner,
-                 _("The desired number of scans"));
+    modeMultiScanNrColorSpinner.set_tooltip_text(_("The desired number of scans"));
 
     modeMultiScanVBox.pack_start(modeMultiScanHBox1, false, false, MARGIN);
 
@@ -530,8 +520,7 @@ TraceDialogImpl::TraceDialogImpl() :
     modeMultiScanColorRadioButton.set_group(modeGroup);
     modeMultiScanColorRadioButton.set_use_underline(true);
     modeMultiScanHBox2.pack_start(modeMultiScanColorRadioButton, false, false, MARGIN);
-    tips.set_tip(modeMultiScanColorRadioButton,
-                 _("Trace the given number of reduced colors"));
+    modeMultiScanColorRadioButton.set_tooltip_text(_("Trace the given number of reduced colors"));
 
     modeMultiScanVBox.pack_start(modeMultiScanHBox2, false, false, MARGIN);
 
@@ -539,8 +528,7 @@ TraceDialogImpl::TraceDialogImpl() :
     modeMultiScanMonoRadioButton.set_group(modeGroup);
     modeMultiScanMonoRadioButton.set_use_underline(true);
     modeMultiScanHBox3.pack_start(modeMultiScanMonoRadioButton, false, false, MARGIN);
-    tips.set_tip(modeMultiScanMonoRadioButton,
-                 _("Same as Colors, but the result is converted to grayscale"));
+    modeMultiScanMonoRadioButton.set_tooltip_text(_("Same as Colors, but the result is converted to grayscale"));
 
     modeMultiScanVBox.pack_start(modeMultiScanHBox3, false, false, MARGIN);
 
@@ -549,15 +537,14 @@ TraceDialogImpl::TraceDialogImpl() :
     modeMultiScanSmoothButton.set_use_underline(true);
     modeMultiScanSmoothButton.set_active(true);
     modeMultiScanHBox4.pack_start(modeMultiScanSmoothButton, false, false, MARGIN);
-    tips.set_tip(modeMultiScanSmoothButton,
-                 _("Apply Gaussian blur to the bitmap before tracing"));
+    modeMultiScanSmoothButton.set_tooltip_text(_("Apply Gaussian blur to the bitmap before tracing"));
 
     // TRANSLATORS: "Stack" is a verb here
     modeMultiScanStackButton.set_label(_("Stac_k scans"));
     modeMultiScanStackButton.set_use_underline(true);
     modeMultiScanStackButton.set_active(true);
     modeMultiScanHBox4.pack_start(modeMultiScanStackButton, false, false, MARGIN);
-    tips.set_tip(modeMultiScanStackButton, _("Stack scans on top of one another (no gaps) instead of tiling (usually with gaps)"));
+    modeMultiScanStackButton.set_tooltip_text(_("Stack scans on top of one another (no gaps) instead of tiling (usually with gaps)"));
 
 
     modeMultiScanBackgroundButton.set_label(_("Remo_ve background"));
@@ -565,8 +552,7 @@ TraceDialogImpl::TraceDialogImpl() :
     modeMultiScanBackgroundButton.set_active(false);
     modeMultiScanHBox4.pack_start(modeMultiScanBackgroundButton, false, false, MARGIN);
     // TRANSLATORS: "Layer" refers to one of the stacked paths in the multiscan
-    tips.set_tip(modeMultiScanBackgroundButton,
-                 _("Remove bottom (background) layer when done"));
+    modeMultiScanBackgroundButton.set_tooltip_text(_("Remove bottom (background) layer when done"));
 
     modeMultiScanVBox.pack_start(modeMultiScanHBox4, false, false, MARGIN);
 
@@ -587,16 +573,14 @@ TraceDialogImpl::TraceDialogImpl() :
 
     optionsSpecklesButton.set_label(_("Suppress _speckles"));
     optionsSpecklesButton.set_use_underline(true);
-    tips.set_tip(optionsSpecklesButton,
-                 _("Ignore small spots (speckles) in the bitmap"));
+    optionsSpecklesButton.set_tooltip_text(_("Ignore small spots (speckles) in the bitmap"));
     optionsSpecklesButton.set_active(true);
     optionsSpecklesBox.pack_start(optionsSpecklesButton, false, false, MARGIN);
     optionsSpecklesSizeSpinner.set_digits(0);
     optionsSpecklesSizeSpinner.set_increments(1, 0);
     optionsSpecklesSizeSpinner.set_range(0, 1000);
     optionsSpecklesSizeSpinner.set_value(2);
-    tips.set_tip(optionsSpecklesSizeSpinner,
-                 _("Speckles of up to this many pixels will be suppressed"));
+    optionsSpecklesSizeSpinner.set_tooltip_text(_("Speckles of up to this many pixels will be suppressed"));
     optionsSpecklesBox.pack_end(optionsSpecklesSizeSpinner, false, false, MARGIN);
     optionsSpecklesSizeLabel.set_label(_("S_ize:"));
     optionsSpecklesSizeLabel.set_use_underline(true);
@@ -605,8 +589,7 @@ TraceDialogImpl::TraceDialogImpl() :
 
     optionsCornersButton.set_label(_("Smooth _corners"));
     optionsCornersButton.set_use_underline(true);
-    tips.set_tip(optionsCornersButton,
-                 _("Smooth out sharp corners of the trace"));
+    optionsCornersButton.set_tooltip_text(_("Smooth out sharp corners of the trace"));
     optionsCornersButton.set_active(true);
     optionsCornersBox.pack_start(optionsCornersButton, false, false, MARGIN);
     optionsCornersThresholdSpinner.set_digits(2);
@@ -614,8 +597,7 @@ TraceDialogImpl::TraceDialogImpl() :
     optionsCornersThresholdSpinner.set_range(0.0, 1.34);
     optionsCornersThresholdSpinner.set_value(1.0);
     optionsCornersBox.pack_end(optionsCornersThresholdSpinner, false, false, MARGIN);
-    tips.set_tip(optionsCornersThresholdSpinner,
-                 _("Increase this to smooth corners more"));
+    optionsCornersThresholdSpinner.set_tooltip_text(_("Increase this to smooth corners more"));
     optionsCornersThresholdLabel.set_label(_("_Threshold:"));
     optionsCornersThresholdLabel.set_use_underline(true);
     optionsCornersThresholdLabel.set_mnemonic_widget(optionsCornersThresholdSpinner);
@@ -624,16 +606,14 @@ TraceDialogImpl::TraceDialogImpl() :
     optionsOptimButton.set_label(_("Optimize p_aths"));
     optionsOptimButton.set_use_underline(true);
     optionsOptimButton.set_active(true);
-    tips.set_tip(optionsOptimButton,
-                 _("Try to optimize paths by joining adjacent Bezier curve segments"));
+    optionsOptimButton.set_tooltip_text(_("Try to optimize paths by joining adjacent Bezier curve segments"));
     optionsOptimBox.pack_start(optionsOptimButton, false, false, MARGIN);
     optionsOptimToleranceSpinner.set_digits(2);
     optionsOptimToleranceSpinner.set_increments(0.05, 0);
     optionsOptimToleranceSpinner.set_range(0.0, 5.0);
     optionsOptimToleranceSpinner.set_value(0.2);
     optionsOptimBox.pack_end(optionsOptimToleranceSpinner, false, false, MARGIN);
-    tips.set_tip(optionsOptimToleranceSpinner,
-                 _("Increase this to reduce the number of nodes in the trace by more aggressive optimization"));
+    optionsOptimToleranceSpinner.set_tooltip_text(_("Increase this to reduce the number of nodes in the trace by more aggressive optimization"));
     optionsOptimToleranceLabel.set_label(_("To_lerance:"));
     optionsOptimToleranceLabel.set_use_underline(true);
     optionsOptimToleranceLabel.set_mnemonic_widget(optionsOptimToleranceSpinner);
@@ -672,8 +652,7 @@ TraceDialogImpl::TraceDialogImpl() :
     sioxButton.set_label(_("SIOX _foreground selection"));
     sioxButton.set_use_underline(true);
     sioxBox.pack_start(sioxButton, false, false, MARGIN);
-    tips.set_tip(sioxButton,
-                 _("Cover the area you want to select as the foreground"));
+    sioxButton.set_tooltip_text(_("Cover the area you want to select as the foreground"));
     rightVBox.pack_start(sioxBox, false, false, 0);
 
     //## preview
@@ -684,8 +663,7 @@ TraceDialogImpl::TraceDialogImpl() :
          sigc::mem_fun(*this, &TraceDialogImpl::previewCallback) );
     previewVBox.pack_end(previewButton, false, false, 0);
     // I guess it's correct to call the "intermediate bitmap" a preview of the trace
-    tips.set_tip(previewButton,
-                 _("Preview the intermediate bitmap with the current settings, without actual tracing"));
+    previewButton.set_tooltip_text(_("Preview the intermediate bitmap with the current settings, without actual tracing"));
     previewImage.set_size_request(200,200);
     //previewImage.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
     previewVBox.pack_start(previewImage, true, true, 0);
@@ -706,11 +684,11 @@ TraceDialogImpl::TraceDialogImpl() :
     //## The OK button
     mainCancelButton = addResponseButton(Gtk::Stock::STOP, GTK_RESPONSE_CANCEL);
     if (mainCancelButton) {
-	tips.set_tip((*mainCancelButton), _("Abort a trace in progress"));
+	mainCancelButton->set_tooltip_text(_("Abort a trace in progress"));
 	mainCancelButton->set_sensitive(false);
     }
     mainOkButton = addResponseButton(Gtk::Stock::OK, GTK_RESPONSE_OK);
-    tips.set_tip((*mainOkButton), _("Execute the trace"));
+    mainOkButton->set_tooltip_text(_("Execute the trace"));
 
     show_all_children();