From 2044c12b7b8ced90073c494b4af6f049e6c6020b Mon Sep 17 00:00:00 2001 From: John Emmas Date: Fri, 21 Mar 2014 16:00:44 +0000 Subject: String object for Greek locale testing should have been Glib::ustring, rather than std::string (see my previous commit) --- gtk2_ardour/bundle_env_msvc.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/bundle_env_msvc.cc') diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc index 8a7fcc0d7d..d2c85b7935 100644 --- a/gtk2_ardour/bundle_env_msvc.cc +++ b/gtk2_ardour/bundle_env_msvc.cc @@ -252,10 +252,13 @@ string pango_modules_file; pango_modules_file += "\\"; pango_modules_file += PROGRAM_NAME; pango_modules_file += PANGO_CONF_LOCATION; -/* JE - handy for non-English locale testing (Greek, in this case) -pango_modules_file = Glib::locale_to_utf8("C:\\Program Files\\Mixbus3\\etc\\ΔΗΜΗΤΡΗΣ\\pango.modules"); +#if 0 +// JE - handy for non-English locale testing (Greek, in this case) + Glib::ustring pango_modules_path = Glib::locale_to_utf8("C:\\Program Files\\Mixbus3\\etc\\ΔΗΜΗΤΡΗΣ\\pango.modules"); /**/ +#else Glib::ustring pango_modules_path = pango_modules_file; +#endif pango_modules_path.resize (pango_modules_path.size()-14); // Remove "/pango.modules" from the end #else if (PBD::find_file_in_search_path (ARDOUR::ardour_config_search_path(), "pango.modules", pango_modules_file)) { -- cgit v1.2.3