Add wxDataViewCtrl::GetColumnPosition() stubs

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

diff --git a/docs/latex/wx/dataviewctrl.tex b/docs/latex/wx/dataviewctrl.tex
index 21401d5d59186d6a666a67b7f998cbd8c9745087..09db49c0fcf4296e24712a76ad1897e29a38459d 100644 (file)
--- a/docs/latex/wx/dataviewctrl.tex
+++ b/docs/latex/wx/dataviewctrl.tex
@@ -210,19 +210,18 @@ Returns pointer to the column. {\it pos} refers to the
 position in the control which may change after reordering
 columns by the user.
 
-\membersection{wxDataViewCtrl::GetModel}\label{wxdataviewctrlgetmodel}
-
-\constfunc{virtual wxDataViewModel*}{GetModel}{\void}
-
-Returns pointer to the data model associated with the
-control (if any).
-
 \membersection{wxDataViewCtrl::GetColumnCount}\label{wxdataviewctrlgetcolumncount}
 
 \constfunc{virtual unsigned int}{GetColumnCount}{\void}
 
 Returns the number of columns.
 
+\membersection{wxDataViewCtrl::GetColumnPosition}\label{wxdataviewctrlgetcolumnposition}
+
+\constfunc{virtual int}{GetColumnPosition}{\param{const wxDataViewColumn* }{column}}
+
+Returns the position of the column or -1 if not found in the control.
+
 \membersection{wxDataViewCtrl::EnsureVisible}\label{wxdataviewctrlensurevisible}
 
 \func{void}{EnsureVisible}{\param{const wxDataViewItem \& }{item}, \param{const wxDataViewColumn* }{column = NULL}}
@@ -247,6 +246,13 @@ Returns indentation.
 
 Returns item rect.
 
+\membersection{wxDataViewCtrl::GetModel}\label{wxdataviewctrlgetmodel}
+
+\constfunc{virtual wxDataViewModel*}{GetModel}{\void}
+
+Returns pointer to the data model associated with the
+control (if any).
+
 \membersection{wxDataViewCtrl::GetSelection}\label{wxdataviewctrlgetselection}
 
 \constfunc{wxDataViewItem}{GetSelection}{\void}

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 50e8f6fd0f7bea0a68707a158ddba1200572f3aa..d00876f06c038ef856d3d5a075f5d2f7f520c8f3 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -497,6 +497,7 @@ public:
 
     virtual unsigned int GetColumnCount() const = 0;
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const = 0;
+    virtual int GetColumnPosition( const wxDataViewColumn *column ) const = 0;
     
     virtual bool DeleteColumn( wxDataViewColumn *column ) = 0;
     virtual bool ClearColumns() = 0;

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index d6ba452ae11a2389e5832b0ab6afe546cf830a61..55f0bce58b4b8b62389219b1f5f8f5ca9b996794 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -391,6 +391,7 @@ public:
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
     virtual bool DeleteColumn( wxDataViewColumn *column );
     virtual bool ClearColumns();
+    virtual int GetColumnPosition( const wxDataViewColumn *column ) const;
 
     virtual wxDataViewColumn *GetSortingColumn() const;
     

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index ba30e5176738bd99877e98edfdaf5814835f80c8..1d7f7bbac1becbe19d87ab708b9d91c3da3bfff9 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -342,6 +342,7 @@ public:
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
     virtual bool DeleteColumn( wxDataViewColumn *column );
     virtual bool ClearColumns();
+    virtual int GetColumnPosition( const wxDataViewColumn *column ) const;
 
     virtual wxDataViewColumn *GetSortingColumn() const;
 

diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h
index 554bf47d6cf3ccd0aabd3d47d554438315e2c30b..2de8f843a91e0cf6fe00a817b8d6eba914ebc1a3 100644 (file)
--- a/include/wx/mac/carbon/dataview.h
+++ b/include/wx/mac/carbon/dataview.h
@@ -530,7 +530,7 @@ public:
   virtual bool DeleteColumn(wxDataViewColumn* columnPtr);
   virtual wxDataViewColumn* GetColumn(unsigned int pos) const;
   virtual unsigned int GetColumnCount(void) const;
-
+    virtual int GetColumnPosition( const wxDataViewColumn *column ) const;
     virtual wxDataViewColumn *GetSortingColumn() const;
 
   virtual void Collapse(wxDataViewItem const& item);

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index bc17b2cb7f6f10159f77e1d53ece1c7e381832de..9f4c496bde274ae2c4896fc63d8bc034bcff1cac 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3794,6 +3794,11 @@ bool wxDataViewCtrl::ClearColumns()
     return true;
 }
 
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
+{
+    return -1;
+}
+
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 {
     return NULL;

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index e51d3e0538fc440205549fe80c290583ba6b7b36..1b908ea9f2ee3f1b3149a6f7ca75aead43b51c66 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -3112,6 +3112,11 @@ bool wxDataViewCtrl::ClearColumns()
     return true;
 }
 
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
+{
+    return -1;
+}
+
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 {
     return NULL;

diff --git a/src/mac/carbon/dataview.cpp b/src/mac/carbon/dataview.cpp
index cbcb97d5dba38391f9d3722274810515beaee175..9e475ea665705625f0d7930543b1c62a764e62e0 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 */
 
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
+{
+    return -1;
+}
+
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 {
     return NULL;