From 049bf7d36fb27fdb56d6713ea8da9242bd2c9c45 Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@arcticnet.no>
Date: Sat, 25 Mar 2000 23:07:40 +0000
Subject: [PATCH] wxLogError()'s second argument is wxChar*, 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
---
 src/html/helpdata.cpp | 6 +++---
 src/html/htmlfilt.cpp | 2 +-
 src/html/htmlwin.cpp  | 4 ++--
 src/html/winpars.cpp  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index a3759e410f..53759bc2e7 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -235,7 +235,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
         delete[] buf;
     }
     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) );
     if (f) {
@@ -250,7 +250,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
         delete[] buf;
     }
     else if (!indexfile.IsEmpty())
-        wxLogError(_("Cannot open index file: %s"), indexfile.mb_str());
+        wxLogError(_("Cannot open index file: %s"), indexfile.c_str());
     return TRUE;
 }
 
@@ -539,7 +539,7 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
         fi = fsys.OpenFile(bookFull);
         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;
 	}
         fsys.ChangePathTo(bookFull);
diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 0a814cb1a0..639ea7272a 100644
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -143,7 +143,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
 
     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;
     }
     src = new char[s -> GetSize() + 1];
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 19584d465b..e1afd4d9fd 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -172,7 +172,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         if (f == NULL) {
             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--;
 
             SetCursor(*wxSTANDARD_CURSOR);
@@ -248,7 +248,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
     const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);
     if (!c)
     {
-        wxLogWarning(_("HTML anchor %s does not exist."), anchor.mb_str());
+        wxLogWarning(_("HTML anchor %s does not exist."), anchor.c_str());
         return FALSE;
     }
     else {
diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index da93089791..24748b018a 100644
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -355,7 +355,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
                            wxCONVERT_SUBSTITUTE))  
     { // total failture :-(
         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;
         delete m_EncConv;
         m_EncConv = NULL;