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

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

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"
 

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

src/common/mstream.cpp

@@ -26,10 +26,14 @@
 
 #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
 // ============================================================================

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

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"
 

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"

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:
@@ -18,10 +18,14 @@
 
 #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
-

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>

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"

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"

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"

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;
 }
-