From 36ea7ff4d61e174a2d116819f98e66f22a7f5b8a Mon Sep 17 00:00:00 2001 From: Andreas Falkenhahn Date: Sun, 4 Apr 2021 17:32:41 +0200 Subject: [PATCH] Autosize the right columns in macOS wxDataViewCtrl This is related to 7555d1b245 (Fix expansion of the last column in macOS wxDataViewCtrl, 2021-01-26) which somehow didn't apply the patch fully, so finish applying it now. Closes #14939. --- src/osx/cocoa/dataview.mm | 2 +- src/osx/dataview_osx.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index 598d6f80e7..6c6c9952dc 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -2340,7 +2340,7 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos) if ( pos == noOfColumns - 1 ) [m_OutlineView sizeLastColumnToFit]; - else + else if ( GetColumn(pos)->GetWidthVariable() == wxCOL_WIDTH_AUTOSIZE ) [column setWidth:calculator.GetMaxWidth() + m_expanderWidth]; if ( !(GetDataViewCtrl()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) ) diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp index 40be2ea389..2860e96565 100644 --- a/src/osx/dataview_osx.cpp +++ b/src/osx/dataview_osx.cpp @@ -302,10 +302,7 @@ void wxOSXDataViewModelNotifier::AdjustAutosizedColumns() unsigned count = m_DataViewCtrlPtr->GetColumnCount(); for ( unsigned col = 0; col < count; col++ ) { - wxDataViewColumn *column = m_DataViewCtrlPtr->GetColumnPtr(col); - - if ( column->GetWidthVariable() == wxCOL_WIDTH_AUTOSIZE ) - m_DataViewCtrlPtr->GetDataViewPeer()->FitColumnWidthToContent(col); + m_DataViewCtrlPtr->GetDataViewPeer()->FitColumnWidthToContent(col); } }