// Purpose: XRC resource for wxListbook
// Author: Vaclav Slavik
// Created: 2000/03/21
-// RCS-ID: $Id$
// Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/xrc/xh_listbk.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/sizer.h"
+#endif
+
#include "wx/listbook.h"
#include "wx/imaglist.h"
-#include "wx/sizer.h"
IMPLEMENT_DYNAMIC_CLASS(wxListbookXmlHandler, wxXmlResourceHandler)
wxListbookXmlHandler::wxListbookXmlHandler()
-: wxXmlResourceHandler(), m_isInside(false), m_listbook(NULL)
+ :wxXmlResourceHandler(),
+ m_isInside(false),
+ m_listbook(NULL)
{
XRC_ADD_STYLE(wxBK_DEFAULT);
XRC_ADD_STYLE(wxBK_LEFT);
XRC_ADD_STYLE(wxBK_TOP);
XRC_ADD_STYLE(wxBK_BOTTOM);
-#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxLB_DEFAULT);
XRC_ADD_STYLE(wxLB_LEFT);
XRC_ADD_STYLE(wxLB_RIGHT);
XRC_ADD_STYLE(wxLB_TOP);
XRC_ADD_STYLE(wxLB_BOTTOM);
-#endif
AddWindowStyles();
}
int imgIndex = imgList->Add(bmp);
m_listbook->SetPageImage(m_listbook->GetPageCount()-1, imgIndex );
}
+ else if ( HasParam(wxT("image")) )
+ {
+ if ( m_listbook->GetImageList() )
+ {
+ m_listbook->SetPageImage(m_listbook->GetPageCount()-1,
+ GetLong(wxT("image")) );
+ }
+ else // image without image list?
+ {
+ ReportError(n, "image can only be used in conjunction "
+ "with imagelist");
+ }
+ }
}
else
- wxLogError(wxT("Error in resource."));
+ {
+ ReportError(n, "listbookpage child must be a window");
+ }
return wnd;
}
else
{
- wxLogError(wxT("Error in resource: no control within listbook's <page> tag."));
+ ReportError("listbookpage must have a window child");
return NULL;
}
}
GetStyle(wxT("style")),
GetName());
+ wxImageList *imagelist = GetImageList();
+ if ( imagelist )
+ nb->AssignImageList(imagelist);
+
wxListbook *old_par = m_listbook;
m_listbook = nb;
bool old_ins = m_isInside;