#include <cairomm/cairomm.h>
-#include "ardour/utils.h"
-
#include "pbd/compose.h"
#include "pbd/convert.h"
#include "canvas/fill.h"
#include "canvas/item.h"
#include "canvas/types.h"
-#include "canvas/utils.h"
-#include "canvas/colors.h"
using namespace std;
using namespace ArdourCanvas;
}
void
-Fill::set_fill_color (Color color)
+Fill::set_fill_color (Gtkmm2ext::Color color)
{
if (_fill_color != color) {
_self.begin_visual_change ();
_fill_color = color;
double r, g, b, a;
- color_to_rgba (color, r, g, b, a);
+ Gtkmm2ext::color_to_rgba (color, r, g, b, a);
if (a == 0.0) {
_transparent = true;
} else {
if (_pattern) {
context->set_source (_pattern);
} else {
- set_source_rgba (context, _fill_color);
+ Gtkmm2ext::set_source_rgba (context, _fill_color);
}
}
for (StopList::const_iterator s = _stops.begin(); s != _stops.end(); ++s) {
double r, g, b, a;
- color_to_rgba (s->second, r, g, b, a);
+ Gtkmm2ext::color_to_rgba (s->second, r, g, b, a);
_gradient->add_color_stop_rgba (s->first, r, g, b, a);
}