X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c575e45a24711793f98959a1f394a9e528c3129a..8064223b7b1b3657363b7a635c381b9269d95e55:/src/xrc/xh_panel.cpp diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp index d059aebba8..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 ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xh_panel.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,17 +18,22 @@ #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(); }