X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..b0c4316ebd9fd30c72f2cc72fab75772fe7c52c3:/src/xrc/xh_panel.cpp?ds=sidebyside diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp index 07653815f7..d059aebba8 100644 --- a/src/xrc/xh_panel.cpp +++ b/src/xrc/xh_panel.cpp @@ -7,8 +7,8 @@ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "xh_panel.h" #endif @@ -19,21 +19,25 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_panel.h" #include "wx/panel.h" +#include "wx/frame.h" // to get wxNO_3D +IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler) wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler() { XRC_ADD_STYLE(wxNO_3D); XRC_ADD_STYLE(wxTAB_TRAVERSAL); XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); - XRC_ADD_STYLE(wxCLIP_CHILDREN); + AddWindowStyles(); } wxObject *wxPanelXmlHandler::DoCreateResource() -{ +{ XRC_MAKE_INSTANCE(panel, wxPanel) panel->Create(m_parentAsWindow, @@ -44,7 +48,7 @@ wxObject *wxPanelXmlHandler::DoCreateResource() SetupWindow(panel); CreateChildren(panel); - + return panel; } @@ -52,3 +56,5 @@ bool wxPanelXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxPanel")); } + +#endif // wxUSE_XRC