X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/095e0f9148b3df0daee2adc84ba5b44d8f9d06ae..6aaee6afdcde7c9e677f642303d4988a66cb9dc9:/docs/latex/wx/grid.tex?ds=sidebyside

diff --git a/docs/latex/wx/grid.tex b/docs/latex/wx/grid.tex
index b23da42266..59ffc0df30 100644
--- a/docs/latex/wx/grid.tex
+++ b/docs/latex/wx/grid.tex
@@ -2,7 +2,7 @@
 %% Name:        grid.tex
 %% Purpose:     wxGrid
 %% Author:
-%% Modified by:
+%% Modified by: Santiago Palacios
 %% Created:
 %% RCS-ID:      $Id$
 %% Copyright:   (c) wxWidgets
@@ -33,6 +33,7 @@ the previous implementation.
 \wxheading{Derived from}
 
 \helpref{wxScrolledWindow}{wxscrolledwindow}\\
+\helpref{wxPanel}{wxpanel}\\
 \helpref{wxWindow}{wxwindow}\\
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
@@ -41,6 +42,10 @@ the previous implementation.
 
 <wx/grid.h>
 
+\wxheading{Library}
+
+\helpref{wxAdv}{librarieslist}
+
 \wxheading{Window styles}
 
 There are presently no specific window styles for wxGrid.
@@ -56,8 +61,10 @@ The ...\_CMD\_... variants also take a window identifier.
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_GRID\_COL\_SIZE(func)}}{The user resized a column by dragging it. Processes a wxEVT\_GRID\_COL\_SIZE.}
+\twocolitem{{\bf EVT\_GRID\_COL\_MOVE(func)}}{The user moved a column by dragging it. Processes a wxEVT\_GRID\_COL\_MOVE.}
 \twocolitem{{\bf EVT\_GRID\_ROW\_SIZE(func)}}{The user resized a row by dragging it. Processes a wxEVT\_GRID\_ROW\_SIZE.}
 \twocolitem{{\bf EVT\_GRID\_CMD\_COL\_SIZE(func)}}{The user resized a column by dragging it; variant taking a window identifier. Processes a wxEVT\_GRID\_COL\_SIZE.}
+\twocolitem{{\bf EVT\_GRID\_CMD\_COL\_MOVE(func)}}{The user moved a column by dragging it; variant taking a window identifier. Processes a wxEVT\_GRID\_COL\_MOVE.}
 \twocolitem{{\bf EVT\_GRID\_CMD\_ROW\_SIZE(func)}}{The user resized a row by dragging it; variant taking a window identifier. Processes a wxEVT\_GRID\_ROW\_SIZE.}
 \end{twocollist}%
 
@@ -183,11 +190,11 @@ The memory requirements for this could become prohibitive if your grid is very l
 
 
 
-\membersection{wxGrid::AutoSizeColOrRow}\label{wxgridautosizecolorrow}
+\membersection{wxGrid::AutoSizeColLabelSize}\label{wxgridautosizecollabelsize}
 
-\func{void}{AutoSizeColOrRow}{\param{int }{n}, \param{bool }{setAsMin}, \param{bool }{column}}
+\func{void}{AutoSizeColLabelSize}{\param{int }{col}}
 
-Common part of AutoSizeColumn/Row() or row?
+Automatically adjusts width of the column to fit its label.
 
 
 
@@ -230,6 +237,14 @@ The memory requirements for this could become prohibitive if your grid is very l
 
 
 
+\membersection{wxGrid::AutoSizeRowLabelSize}\label{wxgridautosizerowlabelsize}
+
+\func{void}{AutoSizeRowLabelSize}{\param{int }{col}}
+
+Automatically adjusts height of the row to fit its label.
+
+
+
 \membersection{wxGrid::AutoSizeRows}\label{wxgridautosizerows}
 
 \func{void}{AutoSizeRows}{\param{bool }{setAsMin = true}}
@@ -253,11 +268,15 @@ the grid is suppressed. Each call to BeginBatch must be matched by a later call
 modification can be enclosed between BeginBatch and EndBatch calls to avoid
 screen flicker. The final EndBatch will cause the grid to be repainted.
 
+\wxheading{See also}
+
+\helpref{wxGridUpdateLocker}{wxgridupdatelocker}
+
 
 
 \membersection{wxGrid::BlockToDeviceRect}\label{wxgridblocktodevicerect}
 
