X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d8c3e58b88ecef633154776708fc90fba221b5c..aa3d027735c05288c9be31e40faa2e1d3b3de7b7:/include/wx/univ/notebook.h diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index 3e29d78106..ffc19b1f77 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -16,6 +16,8 @@ #pragma interface "univnotebook.h" #endif +#include "wx/arrstr.h" + class WXDLLEXPORT wxSpinButton; // ---------------------------------------------------------------------------- @@ -78,7 +80,7 @@ public: virtual void SetPadding(const wxSize& padding); virtual void SetTabSize(const wxSize& sz); - virtual wxSize CalcSizeFromPage(const wxSize& sizePage); + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; virtual bool DeleteAllPages(); @@ -105,8 +107,7 @@ public: // hit testing // ----------- - // return the tab at this position or -1 if none - int HitTest(const wxPoint& pt) const; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; // input handling // -------------- @@ -194,9 +195,6 @@ protected: // get our client size from the page size wxSize GetSizeForPage(const wxSize& size) const; - // change thep age and send events about it (can be vetoed by user code) - void ChangePage(int nPage); - // scroll the tabs so that the first page shown becomes the given one void ScrollTo(int page);