Some Updates for latest CVS.

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 9d86e167ab2341052a7479fb9b03becbb83d42ba..5852174e3a49bf8005cb7400d2dc13c5f16d5754 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -665,7 +665,7 @@ bool wxLocale::Init(int language, int flags)
     wxString name = info->Description;
     wxString canonical = info->CanonicalName;
     wxString locale;
-    wxChar *retloc;
+    const wxChar *retloc;
 
     // Set the locale:
 #ifdef __UNIX__
@@ -1180,7 +1180,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
 // This table is generated by misc/languages/genlang.py
 // When making changes, please put them into misc/languages/langtabl.txt
 
-#ifndef __WIN32__
+#if !defined(__WIN32__) || defined(__WXMICROWIN__)
 
 #define SETWINLANG(info,lang,sublang)
 
@@ -1916,7 +1916,5 @@ void wxLocale::InitLanguagesDB()
 
 // --- --- --- generated code ends here --- --- ---
 
-
-
 #endif // wxUSE_INTL