X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67..5cbda74b6606482f5286a5599fc60f3f91995a52:/include/wx/osx/notebook.h?ds=sidebyside diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h index ff60922e2a..3447388f95 100644 --- a/include/wx/osx/notebook.h +++ b/include/wx/osx/notebook.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.h +// Name: wx/osx/notebook.h // Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) // Author: Stefan Csomor // Modified by: @@ -34,14 +34,15 @@ public: // ctors // ----- // default for dynamic class - wxNotebook(); + wxNotebook() { } // the same arguments as for wxControl (@@@ any special styles?) wxNotebook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNotebookNameStr); + const wxString& name = wxNotebookNameStr) + { Create( parent, id, pos, size, style, name ); } // Create() function bool Create(wxWindow *parent, wxWindowID id, @@ -55,11 +56,9 @@ public: // accessors // --------- // set the currently selected page, return the index of the previously - // selected one (or -1 on error) + // selected one (or wxNOT_FOUND on error) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events 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); } @@ -82,7 +81,7 @@ public: // 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 ; @@ -118,7 +117,7 @@ public: // ------------------- virtual void Command(wxCommandEvent& event); // osx specific event handling common for all osx-ports - + virtual bool OSXHandleClicked( double timestampsec ); protected: @@ -135,8 +134,6 @@ protected: // the icon indices wxArrayInt m_images; - int m_nSelection; // the current selection (-1 if none) - DECLARE_DYNAMIC_CLASS(wxNotebook) DECLARE_EVENT_TABLE() };