X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..ec02a2f7de3d6f4e11c4dd72bf69c33fcc49ba84:/src/xrc/xh_scwin.cpp?ds=sidebyside diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp index e99190c020..156a3c970b 100644 --- a/src/xrc/xh_scwin.cpp +++ b/src/xrc/xh_scwin.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_scwin.cpp +// Name: src/xrc/xh_scwin.cpp // Purpose: XRC resource for wxScrolledWindow // Author: Vaclav Slavik // Created: 2002/10/18 @@ -18,8 +18,11 @@ #if wxUSE_XRC #include "wx/xrc/xh_scwin.h" -#include "wx/scrolwin.h" -#include "wx/frame.h" // to get wxNO_3D + +#ifndef WX_PRECOMP + #include "wx/frame.h" + #include "wx/scrolwin.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler) @@ -30,7 +33,9 @@ wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler() XRC_ADD_STYLE(wxVSCROLL); // wxPanel styles +#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);