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

Send PAGE_CHANGED event after page change in wxOSX wxNotebook

Browse Source 
Also reuse DoSetSelection() from OSXHandleClicked() to ensure the behaviour is
consistent when changing the selection programmatically or interactively.

Closes #17202.
This commit is contained in:
John Roberts
2015-10-15 16:24:04 +02:00
committed by Vadim Zeitlin
parent 1acfe88347
commit 8ce5b9099b
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osx/notebook_osx.cpp
View File

@@ -100,11 +100,15 @@ int wxNotebook::DoSetSelection(size_t nPage, int flags)
return m_selection; return m_selection;
} }
//else: program allows the page change //else: program allows the page change
SendPageChangedEvent(m_selection, nPage);
} }
ChangePage(m_selection, nPage); // m_selection is set to newSel in ChangePage()
// so store its value for event use.
int oldSelection = m_selection;
ChangePage(oldSelection, nPage);
if ( flags & SetSelection_SendEvent )
SendPageChangedEvent(oldSelection, nPage);
} }
//else: no change //else: no change
@@ -453,18 +457,8 @@ bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) )
SInt32 newSel = GetPeer()->GetValue() - 1 ; SInt32 newSel = GetPeer()->GetValue() - 1 ;
if ( newSel != m_selection ) if ( newSel != m_selection )
{ {
if ( SendPageChangingEvent(newSel) ) if ( DoSetSelection(newSel, SetSelection_SendEvent ) != newSel )
{
// m_selection is set to newSel in ChangePage()
// so store its value for event use.
int oldSel = m_selection;
ChangePage(oldSel, newSel);
SendPageChangedEvent(oldSel, newSel);
}
else
{
GetPeer()->SetValue( m_selection + 1 ) ; GetPeer()->SetValue( m_selection + 1 ) ;
}
status = true ; status = true ;
} }