Applied patch [ 867158 ] Warning free gizmos

[wxWidgets.git] / contrib / src / gizmos / multicell.cpp

diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp
index 39bd0d1548d46164d40adae0c524d5490497e4a4..d50fd58826ad425883825915e4a1a483b092eb03 100644 (file)
--- a/contrib/src/gizmos/multicell.cpp
+++ b/contrib/src/gizmos/multicell.cpp
@@ -380,12 +380,9 @@ wxSize wxMultiCellSizer::CalcMin()
        if (m_children.GetCount() == 0)
                return wxSize(10,10);
 
        if (m_children.GetCount() == 0)
                return wxSize(10,10);
 

-       int m_minWidth = 0;
-       int m_minHeight = 0;
-

        GetMinimums();
        GetMinimums();

-       m_minWidth = Sum(m_maxWidth, m_cell_count.GetWidth());
-       m_minHeight = Sum(m_maxHeight, m_cell_count.GetHeight());
+       int m_minWidth = Sum(m_maxWidth, m_cell_count.GetWidth());
+       int m_minHeight = Sum(m_maxHeight, m_cell_count.GetHeight());

        return wxSize( m_minWidth, m_minHeight );
 }
 //---------------------------------------------------------------------------
        return wxSize( m_minWidth, m_minHeight );
 }
 //---------------------------------------------------------------------------


@@ -634,9 +631,10 @@ wxMultiCellCanvas :: wxMultiCellCanvas(wxWindow *par, int numRows, int numCols)
 //---------------------------------------------------------------------------
 void wxMultiCellCanvas :: Add(wxWindow *win, unsigned int row, unsigned int col)
 {
 //---------------------------------------------------------------------------
 void wxMultiCellCanvas :: Add(wxWindow *win, unsigned int row, unsigned int col)
 {

-       wxASSERT_MSG(row >= 0 && row < m_maxRows,
+  // thanks to unsigned data row and col are always >= 0
+       wxASSERT_MSG( /* row >= 0 && */ row < m_maxRows,

                  wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) );
                  wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) );

-       wxASSERT_MSG(col >= 0 && col < m_maxCols,
+       wxASSERT_MSG( /* col >= 0 && */ col < m_maxCols,

                  wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) );
 
        wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied"));
                  wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) );
 
        wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied"));