X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c451707f33826347b2cebdb6640b2ef4ce8398c..6a205442c40cd6e22efab15fd7170a0aeab99cae:/contrib/src/xrc/xh_unkwn.cpp?ds=inline

diff --git a/contrib/src/xrc/xh_unkwn.cpp b/contrib/src/xrc/xh_unkwn.cpp
index 4d6e65263d..4ff1733125 100644
--- a/contrib/src/xrc/xh_unkwn.cpp
+++ b/contrib/src/xrc/xh_unkwn.cpp
@@ -33,8 +33,11 @@ public:
                               const wxString& controlName,
                               wxWindowID id = -1,
                               const wxPoint& pos = wxDefaultPosition,
-                              const wxSize& size = wxDefaultSize)
-        : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
+                              const wxSize& size = wxDefaultSize,
+                              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)
     {
@@ -77,9 +80,12 @@ void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
 }
 
 
+IMPLEMENT_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler, wxXmlResourceHandler)
+
 wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
 : wxXmlResourceHandler()
 {
+    XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
 }
 
 wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
@@ -87,7 +93,8 @@ wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
     wxPanel *panel =
         new wxUnknownControlContainer(m_parentAsWindow,
                                       GetName(), -1,
-                                      GetPosition(), GetSize());
+                                      GetPosition(), GetSize(),
+                                      GetStyle(wxT("style")));
     SetupWindow(panel);
     return panel;
 }