X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f0299c17dc878540bf190c290392db241b425ad..1f481e6a253d4bb2b5237d941311ef3b0f5b214b:/src/common/time.cpp

diff --git a/src/common/time.cpp b/src/common/time.cpp
index 15936ad323..1d30d65da0 100644
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -27,19 +27,24 @@ seconds since January 1, 1901, GMT.
 
 #include "wx/setup.h"
 
-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE
 
 #include "wx/time.h"
 #include "wx/date.h"
 #include "wx/utils.h"
+#include <wx/intl.h>
 
-#if USE_IOSTREAMH
+#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
@@ -141,7 +146,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
@@ -313,9 +318,9 @@ char *wxTime::FormatTime() const {
 
 	if (Format == wx12h)
 		if (GetHour() <= 12)
-			strcat(timeBuf,"am");
+			strcat(timeBuf,_("am"));
 		else
-			strcat(timeBuf,"pm");
+			strcat(timeBuf,_("pm"));
 
 	return timeBuf;
 }
@@ -348,8 +353,8 @@ void wxTime::printOn(ostream& strm) const
         strm << ' ' << ((hh <= 12) ? hh : hh-12) << ':'
              << setfill('0') << setw(2) << GetMinute() << ':'
 				 << setfill('0') << setw(2) << GetSecond() << ' ';
-        if (hh < 12) strm << "am";
-        else strm << "pm";
+        if (hh < 12) strm << _("am");
+        else strm << _("pm");
 }
 
 wxTime::wxTime(OIOin& strm)