X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b11752c4f9e1fd4b11ba3d184246267facb3ad3..49a63afbad7646668df343d29edd88458bc7e0a9:/include/wx/listbook.h?ds=inline diff --git a/include/wx/listbook.h b/include/wx/listbook.h index a021dee95e..48140dc0bb 100644 --- a/include/wx/listbook.h +++ b/include/wx/listbook.h @@ -39,10 +39,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING class WXDLLIMPEXP_CORE wxListbook : public wxBookCtrlBase { public: - wxListbook() - { - Init(); - } + wxListbook() { } wxListbook(wxWindow *parent, wxWindowID id, @@ -51,8 +48,6 @@ public: long style = 0, const wxString& name = wxEmptyString) { - Init(); - (void)Create(parent, id, pos, size, style, name); } @@ -66,17 +61,15 @@ public: // overridden base class methods - virtual int GetSelection() const; virtual bool SetPageText(size_t n, const wxString& strText); virtual wxString GetPageText(size_t n) const; virtual int GetPageImage(size_t n) const; virtual bool SetPageImage(size_t n, int imageId); - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); 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; @@ -89,9 +82,6 @@ public: protected: virtual wxWindow *DoRemovePage(size_t page); - // get the size which the list control should have - virtual wxSize GetControllerSize() const; - void UpdateSelectedPage(size_t newsel); wxBookCtrlEvent* CreatePageChangingEvent() const; @@ -105,13 +95,7 @@ protected: void OnListSelected(wxListEvent& event); void OnSize(wxSizeEvent& event); - // the currently selected page or wxNOT_FOUND if none - int m_selection; - private: - // common part of all constructors - void Init(); - // this should be called when we need to be relaid out void UpdateSize();