From 530ecef01f7e33c2ec1b8b1ad8025484709bef1d Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Wed, 3 May 2006 21:50:35 +0000
Subject: [PATCH] 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 | 7 ++++++-
src/common/fileconf.cpp | 8 +++-----
src/common/mstream.cpp | 10 +++++++---
src/common/sckstrm.cpp | 5 +++--
src/common/stream.cpp | 3 ++-
src/common/variant.cpp | 6 ++++--
src/common/wfstream.cpp | 13 ++++++++-----
src/common/xpmdecod.cpp | 4 +++-
src/html/helpfrm.cpp | 4 +++-
src/html/helpwnd.cpp | 4 +++-
src/msw/utilsexc.cpp | 4 +++-
src/palmos/utilsexc.cpp | 5 +++--
12 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/src/cocoa/utilsexc.mm b/src/cocoa/utilsexc.mm
index 20d6e25688..348c1c1060 100644
--- 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 f70b797e3f..553a3f445b 100644
--- 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 ab50d84386..f778677728 100644
--- 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 56ce74de65..5b1fcac0ca 100644
--- 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 9d1bb67a26..f13da0d3d8 100644
--- 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 e76fbcb725..a45b3d7489 100644
--- 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 74bdde1040..572d2be6d5 100644
--- 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 6a4f651fc0..ac1b1b7249 100644
--- 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 8c016573cd..a1456b1ae2 100644
--- 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 bb2aaafd71..7d0eed086b 100644
--- 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 accecb3645..8df728921e 100644
--- 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 645132d1cc..35be0f4752 100644
--- 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;
}
-
--
2.47.2