#include "wx/textctrl.h"
-#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__) && defined(__WXMAC_OSX__) \
- && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__)
// search control was introduced in Mac OS X 10.3 Panther
#define wxUSE_NATIVE_SEARCH_CONTROL 1
// 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
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
-extern WXDLLEXPORT_DATA(const wxChar) wxSearchCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxSearchCtrlNameStr[];
-BEGIN_DECLARE_EVENT_TYPES()
- DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL, 1119)
- DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH, 1120)
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN;
// ----------------------------------------------------------------------------
// a search ctrl is a text control with a search button and a cancel button
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;
// 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