Respect minimal width in wxDataViewCtrl::GetBestColumnWidth().

See #14167.

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 2eb606f6f1f72757b760ce6d582f931cc9136240..7c58d590b98837ff1ad16e38a88839f3e4bc6ed9 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -4718,6 +4718,8 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
                                   GetModel(), column->GetModelColumn(),
                                   m_clientArea->GetRowHeight());
 
                                   GetModel(), column->GetModelColumn(),
                                   m_clientArea->GetRowHeight());
 

+    calculator.UpdateWithWidth(column->GetMinWidth());
+

     if ( m_headerArea )
         calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column));
 
     if ( m_headerArea )
         calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column));