From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2007 19:27:33 +0000 (+0000)
Subject: make HitTest() public (bug 1626543); this changes ABI for protected part of wx API... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bcbec8656fd511da0ae971970026cdcc24104d68?ds=inline

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

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index fedd45ab55..d6e110a219 100644
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -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;
diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index 5334073d44..c05e56e1aa 100644
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -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);