X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f80ea77b4a8bac4ab005bfc592f9cd3262ffa397..4689441b050787afee8b9113ca1ea574e551cb77:/src/xrc/xh_scwin.cpp diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp index 275bafed64..78b70ce059 100644 --- 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 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "xh_scwin.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,8 +15,14 @@ #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 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler) @@ -29,6 +31,14 @@ wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler() { 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(); } @@ -45,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; } @@ -52,3 +68,5 @@ bool wxScrolledWindowXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxScrolledWindow")); } + +#endif // wxUSE_XRC