Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix wxTreeListCtrl under wxOSX"

Browse Source 
This reverts commit 28f96bdff0 as it isn't
necessary any more after the fix in the previous commit.

See #17409.
This commit is contained in:
Vadim Zeitlin
2017-12-02 23:07:46 +01:00
parent ad8d73cb15
commit 0eb456f08e
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/cocoa/dataview.h
View File

@@ -551,8 +551,6 @@ private:
wxCocoaOutlineDataSource* m_DataSource; wxCocoaOutlineDataSource* m_DataSource;
wxCocoaOutlineView* m_OutlineView; wxCocoaOutlineView* m_OutlineView;
bool m_removeIndentIfNecessary;
}; };
#endif // _WX_DATAVIEWCTRL_COCOOA_H_ #endif // _WX_DATAVIEWCTRL_COCOOA_H_

30
src/osx/cocoa/dataview.mm
View File

@@ -2033,8 +2033,7 @@ wxCocoaDataViewControl::wxCocoaDataViewControl(wxWindow* peer,
[[NSScrollView alloc] initWithFrame:wxOSXGetFrameForControl(peer,pos,size)] [[NSScrollView alloc] initWithFrame:wxOSXGetFrameForControl(peer,pos,size)]
), ),
m_DataSource(NULL), m_DataSource(NULL),
m_OutlineView([[wxCocoaOutlineView alloc] init]), m_OutlineView([[wxCocoaOutlineView alloc] init])
m_removeIndentIfNecessary(false)
{ {
// initialize scrollview (the outline view is part of a scrollview): // initialize scrollview (the outline view is part of a scrollview):
NSScrollView* scrollview = (NSScrollView*) GetWXWidget(); NSScrollView* scrollview = (NSScrollView*) GetWXWidget();
@@ -2408,11 +2407,13 @@ bool wxCocoaDataViewControl::AssociateModel(wxDataViewModel* model)
m_DataSource = NULL; m_DataSource = NULL;
[m_OutlineView setDataSource:m_DataSource]; // if there is a data source the data is immediately going to be requested [m_OutlineView setDataSource:m_DataSource]; // if there is a data source the data is immediately going to be requested
// Set this to true to check if we need to remove the indent in the next // By default, the first column is indented to leave enough place for the
// OnSize() call: we can't do it directly here because the model might not // expanders, but this looks bad if there are no expanders, so don't use
// be fully initialized yet and so might not know whether it has any items // indent in this case.
// with children or not. if ( model && model->IsListModel() )
m_removeIndentIfNecessary = true; {
DoSetIndent(0);
}
return true; return true;
} }
@@ -2577,21 +2578,6 @@ void wxCocoaDataViewControl::SetRowHeight(const wxDataViewItem& WXUNUSED(item),
void wxCocoaDataViewControl::OnSize() void wxCocoaDataViewControl::OnSize()
{ {
if ( m_removeIndentIfNecessary )
{
m_removeIndentIfNecessary = false;
const wxDataViewModel* const model = GetDataViewCtrl()->GetModel();
// By default, the first column is indented to leave enough place for the
// expanders, but this looks bad if there are no expanders, so don't use
// indent in this case.
if ( model && model->IsListModel() )
{
DoSetIndent(0);
}
}
if ([m_OutlineView numberOfColumns] == 1) if ([m_OutlineView numberOfColumns] == 1)
[m_OutlineView sizeLastColumnToFit]; [m_OutlineView sizeLastColumnToFit];
} }