added iosfwrap.h (wrapper for <iosfwd>)

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

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 710af7dac1a070df6b71555cb3b745f772175ccb..a5510edd27ed3b4d3769e95cbd92ebe67c5ce085 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -869,6 +869,7 @@ imagtiff.h  WXH
 imagjpeg.h     WXH
 imaglist.h     WXH
 intl.h WXH     Base
 imagjpeg.h     WXH
 imaglist.h     WXH
 intl.h WXH     Base

+iosfwrap.h     WXH     Base

 ioswrap.h      WXH     Base
 ipc.h  WXH     Base
 ipcbase.h      WXH     Base
 ioswrap.h      WXH     Base
 ipc.h  WXH     Base
 ipcbase.h      WXH     Base

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 57cf016b972b97f343ab0d03a2484ffd44fec774..ce8b94011dad614ee659f171112ded7a2d8e787f 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -40,7 +40,7 @@ class WXDLLEXPORT wxFileHistory;
 class WXDLLEXPORT wxConfigBase;
 
 #if wxUSE_STD_IOSTREAM
 class WXDLLEXPORT wxConfigBase;
 
 #if wxUSE_STD_IOSTREAM

-  #include "wx/ioswrap.h"
+  #include "wx/iosfwrap.h"

 #else
   #include "wx/stream.h"
 #endif
 #else
   #include "wx/stream.h"
 #endif

diff --git a/include/wx/iosfwrap.h b/include/wx/iosfwrap.h
new file mode 100644 (file)
index 0000000..00e7842
--- /dev/null
+++ b/include/wx/iosfwrap.h
@@ -0,0 +1,23 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/iosfwrap.h
+// Purpose:     includes the correct stream-related forward declarations
+// Author:      Jan van Dijk
+// Modified by:
+// Created:     18.12.2002
+// RCS-ID:      $Id$
+// Copyright:   (c) 2002 Jan van Dijk <jan@etpmod.phys.tue.nl>
+// Licence:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+#if wxUSE_STD_IOSTREAM
+
+#if wxUSE_IOSTREAMH
+    // There is no pre-ANSI iosfwd header (?). We include the full decarations.
+#   include <iostream.h>
+#else
+#   include <iosfwd>
+#endif
+
+#endif
+  // wxUSE_STD_IOSTREAM
+

diff --git a/include/wx/ioswrap.h b/include/wx/ioswrap.h
index 293437577753e1c744dd8d623a208aaddfb21d8e..6769adc56501a59c53b9608b3757e3dce64e83b2 100644 (file)
--- a/include/wx/ioswrap.h
+++ b/include/wx/ioswrap.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        ioswrap.h
+// Name:        wx/ioswrap.h

 // Purpose:     includes the correct iostream headers for current compiler
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     includes the correct iostream headers for current compiler
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -12,15 +12,9 @@
 #if wxUSE_STD_IOSTREAM
 
 #if wxUSE_IOSTREAMH
 #if wxUSE_STD_IOSTREAM
 
 #if wxUSE_IOSTREAMH

-    // N.B. BC++ doesn't have istream.h, ostream.h

 #   include <iostream.h>
 #else
 #   include <iostream>
 #   include <iostream.h>
 #else
 #   include <iostream>

-#   if 0 // this is not needed any longer now that we have wxSTD
-#   if defined(__VISUALC__) || defined(__MWERKS__)
-        using namespace std;
-#   endif
-#endif // 0

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/include/wx/log.h b/include/wx/log.h
index 321b0c96f3543a32f85dd8ca26689859a6404f2e..193861f4bc81ddfa8c0894ba895ef83bbef862af 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -101,7 +101,7 @@ enum
     #define wxTraceOleCalls 0x0100  // OLE interface calls
 #endif
 
     #define wxTraceOleCalls 0x0100  // OLE interface calls
 #endif
 

-#include "wx/ioswrap.h"
+#include "wx/iosfwrap.h"

 
 // ----------------------------------------------------------------------------
 // derive from this class to redirect (or suppress, or ...) log messages
 
 // ----------------------------------------------------------------------------
 // derive from this class to redirect (or suppress, or ...) log messages

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 468d826636d4eb002b2098de5e127de44e84fac7..5fc1175e7ef523d41b7a2d074eef015be1b6ab6d 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -144,7 +144,7 @@
 // ----------------------------------------------------------------------------
 
 // we use iostream for wxLongLong output
 // ----------------------------------------------------------------------------
 
 // we use iostream for wxLongLong output

-#include "wx/ioswrap.h"
+#include "wx/iosfwrap.h"

 
 #if wxUSE_LONGLONG_NATIVE
 
 
 #if wxUSE_LONGLONG_NATIVE
 

