Clear columns on destruction

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

diff --git a/include/wx/mac/carbon/srchctrl.h b/include/wx/mac/carbon/srchctrl.h
index 980b7075943dd81cc1f85cddd4fee60fb0bfbb29..eba88ccc4302f8fe75c347a80b9b055160959c96 100644 (file)
--- 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
 // Name:        wx/mac/carbon/srchctrl.h
 // Purpose:     mac carbon wxSearchCtrl class
 // Author:      Vince Harron

-// Modified by:

 // Created:     2006-02-19
 // Created:     2006-02-19

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,7 +15,7 @@
 
 class wxMacSearchFieldControl;
 
 
 class wxMacSearchFieldControl;
 

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

 {
 public:
     // creation
 {
 public:
     // creation


@@ -31,7 +30,7 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxSearchCtrlNameStr);
 
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxSearchCtrlNameStr);
 

-    ~wxSearchCtrl();
+    virtual ~wxSearchCtrl();

 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,


@@ -45,7 +44,7 @@ public:
     // --------------------------
     virtual void SetMenu( wxMenu* menu );
     virtual wxMenu* GetMenu();
     // --------------------------
     virtual void SetMenu( wxMenu* menu );
     virtual wxMenu* GetMenu();

-    
+

     // get/set search options
     // ----------------------
     virtual void ShowSearchButton( bool show );
     // get/set search options
     // ----------------------
     virtual void ShowSearchButton( bool show );


@@ -54,18 +53,22 @@ public:
     virtual void ShowCancelButton( bool show );
     virtual bool IsCancelButtonVisible() const;
 
     virtual void ShowCancelButton( bool show );
     virtual bool IsCancelButtonVisible() 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 wxInt32     MacSearchFieldSearchHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
     virtual wxInt32     MacSearchFieldCancelHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
     wxMacSearchFieldControl * GetPeer() const
     { return (wxMacSearchFieldControl*) m_peer; }

-    
+

     virtual void SetFocus();
     virtual void SetFocus();

-       
+

 protected:
 
     wxSize DoGetBestSize() const;
 protected:
 
     wxSize DoGetBestSize() const;

-    
+

     void Init();
 
     virtual void CreatePeer(
     void Init();
 
     virtual void CreatePeer(