AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1) wxFileConfig now longer tries to delete system-wide config file in DeleteAll

Browse Source 
(only the user's one)
2) wxLogStream "un#indef'ed" under wxGTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-08-03 23:23:56 +00:00
parent a7489b367d
commit c5c16a3025
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/fileconf.cpp
View File

@ -673,10 +673,6 @@ bool wxFileConfig::DeleteAll()
if ( remove(szFile) == -1 )
wxLogSysError(_("can't delete user configuration file '%s'"), szFile);
szFile = m_strGlobalFile;
if ( remove(szFile) )
wxLogSysError(_("can't delete system configuration file '%s'"), szFile);
m_strLocalFile = m_strGlobalFile = "";
Init();
@ -1339,8 +1335,10 @@ wxString FilterOut(const wxString& str)
break;
case '"':
if ( bQuote )
if ( bQuote ) {
c = '"';
break;
}
//else: fall through
default:

6
src/common/log.cpp
View File

@ -362,17 +362,13 @@ void wxLogStream::DoLogString(const char *szString)
// ----------------------------------------------------------------------------
wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
#ifndef __WXGTK__
: wxLogStream(new ostream(pTextCtrl))
#endif //GTK
{
}
wxLogTextCtrl::~wxLogTextCtrl()
{
#ifndef __WXGTK__
delete m_ostr;
#endif //GTK
delete m_ostr;
}
// ----------------------------------------------------------------------------