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

Return old, not new, selection from wxMSW wxNotebook::ChangeSelection().

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-01-23 13:20:54 +00:00
parent b1b5ebb7e2
commit 937d5b6075
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/notebook.cpp
View 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") ); 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 ) if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection )
{ {
TabCtrl_SetCurSel(GetHwnd(), nPage); TabCtrl_SetCurSel(GetHwnd(), nPage);
@@ -499,7 +501,7 @@ int wxNotebook::ChangeSelection(size_t nPage)
UpdateSelection(nPage); UpdateSelection(nPage);
} }
return m_nSelection; return selOld;
} }
bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)