some compilation fixes atttempts for solaris

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 598d84c1254e520258595d245ba91f7d3b5208e8..fb93a4a378aca78c48d22a7d2724033c5168465c 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -36,7 +36,11 @@ class WXDLLEXPORT wxCommandProcessor;
 class WXDLLEXPORT wxFileHistory;
 class WXDLLEXPORT wxConfigBase;
 
-#include "wx/ioswrap.h"
+#if wxUSE_STD_IOSTREAM
+  #include "wx/ioswrap.h"
+#else
+  #include "wx/stream.h"
+#endif
 
 // Document manager flags
 enum
@@ -84,8 +88,18 @@ public:
     virtual bool SaveAs();
     virtual bool Revert();
 
+#if wxUSE_STD_IOSTREAM
     virtual ostream& SaveObject(ostream& stream);
     virtual istream& LoadObject(istream& stream);
+#else
+    virtual wxOutputStream& SaveObject(wxOutputStream& stream);
+    virtual wxInputStream& LoadObject(wxInputStream& stream);
+#endif
+
+#if wxUSE_SERIAL
+    // need this to keep from hiding the virtual from wxObject
+    virtual void LoadObject(wxObjectInputStream& stream) { wxObject::LoadObject(stream); };
+#endif
 
     // Called by wxWindows
     virtual bool OnSaveDocument(const wxString& filename);
@@ -573,9 +587,11 @@ protected:
     int               m_fileMaxFiles;
 };
 
+#if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats:
 // converts from/to a stream to/from a temporary file.
 bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, ostream& stream);
 bool WXDLLEXPORT wxTransferStreamToFile(istream& stream, const wxString& filename);
+#endif
 
 #endif // _WX_DOCH__