Minor changes, just trim trailing spaces in webview code.

[wxWidgets.git] / include / wx / datetime.h

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 42279c2a38129d1a1ef41e046d021351c490ed12..9deab532e1fa76facbadc195feafa98010f10393 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -19,7 +19,7 @@
 
 #ifdef __WXWINCE__
     #include "wx/msw/wince/time.h"
 
 #ifdef __WXWINCE__
     #include "wx/msw/wince/time.h"

-#elif !defined(__WXPALMOS5__)
+#else

     #include <time.h>
 #endif // OS
 
     #include <time.h>
 #endif // OS
 


@@ -31,7 +31,7 @@
 class WXDLLIMPEXP_FWD_BASE wxDateTime;
 class WXDLLIMPEXP_FWD_BASE wxTimeSpan;
 class WXDLLIMPEXP_FWD_BASE wxDateSpan;
 class WXDLLIMPEXP_FWD_BASE wxDateTime;
 class WXDLLIMPEXP_FWD_BASE wxTimeSpan;
 class WXDLLIMPEXP_FWD_BASE wxDateSpan;

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 struct _SYSTEMTIME;
 #endif
 
 struct _SYSTEMTIME;
 #endif
 


@@ -606,7 +606,7 @@ public:
                       wxDateTime_t minute = 0,
                       wxDateTime_t second = 0,
                       wxDateTime_t millisec = 0);
                       wxDateTime_t minute = 0,
                       wxDateTime_t second = 0,
                       wxDateTime_t millisec = 0);

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     wxDateTime(const struct _SYSTEMTIME& st)
     {
         SetFromMSWSysTime(st);
     wxDateTime(const struct _SYSTEMTIME& st)
     {
         SetFromMSWSysTime(st);


@@ -928,7 +928,7 @@ public:
 
     // SYSTEMTIME format
     // ------------------------------------------------------------------------
 
     // SYSTEMTIME format
     // ------------------------------------------------------------------------

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     // convert SYSTEMTIME to wxDateTime
     wxDateTime& SetFromMSWSysTime(const struct _SYSTEMTIME& st);
 
     // convert SYSTEMTIME to wxDateTime
     wxDateTime& SetFromMSWSysTime(const struct _SYSTEMTIME& st);
 


@@ -938,7 +938,7 @@ public:
     // same as above but only take date part into account, time is always zero
     wxDateTime& SetFromMSWSysDate(const struct _SYSTEMTIME& st);
     void GetAsMSWSysDate(struct _SYSTEMTIME* st) const;
     // same as above but only take date part into account, time is always zero
     wxDateTime& SetFromMSWSysDate(const struct _SYSTEMTIME& st);
     void GetAsMSWSysDate(struct _SYSTEMTIME* st) const;

-#endif // __WXMSW__
+#endif // __WINDOWS__

 
     // comparison (see also functions below for operator versions)
     // ------------------------------------------------------------------------
 
     // comparison (see also functions below for operator versions)
     // ------------------------------------------------------------------------


@@ -1205,6 +1205,44 @@ public:
                                      : wxAnyStrPtr();
     }
 
                                      : wxAnyStrPtr();
     }
 

+    // In addition to wxAnyStrPtr versions above we also must provide the
+    // overloads for C strings as we must return a pointer into the original
+    // string and not inside a temporary wxString which would have been created
+    // if the overloads above were used.
+    //
+    // And then we also have to provide the overloads for wxCStrData, as usual.
+    wxAnyStrPtr ParseRfc822Date(const wxCStrData& date)
+        { return ParseRfc822Date(wxString(date)); }
+    const char* ParseRfc822Date(const char* date);
+    const wchar_t* ParseRfc822Date(const wchar_t* date);
+
+    wxAnyStrPtr ParseFormat(const wxCStrData& date,
+                            const wxString& format = wxDefaultDateTimeFormat,
+                            const wxDateTime& dateDef = wxDefaultDateTime)
+        { return ParseFormat(wxString(date), format, dateDef); }
+    const char* ParseFormat(const char* date,
+                            const wxString& format = wxDefaultDateTimeFormat,
+                            const wxDateTime& dateDef = wxDefaultDateTime);
+    const wchar_t* ParseFormat(const wchar_t* date,
+                               const wxString& format = wxDefaultDateTimeFormat,
+                               const wxDateTime& dateDef = wxDefaultDateTime);
+
+    wxAnyStrPtr ParseDateTime(const wxCStrData& datetime)
+        { return ParseDateTime(wxString(datetime)); }
+    const char* ParseDateTime(const char* datetime);
+    const wchar_t* ParseDateTime(const wchar_t* datetime);
+
+    wxAnyStrPtr ParseDate(const wxCStrData& date)
+        { return ParseDate(wxString(date)); }
+    const char* ParseDate(const char* date);
+    const wchar_t* ParseDate(const wchar_t* date);
+
+    wxAnyStrPtr ParseTime(const wxCStrData& time)
+        { return ParseTime(wxString(time)); }
+    const char* ParseTime(const char* time);
+    const wchar_t* ParseTime(const wchar_t* time);
+
+

     // implementation
     // ------------------------------------------------------------------------
 
     // implementation
     // ------------------------------------------------------------------------