don't compare invalid iterators/node pointers

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

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index eb63b83917ec4d846a96743309200e365357b664..b11b02de6539beee663213984365a20703f329b3 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -15,11 +15,15 @@
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
+
+#ifndef wxUSE_GENERICDATAVIEWCTRL
+
 #include "wx/stockitem.h"
 #include "wx/dcclient.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"
@@ -36,13 +40,6 @@
 
 class wxDataViewCtrl;
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -304,8 +301,9 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model,
     wxString mtype = model->GetColType( (size_t) column );
     if (mtype == wxT("string"))
     {
+        wxVariant variant;
         g_value_init( value, G_TYPE_STRING );
-        wxVariant variant = model->GetValue( (size_t) column, (size_t) iter->user_data );
+        model->GetValue( variant, (size_t) column, (size_t) iter->user_data );
         g_value_set_string( value, wxGTK_CONV(variant.GetString()) );
     }
     else
@@ -735,8 +733,8 @@ public:
     virtual bool RowDeleted( size_t row );
     virtual bool RowChanged( size_t row );
     virtual bool ValueChanged( size_t col, size_t row );
+    virtual bool RowsReordered( size_t *new_order );
     virtual bool Cleared();
-    virtual bool ValueChanged( wxDataViewColumn *view_column, size_t model_column, size_t row );
     
     GtkWxListStore      *m_gtk_store;
     wxDataViewListModel *m_wx_model;
@@ -805,36 +803,65 @@ bool wxGtkDataViewListModelNotifier::RowChanged( size_t row )
     return true;
 }
 
-bool wxGtkDataViewListModelNotifier::ValueChanged( size_t col, size_t row )
+bool wxGtkDataViewListModelNotifier::ValueChanged( size_t model_col, size_t model_row )
 {
-    return RowChanged( row );
-}
+    // This adds GTK+'s missing MVC logic for ValueChanged
+    wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
+    while (node)
+    {
+        wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
+        if (viewing_column->m_modelColumn == model_col)
+        {
+            GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview);
+            GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(viewing_column->m_viewColumn->GetGtkHandle());
+
+            // Get cell area
+            GtkTreePath *path = gtk_tree_path_new();
+            gtk_tree_path_append_index( path, model_row );
+            GdkRectangle cell_area;
+            gtk_tree_view_get_cell_area( widget, path, column, &cell_area );
+            gtk_tree_path_free( path ); 
+
+            int ydiff = column->button->allocation.height;
+            // Redraw
+            gtk_widget_queue_draw_area( GTK_WIDGET(widget), 
+                cell_area.x, ydiff + cell_area.y, cell_area.width, cell_area.height );
+        }
 
-bool wxGtkDataViewListModelNotifier::Cleared()
-{
-    return false;
+        node = node->GetNext();
+    }
+    
+    return true;
 }
 
-bool wxGtkDataViewListModelNotifier::ValueChanged( wxDataViewColumn *view_column, size_t model_column, size_t row )
+bool wxGtkDataViewListModelNotifier::RowsReordered( size_t *new_order )
 {
-    GtkTreeView *widget = GTK_TREE_VIEW(view_column->GetOwner()->m_treeview);
-    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(view_column->GetGtkHandle());
+    // Assume sizeof(size_t)= == sizeof(gint)
 
-    // Get cell area
-    GtkTreePath *path = gtk_tree_path_new();
-    gtk_tree_path_append_index( path, row );
-    GdkRectangle cell_area;
-    gtk_tree_view_get_cell_area( widget, path, column, &cell_area );
-    gtk_tree_path_free( path ); 
+    GtkTreePath *path = gtk_tree_path_new ();
+    gtk_tree_model_rows_reordered (GTK_TREE_MODEL (m_gtk_store), path, NULL, (gint*)new_order);
+    gtk_tree_path_free (path);
 
-    int ydiff = column->button->allocation.height;
-    // Redraw
-    gtk_widget_queue_draw_area( GTK_WIDGET(widget), 
-        cell_area.x, ydiff + cell_area.y, cell_area.width, cell_area.height );
+    // This adds GTK+'s missing MVC logic for RowsReordered
+    wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
+    while (node)
+    {
+        wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
+        GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview);
+        // Doesn't work yet...
+        gtk_widget_queue_draw( GTK_WIDGET(widget) ); 
 
+        node = node->GetNext();
+    }
+    
     return true;
 }
 
+bool wxGtkDataViewListModelNotifier::Cleared()
+{
+    return false;
+}
+
 // --------------------------------------------------------- 
 // wxDataViewCell
 // --------------------------------------------------------- 
@@ -1265,7 +1292,8 @@ wxSize wxDataViewDateCell::GetSize()
 
 bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row )
 {
-    wxVariant variant = model->GetValue( col, row );
+    wxVariant variant;
+    model->GetValue( variant, col, row );
     wxDateTime value = variant.GetDateTime();
 
     wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient( 
@@ -1304,11 +1332,11 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
     size_t model_row = (size_t) iter->user_data;
     
-    wxVariant value = list_store->model->GetValue( 
-        cell->GetOwner()->GetModelColumn(), model_row );
+    wxVariant value;
+    list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );
 
     if (value.GetType() != cell->GetVariantType())
-        wxPrintf( wxT("Wrong type\n") );
+        wxLogError( wxT("Wrong type\n") );
                                             
     cell->SetValue( value );
 }
@@ -1353,10 +1381,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
 wxDataViewCtrl::~wxDataViewCtrl()
 {
+    if (m_notifier)
+        GetModel()->RemoveNotifier( m_notifier );
 }
 
 void wxDataViewCtrl::Init()
 {
+    m_notifier = NULL;
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
@@ -1400,10 +1431,9 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )
     GtkWxListStore *gtk_store = wxgtk_list_store_new();
     gtk_store->model = model;
 
-    wxGtkDataViewListModelNotifier *notifier = 
-        new wxGtkDataViewListModelNotifier( gtk_store, model );
+    m_notifier = new wxGtkDataViewListModelNotifier( gtk_store, model );
 
-    model->SetNotifier( notifier );    
+    model->AddNotifier( m_notifier );    
 
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) );
     g_object_unref( gtk_store );
@@ -1423,6 +1453,9 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     return true;
 }
 
+#endif 
+    // !wxUSE_GENERICDATAVIEWCTRL
 
-#endif // wxUSE_DATAVIEWCTRL
+#endif 
+    // wxUSE_DATAVIEWCTRL