Session management changes for wxMSW.

[wxWidgets.git] / include / wx / fstream.h

diff --git a/include/wx/fstream.h b/include/wx/fstream.h
index 0c8dd722961e504fae8ce7206b1d41bd3b0e4b3e..2c1f320f855f8a23a2ba67b98467d59a146671ab 100644 (file)
--- a/include/wx/fstream.h
+++ b/include/wx/fstream.h
@@ -8,14 +8,26 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_WXFSTREAM_H__
 #define _WX_WXFSTREAM_H__
 
+#ifdef __GNUG__
+#pragma interface "fstream.h"
+#endif
+
 #include <wx/object.h>
 #include <wx/string.h>
 #include <wx/stream.h>
 #include <wx/file.h>
 
+// Disable warnings such as
+// 'wxFileStream' : inherits 'wxFileInputStream::Peek' via dominance
+
+#ifdef _MSC_VER
+#pragma warning(disable:4250)
+#endif
+
 class wxFileStreamBase {
 protected:
   wxFile *m_file;
@@ -69,4 +81,8 @@ class wxFileStream: public wxStream,
   virtual ~wxFileStream();
 };
 
+#ifdef _MSC_VER
+#pragma warning(default:4250)
+#endif
+
 #endif