X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27a1fd58803acbcb8b0d25d0e344c9efbab6e47d..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/mac/carbon/notebook.h?ds=sidebyside diff --git a/include/wx/mac/carbon/notebook.h b/include/wx/mac/carbon/notebook.h index 393de929f8..859bbc9bee 100644 --- a/include/wx/mac/carbon/notebook.h +++ b/include/wx/mac/carbon/notebook.h @@ -50,17 +50,20 @@ public: long style = 0, const wxString& name = wxNotebookNameStr); // dtor - ~wxNotebook(); + virtual ~wxNotebook(); // accessors // --------- // set the currently selected page, return the index of the previously // selected one (or -1 on error) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage); + int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } // get the currently selected page int GetSelection() const { return m_nSelection; } + // changes selected page without sending events + int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); } + // set/get the title of a page bool SetPageText(size_t nPage, const wxString& strText); wxString GetPageText(size_t nPage) const; @@ -77,7 +80,10 @@ public: // sets the size of the tabs (assumes all tabs are the same size) virtual void SetTabSize(const wxSize& sz); - // calculate size for wxNotebookSizer + // hit test + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; + + // calculate size for wxNotebookSizer wxSize CalcSizeFromPage(const wxSize& sizePage) const; wxRect GetPageRect() const ; @@ -111,9 +117,10 @@ public: // base class virtuals // ------------------- virtual void Command(wxCommandEvent& event); + virtual wxInt32 MacControlHit(WXEVENTHANDLERREF handler, WXEVENTREF event); + protected: virtual wxNotebookPage *DoRemovePage(size_t page) ; - virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ; // common part of all ctors void Init(); @@ -121,6 +128,8 @@ protected: void ChangePage(int nOldSel, int nSel); // change pages void MacSetupTabs(); + int DoSetSelection(size_t nPage, int flags = 0); + // the icon indices wxArrayInt m_images;