Add virtual wxSizer::DoInsert() to replace Insert().
This allows to avoid problems with hiding all but the overridden overloads of Insert() in wxSizer-derived classes, see #11616, without having to explicitly write any using statements. Keep Insert(size_t, wxSizerItem) virtual to allow the existing code overriding it to keep working. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -634,7 +634,7 @@ wxSizer::~wxSizer()
|
||||
WX_CLEAR_LIST(wxSizerItemList, m_children);
|
||||
}
|
||||
|
||||
wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item )
|
||||
wxSizerItem* wxSizer::DoInsert( size_t index, wxSizerItem *item )
|
||||
{
|
||||
m_children.Insert( index, item );
|
||||
|
||||
@@ -1349,7 +1349,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
|
||||
{
|
||||
}
|
||||
|
||||
wxSizerItem *wxGridSizer::Insert(size_t index, wxSizerItem *item)
|
||||
wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item)
|
||||
{
|
||||
// if only the number of columns or the number of rows is specified for a
|
||||
// sizer, arbitrarily many items can be added to it but if both of them are
|
||||
@@ -1379,7 +1379,7 @@ wxSizerItem *wxGridSizer::Insert(size_t index, wxSizerItem *item)
|
||||
}
|
||||
}
|
||||
|
||||
return wxSizer::Insert(index, item);
|
||||
return wxSizer::DoInsert(index, item);
|
||||
}
|
||||
|
||||
int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
|
||||
|
Reference in New Issue
Block a user