Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

override Do{Open,Save}Document() instead of On{Open,Save}Document() (closes #9892) [backport of r55342 from trunk]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-04 17:47:07 +00:00
parent 098a10bd43
commit de03ba59b5
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/docvwmdi/doc.cpp
View File

@@ -327,27 +327,17 @@ bool DrawingCommand::Undo(void)
IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument) IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
// Since text windows have their own method for saving to/loading from files, // Since text windows have their own method for saving to/loading from files,
// we override OnSave/OpenDocument instead of Save/LoadObject // we override DoSave/OpenDocument instead of Save/LoadObject
bool TextEditDocument::OnSaveDocument(const wxString& filename) bool TextEditDocument::DoSaveDocument(const wxString& filename)
{ {
TextEditView *view = (TextEditView *)GetFirstView(); TextEditView *view = (TextEditView *)GetFirstView();
return view->textsw->SaveFile(filename);
if (!view->textsw->SaveFile(filename))
return false;
Modify(false);
return true;
} }
bool TextEditDocument::OnOpenDocument(const wxString& filename) bool TextEditDocument::DoOpenDocument(const wxString& filename)
{ {
TextEditView *view = (TextEditView *)GetFirstView(); TextEditView *view = (TextEditView *)GetFirstView();
if (!view->textsw->LoadFile(filename)) return view->textsw->LoadFile(filename);
return false;
SetFilename(filename, true);
Modify(false);
UpdateAllViews();
return true;
} }
bool TextEditDocument::IsModified(void) const bool TextEditDocument::IsModified(void) const

7
samples/docvwmdi/doc.h
View File

@@ -93,13 +93,14 @@ class TextEditDocument: public wxDocument
wxSTD ostream& SaveObject(wxSTD ostream& stream); wxSTD ostream& SaveObject(wxSTD ostream& stream);
wxSTD istream& LoadObject(wxSTD istream& 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 bool IsModified(void) const;
virtual void Modify(bool mod); virtual void Modify(bool mod);
TextEditDocument(void) {} TextEditDocument(void) {}
~TextEditDocument(void) {} virtual ~TextEditDocument(void) {}
protected:
virtual bool DoOpenDocument(const wxString& filename);
virtual bool DoSaveDocument(const wxString& filename);
}; };