X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/681be2ef80274e6c39b243922a594c59e4983dab..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/univ/notebook.h?ds=sidebyside diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index 246627c80b..bbc4250be9 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -86,7 +86,7 @@ public: wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); // style tests // ----------- @@ -130,7 +130,6 @@ protected: void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n); // resizing - virtual wxSize DoGetBestClientSize() const; virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoSetSize(int x, int y, int width, int height, @@ -188,7 +187,7 @@ protected: // return true if the tab has an associated image bool HasImage(int page) const - { return m_imageList && m_images[page] != -1; } + { return HasImageList() && m_images[page] != -1; } // get the part of the notebook reserved for the pages (slightly larger // than GetPageRect() as we draw a border and leave marginin between) @@ -201,10 +200,10 @@ protected: wxSize GetSizeForPage(const wxSize& size) const; // scroll the tabs so that the first page shown becomes the given one - void ScrollTo(int page); + void ScrollTo(size_t page); // scroll the tabs so that the first page shown becomes the given one - void ScrollLastTo(int page); + void ScrollLastTo(size_t page); // the pages titles wxArrayString m_titles;