From 1e28312035a97461d1615deae8b69acd8a868457 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 5 Dec 2020 13:52:48 +0100 Subject: [PATCH] Override DoExpand() in wxQt wxDataViewCtrl stub This code doesn't work (and probably doesn't compile) anyhow, but at least try to do the right thing in it and override DoExpand() instead of adding a virtual Expand() hiding the non-virtual version in the base class. --- include/wx/qt/dataview.h | 2 +- src/qt/dataview.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/qt/dataview.h b/include/wx/qt/dataview.h index e53695fcfb..b61f803f75 100644 --- a/include/wx/qt/dataview.h +++ b/include/wx/qt/dataview.h @@ -115,7 +115,6 @@ public: virtual wxRect GetItemRect( const wxDataViewItem &item, const wxDataViewColumn *column = NULL ) const; - virtual void Expand( const wxDataViewItem & item ); virtual void Collapse( const wxDataViewItem & item ); virtual bool IsExpanded( const wxDataViewItem & item ) const; @@ -132,6 +131,7 @@ public: protected: virtual void DoSetExpanderColumn(); virtual void DoSetIndent(); + virtual void DoExpand( const wxDataViewItem & item ); private: virtual wxDataViewItem DoGetCurrentItem() const; diff --git a/src/qt/dataview.cpp b/src/qt/dataview.cpp index 1b16d555e8..ee2b5177d8 100644 --- a/src/qt/dataview.cpp +++ b/src/qt/dataview.cpp @@ -267,7 +267,7 @@ wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem &item, return wxRect(); } -void wxDataViewCtrl::Expand( const wxDataViewItem & item ) +void wxDataViewCtrl::DoExpand( const wxDataViewItem & item ) { }