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

use correct fallback file name in SaveFile() (patch 820884)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-16 09:05:54 +00:00
parent 6a172d5942
commit 64dcc26913
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/textcmn.cpp
View File

@@ -230,7 +230,7 @@ bool wxTextCtrlBase::LoadFile(const wxString& filename)
bool wxTextCtrlBase::SaveFile(const wxString& filename) bool wxTextCtrlBase::SaveFile(const wxString& filename)
{ {
wxString filenameToUse = filename.IsEmpty() ? m_filename : filename; wxString filenameToUse = filename.IsEmpty() ? m_filename : filename;
if ( !filenameToUse ) if ( filenameToUse.empty() )
{ {
// what kind of message to give? is it an error or a program bug? // what kind of message to give? is it an error or a program bug?
wxLogDebug(wxT("Can't save textctrl to file without filename.")); wxLogDebug(wxT("Can't save textctrl to file without filename."));
@@ -239,19 +239,20 @@ bool wxTextCtrlBase::SaveFile(const wxString& filename)
} }
#if wxUSE_FFILE #if wxUSE_FFILE
wxFFile file(filename, _T("w")); wxFFile file(filenameToUse, _T("w"));
if ( file.IsOpened() && file.Write(GetValue()) ) if ( file.IsOpened() && file.Write(GetValue()) )
{ {
// it's not modified any longer // it's not modified any longer
DiscardEdits(); DiscardEdits();
m_filename = filename; // if it worked, save for future calls
m_filename = filenameToUse;
return TRUE; return TRUE;
} }
#endif // wxUSE_FFILE
wxLogError(_("The text couldn't be saved.")); wxLogError(_("The text couldn't be saved."));
#endif // wxUSE_FFILE
return FALSE; return FALSE;
} }