Revert "Fix expansion of the last column in macOS wxDataViewCtrl"

This reverts commit 7555d1b245 and 2a4c52a414.
This commit is contained in:
Václav Slavík
2021-08-10 19:16:56 +02:00
parent 4d62a7a08f
commit 2d302cf143

View File

@@ -2244,7 +2244,6 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
{ {
const int count = GetCount(); const int count = GetCount();
NSTableColumn *column = GetColumn(pos)->GetNativeData()->GetNativeColumnPtr(); NSTableColumn *column = GetColumn(pos)->GetNativeData()->GetNativeColumnPtr();
UInt32 const noOfColumns = [[m_OutlineView tableColumns] count];
class MaxWidthCalculator class MaxWidthCalculator
{ {
@@ -2375,9 +2374,6 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
if ( m_expanderWidth == 0 ) if ( m_expanderWidth == 0 )
m_expanderWidth = calculator.GetExpanderWidth(); 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) ) if ( !(GetDataViewCtrl()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) )