merged 2.2 branch

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

docs/latex/wx/flexsizr.tex

@@ -0,0 +1,24 @@
+\section{\class{wxFlexGridSizer}}\label{wxflexgridsizer}
+
+A flex grid sizer is a sizer which lays out its children in a two-dimensional
+table with all table fields in one row having the same 
+height and all fields in one column having the same width.
+
+\wxheading{Derived from}
+
+\helpref{wxGridSizer}{wxsizer}\\
+\helpref{wxSizer}{wxsizer}\\
+\helpref{wxObject}{wxobject}
+
+\membersection{wxFlexGridSizer::wxFlexGridSizer}\label{wxflexgridsizerwxflexgridsizer}
+
+\func{}{wxFlexGridSizer}{\param{int }{rows}, \param{int }{cols}, \param{int }{vgap}, \param{int }{hgap}}
+
+\func{}{wxFlexGridSizer}{\param{int }{cols}, \param{int }{vgap = 0}, \param{int }{hgap = 0}}
+
+Constructor for a wxGridSizer. {\it rows} and {\it cols} determine the number of
+columns and rows in the sizer - if either of the parameters is zero, it will be
+calculated to form the total number of children in the sizer, thus making the
+sizer grow dynamically. {\it vgap} and {\it hgap} define extra space between
+all children.
+