fixed missing ; after class declaration

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

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 2f331299ade4cc4d1b9785eec0f810ff6a3a5631..7f0aed8532c243ed7bb805ed9aefff40c6704515 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -56,8 +56,8 @@ class WXDLLIMPEXP_BASE wxDateSpan;
 #ifdef HAVE_LOCALTIME_R
 #define wxLocaltime_r localtime_r
 #else
 #ifdef HAVE_LOCALTIME_R
 #define wxLocaltime_r localtime_r
 #else

-struct tm *wxLocaltime_r(const time_t*, struct tm*);
-#if !defined(__WINDOWS__)
+WXDLLIMPEXP_BASE struct tm *wxLocaltime_r(const time_t*, struct tm*);
+#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__)

      // On Windows, localtime _is_ threadsafe!
 #warning using pseudo thread-safe wrapper for localtime to emulate localtime_r
 #endif
      // On Windows, localtime _is_ threadsafe!
 #warning using pseudo thread-safe wrapper for localtime to emulate localtime_r
 #endif


@@ -66,8 +66,8 @@ struct tm *wxLocaltime_r(const time_t*, struct tm*);
 #ifdef HAVE_GMTIME_R
 #define wxGmtime_r gmtime_r
 #else
 #ifdef HAVE_GMTIME_R
 #define wxGmtime_r gmtime_r
 #else

-struct tm *wxGmtime_r(const time_t*, struct tm*);
-#if !defined(__WINDOWS__)
+WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*);
+#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__)

      // On Windows, gmtime _is_ threadsafe!
 #warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r
 #endif
      // On Windows, gmtime _is_ threadsafe!
 #warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r
 #endif


@@ -168,7 +168,7 @@ public:
         GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1,
         GMT0,
         GMT1, GMT2, GMT3, GMT4, GMT5, GMT6,
         GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1,
         GMT0,
         GMT1, GMT2, GMT3, GMT4, GMT5, GMT6,

-        GMT7, GMT8, GMT9, GMT10, GMT11, GMT12,
+        GMT7, GMT8, GMT9, GMT10, GMT11, GMT12, GMT13,

         // Note that GMT12 and GMT_12 are not the same: there is a difference
         // of exactly one day between them
 
         // Note that GMT12 and GMT_12 are not the same: there is a difference
         // of exactly one day between them
 


@@ -202,10 +202,14 @@ public:
         // Australia
 
         A_WST = GMT8,                       // Western Standard Time
         // Australia
 
         A_WST = GMT8,                       // Western Standard Time

-        A_CST = GMT12 + 1,                  // Central Standard Time (+9.5)
+        A_CST = GMT13 + 1,                  // Central Standard Time (+9.5)

         A_EST = GMT10,                      // Eastern Standard Time
         A_ESST = GMT11,                     // Eastern Summer Time
 
         A_EST = GMT10,                      // Eastern Standard Time
         A_ESST = GMT11,                     // Eastern Summer Time
 

+        // New Zealand
+        NZST = GMT12,                       // Standard Time
+        NZDT = GMT13,                       // Daylight Saving Time
+

         // TODO add more symbolic timezone names here
 
         // Universal Coordinated Time = the new and politically correct name
         // TODO add more symbolic timezone names here
 
         // Universal Coordinated Time = the new and politically correct name


@@ -503,7 +507,7 @@ public:
     static bool IsLeapYear(int year = Inv_Year, Calendar cal = Gregorian);
 
         // get the century (19 for 1999, 20 for 2000 and -5 for 492 BC)
     static bool IsLeapYear(int year = Inv_Year, Calendar cal = Gregorian);
 
         // get the century (19 for 1999, 20 for 2000 and -5 for 492 BC)

-    static int GetCentury(int year = Inv_Year);
+    static int GetCentury(int year);

 
         // returns the number of days in this year (356 or 355 for Gregorian
         // calendar usually :-)
 
         // returns the number of days in this year (356 or 355 for Gregorian
         // calendar usually :-)


@@ -560,7 +564,7 @@ public:
     // ------------------------------------------------------------------------
 
         // default ctor does not initialize the object, use Set()!
     // ------------------------------------------------------------------------
 
         // default ctor does not initialize the object, use Set()!

-    wxDateTime() { m_time = wxLongLong((long)ULONG_MAX, ULONG_MAX); }
+    wxDateTime() { m_time = wxLongLong(LONG_MIN, 0); }

 
         // from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970)
 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
 
         // from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970)
 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))


@@ -635,6 +639,10 @@ public:
         // resets time to 00:00:00, doesn't change the date
     wxDateTime& ResetTime();
 
         // resets time to 00:00:00, doesn't change the date
     wxDateTime& ResetTime();
 