-\func{wxRect}{BlockToDeviceRect}{\param{const wxGridCellCoords \& }{topLeft}, \param{const wxGridCellCoords \& }{bottomRight}}
+\constfunc{wxRect}{BlockToDeviceRect}{\param{const wxGridCellCoords \& }{topLeft}, \param{const wxGridCellCoords \& }{bottomRight}}
 
 This function returns the rectangle that encloses the block of cells
 limited by TopLeft and BottomRight cell in device coords and clipped
@@ -265,9 +284,18 @@ to the client size of the grid window.
 
 
 
+\membersection{wxGrid::CanDragColMove}\label{wxgridcandragcolmove}
+
+\constfunc{bool}{CanDragColMove}{\void}
+
+Returns true if columns can be moved by dragging with the mouse. Columns can be moved
+by dragging on their labels.
+
+
+
 \membersection{wxGrid::CanDragColSize}\label{wxgridcandragcolsize}
 
-\func{bool}{CanDragColSize}{\void}
+\constfunc{bool}{CanDragColSize}{\void}
 
 Returns true if columns can be resized by dragging with the mouse. Columns can be resized
 by dragging the edges of their labels. If grid line dragging is enabled they can also be
@@ -278,7 +306,7 @@ resized by dragging the right edge of the column in the grid cell area
 
 \membersection{wxGrid::CanDragRowSize}\label{wxgridcandragrowsize}
 
-\func{bool}{CanDragRowSize}{\void}
+\constfunc{bool}{CanDragRowSize}{\void}
 
 Returns true if rows can be resized by dragging with the mouse. Rows can be resized
 by dragging the edges of their labels. If grid line dragging is enabled they can also be
@@ -289,7 +317,7 @@ resized by dragging the lower edge of the row in the grid cell area
 
 \membersection{wxGrid::CanDragGridSize}\label{wxgridcandraggridsize}
 
-\func{bool}{CanDragGridSize}{\void}
+\constfunc{bool}{CanDragGridSize}{\void}
 
 Return true if the dragging of grid lines to resize rows and columns is enabled or false otherwise.
 
@@ -306,7 +334,7 @@ false otherwise (e.g. if the current cell is read-only).
 
 \membersection{wxGrid::CanHaveAttributes}\label{wxgridcanhaveattributes}
 
-\func{bool}{CanHaveAttributes}{\void}
+\constfunc{bool}{CanHaveAttributes}{\void}
 
 Do we have some place to store attributes in?
 
@@ -314,9 +342,9 @@ Do we have some place to store attributes in?
 
 \membersection{wxGrid::CellToRect}\label{wxgridcelltorect}
 
-\func{wxRect}{CellToRect}{\param{int }{row}, \param{int }{col}}
+\constfunc{wxRect}{CellToRect}{\param{int }{row}, \param{int }{col}}
 
-\func{wxRect}{CellToRect}{\param{const wxGridCellCoords\& }{coords}}
+\constfunc{wxRect}{CellToRect}{\param{const wxGridCellCoords\& }{coords}}
 
 Return the rectangle corresponding to the grid cell's size and position in logical
 coordinates.
@@ -391,6 +419,15 @@ Equivalent to calling EnableCellEditControl(false).
 
 
 
+\membersection{wxGrid::DisableDragColMove}\label{wxgriddisabledragcolmove}
+
+\func{void}{DisableDragColMove}{\void}
+
+Disables column moving by dragging with the mouse. Equivalent to passing false to
+\helpref{wxGrid::EnableDragColMove}{wxgridenabledragcolmove}.
+
+
+
 \membersection{wxGrid::DisableDragColSize}\label{wxgriddisabledragcolsize}
 
 \func{void}{DisableDragColSize}{\void}
@@ -435,6 +472,14 @@ Enables or disables column sizing by dragging with the mouse.
 
 
 
+\membersection{wxGrid::EnableDragColMove}\label{wxgridenabledragcolmove}
+
+\func{void}{EnableDragColMove}{\param{bool }{enable = true}}
+
+Enables or disables column moving by dragging with the mouse.
+
+
+
 \membersection{wxGrid::EnableDragGridSize}\label{wxgridenabledraggridsize}
 
 \func{void}{EnableDragGridSize}{\param{bool }{enable = true}}
@@ -488,6 +533,10 @@ EndBatch. Code that does a lot of grid modification can be enclosed between
 BeginBatch and EndBatch calls to avoid screen flicker. The final EndBatch will
 cause the grid to be repainted.
 
+\wxheading{See also}
+
+\helpref{wxGridUpdateLocker}{wxgridupdatelocker}
+
 
 
 \membersection{wxGrid::Fit}\label{wxgridfit}
