AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed doubled events, corrected behaviour (patch #1037434)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2004-10-06 20:09:34 +00:00
parent 67aa6c1ee6
commit 716dc24570
2 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/generic/choicbkg.cpp
View File

@ -309,6 +309,7 @@ int wxChoicebook::SetSelection(size_t n)
page->SetSize(GetPageRect()); page->SetSize(GetPageRect());
page->Show(); page->Show();
// change m_selection now to ignore the selection change event
m_selection = n; m_selection = n;
m_choice->Select(n); m_choice->Select(n);
@ -337,16 +338,28 @@ wxChoicebook::InsertPage(size_t n,
m_choice->Insert(text, n); m_choice->Insert(text, n);
// we should always have some selection if possible // if the inserted page is before the selected one, we must update the
if ( bSelect || (m_selection == wxNOT_FOUND) ) // index of the selected page
if ( int(n) <= m_selection )
{ {
SetSelection(n); // one extra page added
m_selection++;
m_choice->Select(m_selection);
} }
else // don't select this page
{ // some page should be selected: either this one or the first one if there
// it will be shown only when selected // is still no selection
int selNew = -1;
if ( bSelect )
selNew = n;
else if ( m_selection == -1 )
selNew = 0;
if ( selNew != m_selection )
page->Hide(); page->Hide();
}
if ( selNew != -1 )
SetSelection(selNew);
InvalidateBestSize(); InvalidateBestSize();
return true; return true;
@ -395,7 +408,6 @@ bool wxChoicebook::DeleteAllPages()
void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice) void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice)
{ {
const int selNew = eventChoice.GetSelection(); const int selNew = eventChoice.GetSelection();
const int selOld = m_selection;
if ( selNew == m_selection ) if ( selNew == m_selection )
{ {
@ -405,28 +417,11 @@ void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice)
return; return;
} }
// first send "change in progress" event which may be vetoed by user
wxChoicebookEvent eventIng(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, GetId());
eventIng.SetEventObject(this);
eventIng.SetSelection(selNew);
eventIng.SetOldSelection(selOld);
if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() )
{
m_choice->Select(m_selection);
return;
}
// change allowed: do change the page and notify the user about it
SetSelection(selNew); SetSelection(selNew);
wxChoicebookEvent eventEd(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, GetId()); // change wasn't allowed, return to previous state
if (m_selection != selNew)
eventEd.SetEventObject(this); m_choice->Select(m_selection);
eventEd.SetSelection(selNew);
eventEd.SetOldSelection(selOld);
(void)GetEventHandler()->ProcessEvent(eventEd);
} }
#endif // wxUSE_CHOICEBOOK #endif // wxUSE_CHOICEBOOK

55
src/generic/listbkg.cpp
View File

@ -367,6 +367,7 @@ int wxListbook::SetSelection(size_t n)
page->SetSize(GetPageRect()); page->SetSize(GetPageRect());
page->Show(); page->Show();
// change m_selection now to ignore the selection change event
m_selection = n; m_selection = n;
m_list->Select(n); m_list->Select(n);
m_list->Focus(n); m_list->Focus(n);
@ -396,16 +397,29 @@ wxListbook::InsertPage(size_t n,
m_list->InsertItem(n, text, imageId); m_list->InsertItem(n, text, imageId);
// we should always have some selection if possible // if the inserted page is before the selected one, we must update the
if ( bSelect || (m_selection == wxNOT_FOUND) ) // index of the selected page
if ( int(n) <= m_selection )
{ {
SetSelection(n); // one extra page added
m_selection++;
m_list->Select(m_selection);
m_list->Focus(m_selection);
} }
else // don't select this page
{ // some page should be selected: either this one or the first one if there
// it will be shown only when selected // is still no selection
int selNew = -1;
if ( bSelect )
selNew = n;
else if ( m_selection == -1 )
selNew = 0;
if ( selNew != m_selection )
page->Hide(); page->Hide();
}
if ( selNew != -1 )
SetSelection(selNew);
InvalidateBestSize(); InvalidateBestSize();
return true; return true;
@ -454,7 +468,6 @@ bool wxListbook::DeleteAllPages()
void wxListbook::OnListSelected(wxListEvent& eventList) void wxListbook::OnListSelected(wxListEvent& eventList)
{ {
const int selNew = eventList.GetIndex(); const int selNew = eventList.GetIndex();
const int selOld = m_selection;
if ( selNew == m_selection ) if ( selNew == m_selection )
{ {
@ -464,28 +477,14 @@ void wxListbook::OnListSelected(wxListEvent& eventList)
return; return;
} }
// first send "change in progress" event which may be vetoed by user
wxListbookEvent eventIng(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, GetId());
eventIng.SetEventObject(this);
eventIng.SetSelection(selNew);
eventIng.SetOldSelection(selOld);
if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() )
{
m_list->Select(m_selection);
return;
}
// change allowed: do change the page and notify the user about it
SetSelection(selNew); SetSelection(selNew);
wxListbookEvent eventEd(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, GetId()); // change wasn't allowed, return to previous state
if (m_selection != selNew)
eventEd.SetEventObject(this); {
eventEd.SetSelection(selNew); m_list->Select(m_selection);
eventEd.SetOldSelection(selOld); m_list->Focus(m_selection);
}
(void)GetEventHandler()->ProcessEvent(eventEd);
} }
#endif // wxUSE_LISTBOOK #endif // wxUSE_LISTBOOK