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

compilation fix after last commit (apparently patch was misapplied)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-10-08 20:52:21 +00:00
parent f05b5b774f
commit 2da25e49e5
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mac/carbon/notebmac.cpp
View File

@ -160,11 +160,11 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
return DoGetSizeFromClientSize( sizePage );
}
int wxNotebook::DoSetSelection(size_t nPage, int flags = 0)
int wxNotebook::DoSetSelection(size_t nPage, int flags)
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("DoSetSelection: invalid notebook page") );
if ( int(nPage) != m_nSelection )
if ( m_nSelection != wxNOT_FOUND && nPage != (size_t)m_nSelection )
{
if ( flags & SetSelection_SendEvent )
{
@ -172,15 +172,19 @@ int wxNotebook::DoSetSelection(size_t nPage, int flags = 0)
event.SetSelection(nPage);
event.SetOldSelection(m_nSelection);
event.SetEventObject(this);
if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
{
// program allows the page change
// vetoed by program
return m_nSelection;
}
//else: program allows the page change
event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
(void)GetEventHandler()->ProcessEvent(event);
}
ChangePage(m_nSelection, nPage);
}
}
return m_nSelection;
}
@ -228,11 +232,6 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
MacSetupTabs() ;
}
else
{
ChangePage(m_nSelection, nPage);
}
}
return true;
}