From 9f68fe76c9dfc0a2e24aaaea2bcc1a68eeadd03a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 7 Dec 2008 21:15:20 +0000 Subject: [PATCH] define SetAsSortKey/IsSortKey() in wxMac wxDataViewColumn git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/carbon/dataview.h | 2 ++ src/osx/carbon/dataview.cpp | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/wx/osx/carbon/dataview.h b/include/wx/osx/carbon/dataview.h index 368a7045c8..19546e2a6d 100644 --- a/include/wx/osx/carbon/dataview.h +++ b/include/wx/osx/carbon/dataview.h @@ -380,6 +380,7 @@ public: virtual int GetWidth() const { return m_width; } virtual bool IsHidden() const { return false; } // TODO virtual bool IsSortOrderAscending() const { return m_ascending; } + virtual bool IsSortKey() const; virtual void SetAlignment(wxAlignment align); virtual void SetBitmap (wxBitmap const& bitmap); @@ -393,6 +394,7 @@ public: virtual void SetSortOrder (bool ascending); virtual void SetTitle (wxString const& title); virtual void SetWidth (int width); + virtual void SetAsSortKey(bool sort = true); // implementation only WXDataBrowserPropertyID GetPropertyID() const diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp index 6c71d42150..ec8ae3baef 100644 --- a/src/osx/carbon/dataview.cpp +++ b/src/osx/carbon/dataview.cpp @@ -967,6 +967,24 @@ void wxDataViewColumn::SetWidth(int width) } } +void wxDataViewColumn::SetAsSortKey(bool WXUNUSED(sort)) +{ + // see wxGTK native wxDataViewColumn implementation + wxFAIL_MSG( "not implemented" ); +} + +bool wxDataViewColumn::IsSortKey() const +{ + wxDataViewCtrl * const dataViewCtrlPtr(GetOwner()); + wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr( + dynamic_cast( + dataViewCtrlPtr->GetPeer())); + + DataBrowserPropertyID propertyID; + return macDataViewListCtrlPtr->GetSortProperty(&propertyID) == noErr && + propertyID == m_propertyID; +} + //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- -- 2.45.2