activating DrawRectangle optimization

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

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index a520b52071ffbdfa292f0a037b29653d88563651..7ccc89881edd11ccc56da1ff014738983425bc15 100644 (file)
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxSearchTextCtrl;
 // wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSearchCtrl : public wxSearchCtrlBase
+class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase
 {
 public:
     // creation
@@ -69,9 +69,6 @@ public:
     // 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;
@@ -194,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 );
@@ -204,6 +202,8 @@ public:
 
 protected:
     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);
 
@@ -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