make HitTest() public (bug 1626543); this changes ABI for protected part of wx API but not for the public one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
43c974071f
commit
bcbec8656f
2 changed files with 3 additions and 6 deletions
|
|
@ -65,6 +65,7 @@ public:
|
|||
const wxString& name = wxEmptyString);
|
||||
|
||||
|
||||
// overridden base class methods
|
||||
virtual int GetSelection() const;
|
||||
virtual bool SetPageText(size_t n, const wxString& strText);
|
||||
virtual wxString GetPageText(size_t n) const;
|
||||
|
|
@ -78,6 +79,7 @@ public:
|
|||
int imageId = -1);
|
||||
virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
|
||||
virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
|
||||
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
|
||||
virtual void SetImageList(wxImageList *imageList);
|
||||
|
||||
virtual bool DeleteAllPages();
|
||||
|
|
@ -90,9 +92,6 @@ protected:
|
|||
// get the size which the list control should have
|
||||
virtual wxSize GetControllerSize() const;
|
||||
|
||||
// return the page corresponding to the tab at the specified position
|
||||
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
|
||||
|
||||
void UpdateSelectedPage(size_t newsel);
|
||||
|
||||
wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
|
||||
|
|
|
|||
|
|
@ -135,6 +135,7 @@ public:
|
|||
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
|
||||
virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
|
||||
virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
|
||||
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
|
||||
virtual void SetImageList(wxImageList *imageList);
|
||||
virtual void AssignImageList(wxImageList *imageList);
|
||||
virtual bool DeleteAllPages();
|
||||
|
|
@ -146,9 +147,6 @@ protected:
|
|||
// This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages)
|
||||
virtual bool AllowNullPage() const { return true; }
|
||||
|
||||
// return the page corresponding to the tab at the specified position
|
||||
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
|
||||
|
||||
// event handlers
|
||||
void OnTreeSelectionChange(wxTreeEvent& event);
|
||||
void OnTreeNodeExpandedCollapsed(wxTreeEvent& event);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue