X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Futils.cc;h=bdb44090c3041d612cfa7e46c6f1cc6f1b3aef04;hb=d169864b5bd08c9dbd064e8543ebd074e5695216;hp=c10497a8fbc847f21772357b157b69114c80ea7d;hpb=c6747c93252f3a0bd8751575a0fce2107846e6cd;p=ardour.git

diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index c10497a8fb..bdb44090c3 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -20,6 +20,7 @@
 
 #include <map>
 #include <algorithm>
+#include <iostream>
 
 #include <gtk/gtkpaned.h>
 #include <gtk/gtk.h>
@@ -43,7 +44,7 @@ using namespace std;
 void
 Gtkmm2ext::init (const char* localedir)
 {
-#ifdef ENABLE_NLS
+#if ENABLE_NLS
 	(void) bindtextdomain(PACKAGE, localedir);
 	(void) bind_textdomain_codeset (PACKAGE, "UTF-8");
 #endif
@@ -685,7 +686,11 @@ Gtkmm2ext::rounded_right_half_rectangle (Cairo::RefPtr<Cairo::Context> context,
 void
 Gtkmm2ext::rounded_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
 {
-	double degrees = M_PI / 180.0;
+	static const double degrees = M_PI / 180.0;
+	if (r < 1) {
+		cairo_rectangle (cr, x, y, w, h);
+		return;
+	}
 
 	cairo_new_sub_path (cr);
 	cairo_arc (cr, x + w - r, y + r, r, -90 * degrees, 0 * degrees);  //tr
@@ -698,7 +703,7 @@ Gtkmm2ext::rounded_rectangle (cairo_t* cr, double x, double y, double w, double
 void
 Gtkmm2ext::rounded_left_half_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
 {
-	double degrees = M_PI / 180.0;
+	static const double degrees = M_PI / 180.0;
 
 	cairo_new_sub_path (cr);
 	cairo_line_to (cr, x+w, y); // tr
@@ -711,7 +716,7 @@ Gtkmm2ext::rounded_left_half_rectangle (cairo_t* cr, double x, double y, double
 void
 Gtkmm2ext::rounded_right_half_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
 {
-	double degrees = M_PI / 180.0;
+	static const double degrees = M_PI / 180.0;
 
 	cairo_new_sub_path (cr);
 	cairo_arc (cr, x + w - r, y + r, r, -90 * degrees, 0 * degrees);  //tr
@@ -724,7 +729,7 @@ Gtkmm2ext::rounded_right_half_rectangle (cairo_t* cr, double x, double y, double
 void
 Gtkmm2ext::rounded_top_half_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
 {
-	double degrees = M_PI / 180.0;
+	static const double degrees = M_PI / 180.0;
 
 	cairo_new_sub_path (cr);
 	cairo_move_to (cr, x+w, y+h);
@@ -737,7 +742,7 @@ Gtkmm2ext::rounded_top_half_rectangle (cairo_t* cr, double x, double y, double w
 void
 Gtkmm2ext::rounded_bottom_half_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
 {
-	double degrees = M_PI / 180.0;
+	static const double degrees = M_PI / 180.0;
 
 	cairo_new_sub_path (cr);
 	cairo_move_to (cr, x, y);
@@ -751,7 +756,7 @@ Gtkmm2ext::rounded_bottom_half_rectangle (cairo_t* cr, double x, double y, doubl
 void
 Gtkmm2ext::rounded_top_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
 {
-	double degrees = M_PI / 180.0;
+	static const double degrees = M_PI / 180.0;
 
 	cairo_new_sub_path (cr);
 	cairo_move_to (cr, x+w, y+h);
@@ -1109,7 +1114,7 @@ Gtkmm2ext::add_volume_shortcuts (Gtk::FileChooser& c)
 			}
 		}
 	}
-	catch (Glib::FileError& e) {
+	catch (Glib::FileError const& e) {
 		std::cerr << "listing /Volumnes failed: " << e.what() << std::endl;
 	}
 #endif