X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/621be1ec2672d922cfb95d6e8178b38c8ceaf52a..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/xrc/xh_scwin.cpp diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp index 886da64ce0..d385f3e323 100644 --- a/src/xrc/xh_scwin.cpp +++ b/src/xrc/xh_scwin.cpp @@ -1,17 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_scwin.cpp +// Name: src/xrc/xh_scwin.cpp // Purpose: XRC resource for wxScrolledWindow // Author: Vaclav Slavik // Created: 2002/10/18 -// RCS-ID: $Id$ // 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" @@ -22,8 +17,11 @@ #if wxUSE_XRC #include "wx/xrc/xh_scwin.h" -#include "wx/scrolwin.h" -#include "wx/frame.h" // to get wxNO_3D + +#ifndef WX_PRECOMP + #include "wx/frame.h" + #include "wx/scrolwin.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler) @@ -34,7 +32,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); @@ -54,6 +54,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; }