Revised #ifndef WX_PRECOMP headers, added missing #include wx/wxcrtvararg.h

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 948b3e6f26e3ed18f286096672a41a799f55b10d..8bd4933a187b83f9ecbb48717bdfa58ebd455e54 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -93,17 +93,17 @@ const long wxDateTime::TIME_T_FACTOR = 1000l;
 
 template<> void wxStringReadValue(const wxString &s , wxDateTime &data )
 {
 
 template<> void wxStringReadValue(const wxString &s , wxDateTime &data )
 {

-    data.ParseFormat(s,wxT("%Y-%m-%d %H:%M:%S")) ;
+    data.ParseFormat(s,"%Y-%m-%d %H:%M:%S", NULL);

 }
 
 template<> void wxStringWriteValue(wxString &s , const wxDateTime &data )
 {
 }
 
 template<> void wxStringWriteValue(wxString &s , const wxDateTime &data )
 {

-    s = data.Format(wxT("%Y-%m-%d %H:%M:%S")) ;
+    s = data.Format("%Y-%m-%d %H:%M:%S");

 }
 
 wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringConverter<wxDateTime>)
 
 }
 
 wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringConverter<wxDateTime>)
 

-#endif
+#endif // wxUSE_EXTENDED_RTTI

 
 //
 // ----------------------------------------------------------------------------
 
 //
 // ----------------------------------------------------------------------------


@@ -138,13 +138,6 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
     #include <wtime.h>
 #endif
 
     #include <wtime.h>
 #endif
 

-// define a special symbol for VC8 instead of writing tests for 1400 repeatedly
-#ifdef __VISUALC__
-    #if __VISUALC__ >= 1400
-        #define __VISUALC8__
-    #endif
-#endif
-

 #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
     #if defined(__WXPALMOS__)
         #define WX_GMTOFF_IN_TM
 #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
     #if defined(__WXPALMOS__)
         #define WX_GMTOFF_IN_TM


@@ -383,11 +376,13 @@ wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
 
 // debugger helper: shows what the date really is
 #ifdef __WXDEBUG__
 
 // debugger helper: shows what the date really is
 #ifdef __WXDEBUG__

-extern const wxChar *wxDumpDate(const wxDateTime* dt)
+extern const char *wxDumpDate(const wxDateTime* dt)

 {
 {

-    static wxChar buf[128];
+    static char buf[128];

 
 

-    wxStrcpy(buf, dt->Format(_T("%Y-%m-%d (%a) %H:%M:%S")));
+    wxString fmt(dt->Format("%Y-%m-%d (%a) %H:%M:%S"));
+    wxStrncpy(buf, fmt + " (" + dt->GetValue().ToString() + " ticks)",
+              WXSIZEOF(buf));

 
     return buf;
 }
 
     return buf;
 }


@@ -492,8 +487,10 @@ static wxString CallStrftime(const wxString& format, const tm* tm)
 
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) )
     {
 
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) )
     {

-        // buffer is too small?
+        // if the format is valid, buffer must be too small?

         wxFAIL_MSG(_T("strftime() failed"));
         wxFAIL_MSG(_T("strftime() failed"));

+
+        buf[0] = '\0';

     }
 
     s = buf;
     }
 
     s = buf;


@@ -2852,8 +2849,9 @@ wxDateTime::ParseRfc822Date(const wxString& date, wxString::const_iterator *end)
     min = (wxDateTime_t)(min + *p++ - _T('0'));
 
     wxDateTime_t sec = 0;
     min = (wxDateTime_t)(min + *p++ - _T('0'));
 
     wxDateTime_t sec = 0;

-    if ( *p++ == _T(':') )
+    if ( *p == _T(':') )

     {
     {

+        p++;

         if ( !wxIsdigit(*p) )
         {
             return NULL;
         if ( !wxIsdigit(*p) )
         {
             return NULL;


@@ -3574,10 +3572,11 @@ wxDateTime::ParseFormat(const wxString& date,
                     // common cases
                     wxDateTime dt;
 
                     // common cases
                     wxDateTime dt;
 

-                    const wxChar *result = dt.ParseFormat(input, _T("%T"));
+                    const wxStringCharType *
+                        result = dt.ParseFormat(input, wxS("%T"));

                     if ( !result )
                     {
                     if ( !result )
                     {

-                        result = dt.ParseFormat(input, _T("%r"));
+                        result = dt.ParseFormat(input, wxS("%r"));

                     }
 
                     if ( !result )
                     }
 
                     if ( !result )


@@ -3586,7 +3585,9 @@ wxDateTime::ParseFormat(const wxString& date,
                         return NULL;
                     }
 
                         return NULL;
                     }
 

-                    haveHour = haveMin = haveSec = true;
+                    haveHour =
+                    haveMin =
+                    haveSec = true;

 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;


@@ -4592,4 +4593,30 @@ WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd)
                                : (wxDateTime::WeekDay)(wd - 1);
 }
 
                                : (wxDateTime::WeekDay)(wd - 1);
 }
 

+#ifdef __WXMSW__
+
+wxDateTime& wxDateTime::SetFromMSWSysTime(const SYSTEMTIME& st)
+{
+    return Set(st.wDay,
+            wx_static_cast(wxDateTime::Month, wxDateTime::Jan + st.wMonth - 1),
+            st.wYear,
+            0, 0, 0);
+}
+
+void wxDateTime::GetAsMSWSysTime(SYSTEMTIME* st) const
+{
+    const wxDateTime::Tm tm(GetTm());
+
+    st->wYear = (WXWORD)tm.year;
+    st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
+    st->wDay = tm.mday;
+
+    st->wDayOfWeek =
+    st->wHour =
+    st->wMinute =
+    st->wSecond =
+    st->wMilliseconds = 0;
+}
+#endif // __WXMSW__
+

 #endif // wxUSE_DATETIME
 #endif // wxUSE_DATETIME