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

Test both ChangeSelection() and SetSelection() in notebook sample.

Browse Source 
Test wxBookCtrl::SetSelection() too to be able to check that it does generate
events as expected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-11-07 19:33:22 +00:00
parent 409f747ed9
commit f7aaef4d53
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/notebook/notebook.cpp
View File

@@ -238,7 +238,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(ID_DELETE_CUR_PAGE, MyFrame::OnDeleteCurPage) EVT_MENU(ID_DELETE_CUR_PAGE, MyFrame::OnDeleteCurPage)
EVT_MENU(ID_DELETE_LAST_PAGE, MyFrame::OnDeleteLastPage) EVT_MENU(ID_DELETE_LAST_PAGE, MyFrame::OnDeleteLastPage)
EVT_MENU(ID_NEXT_PAGE, MyFrame::OnNextPage) EVT_MENU(ID_NEXT_PAGE, MyFrame::OnNextPage)
EVT_MENU(ID_GO_HOME, MyFrame::OnGoHome) EVT_MENU(ID_CHANGE_SELECTION, MyFrame::OnChangeSelection)
EVT_MENU(ID_SET_SELECTION, MyFrame::OnSetSelection)
#if wxUSE_HELP #if wxUSE_HELP
EVT_MENU(ID_CONTEXT_HELP, MyFrame::OnContextHelp) EVT_MENU(ID_CONTEXT_HELP, MyFrame::OnContextHelp)
@@ -343,7 +344,8 @@ MyFrame::MyFrame()
menuPageOperations->Append(ID_ADD_SUB_PAGE, wxT("Add s&ub page\tAlt-U")); menuPageOperations->Append(ID_ADD_SUB_PAGE, wxT("Add s&ub page\tAlt-U"));
#endif #endif
menuPageOperations->AppendSeparator(); menuPageOperations->AppendSeparator();
menuPageOperations->Append(ID_GO_HOME, wxT("Go to the first page\tCtrl-F")); menuPageOperations->Append(ID_CHANGE_SELECTION, wxT("&Change selection to 0\tCtrl-0"));
menuPageOperations->Append(ID_SET_SELECTION, wxT("&Set selection to 0\tShift-Ctrl-0"));
wxMenu *menuOperations = new wxMenu; wxMenu *menuOperations = new wxMenu;
#if wxUSE_HELP #if wxUSE_HELP
@@ -838,16 +840,20 @@ void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event))
} }
} }
void MyFrame::OnGoHome(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnChangeSelection(wxCommandEvent& WXUNUSED(event))
{ {
wxBookCtrlBase *currBook = GetCurrentBook(); wxBookCtrlBase *currBook = GetCurrentBook();
if ( currBook ) if ( currBook )
{
// ChangeSelection shouldn't send any events, SetSelection() should
currBook->ChangeSelection(0); currBook->ChangeSelection(0);
//currBook->SetSelection(0); }
}
void MyFrame::OnSetSelection(wxCommandEvent& WXUNUSED(event))
{
wxBookCtrlBase *currBook = GetCurrentBook();
if ( currBook )
currBook->SetSelection(0);
} }
void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )

6
samples/notebook/notebook.h
View File

@@ -49,7 +49,8 @@ public:
void OnDeleteCurPage(wxCommandEvent& event); void OnDeleteCurPage(wxCommandEvent& event);
void OnDeleteLastPage(wxCommandEvent& event); void OnDeleteLastPage(wxCommandEvent& event);
void OnNextPage(wxCommandEvent& event); void OnNextPage(wxCommandEvent& event);
void OnGoHome(wxCommandEvent &event); void OnChangeSelection(wxCommandEvent &event);
void OnSetSelection(wxCommandEvent &event);
void OnAddSubPage(wxCommandEvent& event); void OnAddSubPage(wxCommandEvent& event);
void OnAddPageBefore(wxCommandEvent& event); void OnAddPageBefore(wxCommandEvent& event);
@@ -150,7 +151,8 @@ enum ID_COMMANDS
ID_NEXT_PAGE, ID_NEXT_PAGE,
ID_ADD_PAGE_BEFORE, ID_ADD_PAGE_BEFORE,
ID_ADD_SUB_PAGE, ID_ADD_SUB_PAGE,
ID_GO_HOME, ID_CHANGE_SELECTION,
ID_SET_SELECTION,
#if wxUSE_HELP #if wxUSE_HELP
ID_CONTEXT_HELP, ID_CONTEXT_HELP,