X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..ca71e3ae27676bd0c162487b40fc74afa59f54e8:/src/xrc/xh_notbk.cpp diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp index 3c427b6365..15efb8fca0 100644 --- a/src/xrc/xh_notbk.cpp +++ b/src/xrc/xh_notbk.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_notbk.cpp +// Name: src/xrc/xh_notbk.cpp // Purpose: XRC resource for wxNotebook // Author: Vaclav Slavik // Created: 2000/03/21 @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_notbk.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,26 +15,43 @@ #pragma hdrstop #endif -#include "wx/xrc/xh_notbk.h" +#if wxUSE_XRC && wxUSE_NOTEBOOK -#if wxUSE_NOTEBOOK +#include "wx/xrc/xh_notbk.h" #include "wx/log.h" #include "wx/notebook.h" +#include "wx/imaglist.h" #include "wx/sizer.h" -wxNotebookXmlHandler::wxNotebookXmlHandler() -: wxXmlResourceHandler(), m_isInside(FALSE), m_notebook(NULL) +IMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler) + +wxNotebookXmlHandler::wxNotebookXmlHandler() +: wxXmlResourceHandler(), m_isInside(false), m_notebook(NULL) { - XRC_ADD_STYLE(wxNB_FIXEDWIDTH); + 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); + +#if WXWIN_COMPATIBILITY_2_6 + XRC_ADD_STYLE(wxNB_DEFAULT); XRC_ADD_STYLE(wxNB_LEFT); XRC_ADD_STYLE(wxNB_RIGHT); + XRC_ADD_STYLE(wxNB_TOP); XRC_ADD_STYLE(wxNB_BOTTOM); +#endif + + XRC_ADD_STYLE(wxNB_FIXEDWIDTH); + XRC_ADD_STYLE(wxNB_MULTILINE); + XRC_ADD_STYLE(wxNB_NOPAGETHEME); + AddWindowStyles(); } wxObject *wxNotebookXmlHandler::DoCreateResource() -{ +{ if (m_class == wxT("notebookpage")) { wxXmlNode *n = GetParamNode(wxT("object")); @@ -49,16 +62,30 @@ wxObject *wxNotebookXmlHandler::DoCreateResource() if (n) { bool old_ins = m_isInside; - m_isInside = FALSE; - m_isInside = old_ins; + m_isInside = false; wxObject *item = CreateResFromNode(n, m_notebook, NULL); + m_isInside = old_ins; wxWindow *wnd = wxDynamicCast(item, wxWindow); if (wnd) + { m_notebook->AddPage(wnd, GetText(wxT("label")), - GetBool(wxT("selected"), 0)); - else - wxLogError(wxT("Error in resource.")); + GetBool(wxT("selected"))); + if ( HasParam(wxT("bitmap")) ) + { + wxBitmap bmp = GetBitmap(wxT("bitmap"), wxART_OTHER); + wxImageList *imgList = m_notebook->GetImageList(); + if ( imgList == NULL ) + { + imgList = new wxImageList( bmp.GetWidth(), bmp.GetHeight() ); + m_notebook->AssignImageList( imgList ); + } + int imgIndex = imgList->Add(bmp); + m_notebook->SetPageImage(m_notebook->GetPageCount()-1, imgIndex ); + } + } + else + wxLogError(wxT("Error in resource.")); return wnd; } else @@ -67,29 +94,28 @@ wxObject *wxNotebookXmlHandler::DoCreateResource() return NULL; } } - - else + + else { XRC_MAKE_INSTANCE(nb, wxNotebook) - nb->Create(m_parentAsWindow, + nb->Create(m_parentAsWindow, GetID(), GetPosition(), GetSize(), GetStyle(wxT("style")), GetName()); + SetupWindow(nb); + wxNotebook *old_par = m_notebook; m_notebook = nb; bool old_ins = m_isInside; - m_isInside = TRUE; - CreateChildren(m_notebook, TRUE/*only this handler*/); + m_isInside = true; + CreateChildren(m_notebook, true/*only this handler*/); m_isInside = old_ins; m_notebook = old_par; - if (GetBool(wxT("usenotebooksizer"), FALSE)) - return new wxNotebookSizer(nb); - else - return nb; + return nb; } } @@ -99,4 +125,4 @@ bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node) (m_isInside && IsOfClass(node, wxT("notebookpage")))); } -#endif +#endif // wxUSE_XRC && wxUSE_NOTEBOOK