X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90c0f63a835e4ac6bf73d8671edcf85ff063731f..c9c1faa490a451cdf42b35b92bfcc2c55d22bbe9:/include/wx/listbook.h diff --git a/include/wx/listbook.h b/include/wx/listbook.h index fedd45ab55..a8abcce052 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; @@ -36,7 +36,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING; // wxListbook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListbook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxListbook : public wxBookCtrlBase { public: wxListbook() @@ -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,13 +92,14 @@ 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; - void MakeChangedEvent(wxBookCtrlBaseEvent &event); + wxBookCtrlEvent* CreatePageChangingEvent() const; + void MakeChangedEvent(wxBookCtrlEvent &event); + + // get flags for different list control modes + long GetListCtrlIconViewFlags() const; + long GetListCtrlReportViewFlags() const; // event handlers void OnListSelected(wxListEvent& event); @@ -109,6 +112,10 @@ private: // common part of all constructors void Init(); + // this should be called when we need to be relaid out + void UpdateSize(); + + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxListbook) }; @@ -117,36 +124,18 @@ private: // listbook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListbookEvent : public wxBookCtrlBaseEvent -{ -public: - wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, - int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND) - : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel) - { - } - - wxListbookEvent(const wxListbookEvent& event) - : wxBookCtrlBaseEvent(event) - { - } - - virtual wxEvent *Clone() const { return new wxListbookEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListbookEvent) -}; - -typedef void (wxEvtHandler::*wxListbookEventFunction)(wxListbookEvent&); - -#define wxListbookEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxListbookEventFunction, &func) +// wxListbookEvent is obsolete and defined for compatibility only (notice that +// we use #define and not typedef to also keep compatibility with the existing +// code which forward declares it) +#define wxListbookEvent wxBookCtrlEvent +typedef wxBookCtrlEventFunction wxListbookEventFunction; +#define wxListbookEventHandler(func) wxBookCtrlEventHandler(func) #define EVT_LISTBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, winid, wxListbookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) #define EVT_LISTBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, winid, wxListbookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) #endif // wxUSE_LISTBOOK