Updated event type declarations to follow what other sub-libraries do these days...

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

diff --git a/include/wx/osx/carbon/srchctrl.h b/include/wx/osx/carbon/srchctrl.h
index eba88ccc4302f8fe75c347a80b9b055160959c96..a8831344220f5fdc837d9b98c0b2fed3d7b1654e 100644 (file)
--- a/include/wx/osx/carbon/srchctrl.h
+++ b/include/wx/osx/carbon/srchctrl.h
@@ -13,7 +13,7 @@
 
 #if wxUSE_SEARCHCTRL
 
-class wxMacSearchFieldControl;
+class wxSearchWidgetImpl;
 
 class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase
 {
@@ -54,16 +54,13 @@ public:
     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;
+    void        SetDescriptiveText(const wxString& text);
+    wxString    GetDescriptiveText() const;
 
-    virtual wxInt32     MacSearchFieldSearchHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
-    virtual wxInt32     MacSearchFieldCancelHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
+    virtual bool    HandleSearchFieldSearchHit() ;
+    virtual bool    HandleSearchFieldCancelHit() ;
 
-    wxMacSearchFieldControl * GetPeer() const
-    { return (wxMacSearchFieldControl*) m_peer; }
-
-    virtual void SetFocus();
+    wxSearchWidgetImpl * GetSearchPeer() const;
 
 protected:
 
@@ -71,12 +68,9 @@ protected:
 
     void Init();
 
-    virtual void CreatePeer(
-           const wxString& str,
-           const wxPoint& pos,
-           const wxSize& size, long style );
-
     wxMenu *m_menu;
+    
+    wxString m_descriptiveText;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxSearchCtrl)