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

adjusting keyboardstate to new ctrl / raw_ctrl handling on osx

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-08-23 13:19:19 +00:00
parent 8b9e09383a
commit dd9ec5961f
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1570,10 +1570,10 @@ wxMouseState wxGetMouseState()
ms.SetRightDown( (buttons & 0x02) != 0 ); ms.SetRightDown( (buttons & 0x02) != 0 );
UInt32 modifiers = GetCurrentKeyModifiers(); UInt32 modifiers = GetCurrentKeyModifiers();
ms.SetControlDown(modifiers & controlKey); ms.SetRawControlDown(modifiers & controlKey);
ms.SetShiftDown(modifiers & shiftKey); ms.SetShiftDown(modifiers & shiftKey);
ms.SetAltDown(modifiers & optionKey); ms.SetAltDown(modifiers & optionKey);
ms.SetMetaDown(modifiers & cmdKey); ms.SetControlDown(modifiers & cmdKey);
return ms; return ms;
} }
@@ -1766,9 +1766,9 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
} }
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_keyCode = keyval ; event.m_keyCode = keyval ;
#if wxUSE_UNICODE #if wxUSE_UNICODE
event.m_uniChar = uniChar ; event.m_uniChar = uniChar ;

4
src/osx/cocoa/utils.mm
View File

@@ -305,10 +305,10 @@ wxMouseState wxGetMouseState()
ms.SetMiddleDown( (buttons & 0x04) != 0 ); ms.SetMiddleDown( (buttons & 0x04) != 0 );
ms.SetRightDown( (buttons & 0x02) != 0 ); ms.SetRightDown( (buttons & 0x02) != 0 );
ms.SetControlDown(modifiers & NSControlKeyMask); ms.SetRealControlDown(modifiers & NSControlKeyMask);
ms.SetShiftDown(modifiers & NSShiftKeyMask); ms.SetShiftDown(modifiers & NSShiftKeyMask);
ms.SetAltDown(modifiers & NSAlternateKeyMask); ms.SetAltDown(modifiers & NSAlternateKeyMask);
ms.SetMetaDown(modifiers & NSCommandKeyMask); ms.SetControlDown(modifiers & NSCommandKeyMask);
return ms; return ms;
} }

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

@@ -298,9 +298,9 @@ void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, N
int eventType = [nsEvent type]; int eventType = [nsEvent type];
wxevent.m_shiftDown = modifiers & NSShiftKeyMask; wxevent.m_shiftDown = modifiers & NSShiftKeyMask;
wxevent.m_controlDown = modifiers & NSControlKeyMask; wxevent.m_rawControlDown = modifiers & NSControlKeyMask;
wxevent.m_altDown = modifiers & NSAlternateKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask;
wxevent.m_metaDown = modifiers & NSCommandKeyMask; wxevent.m_controlDown = modifiers & NSCommandKeyMask;
wxevent.m_rawCode = [nsEvent keyCode]; wxevent.m_rawCode = [nsEvent keyCode];
wxevent.m_rawFlags = modifiers; wxevent.m_rawFlags = modifiers;
@@ -427,9 +427,9 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
wxevent.m_x = locationInViewWX.x; wxevent.m_x = locationInViewWX.x;
wxevent.m_y = locationInViewWX.y; wxevent.m_y = locationInViewWX.y;
wxevent.m_shiftDown = modifiers & NSShiftKeyMask; wxevent.m_shiftDown = modifiers & NSShiftKeyMask;
wxevent.m_controlDown = modifiers & NSControlKeyMask; wxevent.m_rawControlDown = modifiers & NSControlKeyMask;
wxevent.m_altDown = modifiers & NSAlternateKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask;
wxevent.m_metaDown = modifiers & NSCommandKeyMask; wxevent.m_controlDown = modifiers & NSCommandKeyMask;
wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ; wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ;
UInt32 mouseChord = 0; UInt32 mouseChord = 0;