From ffdf1b49033b9a2d9cfda3580bc982eeb70cc3d7 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 25 Aug 2004 22:09:01 +0000 Subject: [PATCH] wxScrolledWindow should allow the same styles as wxPanel, especially wxTAB_TRAVERSAL. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xh_scwin.cpp | 7 +++++++ src/xrc/xh_scwin.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/contrib/src/xrc/xh_scwin.cpp b/contrib/src/xrc/xh_scwin.cpp index 275bafed64..e075827f4e 100644 --- a/contrib/src/xrc/xh_scwin.cpp +++ b/contrib/src/xrc/xh_scwin.cpp @@ -21,6 +21,7 @@ #include "wx/xrc/xh_scwin.h" #include "wx/scrolwin.h" +#include "wx/frame.h" // to get wxNO_3D IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler) @@ -29,6 +30,12 @@ wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler() { XRC_ADD_STYLE(wxHSCROLL); XRC_ADD_STYLE(wxVSCROLL); + + // wxPanel styles + XRC_ADD_STYLE(wxNO_3D); + XRC_ADD_STYLE(wxTAB_TRAVERSAL); + XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); + AddWindowStyles(); } diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp index 275bafed64..e075827f4e 100644 --- a/src/xrc/xh_scwin.cpp +++ b/src/xrc/xh_scwin.cpp @@ -21,6 +21,7 @@ #include "wx/xrc/xh_scwin.h" #include "wx/scrolwin.h" +#include "wx/frame.h" // to get wxNO_3D IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler) @@ -29,6 +30,12 @@ wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler() { XRC_ADD_STYLE(wxHSCROLL); XRC_ADD_STYLE(wxVSCROLL); + + // wxPanel styles + XRC_ADD_STYLE(wxNO_3D); + XRC_ADD_STYLE(wxTAB_TRAVERSAL); + XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); + AddWindowStyles(); } -- 2.47.2