From 5732efaa913d25a9393aecb1318c1055b4365f9d Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 9 Jul 2007 12:32:59 +0000 Subject: [PATCH] Add compare function to wxDataViewModel git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dataview.h | 11 +++++++++-- src/common/datavcmn.cpp | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/wx/dataview.h b/include/wx/dataview.h index cbd328de61..0a6a5a8f54 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -83,12 +83,15 @@ private: wxUint32 m_id; }; -bool operator == ( const wxDataViewItem & left, const wxDataViewItem & right ); +bool operator == ( const wxDataViewItem& left, const wxDataViewItem& right ); // --------------------------------------------------------- // wxDataViewModel // --------------------------------------------------------- +typedef int (wxCALLBACK *wxDataViewModelCompare) + (const wxDataViewItem& item1, const wxDataViewItem& item2, unsigned int col, unsigned int option ); + class WXDLLIMPEXP_ADV wxDataViewModel: public wxObjectRefData { public: @@ -125,11 +128,15 @@ public: void AddNotifier( wxDataViewModelNotifier *notifier ); void RemoveNotifier( wxDataViewModelNotifier *notifier ); + void SetCompareFunction( wxDataViewModelCompare func ) { m_cmpFunc = func; } + wxDataViewModelCompare GetCompareFunction() { return m_cmpFunc; } + protected: // the user should not delete this class directly: he should use DecRef() instead! virtual ~wxDataViewModel() { } - wxList m_notifiers; + wxList m_notifiers; + wxDataViewModelCompare m_cmpFunc; }; // --------------------------------------------------------- diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 75aa10454b..684c4bea29 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -33,6 +33,7 @@ const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); wxDataViewModel::wxDataViewModel() { m_notifiers.DeleteContents( true ); + m_cmpFunc = NULL; } bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) -- 2.47.2