Remove tooltips() member from ARDOUR_UI and use Gtk_UI::set_tip

5 files changed, 10 insertions, 15 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index e08b92b881..c61f53547b 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -558,8 +558,6 @@ ARDOUR_UI::post_engine ()
 	AudioEngine::instance()->Halted.connect_same_thread (halt_connection, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
 	AudioEngine::instance()->BecameSilent.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::audioengine_became_silent, this), gui_context());
 
-	_tooltips.enable();
-
 	if (setup_windows ()) {
 		throw failed_constructor ();
 	}
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 9e69038493..7d3d4adf23 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -202,8 +202,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void toggle_mixer_space();
 	void toggle_keep_tearoffs();
 
-	Gtk::Tooltips& tooltips() { return _tooltips; }
-
 	static PublicEditor* _instance;
 
 	/** Emitted frequently with the audible frame, false, and the edit point as
@@ -338,7 +336,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
   private:
 	PublicEditor*        editor;
 	Mixer_UI*            mixer;
-	Gtk::Tooltips       _tooltips;
 	NSM_Client*          nsm;
 	bool                _was_dirty;
         bool                _mixer_on_top;
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 832dfee4ab..3a080191a4 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -320,15 +320,15 @@ LocationEditRow::set_location (Location *loc)
 		ARDOUR_UI::instance()->set_tip (end_clock, _("End time - middle click to locate here"));
 		ARDOUR_UI::instance()->set_tip (length_clock, _("Length"));
 
-		ARDOUR_UI::instance()->tooltips().set_tip (start_to_playhead_button, _("Set range start from playhead location"));
-		ARDOUR_UI::instance()->tooltips().set_tip (end_to_playhead_button, _("Set range end from playhead location"));
+		ARDOUR_UI::instance()->set_tip (start_to_playhead_button, _("Set range start from playhead location"));
+		ARDOUR_UI::instance()->set_tip (end_to_playhead_button, _("Set range end from playhead location"));
 		
 	} else {
 
 		ARDOUR_UI::instance()->set_tip (remove_button, _("Remove this marker"));
 		ARDOUR_UI::instance()->set_tip (start_clock, _("Position - middle click to locate here"));
 
-		ARDOUR_UI::instance()->tooltips().set_tip (start_to_playhead_button, _("Set marker time from playhead location"));
+		ARDOUR_UI::instance()->set_tip (start_to_playhead_button, _("Set marker time from playhead location"));
 
 		end_clock.hide();
 		length_clock.hide();
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index bae774d314..eb54b04bdd 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -139,19 +139,19 @@ MonitorSection::MonitorSection (Session* s)
 	solo_model_box.show ();
 
 	act = ActionManager::get_action (X_("Solo"), X_("solo-use-in-place"));
-	ARDOUR_UI::instance()->tooltips().set_tip (solo_in_place_button, _("Solo controls affect solo-in-place"));
+	ARDOUR_UI::instance()->set_tip (solo_in_place_button, _("Solo controls affect solo-in-place"));
 	if (act) {
 		solo_in_place_button.set_related_action (act);
 	}
 
 	act = ActionManager::get_action (X_("Solo"), X_("solo-use-afl"));
-	ARDOUR_UI::instance()->tooltips().set_tip (afl_button, _("Solo controls toggle after-fader-listen"));
+	ARDOUR_UI::instance()->set_tip (afl_button, _("Solo controls toggle after-fader-listen"));
 	if (act) {
 		afl_button.set_related_action (act);
 	}
 
 	act = ActionManager::get_action (X_("Solo"), X_("solo-use-pfl"));
-	ARDOUR_UI::instance()->tooltips().set_tip (pfl_button, _("Solo controls toggle pre-fader-listen"));
+	ARDOUR_UI::instance()->set_tip (pfl_button, _("Solo controls toggle pre-fader-listen"));
 	if (act) {
 		pfl_button.set_related_action (act);
 	}
@@ -161,7 +161,7 @@ MonitorSection::MonitorSection (Session* s)
 	solo_boost_control = new ArdourKnob ();
 	solo_boost_control->set_name("monitor knob");
 	solo_boost_control->set_size_request (PX_SCALE(40), PX_SCALE(40));
-	ARDOUR_UI::instance()->tooltips().set_tip (*solo_boost_control, _("Gain increase for soloed signals (0dB is normal)"));
+	ARDOUR_UI::instance()->set_tip (*solo_boost_control, _("Gain increase for soloed signals (0dB is normal)"));
 
 	solo_boost_display = new ArdourDisplay ();
 	solo_boost_display->set_name("monitor section cut");
@@ -190,7 +190,7 @@ MonitorSection::MonitorSection (Session* s)
 	solo_cut_control = new ArdourKnob ();
 	solo_cut_control->set_name ("monitor knob");
 	solo_cut_control->set_size_request (PX_SCALE(40), PX_SCALE(40));
-	ARDOUR_UI::instance()->tooltips().set_tip (*solo_cut_control, _("Gain reduction non-soloed signals\nA value above -inf dB causes \"solo-in-front\""));
+	ARDOUR_UI::instance()->set_tip (*solo_cut_control, _("Gain reduction non-soloed signals\nA value above -inf dB causes \"solo-in-front\""));
 
 	solo_cut_display = new ArdourDisplay ();
 	solo_cut_display->set_name("monitor section cut");
@@ -216,7 +216,7 @@ MonitorSection::MonitorSection (Session* s)
 	dim_control = new ArdourKnob (ArdourKnob::default_elements, ArdourKnob::Detent);
 	dim_control->set_name ("monitor knob");
 	dim_control->set_size_request (PX_SCALE(40), PX_SCALE(40));
-	ARDOUR_UI::instance()->tooltips().set_tip (*dim_control, _("Gain reduction to use when dimming monitor outputs"));
+	ARDOUR_UI::instance()->set_tip (*dim_control, _("Gain reduction to use when dimming monitor outputs"));
 
 	dim_display = new ArdourDisplay ();
 	dim_display->set_name("monitor section cut");
diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc
index 4c71eb8ec2..911bf285c0 100644
--- a/gtk2_ardour/session_dialog.cc
+++ b/gtk2_ardour/session_dialog.cc
@@ -360,7 +360,7 @@ SessionDialog::setup_initial_choice_box ()
 		Gtk::Button *updates_button = manage (new Gtk::Button (_("Check the website for more...")));
 
 		updates_button->signal_clicked().connect (mem_fun(*this, &SessionDialog::updates_button_clicked) );
-		ARDOUR_UI::instance()->tooltips().set_tip (*updates_button, _("Click to open the program website in your web browser"));
+		ARDOUR_UI::instance()->set_tip (*updates_button, _("Click to open the program website in your web browser"));
 
 		info_box->pack_start (*updates_button, false, false);