X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/791b07a345ed1e89b8af7a83bad2877f2f3936f1..c0ae6c3bc40864f4d6312e136ec2f714b9ef239f:/src/common/datetime.cpp

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index a6758a896a..026bae109d 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -172,7 +172,7 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
         #define WX_GMTOFF_IN_TM
     #elif defined(__WXWINCE__) && defined(__VISUALC8__)
         // _timezone is not present in dynamic run-time library
-        #if 1
+        #if 0
         // Solution (1): use the function equivalent of _timezone
         static long wxGetTimeZone()
         {
@@ -186,7 +186,7 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
             return s_Timezone;
         }
         #define WX_TIMEZONE wxGetTimeZone()
-        #elif 0
+        #elif 1
         // Solution (2): using GetTimeZoneInformation
         static long wxGetTimeZone()
         {
@@ -3835,7 +3835,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
     // some special cases
     static struct
     {
-        const wxChar *str;
+        const char *str;
         int dayDiffFromToday;
     } literalDates[] =
     {
@@ -4010,7 +4010,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                 else // not a valid weekday name
                 {
                     // try the ordinals
-                    static const wxChar *ordinals[] =
+                    static const char *ordinals[] =
                     {
                         wxTRANSLATE("first"),
                         wxTRANSLATE("second"),
@@ -4176,7 +4176,7 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
     // first try some extra things
     static const struct
     {
-        const wxChar *name;
+        const char *name;
         wxDateTime_t  hour;
     } stdTimes[] =
     {