Cleanup GSEAL issues and deprecated GtkTooltips

(bzr r10826)

12 files changed, 13 insertions, 30 deletions

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);
     }