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

Added DoLoadFile, DoSaveFile to wxTextCtrlBase

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-09-24 11:40:33 +00:00
parent 3bb918c097
commit 3306aec124
16 changed files with 102 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/richtext/richtextctrl.cpp
View File

@@ -1525,9 +1525,30 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
// file IO functions
// ----------------------------------------------------------------------------
bool wxRichTextCtrl::LoadFile(const wxString& filename, int type)
#if !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
bool wxRichTextCtrl::LoadFile(const wxString& filename, int fileType)
{
bool success = GetBuffer().LoadFile(filename, type);
return DoLoadFile(filename, fileType);
}
bool wxRichTextCtrl::SaveFile(const wxString& filename, int fileType)
{
wxString filenameToUse = filename.empty() ? m_filename : filename;
if ( filenameToUse.empty() )
{
// what kind of message to give? is it an error or a program bug?
wxLogDebug(wxT("Can't save textctrl to file without filename."));
return false;
}
return DoSaveFile(filenameToUse, fileType);
}
#endif
bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
{
bool success = GetBuffer().LoadFile(filename, fileType);
if (success)
m_filename = filename;
@@ -1549,25 +1570,15 @@ bool wxRichTextCtrl::LoadFile(const wxString& filename, int type)
}
}
bool wxRichTextCtrl::SaveFile(const wxString& filename, int type)
bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType)
{
wxString filenameToUse = filename.empty() ? m_filename : filename;
if ( filenameToUse.empty() )
if (GetBuffer().SaveFile(filename, fileType))
{
// what kind of message to give? is it an error or a program bug?
wxLogDebug(wxT("Can't save textctrl to file without filename."));
return false;
}
if (GetBuffer().SaveFile(filenameToUse, type))
{
m_filename = filenameToUse;
m_filename = filename;
DiscardEdits();
return true;
}
wxLogError(_("The text couldn't be saved."));