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

Use default values for some parameters of wxSizerItem and wxGBSizerItem ctors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2011-12-10 04:34:06 +00:00
parent e6d7f1efce
commit 5eb16fe200
4 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/gbsizer.h
View File

@ -115,26 +115,26 @@ public:
wxGBSizerItem( int width,
int height,
const wxGBPosition& pos,
const wxGBSpan& span,
int flag,
int border,
wxObject* userData);
const wxGBSpan& span=wxDefaultSpan,
int flag=0,
int border=0,
wxObject* userData=NULL);
// window
wxGBSizerItem( wxWindow *window,
const wxGBPosition& pos,
const wxGBSpan& span,
int flag,
int border,
wxObject* userData );
const wxGBSpan& span=wxDefaultSpan,
int flag=0,
int border=0,
wxObject* userData=NULL );
// subsizer
wxGBSizerItem( wxSizer *sizer,
const wxGBPosition& pos,
const wxGBSpan& span,
int flag,
int border,
wxObject* userData );
const wxGBSpan& span=wxDefaultSpan,
int flag=0,
int border=0,
wxObject* userData=NULL );
// default ctor
wxGBSizerItem();

24
include/wx/sizer.h
View File

@ -251,10 +251,10 @@ class WXDLLIMPEXP_CORE wxSizerItem : public wxObject
public:
// window
wxSizerItem( wxWindow *window,
int proportion,
int flag,
int border,
wxObject* userData );
int proportion=0,
int flag=0,
int border=0,
wxObject* userData=NULL );
// window with flags
wxSizerItem(wxWindow *window, const wxSizerFlags& flags)
@ -266,10 +266,10 @@ public:
// subsizer
wxSizerItem( wxSizer *sizer,
int proportion,
int flag,
int border,
wxObject* userData );
int proportion=0,
int flag=0,
int border=0,
wxObject* userData=NULL );
// sizer with flags
wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags)
@ -282,10 +282,10 @@ public:
// spacer
wxSizerItem( int width,
int height,
int proportion,
int flag,
int border,
wxObject* userData);
int proportion=0,
int flag=0,
int border=0,
wxObject* userData=NULL);
// spacer with flags
wxSizerItem(int width, int height, const wxSizerFlags& flags)

18
interface/wx/gbsizer.h
View File

@ -231,20 +231,20 @@ public:
Construct a sizer item for tracking a spacer.
*/
wxGBSizerItem(int width, int height, const wxGBPosition& pos,
const wxGBSpan& span, int flag, int border,
wxObject* userData);
const wxGBSpan& span=wxDefaultSpan, int flag=0, int border=0,
wxObject* userData=NULL);
/**
Construct a sizer item for tracking a window.
*/
wxGBSizerItem(wxWindow* window, const wxGBPosition& pos,
const wxGBSpan& span, int flag, int border,
wxObject* userData);
const wxGBSpan& span=wxDefaultSpan, int flag=0, int border=0,
wxObject* userData=NULL);
/**
Construct a sizer item for tracking a subsizer.
*/
wxGBSizerItem(wxSizer* sizer, const wxGBPosition& pos,
const wxGBSpan& span, int flag, int border,
wxObject* userData);
const wxGBSpan& span=wxDefaultSpan, int flag=0, int border=0,
wxObject* userData=NULL);
/**
Get the row and column of the endpoint of this item.
@ -291,6 +291,10 @@ public:
is successful and after the next Layout the item will be resized.
*/
bool SetSpan(const wxGBSpan& span);
wxGridBagSizer* GetGBSizer() const;
void SetGBSizer(wxGridBagSizer* sizer);
};
@ -348,3 +352,5 @@ public:
bool operator==(const wxGBSpan& o) const;
};
const wxGBSpan wxDefaultSpan;

16
interface/wx/sizer.h
View File

@ -1007,17 +1007,17 @@ public:
/**
Construct a sizer item for tracking a spacer.
*/
wxSizerItem(int width, int height, int proportion, int flag,
int border, wxObject* userData);
wxSizerItem(int width, int height, int proportion=0, int flag=0,
int border=0, wxObject* userData=NULL);
//@{
/**
Construct a sizer item for tracking a window.
*/
wxSizerItem(wxWindow* window, const wxSizerFlags& flags);
wxSizerItem(wxWindow* window, int proportion, int flag,
int border,
wxObject* userData);
wxSizerItem(wxWindow* window, int proportion=0, int flag=0,
int border=0,
wxObject* userData=NULL);
//@}
//@{
@ -1025,9 +1025,9 @@ public:
Construct a sizer item for tracking a subsizer.
*/
wxSizerItem(wxSizer* sizer, const wxSizerFlags& flags);
wxSizerItem(wxSizer* sizer, int proportion, int flag,
int border,
wxObject* userData);
wxSizerItem(wxSizer* sizer, int proportion=0, int flag=0,
int border=0,
wxObject* userData=NULL);
//@}
/**