remove USE_SYS_TYPES_FD_SET definition which is already present in include/wx/msw...

[wxWidgets.git] / src / common / sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index af8275b478cdfca2183da841937732ba6a3ebe2e..98990a2ee106c0e5e946cfc9f9bf0b80980d2b7b 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1328,9 +1328,12 @@ int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
     if ( m_cols && m_rows )
     {
         // if both rows and columns are specified by user, use the provided
-        // values even if we don't have enough items
+        // values even if we don't have enough items but check that we don't
+        // have too many of them as this is going to result in problems later
         ncols = m_cols;
         nrows = m_rows;
+
+        wxASSERT_MSG( ncols*nrows >= nitems, "too many items in grid sizer" );
     }
     else if ( m_cols )
     {