Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/common/datetimefmt.cpp b/src/common/datetimefmt.cpp
index f9404d864292692cc3fff9b1486545be18cfab5e..77194b0a2095a02fae297f2f7f7d91a49b540008 100644 (file)
--- a/src/common/datetimefmt.cpp
+++ b/src/common/datetimefmt.cpp
@@ -57,6 +57,7 @@
 #endif
 
 #include "wx/datetime.h"
 #endif
 
 #include "wx/datetime.h"

+#include "wx/time.h"

 
 // ============================================================================
 // implementation of wxDateTime
 
 // ============================================================================
 // implementation of wxDateTime


@@ -68,8 +69,6 @@
 
 extern void InitTm(struct tm& tm);
 
 
 extern void InitTm(struct tm& tm);
 

-extern int GetTimeZone();
-

 extern wxString CallStrftime(const wxString& format, const tm* tm);
 
 // ----------------------------------------------------------------------------
 extern wxString CallStrftime(const wxString& format, const tm* tm);
 
 // ----------------------------------------------------------------------------


@@ -320,7 +319,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
     format.Replace("%X",wxLocale::GetInfo(wxLOCALE_TIME_FMT));
 #endif
     // we have to use our own implementation if the date is out of range of
     format.Replace("%X",wxLocale::GetInfo(wxLOCALE_TIME_FMT));
 #endif
     // we have to use our own implementation if the date is out of range of

-    // strftime() or if we use non standard specificators
+    // strftime() or if we use non standard specifiers

 #ifdef wxHAS_STRFTIME
     time_t time = GetTicks();
 
 #ifdef wxHAS_STRFTIME
     time_t time = GetTicks();
 


@@ -329,7 +328,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
         // use strftime()
         struct tm tmstruct;
         struct tm *tm;
         // use strftime()
         struct tm tmstruct;
         struct tm *tm;

-        if ( tz.GetOffset() == -GetTimeZone() )
+        if ( tz.GetOffset() == -wxGetTimeZone() )

         {
             // we are working with local time
             tm = wxLocaltime_r(&time, &tmstruct);
         {
             // we are working with local time
             tm = wxLocaltime_r(&time, &tmstruct);


@@ -374,12 +373,11 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
 
     // used for calls to strftime() when we only deal with time
     struct tm tmTimeOnly;
 
     // used for calls to strftime() when we only deal with time
     struct tm tmTimeOnly;

+    memset(&tmTimeOnly, 0, sizeof(tmTimeOnly));

     tmTimeOnly.tm_hour = tm.hour;
     tmTimeOnly.tm_min = tm.min;
     tmTimeOnly.tm_sec = tm.sec;
     tmTimeOnly.tm_hour = tm.hour;
     tmTimeOnly.tm_min = tm.min;
     tmTimeOnly.tm_sec = tm.sec;

-    tmTimeOnly.tm_wday = 0;
-    tmTimeOnly.tm_yday = 0;
-    tmTimeOnly.tm_mday = 1;         // any date will do
+    tmTimeOnly.tm_mday = 1;         // any date will do, use 1976-01-01

     tmTimeOnly.tm_mon = 0;
     tmTimeOnly.tm_year = 76;
     tmTimeOnly.tm_isdst = 0;        // no DST, we adjust for tz ourselves
     tmTimeOnly.tm_mon = 0;
     tmTimeOnly.tm_year = 76;
     tmTimeOnly.tm_isdst = 0;        // no DST, we adjust for tz ourselves


@@ -649,9 +647,10 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
 
                 default:
                     // is it the format width?
 
                 default:
                     // is it the format width?

-                    fmt.Empty();
-                    while ( *p == wxT('-') || *p == wxT('+') ||
-                            *p == wxT(' ') || wxIsdigit(*p) )
+                    for ( fmt.clear();
+                          *p == wxT('-') || *p == wxT('+') ||
+                            *p == wxT(' ') || wxIsdigit(*p);
+                          ++p )

                     {
                         fmt += *p;
                     }
                     {
                         fmt += *p;
                     }


@@ -668,7 +667,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
                     }
 
                     // no, it wasn't the width
                     }
 
                     // no, it wasn't the width

-                    wxFAIL_MSG(wxT("unknown format specificator"));
+                    wxFAIL_MSG(wxT("unknown format specifier"));

 
                     // fall through and just copy it nevertheless
 
 
                     // fall through and just copy it nevertheless
 


@@ -1497,10 +1496,9 @@ wxDateTime::ParseDateTime(const wxString& date, wxString::const_iterator *end)
 {
     wxCHECK_MSG( end, false, "end iterator pointer must be specified" );
 
 {
     wxCHECK_MSG( end, false, "end iterator pointer must be specified" );
 

-    // Set to current day and hour, so strings like '14:00' becomes today at
-    // 14, not some other random date
-    wxDateTime dtDate = wxDateTime::Today();
-    wxDateTime dtTime = wxDateTime::Today();
+    wxDateTime
+        dtDate,
+        dtTime;

 
     wxString::const_iterator
         endTime,
 
     wxString::const_iterator
         endTime,


@@ -1626,9 +1624,10 @@ wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end)
     while ( p != pEnd )
     {
         // skip white space and date delimiters
     while ( p != pEnd )
     {
         // skip white space and date delimiters

-        while ( wxStrchr(".,/-\t\r\n ", *p) )
+        if ( wxStrchr(".,/-\t\r\n ", *p) )

         {
             ++p;
         {
             ++p;

+            continue;

         }
 
         // modify copy of the iterator as we're not sure if the next token is
         }
 
         // modify copy of the iterator as we're not sure if the next token is