diff --git a/docs/latex/wx/category.tex b/docs/latex/wx/category.tex
index 2ddfbdd27f..ae4ec05096 100644
--- a/docs/latex/wx/category.tex
+++ b/docs/latex/wx/category.tex
@@ -117,6 +117,8 @@ These are the classes relevant to the sizer-based layout.
 
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\helpref{wxSizer}{wxsizer}}{Abstract base class}
+\twocolitem{\helpref{wxGridSizer}{wxgridsizer}}{A sizer for laying out windows in a grid with all fields having the same size}
+\twocolitem{\helpref{wxFlexGridSizer}{wxflexgridsizer}}{A sizer for laying out windows in a flexible grid}
 \twocolitem{\helpref{wxBoxSizer}{wxboxsizer}}{A sizer for laying out windows in a row or column}
 \twocolitem{\helpref{wxStaticBoxSizer}{wxstaticboxsizer}}{Same as wxBoxSizer, but with surrounding static box}
 \twocolitem{\helpref{wxNotebookSizer}{wxnotebooksizer}}{Sizer to use with the wxNotebook control.}
diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index f985e23929..f28ae2bc7e 100644
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -91,6 +91,7 @@
 \input filesys.tex
 \input filesysh.tex
 \input filetype.tex
+\input flexsizr.tex
 \input fltinstr.tex
 \input fltoutst.tex
 \input focusevt.tex
@@ -107,6 +108,7 @@
 \input glcanvas.tex
 \input valgen.tex
 \input grid.tex
+\input gridsizr.tex
 \input hash.tex
 \input helpinst.tex
 \input htcell.tex
diff --git a/docs/latex/wx/flexsizr.tex b/docs/latex/wx/flexsizr.tex
new file mode 100644
index 0000000000..5587e5794d
--- /dev/null
+++ b/docs/latex/wx/flexsizr.tex
@@ -0,0 +1,25 @@
+\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 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.
+
+
diff --git a/docs/latex/wx/gridsizr.tex b/docs/latex/wx/gridsizr.tex
new file mode 100644
index 0000000000..796420a2d4
--- /dev/null
+++ b/docs/latex/wx/gridsizr.tex
@@ -0,0 +1,25 @@
+\section{\class{wxGridSizer}}\label{wxgridsizer}
+
+A grid sizer is a sizer which lays out its children in a two-
+dimensional table with all table fields having the same size,
+i.e. the width of each field is the width of the widest child,
+the height of each field is the height of the tallest child.
+
+\wxheading{Derived from}
+
+\helpref{wxSizer}{wxsizer}\\
+\helpref{wxObject}{wxobject}
+
+\membersection{wxGridSizer::wxGridSizer}\label{wxgridsizerwxgridsizer}
+
+\func{}{wxGridSizer}{\param{int }{rows}, \param{int }{cols}, \param{int }{vgap}, \param{int }{hgap}}
+
+\func{}{wxGridSizer}{\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 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.
+
+
diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index 5c72baf080..e5296ea8eb 100644
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -29,7 +29,7 @@ handler with \helpref{wxImage::AddHandler}{wximageaddhandler} or
 \twocolitem{{\bf \indexit{wxGIFHandler}}}{Only for loading, due to legal issues.}
 \twocolitem{{\bf \indexit{wxPCXHandler}}}{For loading and saving (see below).}
 \twocolitem{{\bf \indexit{wxPNMHandler}}}{For loading and saving (see below).}
-\twocolitem{{\bf \indexit{wxTIFFHandler}}}{For loading and saving.}
+\twocolitem{{\bf \indexit{wxTIFFHandler}}}{For loading.}
 \end{twocollist}
 
 When saving in PCX format, {\bf wxPCXHandler} will count the number of
@@ -74,6 +74,13 @@ and forth without loss in that respect.
 
 Creates an image with the given width and height.
 
+\func{}{wxImage}{\param{int}{ width}, \param{int}{ height}, \param{unsigned char*}{ data}, \param{bool}{ static_data=FALSE}}
+
+Creates an image from given data with the given width and height. If 
+{\it static_data} is TRUE, then wxImage will not delete the actual
+image data in its destructor, otherwise it will free it by calling
+{\it free()}.
+
 \func{}{wxImage}{\param{const wxString\& }{name}, \param{long}{ type = wxBITMAP\_TYPE\_ANY}}
 
 \func{}{wxImage}{\param{const wxString\& }{name}, \param{const wxString\&}{ mimetype}}
@@ -458,7 +465,6 @@ Saves a image in the given stream.
 \twocolitem{{\bf wxBITMAP\_TYPE\_PNG}}{Save a PNG image file.}
 \twocolitem{{\bf wxBITMAP\_TYPE\_PCX}}{Save a PCX image file (tries to save as 8-bit if possible, falls back to 24-bit otherwise).}
 \twocolitem{{\bf wxBITMAP\_TYPE\_PNM}}{Save a PNM image file (as raw RGB always).}
-\twocolitem{{\bf wxBITMAP\_TYPE\_TIF}}{Save a TIFF image file.}
 \end{twocollist}}
 
 \docparam{mimetype}{MIME type.}