char* -> wxString

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

diff --git a/src/common/time.cpp b/src/common/time.cpp
index ecd30b9ac0a9fc7e25012e80afd68d823ff87d14..d709f8b21286364cc140db034b1b302174b3165b 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -36,11 +36,15 @@ seconds since January 1, 1901, GMT.
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
+#include <iomanip.h>
 #else
 #include <iostream>
+#include <iomanip>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
 #endif
 
-#include <iomanip.h>
 #include <string.h>
 
 #if !USE_SHARED_LIBRARY
@@ -100,7 +104,11 @@ wxTime::wxTime()
         wxTimeInitialized = TRUE;
   }
   sec = wxGetCurrentTime();
+#ifdef __SALFORDC__
+  sec += (unsigned long) 2177452800;     /* seconds from 1/1/01 to 1/1/70 */
+#else
   sec += 2177452800UL;     /* seconds from 1/1/01 to 1/1/70 */
+#endif
 }
 
 wxTime::wxTime(hourTy h, minuteTy m, secondTy s, bool dst)
@@ -148,6 +156,7 @@ wxTime::wxTime(const wxDate& date, hourTy h, minuteTy m, secondTy s, bool dst)
   sec += TIME_ZONE;                               // adjust to GMT
 }
 
+#ifndef __SALFORDC__
 wxTime::operator wxDate() const
 /*
                  Convert a wxTime to a local wxDate
@@ -160,6 +169,7 @@ wxTime::operator wxDate() const
         date += daycount;
         return date;
 }
+#endif
 
 bool wxTime::IsBetween(const wxTime& a, const wxTime& b) const
 {
@@ -267,6 +277,38 @@ secondTy wxTime::GetSecond() const
                  return (secondTy)(((sec % 86400) % 3600) % 60);
 }
 
+secondTy wxTime::GetSecondGMT() const
+/*
+        Return the minute of this wxTime in GMT.
+*/
+{
+        return (secondTy)(((sec % 86400) % 3600) % 60);
+}
+
+int wxTime::GetDay() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetDay();
+}
+
+int wxTime::GetDayOfWeek() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetDayOfWeek();
+}
+
+int wxTime::GetMonth() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetMonth();
+}
+
+int wxTime::GetYear() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetYear();
+}
+
 wxTime wxTime::Max(const wxTime& t) const
 {
         if (t < *this) return *this;
@@ -279,10 +321,12 @@ wxTime wxTime::Min(const wxTime& t) const
                  return t;
 }
 
+#ifndef __SALFORDC__
 wxTime::operator char *(void)
 {
   return FormatTime();
 }
+#endif
 
 void wxTime::SetFormat(const wxTime::tFormat lFormat,
                                                          const wxTime::tPrecision lPrecision) {