Change EnsureVisble() to including column parameter, implemented it for wxGTK

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index d7811f9513387a7cb6f68a71e158da67d8c98a8b..6a8ede95ba766a598266ef4fc77a6e55f481bb09 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -484,7 +484,8 @@ public:
     virtual void SelectAll() = 0;
     virtual void UnselectAll() = 0;
 
-    virtual void EnsureVisible( const wxDataViewItem & item ) = 0;
+    virtual void EnsureVisible( const wxDataViewItem & item,
+                                wxDataViewColumn *column = NULL ) = 0;
 
 protected:
     virtual void DoSetExpanderColumn() = 0 ;

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 6d28f1c6c01c7be796503b900ffdb54096b2d4a7..083d4b1cfb1478ccea9c3a45c563a798e21b1ec7 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -371,7 +371,7 @@ public:
     virtual void UnselectAll();
 
     virtual void EnsureVisible( int row );
-    virtual void EnsureVisible( const wxDataViewItem & item );
+    virtual void EnsureVisible( const wxDataViewItem & item, wxDataViewColumn *column = NULL );
 
     virtual wxDataViewItem GetItemByRow( unsigned int row ) const;
     virtual int GetRowByItem( const wxDataViewItem & item ) const;

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 82b5e001a7c83545a245db648ba9442e73156e2b..d98ec0fb1063dc9c1a406ac2bee7c0e27138875c 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -315,7 +315,7 @@ public:
     virtual void SelectAll();
     virtual void UnselectAll();
 
-    virtual void EnsureVisible( const wxDataViewItem & item );
+    virtual void EnsureVisible( const wxDataViewItem & item, wxDataViewColumn *column = NULL );
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 2fb1c5b35ae2075bcce4fc1a4d68e4db1fd522ff..0f609572ed50d7a28fa4f08e0e9b02a27ef1a1f4 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3622,7 +3622,7 @@ void wxDataViewCtrl::EnsureVisible( int row )
     m_clientArea->ScrollTo( row );
 }
 
-void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item )
+void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, wxDataViewColumn *column )
 {
     int row = m_clientArea->GetRowByItem(item);
     if( row >= 0 )

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index dd8038be46b23da2804121ec789145d74950861c..a56518a0b96878a1319e77e5500f83faf5942364 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -3033,8 +3033,13 @@ void wxDataViewCtrl::UnselectAll()
 {
 }
 
-void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item )
+void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, wxDataViewColumn *column )
 {
+    GtkTreeIter iter;
+    iter.user_data = (gpointer) item.GetID();
+    GtkTreePath *path = m_internal->get_path( &iter );
+    gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 );
+    gtk_tree_path_free( path );
 }
 
 void wxDataViewCtrl::DoSetExpanderColumn()