warning fixes for BCC and OW (heavily modified patch 819146)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -111,7 +111,8 @@ static size_t encode_utf16(wxUint32 input, wxUint16 *output)
|
||||
{
|
||||
if (input<=0xffff)
|
||||
{
|
||||
if (output) *output++ = (wxUint16) input;
|
||||
if (output)
|
||||
*output = (wxUint16) input;
|
||||
return 1;
|
||||
}
|
||||
else if (input>=0x110000)
|
||||
@@ -123,7 +124,7 @@ static size_t encode_utf16(wxUint32 input, wxUint16 *output)
|
||||
if (output)
|
||||
{
|
||||
*output++ = (wxUint16) ((input >> 10)+0xd7c0);
|
||||
*output++ = (wxUint16) ((input&0x3ff)+0xdc00);
|
||||
*output = (wxUint16) ((input&0x3ff)+0xdc00);
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
|
Reference in New Issue
Block a user