@@ -508,7 +557,7 @@ Causes immediate repainting of the grid. Use this instead of the usual wxWindow:
 
 \membersection{wxGrid::GetBatchCount}\label{wxgridgetbatchcount}
 
-\func{int}{GetBatchCount}{\void}
+\constfunc{int}{GetBatchCount}{\void}
 
 Returns the number of times that \helpref{wxGrid::BeginBatch}{wxgridbeginbatch} has been called
 without (yet) matching calls to \helpref{wxGrid::EndBatch}{wxgridendbatch}. While
@@ -518,7 +567,7 @@ the grid's batch count is greater than zero the display will not be updated.
 
 \membersection{wxGrid::GetCellAlignment}\label{wxgridgetcellalignment}
 
-\func{void}{GetCellAlignment}{\param{int }{row}, \param{int }{col}, \param{int* }{horiz}, \param{int* }{vert}}
+\constfunc{void}{GetCellAlignment}{\param{int }{row}, \param{int }{col}, \param{int* }{horiz}, \param{int* }{vert}}
 
 Sets the arguments to the horizontal and vertical text alignment values for the
 grid cell at the specified location.
@@ -533,7 +582,7 @@ returns a 2-element list {\tt ( horiz, vert )}.}
 
 \membersection{wxGrid::GetCellBackgroundColour}\label{wxgridgetcellbackgroundcolour}
 
-\func{wxColour}{GetCellBackgroundColour}{\param{int }{row}, \param{int }{col}}
+\constfunc{wxColour}{GetCellBackgroundColour}{\param{int }{row}, \param{int }{col}}
 
 Returns the background colour of the cell at the specified location.
 
@@ -541,7 +590,7 @@ Returns the background colour of the cell at the specified location.
 
 \membersection{wxGrid::GetCellEditor}\label{wxgridgetcelleditor}
 
-\func{wxGridCellEditor*}{GetCellEditor}{\param{int }{row}, \param{int }{col}}
+\constfunc{wxGridCellEditor*}{GetCellEditor}{\param{int }{row}, \param{int }{col}}
 
 Returns a pointer to the editor for the cell at the specified location.
 
@@ -552,7 +601,7 @@ the \helpref{wxGrid overview}{gridoverview} for more information about cell edit
 
 \membersection{wxGrid::GetCellFont}\label{wxgridgetcellfont}
 
-\func{wxFont}{GetCellFont}{\param{int }{row}, \param{int }{col}}
+\constfunc{wxFont}{GetCellFont}{\param{int }{row}, \param{int }{col}}
 
 Returns the font for text in the grid cell at the specified location.
 
@@ -560,7 +609,7 @@ Returns the font for text in the grid cell at the specified location.
 
 \membersection{wxGrid::GetCellRenderer}\label{wxgridgetcellrenderer}
 
-\func{wxGridCellRenderer*}{GetCellRenderer}{\param{int }{row}, \param{int }{col}}
+\constfunc{wxGridCellRenderer*}{GetCellRenderer}{\param{int }{row}, \param{int }{col}}
 
 Returns a pointer to the renderer for the grid cell at the specified location.
 
@@ -571,7 +620,7 @@ the \helpref{wxGrid overview}{gridoverview} for more information about cell edit
 
 \membersection{wxGrid::GetCellTextColour}\label{wxgridgetcelltextcolour}
 
-\func{wxColour}{GetCellTextColour}{\param{int }{row}, \param{int }{col}}
+\constfunc{wxColour}{GetCellTextColour}{\param{int }{row}, \param{int }{col}}
 
 Returns the text colour for the grid cell at the specified location.
 
@@ -579,9 +628,9 @@ Returns the text colour for the grid cell at the specified location.
 
 \membersection{wxGrid::GetCellValue}\label{wxgridgetcellvalue}
 
-\func{wxString}{GetCellValue}{\param{int }{row}, \param{int }{col}}
+\constfunc{wxString}{GetCellValue}{\param{int }{row}, \param{int }{col}}
 
-\func{wxString}{GetCellValue}{\param{const wxGridCellCoords\&}{coords}}
+\constfunc{wxString}{GetCellValue}{\param{const wxGridCellCoords\&}{coords}}
 
 Returns the string contained in the cell at the specified location. For simple applications where a
 grid object automatically uses a default grid table of string values you use this function together
@@ -596,6 +645,13 @@ and the \helpref{wxGrid overview}{gridoverview} for more information.
 
 
 
