From de03ba59b51788ba9065e89d6703bda9fe5d65d6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 4 Nov 2008 17:47:07 +0000
Subject: [PATCH] override Do{Open,Save}Document() instead of
 On{Open,Save}Document() (closes #9892) [backport of r55342 from trunk]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/docvwmdi/doc.cpp | 20 +++++---------------
 samples/docvwmdi/doc.h   |  7 ++++---
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp
index cba38cb497..b006c1ac34 100644
--- a/samples/docvwmdi/doc.cpp
+++ b/samples/docvwmdi/doc.cpp
@@ -327,27 +327,17 @@ 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);
-    return true;
+    return view->textsw->SaveFile(filename);
 }
 
-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;
+    return view->textsw->LoadFile(filename);
 }
 
 bool TextEditDocument::IsModified(void) const
diff --git a/samples/docvwmdi/doc.h b/samples/docvwmdi/doc.h
index f68b8a18ea..96ef29f1b5 100644
--- a/samples/docvwmdi/doc.h
+++ b/samples/docvwmdi/doc.h
@@ -93,13 +93,14 @@ class TextEditDocument: public wxDocument
   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 IsModified(void) const;
   virtual void Modify(bool mod);
 
   TextEditDocument(void) {}
-  ~TextEditDocument(void) {}
+  virtual ~TextEditDocument(void) {}
+protected:
+  virtual bool DoOpenDocument(const wxString& filename);
+  virtual bool DoSaveDocument(const wxString& filename);
 };