The unknown control container should always have the wxTAB_TRAVERSAL

and wxNO_BORDER styles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xh_unkwn.cpp b/contrib/src/xrc/xh_unkwn.cpp
index 388fb040c34bd0b70dfa769a6701496dfe6c561b..4ff17331255d181695cea5bc0578729e75407e07 100644 (file)
--- a/contrib/src/xrc/xh_unkwn.cpp
+++ b/contrib/src/xrc/xh_unkwn.cpp
@@ -34,8 +34,10 @@ public:
                               wxWindowID id = -1,
                               const wxPoint& pos = wxDefaultPosition,
                               const wxSize& size = wxDefaultSize,
-                                                         long style = wxTAB_TRAVERSAL | wxNO_BORDER)
-        : wxPanel(parent, id, pos, size, style,
+                              long style = 0)
+        // Always add the wxTAB_TRAVERSAL and wxNO_BORDER styles to what comes
+        // from the XRC if anything.
+        : wxPanel(parent, id, pos, size, style | wxTAB_TRAVERSAL | wxNO_BORDER,
                   controlName + wxT("_container")),
           m_controlName(controlName), m_controlAdded(false)
     {
@@ -92,8 +94,7 @@ wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
         new wxUnknownControlContainer(m_parentAsWindow,
                                       GetName(), -1,
                                       GetPosition(), GetSize(),
-                                      GetStyle(wxT("style"),
-                                               wxTAB_TRAVERSAL | wxNO_BORDER));
+                                      GetStyle(wxT("style")));
     SetupWindow(panel);
     return panel;
 }

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index 388fb040c34bd0b70dfa769a6701496dfe6c561b..4ff17331255d181695cea5bc0578729e75407e07 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -34,8 +34,10 @@ public:
                               wxWindowID id = -1,
                               const wxPoint& pos = wxDefaultPosition,
                               const wxSize& size = wxDefaultSize,
-                                                         long style = wxTAB_TRAVERSAL | wxNO_BORDER)
-        : wxPanel(parent, id, pos, size, style,
+                              long style = 0)
+        // Always add the wxTAB_TRAVERSAL and wxNO_BORDER styles to what comes
+        // from the XRC if anything.
+        : wxPanel(parent, id, pos, size, style | wxTAB_TRAVERSAL | wxNO_BORDER,
                   controlName + wxT("_container")),
           m_controlName(controlName), m_controlAdded(false)
     {
@@ -92,8 +94,7 @@ wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
         new wxUnknownControlContainer(m_parentAsWindow,
                                       GetName(), -1,
                                       GetPosition(), GetSize(),
-                                      GetStyle(wxT("style"),
-                                               wxTAB_TRAVERSAL | wxNO_BORDER));
+                                      GetStyle(wxT("style")));
     SetupWindow(panel);
     return panel;
 }