+\membersection{wxGrid::GetColAt}\label{wxgridgetcolat}
+
+\constfunc{int}{GetColAt}{\param{int }{colPos}}
+
+Returns the column ID of the specified column position.
+
+
 \membersection{wxGrid::GetColLeft}\label{wxgridgetcolleft}
 
 \constfunc{int}{GetColLeft}{\param{int }{col}}
@@ -604,7 +660,7 @@ and the \helpref{wxGrid overview}{gridoverview} for more information.
 
 \membersection{wxGrid::GetColLabelAlignment}\label{wxgridgetcollabelalignment}
 
-\func{void}{GetColLabelAlignment}{\param{int* }{horiz}, \param{int* }{vert}}
+\constfunc{void}{GetColLabelAlignment}{\param{int* }{horiz}, \param{int* }{vert}}
 
 Sets the arguments to the current column label alignment values.
 
@@ -618,7 +674,7 @@ returns a 2-element list {\tt ( horiz, vert )}.}
 
 \membersection{wxGrid::GetColLabelSize}\label{wxgridgetcollabelsize}
 
-\func{int}{GetColLabelSize}{\void}
+\constfunc{int}{GetColLabelSize}{\void}
 
 Returns the current height of the column labels.
 
@@ -626,7 +682,7 @@ Returns the current height of the column labels.
 
 \membersection{wxGrid::GetColLabelValue}\label{wxgridgetcollabelvalue}
 
-\func{wxString}{GetColLabelValue}{\param{int }{col}}
+\constfunc{wxString}{GetColLabelValue}{\param{int }{col}}
 
 Returns the specified column label. The default grid table class provides column labels of
 the form A,B...Z,AA,AB...ZZ,AAA... If you are using a custom grid table you can override
@@ -637,7 +693,7 @@ your own labels.
 
 \membersection{wxGrid::GetColMinimalAcceptableWidth}\label{wxgridgetcolminimalacceptablewidth}
 
-\func{int}{GetColMinimalAcceptableWidth}{}
+\constfunc{int}{GetColMinimalAcceptableWidth}{}
 
 This returns the value of the lowest column width that can be handled correctly. See
 member \helpref{SetColMinimalAcceptableWidth}{wxgridsetcolminimalacceptablewidth} for details.
@@ -652,6 +708,14 @@ Get the minimal width of the given column/row.
 
 
 
+\membersection{wxGrid::GetColPos}\label{wxgridgetcolpos}
+
+\constfunc{int}{GetColPos}{\param{int }{colID}}
+
+Returns the position of the specified column.
+
+
+
 \membersection{wxGrid::GetColRight}\label{wxgridgetcolright}
 
 \constfunc{int}{GetColRight}{\param{int }{col}}
@@ -660,7 +724,7 @@ Get the minimal width of the given column/row.
 
 \membersection{wxGrid::GetColSize}\label{wxgridgetcolsize}
 
-\func{int}{GetColSize}{\param{int }{col}}
+\constfunc{int}{GetColSize}{\param{int }{col}}
 
 Returns the width of the specified column.
 
@@ -668,7 +732,7 @@ Returns the width of the specified column.
 
 \membersection{wxGrid::GetDefaultCellAlignment}\label{wxgridgetdefaultcellalignment}
 
-\func{void}{GetDefaultCellAlignment}{\param{int* }{horiz}, \param{int* }{vert}}
+\constfunc{void}{GetDefaultCellAlignment}{\param{int* }{horiz}, \param{int* }{vert}}
 
 Sets the arguments to the current default horizontal and vertical text alignment
 values.
@@ -680,7 +744,7 @@ Vertical alignment will be one of wxALIGN\_TOP, wxALIGN\_CENTRE or wxALIGN\_BOTT
 
 \membersection{wxGrid::GetDefaultCellBackgroundColour}\label{wxgridgetdefaultcellbackgroundcolour}
 
-\func{wxColour}{GetDefaultCellBackgroundColour}{\void}
+\constfunc{wxColour}{GetDefaultCellBackgroundColour}{\void}
 
 Returns the current default background colour for grid cells.
 
@@ -688,7 +752,7 @@ Returns the current default background colour for grid cells.
 
 \membersection{wxGrid::GetDefaultCellFont}\label{wxgridgetdefaultcellfont}
 
-\func{wxFont}{GetDefaultCellFont}{\void}
+\constfunc{wxFont}{GetDefaultCellFont}{\void}
 
 Returns the current default font for grid cell text.
 
