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

Restore propagation of EVT_SEARCHCTRL_CANCEL_BTN events to the parent.

Browse Source 
This was broken by r72581, add event.Skip() call to the handler for this event
added there.

Also add a handler for this event to the corresponding page of the widgets
sample to be able to test this.

Closes #14799.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2012-11-06 23:56:21 +00:00
parent 51d2b636e8
commit 639dbb6dd6
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
samples/widgets/searchctrl.cpp
View File

@ -85,6 +85,7 @@ protected:
void OnToggleSearchMenu(wxCommandEvent&); void OnToggleSearchMenu(wxCommandEvent&);
void OnSearch(wxCommandEvent& event); void OnSearch(wxCommandEvent& event);
void OnSearchCancel(wxCommandEvent& event);
wxMenu* CreateTestMenu(); wxMenu* CreateTestMenu();
@ -112,6 +113,7 @@ BEGIN_EVENT_TABLE(SearchCtrlWidgetsPage, WidgetsPage)
EVT_CHECKBOX(ID_MENU_CB, SearchCtrlWidgetsPage::OnToggleSearchMenu) EVT_CHECKBOX(ID_MENU_CB, SearchCtrlWidgetsPage::OnToggleSearchMenu)
EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch) EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch)
EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearchCancel)
END_EVENT_TABLE() END_EVENT_TABLE()
// ============================================================================ // ============================================================================
@ -231,4 +233,11 @@ void SearchCtrlWidgetsPage::OnSearch(wxCommandEvent& event)
wxLogMessage("Search button: search for \"%s\".", event.GetString()); wxLogMessage("Search button: search for \"%s\".", event.GetString());
} }
void SearchCtrlWidgetsPage::OnSearchCancel(wxCommandEvent& event)
{
wxLogMessage("Cancel button pressed.");
event.Skip();
}
#endif // wxUSE_SEARCHCTRL #endif // wxUSE_SEARCHCTRL

3
src/generic/srchctlg.cpp
View File

@ -1176,9 +1176,10 @@ void wxSearchCtrl::RecalcBitmaps()
} }
} }
void wxSearchCtrl::OnCancelButton( wxCommandEvent& WXUNUSED(event) ) void wxSearchCtrl::OnCancelButton( wxCommandEvent& event )
{ {
m_text->Clear(); m_text->Clear();
event.Skip();
} }
void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ ) void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ )