Committing in .

[wxWidgets.git] / src / gtk / dataview.cpp

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 6ae875695ce5e7e9552fd21d11e778ede3bf9aeb..9ff06f25be678ce8829f5fa6565ce5d0162452f8 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -16,12 +16,15 @@
 
 #ifndef wxUSE_GENERICDATAVIEWCTRL
 
 
 #ifndef wxUSE_GENERICDATAVIEWCTRL
 

+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/dcclient.h"
+    #include "wx/sizer.h"
+#endif
+

 #include "wx/stockitem.h"
 #include "wx/stockitem.h"

-#include "wx/dcclient.h"

 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"

-#include "wx/sizer.h"
-#include "wx/log.h"

 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"


@@ -1349,17 +1352,17 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell,
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
 
     gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
 
     gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );

-    
+

     if (sizing == wxDATAVIEW_COL_WIDTH_FIXED)
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
     else if (sizing == wxDATAVIEW_COL_WIDTH_GROW)
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_GROW_ONLY );
     else
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_AUTOSIZE );
     if (sizing == wxDATAVIEW_COL_WIDTH_FIXED)
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
     else if (sizing == wxDATAVIEW_COL_WIDTH_GROW)
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_GROW_ONLY );
     else
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_AUTOSIZE );

-        
+

     if (fixed_width > 0)
         gtk_tree_view_column_set_fixed_width( column, fixed_width );
     if (fixed_width > 0)
         gtk_tree_view_column_set_fixed_width( column, fixed_width );

-    
+

     gtk_tree_view_column_pack_start( column, renderer, TRUE );
 
     gtk_tree_view_column_set_cell_data_func( column, renderer,
     gtk_tree_view_column_pack_start( column, renderer, TRUE );
 
     gtk_tree_view_column_set_cell_data_func( column, renderer,


@@ -1435,6 +1438,12 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     m_treeview = gtk_tree_view_new();
     gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
 
     m_treeview = gtk_tree_view_new();
     gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
 

+    if (style & wxDV_MULTIPLE)
+    {
+        GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+        gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE );
+    }
+

     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
         GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
     gtk_widget_show (m_treeview);
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
         GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
     gtk_widget_show (m_treeview);