X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f7adba06fa6cf7d171caaa83d81563e581dfb5c..9398120d298d745763f253d87d774be3b134b43f:/include/wx/docview.h diff --git a/include/wx/docview.h b/include/wx/docview.h index cc728d8e16..52f0c25048 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -96,11 +96,6 @@ public: 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); virtual bool OnOpenDocument(const wxString& filename); @@ -176,7 +171,7 @@ public: ~wxView(); wxDocument *GetDocument() const { return m_viewDocument; } - void SetDocument(wxDocument *doc); + virtual void SetDocument(wxDocument *doc); wxString GetViewName() const { return m_viewTypeName; } void SetViewName(const wxString& name) { m_viewTypeName = name; }; @@ -305,6 +300,7 @@ public: // Handlers for common user commands void OnFileClose(wxCommandEvent& event); + void OnFileCloseAll(wxCommandEvent& event); void OnFileNew(wxCommandEvent& event); void OnFileOpen(wxCommandEvent& event); void OnFileRevert(wxCommandEvent& event); @@ -365,6 +361,9 @@ public: void AddDocument(wxDocument *doc); void RemoveDocument(wxDocument *doc); + // closes all currently open documents + bool CloseDocuments(bool force = TRUE); + // Clear remaining documents and templates bool Clear(bool force = TRUE);