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

Slightly simplify wxBookCtrlBase::DoSetSelection()

Browse Source 
No real changes, just simplify the check for whether the page change is
allowed: we can assume it is by default, which means we don't have to
test for SetSelection_SendEvent twice.
This commit is contained in:
Vadim Zeitlin
2018-03-24 19:41:18 +01:00
parent 058c085b21
commit 966dc44c72
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/bookctrl.cpp
View File

@@ -479,7 +479,7 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
if ( n != (size_t)oldSel ) if ( n != (size_t)oldSel )
{ {
wxBookCtrlEvent *event = CreatePageChangingEvent(); wxBookCtrlEvent *event = CreatePageChangingEvent();
bool allowed = false; bool allowed = true;
if ( flags & SetSelection_SendEvent ) if ( flags & SetSelection_SendEvent )
{ {
@@ -490,7 +490,7 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed(); allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed();
} }
if ( !(flags & SetSelection_SendEvent) || allowed) if ( allowed )
{ {
if ( oldSel != wxNOT_FOUND ) if ( oldSel != wxNOT_FOUND )
DoShowPage(m_pages[oldSel], false); DoShowPage(m_pages[oldSel], false);