Applied patch for ArtProvider.

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 84cc559e76a11ddf4d19536ce206c31287dae942..b211b4ee2d594689f5f9a08fdf43a75deece0184 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -84,7 +84,9 @@
 #ifdef __WINDOWS__
     #include "wx/msw/wrapwin.h"
     #include <winnls.h>
-    #include <locale.h>
+    #ifndef __WXWINCE__
+        #include <locale.h>
+    #endif
 #endif
 
 #include "wx/datetime.h"
@@ -357,6 +359,7 @@ static long GetTruncatedJDN(wxDateTime::wxDateTime_t day,
             - JDN_OFFSET;
 }
 
+#ifndef __WXWINCE__
 // this function is a wrapper around strftime(3) adding error checking
 static wxString CallStrftime(const wxChar *format, const tm* tm)
 {
@@ -369,6 +372,7 @@ static wxString CallStrftime(const wxChar *format, const tm* tm)
 
     return wxString(buf);
 }
+#endif
 
 #ifdef HAVE_STRPTIME
 
@@ -2843,9 +2847,9 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
 // the locale is set; otherwise or in case of failure, leaves fmt unchanged
 static void GetLocaleDateFormat(wxString *fmt)
 {
-    // there is no setlocale() under Windows CE with Standard SDK, so just
-    // always query the system there
-#ifndef WCE_PLATFORM_STANDARDSDK
+    // there is no setlocale() under Windows CE, so just always query the
+    // system there
+#ifndef __WXWINCE__
     if ( strcmp(setlocale(LC_ALL, NULL), "C") != 0 )
 #endif
     {