Use wxConvertMB2WX to fix compilation error in Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
80df4d3169
commit
f6e9f05fa7
@ -586,12 +586,8 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
|
||||
}
|
||||
else
|
||||
{
|
||||
// FIXME it was
|
||||
// return (wxMB2WXbuf)(wxConvCurrent->cMB2WX(pszTrans));
|
||||
// before, but we don't want to use wxConvCurrent explicitly to
|
||||
// avoid linking unnecessary code in ANSI programs without MB
|
||||
// support
|
||||
return (wxMB2WXbuf)(pszTrans);
|
||||
return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something,
|
||||
// a macro similar to wxConvertMB2WX could be written for that
|
||||
}
|
||||
|
||||
#undef szOrgString
|
||||
|
Loading…
Reference in New Issue
Block a user