From 937d5b6075db060b98daa0f0fadbaa528bc85554 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 23 Jan 2010 13:20:54 +0000 Subject: [PATCH] Return old, not new, selection from wxMSW wxNotebook::ChangeSelection(). The function is documented to return the old selection and not the new one, so correct it to behave as expected. Closes #11646. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/notebook.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 831680858f..87a6ca1a35 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -492,6 +492,8 @@ int wxNotebook::ChangeSelection(size_t nPage) { wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); + const int selOld = m_nSelection; + if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection ) { TabCtrl_SetCurSel(GetHwnd(), nPage); @@ -499,7 +501,7 @@ int wxNotebook::ChangeSelection(size_t nPage) UpdateSelection(nPage); } - return m_nSelection; + return selOld; } bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) -- 2.45.2