Use XMLNode::get/set_property API in ARDOUR::MidiTrack class

[ardour.git] / libs / gtkmm2ext / cell_renderer_color_selector.cc

diff --git a/libs/gtkmm2ext/cell_renderer_color_selector.cc b/libs/gtkmm2ext/cell_renderer_color_selector.cc
index 6ed761132a68646d3dcf56fe19caae835df0644b..f8093cca1d0df2269f86faeaba1d961e185c6b05 100644 (file)
--- a/libs/gtkmm2ext/cell_renderer_color_selector.cc
+++ b/libs/gtkmm2ext/cell_renderer_color_selector.cc
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2011 Paul Davis
- 
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -46,7 +46,7 @@ CellRendererColorSelector::CellRendererColorSelector()
        c.set_red (0);
        c.set_green (0);
        c.set_blue (0);
-       
+
        property_color() = c;
 }
 
@@ -54,37 +54,42 @@ CellRendererColorSelector::~CellRendererColorSelector ()
 {
 }
 
-Glib::PropertyProxy<Gdk::Color> 
+Glib::PropertyProxy<Gdk::Color>
 CellRendererColorSelector::property_color()
 {
        return _property_color.get_proxy();
-} 
+}
 
-void 
+void
 CellRendererColorSelector::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& /*widget*/, const Gdk::Rectangle& /*background_area*/, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState /*flags*/)
 {
-       cairo_t* cr = gdk_cairo_create (window->gobj());
-       double r, g, b;
        Gdk::Color c = _property_color.get_value();
 
-       cairo_rectangle (cr, expose_area.get_x(), expose_area.get_y(), expose_area.get_width(), expose_area.get_height());
-       cairo_clip (cr);
+       if (c.gobj() != 0) {
+
+               cairo_t* cr = gdk_cairo_create (window->gobj());
+               double r, g, b;
+               Gdk::Color c = _property_color.get_value();
+
+               cairo_rectangle (cr, expose_area.get_x(), expose_area.get_y(), expose_area.get_width(), expose_area.get_height());
+               cairo_clip (cr);
 
-       r = c.get_red_p();
-       g = c.get_green_p();
-       b = c.get_blue_p();
+               r = c.get_red_p();
+               g = c.get_green_p();
+               b = c.get_blue_p();
 
-       cairo_rectangle_t drawing_rect;
+               cairo_rectangle_t drawing_rect;
 
-       drawing_rect.x = cell_area.get_x() + property_xpad();
-       drawing_rect.y = cell_area.get_y() + property_ypad();
-       drawing_rect.width = cell_area.get_width() - (2 * property_xpad());
-       drawing_rect.height = cell_area.get_height() - (2 * property_ypad());
+               drawing_rect.x = cell_area.get_x() + property_xpad();
+               drawing_rect.y = cell_area.get_y() + property_ypad();
+               drawing_rect.width = cell_area.get_width() - (2 * property_xpad());
+               drawing_rect.height = cell_area.get_height() - (2 * property_ypad());
 
-       Gtkmm2ext::rounded_rectangle (cr, drawing_rect.x, drawing_rect.y, drawing_rect.width, drawing_rect.height, 5);
-       cairo_set_source_rgb (cr, r, g, b);
-       cairo_fill (cr);
+               Gtkmm2ext::rounded_rectangle (cr, drawing_rect.x, drawing_rect.y, drawing_rect.width, drawing_rect.height, 5);
+               cairo_set_source_rgb (cr, r, g, b);
+               cairo_fill (cr);
 
-       cairo_destroy (cr);
+               cairo_destroy (cr);
+       }
 }