Applied [ 821234 ] Fix: erroneous assertion failed wxListBox::SetSelection

[wxWidgets.git] / src / xrc / xh_unkwn.cpp

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index 388fb040c34bd0b70dfa769a6701496dfe6c561b..cad645b68b10634d0332f95642f8602ffc75c978 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)
     {
@@ -88,12 +90,14 @@ wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
 
 wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
 {
+    wxASSERT_MSG( m_instance == NULL,
+                  _T("'unknown' controls can't be subclassed, use wxXmlResource::AttachUnknownControl") );
+
     wxPanel *panel =
         new wxUnknownControlContainer(m_parentAsWindow,
                                       GetName(), -1,
                                       GetPosition(), GetSize(),
-                                      GetStyle(wxT("style"),
-                                               wxTAB_TRAVERSAL | wxNO_BORDER));
+                                      GetStyle(wxT("style")));
     SetupWindow(panel);
     return panel;
 }