X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/698db322d0af46ddfa0511b80c76c01f6cd6e7ef..05cc594ad247b7c97b839bdd26d3bbca2eb03147:/include/wx/mac/carbon/srchctrl.h?ds=sidebyside

diff --git a/include/wx/mac/carbon/srchctrl.h b/include/wx/mac/carbon/srchctrl.h
index 84da5212d7..94c34fd41a 100644
--- a/include/wx/mac/carbon/srchctrl.h
+++ b/include/wx/mac/carbon/srchctrl.h
@@ -2,9 +2,8 @@
 // Name:        wx/mac/carbon/srchctrl.h
 // Purpose:     mac carbon wxSearchCtrl class
 // Author:      Vince Harron
-// Modified by:
 // Created:     2006-02-19
-// RCS-ID:      
+// RCS-ID:      $Id$
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,30 +13,6 @@
 
 #if wxUSE_SEARCHCTRL
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "srchctrl.h"
-#endif
-
-class WXDLLEXPORT wxSearchCtrlBase : public wxTextCtrl
-{
-public:
-    wxSearchCtrlBase() {}
-    virtual ~wxSearchCtrlBase() {}
-
-    // search control 
-    virtual void SetMenu( wxMenu* menu ) = 0;
-    virtual wxMenu* GetMenu() = 0;
-
-
-    // get/set options
-    virtual void SetSearchButtonVisible( bool show ) = 0;
-    virtual bool GetSearchButtonVisible() const = 0;
-
-    virtual void SetCancelButtonVisible( bool show ) = 0;
-    virtual bool GetCancelButtonVisible() const = 0;
-protected:
-};
-
 class wxMacSearchFieldControl;
 
 class WXDLLEXPORT wxSearchCtrl : public wxSearchCtrlBase
@@ -55,7 +30,7 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxSearchCtrlNameStr);
 
-    ~wxSearchCtrl();
+    virtual ~wxSearchCtrl();
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
@@ -69,27 +44,31 @@ public:
     // --------------------------
     virtual void SetMenu( wxMenu* menu );
     virtual wxMenu* GetMenu();
-    
+
     // get/set search options
     // ----------------------
-    virtual void SetSearchButtonVisible( bool show );
-    virtual bool GetSearchButtonVisible() const;
+    virtual void ShowSearchButton( bool show );
+    virtual bool IsSearchButtonVisible() const;
+
+    virtual void ShowCancelButton( bool show );
+    virtual bool IsCancelButtonVisible() const;
 
-    virtual void SetCancelButtonVisible( bool show );
-    virtual bool GetCancelButtonVisible() const;
+    // TODO: In 2.9 these should probably be virtual, and declared in the base class...
+    void SetDescriptiveText(const wxString& text);
+    wxString GetDescriptiveText() const;
 
     virtual wxInt32     MacSearchFieldSearchHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
     virtual wxInt32     MacSearchFieldCancelHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
     wxMacSearchFieldControl * GetPeer() const
     { return (wxMacSearchFieldControl*) m_peer; }
-    
+
     virtual void SetFocus();
-	
+
 protected:
 
     wxSize DoGetBestSize() const;
-    
+
     void Init();
 
     virtual void CreatePeer(