unicode fixes

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 1fd78f7aca0c3a6876952a91142790943ee463f0..b872663c75ee3108fe8496bc11913e76c5b9aa57 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -513,6 +513,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
         }
     }
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
         }
     }
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T

+    (void)convertEncoding; // get rid of warnings about unused parameter

 }
 
 wxString wxMsgCatalogFile::GetCharset() const
 }
 
 wxString wxMsgCatalogFile::GetCharset() const


@@ -647,7 +648,9 @@ bool wxLocale::Init(const wxChar *szName,
   // TODO: how to find languageId
   // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
 #else
   // TODO: how to find languageId
   // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
 #else

-  m_pszOldLocale = wxStrdup(wxSetlocale(LC_ALL, szLocale));
+  m_pszOldLocale = wxSetlocale(LC_ALL, szLocale);
+  if ( m_pszOldLocale )
+      m_pszOldLocale = wxStrdup(m_pszOldLocale);

 #endif
 
   if ( m_pszOldLocale == NULL )
 #endif
 
   if ( m_pszOldLocale == NULL )


@@ -1381,7 +1384,7 @@ wxString wxLocale::GetSystemEncodingName()
     // to Unix98)
     char *oldLocale = strdup(setlocale(LC_CTYPE, NULL));
     setlocale(LC_CTYPE, "");
     // to Unix98)
     char *oldLocale = strdup(setlocale(LC_CTYPE, NULL));
     setlocale(LC_CTYPE, "");

-    char *alang = nl_langinfo(CODESET);
+    const char *alang = nl_langinfo(CODESET);

     setlocale(LC_CTYPE, oldLocale);
     free(oldLocale);
 
     setlocale(LC_CTYPE, oldLocale);
     free(oldLocale);