X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..00b89a1d1da61a1f842db63b244ad08c0554121c:/src/xrc/xh_panel.cpp?ds=sidebyside diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp index 07653815f7..04a21ddfbd 100644 --- a/src/xrc/xh_panel.cpp +++ b/src/xrc/xh_panel.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_panel.cpp +// Name: src/xrc/xh_panel.cpp // Purpose: XRC resource for panels // Author: Vaclav Slavik // Created: 2000/03/05 @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_panel.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,21 +15,30 @@ #pragma hdrstop #endif +#if wxUSE_XRC + #include "wx/xrc/xh_panel.h" -#include "wx/panel.h" +#ifndef WX_PRECOMP + #include "wx/panel.h" + #include "wx/frame.h" +#endif + +IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler) wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler() { +#if WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxNO_3D); +#endif // WXWIN_COMPATIBILITY_2_6 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 +49,7 @@ wxObject *wxPanelXmlHandler::DoCreateResource() SetupWindow(panel); CreateChildren(panel); - + return panel; } @@ -52,3 +57,5 @@ bool wxPanelXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxPanel")); } + +#endif // wxUSE_XRC