OSC: add group sharing bit feedback

[ardour.git] / libs / surfaces / push2 / menu.cc

diff --git a/libs/surfaces/push2/menu.cc b/libs/surfaces/push2/menu.cc
index 116da8aded43b2005df25ce7abafd78d58afb696..5a70a0ebd06429c74132e78cb3fd4b0427ff276b 100644 (file)
--- a/libs/surfaces/push2/menu.cc
+++ b/libs/surfaces/push2/menu.cc
@@ -26,7 +26,7 @@
 #include "canvas/text.h"
 #include "canvas/types.h"
 #include "canvas/rectangle.h"
-#include "canvas/colors.h"
+#include "gtkmm2ext/colors.h"
 
 #include "canvas.h"
 #include "gui.h"
@@ -230,7 +230,7 @@ Push2Menu::set_active (uint32_t index)
 
        /* set text color for old active item, and the new one */
 
-       if (_active <= displays.size()) {
+       if (_active < displays.size()) {
                displays[_active]->set_color (text_color);
        }
 
@@ -262,7 +262,7 @@ Push2Menu::set_active (uint32_t index)
 }
 
 void
-Push2Menu::set_text_color (Color c)
+Push2Menu::set_text_color (Gtkmm2ext::Color c)
 {
        text_color = c;
 
@@ -273,10 +273,10 @@ Push2Menu::set_text_color (Color c)
 }
 
 void
-Push2Menu::set_active_color (Color c)
+Push2Menu::set_active_color (Gtkmm2ext::Color c)
 {
        active_color = c;
-       contrast_color = contrasting_text_color (active_color);
+       contrast_color = Gtkmm2ext::contrasting_text_color (active_color);
        if (active_bg) {
                active_bg->set_fill_color (c);
        }