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

gcc compilation fixes after last commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-22 12:48:07 +00:00
parent 74a7eb0bf6
commit 422e411e95
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/strconv.cpp
View File

@@ -1341,7 +1341,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name )
return result; return result;
} }
wxString wxMBConv_iconv::ms_wcCharsetName = NULL; wxString wxMBConv_iconv::ms_wcCharsetName;
bool wxMBConv_iconv::ms_wcNeedsSwap = false; bool wxMBConv_iconv::ms_wcNeedsSwap = false;
wxMBConv_iconv::wxMBConv_iconv(const wxChar *name) wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
@@ -1407,7 +1407,8 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
if (ICONV_FAILED(res, insz)) if (ICONV_FAILED(res, insz))
{ {
wxLogLastError(wxT("iconv")); wxLogLastError(wxT("iconv"));
wxLogError(_("Conversion to charset '%s' doesn't work."), name); wxLogError(_("Conversion to charset '%s' doesn't work."),
name.c_str());
} }
else // ok, can convert to this encoding, remember it else // ok, can convert to this encoding, remember it
{ {
@@ -1445,7 +1446,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
{ {
wxLogTrace(TRACE_STRCONV, wxLogTrace(TRACE_STRCONV,
wxT("\"%s\" -> \"%s\" works but not the converse!?"), wxT("\"%s\" -> \"%s\" works but not the converse!?"),
ms_wcCharsetName.c_str(), cname); ms_wcCharsetName.c_str(), cname.data());
} }
} }
} }