start using ActionMap in preference to ActionManager

[ardour.git] / gtk2_ardour / led.cc

diff --git a/gtk2_ardour/led.cc b/gtk2_ardour/led.cc
index e2e4b281056455bd1511911b93b348419c445369..6112f9c429547f76a48892a77ae1a634d4da4a52 100644 (file)
--- a/gtk2_ardour/led.cc
+++ b/gtk2_ardour/led.cc
@@ -26,6 +26,7 @@
 using namespace Gdk;
 using namespace Gtk;
 using namespace Glib;
+using namespace Gtkmm2ext;
 
 LED::LED()
        : _diameter (0.0)
@@ -41,10 +42,11 @@ LED::~LED()
 }
 
 void
-LED::render (cairo_t* cr)
+LED::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_t*)
 {
+       cairo_t* cr = ctx->cobj();
        if (!_fixed_diameter) {
-               _diameter = std::min (_width, _height);
+               _diameter = std::min (get_width(), get_height());
        }
 
        //background
@@ -74,7 +76,7 @@ LED::render (cairo_t* cr)
        cairo_fill(cr);
 #endif
 
-       cairo_translate(cr, _width/2, _height/2);
+       cairo_translate(cr, get_width()/2, get_height()/2);
 
        //inset
        cairo_pattern_t *pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, _diameter);
@@ -91,7 +93,7 @@ LED::render (cairo_t* cr)
        cairo_fill(cr);
 
        //knob color
-       cairo_set_source_rgba (cr, _red, _green, _blue, (active_state() == Active) ? 0.8 : 0.2);
+       cairo_set_source_rgba (cr, _red, _green, _blue, (active_state() == Gtkmm2ext::ExplicitActive) ? 0.8 : 0.2);
        cairo_arc (cr, 0, 0, _diameter/2-3, 0, 2 * M_PI);
        cairo_fill(cr);
 
@@ -145,7 +147,7 @@ LED::set_colors_from_style ()
        Color c;
 
        switch (_visual_state) {
-       case 0:
+       case VisualState(0):
                c = style->get_fg (STATE_NORMAL);
                break;
        default: