X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f00af0e9e76648894c0e7b2f89abfafe85fc08e..d27d59fb91131222207a535b43ef67babfd03ee9:/src/xrc/xh_treebk.cpp?ds=sidebyside diff --git a/src/xrc/xh_treebk.cpp b/src/xrc/xh_treebk.cpp index ed2c6ce3bc..efc5c36f99 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) @@ -58,6 +61,10 @@ wxObject *wxTreebookXmlHandler::DoCreateResource() GetStyle(wxT("style")), GetName()); + wxImageList *imagelist = GetImageList(); + if ( imagelist ) + tbk->AssignImageList(imagelist); + wxTreebook * old_par = m_tbk; m_tbk = tbk; @@ -92,12 +99,14 @@ wxObject *wxTreebookXmlHandler::DoCreateResource() wnd = wxDynamicCast(item, wxWindow); if (wnd == NULL && item != NULL) - wxLogError(wxT("Error in resource: control within treebook's tag is not a window.")); + { + ReportError(n, "treebookpage child must be a window"); + } } size_t depth = GetLong( wxT("depth") ); - if( depth <= m_treeContext.Count() ) + if( depth <= m_treeContext.GetCount() ) { // first prepare the icon int imgIndex = wxNOT_FOUND; @@ -112,10 +121,22 @@ wxObject *wxTreebookXmlHandler::DoCreateResource() } imgIndex = imgList->Add(bmp); } + else if ( HasParam(wxT("image")) ) + { + if ( m_tbk->GetImageList() ) + { + imgIndex = GetLong(wxT("image")); + } + else // image without image list? + { + ReportError(n, "image can only be used in conjunction " + "with imagelist"); + } + } // 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 +144,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); } @@ -131,7 +152,10 @@ wxObject *wxTreebookXmlHandler::DoCreateResource() } else - wxLogError(wxT("Error in resource. wxTreebookPage has an invalid depth.")); + { + ReportParamError("depth", "invalid depth"); + } + return wnd; }