Extended wxGetHostName implementation.

[wxWidgets.git] / src / xrc / xh_scwin.cpp

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index 275bafed6433295e402d898eba79fd8e77e3f7ff..156a3c970be6f1eb72513cf010d061e84535f6d5 100644 (file)
--- 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
 // Purpose:     XRC resource for wxScrolledWindow
 // Author:      Vaclav Slavik
 // Created:     2002/10/18


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xh_scwin.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,8 +15,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_scwin.h"
 #include "wx/xrc/xh_scwin.h"

-#include "wx/scrolwin.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+    #include "wx/scrolwin.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
 


@@ -29,6 +31,14 @@ wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler()
 {
     XRC_ADD_STYLE(wxHSCROLL);
     XRC_ADD_STYLE(wxVSCROLL);
 {
     XRC_ADD_STYLE(wxHSCROLL);
     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);
+

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 


@@ -52,3 +62,5 @@ bool wxScrolledWindowXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxScrolledWindow"));
 }
 {
     return IsOfClass(node, wxT("wxScrolledWindow"));
 }

+
+#endif // wxUSE_XRC