From 5e4a7f9196ed618fd66577615cce896d49744961 Mon Sep 17 00:00:00 2001 From: Jamie Gadd Date: Tue, 25 Jul 2006 09:30:19 +0000 Subject: [PATCH] Make wxTreebook use wxControlContainer. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/treebook.h | 2 ++ src/generic/treebkg.cpp | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/include/wx/treebook.h b/include/wx/treebook.h index 325aaa3521..578ec3ade3 100644 --- a/include/wx/treebook.h +++ b/include/wx/treebook.h @@ -18,6 +18,7 @@ #include "wx/bookctrl.h" #include "wx/treectrl.h" // for wxArrayTreeItemIds +#include "wx/containr.h" typedef wxWindow wxTreebookPage; @@ -227,6 +228,7 @@ private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook) + WX_DECLARE_CONTROL_CONTAINER(); }; diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp index b93e0b3d89..8728039648 100644 --- a/src/generic/treebkg.cpp +++ b/src/generic/treebkg.cpp @@ -60,18 +60,24 @@ BEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase) EVT_TREE_SEL_CHANGED (wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeSelectionChange) EVT_TREE_ITEM_EXPANDED (wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeNodeExpandedCollapsed) EVT_TREE_ITEM_COLLAPSED(wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeNodeExpandedCollapsed) + + WX_EVENT_TABLE_CONTROL_CONTAINER(wxTreebook) END_EVENT_TABLE() // ============================================================================ // wxTreebook implementation // ============================================================================ +WX_DELEGATE_TO_CONTROL_CONTAINER(wxTreebook, wxControl) + // ---------------------------------------------------------------------------- // wxTreebook creation // ---------------------------------------------------------------------------- void wxTreebook::Init() { + m_container.SetContainerWindow(this); + m_selection = m_actualSelection = wxNOT_FOUND; } @@ -89,6 +95,7 @@ wxTreebook::Create(wxWindow *parent, { style |= wxBK_LEFT; } + style |= wxTAB_TRAVERSAL; // no border for this control, it doesn't look nice together with the tree style &= ~wxBORDER_MASK; -- 2.45.2