wxUSE_IOSTREAMH changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/dialoged/src/dlghndlr.cpp b/utils/dialoged/src/dlghndlr.cpp
index 88f3a1ab9258f1a6621f005bd5be81f853be09b8..b63762d66d3d6b61b50131156f3352cde333800a 100644 (file)
--- a/utils/dialoged/src/dlghndlr.cpp
+++ b/utils/dialoged/src/dlghndlr.cpp
@@ -29,11 +29,15 @@
 #include <math.h>
 #include <string.h>
 
+#if wxUSE_IOSTREAMH
 #if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>
 #else
 #include <strstream.h>
 #endif
+#else
+#include <strstream>
+#endif
 
 #include "reseditr.h"
 #include "winprop.h"

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 46bf44ed4e66121b17074e0d7d44ebdece2ad88b..0e32145a097d22acfa2563a51347109e3d652d20 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -44,11 +44,15 @@
 #include <math.h>
 #include <string.h>
 
+#if wxUSE_IOSTREAMH
 #if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>
 #else
 #include <strstream.h>
 #endif
+#else
+#include <strstream>
+#endif
 
 #ifdef __WXMSW__
 #include <windows.h>

diff --git a/utils/dialoged/src/reswrite.cpp b/utils/dialoged/src/reswrite.cpp
index 57b0ed849ea4916c1ca1a40414141113bc958a0f..41766cacd1205913322f7c107034f7ba47d7e028 100644 (file)
--- a/utils/dialoged/src/reswrite.cpp
+++ b/utils/dialoged/src/reswrite.cpp
@@ -29,13 +29,18 @@
 #include <math.h>
 #include <string.h>
 
+#if wxUSE_IOSTREAMH
 #if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>
 #else
 #include <strstream.h>
+#include <fstream.h>
+#endif
+#else
+#include <strstream>
+#include <fstream>
 #endif
 
-#include <fstream.h>
 
 #include "wx/scrolbar.h"
 #include "wx/string.h"

diff --git a/utils/dialoged/src/winprop.cpp b/utils/dialoged/src/winprop.cpp
index 7eabff426073b7944d084c34907fb118727d61f2..20d6bfbb7fa374b05b15084618dccf4504deec00 100644 (file)
--- a/utils/dialoged/src/winprop.cpp
+++ b/utils/dialoged/src/winprop.cpp
@@ -29,11 +29,15 @@
 #include <math.h>
 #include <string.h>
 
+#if wxUSE_IOSTREAMH
 #if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>
 #else
 #include <strstream.h>
 #endif
+#else
+#include <strstream>
+#endif
 
 #ifdef __WXMSW__
 #include <windows.h>