CodeWarrior fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index bc118c77417dd1fe15fd9ebdfdafeb08b8d88091..a82b7e19a719caf5756a668cc6d0411ed1ffa20f 100644 (file)
--- 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