From 9137f764b6d05f97589f1b6b322690eff591f1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 31 Mar 2003 22:03:28 +0000 Subject: [PATCH] XRC's unknown widget container handles removal of the widget now (backported) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xh_unkwn.cpp | 8 +++++++- src/xrc/xh_unkwn.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/contrib/src/xrc/xh_unkwn.cpp b/contrib/src/xrc/xh_unkwn.cpp index 99a514c18f..3f8247d41a 100644 --- a/contrib/src/xrc/xh_unkwn.cpp +++ b/contrib/src/xrc/xh_unkwn.cpp @@ -43,6 +43,7 @@ public: } virtual void AddChild(wxWindowBase *child); + virtual void RemoveChild(wxWindowBase *child); protected: wxString m_controlName; @@ -68,7 +69,12 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child) Layout(); } - +void wxUnknownControlContainer::RemoveChild(wxWindowBase *child) +{ + wxPanel::RemoveChild(child); + m_controlAdded = FALSE; + GetSizer()->Remove((wxWindow*)child); +} wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler() : wxXmlResourceHandler() diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp index 99a514c18f..3f8247d41a 100644 --- a/src/xrc/xh_unkwn.cpp +++ b/src/xrc/xh_unkwn.cpp @@ -43,6 +43,7 @@ public: } virtual void AddChild(wxWindowBase *child); + virtual void RemoveChild(wxWindowBase *child); protected: wxString m_controlName; @@ -68,7 +69,12 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child) Layout(); } - +void wxUnknownControlContainer::RemoveChild(wxWindowBase *child) +{ + wxPanel::RemoveChild(child); + m_controlAdded = FALSE; + GetSizer()->Remove((wxWindow*)child); +} wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler() : wxXmlResourceHandler()