adding 10.4 build compatibility for osx cocoa, see #10361

[wxWidgets.git] / include / wx / gtk / dataview.h

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 862dfb2ec33b57b25cae8ea630ee9fb2979c0ab7..6580aee732c0561c671ed688614f63cd44e855be 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -300,8 +300,6 @@ public:
                       wxAlignment align = wxALIGN_CENTER,
                       int flags = wxDATAVIEW_COL_RESIZABLE );
 
-    virtual ~wxDataViewColumn();
-
 
     // setters:
 
@@ -314,6 +312,7 @@ public:
 
     virtual void SetSortable( bool sortable );
     virtual void SetSortOrder( bool ascending );
+    virtual void SetAsSortKey(bool sort = true);
 
     virtual void SetResizeable( bool resizeable );
     virtual void SetHidden( bool hidden );
@@ -332,6 +331,8 @@ public:
 
     virtual bool IsSortable() const;
     virtual bool IsSortOrderAscending() const;
+    virtual bool IsSortKey() const;
+
     virtual bool IsResizeable() const;
     virtual bool IsHidden() const;
 
@@ -360,9 +361,6 @@ private:
     bool    m_isConnected;
 
     void Init(wxAlignment align, int flags, int width);
-
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 
 WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
@@ -431,6 +429,8 @@ public:
     virtual void Expand( const wxDataViewItem & item );
     virtual void Collapse( const wxDataViewItem & item );
 
+    virtual bool IsExpanded( const wxDataViewItem & item ) const;
+
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);