From 99abd9c85c071fac36d8cde66eb0656bb48d6cc9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 11 Feb 2008 23:48:35 +0000
Subject: [PATCH] remove half a dozen #ifndef __WXWINCE__ as they dont seem to
 be necessary now (wxSetlocale() is defined in wxcrt.h for all platforms); if
 the compilation for CE is broken it must be fixed by providing wxSetlocale()
 stub for it instead of writings tons of #ifdefs!

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/intl.cpp | 40 ++++++----------------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 2a4f5e16e7..8d594c8142 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1622,27 +1622,11 @@ bool wxLocale::Init(const wxString& name,
                  wxS("no locale to set in wxLocale::Init()") );
   }
 
-#ifdef __WXWINCE__
-  // FIXME: I'm guessing here
-  wxChar localeName[256];
-  int ret = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLANGUAGE, localeName,
-      256);
-  if (ret != 0)
-  {
-    m_pszOldLocale = wxStrdup(wxConvLibc.cWC2MB(localeName));
-  }
-  else
-    m_pszOldLocale = NULL;
-
-  // TODO: how to find languageId
-  // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
-#else
   const char *oldLocale = wxSetlocale(LC_ALL, szLocale);
   if ( oldLocale )
       m_pszOldLocale = wxStrdup(oldLocale);
   else
       m_pszOldLocale = NULL;
-#endif
 
   if ( m_pszOldLocale == NULL )
     wxLogError(_("locale '%s' can not be set."), szLocale);
@@ -1854,11 +1838,13 @@ bool wxLocale::Init(int language, int flags)
         {
             const wxUint32 lcid = info->GetLCID();
 
-            // FIXME
+            // Windows CE doesn't have SetThreadLocale() and there doesn't seem
+            // to be any equivalent
 #ifndef __WXWINCE__
             // change locale used by Windows functions
             ::SetThreadLocale(lcid);
 #endif
+
             // and also call setlocale() to change locale used by the CRT
             locale = info->GetLocaleName();
             if ( locale.empty() )
@@ -1867,10 +1853,8 @@ bool wxLocale::Init(int language, int flags)
             }
             else // have a valid locale
             {
-                // FIXME
-#ifndef __WXWINCE__
                 retloc = wxSetlocale(LC_ALL, locale);
-#endif
+
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
                 if ( !retloc )
                 {
@@ -1889,12 +1873,8 @@ bool wxLocale::Init(int language, int flags)
     }
     else
     {
-            // FIXME
-#ifndef __WXWINCE__
         retloc = wxSetlocale(LC_ALL, wxEmptyString);
-#else
-        retloc = NULL;
-#endif
+
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
         if (retloc == NULL)
         {
@@ -1906,7 +1886,7 @@ bool wxLocale::Init(int language, int flags)
                 retloc = "C";
             }
         }
-#endif
+#endif // SETLOCALE_FAILS_ON_UNICODE_LANGS
     }
 
     if ( !retloc )
@@ -2365,12 +2345,7 @@ const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale)
 
 wxString wxLocale::GetSysName() const
 {
-            // FIXME
-#ifndef __WXWINCE__
     return wxSetlocale(LC_ALL, NULL);
-#else
-    return wxEmptyString;
-#endif
 }
 
 // clean up
@@ -2387,10 +2362,7 @@ wxLocale::~wxLocale()
     // restore old locale pointer
     wxSetLocale(m_pOldLocale);
 
-    // FIXME
-#ifndef __WXWINCE__
     wxSetlocale(LC_ALL, m_pszOldLocale);
-#endif
     free((wxChar *)m_pszOldLocale);     // const_cast
 }
 
-- 
2.45.2