X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bc333d76d46ce8b3a0077e211ff1485673ae725..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/srchctrl.h?ds=sidebyside

diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index e9d2a277c5..386e849872 100644
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -27,7 +27,10 @@
     // no native version, use the generic one
     #define wxUSE_NATIVE_SEARCH_CONTROL 0
 
-    #define wxSearchCtrlBaseBaseClass wxTextCtrlBase
+    class WXDLLIMPEXP_CORE wxSearchCtrlBaseBaseClass : public wxControl,
+                                                       public wxTextCtrlIface
+    {
+    };
 #endif
 
 // ----------------------------------------------------------------------------
@@ -37,8 +40,8 @@
 extern WXDLLEXPORT_DATA(const wxChar) wxSearchCtrlNameStr[];
 
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL, 1119)
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH, 1120)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1120)
 END_DECLARE_EVENT_TYPES()
 
 // ----------------------------------------------------------------------------
@@ -52,9 +55,11 @@ public:
     wxSearchCtrlBase() { }
     virtual ~wxSearchCtrlBase() { }
 
-    // search control 
+    // search control
+#if wxUSE_MENUS
     virtual void SetMenu(wxMenu *menu) = 0;
     virtual wxMenu *GetMenu() = 0;
+#endif // wxUSE_MENUS
 
     // get/set options
     virtual void ShowSearchButton( bool show ) = 0;
@@ -78,11 +83,11 @@ public:
 // macros for handling search events
 // ----------------------------------------------------------------------------
 
-#define EVT_SEARCHCTRL_CANCEL(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_CANCEL, id, wxCommandEventHandler(fn))
+#define EVT_SEARCHCTRL_CANCEL_BTN(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, id, wxCommandEventHandler(fn))
 
-#define EVT_SEARCHCTRL_SEARCH(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_SEARCH, id, wxCommandEventHandler(fn))
+#define EVT_SEARCHCTRL_SEARCH_BTN(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, id, wxCommandEventHandler(fn))
 
 #endif // wxUSE_SEARCHCTRL