X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a533f5c122c27b44a80b4eef2bd907a44bec8b70..fb9010ed40454cc978a9cbaa6de2ee41ea8b6c84:/include/wx/docview.h

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 68a49c8346..3a11b7b5c5 100644
--- 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
@@ -357,6 +362,7 @@ public:
 
     // File history management
     virtual void AddFileToHistory(const wxString& file);
+    virtual void RemoveFileFromHistory(int i);
     virtual int GetNoHistoryFiles() const;
     virtual wxString GetHistoryFile(int i) const;
     virtual void FileHistoryUseMenu(wxMenu *menu);
@@ -548,6 +554,7 @@ public:
 
     // Operations
     virtual void AddFileToHistory(const wxString& file);
+    virtual void RemoveFileFromHistory(int i);
     virtual int GetMaxFiles() const { return m_fileMaxFiles; }
     virtual void UseMenu(wxMenu *menu);