Implement for selection code.

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 33001f1f838dfecf157f1946ae789f8c5f6d370f..acef40fa2ebcc09b7e639d0483cf70e7521fbefc 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -329,6 +329,9 @@ private:
     
     virtual void OnInternalIdle();
     
     
     virtual void OnInternalIdle();
     

+    void GtkEnableSelectionEvents();
+    void GtkDisableSelectionEvents();
+    

 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 98a173db122637a3f8ff58175c644bba66aeafe7..da6f6a7fa55e33c35c6f176978ad3965ffdae0b3 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -2060,9 +2060,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
 
     PostCreation(size);
 

-    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
-    g_signal_connect_after (selection, "changed",
-                            G_CALLBACK (wxdataview_selection_changed_callback), this);
+    GtkEnableSelectionEvents();
+

     g_signal_connect_after (m_treeview, "row_activated",
                             G_CALLBACK (wxdataview_row_activated_callback), this);
 
     g_signal_connect_after (m_treeview, "row_activated",
                             G_CALLBACK (wxdataview_row_activated_callback), this);
 


@@ -2112,8 +2111,24 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     return true;
 }
 
     return true;
 }
 

+void wxDataViewCtrl::GtkDisableSelectionEvents()
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    g_signal_connect_after (selection, "changed",
+                            G_CALLBACK (wxdataview_selection_changed_callback), this);
+}
+
+void wxDataViewCtrl::GtkEnableSelectionEvents()
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    g_signal_handlers_disconnect_by_func( selection, 
+                            (gpointer) (wxdataview_selection_changed_callback), this);
+}
+

 void wxDataViewCtrl::SetSelection( int row )
 {
 void wxDataViewCtrl::SetSelection( int row )
 {

+    GtkDisableSelectionEvents();
+

     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     if (row < 0)
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     if (row < 0)


@@ -2129,10 +2144,14 @@ void wxDataViewCtrl::SetSelection( int row )
 
         gtk_tree_path_free( path );
     }
 
         gtk_tree_path_free( path );
     }

+    
+    GtkEnableSelectionEvents();

 }
 
 void wxDataViewCtrl::Unselect( unsigned int row )
 {
 }
 
 void wxDataViewCtrl::Unselect( unsigned int row )
 {

+    GtkDisableSelectionEvents();
+    

     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     GtkTreePath *path = gtk_tree_path_new ();
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     GtkTreePath *path = gtk_tree_path_new ();


@@ -2141,14 +2160,54 @@ void wxDataViewCtrl::Unselect( unsigned int row )
     gtk_tree_selection_unselect_path( selection, path );
 
     gtk_tree_path_free( path );
     gtk_tree_selection_unselect_path( selection, path );
 
     gtk_tree_path_free( path );

+    
+    GtkEnableSelectionEvents();

 }
 
 void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to )
 {
 }
 
 void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to )
 {

+    GtkDisableSelectionEvents();
+    
+    if (from > to)
+    {
+        unsigned int tmp = from;
+        from = to;
+        to = tmp;
+    }
+    
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    
+    GtkTreePath *path_from = gtk_tree_path_new ();
+    gtk_tree_path_append_index( path_from, from );
+    GtkTreePath *path_to = gtk_tree_path_new ();
+    gtk_tree_path_append_index( path_to, to );
+    
+    gtk_tree_selection_select_range( selection, path_from, path_to );
+    
+    gtk_tree_path_free( path_to );
+    gtk_tree_path_free( path_from );
+    
+    GtkEnableSelectionEvents();

 }
 
 void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections)
 {
 }
 
 void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections)
 {

+    GtkDisableSelectionEvents();
+    
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    
+    unsigned int i;
+    for (i = 0; i < aSelections.GetCount(); i++)
+    {
+        GtkTreePath *path = gtk_tree_path_new ();
+        gtk_tree_path_append_index( path, aSelections[i] );
+
+        gtk_tree_selection_select_path( selection, path );
+
+        gtk_tree_path_free( path );
+    }
+    
+    GtkEnableSelectionEvents();

 }
 
 bool wxDataViewCtrl::IsSelected( unsigned int row ) const
 }
 
 bool wxDataViewCtrl::IsSelected( unsigned int row ) const