1. log::save works with wxGTK
2. wxFile::Create() doesn't create files open for reading any more... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -174,7 +174,8 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
|
|||||||
{
|
{
|
||||||
// if bOverwrite we create a new file or truncate the existing one,
|
// if bOverwrite we create a new file or truncate the existing one,
|
||||||
// otherwise we only create the new file and fail if it already exists
|
// otherwise we only create the new file and fail if it already exists
|
||||||
int fd = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
|
int fd = open(szFileName, O_WRONLY | O_CREAT |
|
||||||
|
(bOverwrite ? O_TRUNC : O_EXCL), access);
|
||||||
|
|
||||||
if ( fd == -1 ) {
|
if ( fd == -1 ) {
|
||||||
wxLogSysError(_("can't create file '%s'"), szFileName);
|
wxLogSysError(_("can't create file '%s'"), szFileName);
|
||||||
|
@@ -687,22 +687,19 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
|
|||||||
|
|
||||||
// retrieve text and save it
|
// retrieve text and save it
|
||||||
// -------------------------
|
// -------------------------
|
||||||
#ifdef __WXGTK__
|
|
||||||
// @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
|
|
||||||
wxLogError(_("Sorry, this function is not implemented under GTK"));
|
|
||||||
#else
|
|
||||||
int nLines = m_pTextCtrl->GetNumberOfLines();
|
int nLines = m_pTextCtrl->GetNumberOfLines();
|
||||||
for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
|
for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
|
||||||
bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
|
bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
|
||||||
}
|
}
|
||||||
#endif //GTK
|
|
||||||
|
|
||||||
if ( bOk )
|
if ( bOk )
|
||||||
bOk = file.Close();
|
bOk = file.Close();
|
||||||
|
|
||||||
if ( !bOk ) {
|
if ( !bOk ) {
|
||||||
wxLogError(_("Can't save log contents to file."));
|
wxLogError(_("Can't save log contents to file."));
|
||||||
return;
|
}
|
||||||
|
else {
|
||||||
|
wxLogStatus(this, _("Log saved to the file '%s'."), szFileName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user