X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/listbook.h diff --git a/include/wx/listbook.h b/include/wx/listbook.h index 13c8611932..8d7651b4ac 100644 --- a/include/wx/listbook.h +++ b/include/wx/listbook.h @@ -17,12 +17,13 @@ #if wxUSE_LISTBOOK #include "wx/bookctrl.h" +#include "wx/containr.h" 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; +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxBookCtrlEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent ); // wxListbook flags #define wxLB_DEFAULT wxBK_DEFAULT @@ -36,13 +37,10 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING; // wxListbook // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxListbook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxListbook : public wxNavigationEnabled { public: - wxListbook() - { - Init(); - } + wxListbook() { } wxListbook(wxWindow *parent, wxWindowID id, @@ -51,8 +49,6 @@ public: long style = 0, const wxString& name = wxEmptyString) { - Init(); - (void)Create(parent, id, pos, size, style, name); } @@ -66,17 +62,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,24 +83,22 @@ 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); - wxBookCtrlBaseEvent* CreatePageChangingEvent() const; - void MakeChangedEvent(wxBookCtrlBaseEvent &event); + wxBookCtrlEvent* CreatePageChangingEvent() const; + void MakeChangedEvent(wxBookCtrlEvent &event); + + // Get the correct wxListCtrl flags to use depending on our own flags. + long GetListCtrlFlags() const; // event handlers 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(); + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxListbook) @@ -116,36 +108,18 @@ private: // listbook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE 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