X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..0d2c74c6ef3d14e1fa4f22323353b83630acd7a9:/src/xrc/xh_split.cpp diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp index bc6f9c5f24..c78d526066 100644 --- a/src/xrc/xh_split.cpp +++ b/src/xrc/xh_split.cpp @@ -7,8 +7,8 @@ // Copyright: (c) 2003 panga@freemail.hu, Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "xh_split.h" #endif @@ -19,6 +19,8 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_split.h" #include "wx/splitter.h" #include "wx/log.h" @@ -35,6 +37,7 @@ wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler( XRC_ADD_STYLE(wxSP_NOBORDER); XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT); XRC_ADD_STYLE(wxSP_LIVE_UPDATE); + XRC_ADD_STYLE(wxSP_NO_XP_THEME); AddWindowStyles(); } @@ -59,7 +62,7 @@ wxObject *wxSplitterWindowXmlHandler::DoCreateResource() wxXmlNode *n = m_node->GetChildren(); while (n) { - if ((n->GetType() == wxXML_ELEMENT_NODE) && + if ((n->GetType() == wxXML_ELEMENT_NODE) && (n->GetName() == wxT("object") || n->GetName() == wxT("object_ref"))) { @@ -73,7 +76,7 @@ wxObject *wxSplitterWindowXmlHandler::DoCreateResource() { win2 = win; break; - } + } } n = n->GetNext(); } @@ -102,4 +105,4 @@ bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxSplitterWindow")); } - +#endif // wxUSE_XRC