From 3f69d4b904543ea935648025b97d4d0598d40da8 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 21 Aug 2008 08:56:50 +0000 Subject: [PATCH] using the 'new' bottleneck methods, fixing bugreport from Bengt Nilsson git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/docview/doc.cpp | 15 ++++----------- samples/docview/doc.h | 4 ++-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp index 87a24dad4e..c8021168a7 100644 --- a/samples/docview/doc.cpp +++ b/samples/docview/doc.cpp @@ -329,30 +329,23 @@ bool DrawingCommand::Undo(void) 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) +// we override DoSave/OpenDocument instead of Save/LoadObject +bool TextEditDocument::DoSaveDocument(const wxString& filename) { TextEditView *view = (TextEditView *)GetFirstView(); if (!view->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 = (TextEditView *)GetFirstView(); if (!view->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 af9b272fbe..323f809228 100644 --- a/samples/docview/doc.h +++ b/samples/docview/doc.h @@ -93,8 +93,8 @@ public: wxSTD ostream& SaveObject(wxSTD ostream& stream); wxSTD istream& LoadObject(wxSTD istream& stream); */ - 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);