@@ -696,7 +760,7 @@ Returns the current default font for grid cell text.
 
 \membersection{wxGrid::GetDefaultCellTextColour}\label{wxgridgetdefaultcelltextcolour}
 
-\func{wxColour}{GetDefaultCellTextColour}{\void}
+\constfunc{wxColour}{GetDefaultCellTextColour}{\void}
 
 Returns the current default colour for grid cell text.
 
@@ -704,7 +768,7 @@ Returns the current default colour for grid cell text.
 
 \membersection{wxGrid::GetDefaultColLabelSize}\label{wxgridgetdefaultcollabelsize}
 
-\func{int}{GetDefaultColLabelSize}{\void}
+\constfunc{int}{GetDefaultColLabelSize}{\void}
 
 Returns the default height for column labels.
 
@@ -712,7 +776,7 @@ Returns the default height for column labels.
 
 \membersection{wxGrid::GetDefaultColSize}\label{wxgridgetdefaultcolsize}
 
-\func{int}{GetDefaultColSize}{\void}
+\constfunc{int}{GetDefaultColSize}{\void}
 
 Returns the current default width for grid columns.
 
@@ -768,7 +832,7 @@ the \helpref{wxGrid overview}{gridoverview} for more information about cell edit
 
 \membersection{wxGrid::GetDefaultRowLabelSize}\label{wxgridgetdefaultrowlabelsize}
 
-\func{int}{GetDefaultRowLabelSize}{\void}
+\constfunc{int}{GetDefaultRowLabelSize}{\void}
 
 Returns the default width for the row labels.
 
@@ -776,7 +840,7 @@ Returns the default width for the row labels.
 
 \membersection{wxGrid::GetDefaultRowSize}\label{wxgridgetdefaultrowsize}
 
-\func{int}{GetDefaultRowSize}{\void}
+\constfunc{int}{GetDefaultRowSize}{\void}
 
 Returns the current default height for grid rows.
 
@@ -784,7 +848,7 @@ Returns the current default height for grid rows.
 
 \membersection{wxGrid::GetGridCursorCol}\label{wxgridgetgridcursorcol}
 
-\func{int}{GetGridCursorCol}{\void}
+\constfunc{int}{GetGridCursorCol}{\void}
 
 Returns the current grid cell column position.
 
@@ -792,7 +856,7 @@ Returns the current grid cell column position.
 
 \membersection{wxGrid::GetGridCursorRow}\label{wxgridgetgridcursorrow}
 
-\func{int}{GetGridCursorRow}{\void}
+\constfunc{int}{GetGridCursorRow}{\void}
 
 Returns the current grid cell row position.
 
@@ -800,15 +864,71 @@ Returns the current grid cell row position.
 
 \membersection{wxGrid::GetGridLineColour}\label{wxgridgetgridlinecolour}
 
-\func{wxColour}{GetGridLineColour}{\void}
+\constfunc{wxColour}{GetGridLineColour}{\void}
 
 Returns the colour used for grid lines.
 
+\wxheading{See also}
+
+\helpref{GetDefaultGridLinePen()}{wxgridgetdefaultgridlinepen}
+
+
+\membersection{wxGrid::GetDefaultGridLinePen}\label{wxgridgetdefaultgridlinepen}
+
+\func{wxPen}{GetDefaultGridLinePen}{\void}
+
+Returns the pen used for grid lines. This virtual function may be overridden in
+derived classes in order to change the appearance of grid lines. Note that
+currently the pen width must be $1$.
+
+\wxheading{See also}
+
+\helpref{GetColGridLinePen()}{wxgridgetcolgridlinepen},\\
+\helpref{GetRowGridLinePen()}{wxgridgetrowgridlinepen}
+
+
+
+
+\membersection{wxGrid::GetRowGridLinePen}\label{wxgridgetrowgridlinepen}
+
+\func{wxPen}{GetRowGridLinePen}{\param{int }{row}}
+
+Returns the pen used for horizontal grid lines. This virtual function may be
+overridden in derived classes in order to change the appearance of individual
+grid line for the given row \arg{row}.
+
+Example: \\
+\\
+\begin{verbatim}
+   // in a grid displaying music notation, use a solid black pen between
+   // octaves (C0=row 127, C1=row 115 etc.)
+   wxPen MidiGrid::GetRowGridLinePen(int row)
+   {
+       if ( row%12 == 7 )
+          return wxPen(*wxBLACK, 1, wxSOLID);
+       else 
+          return GetDefaultGridLinePen();
+   }
+\end{verbatim}
+
+
+
+\membersection{wxGrid::GetColGridLinePen}\label{wxgridgetcolgridlinepen}
+
+\func{wxPen}{GetColGridLinePen}{\param{int }{col}}
+
+Returns the pen used for vertical grid lines. This virtual function may be
+overridden in derived classes in order to change the appearance of individual
+grid lines for the given column \arg{col}.
+
+See \helpref{GetRowGridLinePen()}{wxgridgetrowgridlinepen} for an example.
+
+
 
 
 \membersection{wxGrid::GridLinesEnabled}\label{wxgridgridlinesenabled}
 
