From 84484a8dddb782b17e830df695732ff4df131649 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 21 Mar 2012 16:42:00 +0000 Subject: [PATCH] Avoid assert when deleting columns if there is more columns than there are column labels git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/grid.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 3d79bc7f7c..a199b556e5 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -1535,7 +1535,8 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) // the label of the first column had been set it would have only one // element and not numCols, so account for it int numRemaining = m_colLabels.size() - colID; - m_colLabels.RemoveAt( colID, wxMin(numCols, numRemaining) ); + if (numRemaining > 0) + m_colLabels.RemoveAt( colID, wxMin(numCols, numRemaining) ); } if ( numCols >= curNumCols ) -- 2.45.2