Mixer list pane can shrink to zero width.

[ardour.git] / gtk2_ardour / ardour_button.cc

diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 7fbc0f0d48bd9cc1bd12f8d33f2171e5a921d03d..7eaa960980ba6b4117354c1e151bf84111e5f92a 100644 (file)
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -24,6 +24,7 @@
 #include <pangomm/layout.h>
 
 #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;
@@ -195,7 +197,7 @@ ArdourButton::set_alignment (const float xa, const float ya)
 /* TODO make this a dedicated function elsewhere.
  *
  * Option 1:
- * virtual ArdourButton::render_vector_icon() 
+ * virtual ArdourButton::render_vector_icon()
  * ArdourIconButton::render_vector_icon
  *
  * Option 2:
@@ -625,7 +627,7 @@ ArdourButton::set_colors ()
        /* The inactive color for the LED is just a fairly dark version of the
         * active color.
         */
-       
+
        ArdourCanvas::HSV inactive (led_active_color);
        inactive.v = 0.35;
 
@@ -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