diff --git a/docs/changes.txt b/docs/changes.txt index 332809ff58..d97e915390 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -97,6 +97,7 @@ All (GUI): - Support wxGRID_AUTOSIZE in wxGrid::SetRow/ColLabelSize() (Evgeniy Tarassov). - Ensure that wxGrid::AutoSizeColumn/Row() never sets column/row size smaller than the minimal size. +- Added parameter to wxScrolledWindow XRC handler. All (Unix): diff --git a/docs/tech/tn0014.txt b/docs/tech/tn0014.txt index c09c907939..6d5d2e5f5d 100644 --- 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 156a3c970b..78b70ce059 100644 --- 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; }