tmake template for DLL project for VC++ 6.0

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

diff --git a/src/common/time.cpp b/src/common/time.cpp
index 71ad2fac3a5517789a6b7121db1063c89dd30d2c..49458ca52436da5765443f80a72fd3263acb2fcb 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>
@@ -319,7 +319,7 @@ wxTime wxTime::Min(const wxTime& t) const
 }
 
 #ifndef __SALFORDC__
-wxTime::operator char *(void)
+wxTime::operator wxChar *(void)
 {
   return FormatTime();
 }
@@ -332,8 +332,8 @@ void wxTime::SetFormat(const wxTime::tFormat lFormat,
   wxTime::Precision  = lPrecision;
 }
 
-char *wxTime::FormatTime() const {
-  static char  timeBuf[30];
+wxChar *wxTime::FormatTime() const {
+  static wxChar  timeBuf[30];
   unsigned    hh(GetHour());
 
   switch (Format) {
@@ -346,18 +346,18 @@ char *wxTime::FormatTime() const {
 
   switch (Precision) {
   case wxStdMinSec:
-    sprintf(timeBuf,"%2d:%02d:%02d",hh,GetMinute(),GetSecond());
+    wxSprintf(timeBuf,wxT("%2d:%02d:%02d"),hh,GetMinute(),GetSecond());
     break;
   case wxStdMin:
-    sprintf(timeBuf,"%2d:%02d",hh,GetMinute());
+    wxSprintf(timeBuf,wxT("%2d:%02d"),hh,GetMinute());
     break;
   }
 
   if (Format == wx12h)
     if (GetHour() <= 12)
-      strcat(timeBuf,_("am"));
+      wxStrcat(timeBuf,_("am"));
     else
-      strcat(timeBuf,_("pm"));
+      wxStrcat(timeBuf,_("pm"));
 
   return timeBuf;
 }