byte length for interim UniChar String corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
da3f3e049a
commit
4227afa4f7
@ -71,9 +71,9 @@
|
||||
#include "wx/fontmap.h"
|
||||
|
||||
#ifdef __WXMAC__
|
||||
#include "ATSUnicode.h"
|
||||
#include "TextCommon.h"
|
||||
#include "TextEncodingConverter.h"
|
||||
#include <ATSUnicode.h>
|
||||
#include <TextCommon.h>
|
||||
#include <TextEncodingConverter.h>
|
||||
|
||||
#include "wx/mac/private.h" // includes mac headers
|
||||
#endif
|
||||
@ -1373,9 +1373,9 @@ public:
|
||||
#if SIZEOF_WCHAR_T == 4
|
||||
wxMBConvUTF16BE converter ;
|
||||
size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ;
|
||||
byteBufferLen = unicharlen ;
|
||||
ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ;
|
||||
converter.WC2MB( (char*) ubuf , psz, unicharlen ) ;
|
||||
byteInLen = unicharlen ;
|
||||
ubuf = (UniChar*) malloc( byteInLen + 2 ) ;
|
||||
converter.WC2MB( (char*) ubuf , psz, unicharlen + 2 ) ;
|
||||
#else
|
||||
ubuf = (UniChar*) psz ;
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user