Updated configure (not only configure.in)

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

diff --git a/src/common/time.cpp b/src/common/time.cpp
index c221079ae4c934e832575d34707bcd0d02725c68..53d034ccf1147ea097baa4dc091a1c0e6fc05b44 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -36,7 +36,7 @@ seconds since January 1, 1901, GMT.
 
 #include "wx/ioswrap.h"
 
-#if wxUSE_IOSTREAMH
+#if wxUSE_IOSTREAMH && wxUSE_STD_IOSTREAM
     #include <iomanip.h>
 #else
     #include <iomanip>
@@ -147,7 +147,7 @@ wxTime::wxTime(const wxDate& date, hourTy h, minuteTy m, secondTy s, bool dst)
 /*
                 if (IsDST()) setError(NIHCL_BADTIME,DEFAULT,
                 date.dayOfMonth(),date.nameOfMonth(),date.year(),
-                h,m,s,(dst?_("DST"):""));
+                h,m,s,(dst?_("DST("):""));
 */
   }
   sec += TIME_ZONE;                               // adjust to GMT
@@ -346,10 +346,10 @@ wxChar *wxTime::FormatTime() const {
 
   switch (Precision) {
   case wxStdMinSec:
-    wxSprintf(timeBuf,_T("%2d:%02d:%02d"),hh,GetMinute(),GetSecond());
+    wxSprintf(timeBuf,T("%2d:%02d:%02d"),hh,GetMinute(),GetSecond());
     break;
   case wxStdMin:
-    wxSprintf(timeBuf,_T("%2d:%02d"),hh,GetMinute());
+    wxSprintf(timeBuf,T("%2d:%02d"),hh,GetMinute());
     break;
   }