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

corrected button modifier state in carbon, cursor setup corrected

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

33
src/mac/app.cpp
View File

@@ -1384,7 +1384,11 @@ void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
} }
else else
{ {
ev->modifiers = GetCurrentKeyModifiers() ; EventRecord nev ;
WaitNextEvent( 0 , &nev , 0 , NULL ) ;
ev->modifiers = nev.modifiers ;
// KeyModifiers unfortunately don't include btnState...
// ev->modifiers = GetCurrentKeyModifiers() ;
} }
#endif #endif
if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL ) if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL )
@@ -2143,23 +2147,30 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
switch (windowPart) switch (windowPart)
{ {
// fixes for setting the cursor back from dominic mazzoni case inContent :
case inMenuBar :
UMAShowArrowCursor();
break ;
case inSysWindow :
UMAShowArrowCursor();
break ;
default:
{ {
wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win ) if ( win )
win->MacMouseMoved( ev , windowPart ) ; win->MacMouseMoved( ev , windowPart ) ;
else else
UMAShowArrowCursor(); {
if ( wxIsBusy() )
{
}
else
UMAShowArrowCursor();
}
} }
break; break;
default :
{
if ( wxIsBusy() )
{
}
else
UMAShowArrowCursor();
}
break ;
} }
} }
break ; break ;

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

@@ -1384,7 +1384,11 @@ void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
} }
else else
{ {
ev->modifiers = GetCurrentKeyModifiers() ; EventRecord nev ;
WaitNextEvent( 0 , &nev , 0 , NULL ) ;
ev->modifiers = nev.modifiers ;
// KeyModifiers unfortunately don't include btnState...
// ev->modifiers = GetCurrentKeyModifiers() ;
} }
#endif #endif
if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL ) if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL )
@@ -2143,23 +2147,30 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
switch (windowPart) switch (windowPart)
{ {
// fixes for setting the cursor back from dominic mazzoni case inContent :
case inMenuBar :
UMAShowArrowCursor();
break ;
case inSysWindow :
UMAShowArrowCursor();
break ;
default:
{ {
wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win ) if ( win )
win->MacMouseMoved( ev , windowPart ) ; win->MacMouseMoved( ev , windowPart ) ;
else else
UMAShowArrowCursor(); {
if ( wxIsBusy() )
{
}
else
UMAShowArrowCursor();
}
} }
break; break;
default :
{
if ( wxIsBusy() )
{
}
else
UMAShowArrowCursor();
}
break ;
} }
} }
break ; break ;