warning in Unicode compilation fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1377,12 +1377,13 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
|
|||||||
|
|
||||||
return (wxMB2WXbuf)(szOrigString);
|
return (wxMB2WXbuf)(szOrigString);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something,
|
|
||||||
// a macro similar to wxConvertMB2WX could be written for that
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// or preferably wxCSConv(charset).cMB2WX(pszTrans) or something, a macro
|
||||||
|
// similar to wxConvertMB2WX could be written for that
|
||||||
|
|
||||||
|
return wxConvertMB2WX(pszTrans);
|
||||||
|
|
||||||
|
// undo the hack from the beginning of this function
|
||||||
#undef szOrgString
|
#undef szOrgString
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user