Add wxDataViewCtrl::GetSortingColumn() stubs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/dataviewctrl.tex b/docs/latex/wx/dataviewctrl.tex
index 2aa0d92ec70122a6b8ed8ff25578e82b844b4bde..21401d5d59186d6a666a67b7f998cbd8c9745087 100644 (file)
--- a/docs/latex/wx/dataviewctrl.tex
+++ b/docs/latex/wx/dataviewctrl.tex
@@ -260,6 +260,13 @@ Returns first selected item or an invalid item if none is selected.
 Fills {\it sel} with currently selected items and returns
 their number.
 
+\membersection{wxDataViewCtrl::GetSortingColumn}\label{wxdataviewctrlgetsortingcolumn}
+
+\constfunc{virtual wxDataViewColumn*}{GetSortingColumn}{\void}
+
+Returns the wxDataViewColumn currently responsible for sorting
+or NULL if none has been selected.
+
 \membersection{wxDataViewCtrl::HitTest}\label{wxdataviewctrlhittest}
 
 \constfunc{void}{HitTest}{\param{const wxPoint\& }{point}, \param{wxDataViewItem\& }{item}, \param{wxDataViewColumn *\&}{col}}

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index d024d5e794e772789879371d75c3a5c55109b91d..50e8f6fd0f7bea0a68707a158ddba1200572f3aa 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -505,6 +505,8 @@ public:
         { m_expander_column = col ; DoSetExpanderColumn(); }
     wxDataViewColumn *GetExpanderColumn() const 
         { return m_expander_column; }
+        
+    virtual wxDataViewColumn *GetSortingColumn() const = 0;
 
     void SetIndent( int indent )
         { m_indent = indent ; DoSetIndent(); }

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index b1789509d547a6ba1bb5749e223035d414aee289..d6ba452ae11a2389e5832b0ab6afe546cf830a61 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -392,6 +392,8 @@ public:
     virtual bool DeleteColumn( wxDataViewColumn *column );
     virtual bool ClearColumns();
 
+    virtual wxDataViewColumn *GetSortingColumn() const;
+    
     virtual wxDataViewItem GetSelection() const;
     virtual int GetSelections( wxDataViewItemArray & sel ) const;
     virtual void SetSelections( const wxDataViewItemArray & sel );

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index b6d9233839aa73fd27c10e82f5df0ea565d8d8ee..ba30e5176738bd99877e98edfdaf5814835f80c8 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -343,6 +343,8 @@ public:
     virtual bool DeleteColumn( wxDataViewColumn *column );
     virtual bool ClearColumns();
 
+    virtual wxDataViewColumn *GetSortingColumn() const;
+
     virtual wxDataViewItem GetSelection() const;
     virtual int GetSelections( wxDataViewItemArray & sel ) const;
     virtual void SetSelections( const wxDataViewItemArray & sel );

diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h
index 16f0dd15728490f10da12a88431d37b13edacd3b..554bf47d6cf3ccd0aabd3d47d554438315e2c30b 100644 (file)
--- a/include/wx/mac/carbon/dataview.h
+++ b/include/wx/mac/carbon/dataview.h
@@ -531,6 +531,8 @@ public:
   virtual wxDataViewColumn* GetColumn(unsigned int pos) const;
   virtual unsigned int GetColumnCount(void) const;
 
+    virtual wxDataViewColumn *GetSortingColumn() const;
+
   virtual void Collapse(wxDataViewItem const& item);
   virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr=NULL);
   virtual void Expand(wxDataViewItem const& item);

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index fb5dd4b30a4598d1fe96f5b3665621f94c5e4182..bc17b2cb7f6f10159f77e1d53ece1c7e381832de 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3794,6 +3794,11 @@ bool wxDataViewCtrl::ClearColumns()
     return true;
 }
 
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return NULL;
+}
+
 //Selection code with wxDataViewItem as parameters
 wxDataViewItem wxDataViewCtrl::GetSelection() const
 {

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 9b7df0db61eface0cc43e518ca52afe56067a0b2..e51d3e0538fc440205549fe80c290583ba6b7b36 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1256,6 +1256,7 @@ void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
         break;
     }
 
+    // This value is most often ignored in GtkTreeView    
     GValue gvalue = { 0, };
     g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
     g_value_set_enum( &gvalue, gtkMode );
@@ -3111,6 +3112,11 @@ bool wxDataViewCtrl::ClearColumns()
     return true;
 }
 
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return NULL;
+}
+
 void wxDataViewCtrl::Expand( const wxDataViewItem & item )
 {
     GtkTreeIter iter;

diff --git a/src/mac/carbon/dataview.cpp b/src/mac/carbon/dataview.cpp
index 3088806ef0513737de54390efae9154ccc0dcebf..cbcb97d5dba38391f9d3722274810515beaee175 100644 (file)
--- a/src/mac/carbon/dataview.cpp
+++ b/src/mac/carbon/dataview.cpp
@@ -890,6 +890,11 @@ unsigned int wxDataViewCtrl::GetColumnCount(void) const
   return this->m_ColumnPointers.size();
 } /* wxDataViewCtrl::GetColumnCount(void) const */
 
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return NULL;
+}
+
 void wxDataViewCtrl::Collapse(wxDataViewItem const& item)
 {
   wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));