diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 8623207cfa..3fdf6ae227 100644
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -34,19 +34,17 @@ END_DECLARE_EVENT_TYPES()
 // it is based on the MacOSX 10.3 control HISearchFieldCreate
 // ----------------------------------------------------------------------------
 
-// ----------------------------------------------------------------------------
 // include the platform-dependent class implementation
-// ----------------------------------------------------------------------------
-
-#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__) && defined(__WXMAC_OSX__) \
+        && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
     // search control was introduced in Mac OS X 10.3 Panther
-    #define USE_NATIVE_SEARCH_CONTROL 1
+    #define wxUSE_NATIVE_SEARCH_CONTROL 1
 #else
-    //not supported on these platforms, leave 0
-    #define USE_NATIVE_SEARCH_CONTROL 0
+    // no native version, use the generic one
+    #define wxUSE_NATIVE_SEARCH_CONTROL 0
 #endif
 
-#if USE_NATIVE_SEARCH_CONTROL
+#if wxUSE_NATIVE_SEARCH_CONTROL
     #if defined(__WXMAC__)
         #include "wx/mac/srchctrl.h"
     #endif
@@ -54,7 +52,10 @@ END_DECLARE_EVENT_TYPES()
     #include "wx/generic/srchctlg.h"
 #endif
 
+// ----------------------------------------------------------------------------
 // macros for handling search events
+// ----------------------------------------------------------------------------
+
 #define EVT_SEARCHCTRL_CANCEL(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_CANCEL, id, wxCommandEventHandler(fn))