X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84fff0b395adcfecd09dd65389ba7c1c47dd7eee..faa7a70eaf23743f54e1fd3f1b28e24663bdcc78:/src/common/time.cpp?ds=sidebyside

diff --git a/src/common/time.cpp b/src/common/time.cpp
index c221079ae4..ee697899ea 100644
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -34,19 +34,18 @@ seconds since January 1, 1901, GMT.
 #include "wx/utils.h"
 #include "wx/intl.h"
 
-#include "wx/ioswrap.h"
-
-#if wxUSE_IOSTREAMH
-    #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>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
-#endif
 
 
 extern bool wxGetLocalTime(long *timeZone, int *dstObserved);
@@ -346,10 +345,10 @@ wxChar *wxTime::FormatTime() const {
 
   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:
-    wxSprintf(timeBuf,_T("%2d:%02d"),hh,GetMinute());
+    wxSprintf(timeBuf,wxT("%2d:%02d"),hh,GetMinute());
     break;
   }