undo the last change as it results in buildbot configuration error

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

diff --git a/interface/wx/srchctrl.h b/interface/wx/srchctrl.h
index 348632ae3fc6439209f9d94d1cb4956252a6c839..29b9294c41cca48444cfaf606c4064ce9b581d8b 100644 (file)
--- a/interface/wx/srchctrl.h
+++ b/interface/wx/srchctrl.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxSearchCtrl
-    @wxheader{srchctrl.h}
 
     A search control is a composite control with a search button, a text
     control, and a cancel button.
@@ -40,8 +39,20 @@
            capitalized.
     @endStyleTable
 
+    @beginEventEmissionTable{wxCommandEvent}
+    To retrieve actual search queries, use EVT_TEXT and EVT_TEXT_ENTER events,
+    just as you would with wxTextCtrl.
+    @event{EVT_SEARCHCTRL_SEARCH_BTN(id, func)}
+        Respond to a wxEVT_SEARCHCTRL_SEARCH_BTN event, generated when the
+        search button is clicked. Note that this does not initiate a search.
+    @event{EVT_SEARCHCTRL_CANCEL_BTN(id, func)}
+        Respond to a wxEVT_SEARCHCTRL_CANCEL_BTN event, generated when the
+        cancel button is clicked.
+    @endEventTable
+
     @library{wxcore}
-    @category{FIXME}
+    @category{ctrl}
+    @appearance{searchctrl.png}
 
     @see wxTextCtrl::Create, wxValidator
 */
@@ -52,7 +63,7 @@ public:
       Default constructor
     */
     wxSearchCtrl();
-    
+
     /**
         Constructor, creating and showing a text control.
 
@@ -76,7 +87,7 @@ public:
         @see wxTextCtrl::Create, wxValidator
     */
     wxSearchCtrl(wxWindow* parent, wxWindowID id,
-                 const wxString& value = "",
+                 const wxString& value = wxEmptyString,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
@@ -86,7 +97,7 @@ public:
     /**
         Destructor, destroying the search control.
     */
-    ~wxSearchCtrl();
+    virtual ~wxSearchCtrl();
 
     /**
         Returns a pointer to the search control's menu object or @NULL if there is no
@@ -97,16 +108,15 @@ public:
     /**
         Returns the search button visibility value.
         If there is a menu attached, the search button will be visible regardless of
-        the search
-        button visibility value.
+        the search button visibility value.
+
         This always returns @false in Mac OS X v10.3
     */
-    virtual bool IsSearchButtonVisible();
+    virtual bool IsSearchButtonVisible() const;
 
     /**
-        Sets the search control's menu object.  If there is already a menu associated
-        with
-        the search control it is deleted.
+        Sets the search control's menu object.
+        If there is already a menu associated with the search control it is deleted.
 
         @param menu
             Menu to attach to the search control.
@@ -121,8 +131,8 @@ public:
     /**
         Sets the search button visibility value on the search control.
         If there is a menu attached, the search button will be visible regardless of
-        the search
-        button visibility value.
+        the search button visibility value.
+
         This has no effect in Mac OS X v10.3
     */
     virtual void ShowSearchButton(bool show);