wx(Choice/List/Note)book controls send CHANG(ED/ING) events in SetSelection.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -233,6 +233,7 @@ All (GUI):
|
||||
- added wxChoicebook control
|
||||
- smoother time estimation updates in wxProgressDialog (Christian Sturmlechner)
|
||||
- the XRC contrib library was moved to the core
|
||||
- wx(Choice/List/Note)book controls send CHANG(ED/ING) events in SetSelection
|
||||
|
||||
Unix:
|
||||
|
||||
|
@@ -156,7 +156,7 @@ public:
|
||||
// set the currently selected page, return the index of the previously
|
||||
// selected one (or -1 on error)
|
||||
//
|
||||
// NB: this function will _not_ generate PAGE_CHANGING/ED events
|
||||
// NB: this function will generate PAGE_CHANGING/ED events
|
||||
virtual int SetSelection(size_t n) = 0;
|
||||
|
||||
|
||||
|
@@ -50,6 +50,13 @@ const wxCoord MARGIN = 5;
|
||||
// various wxWidgets macros
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// check that the page index is valid
|
||||
#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// event table
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxControl)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
|
||||
|
||||
@@ -282,25 +289,36 @@ int wxChoicebook::GetSelection() const
|
||||
|
||||
int wxChoicebook::SetSelection(size_t n)
|
||||
{
|
||||
wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
|
||||
_T("invalid page index in wxChoicebook::SetSelection()") );
|
||||
wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
|
||||
wxT("invalid page index in wxChoicebook::SetSelection()") );
|
||||
|
||||
const int selOld = m_selection;
|
||||
const int oldSel = m_selection;
|
||||
|
||||
if ( (int)n != m_selection )
|
||||
if ( int(n) != m_selection )
|
||||
{
|
||||
wxChoicebookEvent event(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
|
||||
event.SetSelection(n);
|
||||
event.SetOldSelection(m_selection);
|
||||
event.SetEventObject(this);
|
||||
if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
|
||||
{
|
||||
if ( m_selection != wxNOT_FOUND )
|
||||
m_pages[m_selection]->Hide();
|
||||
|
||||
wxWindow *page = m_pages[n];
|
||||
page->SetSize(GetPageRect());
|
||||
page->Show();
|
||||
|
||||
// change m_selection only now to ignore the selection change event
|
||||
m_selection = n;
|
||||
m_choice->Select(n);
|
||||
|
||||
// program allows the page change
|
||||
event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
|
||||
(void)GetEventHandler()->ProcessEvent(event);
|
||||
}
|
||||
}
|
||||
|
||||
return selOld;
|
||||
return oldSel;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -48,6 +48,13 @@ const wxCoord MARGIN = 5;
|
||||
// various wxWidgets macros
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// check that the page index is valid
|
||||
#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// event table
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxControl)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxListbookEvent, wxNotifyEvent)
|
||||
|
||||
@@ -340,27 +347,37 @@ int wxListbook::GetSelection() const
|
||||
|
||||
int wxListbook::SetSelection(size_t n)
|
||||
{
|
||||
wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
|
||||
_T("invalid page index in wxListbook::SetSelection()") );
|
||||
wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
|
||||
wxT("invalid page index in wxListbook::SetSelection()") );
|
||||
|
||||
const int selOld = m_selection;
|
||||
const int oldSel = m_selection;
|
||||
|
||||
if ( (int)n != m_selection )
|
||||
if ( int(n) != m_selection )
|
||||
{
|
||||
wxListbookEvent event(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
|
||||
event.SetSelection(n);
|
||||
event.SetOldSelection(m_selection);
|
||||
event.SetEventObject(this);
|
||||
if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
|
||||
{
|
||||
if ( m_selection != wxNOT_FOUND )
|
||||
m_pages[m_selection]->Hide();
|
||||
|
||||
wxWindow *page = m_pages[n];
|
||||
page->SetSize(GetPageRect());
|
||||
page->Show();
|
||||
|
||||
// change m_selection only now to ignore the selection change event
|
||||
m_selection = n;
|
||||
|
||||
m_list->Select(n);
|
||||
m_list->Focus(n);
|
||||
|
||||
// program allows the page change
|
||||
event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
|
||||
(void)GetEventHandler()->ProcessEvent(event);
|
||||
}
|
||||
}
|
||||
|
||||
return selOld;
|
||||
return oldSel;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user