moving string conversions at one place

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 98bc6dcc078a6eb684184dd3ee991c1707538b81..e2a7299f7aef6ff59178ac3b98a926264272f1eb 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -768,15 +768,18 @@ bool wxLocale::Init(int language, int flags)
     wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
 #else
     return FALSE;
+    #define WX_NO_LOCALE_SUPPORT
 #endif
 
-    wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
+#ifndef WX_NO_LOCALE_SUPPORT
+     wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
     bool ret = Init(name, canonical, retloc,
                     (flags & wxLOCALE_LOAD_DEFAULT) != 0,
                     (flags & wxLOCALE_CONV_ENCODING) != 0);
     if (szLocale)
         free(szLocale);
     return ret;
+#endif
 }