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

Build fix for wxOSX after removing position in MacCreateKeyEvent().

Browse Source 
This fixes compilation after the changes of r72207.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-24 21:44:32 +00:00
parent 33418f48c4
commit 723aa01a83
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osx/window_osx.cpp
View File

@@ -2628,20 +2628,18 @@ wxHotKeyHandler(EventHandlerCallRef WXUNUSED(nextHandler),
unsigned char charCode ; unsigned char charCode ;
UInt32 keyCode ; UInt32 keyCode ;
UInt32 modifiers ; UInt32 modifiers ;
Point where ;
UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode ); GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &where );
UInt32 keymessage = (keyCode << 8) + charCode; UInt32 keymessage = (keyCode << 8) + charCode;
wxKeyEvent wxevent(wxEVT_HOTKEY); wxKeyEvent wxevent(wxEVT_HOTKEY);
wxevent.SetId(hotKeyId.id); wxevent.SetId(hotKeyId.id);
wxTheApp->MacCreateKeyEvent( wxevent, s_hotkeys[i].window , keymessage , wxTheApp->MacCreateKeyEvent( wxevent, s_hotkeys[i].window , keymessage ,
modifiers , when , where.h , where.v , 0 ) ; modifiers , when , 0 ) ;
s_hotkeys[i].window->HandleWindowEvent(wxevent); s_hotkeys[i].window->HandleWindowEvent(wxevent);
} }