Adding MSVC makefile support for building the TIFF library

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

diff --git a/src/common/time.cpp b/src/common/time.cpp
index 1a20e34b639d08d8950d9ca65ebd23581e2e11b8..74018b00798bce27bf2c6845b904a220eec64467 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -34,23 +34,45 @@ seconds since January 1, 1901, GMT.
 #include "wx/utils.h"
 #include "wx/intl.h"
 
 #include "wx/utils.h"
 #include "wx/intl.h"
 

-#include "wx/ioswrap.h"
-
-#if wxUSE_IOSTREAMH && wxUSE_STD_IOSTREAM
-    #include <iomanip.h>
-#else
-    #include <iomanip>
+#if wxUSE_STD_IOSTREAM
+    #include "wx/ioswrap.h"
+    #if wxUSE_IOSTREAMH
+        #include <iomanip.h>
+    #else
+        #include <iomanip>
+    #endif

 #endif
 
 #include <string.h>
 #endif
 
 #include <string.h>

+#include <time.h>

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)

+
+
+#ifndef WX_TIMEZONE
+    #define WX_TIMEZONE _timezone

 #endif
 
 #endif
 

+extern long wxGetUTCTime(void);
+bool wxGetTZandDST(long *timeZone, int *dstObserved)
+{
+  time_t now;
+  struct tm *tm;
+
+  now = time((time_t *) NULL);
+
+  if (now != (time_t)-1)
+  {
+    tm = localtime(&now);
+
+    if ((tm) && (tm->tm_isdst > 0))
+      *dstObserved = 1;
+  }
+  *timeZone = WX_TIMEZONE;
+
+  return TRUE;
+}

 
 

-extern bool wxGetLocalTime(long *timeZone, int *dstObserved);
-extern long wxGetCurrentTime(void);

 
 static long TIME_ZONE;          /* seconds west of GMT */
 static int DST_OBSERVED;        /* flags U.S. daylight saving time observed */
 
 static long TIME_ZONE;          /* seconds west of GMT */
 static int DST_OBSERVED;        /* flags U.S. daylight saving time observed */


@@ -58,7 +80,7 @@ static int DST_OBSERVED;        /* flags U.S. daylight saving time observed */
 static bool wxTimeInitialized = FALSE;
 
 wxTime::tFormat    wxTime::Format    = wxTime::wx12h;
 static bool wxTimeInitialized = FALSE;
 
 wxTime::tFormat    wxTime::Format    = wxTime::wx12h;

-wxTime::tPrecision  wxTime::Precision  = wxTime::wxStdMinSec;
+wxTime::tPrecision wxTime::Precision  = wxTime::wxStdMinSec;

 
 static const unsigned long seconds_in_day = 24*60*60L;
 static const wxDate refDate(1,1,1901);
 
 static const unsigned long seconds_in_day = 24*60*60L;
 static const wxDate refDate(1,1,1901);


@@ -72,7 +94,7 @@ wxTime wxTime::GetLocalTime(const wxDate& date, hourTy h, minuteTy m, secondTy s
 {
   if (!wxTimeInitialized)
   {
 {
   if (!wxTimeInitialized)
   {

-   wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
+   wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);

    wxTimeInitialized = TRUE;
   }
 /*
    wxTimeInitialized = TRUE;
   }
 /*


@@ -97,10 +119,10 @@ wxTime::wxTime()
 {
   if (!wxTimeInitialized)
   {
 {
   if (!wxTimeInitialized)
   {

-   wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
+   wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);

    wxTimeInitialized = TRUE;
   }
    wxTimeInitialized = TRUE;
   }

-  sec = wxGetCurrentTime();
+  sec = wxGetUTCTime();

 #ifdef __SALFORDC__
   sec += (unsigned long) 2177452800;     /* seconds from 1/1/01 to 1/1/70 */
 #else
 #ifdef __SALFORDC__
   sec += (unsigned long) 2177452800;     /* seconds from 1/1/01 to 1/1/70 */
 #else


@@ -116,7 +138,7 @@ wxTime::wxTime(hourTy h, minuteTy m, secondTy s, bool dst)
 {
   if (!wxTimeInitialized)
   {
 {
   if (!wxTimeInitialized)
   {

-   wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
+   wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);

    wxTimeInitialized = TRUE;
   }
 
    wxTimeInitialized = TRUE;
   }
 


@@ -132,7 +154,7 @@ wxTime::wxTime(const wxDate& date, hourTy h, minuteTy m, secondTy s, bool dst)
 {
   if (!wxTimeInitialized)
   {
 {
   if (!wxTimeInitialized)
   {

-    wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
+    wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);

    wxTimeInitialized = TRUE;
   }
   sec = GetLocalTime(date,h,m,s).sec-3600;
    wxTimeInitialized = TRUE;
   }
   sec = GetLocalTime(date,h,m,s).sec-3600;


@@ -346,10 +368,10 @@ wxChar *wxTime::FormatTime() const {
 
   switch (Precision) {
   case wxStdMinSec:
 
   switch (Precision) {
   case wxStdMinSec:

-    wxSprintf(timeBuf,T("%2d:%02d:%02d"),hh,GetMinute(),GetSecond());
+    wxSprintf(timeBuf,wxT("%2d:%02d:%02d"),hh,GetMinute(),GetSecond());

     break;
   case wxStdMin:
     break;
   case wxStdMin:

-    wxSprintf(timeBuf,T("%2d:%02d"),hh,GetMinute());
+    wxSprintf(timeBuf,wxT("%2d:%02d"),hh,GetMinute());

     break;
   }
 
     break;
   }