From 966dc44c7273791cc2dfdcbbc2b7090ceafcddd0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 24 Mar 2018 19:41:18 +0100 Subject: [PATCH] Slightly simplify wxBookCtrlBase::DoSetSelection() 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. --- src/common/bookctrl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp index 25498b0fa4..969ae07a70 100644 --- a/src/common/bookctrl.cpp +++ b/src/common/bookctrl.cpp @@ -479,7 +479,7 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags) if ( n != (size_t)oldSel ) { wxBookCtrlEvent *event = CreatePageChangingEvent(); - bool allowed = false; + bool allowed = true; if ( flags & SetSelection_SendEvent ) { @@ -490,7 +490,7 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags) allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed(); } - if ( !(flags & SetSelection_SendEvent) || allowed) + if ( allowed ) { if ( oldSel != wxNOT_FOUND ) DoShowPage(m_pages[oldSel], false);