no tabs please\!

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index b5f06659551fd8c880b0037d09f3644f3e747895..a9b4295653beb9cc277585d76fcae6db840cb55c 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sizer.h
-// Purpose:     provide wxSizer class for layouting
+// Purpose:     provide wxSizer class for layout
 // Author:      Robert Roebling and Robin Dunn
 // Modified by: Ron Lee
 // Created:
 // RCS-ID:      $Id$
-// Copyright:   (c) Robin Dunn, Dirk Holtwick and Robert Roebling
-//              (c) 2003, Ron Lee
+// Copyright:   (c) Robin Dunn, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -153,7 +152,7 @@ protected:
     wxObject    *m_userData;
 
 private:
-    DECLARE_CLASS(wxSizerItem);
+    DECLARE_CLASS(wxSizerItem)
     DECLARE_NO_COPY_CLASS(wxSizerItem)
 };
 
@@ -326,7 +325,7 @@ protected:
     virtual bool DoSetItemMinSize( size_t index, int width, int height );
 
 private:
-    DECLARE_CLASS(wxSizer);
+    DECLARE_CLASS(wxSizer)
 };
 
 //---------------------------------------------------------------------------
@@ -363,7 +362,7 @@ protected:
     void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
 
 private:
-    DECLARE_CLASS(wxGridSizer);
+    DECLARE_CLASS(wxGridSizer)
 };
 
 //---------------------------------------------------------------------------
@@ -395,9 +394,9 @@ public:
 
     // set the rows/columns which will grow (the others will remain of the
     // constant initial size)
-    void AddGrowableRow( size_t idx );
+    void AddGrowableRow( size_t idx, int proportion = 0 );
     void RemoveGrowableRow( size_t idx );
-    void AddGrowableCol( size_t idx );
+    void AddGrowableCol( size_t idx, int proportion = 0 );
     void RemoveGrowableCol( size_t idx );
 
 
@@ -427,13 +426,17 @@ protected:
     wxArrayInt  m_growableRows,
                 m_growableCols;
 
+    // proportion values of the corresponding growable rows and columns
+    wxArrayInt  m_growableRowsProportions,
+                m_growableColsProportions;
+
     // parameters describing whether the growable cells should be resized in
     // both directions or only one
     int m_flexDirection;
     wxFlexSizerGrowMode m_growMode;
 
 private:
-    DECLARE_CLASS(wxFlexGridSizer);
+    DECLARE_CLASS(wxFlexGridSizer)
     DECLARE_NO_COPY_CLASS(wxFlexGridSizer)
 };
 
@@ -464,7 +467,7 @@ protected:
     int m_fixedHeight;
 
 private:
-    DECLARE_CLASS(wxBoxSizer);
+    DECLARE_CLASS(wxBoxSizer)
 };
 
 //---------------------------------------------------------------------------
@@ -490,7 +493,7 @@ protected:
     wxStaticBox   *m_staticBox;
 
 private:
-    DECLARE_CLASS(wxStaticBoxSizer);
+    DECLARE_CLASS(wxStaticBoxSizer)
     DECLARE_NO_COPY_CLASS(wxStaticBoxSizer)
 };
 
@@ -519,7 +522,7 @@ protected:
     wxNotebook   *m_notebook;
 
 private:
-    DECLARE_CLASS(wxNotebookSizer);
+    DECLARE_CLASS(wxNotebookSizer)
     DECLARE_NO_COPY_CLASS(wxNotebookSizer)
 };