Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing interface items for Phoenix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-10-29 21:34:49 +00:00
parent c78f085763
commit 7cab9c4193
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
interface/wx/scrolwin.h
View File

@@ -493,6 +493,22 @@ public:
method must be overridden. method must be overridden.
*/ */
void SetTargetWindow(wxWindow *window); 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: protected:
/** /**

28
interface/wx/srchctrl.h
View File

@@ -102,6 +102,15 @@ public:
*/ */
virtual ~wxSearchCtrl(); 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 Returns a pointer to the search control's menu object or @NULL if there is no
menu attached. menu attached.
@@ -117,6 +126,11 @@ public:
*/ */
virtual bool IsSearchButtonVisible() const; virtual bool IsSearchButtonVisible() const;
/**
Returns the cancel button's visibility state.
*/
virtual bool IsCancelButtonVisible() const;
/** /**
Sets the search control's menu object. Sets the search control's menu object.
If there is already a menu associated with the search control it is deleted. 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 This has no effect in Mac OS X v10.3
*/ */
virtual void ShowSearchButton(bool show); 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;