X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9aaf11927c8f43dcf296563c6a62707d625c2356..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/xrc/xh_listbk.cpp diff --git a/src/xrc/xh_listbk.cpp b/src/xrc/xh_listbk.cpp index ef7dd63a98..7d4f64ae98 100644 --- a/src/xrc/xh_listbk.cpp +++ b/src/xrc/xh_listbk.cpp @@ -1,16 +1,13 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_listbk.cpp +// Name: src/xrc/xh_listbk.cpp // Purpose: XRC resource for wxListbook // Author: Vaclav Slavik // Created: 2000/03/21 +// RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xh_listbk.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,20 +19,33 @@ #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_RIGHT); + XRC_ADD_STYLE(wxBK_TOP); + XRC_ADD_STYLE(wxBK_BOTTOM); + + 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); + AddWindowStyles(); } @@ -72,14 +82,29 @@ wxObject *wxListbookXmlHandler::DoCreateResource() 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 tag.")); + ReportError("listbookpage must have a window child"); return NULL; } } @@ -94,6 +119,10 @@ wxObject *wxListbookXmlHandler::DoCreateResource() 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;