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
This commit is contained in:
@@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#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,7 +226,6 @@ private:
|
|||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook)
|
||||||
WX_DECLARE_CONTROL_CONTAINER();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@@ -59,24 +59,18 @@ BEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase)
|
|||||||
EVT_TREE_SEL_CHANGED (wxID_ANY, wxTreebook::OnTreeSelectionChange)
|
EVT_TREE_SEL_CHANGED (wxID_ANY, wxTreebook::OnTreeSelectionChange)
|
||||||
EVT_TREE_ITEM_EXPANDED (wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed)
|
EVT_TREE_ITEM_EXPANDED (wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed)
|
||||||
EVT_TREE_ITEM_COLLAPSED(wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed)
|
EVT_TREE_ITEM_COLLAPSED(wxID_ANY, 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;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user