wxMessageBox off the main thread lost result code.

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

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index c60fd51170906949a7b484114ce8ec79466b1338..888f2ae8906dd05dd39b35c1aec65de56b462085 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_unkwn.cpp
+// Name:        src/xrc/xh_unkwn.cpp
 // Purpose:     XRC resource for unknown widget
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,10 +17,13 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_unkwn.h"
-#include "wx/window.h"
-#include "wx/log.h"
-#include "wx/sizer.h"
-#include "wx/panel.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/window.h"
+    #include "wx/panel.h"
+    #include "wx/sizer.h"
+#endif
 
 
 class wxUnknownControlContainer : public wxPanel
@@ -65,8 +67,7 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
 
     wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add((wxWindow*)child, 1, wxEXPAND);
-    SetSizer(sizer);
-    Layout();
+    SetSizerAndFit(sizer);
 }
 
 void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
@@ -88,7 +89,7 @@ wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
 wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
 {
     wxASSERT_MSG( m_instance == NULL,
-                  _T("'unknown' controls can't be subclassed, use wxXmlResource::AttachUnknownControl") );
+                  wxT("'unknown' controls can't be subclassed, use wxXmlResource::AttachUnknownControl") );
 
     wxPanel *panel =
         new wxUnknownControlContainer(m_parentAsWindow,