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

adapting new osx modifier handling, fixes #14377

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-07-02 12:36:18 +00:00
parent 0a434b1015
commit 9a0266bbf0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osx/carbon/nonownedwnd.cpp
View File

@@ -367,9 +367,9 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
wxKeyEvent event(wxEVT_KEY_DOWN); wxKeyEvent event(wxEVT_KEY_DOWN);
event.m_shiftDown = modifiers & shiftKey; event.m_shiftDown = modifiers & shiftKey;
event.m_controlDown = modifiers & controlKey; event.m_rawControlDown = modifiers & controlKey;
event.m_altDown = modifiers & optionKey; event.m_altDown = modifiers & optionKey;
event.m_metaDown = modifiers & cmdKey; event.m_controlDown = event.m_metaDown = modifiers & cmdKey;
event.m_x = point.h; event.m_x = point.h;
event.m_y = point.v; event.m_y = point.v;
@@ -382,7 +382,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & controlKey ) if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & controlKey )
{ {
event.m_keyCode = WXK_CONTROL ; event.m_keyCode = WXK_RAW_CONTROL ;
event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
focus->HandleWindowEvent( event ) ; focus->HandleWindowEvent( event ) ;
} }
@@ -400,7 +400,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
} }
if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & cmdKey ) if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & cmdKey )
{ {
event.m_keyCode = WXK_COMMAND ; event.m_keyCode = WXK_CONTROL;
event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
focus->HandleWindowEvent( event ) ; focus->HandleWindowEvent( event ) ;
} }
@@ -443,9 +443,9 @@ WXDLLEXPORT void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEve
wxevent.m_x = screenMouseLocation.h; wxevent.m_x = screenMouseLocation.h;
wxevent.m_y = screenMouseLocation.v; wxevent.m_y = screenMouseLocation.v;
wxevent.m_shiftDown = modifiers & shiftKey; wxevent.m_shiftDown = modifiers & shiftKey;
wxevent.m_controlDown = modifiers & controlKey; wxevent.m_rawControlDown = modifiers & controlKey;
wxevent.m_altDown = modifiers & optionKey; wxevent.m_altDown = modifiers & optionKey;
wxevent.m_metaDown = modifiers & cmdKey; wxevent.m_controlDown = wxevent.m_metaDown = modifiers & cmdKey;
wxevent.m_clickCount = clickCount; wxevent.m_clickCount = clickCount;
wxevent.SetTimestamp( cEvent.GetTicks() ) ; wxevent.SetTimestamp( cEvent.GetTicks() ) ;