using the 'new' bottleneck methods, fixing bugreport from Bengt Nilsson <bengt.nilsso...

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 dbf9d7ddad41ca04735789908fa1dfa1d94cc5ab..0116a79c2e84d0109bf45790db10bae2a0e1fa4f 100644 (file)
--- 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 43ad93c91a79c8343acfb1aefb963e2c6932a87a..66132371c3dc63ede888e6296fb1198cab922fbf 100644 (file)
--- 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);
 };