From 639dbb6dd6fd420845607c2dcac25541da1b58e2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 6 Nov 2012 23:56:21 +0000 Subject: [PATCH] Restore propagation of EVT_SEARCHCTRL_CANCEL_BTN events to the parent. 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 --- samples/widgets/searchctrl.cpp | 9 +++++++++ src/generic/srchctlg.cpp | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp index 7ba5df5a93..4c8e900c40 100644 --- a/samples/widgets/searchctrl.cpp +++ b/samples/widgets/searchctrl.cpp @@ -85,6 +85,7 @@ protected: void OnToggleSearchMenu(wxCommandEvent&); void OnSearch(wxCommandEvent& event); + void OnSearchCancel(wxCommandEvent& event); wxMenu* CreateTestMenu(); @@ -112,6 +113,7 @@ BEGIN_EVENT_TABLE(SearchCtrlWidgetsPage, WidgetsPage) EVT_CHECKBOX(ID_MENU_CB, SearchCtrlWidgetsPage::OnToggleSearchMenu) EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch) + EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearchCancel) END_EVENT_TABLE() // ============================================================================ @@ -231,4 +233,11 @@ void SearchCtrlWidgetsPage::OnSearch(wxCommandEvent& event) wxLogMessage("Search button: search for \"%s\".", event.GetString()); } +void SearchCtrlWidgetsPage::OnSearchCancel(wxCommandEvent& event) +{ + wxLogMessage("Cancel button pressed."); + + event.Skip(); +} + #endif // wxUSE_SEARCHCTRL diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp index acf408c2dd..91000de3cb 100644 --- a/src/generic/srchctlg.cpp +++ b/src/generic/srchctlg.cpp @@ -1176,9 +1176,10 @@ void wxSearchCtrl::RecalcBitmaps() } } -void wxSearchCtrl::OnCancelButton( wxCommandEvent& WXUNUSED(event) ) +void wxSearchCtrl::OnCancelButton( wxCommandEvent& event ) { m_text->Clear(); + event.Skip(); } void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ ) -- 2.47.2