-\func{bool}{GridLinesEnabled}{\void}
+\constfunc{bool}{GridLinesEnabled}{\void}
 
 Returns true if drawing of grid lines is turned on, false otherwise.
 
@@ -816,7 +936,7 @@ Returns true if drawing of grid lines is turned on, false otherwise.
 
 \membersection{wxGrid::GetLabelBackgroundColour}\label{wxgridgetlabelbackgroundcolour}
 
-\func{wxColour}{GetLabelBackgroundColour}{\void}
+\constfunc{wxColour}{GetLabelBackgroundColour}{\void}
 
 Returns the colour used for the background of row and column labels.
 
@@ -824,7 +944,7 @@ Returns the colour used for the background of row and column labels.
 
 \membersection{wxGrid::GetLabelFont}\label{wxgridgetlabelfont}
 
-\func{wxFont}{GetLabelFont}{\void}
+\constfunc{wxFont}{GetLabelFont}{\void}
 
 Returns the font used for row and column labels.
 
@@ -832,7 +952,7 @@ Returns the font used for row and column labels.
 
 \membersection{wxGrid::GetLabelTextColour}\label{wxgridgetlabeltextcolour}
 
-\func{wxColour}{GetLabelTextColour}{\void}
+\constfunc{wxColour}{GetLabelTextColour}{\void}
 
 Returns the colour used for row and column label text.
 
@@ -840,7 +960,7 @@ Returns the colour used for row and column label text.
 
 \membersection{wxGrid::GetNumberCols}\label{wxgridgetnumbercols}
 
-\func{int}{GetNumberCols}{\void}
+\constfunc{int}{GetNumberCols}{\void}
 
 Returns the total number of grid columns (actually the number of columns in the underlying grid
 table).
@@ -849,7 +969,7 @@ table).
 
 \membersection{wxGrid::GetNumberRows}\label{wxgridgetnumberrows}
 
-\func{int}{GetNumberRows}{\void}
+\constfunc{int}{GetNumberRows}{\void}
 
 Returns the total number of grid rows (actually the number of rows in the underlying grid table).
 
