X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da86e1776517d2403a687de08947698f5a608219..9d8fe14a97d1092989eecbe43c4e1f730fba17ad:/src/xrc/xh_panel.cpp diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp index 035c6cade4..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 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "xh_panel.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,20 +15,25 @@ #pragma hdrstop #endif -#if wxUSE_XML && wxUSE_XRC +#if wxUSE_XRC #include "wx/xrc/xh_panel.h" -#include "wx/panel.h" -#include "wx/frame.h" // to get wxNO_3D + +#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); - + AddWindowStyles(); } @@ -57,4 +58,4 @@ bool wxPanelXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxPanel")); } -#endif // wxUSE_XML && wxUSE_XRC +#endif // wxUSE_XRC