added <scrollrate> parameter to wxScrolledWindow XRC handler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index a5756ae3f3ea9ce37da37e041792c2eaaa8b9784..83dc10cde4fcf4847a9c92854d313ec03141e4f4 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -238,7 +238,8 @@ All (GUI):
   behaviour of GetNextSibling() consistent between wxMSW and generic versions.
 - Merged wxRichTextAttr and wxTextAttrEx into wxTextAttr, and added a font table
   to wxRichTextBuffer to reduce wxFont consumption and increase performance.
-- Optimize wxGenericTreeCtrl::Collapse/ExpandAllChildren() (Szczepan Holyszewski)
+- Optimize wxGenericTreeCtrl::Collapse/ExpandAllChildren(). (Szczepan Holyszewski)
+- Added <scrollrate> parameter to wxScrolledWindow XRC handler.
 
 wxGTK:
 

diff --git a/docs/tech/tn0014.txt b/docs/tech/tn0014.txt
index c09c90793963a84f335fd03193091c579950ab68..6d5d2e5f5d5dd4d60f187a728d2f0bfc6d725aec 100644 (file)
--- a/docs/tech/tn0014.txt
+++ b/docs/tech/tn0014.txt
@@ -432,6 +432,7 @@ wxScrolledWindow
 pos                        Position                -1,-1
 size                       Size                    -1,-1
 style                      Style[wxScrolledWindow] wxHSCROLL | wxVSCROLL
+scrollrate                 Size                    0,0
 
 wxScolledWindow may have children objects.
 

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index 156a3c970be6f1eb72513cf010d061e84535f6d5..78b70ce059f34c45250bbbc0bb4cb5e2416859b4 100644 (file)
--- a/src/xrc/xh_scwin.cpp
+++ b/src/xrc/xh_scwin.cpp
@@ -55,6 +55,12 @@ wxObject *wxScrolledWindowXmlHandler::DoCreateResource()
     SetupWindow(control);
     CreateChildren(control);
 
+    if ( HasParam(wxT("scrollrate")) )
+    {
+        wxSize rate = GetSize(wxT("scrollrate"));
+        control->SetScrollRate(rate.x, rate.y);
+    }
+
     return control;
 }