X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec184e324214ea06f0c056ab626de5f32bcdad3b..75aa19469b8b31ae58d6e8956b0e4c7200e30578:/include/wx/srchctrl.h diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h index a5ea78dd73..5ec9336f3f 100644 --- a/include/wx/srchctrl.h +++ b/include/wx/srchctrl.h @@ -2,9 +2,8 @@ // Name: srchctrl.h // Purpose: wxSearchCtrlBase class // Author: Vince Harron -// Modified by: // Created: 2006-02-18 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Vince Harron // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,8 +37,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() // ---------------------------------------------------------------------------- @@ -79,11 +78,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