Deprecated and obsolete parts marked up for backward compatibility.

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

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 5239bad72f7f582cf1504b348b1301f0ec632432..ddfe171080624645076f37b771ac71cce3a9005e 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -15,6 +15,9 @@
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
+
+#ifndef wxUSE_GENERICDATAVIEWCTRL
+
 #include "wx/stockitem.h"
 #include "wx/dcclient.h"
 #include "wx/calctrl.h"
@@ -280,7 +283,7 @@ wxgtk_list_store_get_path (GtkTreeModel *tree_model,
   
     GtkTreePath *retval = gtk_tree_path_new ();
     // user_data is just the index
-    int i = (int) iter->user_data;
+    int i = (wxUIntPtr) iter->user_data;
     gtk_tree_path_append_index (retval, i);
     return retval;
 }
@@ -338,7 +341,7 @@ wxgtk_list_store_iter_next (GtkTreeModel  *tree_model,
     
     g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE);
 
-    int n = (int) iter->user_data;
+    int n = (wxUIntPtr) iter->user_data;
     
     if (n == -1)
         return FALSE;
@@ -994,7 +997,7 @@ wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype,
 {
     m_renderer = (void*) gtk_cell_renderer_toggle_new();
     
-    if (m_mode & wxDATAVIEW_CELL_EDITABLE)
+    if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
     {
         g_signal_connect_after( m_renderer, "toggled", G_CALLBACK(wxGtkToggleRendererToggledCallback), this );
     }
@@ -1450,6 +1453,9 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     return true;
 }
 
+#endif 
+    // !wxUSE_GENERICDATAVIEWCTRL
 
-#endif // wxUSE_DATAVIEWCTRL
+#endif 
+    // wxUSE_DATAVIEWCTRL