Fixed bug: wxPropertyGridInterface::SetPropertyReadOnly() with wxPG_DONT_RECURSE...

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

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index 9aedfefe5789eb512b16a2a1899cd09d3d589d9d..78b70ce059f34c45250bbbc0bb4cb5e2416859b4 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
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2002 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_scwin.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,20 +15,35 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_scwin.h"
-#include "wx/scrolwin.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+    #include "wx/scrolwin.h"
+#endif
 
-wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
+
+wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler()
+: wxXmlResourceHandler()
 {
     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();
 }
 
 wxObject *wxScrolledWindowXmlHandler::DoCreateResource()
-{ 
+{
     XRC_MAKE_INSTANCE(control, wxScrolledWindow)
 
     control->Create(m_parentAsWindow,
@@ -42,7 +53,14 @@ wxObject *wxScrolledWindowXmlHandler::DoCreateResource()
                     GetName());
 
     SetupWindow(control);
-    
+    CreateChildren(control);
+
+    if ( HasParam(wxT("scrollrate")) )
+    {
+        wxSize rate = GetSize(wxT("scrollrate"));
+        control->SetScrollRate(rate.x, rate.y);
+    }
+
     return control;
 }
 
@@ -50,3 +68,5 @@ bool wxScrolledWindowXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxScrolledWindow"));
 }
+
+#endif // wxUSE_XRC