From 69b44ee82904744bd4e9ed6801ca9d0c42a49738 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Wed, 29 Apr 2015 23:14:58 +1000 Subject: [PATCH] Use tooltips.h in ArdourButton to remove ardour_ui.h inclusion --- gtk2_ardour/ardour_button.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc index 7fbc0f0d48..756f8dfc94 100644 --- a/gtk2_ardour/ardour_button.cc +++ b/gtk2_ardour/ardour_button.cc @@ -24,6 +24,7 @@ #include #include "pbd/compose.h" +#include "pbd/controllable.h" #include "pbd/error.h" #include "pbd/stacktrace.h" @@ -35,7 +36,7 @@ #include "canvas/colors.h" #include "ardour_button.h" -#include "ardour_ui.h" +#include "tooltips.h" #include "ui_config.h" #include "i18n.h" @@ -47,6 +48,7 @@ using namespace Gdk; using namespace Gtk; using namespace Glib; using namespace PBD; +using namespace ARDOUR_UI_UTILS; using std::max; using std::min; using namespace std; @@ -1109,7 +1111,7 @@ void ArdourButton::action_tooltip_changed () { string str = _action->property_tooltip().get_value(); - ARDOUR_UI::instance()->set_tip (*this, str); + set_tooltip (*this, str); } void