Revert the zoom direction on Ctrl-mouse wheel in wxStyledTextCtrl.

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

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index 05fe114b5e70aa8df73afc67e6fbbf90701354db..0d1fc5b539282de3e884c6635ffc9c33cd14998b 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
 // ----------------------------------------------------------------------------
 
 // 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;


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