AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add virtual wxSizer::DoInsert() to replace Insert().

Browse Source 
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:
Vadim Zeitlin 2010-01-23 13:44:46 +00:00
parent 7ca106e860
commit e556b61236
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/sizer.h
View File

@ -542,7 +542,11 @@ public:
int width,
int height,
const wxSizerFlags& flags);
virtual wxSizerItem* Insert( size_t index, wxSizerItem *item);
// NB: do _not_ override this function in the derived classes, this one is
// virtual for compatibility reasons only to allow old code overriding
// it to continue to work, override DoInsert() instead in the new code
virtual wxSizerItem* Insert(size_t index, wxSizerItem *item);
wxSizerItem* InsertSpacer(size_t index, int size);
wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);
@ -713,6 +717,10 @@ protected:
virtual bool DoSetItemMinSize( wxSizer *sizer, int width, int height );
virtual bool DoSetItemMinSize( size_t index, int width, int height );
// insert a new item into m_children at given index and return the item
// itself
virtual wxSizerItem* DoInsert(size_t index, wxSizerItem *item);
private:
DECLARE_CLASS(wxSizer)
};
@ -733,13 +741,6 @@ public:
wxGridSizer( int rows, int cols, int vgap, int hgap );
wxGridSizer( int rows, int cols, const wxSize& gap );
virtual wxSizerItem *Insert(size_t index, wxSizerItem *item);
#ifdef __WXOSX__
// TODO change to better condition
using wxSizer::Insert;
#endif
virtual void RecalcSizes();
virtual wxSize CalcMin();
@ -779,6 +780,8 @@ protected:
int m_vgap;
int m_hgap;
virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item);
void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
// returns the number of columns/rows needed for the current total number
@ -1271,6 +1274,12 @@ wxSizer::Insert( size_t index, int width, int height, const wxSizerFlags& flags
return Insert( index, new wxSizerItem(width, height, flags) );
}
inline wxSizerItem*
wxSizer::Insert(size_t index, wxSizerItem *item)
{
return DoInsert(index, item);
}
inline wxSizerItem*
wxSizer::InsertSpacer(size_t index, int size)
{

6
src/common/sizer.cpp
View File

@ -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