]> git.saurik.com Git - wxWidgets.git/commitdiff
Return old, not new, selection from wxMSW wxNotebook::ChangeSelection().
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 23 Jan 2010 13:20:54 +0000 (13:20 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 23 Jan 2010 13:20:54 +0000 (13:20 +0000)
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

index 831680858f107f4450e31b0274a04455e428ddc2..87a6ca1a35875f110c80b7b7a80213a205ffa03a 100644 (file)
@@ -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)