From 7555d1b2459949c128d6ee3a473669a1a134f124 Mon Sep 17 00:00:00 2001
From: Andreas Falkenhahn <andreas@falkenhahn.com>
Date: Tue, 26 Jan 2021 22:58:01 +0100
Subject: [PATCH] Fix expansion of the last column in macOS wxDataViewCtrl

It should always take the rest of the available space.

See #14939.
---
 src/osx/cocoa/dataview.mm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 6935f463ed..2052031dc0 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -2184,6 +2184,7 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
 {
     const int count = GetCount();
     NSTableColumn *column = GetColumn(pos)->GetNativeData()->GetNativeColumnPtr();
+    UInt32 const noOfColumns = [[m_OutlineView tableColumns] count];
 
     class MaxWidthCalculator
     {
@@ -2314,7 +2315,10 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
     if ( m_expanderWidth == 0 )
         m_expanderWidth = calculator.GetExpanderWidth();
 
-    [column setWidth:calculator.GetMaxWidth() + m_expanderWidth];
+    if ( pos == noOfColumns - 1 )
+        [m_OutlineView sizeLastColumnToFit];
+    else
+        [column setWidth:calculator.GetMaxWidth() + m_ExpanderWidth];
 
     if ( !(GetDataViewCtrl()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) )
     {