Ticket #237: sg_unicode.2.patch

SkinManager.cpp

@@ -1207 +1207 @@
     // First we try the users canonical locale resources.
     //  i.e. en_US
     retval = ERR_XML_PARSE;
-    p = fopen(ConstructSkinFileName().c_str(), "r");
+    p = fopen((const char*)ConstructSkinFileName().mb_str(wxConvUTF8), "r");
     if (p) {
         mf.init_file(p);
         retval = Parse(mf, strDesiredLocale);
@@ -1218 +1218 @@
     //   locale.
     //  i.e. en
     if (ERR_XML_PARSE == retval) {
-        p = fopen(ConstructSkinFileName().c_str(), "r");
+        p = fopen((const char*)ConstructSkinFileName().mb_str(wxConvUTF8), "r");
         if (p) {
             mf.init_file(p);
             retval = Parse(mf, strDesiredLocale.Left(2));
@@ -1229 +1229 @@
     // If we failed the second lookup try english
     //  i.e. en
     if (ERR_XML_PARSE == retval) {
-        p = fopen(ConstructSkinFileName().c_str(), "r");
+        p = fopen((const char*)ConstructSkinFileName().mb_str(wxConvUTF8), "r");
         if (p) {
             mf.init_file(p);
             retval = Parse(mf, wxT("en"));
@@ -1343 +1343 @@
 
     // Look for the begining of the desired locale.
     while (in.fgets(buf, 256)) {
-        if (match_tag(buf, strLocaleStartTag.c_str())) {
+        if (match_tag(buf, (const char*)strLocaleStartTag.mb_str(wxConvUTF8))) {
             bLocaleFound = true;
             break;
         }
@@ -1352 +1352 @@
     if (!bLocaleFound) return ERR_XML_PARSE;
 
     while (in.fgets(buf, 256)) {
-        if (match_tag(buf, strLocaleEndTag.c_str())) break;
+        if (match_tag(buf, (const char*)strLocaleEndTag.mb_str(wxConvUTF8))) break;
         else if (match_tag(buf, "<simple>")) {
             m_SimpleSkin.Parse(in);
             continue;