X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..da52a4e023e73c2922f63d95026816a624695559:/include/wx/listbook.h diff --git a/include/wx/listbook.h b/include/wx/listbook.h index 73244fc256..13a2852866 100644 --- a/include/wx/listbook.h +++ b/include/wx/listbook.h @@ -12,58 +12,31 @@ #ifndef _WX_LISTBOOK_H_ #define _WX_LISTBOOK_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "listbook.h" -#endif - #include "wx/defs.h" #if wxUSE_LISTBOOK -// this can be defined to put a static line as separator between the list -// control and the page area; but I think it finally looks better without it so -// it is not enabled by default -//#define wxUSE_LINE_IN_LISTBOOK 1 - -#if !wxUSE_STATLINE - #undef wxUSE_LINE_IN_LISTBOOK - #define wxUSE_LINE_IN_LISTBOOK 0 -#endif - #include "wx/bookctrl.h" -class WXDLLEXPORT wxListView; -class WXDLLEXPORT wxListEvent; - -#if wxUSE_LINE_IN_LISTBOOK -class WXDLLEXPORT wxStaticLine; -#endif // wxUSE_LINE_IN_LISTBOOK - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// wxListbook styles -enum -{ - // default alignment: left everywhere except Mac where it is top - wxLB_DEFAULT = 0, +class WXDLLIMPEXP_FWD_CORE wxListView; +class WXDLLIMPEXP_FWD_CORE wxListEvent; - // put the list control to the left/right/top/bottom of the page area - wxLB_TOP = 0x1, - wxLB_BOTTOM = 0x2, - wxLB_LEFT = 0x4, - wxLB_RIGHT = 0x8, +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED; +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING; - // the mask which can be used to extract the alignment from the style - wxLB_ALIGN_MASK = 0xf -}; +// wxListbook flags +#define wxLB_DEFAULT wxBK_DEFAULT +#define wxLB_TOP wxBK_TOP +#define wxLB_BOTTOM wxBK_BOTTOM +#define wxLB_LEFT wxBK_LEFT +#define wxLB_RIGHT wxBK_RIGHT +#define wxLB_ALIGN_MASK wxBK_ALIGN_MASK // ---------------------------------------------------------------------------- // wxListbook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListbook : public wxBookCtrl +class WXDLLEXPORT wxListbook : public wxBookCtrlBase { public: wxListbook() @@ -92,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; @@ -103,41 +77,36 @@ public: const wxString& text, bool bSelect = false, int imageId = -1); - virtual int SetSelection(size_t n); + 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); - // returns true if we have wxLB_TOP or wxLB_BOTTOM style - bool IsVertical() const { return HasFlag(wxLB_BOTTOM | wxLB_TOP); } + virtual bool DeleteAllPages(); + + wxListView* GetListView() const { return (wxListView*)m_bookctrl; } protected: virtual wxWindow *DoRemovePage(size_t page); -private: - // common part of all constructors - void Init(); - // get the size which the list control should have - wxSize GetListSize() const; + virtual wxSize GetControllerSize() const; + + void UpdateSelectedPage(size_t newsel); - // get the page area - wxRect GetPageRect() const; + wxBookCtrlBaseEvent* CreatePageChangingEvent() const; + void MakeChangedEvent(wxBookCtrlBaseEvent &event); // event handlers - void OnSize(wxSizeEvent& event); void OnListSelected(wxListEvent& event); - - - // the list control we use for showing the pages index - wxListView *m_list; - -#if wxUSE_LINE_IN_LISTBOOK - // the line separating it from the page area - wxStaticLine *m_line; -#endif // wxUSE_LINE_IN_LISTBOOK + void OnSize(wxSizeEvent& event); // the currently selected page or wxNOT_FOUND if none int m_selection; +private: + // common part of all constructors + void Init(); DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxListbook) @@ -147,41 +116,36 @@ private: // listbook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListbookEvent : public wxBookCtrlEvent +class WXDLLEXPORT wxListbookEvent : public wxBookCtrlBaseEvent { public: wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, - int nSel = -1, int nOldSel = -1) - : wxBookCtrlEvent(commandType, id, nSel, nOldSel) + 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_COPY(wxListbookEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListbookEvent) }; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING; - typedef void (wxEvtHandler::*wxListbookEventFunction)(wxListbookEvent&); -#define EVT_LISTBOOK_PAGE_CHANGED(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, \ - id, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxListbookEventFunction, &fn ), \ - NULL \ - ), - -#define EVT_LISTBOOK_PAGE_CHANGING(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, \ - id, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxListbookEventFunction, &fn ), \ - NULL \ - ), +#define wxListbookEventHandler(func) \ + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxListbookEventFunction, &func) + +#define EVT_LISTBOOK_PAGE_CHANGED(winid, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, winid, wxListbookEventHandler(fn)) + +#define EVT_LISTBOOK_PAGE_CHANGING(winid, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, winid, wxListbookEventHandler(fn)) #endif // wxUSE_LISTBOOK