X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ec1179b86dac6c87ad9f2cd126f87e92642c62c..7cec3a32a41a914e4bed8b731cabf3868d25c45e:/include/wx/srchctrl.h

diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 386e849872..a3d1c2aa22 100644
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -17,8 +17,7 @@
 
 #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
 
@@ -37,12 +36,10 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar) wxSearchCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxSearchCtrlNameStr[];
 
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119)
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 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