X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0363d3d2d959f8ad86177de9179a284206ee615..e3a50b565bb92fcd9cce062fb7d550e98451d345:/contrib/src/gizmos/multicell.cpp diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp index 05221dbe97..555bc6f659 100644 --- a/contrib/src/gizmos/multicell.cpp +++ b/contrib/src/gizmos/multicell.cpp @@ -4,7 +4,7 @@ // Author: Jonathan Bayer // Modified by: // Created: -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Jonathan Bayer // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -83,42 +83,42 @@ wxMultiCellItemHandle :: wxMultiCellItemHandle( int row, int column, wxResizable Initialize(row, column, 1, 1, wxSize(1, 1), style, weight, align); } //--------------------------------------------------------------------------- -int wxMultiCellItemHandle::GetColumn() +int wxMultiCellItemHandle::GetColumn() const { return m_column; } //--------------------------------------------------------------------------- -int wxMultiCellItemHandle::GetRow() +int wxMultiCellItemHandle::GetRow() const { return m_row; } //--------------------------------------------------------------------------- -int wxMultiCellItemHandle::GetWidth() +int wxMultiCellItemHandle::GetWidth() const { return m_width; } //--------------------------------------------------------------------------- -int wxMultiCellItemHandle::GetHeight() +int wxMultiCellItemHandle::GetHeight() const { return m_height; } //--------------------------------------------------------------------------- -wxResizable wxMultiCellItemHandle :: GetStyle() +wxResizable wxMultiCellItemHandle :: GetStyle() const { return m_style; }; //--------------------------------------------------------------------------- -wxSize wxMultiCellItemHandle :: GetLocalSize() +wxSize wxMultiCellItemHandle :: GetLocalSize() const { return m_fixedSize; }; //--------------------------------------------------------------------------- -int wxMultiCellItemHandle :: GetAlignment() +int wxMultiCellItemHandle :: GetAlignment() const { return m_alignment; }; //--------------------------------------------------------------------------- -wxSize wxMultiCellItemHandle :: GetWeight() +wxSize wxMultiCellItemHandle :: GetWeight() const { return m_weight; }; @@ -510,7 +510,7 @@ void wxMultiCellSizer :: GetMinimums() * */ -int wxMultiCellSizer :: Sum(int *array, int x) +/* static */ int wxMultiCellSizer :: Sum(int *array, int x) { int sum = 0; while (x--) @@ -651,4 +651,3 @@ void wxMultiCellCanvas :: CalculateConstraints() } /*** End of File ***/ -