AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make wxTreebook use wxControlContainer.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jamie Gadd 2006-07-25 09:30:19 +00:00
parent 89fdd421b4
commit 5e4a7f9196
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/treebook.h
View File

@ -18,6 +18,7 @@
#include "wx/bookctrl.h" #include "wx/bookctrl.h"
#include "wx/treectrl.h" // for wxArrayTreeItemIds #include "wx/treectrl.h" // for wxArrayTreeItemIds
#include "wx/containr.h"
typedef wxWindow wxTreebookPage; typedef wxWindow wxTreebookPage;
@ -227,6 +228,7 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook) DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook)
WX_DECLARE_CONTROL_CONTAINER();
}; };

7
src/generic/treebkg.cpp
View File

@ -60,18 +60,24 @@ BEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase)
EVT_TREE_SEL_CHANGED (wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeSelectionChange) EVT_TREE_SEL_CHANGED (wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeSelectionChange)
EVT_TREE_ITEM_EXPANDED (wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeNodeExpandedCollapsed) EVT_TREE_ITEM_EXPANDED (wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeNodeExpandedCollapsed)
EVT_TREE_ITEM_COLLAPSED(wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeNodeExpandedCollapsed) EVT_TREE_ITEM_COLLAPSED(wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeNodeExpandedCollapsed)
WX_EVENT_TABLE_CONTROL_CONTAINER(wxTreebook)
END_EVENT_TABLE() END_EVENT_TABLE()
// ============================================================================ // ============================================================================
// wxTreebook implementation // wxTreebook implementation
// ============================================================================ // ============================================================================
WX_DELEGATE_TO_CONTROL_CONTAINER(wxTreebook, wxControl)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTreebook creation // wxTreebook creation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxTreebook::Init() void wxTreebook::Init()
{ {
m_container.SetContainerWindow(this);
m_selection = m_selection =
m_actualSelection = wxNOT_FOUND; m_actualSelection = wxNOT_FOUND;
} }
@ -89,6 +95,7 @@ wxTreebook::Create(wxWindow *parent,
{ {
style |= wxBK_LEFT; style |= wxBK_LEFT;
} }
style |= wxTAB_TRAVERSAL;
// no border for this control, it doesn't look nice together with the tree // no border for this control, it doesn't look nice together with the tree
style &= ~wxBORDER_MASK; style &= ~wxBORDER_MASK;