converted to 16 colors

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 68a49c83468716726aac981029cc7cef6d96258e..fb93a4a378aca78c48d22a7d2724033c5168465c 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -92,8 +92,13 @@ public:
     virtual ostream& SaveObject(ostream& stream);
     virtual istream& LoadObject(istream& stream);
 #else
-    virtual bool SaveObject(wxOutputStream& stream);
-    virtual bool LoadObject(wxInputStream& stream);
+    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