X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Futils.cc;h=19f93ad2e82b8005a08790ed341827c0e97ce945;hb=cd0d68a591ee64bb0e85d9a364af9fe6abdeecbe;hp=62144ffd6936b67ccb40c8b1f0ab441f6ecfabe6;hpb=05d80120bff799e3234f883568b5dc6e89a3ec27;p=ardour.git

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 62144ffd69..19f93ad2e8 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -25,6 +25,8 @@
 #include <pango/pangocairo.h> // for fontmap resolution control for GnomeCanvas
 
 #include <cstdlib>
+#include <clocale>
+#include <cstring>
 #include <cctype>
 #include <fstream>
 #include <list>
@@ -226,13 +228,13 @@ get_font_for_style (string widgetname)
 
 	Glib::RefPtr<const Pango::Layout> layout = foobar.get_layout();
 
-	PangoFontDescription *pfd = (PangoFontDescription *)pango_layout_get_font_description((PangoLayout *)layout->gobj());
+	PangoFontDescription *pfd = const_cast<PangoFontDescription *> (pango_layout_get_font_description(const_cast<PangoLayout *>(layout->gobj())));
 
 	if (!pfd) {
 
 		/* layout inherited its font description from a PangoContext */
 
-		PangoContext* ctxt = (PangoContext*) pango_layout_get_context ((PangoLayout*) layout->gobj());
+		PangoContext* ctxt = (PangoContext*) pango_layout_get_context (const_cast<PangoLayout*>(layout->gobj()));
 		pfd =  pango_context_get_font_description (ctxt);
 		return Pango::FontDescription (pfd); /* make a copy */
 	}
@@ -549,7 +551,7 @@ get_icon (const char* cname)
 	} catch (const Gdk::PixbufError &e) {
 		cerr << "Caught PixbufError: " << e.what() << endl;
 	} catch (...) {
-		g_message("Caught ... ");
+		error << string_compose (_("Caught exception while loading icon named %1"), cname) << endmsg;
 	}
 
 	return img;
@@ -586,11 +588,48 @@ longest (vector<string>& strings)
 bool
 key_is_legal_for_numeric_entry (guint keyval)
 {
+	/* we assume that this does not change over the life of the process 
+	 */
+
+	static int comma_decimal = -1;
+
 	switch (keyval) {
-	case GDK_minus:
-	case GDK_plus:
 	case GDK_period:
 	case GDK_comma:
+		if (comma_decimal < 0) {
+			std::lconv* lc = std::localeconv();
+			if (strchr (lc->decimal_point, ',') != 0) {
+				comma_decimal = 1;
+			} else {
+				comma_decimal = 0;
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
+	switch (keyval) {
+	case GDK_decimalpoint:
+	case GDK_KP_Separator:
+		return true;
+
+	case GDK_period:
+		if (comma_decimal) {
+			return false;
+		} else {
+			return true;
+		}
+		break;
+	case GDK_comma:
+		if (comma_decimal) {
+			return true;
+		} else {
+			return false;
+		}
+		break;
+	case GDK_minus:
+	case GDK_plus:
 	case GDK_0:
 	case GDK_1:
 	case GDK_2:
@@ -637,7 +676,7 @@ set_pango_fontsize ()
 
 	/* FT2 rendering - used by GnomeCanvas, sigh */
 
-	pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_for_display(), val/1024, val/1024);
+	pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024);
 
 	/* Cairo rendering, in case there is any */