From cdef03346586b83cb87ed1e9d239f236ce8baaf7 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 10 Mar 2006 16:06:32 +0000 Subject: [PATCH] CodeWarrior fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/window.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index bc118c7741..a82b7e19a7 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -167,9 +167,11 @@ static const EventTypeSpec eventList[] = { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } , { kEventClassControl , kEventControlDraw } , +#if TARGET_API_MAC_OSX { kEventClassControl , kEventControlVisibilityChanged } , { kEventClassControl , kEventControlEnabledStateChanged } , { kEventClassControl , kEventControlHiliteChanged } , +#endif { kEventClassControl , kEventControlSetFocusPart } , { kEventClassService , kEventServiceGetTypes }, @@ -513,7 +515,7 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even uniChars = new wchar_t[ numChars ] ; GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ; #if SIZEOF_WCHAR_T == 2 - uniChars = charBuf ; + uniChars = (wchar_t*) charBuf ; memcpy( uniChars , charBuf , dataSize ) ; #else // the resulting string will never have more chars than the utf16 version, so this is safe -- 2.45.2