X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f80ea77b4a8bac4ab005bfc592f9cd3262ffa397..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/xrc/xh_unkwn.cpp diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp index d8b615cf6e..e399ce9205 100644 --- a/src/xrc/xh_unkwn.cpp +++ b/src/xrc/xh_unkwn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_unkwn.cpp +// Name: src/xrc/xh_unkwn.cpp // Purpose: XRC resource for unknown widget // Author: Vaclav Slavik // Created: 2000/09/09 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "xh_unkwn.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,11 +15,16 @@ #pragma hdrstop #endif +#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 @@ -67,9 +68,7 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child) wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL); sizer->Add((wxWindow*)child, 1, wxEXPAND); - SetSizer(sizer); - SetAutoLayout(true); - Layout(); + SetSizerAndFit(sizer); } void wxUnknownControlContainer::RemoveChild(wxWindowBase *child) @@ -91,7 +90,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, @@ -107,3 +106,4 @@ bool wxUnknownWidgetXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("unknown")); } +#endif // wxUSE_XRC