compilation fix (no C++ comments in C files, include/wx/expr.hsrc/msw/textctrl.cpp...

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

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 68a49c83468716726aac981029cc7cef6d96258e..39854b9847d52270ba4e8a9bf76b2617ffb3a623 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
@@ -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);
@@ -369,6 +375,9 @@ public:
     virtual void FileHistoryAddFilesToMenu();
     virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
 
+    inline wxString GetLastDirectory() const { return m_lastDirectory; }
+    inline void SetLastDirectory(const wxString& dir) { m_lastDirectory = dir; }
+
 protected:
     long              m_flags;
     int               m_defaultDocumentNameCounter;
@@ -377,6 +386,7 @@ protected:
     wxList            m_templates;
     wxView*           m_currentView;
     wxFileHistory*    m_fileHistory;
+    wxString          m_lastDirectory;
 
     DECLARE_EVENT_TABLE()
 };
@@ -548,6 +558,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);