diff --git a/include/wx/object.h b/include/wx/object.h
index be4a7bbc3fb85282cc724c8773de2699e43c0276..8dd677333cef412adb772b01841ad0e37e2b1054 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -45,11 +45,6 @@ class WXDLLEXPORT wxClassInfo;
 class WXDLLEXPORT wxHashTable;
 class WXDLLEXPORT wxObjectRefData;
 
 class WXDLLEXPORT wxHashTable;
 class WXDLLEXPORT wxObjectRefData;
 

-#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-    #include "wx/ioswrap.h"
-#endif
-
-

 // ----------------------------------------------------------------------------
 // wxClassInfo
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxClassInfo
 // ----------------------------------------------------------------------------


@@ -326,18 +321,6 @@ inline void wxCheckCast(void *ptr)
 
 #endif  // __WXDEBUG__
 
 
 #endif  // __WXDEBUG__
 

-
-// for some reason Borland seems to need this include.
-#if wxUSE_STD_IOSTREAM                                \
-    && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)  \
-    && defined(__BORLANDC__)
-    #if wxUSE_IOSTREAMH
-        #include <iostream.h>
-    #else
-        #include <iostream>
-    #endif
-#endif // wxUSE_IOSTREAMH
-

 // ----------------------------------------------------------------------------
 // set up memory debugging macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // set up memory debugging macros
 // ----------------------------------------------------------------------------


@@ -396,6 +379,10 @@ inline void wxCheckCast(void *ptr)
 
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 
 
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 

+#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
+// needed by wxObject::Dump
+#include "wx/iosfwrap.h"
+#endif

 
 // ----------------------------------------------------------------------------
 // wxObject: the root class of wxWindows object hierarchy
 
 // ----------------------------------------------------------------------------
 // wxObject: the root class of wxWindows object hierarchy

diff --git a/include/wx/string.h b/include/wx/string.h
index 559817da0184cf4b4c35966162ad7d4ccf646637..c9169837c7e0494cd48885ddf23e75aabf072df6 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -1261,7 +1261,7 @@ inline wxString operator+(const wxCharBuffer& buf, const wxString& string)
 
 #if defined(wxSTD_STRING_COMPATIBILITY) && wxUSE_STD_IOSTREAM
 
 
 #if defined(wxSTD_STRING_COMPATIBILITY) && wxUSE_STD_IOSTREAM
 

-#include "wx/ioswrap.h"
+#include "wx/iosfwrap.h"

 
 WXDLLEXPORT wxSTD istream& operator>>(wxSTD istream&, wxString&);
 WXDLLEXPORT wxSTD ostream& operator<<(wxSTD ostream&, const wxString&);
 
 WXDLLEXPORT wxSTD istream& operator>>(wxSTD istream&, wxString&);
 WXDLLEXPORT wxSTD ostream& operator<<(wxSTD ostream&, const wxString&);

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 337d8406f65cc469d2e99f2ba24db2ea104f8608..00ff41af957ff50ff9ef4c76c8f25d1fe8c9b4f8 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -37,7 +37,7 @@
 
 #ifndef NO_TEXT_WINDOW_STREAM
     #if wxUSE_STD_IOSTREAM
 
 #ifndef NO_TEXT_WINDOW_STREAM
     #if wxUSE_STD_IOSTREAM

-        #include "wx/ioswrap.h"    // for iostream classes if we need them
+        #include "wx/ioswrap.h"    // derivation: we need the full decls.

     #else // !wxUSE_STD_IOSTREAM
         // can't compile this feature in if we don't use streams at all
         #define NO_TEXT_WINDOW_STREAM
     #else // !wxUSE_STD_IOSTREAM
         // can't compile this feature in if we don't use streams at all
         #define NO_TEXT_WINDOW_STREAM

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 3c47bc497e7bbbcbecd494b449e4a3628d14e7ce..795f92b5f47b19787b1bcc29a48d47d041d08871 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -32,7 +32,7 @@
     #include "wx/db.h"  // will #include sqltypes.h
 #endif //ODBC
 
     #include "wx/db.h"  // will #include sqltypes.h
 #endif //ODBC
 

-#include "wx/ioswrap.h"
+#include "wx/iosfwrap.h"

 
 /*
  * wxVariantData stores the actual data in a wxVariant object,
 
 /*
  * wxVariantData stores the actual data in a wxVariant object,

diff --git a/src/common/log.cpp b/src/common/log.cpp
index b53bb3a6a9992e14b6c18cd4ba57e618db5e3a53..81ab68239bb4e0ff2d5291b4a8e31e9d0c82d541 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -748,6 +748,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM

+#include "wx/ioswrap.h"

 wxLogStream::wxLogStream(wxSTD ostream *ostr)
 {
     if ( ostr == NULL )
 wxLogStream::wxLogStream(wxSTD ostream *ostr)
 {
     if ( ostr == NULL )