synchronize GTK2 minimum version in docs

[wxWidgets.git] / include / wx / gbsizer.h

diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h
index 8d3c74adf4fd8a2b9521f695269b15e96b560c68..9ee4d4863549f38512bce265a454638b82f1d98f 100644 (file)
--- a/include/wx/gbsizer.h
+++ b/include/wx/gbsizer.h
@@ -115,26 +115,26 @@ public:
     wxGBSizerItem( int width,
                    int height,
                    const wxGBPosition& pos,
     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,
 
     // 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,
 
     // 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();
 
     // default ctor
     wxGBSizerItem();


@@ -160,7 +160,7 @@ public:
     // is successful and after the next Layout the item will be resized.
     bool SetSpan( const wxGBSpan& span );
 
     // is successful and after the next Layout the item will be resized.
     bool SetSpan( const wxGBSpan& span );
 

-    // Returns true if this item and the other item instersect
+    // Returns true if this item and the other item intersect

     bool Intersects(const wxGBSizerItem& other);
 
     // Returns true if the given pos/span would intersect with this item.
     bool Intersects(const wxGBSizerItem& other);
 
     // Returns true if the given pos/span would intersect with this item.