X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c60122bf37a65f07f517e14a98ce988a3eae8305..0dd9b9e2be1809f484b6447ad9525fa5b404ad95:/include/wx/srchctrl.h?ds=sidebyside

diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 5ec9336f3f..e57078cc7f 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
 
@@ -27,14 +26,17 @@
     // 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_BTN, 1119)
@@ -52,9 +54,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;