Avoid warning about unused variable in wxGetUTCTimeMillis() in wxMSW.

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

diff --git a/interface/wx/gbsizer.h b/interface/wx/gbsizer.h
index 0bfb617b25c75c369e3ac779bd0fd23e644d2322..f1604bbc9ef8fa7f504e7503a5253ed7c0a0b3d5 100644 (file)
--- a/interface/wx/gbsizer.h
+++ b/interface/wx/gbsizer.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxGBPosition
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxGBPosition
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -48,9 +48,9 @@ public:
     void SetRow(int row);
 
     /**
     void SetRow(int row);
 
     /**

-        Checks if the position is valid. An invalid position is (-1,-1).
+        Compare inequality of two wxGBPositions.

     */
     */

-    bool operator!(const wxGBPosition& p) const;
+    bool operator!=(const wxGBPosition& p) const;

 
     /**
         Compare equality of two wxGBPositions.
 
     /**
         Compare equality of two wxGBPositions.


@@ -217,7 +217,7 @@ public:
 
     The wxGBSizerItem class is used by the wxGridBagSizer for tracking the
     items in the sizer. It adds grid position and spanning information to the
 
     The wxGBSizerItem class is used by the wxGridBagSizer for tracking the
     items in the sizer. It adds grid position and spanning information to the

-    normal wxSizerItem by adding wxGBPosition and wxGBSpan attrbibutes. Most of
+    normal wxSizerItem by adding wxGBPosition and wxGBSpan attributes. Most of

     the time you will not need to use a wxGBSizerItem directly in your code,
     but there are a couple of cases where it is handy.
 
     the time you will not need to use a wxGBSizerItem directly in your code,
     but there are a couple of cases where it is handy.
 


@@ -231,20 +231,20 @@ public:
         Construct a sizer item for tracking a spacer.
     */
     wxGBSizerItem(int width, int height, const wxGBPosition& pos,
         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,
     /**
         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,
     /**
         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.
 
     /**
         Get the row and column of the endpoint of this item.


@@ -268,7 +268,7 @@ public:
     //@}
 
     /**
     //@}
 
     /**

-        Returns @true if this item and the @a other item instersect.
+        Returns @true if this item and the @a other item intersect.

     */
     bool Intersects(const wxGBSizerItem& other);
     /**
     */
     bool Intersects(const wxGBSizerItem& other);
     /**


@@ -291,6 +291,10 @@ 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);

+
+    
+    wxGridBagSizer* GetGBSizer() const;
+    void SetGBSizer(wxGridBagSizer* sizer);

 };
 
 
 };
 
 


@@ -338,9 +342,9 @@ public:
     void SetRowspan(int rowspan);
 
     /**
     void SetRowspan(int rowspan);
 
     /**

-        Checks if the span is valid. An invalid span is (-1,-1).
+        Compare inequality of two wxGBSpans.

     */
     */

-    bool operator!(const wxGBSpan& o) const;
+    bool operator!=(const wxGBSpan& o) const;

 
     /**
         Compare equality of two wxGBSpans.
 
     /**
         Compare equality of two wxGBSpans.


@@ -348,3 +352,5 @@ public:
     bool operator==(const wxGBSpan& o) const;
 };
 
     bool operator==(const wxGBSpan& o) const;
 };
 

+
+const wxGBSpan wxDefaultSpan;