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

diff --git a/contrib/src/xrc/xh_scwin.cpp b/contrib/src/xrc/xh_scwin.cpp
index 275bafed6433295e402d898eba79fd8e77e3f7ff..e075827f4e880be9beeace85f75a4f527ae96b89 100644 (file)
--- 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 275bafed6433295e402d898eba79fd8e77e3f7ff..e075827f4e880be9beeace85f75a4f527ae96b89 100644 (file)
--- 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();
 }