Pass menu events to the handler in the associated menu bar.

[wxWidgets.git] / samples / widgets / searchctrl.cpp

diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 7ba5df5a9337108b9c3c5c7019ea99cb9f6ad443..beedb630b2f3b48d21daba9155e3d7c5dff727d0 100644 (file)
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -85,6 +85,7 @@ protected:
     void OnToggleSearchMenu(wxCommandEvent&);
 
     void OnSearch(wxCommandEvent& event);
     void OnToggleSearchMenu(wxCommandEvent&);
 
     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_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch)
     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()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -196,7 +198,7 @@ wxMenu* SearchCtrlWidgetsPage::CreateTestMenu()
 //     target->Connect(
 //         ID_SEARCHMENU,
 //         ID_SEARCHMENU+SEARCH_MENU_SIZE,
 //     target->Connect(
 //         ID_SEARCHMENU,
 //         ID_SEARCHMENU+SEARCH_MENU_SIZE,

-//         wxEVT_COMMAND_MENU_SELECTED,
+//         wxEVT_MENU,

 //         wxCommandEventHandler(MySearchCtrl::OnSearchMenu)
 //         );
     return menu;
 //         wxCommandEventHandler(MySearchCtrl::OnSearchMenu)
 //         );
     return menu;


@@ -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