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

fixing type for key event, using WXK_RAW_CONTROL constant for controlkey, see #13415

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-08-23 15:30:44 +00:00
parent a8fc3508e7
commit 68065b9194
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osx/cocoa/window.mm
View File

@@ -214,7 +214,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event, int eventType )
// command key // command key
case 54: case 54:
case 55: case 55:
retval = WXK_COMMAND; retval = WXK_CONTROL;
break; break;
// caps locks key // caps locks key
case 57: // Capslock case 57: // Capslock
@@ -233,7 +233,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event, int eventType )
// ctrl key // ctrl key
case 59: // Left Ctrl case 59: // Left Ctrl
case 62: // Right Ctrl case 62: // Right Ctrl
retval = WXK_CONTROL; retval = WXK_RAW_CONTROL;
break; break;
// clear key // clear key
case 71: case 71:
@@ -2141,6 +2141,7 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
{ {
// eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars
wxKeyEvent wxevent2(wxevent) ; wxKeyEvent wxevent2(wxevent) ;
wxevent2.SetEventType(wxEVT_CHAR);
wxevent2.m_keyCode = keycode; wxevent2.m_keyCode = keycode;
result = GetWXPeer()->OSXHandleKeyEvent(wxevent2); result = GetWXPeer()->OSXHandleKeyEvent(wxevent2);
} }