X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/311b2ea70a02d742ac389d3b20bcf6602bb37228..a766986f6d443ba1d50e3af25f3306fa56e4518e:/src/xrc/xh_notbk.cpp?ds=sidebyside diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp index 7ac56de506..7c0217f9c8 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 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xh_notbk.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -23,21 +19,34 @@ #include "wx/xrc/xh_notbk.h" -#include "wx/log.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/sizer.h" +#endif + #include "wx/notebook.h" #include "wx/imaglist.h" -#include "wx/sizer.h" IMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler) wxNotebookXmlHandler::wxNotebookXmlHandler() -: wxXmlResourceHandler(), m_isInside(false), m_notebook(NULL) + :wxXmlResourceHandler(), + m_isInside(false), + m_notebook(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); + +#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);