OSX reshuffling

[wxWidgets.git] / include / wx / srchctrl.h

diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index e9d2a277c52772674ba69e049f6fcd558ede67cb..17e18884dcbc2ee17675c9a914cd29c991ce9f02 100644 (file)
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -17,8 +17,7 @@
 
 #include "wx/textctrl.h"
 
 
 #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
 
     // search control was introduced in Mac OS X 10.3 Panther
     #define wxUSE_NATIVE_SEARCH_CONTROL 1
 


@@ -27,34 +26,37 @@
     // no native version, use the generic one
     #define wxUSE_NATIVE_SEARCH_CONTROL 0
 
     // 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
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(const wxChar) wxSearchCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(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
 // it is based on the MacOSX 10.3 control HISearchFieldCreate
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // a search ctrl is a text control with a search button and a cancel button
 // it is based on the MacOSX 10.3 control HISearchFieldCreate
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass
+class WXDLLIMPEXP_CORE wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass

 {
 public:
     wxSearchCtrlBase() { }
     virtual ~wxSearchCtrlBase() { }
 
 {
 public:
     wxSearchCtrlBase() { }
     virtual ~wxSearchCtrlBase() { }
 

-    // search control 
+    // search control
+#if wxUSE_MENUS

     virtual void SetMenu(wxMenu *menu) = 0;
     virtual wxMenu *GetMenu() = 0;
     virtual void SetMenu(wxMenu *menu) = 0;
     virtual wxMenu *GetMenu() = 0;

+#endif // wxUSE_MENUS

 
     // get/set options
     virtual void ShowSearchButton( bool show ) = 0;
 
     // get/set options
     virtual void ShowSearchButton( bool show ) = 0;


@@ -68,7 +70,7 @@ public:
 // include the platform-dependent class implementation
 #if wxUSE_NATIVE_SEARCH_CONTROL
     #if defined(__WXMAC__)
 // include the platform-dependent class implementation
 #if wxUSE_NATIVE_SEARCH_CONTROL
     #if defined(__WXMAC__)

-        #include "wx/mac/srchctrl.h"
+        #include "wx/osx/srchctrl.h"

     #endif
 #else
     #include "wx/generic/srchctlg.h"
     #endif
 #else
     #include "wx/generic/srchctlg.h"


@@ -78,11 +80,11 @@ public:
 // macros for handling search events
 // ----------------------------------------------------------------------------
 
 // 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
 
 
 #endif // wxUSE_SEARCHCTRL