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

wxLogError()'s second argument is wxChar*,

Browse Source 
so it likes c_str() better than mb_str()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-03-25 23:07:40 +00:00
parent ab64366836
commit 049bf7d36f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/html/helpdata.cpp
View File

@@ -235,7 +235,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
delete[] buf; delete[] buf;
} }
else else
wxLogError(_("Cannot open contents file: %s"), contentsfile.mb_str()); wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) ); f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
if (f) { if (f) {
@@ -250,7 +250,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
delete[] buf; delete[] buf;
} }
else if (!indexfile.IsEmpty()) else if (!indexfile.IsEmpty())
wxLogError(_("Cannot open index file: %s"), indexfile.mb_str()); wxLogError(_("Cannot open index file: %s"), indexfile.c_str());
return TRUE; return TRUE;
} }
@@ -539,7 +539,7 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
fi = fsys.OpenFile(bookFull); fi = fsys.OpenFile(bookFull);
if (fi == NULL) if (fi == NULL)
{ {
wxLogError(_("Cannot open HTML help book: %s"), bookFull.mb_str()); wxLogError(_("Cannot open HTML help book: %s"), bookFull.c_str());
return FALSE; return FALSE;
} }
fsys.ChangePathTo(bookFull); fsys.ChangePathTo(bookFull);

2
src/html/htmlfilt.cpp
View File

@@ -143,7 +143,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
if (s == NULL) if (s == NULL)
{ {
wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().mb_str()); wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().c_str());
return wxEmptyString; return wxEmptyString;
} }
src = new char[s -> GetSize() + 1]; src = new char[s -> GetSize() + 1];

4
src/html/htmlwin.cpp
View File

@@ -172,7 +172,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
if (f == NULL) { if (f == NULL) {
wxString err; wxString err;
wxLogError(_("Unable to open requested HTML document: %s"), location.mb_str()); wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
m_tmpCanDrawLocks--; m_tmpCanDrawLocks--;
SetCursor(*wxSTANDARD_CURSOR); SetCursor(*wxSTANDARD_CURSOR);
@@ -248,7 +248,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor); const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);
if (!c) if (!c)
{ {
wxLogWarning(_("HTML anchor %s does not exist."), anchor.mb_str()); wxLogWarning(_("HTML anchor %s does not exist."), anchor.c_str());
return FALSE; return FALSE;
} }
else { else {

2
src/html/winpars.cpp
View File

@@ -355,7 +355,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
wxCONVERT_SUBSTITUTE)) wxCONVERT_SUBSTITUTE))
{ // total failture :-( { // total failture :-(
wxLogError(_("Failed to display HTML document in %s encoding"), wxLogError(_("Failed to display HTML document in %s encoding"),
wxFontMapper::GetEncodingName(enc).mb_str()); wxFontMapper::GetEncodingName(enc).c_str());
m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
delete m_EncConv; delete m_EncConv;
m_EncConv = NULL; m_EncConv = NULL;