Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow using wxSizerFlags with wxSizer methods adding spacers too (patch 1797272)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-19 00:45:31 +00:00
parent e86882e38d
commit b701f995b1
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/sizer.h
View File

@@ -462,6 +462,7 @@ public:
wxObject* userData = NULL); wxObject* userData = NULL);
wxSizerItem* Add( wxWindow *window, const wxSizerFlags& flags); wxSizerItem* Add( wxWindow *window, const wxSizerFlags& flags);
wxSizerItem* Add( wxSizer *sizer, const wxSizerFlags& flags); wxSizerItem* Add( wxSizer *sizer, const wxSizerFlags& flags);
wxSizerItem* Add( int width, int height, const wxSizerFlags& flags);
wxSizerItem* Add( wxSizerItem *item); wxSizerItem* Add( wxSizerItem *item);
wxSizerItem* AddSpacer(int size); wxSizerItem* AddSpacer(int size);
@@ -492,6 +493,10 @@ public:
wxSizerItem* Insert(size_t index, wxSizerItem* Insert(size_t index,
wxSizer *sizer, wxSizer *sizer,
const wxSizerFlags& flags); const wxSizerFlags& flags);
wxSizerItem* Insert(size_t index,
int width,
int height,
const wxSizerFlags& flags);
virtual wxSizerItem* Insert( size_t index, wxSizerItem *item); virtual wxSizerItem* Insert( size_t index, wxSizerItem *item);
wxSizerItem* InsertSpacer(size_t index, int size); wxSizerItem* InsertSpacer(size_t index, int size);
@@ -515,6 +520,7 @@ public:
wxObject* userData = NULL); wxObject* userData = NULL);
wxSizerItem* Prepend(wxWindow *window, const wxSizerFlags& flags); wxSizerItem* Prepend(wxWindow *window, const wxSizerFlags& flags);
wxSizerItem* Prepend(wxSizer *sizer, const wxSizerFlags& flags); wxSizerItem* Prepend(wxSizer *sizer, const wxSizerFlags& flags);
wxSizerItem* Prepend(int width, int height, const wxSizerFlags& flags);
wxSizerItem* Prepend(wxSizerItem *item); wxSizerItem* Prepend(wxSizerItem *item);
wxSizerItem* PrependSpacer(int size); wxSizerItem* PrependSpacer(int size);
@@ -1006,6 +1012,12 @@ wxSizer::Add( wxSizer *sizer, const wxSizerFlags& flags )
return Add( new wxSizerItem(sizer, flags) ); return Add( new wxSizerItem(sizer, flags) );
} }
inline wxSizerItem*
wxSizer::Add( int width, int height, const wxSizerFlags& flags )
{
return Add( new wxSizerItem(width, height, flags) );
}
inline wxSizerItem* inline wxSizerItem*
wxSizer::AddSpacer(int size) wxSizer::AddSpacer(int size)
{ {
@@ -1066,6 +1078,12 @@ wxSizer::Prepend( wxSizer *sizer, const wxSizerFlags& flags )
return Prepend( new wxSizerItem(sizer, flags) ); return Prepend( new wxSizerItem(sizer, flags) );
} }
inline wxSizerItem*
wxSizer::Prepend( int width, int height, const wxSizerFlags& flags )
{
return Prepend( new wxSizerItem(width, height, flags) );
}
inline wxSizerItem* inline wxSizerItem*
wxSizer::Insert( size_t index, wxSizer::Insert( size_t index,
wxWindow *window, wxWindow *window,
@@ -1112,6 +1130,12 @@ wxSizer::Insert( size_t index, wxSizer *sizer, const wxSizerFlags& flags )
return Insert( index, new wxSizerItem(sizer, flags) ); return Insert( index, new wxSizerItem(sizer, flags) );
} }
inline wxSizerItem*
wxSizer::Insert( size_t index, int width, int height, const wxSizerFlags& flags )
{
return Insert( index, new wxSizerItem(width, height, flags) );
}
inline wxSizerItem* inline wxSizerItem*
wxSizer::InsertSpacer(size_t index, int size) wxSizer::InsertSpacer(size_t index, int size)
{ {