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

don't use implicit wxString->char*/wchar_t* conversion, it will not be available in wxUSE_STL build in the future

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-10 17:42:41 +00:00
parent 52de37c78f
commit 8650108199
51 changed files with 330 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/uri.cpp
View File

@@ -93,7 +93,10 @@ const wxChar* wxURI::Create(const wxString& uri)
if (m_fields)
Clear();
return Parse(uri);
// FIXME-UTF8: rewrite ParseXXX() methods using iterators
// NB: using wxWxCharBuffer instead of just c_str() avoids keeping
// converted string in memory for longer than needed
return Parse(wxWxCharBuffer(uri.c_str()));
}
// ---------------------------------------------------------------------------
@@ -374,7 +377,7 @@ bool wxURI::IsReference() const
// URI-reference = URI / relative
// ---------------------------------------------------------------------------
const wxChar* wxURI::Parse(const wxChar* uri)
const wxChar* wxURI::Parse(const wxChar *uri)
{
uri = ParseScheme(uri);
uri = ParseAuthority(uri);
@@ -389,7 +392,7 @@ const wxChar* wxURI::Parse(const wxChar* uri)
// Individual parsers for each URI component
// ---------------------------------------------------------------------------
const wxChar* wxURI::ParseScheme(const wxChar* uri)
const wxChar* wxURI::ParseScheme(const wxChar *uri)
{
wxASSERT(uri != NULL);