From: Robin Dunn <robin@alldunn.com>
Date: Sat, 29 Oct 2011 21:34:49 +0000 (+0000)
Subject: Add missing interface items for Phoenix
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7cab9c419393b97cfc2f7c08940ca5a52010381c

Add missing interface items for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/interface/wx/scrolwin.h b/interface/wx/scrolwin.h
index fea0ad5b27..ac46c7e264 100644
--- a/interface/wx/scrolwin.h
+++ b/interface/wx/scrolwin.h
@@ -493,6 +493,22 @@ public:
         method must be overridden.
     */
     void SetTargetWindow(wxWindow *window);
+    wxWindow *GetTargetWindow() const;
+
+    
+    void SetTargetRect(const wxRect& rect);
+    wxRect GetTargetRect() const;
+
+    int GetScrollPageSize(int orient) const;
+    void SetScrollPageSize(int orient, int pageSize);
+    int GetScrollLines( int orient ) const;
+    void SetScale(double xs, double ys);
+    double GetScaleX() const;
+    double GetScaleY() const;
+
+    virtual void AdjustScrollbars();
+    bool IsAutoScrolling() const;
+    void StopAutoScrolling();
 
 protected:
     /**
diff --git a/interface/wx/srchctrl.h b/interface/wx/srchctrl.h
index c7f1cd6af7..05eefdd458 100644
--- a/interface/wx/srchctrl.h
+++ b/interface/wx/srchctrl.h
@@ -102,6 +102,15 @@ public:
     */
     virtual ~wxSearchCtrl();
 
+    
+    bool Create(wxWindow* parent, wxWindowID id,
+                 const wxString& value = wxEmptyString,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxSearchCtrlNameStr);
+
     /**
         Returns a pointer to the search control's menu object or @NULL if there is no
         menu attached.
@@ -117,6 +126,11 @@ public:
     */
     virtual bool IsSearchButtonVisible() const;
 
+    /**
+       Returns the cancel button's visibility state.
+    */
+    virtual bool IsCancelButtonVisible() const;
+    
     /**
         Sets the search control's menu object.
         If there is already a menu associated with the search control it is deleted.
@@ -139,5 +153,19 @@ public:
         This has no effect in Mac OS X v10.3
     */
     virtual void ShowSearchButton(bool show);
+
+    /**
+       Set the text to be displayed in the search control when the user has
+       not yet typed anything in it.
+    */
+    void        SetDescriptiveText(const wxString& text);
+
+    /**
+       Return the text displayed when there is not yet any user input.
+    */
+    wxString    GetDescriptiveText() const;
 };
 
+
+wxEventType  wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN;
+wxEventType  wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN;