X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/621be1ec2672d922cfb95d6e8178b38c8ceaf52a..f7b06c8ce1bf0c34e4c5bde45181205101a5661e:/src/xrc/xh_scwin.cpp

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index 886da64ce0..f205a72b7b 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
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_scwin.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -22,8 +18,12 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_scwin.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif
+
 #include "wx/scrolwin.h"
-#include "wx/frame.h"  // to get wxNO_3D
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
 
@@ -34,7 +34,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);