X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f00af0e9e76648894c0e7b2f89abfafe85fc08e..7e38638c3499c679f25ec0029931aad8e62e70d3:/src/xrc/xh_treebk.cpp?ds=sidebyside diff --git a/src/xrc/xh_treebk.cpp b/src/xrc/xh_treebk.cpp index ed2c6ce3bc..d3d427dfba 100644 --- a/src/xrc/xh_treebk.cpp +++ b/src/xrc/xh_treebk.cpp @@ -19,9 +19,12 @@ #include "wx/xrc/xh_treebk.h" +#ifndef WX_PRECOMP + #include "wx/log.h" +#endif + #include "wx/treebook.h" #include "wx/imaglist.h" -#include "wx/log.h" IMPLEMENT_DYNAMIC_CLASS(wxTreebookXmlHandler, wxXmlResourceHandler) @@ -97,7 +100,7 @@ wxObject *wxTreebookXmlHandler::DoCreateResource() size_t depth = GetLong( wxT("depth") ); - if( depth <= m_treeContext.Count() ) + if( depth <= m_treeContext.GetCount() ) { // first prepare the icon int imgIndex = wxNOT_FOUND; @@ -114,8 +117,8 @@ wxObject *wxTreebookXmlHandler::DoCreateResource() } // then add the page to the corresponding parent - if( depth < m_treeContext.Count() ) - m_treeContext.RemoveAt(depth, m_treeContext.Count() - depth ); + if( depth < m_treeContext.GetCount() ) + m_treeContext.RemoveAt(depth, m_treeContext.GetCount() - depth ); if( depth == 0) { m_tbk->AddPage(wnd, @@ -123,7 +126,7 @@ wxObject *wxTreebookXmlHandler::DoCreateResource() } else { - m_tbk->AddSubPage(m_treeContext.Item(depth - 1), wnd, + m_tbk->InsertSubPage(m_treeContext.Item(depth - 1), wnd, GetText(wxT("label")), GetBool(wxT("selected")), imgIndex); }