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

adapting to new raw_control

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-01-19 15:09:02 +00:00
parent 7b7dc4a22b
commit 41749c76d8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -164,9 +164,9 @@ static pascal OSStatus wxWebKitKeyEventHandler( EventHandlerCallRef handler , Ev
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 = modifiers & cmdKey;
event.m_x = point.h; event.m_x = point.h;
event.m_y = point.v; event.m_y = point.v;
@@ -179,7 +179,7 @@ static pascal OSStatus wxWebKitKeyEventHandler( EventHandlerCallRef handler , Ev
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->GetEventHandler()->ProcessEvent( event ) ; focus->GetEventHandler()->ProcessEvent( event ) ;
} }
@@ -197,7 +197,7 @@ static pascal OSStatus wxWebKitKeyEventHandler( EventHandlerCallRef handler , Ev
} }
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->GetEventHandler()->ProcessEvent( event ) ; focus->GetEventHandler()->ProcessEvent( event ) ;
} }