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

avoid conflict between wxBookCtrlBase::DoSetSelection() and the derived classes; refactor more common code into the base class

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-09 21:29:12 +00:00
parent 6500a868fe
commit deb325e3b2
8 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/bookctrl.cpp
View File

@@ -423,7 +423,7 @@ wxSize wxBookCtrlBase::GetControllerSize() const
return size;
}
int wxBookCtrlBase::DoSetSelection(size_t n, int flags, wxBookCtrlBaseEvent &event)
int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
{
wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
wxT("invalid page index in wxBookCtrlBase::DoSetSelection()") );
@@ -432,15 +432,16 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags, wxBookCtrlBaseEvent &eve
if ( oldSel != wxNOT_FOUND && n != (size_t)oldSel )
{
wxBookCtrlBaseEvent *event = CreatePageChangingEvent();
bool allowed = false;
if ( flags & SetSelection_SendEvent )
{
event.SetSelection(n);
event.SetOldSelection(oldSel);
event.SetEventObject(this);
event->SetSelection(n);
event->SetOldSelection(oldSel);
event->SetEventObject(this);
allowed = !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();
allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed();
}
if ( !(flags & SetSelection_SendEvent) || allowed)
@@ -458,10 +459,12 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags, wxBookCtrlBaseEvent &eve
if ( flags & SetSelection_SendEvent )
{
// program allows the page change
MakeChangedEvent(event);
(void)GetEventHandler()->ProcessEvent(event);
MakeChangedEvent(*event);
(void)GetEventHandler()->ProcessEvent(*event);
}
}
delete event;
}
return oldSel;