Use default values for some parameters of wxSizerItem and wxGBSizerItem ctors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gbsizer.h

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

include/wx/sizer.h

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

interface/wx/gbsizer.h

@@ -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,
+                  const wxGBSpan& span=wxDefaultSpan, int flag=0, int border=0,
-                  wxObject* userData);
+                  wxObject* userData=NULL);
     /**
         Construct a sizer item for tracking a window.
     */
     wxGBSizerItem(wxWindow* window, const wxGBPosition& pos,
-                  const wxGBSpan& span, int flag, int border,
+                  const wxGBSpan& span=wxDefaultSpan, int flag=0, int border=0,
-                  wxObject* userData);
+                  wxObject* userData=NULL);
     /**
         Construct a sizer item for tracking a subsizer.
     */
     wxGBSizerItem(wxSizer* sizer, const wxGBPosition& pos,
-                  const wxGBSpan& span, int flag, int border,
+                  const wxGBSpan& span=wxDefaultSpan, int flag=0, int border=0,
-                  wxObject* userData);
+                  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;

interface/wx/sizer.h

@@ -1007,17 +1007,17 @@ public:
     /**
         Construct a sizer item for tracking a spacer.
     */
-    wxSizerItem(int width, int height, int proportion, int flag,
+    wxSizerItem(int width, int height, int proportion=0, int flag=0,
-                int border, wxObject* userData);
+                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,
+    wxSizerItem(wxWindow* window, int proportion=0, int flag=0,
-                int border,
+                int border=0,
-                wxObject* userData);
+                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,
+    wxSizerItem(wxSizer* sizer, int proportion=0, int flag=0,
-                int border,
+                int border=0,
-                wxObject* userData);
+                wxObject* userData=NULL);
     //@}
 
     /**