From 2d302cf1430fe5531d585b7cb319395f25aec37a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vaclav@slavik.io>
Date: Tue, 10 Aug 2021 19:16:56 +0200
Subject: [PATCH] Revert "Fix expansion of the last column in macOS
 wxDataViewCtrl"

This reverts commit 7555d1b2459949c128d6ee3a473669a1a134f124 and 2a4c52a41472f7a3659727037ff56158e7294f04.
---
 src/osx/cocoa/dataview.mm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 534553022f..3928f700f1 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -2244,7 +2244,6 @@ 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
     {
@@ -2375,10 +2374,7 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
     if ( m_expanderWidth == 0 )
         m_expanderWidth = calculator.GetExpanderWidth();
 
-    if ( pos == noOfColumns - 1 )
-        [m_OutlineView sizeLastColumnToFit];
-    else
-        [column setWidth:calculator.GetMaxWidth() + m_expanderWidth];
+    [column setWidth:calculator.GetMaxWidth() + m_expanderWidth];
 
     if ( !(GetDataViewCtrl()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) )
     {