summaryrefslogtreecommitdiff
path: root/libs/surfaces/push2/menu.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-07-17 18:34:35 +0200
committerRobin Gareus <robin@gareus.org>2017-07-17 21:06:04 +0200
commit601c317d70a03190257577bd867cefc2c70d3275 (patch)
tree077071290f084431a912414c4e87b6127c586677 /libs/surfaces/push2/menu.cc
parent1f5ebc54853446a786925941bd014666e75221d2 (diff)
Clean up library inheritance (colors.h, utils.h)
make libwidget independent of libcanvas. Confine basics to pbd and gtkmm2ext.
Diffstat (limited to 'libs/surfaces/push2/menu.cc')
-rw-r--r--libs/surfaces/push2/menu.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/surfaces/push2/menu.cc b/libs/surfaces/push2/menu.cc
index b6558ac0ff..5a70a0ebd0 100644
--- 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"
@@ -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);
}