From: Stefan Csomor Date: Thu, 21 Aug 2008 08:49:42 +0000 (+0000) Subject: using the 'new' bottleneck methods, fixing bugreport from Bengt Nilsson git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp index dbf9d7ddad..0116a79c2e 100644 --- a/samples/docview/doc.cpp +++ b/samples/docview/doc.cpp @@ -330,29 +330,22 @@ IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument) // Since text windows have their own method for saving to/loading from files, // we override OnSave/OpenDocument instead of Save/LoadObject -bool TextEditDocument::OnSaveDocument(const wxString& filename) +bool TextEditDocument::DoSaveDocument(const wxString& filename) { TextEditView* view = GetFirstView(); if (!view->m_textsw->SaveFile(filename)) return false; - Modify(false); -#ifdef __WXMAC__ - wxFileName fn(filename) ; - fn.MacSetDefaultTypeAndCreator() ; -#endif + return true; } -bool TextEditDocument::OnOpenDocument(const wxString& filename) +bool TextEditDocument::DoOpenDocument(const wxString& filename) { TextEditView* view = GetFirstView(); if (!view->m_textsw->LoadFile(filename)) return false; - SetFilename(filename, true); - Modify(false); - UpdateAllViews(); return true; } diff --git a/samples/docview/doc.h b/samples/docview/doc.h index 43ad93c91a..66132371c3 100644 --- a/samples/docview/doc.h +++ b/samples/docview/doc.h @@ -97,8 +97,8 @@ public: */ TextEditView* GetFirstView() const; - virtual bool OnSaveDocument(const wxString& filename); - virtual bool OnOpenDocument(const wxString& filename); + virtual bool DoSaveDocument(const wxString& filename); + virtual bool DoOpenDocument(const wxString& filename); virtual bool IsModified(void) const; virtual void Modify(bool mod); };