Converted the virtual-methods-callbacks into real events, leaving the

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

diff --git a/src/common/time.cpp b/src/common/time.cpp
index 01eed9a49520a61ed72303d133aa385ad2bde37d..1d30d65da07673d941f072528ee08a58eaf7bffc 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -27,20 +27,24 @@ seconds since January 1, 1901, GMT.
 
 #include "wx/setup.h"
 
 
 #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>
 
 
 #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 <iostream.h>

+#include <iomanip.h>

 #else
 #include <iostream>
 #else
 #include <iostream>

+#include <iomanip>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif

 #endif
 
 #endif
 

-#include <iomanip.h>

 #include <string.h>
 
 #if !USE_SHARED_LIBRARY
 #include <string.h>
 
 #if !USE_SHARED_LIBRARY