X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/xrc/xh_unkwn.cpp diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp index a7b7beaf44..888f2ae890 100644 --- a/src/xrc/xh_unkwn.cpp +++ b/src/xrc/xh_unkwn.cpp @@ -3,7 +3,6 @@ // Purpose: XRC resource for unknown widget // Author: Vaclav Slavik // Created: 2000/09/09 -// RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,12 +20,11 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/window.h" + #include "wx/panel.h" + #include "wx/sizer.h" #endif -#include "wx/window.h" -#include "wx/sizer.h" -#include "wx/panel.h" - class wxUnknownControlContainer : public wxPanel { @@ -69,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) @@ -92,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,