Include wx/stream.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/cocoa/utilsexc.mm b/src/cocoa/utilsexc.mm
index 20d6e25688e65ce60050234b416ca25db0a7b1a4..348c1c1060eb16cc091427de61882d71d0902808 100644 (file)
--- a/src/cocoa/utilsexc.mm
+++ b/src/cocoa/utilsexc.mm
@@ -21,8 +21,13 @@
 
 #if 0
 
+#ifndef   WX_PRECOMP
+    #if wxUSE_STREAMS
+        #include  "wx/stream.h"
+    #endif // wxUSE_STREAMS
+#endif  //WX_PRECOMP
+
 #include "wx/process.h"
-#include "wx/stream.h"
 
 #include "wx/cocoa/string.h"
 

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index f70b797e3fedec095d08fbe75e55289e1f13eece..553a3f445befeef3cb5eadccb9d7a6d29f132e46 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -30,6 +30,9 @@
     #include  "wx/log.h"
     #include  "wx/app.h"
     #include  "wx/utils.h"    // for wxGetHomeDir
+    #if wxUSE_STREAMS
+        #include  "wx/stream.h"
+    #endif // wxUSE_STREAMS
 #endif  //WX_PRECOMP
 
 #include  "wx/file.h"
@@ -39,11 +42,6 @@
 #include  "wx/fileconf.h"
 #include  "wx/filefn.h"
 
-#if wxUSE_STREAMS
-    #include  "wx/stream.h"
-#endif // wxUSE_STREAMS
-
-
 #if defined(__WXMAC__)
     #include  "wx/mac/private.h"  // includes mac headers
     #include  "wx/filename.h"     // for MacSetTypeAndCreator

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index ab50d843865f1c8ee942ca2b6105678dc09d7bc3..f7786777284e9b4c4e24f0a1a116347aba08e98d 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -21,15 +21,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_STREAMS
 
-#include <stdlib.h>
-#include "wx/stream.h"
 #include "wx/mstream.h"
 
+#ifndef   WX_PRECOMP
+    #include  "wx/stream.h"
+#endif  //WX_PRECOMP
+
+#include <stdlib.h>
+
 // ============================================================================
 // implementation
 // ============================================================================

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 56ce74de65b4c918ece96b193a2ded126b612962..5b1fcac0ca1a2f63187caa51a55944ed9b173f91 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -18,12 +18,13 @@
 
 #if wxUSE_SOCKETS && wxUSE_STREAMS
 
+#include "wx/sckstrm.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/stream.h"
 #endif
 
-#include "wx/stream.h"
 #include "wx/socket.h"
-#include "wx/sckstrm.h"
 
 // ---------------------------------------------------------------------------
 // wxSocketOutputStream

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 9d1bb67a26805b2ddeb2ac3cdd1d6e1670165d30..f13da0d3d8af6a7e542f04eacde4bedfe4e82e8d 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -27,12 +27,13 @@
 
 #if wxUSE_STREAMS
 
+#include "wx/stream.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif
 
 #include <ctype.h>
-#include "wx/stream.h"
 #include "wx/datstrm.h"
 #include "wx/textfile.h"
 

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index e76fbcb725b3a1045fe062d3542ccd79cb4c56ff..a45b3d7489538d748124165dc78487173cca0447 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -20,6 +20,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
 #endif
 
 #if wxUSE_STD_IOSTREAM
@@ -36,8 +39,7 @@ using namespace std ;
 #endif
 
 #if wxUSE_STREAMS
-#include "wx/stream.h"
-#include "wx/txtstrm.h"
+    #include "wx/txtstrm.h"
 #endif
 
 #include "wx/string.h"

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 74bdde104059b597489e39340d30d03740f4979f..572d2be6d5758103f3c373b26f2c6dba86e69e58 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fstream.cpp
+// Name:        src/common/fstream.cpp
 // Purpose:     "File stream" classes
 // Author:      Julian Smart
 // Modified by:
@@ -13,15 +13,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_STREAMS
 
-#include <stdio.h>
-#include "wx/stream.h"
 #include "wx/wfstream.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/stream.h"
+#endif
+
+#include <stdio.h>
+
 #if wxUSE_FILE
 
 // ----------------------------------------------------------------------------
@@ -380,4 +384,3 @@ wxFFileStream::wxFFileStream(const wxString& fileName)
 #endif //wxUSE_FFILE
 
 #endif // wxUSE_STREAMS
-

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 6a4f651fc0fbfdb58676deeab88d95f007c644e4..ac1b1b7249151f5ce7dd67cc03bff742c2fea99d 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -103,9 +103,11 @@ license is as follows:
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
 #endif
 
-#include "wx/stream.h"
 #include "wx/image.h"
 #include "wx/hashmap.h"
 #include <string.h>

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 8c016573cd70b8ec18e5993286315f75b36a1a6d..a1456b1ae2f309dc1aabfc88d6373298e1caf8a0 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -24,6 +24,9 @@
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
 
     #include "wx/sizer.h"
 
@@ -50,7 +53,6 @@
 #include "wx/progdlg.h"
 #include "wx/toolbar.h"
 #include "wx/fontenum.h"
-#include "wx/stream.h"
 #include "wx/filedlg.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index bb2aaafd71145ff5919dc180919c6ab02d586a4f..7d0eed086b7e7767a70f3381562890431c328510 100644 (file)
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -24,6 +24,9 @@
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
 
     #include "wx/sizer.h"
 
@@ -51,7 +54,6 @@
 #include "wx/progdlg.h"
 #include "wx/toolbar.h"
 #include "wx/fontenum.h"
-#include "wx/stream.h"
 #include "wx/filedlg.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index accecb36450b28f5e5a538eaea40995bfdde25e2..8df728921e05026034928c9cca4fb1ef836fa6f1 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -29,9 +29,11 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
 #endif
 
-#include "wx/stream.h"
 #include "wx/process.h"
 
 #include "wx/apptrait.h"

diff --git a/src/palmos/utilsexc.cpp b/src/palmos/utilsexc.cpp
index 645132d1cca521365ae7f80cb10bec593ad10659..35be0f4752606000b10e91504dfd21b4aec947e9 100644 (file)
--- a/src/palmos/utilsexc.cpp
+++ b/src/palmos/utilsexc.cpp
@@ -29,9 +29,11 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
 #endif
 
-#include "wx/stream.h"
 #include "wx/process.h"
 
 #include "wx/apptrait.h"
@@ -95,4 +97,3 @@ long wxExecute(wxChar **argv, int flags, wxProcess *handler)
 {
     return 0;
 }
-