From 352d9b89577ab5e05cea07a7bc09a1a863ee6e42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 16 May 2007 18:07:05 +0000 Subject: [PATCH] fixes for STL build without implicit wxString->char* conversion git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/xml/xml.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp index ef4326200e..605e95375a 100644 --- a/src/xml/xml.cpp +++ b/src/xml/xml.cpp @@ -40,7 +40,7 @@ IMPLEMENT_CLASS(wxXmlDocument, wxObject) // a private utility used by wxXML -static bool wxIsWhiteOnly(const wxChar *buf); +static bool wxIsWhiteOnly(const wxString& buf); //----------------------------------------------------------------------------- @@ -438,11 +438,14 @@ static wxString CharToString(wxMBConv *conv, } // returns true if the given string contains only whitespaces -bool wxIsWhiteOnly(const wxChar *buf) +bool wxIsWhiteOnly(const wxString& buf) { - for (const wxChar *c = buf; *c != wxT('\0'); c++) - if (*c != wxT(' ') && *c != wxT('\t') && *c != wxT('\n') && *c != wxT('\r')) + for ( wxString::const_iterator i = buf.begin(); i != buf.end(); ++i ) + { + wxChar c = *i; + if ( c != wxT(' ') && c != wxT('\t') && c != wxT('\n') && c != wxT('\r')) return false; + } return true; } @@ -573,8 +576,7 @@ static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData), // We must build conversion table for expat. The easiest way to do so // is to let wxCSConv convert as string containing all characters to // wide character representation: - wxString str(name, wxConvLibc); - wxCSConv conv(str); + wxCSConv conv(name); char mbBuf[2]; wchar_t wcBuf[10]; size_t i; -- 2.45.2