X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eca15c0d5497309e402d4bb91f8e479b4fb70fa9..a7d403698f6750bbf8c161e88aee5ab8a6b0bcd4:/include/wx/treebook.h diff --git a/include/wx/treebook.h b/include/wx/treebook.h index 34f0090f89..704c87f234 100644 --- a/include/wx/treebook.h +++ b/include/wx/treebook.h @@ -21,31 +21,13 @@ typedef wxWindow wxTreebookPage; -class WXDLLEXPORT wxTreeEvent; - -// ---------------------------------------------------------------------------- -// style flags -// ---------------------------------------------------------------------------- - -// This is a set of synonyms of wxNB_XXX, which still could be used directly -// for styling the control. Defined for consistency with wxListbook and -// wxChoicebook only. -#define wxTBK_LEFT wxNB_LEFT -#define wxTBK_RIGHT wxNB_RIGHT - -// we don't support TOP/BOTTOM orientations but still define the flags (again, -// for consistency with others) -#define wxTBK_TOP wxTBK_LEFT -#define wxTBK_BOTTOM wxTBK_RIGHT - -#define wxTBK_ALIGN_MASK (wxTBK_LEFT | wxTBK_RIGHT) -#define wxTBK_DEFAULT wxTBK_LEFT +class WXDLLIMPEXP_FWD_CORE wxTreeEvent; // ---------------------------------------------------------------------------- // wxTreebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreebook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxTreebook : public wxBookCtrlBase { public: // Constructors and such @@ -62,7 +44,7 @@ public: wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTBK_DEFAULT, + long style = wxBK_DEFAULT, const wxString& name = wxEmptyString) { Init(); @@ -75,7 +57,7 @@ public: wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTBK_DEFAULT, + long style = wxBK_DEFAULT, const wxString& name = wxEmptyString); @@ -95,11 +77,11 @@ public: int imageId = wxNOT_FOUND); // Inserts a new sub-page to the end of children of the page at given pos. - virtual bool AddSubPage(size_t pos, - wxWindow *page, - const wxString& text, - bool bSelect = false, - int imageId = wxNOT_FOUND); + virtual bool InsertSubPage(size_t pos, + wxWindow *page, + const wxString& text, + bool bSelect = false, + int imageId = wxNOT_FOUND); // Adds a new page at top level after all other pages. virtual bool AddPage(wxWindow *page, @@ -137,6 +119,9 @@ public: // get the parent page or wxNOT_FOUND if this is a top level page int GetPageParent(size_t pos) const; + // the tree control we use for showing the pages index tree + wxTreeCtrl* GetTreeCtrl() const { return (wxTreeCtrl*)m_bookctrl; } + // Standard operations inherited from wxBookCtrlBase // ------------------------------------------------- @@ -147,30 +132,24 @@ public: virtual int GetPageImage(size_t n) const; virtual bool SetPageImage(size_t n, int imageId); virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; - 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); virtual void AssignImageList(wxImageList *imageList); virtual bool DeleteAllPages(); protected: + // Implementation of a page removal. See DeletPage for comments. + wxTreebookPage *DoRemovePage(size_t pos); + // This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages) virtual bool AllowNullPage() const { return true; } - // get the size which the tree control should have - wxSize GetTreeSize() const; - - // get the page area - wxRect GetPageRect() const; - // event handlers - void OnSize(wxSizeEvent& event); void OnTreeSelectionChange(wxTreeEvent& event); void OnTreeNodeExpandedCollapsed(wxTreeEvent& event); - - // the tree control we use for showing the pages index tree - wxTreeCtrl *m_tree; - // array of page ids and page windows wxArrayTreeItemIds m_treeIds; @@ -206,11 +185,8 @@ private: bool bSelect = false, int imageId = wxNOT_FOUND); - // Implementation of a page removal. See DeletPage for comments. - wxTreebookPage *DoRemovePage(size_t pos); - // Sets selection in the tree control and updates the page being shown. - int DoSetSelection(size_t pos); + int DoSetSelection(size_t pos, int flags = 0); // Returns currently shown page. In a case when selected the node // has empty (NULL) page finds first (sub)child with not-empty page. @@ -245,7 +221,7 @@ private: // Returns internal number of pages which can be different from // GetPageCount() while performing a page insertion or removal. - size_t DoInternalGetPageCount() const { return m_treeIds.Count(); } + size_t DoInternalGetPageCount() const { return m_treeIds.GetCount(); } DECLARE_EVENT_TABLE() @@ -257,40 +233,28 @@ private: // treebook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreebookEvent : public wxBookCtrlBaseEvent -{ -public: - wxTreebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, - int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND) - : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel) - { - } +// wxTreebookEvent is obsolete and defined for compatibility only +typedef wxBookCtrlEvent wxTreebookEvent; +typedef wxBookCtrlEventFunction wxTreebookEventFunction; +#define wxTreebookEventHandler(func) wxBookCtrlEventHandler(func) -private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebookEvent) -}; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED; -typedef void (wxEvtHandler::*wxTreebookEventFunction)(wxTreebookEvent&); - -#define wxTreebookEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTreebookEventFunction, &func) - #define EVT_TREEBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, winid, wxTreebookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) #define EVT_TREEBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, winid, wxTreebookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) #define EVT_TREEBOOK_NODE_COLLAPSED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, winid, wxTreebookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, winid, wxBookCtrlEventHandler(fn)) #define EVT_TREEBOOK_NODE_EXPANDED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, winid, wxTreebookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, winid, wxBookCtrlEventHandler(fn)) #endif // wxUSE_TREEBOOK