@@ -863,7 +983,7 @@ Returns the total number of grid rows (actually the number of rows in the underl
 
 \membersection{wxGrid::GetRowMinimalAcceptableHeight}\label{wxgridgetrowminimalacceptableheight}
 
-\func{int}{GetRowMinimalAcceptableHeight}{}
+\constfunc{int}{GetRowMinimalAcceptableHeight}{}
 
 This returns the value of the lowest row width that can be handled correctly. See
 member \helpref{SetRowMinimalAcceptableHeight}{wxgridsetrowminimalacceptableheight} for details.
@@ -878,7 +998,7 @@ member \helpref{SetRowMinimalAcceptableHeight}{wxgridsetrowminimalacceptableheig
 
 \membersection{wxGrid::GetRowLabelAlignment}\label{wxgridgetrowlabelalignment}
 
-\func{void}{GetRowLabelAlignment}{\param{int* }{horiz}, \param{int* }{vert}}
+\constfunc{void}{GetRowLabelAlignment}{\param{int* }{horiz}, \param{int* }{vert}}
 
 Sets the arguments to the current row label alignment values.
 
@@ -892,7 +1012,7 @@ returns a 2-element list {\tt ( horiz, vert )}.}
 
 \membersection{wxGrid::GetRowLabelSize}\label{wxgridgetrowlabelsize}
 
-\func{int}{GetRowLabelSize}{\void}
+\constfunc{int}{GetRowLabelSize}{\void}
 
 Returns the current width of the row labels.
 
@@ -900,7 +1020,7 @@ Returns the current width of the row labels.
 
 \membersection{wxGrid::GetRowLabelValue}\label{wxgridgetrowlabelvalue}
 
-\func{wxString}{GetRowLabelValue}{\param{int }{row}}
+\constfunc{wxString}{GetRowLabelValue}{\param{int }{row}}
 
 Returns the specified row label. The default grid table class provides numeric row labels.
 If you are using a custom grid table you can override
@@ -911,7 +1031,7 @@ your own labels.
 
 \membersection{wxGrid::GetRowSize}\label{wxgridgetrowsize}
 
-\func{int}{GetRowSize}{\param{int }{row}}
+\constfunc{int}{GetRowSize}{\param{int }{row}}
 
 Returns the height of the specified row.
 
@@ -1019,7 +1139,7 @@ Returns a base pointer to the current table object.
 
 \membersection{wxGrid::GetViewWidth}\label{wxgridgetviewwidth}
 
-\func{int}{GetViewWidth}{\void}
+\constfunc{int}{GetViewWidth}{\void}
 
 Returned number of whole cols visible.
 
@@ -1062,10 +1182,10 @@ used at present.
 
 The sequence of actions begins with the grid object requesting the underlying grid
 table to insert new columns. If this is successful the table notifies the grid and the
-grid updates the display. For a default grid (one where you have called 
+grid updates the display. For a default grid (one where you have called
 \helpref{wxGrid::CreateGrid}{wxgridcreategrid}) this process is automatic. If you are
 using a custom grid table (specified with \helpref{wxGrid::SetTable}{wxgridsettable})
-then you must override 
+then you must override
 \helpref{wxGridTableBase::InsertCols}{wxgridtablebaseinsertcols} in your derived
 table class.
 
@@ -1081,10 +1201,10 @@ present.
 
 The sequence of actions begins with the grid object requesting the underlying grid
 table to insert new rows. If this is successful the table notifies the grid and the
-grid updates the display. For a default grid (one where you have called 
+grid updates the display. For a default grid (one where you have called
 \helpref{wxGrid::CreateGrid}{wxgridcreategrid}) this process is automatic. If you are
 using a custom grid table (specified with \helpref{wxGrid::SetTable}{wxgridsettable})
-then you must override 
+then you must override
 \helpref{wxGridTableBase::InsertRows}{wxgridtablebaseinsertrows} in your derived
 table class.
 
@@ -1109,7 +1229,7 @@ Returns true if the current cell has been set to read-only
 
 \membersection{wxGrid::IsEditable}\label{wxgridiseditable}
 
-\func{bool}{IsEditable}{\void}
+\constfunc{bool}{IsEditable}{\void}
 
 Returns false if the whole grid has been set as read-only or true otherwise.
 See \helpref{wxGrid::EnableEditing}{wxgridenableediting} for more information about
@@ -1138,7 +1258,7 @@ See also \helpref{wxGrid::IsReadOnly}{wxgridisreadonly}.
 
 \membersection{wxGrid::IsSelection}\label{wxgridisselection}
 
-\func{bool}{IsSelection}{\void}
+\constfunc{bool}{IsSelection}{\void}
 
 Returns true if there are currently rows, columns or blocks of cells selected.
 
@@ -1146,9 +1266,9 @@ Returns true if there are currently rows, columns or blocks of cells selected.
 
 \membersection{wxGrid::IsVisible}\label{wxgridisvisible}
 
-\func{bool}{IsVisible}{\param{int }{row}, \param{int }{col}, \param{bool }{wholeCellVisible = true}}
+\constfunc{bool}{IsVisible}{\param{int }{row}, \param{int }{col}, \param{bool }{wholeCellVisible = true}}
 
-\func{bool}{IsVisible}{\param{const wxGridCellCoords\& }{coords}, \param{bool }{wholeCellVisible = true}}
+\constfunc{bool}{IsVisible}{\param{const wxGridCellCoords\& }{coords}, \param{bool }{wholeCellVisible = true}}
 
 Returns true if a cell is either wholly visible (the default) or at least partially
 visible in the grid window.
@@ -1341,7 +1461,7 @@ deselected; if true the column will be added to the existing selection.
 
 \membersection{wxGrid::SelectionToDeviceRect}\label{wxgridselectiontodevicerect}
 
-\func{wxRect}{SelectionToDeviceRect}{\void}
+\constfunc{wxRect}{SelectionToDeviceRect}{\void}
 
 This function returns the rectangle that encloses the selected cells
 in device coords and clipped to the client size of the grid window.
@@ -1438,7 +1558,7 @@ function for those cells that contain string values.
 
 The last form is for backward compatibility only.
 
-See \helpref{wxGridTableBase::CanSetValueAs}{wxgridtablebasecangetvalueas} 
+See \helpref{wxGridTableBase::CanSetValueAs}{wxgridtablebasecangetvalueas}
 and the \helpref{wxGrid overview}{gridoverview} for more information.
 
 
@@ -1449,8 +1569,8 @@ and the \helpref{wxGrid overview}{gridoverview} for more information.
 
 Sets the cell attributes for all cells in the specified column.
 
-For more information about controlling grid cell attributes see the 
-\helpref{wxGridCellAttr}{wxgridcellattr} cell attribute class and the 
+For more information about controlling grid cell attributes see the
+\helpref{wxGridCellAttr}{wxgridcellattr} cell attribute class and the
 \helpref{wxGrid classes overview}{gridoverview}.
 
 
@@ -1507,6 +1627,9 @@ Vertical alignment should be one of wxALIGN\_TOP, wxALIGN\_CENTRE or wxALIGN\_BO
 
 Sets the height of the column labels.
 
+If \arg{height} equals to \texttt{wxGRID\_AUTOSIZE} then height is calculated automatically
+so that no label is truncated. Note that this could be slow for a large table.
+
 
 
 \membersection{wxGrid::SetColLabelValue}\label{wxgridsetcollabelvalue}
@@ -1543,6 +1666,14 @@ with sizes smaller than the value specified here.
 
 
 
+\membersection{wxGrid::SetColPos}\label{wxgridsetcolpos}
+
+\func{void}{SetColPos}{\param{int }{colID}, \param{int }{newPos}}
+
+Sets the position of the specified column.
+
+
+
 \membersection{wxGrid::SetColSize}\label{wxgridsetcolsize}
 
 \func{void}{SetColSize}{\param{int }{col}, \param{int }{width}}
@@ -1738,6 +1869,9 @@ Vertical alignment should be one of wxALIGN\_TOP, wxALIGN\_CENTRE or wxALIGN\_BO
 
 Sets the width of the row labels.
 
+If \arg{width} equals \texttt{wxGRID\_AUTOSIZE} then width is calculated automatically
+so that no label is truncated. Note that this could be slow for a large table.
+
 
 
 \membersection{wxGrid::SetRowLabelValue}\label{wxgridsetrowlabelvalue}
@@ -1877,16 +2011,21 @@ Displays the in-place cell edit control for the current cell.
 
 \membersection{wxGrid::XToCol}\label{wxgridxtocol}
 
-\func{int}{XToCol}{\param{int }{x}}
+\constfunc{int}{XToCol}{\param{int }{x}, \param{bool }{clipToMinMax = false}}
+
+\wxheading{Parameters}
+\docparam{x}{The x position to evaluate.}
+\docparam{clipToMinMax}{If true, rather than returning wxNOT\_FOUND, it returns either the first or last column depending on whether x is too far to the left or right respectively.}
 
-Returns the grid column that corresponds to the logical x coordinate. Returns 
+\wxheading{Return value}
+The grid column that corresponds to the logical x coordinate. Returns
 {\tt wxNOT\_FOUND} if there is no column at the x position.
 
 
 
 \membersection{wxGrid::XToEdgeOfCol}\label{wxgridxtoedgeofcol}
 
-\func{int}{XToEdgeOfCol}{\param{int }{x}}
+\constfunc{int}{XToEdgeOfCol}{\param{int }{x}}
 
 Returns the column whose right hand edge is close to the given logical x position.
 If no column edge is near to this position {\tt wxNOT\_FOUND} is returned.
@@ -1895,7 +2034,7 @@ If no column edge is near to this position {\tt wxNOT\_FOUND} is returned.
 
 \membersection{wxGrid::YToEdgeOfRow}\label{wxgridytoedgeofrow}
 
-\func{int}{YToEdgeOfRow}{\param{int }{y}}
+\constfunc{int}{YToEdgeOfRow}{\param{int }{y}}
 
 Returns the row whose bottom edge is close to the given logical y position.
 If no row edge is near to this position {\tt wxNOT\_FOUND} is returned.
@@ -1904,8 +2043,8 @@ If no row edge is near to this position {\tt wxNOT\_FOUND} is returned.
 
 \membersection{wxGrid::YToRow}\label{wxgridytorow}
 
-\func{int}{YToRow}{\param{int }{y}}
+\constfunc{int}{YToRow}{\param{int }{y}}
 
-Returns the grid row that corresponds to the logical y coordinate. Returns 
+Returns the grid row that corresponds to the logical y coordinate. Returns
 {\tt wxNOT\_FOUND} if there is no row at the y position.
 
