X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fruler.cc;h=9949836fa1bd5542cee115ad58669946be506f1e;hb=657ba64ad23eaaa3cbf0e2da778a185fbc47a354;hp=f55129662acdfb510beba6604429e950bd671e3a;hpb=218d3761544a84eb55e13de32ebc402ff66c7933;p=ardour.git

diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc
index f55129662a..9949836fa1 100644
--- a/libs/canvas/ruler.cc
+++ b/libs/canvas/ruler.cc
@@ -25,7 +25,6 @@
 #include "canvas/ruler.h"
 #include "canvas/types.h"
 #include "canvas/debug.h"
-#include "canvas/utils.h"
 #include "canvas/canvas.h"
 
 using namespace std;
@@ -103,13 +102,13 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
 	}
 
 	Rect self (item_to_window (get()));
-	boost::optional<Rect> i = self.intersection (area);
+	Rect i = self.intersection (area);
 
 	if (!i) {
 		return;
 	}
 
-	Rect intersection (i.get());
+	Rect intersection (i);
 
 	Distance height = self.height();
 
@@ -199,12 +198,12 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
 
 		cr->set_line_width (1.0);
 
-		set_source_rgba (cr, _divider_color_top);
+		Gtkmm2ext::set_source_rgba (cr, _divider_color_top);
 		cr->move_to (self.x0, self.y0 + _divide_height-1.0+0.5);
 		cr->line_to (self.x1, self.y0 + _divide_height-1.0+0.5);
 		cr->stroke ();
 
-		set_source_rgba (cr, _divider_color_bottom);
+		Gtkmm2ext::set_source_rgba (cr, _divider_color_bottom);
 		cr->move_to (self.x0, self.y0 + _divide_height+0.5);
 		cr->line_to (self.x1, self.y0 + _divide_height+0.5);
 		cr->stroke ();
@@ -222,7 +221,7 @@ Ruler::set_divide_height (double h)
 }
 
 void
-Ruler::set_divide_colors (Color t, Color b)
+Ruler::set_divide_colors (Gtkmm2ext::Color t, Gtkmm2ext::Color b)
 {
         _divider_color_bottom = b;
         _divider_color_top = t;