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 043ecfa8790a518d56dff770a73959f12e109b92..7ccc89881edd11ccc56da1ff014738983425bc15 100644 (file)
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -15,14 +15,14 @@
 
 #include "wx/bitmap.h"
 
 
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxSearchButton;
-class WXDLLEXPORT wxSearchTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxSearchButton;
+class WXDLLIMPEXP_FWD_CORE wxSearchTextCtrl;

 
 // ----------------------------------------------------------------------------
 // wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSearchCtrl : public wxSearchCtrlBase
+class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase

 {
 public:
     // creation
 {
 public:
     // creation


@@ -69,9 +69,6 @@ public:
     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    virtual wxString GetValue() const;
-    virtual void SetValue(const wxString& value);
-

     virtual wxString GetRange(long from, long to) const;
 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetRange(long from, long to) const;
 
     virtual int GetLineLength(long lineNo) const;


@@ -194,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 );


@@ -203,7 +201,11 @@ public:
 #endif // wxUSE_MENUS
 
 protected:
 #endif // wxUSE_MENUS
 
 protected:

-    virtual void DoSetValue(const wxString& value, int flags = 0);
+    virtual void DoSetValue(const wxString& value, int flags);
+    virtual wxString DoGetValue() const;
+
+    virtual bool DoLoadFile(const wxString& file, int fileType);
+    virtual bool DoSaveFile(const wxString& file, int fileType);

 
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
 
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;


@@ -217,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 );


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