removing outdated code

[wxWidgets.git] / include / wx / generic / srchctlg.h

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index 202abb9d5b01973dfa69b66460aece426796979c..7ccc89881edd11ccc56da1ff014738983425bc15 100644 (file)
--- 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);
 
     // wxWindow overrides
     virtual bool SetFont(const wxFont& font);

+    virtual bool SetBackgroundColour(const wxColour& colour);

 
     // search control generic only
     void SetSearchBitmap( const wxBitmap& bitmap );
 
     // search control generic only
     void SetSearchBitmap( const wxBitmap& bitmap );


@@ -218,7 +219,7 @@ protected:
     virtual wxBitmap RenderSearchBitmap( int x, int y, bool renderDrop );
     virtual wxBitmap RenderCancelBitmap( int x, int y );
 
     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 );
 
     void OnSetFocus( wxFocusEvent& event );
     void OnSize( wxSizeEvent& event );


@@ -235,6 +236,9 @@ protected:
 private:
     friend class wxSearchButton;
 
 private:
     friend class wxSearchButton;
 

+    // Implement pure virtual function inherited from wxCompositeWindow.
+    virtual wxWindowList GetCompositeWindowParts() const;
+

 #if wxUSE_MENUS
     void PopupSearchMenu();
 #endif // wxUSE_MENUS
 #if wxUSE_MENUS
     void PopupSearchMenu();
 #endif // wxUSE_MENUS