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 d71fdcc3ae5cd6279dae5071d49a4332358359a4..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 );


@@ -202,7 +203,6 @@ public:
 protected:
     virtual void DoSetValue(const wxString& value, int flags);
     virtual wxString DoGetValue() const;
 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);
 
     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 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 );


@@ -236,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