Applied patch from SF on menu command not blocked
if they are disabled but still emitted by an accelerator First attempt at adding wxSizer::Clear(). Further testing pending :-) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -232,6 +232,15 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
|
||||
m_size = size;
|
||||
}
|
||||
|
||||
void wxSizerItem::DeleteWindows()
|
||||
{
|
||||
if (m_window)
|
||||
m_window->Destroy();
|
||||
|
||||
if (m_sizer)
|
||||
m_sizer->DeleteWindows();
|
||||
}
|
||||
|
||||
bool wxSizerItem::IsWindow()
|
||||
{
|
||||
return (m_window != NULL);
|
||||
@@ -355,6 +364,25 @@ bool wxSizer::Remove( int pos )
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxSizer::Clear( bool delete_windows )
|
||||
{
|
||||
if (delete_windows)
|
||||
DeleteWindows();
|
||||
|
||||
m_children.Clear();
|
||||
}
|
||||
|
||||
void wxSizer::DeleteWindows()
|
||||
{
|
||||
wxNode *node = m_children.First();
|
||||
while (node)
|
||||
{
|
||||
wxSizerItem *item = (wxSizerItem*)node->Data();
|
||||
item->DeleteWindows();
|
||||
node = node->Next();
|
||||
}
|
||||
}
|
||||
|
||||
void wxSizer::Fit( wxWindow *window )
|
||||
{
|
||||
wxSize size;
|
||||
|
Reference in New Issue
Block a user