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

CodeWarrior fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-03-10 16:06:32 +00:00
parent cd17aeff89
commit cdef033465
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/window.cpp
View File

@@ -167,9 +167,11 @@ static const EventTypeSpec eventList[] =
{ kEventClassTextInput, kEventTextInputUpdateActiveInputArea } , { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
{ kEventClassControl , kEventControlDraw } , { kEventClassControl , kEventControlDraw } ,
#if TARGET_API_MAC_OSX
{ kEventClassControl , kEventControlVisibilityChanged } , { kEventClassControl , kEventControlVisibilityChanged } ,
{ kEventClassControl , kEventControlEnabledStateChanged } , { kEventClassControl , kEventControlEnabledStateChanged } ,
{ kEventClassControl , kEventControlHiliteChanged } , { kEventClassControl , kEventControlHiliteChanged } ,
#endif
{ kEventClassControl , kEventControlSetFocusPart } , { kEventClassControl , kEventControlSetFocusPart } ,
{ kEventClassService , kEventServiceGetTypes }, { kEventClassService , kEventServiceGetTypes },
@@ -513,7 +515,7 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
uniChars = new wchar_t[ numChars ] ; uniChars = new wchar_t[ numChars ] ;
GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ; GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
#if SIZEOF_WCHAR_T == 2 #if SIZEOF_WCHAR_T == 2
uniChars = charBuf ; uniChars = (wchar_t*) charBuf ;
memcpy( uniChars , charBuf , dataSize ) ; memcpy( uniChars , charBuf , dataSize ) ;
#else #else
// the resulting string will never have more chars than the utf16 version, so this is safe // the resulting string will never have more chars than the utf16 version, so this is safe