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

(hopefully) workaround for a carbon bug not always setting the modifiers event record field.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-08-15 13:28:48 +00:00
parent aaad759f90
commit 2fca5a0004
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mac/app.cpp
View File

@@ -1377,6 +1377,17 @@ void wxApp::MacDoOneEvent()
void wxApp::MacHandleModifierEvents( WXEVENTREF evr ) void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
{ {
EventRecord* ev = (EventRecord*) evr ; EventRecord* ev = (EventRecord*) evr ;
#if TARGET_CARBON
if ( ev->what == mouseDown || ev->what == mouseUp || ev->what == activateEvt ||
ev->what == keyDown || ev->what == autoKey || ev->what == keyUp || ev->what == nullEvent )
{
// in these cases the modifiers are already correctly setup by carbon
}
else
{
ev->modifiers = GetCurrentKeyModifiers() ;
}
#endif
if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL ) if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL )
{ {
wxKeyEvent event(wxEVT_KEY_DOWN); wxKeyEvent event(wxEVT_KEY_DOWN);
@@ -2142,20 +2153,6 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
break ; break ;
default: default:
{ {
// if ( s_lastMouseDown == 0 )
// ev->modifiers |= btnState ;
// Calling GetNextEvent with a zero event mask will always
// pass back a null event. However, it fills the EventRecord
// with the state of the modifier keys. This is needed since
// the modifier state returned by WaitForNextEvent often is
// wrong mouse move events. The attempt above to correct this
// didn't always work (under OS X at least).
EventRecord tmp;
::GetNextEvent(0, &tmp);
ev->modifiers = tmp.modifiers;
wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win ) if ( win )
win->MacMouseMoved( ev , windowPart ) ; win->MacMouseMoved( ev , windowPart ) ;

25
src/mac/carbon/app.cpp
View File

@@ -1377,6 +1377,17 @@ void wxApp::MacDoOneEvent()
void wxApp::MacHandleModifierEvents( WXEVENTREF evr ) void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
{ {
EventRecord* ev = (EventRecord*) evr ; EventRecord* ev = (EventRecord*) evr ;
#if TARGET_CARBON
if ( ev->what == mouseDown || ev->what == mouseUp || ev->what == activateEvt ||
ev->what == keyDown || ev->what == autoKey || ev->what == keyUp || ev->what == nullEvent )
{
// in these cases the modifiers are already correctly setup by carbon
}
else
{
ev->modifiers = GetCurrentKeyModifiers() ;
}
#endif
if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL ) if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL )
{ {
wxKeyEvent event(wxEVT_KEY_DOWN); wxKeyEvent event(wxEVT_KEY_DOWN);
@@ -2142,20 +2153,6 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
break ; break ;
default: default:
{ {
// if ( s_lastMouseDown == 0 )
// ev->modifiers |= btnState ;
// Calling GetNextEvent with a zero event mask will always
// pass back a null event. However, it fills the EventRecord
// with the state of the modifier keys. This is needed since
// the modifier state returned by WaitForNextEvent often is
// wrong mouse move events. The attempt above to correct this
// didn't always work (under OS X at least).
EventRecord tmp;
::GetNextEvent(0, &tmp);
ev->modifiers = tmp.modifiers;
wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win ) if ( win )
win->MacMouseMoved( ev , windowPart ) ; win->MacMouseMoved( ev , windowPart ) ;