ensure that wxGrid::AutoSizeColumn/Row() never sets column/row size smaller than...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 3cd1e3307da0376d95bcda847b45df33168cdbdf..adace082480fe74899494c42ae2ef3bfb57edfb8 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -10537,6 +10537,12 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
 
     if ( column )
     {
 
     if ( column )
     {

+        // Ensure automatic width is not less than minimal width. See the
+        // comment in SetColSize() for explanation of why this isn't done
+        // in SetColSize().
+        if ( !setAsMin )
+            extentMax = wxMax(extentMax, GetColMinimalWidth(col));
+

         SetColSize( col, extentMax );
         if ( !GetBatchCount() )
         {
         SetColSize( col, extentMax );
         if ( !GetBatchCount() )
         {


@@ -10552,6 +10558,12 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
     }
     else
     {
     }
     else
     {

+        // Ensure automatic width is not less than minimal height. See the
+        // comment in SetColSize() for explanation of why this isn't done
+        // in SetRowSize().
+        if ( !setAsMin )
+            extentMax = wxMax(extentMax, GetRowMinimalHeight(row));
+

         SetRowSize(row, extentMax);
         if ( !GetBatchCount() )
         {
         SetRowSize(row, extentMax);
         if ( !GetBatchCount() )
         {