X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90c0f63a835e4ac6bf73d8671edcf85ff063731f..2aebd278e374af02a3761201e2187a91d3f92832:/include/wx/listbook.h diff --git a/include/wx/listbook.h b/include/wx/listbook.h index fedd45ab55..13a2852866 100644 --- a/include/wx/listbook.h +++ b/include/wx/listbook.h @@ -18,8 +18,8 @@ #include "wx/bookctrl.h" -class WXDLLEXPORT wxListView; -class WXDLLEXPORT wxListEvent; +class WXDLLIMPEXP_FWD_CORE wxListView; +class WXDLLIMPEXP_FWD_CORE wxListEvent; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING; @@ -65,6 +65,7 @@ public: const wxString& name = wxEmptyString); + // overridden base class methods virtual int GetSelection() const; virtual bool SetPageText(size_t n, const wxString& strText); virtual wxString GetPageText(size_t n) const; @@ -78,6 +79,7 @@ public: int imageId = -1); 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; virtual void SetImageList(wxImageList *imageList); virtual bool DeleteAllPages(); @@ -90,9 +92,6 @@ protected: // get the size which the list control should have virtual wxSize GetControllerSize() const; - // return the page corresponding to the tab at the specified position - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; - void UpdateSelectedPage(size_t newsel); wxBookCtrlBaseEvent* CreatePageChangingEvent() const;