+        // get the date part of this object only, i.e. the object which has the
+        // same date as this one but time of 00:00:00
+    wxDateTime GetDateOnly() const;
+

         // the following functions don't change the values of the other
         // fields, i.e. SetMinute() won't change either hour or seconds value
 
         // the following functions don't change the values of the other
         // fields, i.e. SetMinute() won't change either hour or seconds value
 


@@ -704,6 +712,7 @@ public:
                                      Month month = Inv_Month,
                                      int year = Inv_Year);
 
                                      Month month = Inv_Month,
                                      int year = Inv_Year);
 

+#if WXWIN_COMPATIBILITY_2_6

         // sets the date to the given day of the given week in the year,
         // returns true on success and false if given date doesn't exist (e.g.
         // numWeek is > 53)
         // sets the date to the given day of the given week in the year,
         // returns true on success and false if given date doesn't exist (e.g.
         // numWeek is > 53)


@@ -716,6 +725,7 @@ public:
     wxDEPRECATED( wxDateTime GetWeek(wxDateTime_t numWeek,
                                      WeekDay weekday = Mon,
                                      WeekFlags flags = Monday_First) const );
     wxDEPRECATED( wxDateTime GetWeek(wxDateTime_t numWeek,
                                      WeekDay weekday = Mon,
                                      WeekFlags flags = Monday_First) const );

+#endif // WXWIN_COMPATIBILITY_2_6

 
         // returns the date corresponding to the given week day of the given
         // week (in ISO notation) of the specified year
 
         // returns the date corresponding to the given week day of the given
         // week (in ISO notation) of the specified year


@@ -836,6 +846,9 @@ public:
         // if the value is out of range
     inline time_t GetTicks() const;
 
         // if the value is out of range
     inline time_t GetTicks() const;
 

+        // get the century, same as GetCentury(GetYear())
+    int GetCentury(const TimeZone& tz = Local) const
+            { return GetCentury(GetYear(tz)); }

         // get the year (returns Inv_Year if date is invalid)
     int GetYear(const TimeZone& tz = Local) const
             { return GetTm(tz).year; }
         // get the year (returns Inv_Year if date is invalid)
     int GetYear(const TimeZone& tz = Local) const
             { return GetTm(tz).year; }


@@ -1112,8 +1125,12 @@ public:
     // constructors
     // ------------------------------------------------------------------------
 
     // constructors
     // ------------------------------------------------------------------------
 

+        // return the timespan for the given number of milliseconds
+    static wxTimeSpan Milliseconds(wxLongLong ms) { return wxTimeSpan(0, 0, 0, ms); }
+    static wxTimeSpan Millisecond() { return Milliseconds(1); }
+

         // return the timespan for the given number of seconds
         // return the timespan for the given number of seconds

-    static wxTimeSpan Seconds(long sec) { return wxTimeSpan(0, 0, sec); }
+    static wxTimeSpan Seconds(wxLongLong sec) { return wxTimeSpan(0, 0, sec); }

     static wxTimeSpan Second() { return Seconds(1); }
 
         // return the timespan for the given number of minutes
     static wxTimeSpan Second() { return Seconds(1); }
 
         // return the timespan for the given number of minutes


@@ -1140,8 +1157,8 @@ public:
         // milliseconds)
     inline wxTimeSpan(long hours,
                       long minutes = 0,
         // milliseconds)
     inline wxTimeSpan(long hours,
                       long minutes = 0,

-                      long seconds = 0,
-                      long milliseconds = 0);
+                      wxLongLong seconds = 0,
+                      wxLongLong milliseconds = 0);

 
         // default copy ctor is ok
 
 
         // default copy ctor is ok
 


@@ -1891,8 +1908,8 @@ wxDateTime::FromTimezone(const wxDateTime::TimeZone& tz, bool noDST) const
 
 inline wxTimeSpan::wxTimeSpan(long hours,
                               long minutes,
 
 inline wxTimeSpan::wxTimeSpan(long hours,
                               long minutes,

-                              long seconds,
-                              long milliseconds)
+                              wxLongLong seconds,
+                              wxLongLong milliseconds)

 {
     // assign first to avoid precision loss
     m_diff = hours;
 {
     // assign first to avoid precision loss
     m_diff = hours;


@@ -1915,7 +1932,9 @@ inline wxLongLong wxTimeSpan::GetSeconds() const
 
 inline int wxTimeSpan::GetMinutes() const
 {
 
 inline int wxTimeSpan::GetMinutes() const
 {

-    return (GetSeconds() / 60l).GetLo();
+    // explicit cast to int suppresses a warning with CodeWarrior and possibly
+    // others (changing the return type to long from int is impossible in 2.8)
+    return (int)((GetSeconds() / 60l).GetLo());

 }
 
 inline int wxTimeSpan::GetHours() const
 }
 
 inline int wxTimeSpan::GetHours() const