From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Mar 2007 21:17:19 +0000 (+0000)
Subject: why was this class made a wxControlContainer (rev. 1.7), this doesn't seem to make... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4542739ccb3b2ad47afc66b7a3182568a182b71f

why was this class made a wxControlContainer (rev. 1.7), this doesn't seem to make sense -- and if it does it should probably be done at the base class level, not here


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index c05e56e1aa..d2201317dc 100644
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -18,7 +18,6 @@
 
 #include "wx/bookctrl.h"
 #include "wx/treectrl.h"        // for wxArrayTreeItemIds
-#include "wx/containr.h"
 
 typedef wxWindow wxTreebookPage;
 
@@ -227,7 +226,6 @@ 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 3d88255a0f..25de92bea6 100644
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -59,24 +59,18 @@ BEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase)
     EVT_TREE_SEL_CHANGED   (wxID_ANY, wxTreebook::OnTreeSelectionChange)
     EVT_TREE_ITEM_EXPANDED (wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed)
     EVT_TREE_ITEM_COLLAPSED(wxID_ANY, 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;
 }