Don't call wxTextMeasure::BeginMeasuring() when using non-native wxDC.

[wxWidgets.git] / include / wx / ioswrap.h

diff --git a/include/wx/ioswrap.h b/include/wx/ioswrap.h
index 8d2ad899b6d5dd748137aa4ac6d589078d1ff479..7391683a74be94cad03dd5fe1db1bcf54d72cf85 100644 (file)
--- a/include/wx/ioswrap.h
+++ b/include/wx/ioswrap.h
@@ -1,24 +1,28 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        ioswrap.h
+// Name:        wx/ioswrap.h
 // Purpose:     includes the correct iostream headers for current compiler
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if wxUSE_STD_IOSTREAM
 
+#include "wx/beforestd.h"
+
 #if wxUSE_IOSTREAMH
-    // N.B. BC++ doesn't have istream.h, ostream.h
 #   include <iostream.h>
 #else
 #   include <iostream>
-#   if defined(__VISUALC__) || defined(__MWERKS__)
-        using namespace std;
-#   endif
+#endif
+
+#include "wx/afterstd.h"
+
+#ifdef __WINDOWS__
+#   include "wx/msw/winundef.h"
 #endif
 
 #endif