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

Remove unnecessary checks of wxEvent::GetSkipped()

Browse Source 
HandleWindowEvent() already returns false if the event handler skipped
the event, there is no need to test for it explicitly.

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-01-24 20:53:30 +01:00
parent 8e26b8d54e
commit 5f30f79bc8
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3712,7 +3712,7 @@ bool wxWidgetCocoaImpl::DoHandleKeyNavigation(const wxKeyEvent &event)
/* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
new_event.SetWindowChange( event.ControlDown() ); new_event.SetWindowChange( event.ControlDown() );
new_event.SetCurrentFocus( focus ); new_event.SetCurrentFocus( focus );
handled = iter->HandleWindowEvent( new_event ) && !new_event.GetSkipped(); handled = iter->HandleWindowEvent( new_event );
} }
iter = iter->GetParent() ; iter = iter->GetParent() ;

4
src/osx/window_osx.cpp
View File

@@ -2605,11 +2605,7 @@ bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL
if ( !handled ) if ( !handled )
{
handled = HandleWindowEvent( event ) ; handled = HandleWindowEvent( event ) ;
if ( handled && event.GetSkipped() )
handled = false ;
}
return handled ; return handled ;
} }