compilation fix after incorrectly resolved conflict

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

diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl
index 57555e63553df0994b2d37e52075709c39e95698..5b1d4652e3f853973d03c58d563e31d812733da4 100644 (file)
--- a/include/wx/datetime.inl
+++ b/include/wx/datetime.inl
@@ -75,6 +75,11 @@ wxDateTime::wxDateTime(const Tm& tm)
     Set(tm);
 }
 
     Set(tm);
 }
 

+wxDateTime::wxDateTime(double jdn)
+{
+    Set(jdn);
+}
+

 wxDateTime& wxDateTime::Set(const Tm& tm)
 {
     wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") );
 wxDateTime& wxDateTime::Set(const Tm& tm)
 {
     wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") );


@@ -241,23 +246,13 @@ wxDateTime& wxDateTime::operator+=(const wxDateSpan& diff)
 // wxDateTime and timezones
 // ----------------------------------------------------------------------------
 
 // wxDateTime and timezones
 // ----------------------------------------------------------------------------
 

-wxDateTime wxDateTime::ToUTC() const
-{
-    return wxDateTime(*this).MakeUTC();
-}
-

 wxDateTime wxDateTime::ToTimezone(const wxDateTime::TimeZone& tz) const
 {
     return wxDateTime(*this).MakeTimezone(tz);
 }
 
 wxDateTime wxDateTime::ToTimezone(const wxDateTime::TimeZone& tz) const
 {
     return wxDateTime(*this).MakeTimezone(tz);
 }
 

-wxDateTime wxDateTime::ToLocalTime(const wxDateTime::TimeZone& tz) const
-{
-    return wxDateTime(*this).MakeLocalTime(tz);
-}
-

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

-// wxTimeSpan
+// wxTimeSpan construction

 // ----------------------------------------------------------------------------
 
 wxTimeSpan::wxTimeSpan(int hours, int minutes, int seconds, int milliseconds)
 // ----------------------------------------------------------------------------
 
 wxTimeSpan::wxTimeSpan(int hours, int minutes, int seconds, int milliseconds)


@@ -272,6 +267,39 @@ wxTimeSpan::wxTimeSpan(int hours, int minutes, int seconds, int milliseconds)
     m_diff += milliseconds;
 }
 
     m_diff += milliseconds;
 }
 

+// ----------------------------------------------------------------------------
+// wxTimeSpan accessors
+// ----------------------------------------------------------------------------
+
+wxLongLong wxTimeSpan::GetSeconds() const
+{
+    return m_diff / 1000l;
+}
+
+int wxTimeSpan::GetMinutes() const
+{
+    return (GetSeconds() / 60l).GetLo();
+}
+
+int wxTimeSpan::GetHours() const
+{
+    return GetMinutes() / 60;
+}
+
+int wxTimeSpan::GetDays() const
+{
+    return GetHours() / 24;
+}
+
+int wxTimeSpan::GetWeeks() const
+{
+    return GetDays() / 7;
+}
+
+// ----------------------------------------------------------------------------
+// wxTimeSpan arithmetics
+// ----------------------------------------------------------------------------
+

 wxTimeSpan& wxTimeSpan::Add(const wxTimeSpan& diff)
 {
     m_diff += diff.GetValue();
 wxTimeSpan& wxTimeSpan::Add(const wxTimeSpan& diff)
 {
     m_diff += diff.GetValue();