VC8 doesn't have xlocale support under CE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/features.h b/include/wx/features.h
index 52c84a27e03f71cdb3a40d5ce2ab127393c9802f..4d004f882967e28a54cc7049de9eed49c7da353e 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -77,7 +77,8 @@
 /* This is defined when the compiler provides some type of extended locale
    functions.  Otherwise, we implement them ourselves to only support the
    'C' locale */
 /* This is defined when the compiler provides some type of extended locale
    functions.  Otherwise, we implement them ourselves to only support the
    'C' locale */

-#if defined(HAVE_LOCALE_T) || wxCHECK_VISUALC_VERSION(8)
+#if defined(HAVE_LOCALE_T) || \
+    (wxCHECK_VISUALC_VERSION(8) && !defined(__WXWINCE__))

     #define wxHAS_XLOCALE_SUPPORT
 #else
     #undef wxHAS_XLOCALE_SUPPORT
     #define wxHAS_XLOCALE_SUPPORT
 #else
     #undef wxHAS_XLOCALE_SUPPORT

diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index 198a9921cb58b79579ba5d1c5706e7d8dc701673..39b49e7556541ea4c7e86c1d5d4a0db8a5b2bf5c 100644 (file)
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -37,7 +37,7 @@
 // The platform-specific locale type
 // If wxXLocale_t is not defined, then only "C" locale support is provided
 #ifdef wxHAS_XLOCALE_SUPPORT
 // The platform-specific locale type
 // If wxXLocale_t is not defined, then only "C" locale support is provided
 #ifdef wxHAS_XLOCALE_SUPPORT

-    #if wxCHECK_VISUALC_VERSION(8)
+    #if wxCHECK_VISUALC_VERSION(8) && !defined(__WXWINCE__)

         typedef _locale_t wxXLocale_t;
         #define wxXLOCALE_IDENT(name) _ ## name
     #elif defined(HAVE_LOCALE_T)
         typedef _locale_t wxXLocale_t;
         #define wxXLOCALE_IDENT(name) _ ## name
     #elif defined(HAVE_LOCALE_T)