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

wxOSX/Carbon compilation fix after the changes of r72207.

Browse Source 
Don't use position for keyboard events in Carbon code neither.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-25 22:21:45 +00:00
parent 9765f67156
commit f5406730ff
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/carbon/window.cpp
View File

@@ -653,8 +653,7 @@ WXDLLEXPORT pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef ha
I don't have time to look into that right now. I don't have time to look into that right now.
-- CL -- CL
*/ */
if ( wxTheApp->MacSendCharEvent( if ( wxTheApp->MacSendCharEvent( focus , message , 0 , when , uniChars[pos] ) )
focus , message , 0 , when , 0 , 0 , uniChars[pos] ) )
{ {
result = noErr ; result = noErr ;
} }
@@ -666,7 +665,6 @@ WXDLLEXPORT pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef ha
case kEventTextInputUnicodeForKeyEvent : case kEventTextInputUnicodeForKeyEvent :
{ {
UInt32 keyCode, modifiers ; UInt32 keyCode, modifiers ;
Point point ;
EventRef rawEvent ; EventRef rawEvent ;
unsigned char charCode ; unsigned char charCode ;
@@ -674,7 +672,6 @@ WXDLLEXPORT pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef ha
GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode ); GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
UInt32 message = (keyCode << 8) + charCode; UInt32 message = (keyCode << 8) + charCode;
@@ -686,8 +683,7 @@ WXDLLEXPORT pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef ha
WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ; WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
wxTheApp->MacSetCurrentEvent( event , handler ) ; wxTheApp->MacSetCurrentEvent( event , handler ) ;
if ( wxTheApp->MacSendCharEvent( if ( wxTheApp->MacSendCharEvent( focus , message , modifiers , when , uniChars[pos] ) )
focus , message , modifiers , when , point.h , point.v , uniChars[pos] ) )
{ {
result = noErr ; result = noErr ;
} }