X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/135b23b266fffceb26b29d832c7d25db99038d0d..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/generic/srchctlg.h?ds=sidebyside

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index d71fdcc3ae..7ccc89881e 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -191,6 +191,7 @@ public:
 
     // wxWindow overrides
     virtual bool SetFont(const wxFont& font);
+    virtual bool SetBackgroundColour(const wxColour& colour);
 
     // search control generic only
     void SetSearchBitmap( const wxBitmap& bitmap );
@@ -202,7 +203,6 @@ public:
 protected:
     virtual void DoSetValue(const wxString& value, int flags);
     virtual wxString DoGetValue() const;
-    virtual void SetValue(const wxString& value);
 
     virtual bool DoLoadFile(const wxString& file, int fileType);
     virtual bool DoSaveFile(const wxString& file, int fileType);
@@ -219,7 +219,7 @@ protected:
     virtual wxBitmap RenderSearchBitmap( int x, int y, bool renderDrop );
     virtual wxBitmap RenderCancelBitmap( int x, int y );
 
-    virtual void OnSearchButton( wxCommandEvent& event );
+    void OnCancelButton( wxCommandEvent& event );
 
     void OnSetFocus( wxFocusEvent& event );
     void OnSize( wxSizeEvent& event );
@@ -236,6 +236,9 @@ protected:
 private:
     friend class wxSearchButton;
 
+    // Implement pure virtual function inherited from wxCompositeWindow.
+    virtual wxWindowList GetCompositeWindowParts() const;
+
 #if wxUSE_MENUS
     void PopupSearchMenu();
 #endif // wxUSE_MENUS