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
This commit is contained in:
@@ -43,6 +43,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual void AddChild(wxWindowBase *child);
|
virtual void AddChild(wxWindowBase *child);
|
||||||
|
virtual void RemoveChild(wxWindowBase *child);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxString m_controlName;
|
wxString m_controlName;
|
||||||
@@ -68,7 +69,12 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
|
|||||||
Layout();
|
Layout();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
|
||||||
|
{
|
||||||
|
wxPanel::RemoveChild(child);
|
||||||
|
m_controlAdded = FALSE;
|
||||||
|
GetSizer()->Remove((wxWindow*)child);
|
||||||
|
}
|
||||||
|
|
||||||
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
|
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
|
||||||
: wxXmlResourceHandler()
|
: wxXmlResourceHandler()
|
||||||
|
@@ -43,6 +43,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual void AddChild(wxWindowBase *child);
|
virtual void AddChild(wxWindowBase *child);
|
||||||
|
virtual void RemoveChild(wxWindowBase *child);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxString m_controlName;
|
wxString m_controlName;
|
||||||
@@ -68,7 +69,12 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
|
|||||||
Layout();
|
Layout();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
|
||||||
|
{
|
||||||
|
wxPanel::RemoveChild(child);
|
||||||
|
m_controlAdded = FALSE;
|
||||||
|
GetSizer()->Remove((wxWindow*)child);
|
||||||
|
}
|
||||||
|
|
||||||
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
|
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
|
||||||
: wxXmlResourceHandler()
|
: wxXmlResourceHandler()
|
||||||
|
Reference in New Issue
Block a user