]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/dataview.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove unused XIM code, minor cleanup
[wxWidgets.git] / src / gtk / dataview.cpp
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index eb63b83917ec4d846a96743309200e365357b664..7d4d4eafb09437b20f4c141b93e9f2cc31e89c26 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dataview.cpp
+// Name:        src/gtk/dataview.cpp
 // Purpose:     wxDataViewCtrl GTK+2 implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDataViewCtrl GTK+2 implementation
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -10,16 +10,23 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
+
+#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/icon.h"
+
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
@@ -36,13 +43,6 @@
 
 class wxDataViewCtrl;
 
 
 class wxDataViewCtrl;
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -79,7 +79,6 @@ struct _GtkWxListStore
 struct _GtkWxListStoreClass
 {
   GObjectClass list_parent_class;
 struct _GtkWxListStoreClass
 {
   GObjectClass list_parent_class;
-  
 };
 
 static GtkWxListStore *wxgtk_list_store_new          (void);
 };
 
 static GtkWxListStore *wxgtk_list_store_new          (void);
@@ -90,68 +89,68 @@ static void         wxgtk_list_store_finalize        (GObject           *object)
 static GtkTreeModelFlags wxgtk_list_store_get_flags  (GtkTreeModel      *tree_model);
 static gint         wxgtk_list_store_get_n_columns   (GtkTreeModel      *tree_model);
 static GType        wxgtk_list_store_get_column_type (GtkTreeModel      *tree_model,
 static GtkTreeModelFlags wxgtk_list_store_get_flags  (GtkTreeModel      *tree_model);
 static gint         wxgtk_list_store_get_n_columns   (GtkTreeModel      *tree_model);
 static GType        wxgtk_list_store_get_column_type (GtkTreeModel      *tree_model,
-                                                   gint               index);
+                                                      gint               index);
 static gboolean     wxgtk_list_store_get_iter        (GtkTreeModel      *tree_model,
 static gboolean     wxgtk_list_store_get_iter        (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   GtkTreePath       *path);
+                                                      GtkTreeIter       *iter,
+                                                      GtkTreePath       *path);
 static GtkTreePath *wxgtk_list_store_get_path        (GtkTreeModel      *tree_model,
 static GtkTreePath *wxgtk_list_store_get_path        (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter);
+                                                      GtkTreeIter       *iter);
 static void         wxgtk_list_store_get_value       (GtkTreeModel      *tree_model,
 static void         wxgtk_list_store_get_value       (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   gint               column,
-                                                   GValue            *value);
+                                                      GtkTreeIter       *iter,
+                                                      gint               column,
+                                                      GValue            *value);
 static gboolean     wxgtk_list_store_iter_next       (GtkTreeModel      *tree_model,
 static gboolean     wxgtk_list_store_iter_next       (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter);
+                                                      GtkTreeIter       *iter);
 static gboolean     wxgtk_list_store_iter_children   (GtkTreeModel      *tree_model,
 static gboolean     wxgtk_list_store_iter_children   (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   GtkTreeIter       *parent);
+                                                      GtkTreeIter       *iter,
+                                                      GtkTreeIter       *parent);
 static gboolean     wxgtk_list_store_iter_has_child  (GtkTreeModel      *tree_model,
 static gboolean     wxgtk_list_store_iter_has_child  (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter);
+                                                      GtkTreeIter       *iter);
 static gint         wxgtk_list_store_iter_n_children (GtkTreeModel      *tree_model,
 static gint         wxgtk_list_store_iter_n_children (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter);
+                                                      GtkTreeIter       *iter);
 static gboolean     wxgtk_list_store_iter_nth_child  (GtkTreeModel      *tree_model,
 static gboolean     wxgtk_list_store_iter_nth_child  (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   GtkTreeIter       *parent,
-                                                   gint               n);
+                                                      GtkTreeIter       *iter,
+                                                      GtkTreeIter       *parent,
+                                                      gint               n);
 static gboolean     wxgtk_list_store_iter_parent     (GtkTreeModel      *tree_model,
 static gboolean     wxgtk_list_store_iter_parent     (GtkTreeModel      *tree_model,
-                                                   GtkTreeIter       *iter,
-                                                   GtkTreeIter       *child);
+                                                      GtkTreeIter       *iter,
+                                                      GtkTreeIter       *child);
 
 static GObjectClass *list_parent_class = NULL;
 
 GType
 gtk_wx_list_store_get_type (void)
 {
 
 static GObjectClass *list_parent_class = NULL;
 
 GType
 gtk_wx_list_store_get_type (void)
 {
-  static GType list_store_type = 0;
+    static GType list_store_type = 0;
 
 
-  if (!list_store_type)
+    if (!list_store_type)
     {
     {
-      static const GTypeInfo list_store_info =
-      {
-       sizeof (GtkWxListStoreClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-        (GClassInitFunc) wxgtk_list_store_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-        sizeof (GtkWxListStore),
-       0,
-        (GInstanceInitFunc) wxgtk_list_store_init,
-      };
+        static const GTypeInfo list_store_info =
+        {
+            sizeof (GtkWxListStoreClass),
+            NULL,   /* base_init */
+            NULL,   /* base_finalize */
+            (GClassInitFunc) wxgtk_list_store_class_init,
+            NULL,   /* class_finalize */
+            NULL,   /* class_data */
+            sizeof (GtkWxListStore),
+            0,
+            (GInstanceInitFunc) wxgtk_list_store_init,
+        };
 
       static const GInterfaceInfo tree_model_info =
       {
 
       static const GInterfaceInfo tree_model_info =
       {
-       (GInterfaceInitFunc) wxgtk_list_store_tree_model_init,
-       NULL,
-       NULL
+          (GInterfaceInitFunc) wxgtk_list_store_tree_model_init,
+          NULL,
+          NULL
       };
 
       list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxListStore",
       };
 
       list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxListStore",
-                                               &list_store_info, (GTypeFlags)0 );
+                                                &list_store_info, (GTypeFlags)0 );
 
       g_type_add_interface_static (list_store_type,
 
       g_type_add_interface_static (list_store_type,
-                                  GTK_TYPE_TREE_MODEL,
-                                  &tree_model_info);
+                                   GTK_TYPE_TREE_MODEL,
+                                   &tree_model_info);
     }
 
   return list_store_type;
     }
 
   return list_store_type;
@@ -207,7 +206,7 @@ wxgtk_list_store_finalize (GObject *object)
     /* must chain up */
     (* list_parent_class->finalize) (object);
 }
     /* must chain up */
     (* list_parent_class->finalize) (object);
 }
-                        
+
 } // extern "C"
 
 //-----------------------------------------------------------------------------
 } // extern "C"
 
 //-----------------------------------------------------------------------------
@@ -241,15 +240,15 @@ wxgtk_list_store_get_n_columns (GtkTreeModel *tree_model)
 
 static GType
 wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
 
 static GType
 wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
-                               gint          index)
+                                  gint          index)
 {
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), G_TYPE_INVALID);
 
     GType gtype = G_TYPE_INVALID;
 {
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), G_TYPE_INVALID);
 
     GType gtype = G_TYPE_INVALID;
-    
-    wxString wxtype = list_store->model->GetColType( (size_t) index );
-    
+
+    wxString wxtype = list_store->model->GetColType( (unsigned int) index );
+
     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
 
     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
 
@@ -258,14 +257,14 @@ wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
 
 static gboolean
 wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
 
 static gboolean
 wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
-                        GtkTreeIter  *iter,
-                        GtkTreePath  *path)
+                           GtkTreeIter  *iter,
+                           GtkTreePath  *path)
 {
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
     g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
 
 {
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
     g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
 
-    size_t i = (size_t)gtk_tree_path_get_indices (path)[0];
+    unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];
 
     if (i >= list_store->model->GetNumberOfRows())
         return FALSE;
 
     if (i >= list_store->model->GetNumberOfRows())
         return FALSE;
@@ -279,39 +278,40 @@ wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
 
 static GtkTreePath *
 wxgtk_list_store_get_path (GtkTreeModel *tree_model,
 
 static GtkTreePath *
 wxgtk_list_store_get_path (GtkTreeModel *tree_model,
-                        GtkTreeIter  *iter)
+                           GtkTreeIter  *iter)
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), NULL);
     g_return_val_if_fail (iter->stamp == GTK_WX_LIST_STORE (tree_model)->stamp, NULL);
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), NULL);
     g_return_val_if_fail (iter->stamp == GTK_WX_LIST_STORE (tree_model)->stamp, NULL);
-  
+
     GtkTreePath *retval = gtk_tree_path_new ();
     // user_data is just the index
     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;
 }
 
 static void
 wxgtk_list_store_get_value (GtkTreeModel *tree_model,
     gtk_tree_path_append_index (retval, i);
     return retval;
 }
 
 static void
 wxgtk_list_store_get_value (GtkTreeModel *tree_model,
-                         GtkTreeIter  *iter,
-                         gint          column,
-                         GValue       *value)
+                            GtkTreeIter  *iter,
+                            gint          column,
+                            GValue       *value)
 {
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
     g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) );
 
     wxDataViewListModel *model = list_store->model;
 {
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
     g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) );
 
     wxDataViewListModel *model = list_store->model;
-    wxString mtype = model->GetColType( (size_t) column );
+    wxString mtype = model->GetColType( (unsigned int) column );
     if (mtype == wxT("string"))
     {
     if (mtype == wxT("string"))
     {
+        wxVariant variant;
         g_value_init( value, G_TYPE_STRING );
         g_value_init( value, G_TYPE_STRING );
-        wxVariant variant = model->GetValue( (size_t) column, (size_t) iter->user_data );
+        model->GetValue( variant, (unsigned int) column, (unsigned int) iter->user_data );
         g_value_set_string( value, wxGTK_CONV(variant.GetString()) );
     }
     else
     {
     }
         g_value_set_string( value, wxGTK_CONV(variant.GetString()) );
     }
     else
     {
     }
-    
+
 #if 0
   GtkTreeDataList *list;
   gint tmp_column = column;
 #if 0
   GtkTreeDataList *list;
   gint tmp_column = column;
@@ -328,29 +328,29 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model,
     g_value_init (value, GTK_LIST_STORE (tree_model)->column_headers[column]);
   else
     _gtk_tree_data_list_node_to_value (list,
     g_value_init (value, GTK_LIST_STORE (tree_model)->column_headers[column]);
   else
     _gtk_tree_data_list_node_to_value (list,
-                                      GTK_LIST_STORE (tree_model)->column_headers[column],
-                                      value);
+                                       GTK_LIST_STORE (tree_model)->column_headers[column],
+                                       value);
 #endif
 
 }
 
 static gboolean
 wxgtk_list_store_iter_next (GtkTreeModel  *tree_model,
 #endif
 
 }
 
 static gboolean
 wxgtk_list_store_iter_next (GtkTreeModel  *tree_model,
-                         GtkTreeIter   *iter)
+                            GtkTreeIter   *iter)
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-    
+
     g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE);
 
     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;
     if (n == -1)
         return FALSE;
-        
+
     if (n >= (int) list_store->model->GetNumberOfRows()-1)
         return FALSE;
     if (n >= (int) list_store->model->GetNumberOfRows()-1)
         return FALSE;
-        
+
     iter->user_data = (gpointer) ++n;
 
     return TRUE;
     iter->user_data = (gpointer) ++n;
 
     return TRUE;
@@ -358,78 +358,78 @@ wxgtk_list_store_iter_next (GtkTreeModel  *tree_model,
 
 static gboolean
 wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
 
 static gboolean
 wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
-                             GtkTreeIter  *iter,
-                             GtkTreeIter  *parent)
+                                GtkTreeIter  *iter,
+                                GtkTreeIter  *parent)
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-    
+
     // this is a list, nodes have no children
     if (parent)
         return FALSE;
 
     iter->stamp = list_store->stamp;
     iter->user_data = (gpointer) -1;
     // this is a list, nodes have no children
     if (parent)
         return FALSE;
 
     iter->stamp = list_store->stamp;
     iter->user_data = (gpointer) -1;
-    
+
     return TRUE;
 }
 
 static gboolean
 wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
     return TRUE;
 }
 
 static gboolean
 wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
-                              GtkTreeIter  *iter)
+                                 GtkTreeIter  *iter)
 {
     return FALSE;
 }
 
 static gint
 wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
 {
     return FALSE;
 }
 
 static gint
 wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
-                               GtkTreeIter  *iter)
+                                  GtkTreeIter  *iter)
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), -1);
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), -1);
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-    
+
     if (iter == NULL)
         return (gint) list_store->model->GetNumberOfRows();
 
     g_return_val_if_fail (list_store->stamp == iter->stamp, -1);
     if (iter == NULL)
         return (gint) list_store->model->GetNumberOfRows();
 
     g_return_val_if_fail (list_store->stamp == iter->stamp, -1);
-  
+
     return 0;
 }
 
 static gboolean
 wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
     return 0;
 }
 
 static gboolean
 wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
-                              GtkTreeIter  *iter,
-                              GtkTreeIter  *parent,
-                              gint          n)
+                                 GtkTreeIter  *iter,
+                                 GtkTreeIter  *parent,
+                                 gint          n)
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
 {
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-    
+
     if (parent)
         return FALSE;
 
     if (n < 0)
         return FALSE;
     if (parent)
         return FALSE;
 
     if (n < 0)
         return FALSE;
-        
+
     if (n >= (gint) list_store->model->GetNumberOfRows())
         return FALSE;
 
     iter->stamp = list_store->stamp;
     iter->user_data = (gpointer) n;
     if (n >= (gint) list_store->model->GetNumberOfRows())
         return FALSE;
 
     iter->stamp = list_store->stamp;
     iter->user_data = (gpointer) n;
-    
+
     return TRUE;
 }
 
 static gboolean
 wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
     return TRUE;
 }
 
 static gboolean
 wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
-                           GtkTreeIter  *iter,
-                           GtkTreeIter  *child)
+                              GtkTreeIter  *iter,
+                              GtkTreeIter  *child)
 {
     return FALSE;
 }
 
 //-----------------------------------------------------------------------------
 {
     return FALSE;
 }
 
 //-----------------------------------------------------------------------------
-// define new GTK+ class wxGtkCellRenderer
+// define new GTK+ class wxGtkRendererRenderer
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {
@@ -451,7 +451,7 @@ struct _GtkWxCellRenderer
   GtkCellRenderer parent;
 
   /*< private >*/
   GtkCellRenderer parent;
 
   /*< private >*/
-  wxDataViewCustomCell *cell;
+  wxDataViewCustomRenderer *cell;
   guint32 last_click;
 };
 
   guint32 last_click;
 };
 
@@ -470,20 +470,20 @@ static void gtk_wx_cell_renderer_finalize (
                         GObject                *object );
 static void gtk_wx_cell_renderer_get_size (
                         GtkCellRenderer         *cell,
                         GObject                *object );
 static void gtk_wx_cell_renderer_get_size (
                         GtkCellRenderer         *cell,
-                                               GtkWidget               *widget,
-                                               GdkRectangle            *rectangle,
-                                               gint                    *x_offset,
-                                               gint                    *y_offset,
-                                               gint                    *width,
-                                               gint                    *height );
+                        GtkWidget               *widget,
+                        GdkRectangle            *rectangle,
+                        gint                    *x_offset,
+                        gint                    *y_offset,
+                        gint                    *width,
+                        gint                    *height );
 static void gtk_wx_cell_renderer_render (
                         GtkCellRenderer         *cell,
 static void gtk_wx_cell_renderer_render (
                         GtkCellRenderer         *cell,
-                                               GdkWindow               *window,
-                                               GtkWidget               *widget,
-                                               GdkRectangle            *background_area,
-                                               GdkRectangle            *cell_area,
-                                               GdkRectangle            *expose_area,
-                                               GtkCellRendererState     flags );
+                        GdkWindow               *window,
+                        GtkWidget               *widget,
+                        GdkRectangle            *background_area,
+                        GdkRectangle            *cell_area,
+                        GdkRectangle            *expose_area,
+                        GtkCellRendererState     flags );
 static gboolean gtk_wx_cell_renderer_activate(
                         GtkCellRenderer         *cell,
                         GdkEvent                *event,
 static gboolean gtk_wx_cell_renderer_activate(
                         GtkCellRenderer         *cell,
                         GdkEvent                *event,
@@ -497,7 +497,7 @@ static GObjectClass *cell_parent_class = NULL;
 
 }  // extern "C"
 
 
 }  // extern "C"
 
-GType 
+GType
 gtk_wx_cell_renderer_get_type (void)
 {
     static GType cell_wx_type = 0;
 gtk_wx_cell_renderer_get_type (void)
 {
     static GType cell_wx_type = 0;
@@ -507,17 +507,17 @@ gtk_wx_cell_renderer_get_type (void)
         static const GTypeInfo cell_wx_info =
         {
             sizeof (GtkWxCellRendererClass),
         static const GTypeInfo cell_wx_info =
         {
             sizeof (GtkWxCellRendererClass),
-            NULL,              /* base_init */
-            NULL,              /* base_finalize */
+            NULL, /* base_init */
+            NULL, /* base_finalize */
             (GClassInitFunc) gtk_wx_cell_renderer_class_init,
             (GClassInitFunc) gtk_wx_cell_renderer_class_init,
-            NULL,              /* class_finalize */
-            NULL,              /* class_data */
+            NULL, /* class_finalize */
+            NULL, /* class_data */
             sizeof (GtkWxCellRenderer),
             0,          /* n_preallocs */
             (GInstanceInitFunc) gtk_wx_cell_renderer_init,
         };
 
             sizeof (GtkWxCellRenderer),
             0,          /* n_preallocs */
             (GInstanceInitFunc) gtk_wx_cell_renderer_init,
         };
 
-        cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER, 
+        cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER,
             "GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 );
     }
 
             "GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 );
     }
 
@@ -561,34 +561,34 @@ gtk_wx_cell_renderer_new (void)
 
 static void
 gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
 
 static void
 gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
-                                  GtkWidget       *widget,
-                                  GdkRectangle    *cell_area,
-                                  gint            *x_offset,
-                                  gint            *y_offset,
-                                  gint            *width,
-                                  gint            *height)
+                               GtkWidget       *widget,
+                               GdkRectangle    *cell_area,
+                               gint            *x_offset,
+                               gint            *y_offset,
+                               gint            *width,
+                               gint            *height)
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
-    wxDataViewCustomCell *cell = wxrenderer->cell;
-  
+    wxDataViewCustomRenderer *cell = wxrenderer->cell;
+
     wxSize size = cell->GetSize();
 
     gint calc_width  = (gint) renderer->xpad * 2 + size.x;
     gint calc_height = (gint) renderer->ypad * 2 + size.y;
     wxSize size = cell->GetSize();
 
     gint calc_width  = (gint) renderer->xpad * 2 + size.x;
     gint calc_height = (gint) renderer->ypad * 2 + size.y;
-  
-    if (x_offset) 
+
+    if (x_offset)
         *x_offset = 0;
         *x_offset = 0;
-    if (y_offset) 
+    if (y_offset)
         *y_offset = 0;
 
     if (cell_area && size.x > 0 && size.y > 0)
     {
         if (x_offset)
         *y_offset = 0;
 
     if (cell_area && size.x > 0 && size.y > 0)
     {
         if (x_offset)
-           {
+        {
             *x_offset = (gint)((renderer->xalign *
                                (cell_area->width - calc_width - 2 * renderer->xpad)));
             *x_offset = MAX (*x_offset, 0) + renderer->xpad;
             *x_offset = (gint)((renderer->xalign *
                                (cell_area->width - calc_width - 2 * renderer->xpad)));
             *x_offset = MAX (*x_offset, 0) + renderer->xpad;
-           }
+        }
         if (y_offset)
         {
             *y_offset = (gint)((renderer->yalign *
         if (y_offset)
         {
             *y_offset = (gint)((renderer->yalign *
@@ -599,36 +599,36 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
 
     if (width)
         *width = calc_width;
 
     if (width)
         *width = calc_width;
-  
+
     if (height)
         *height = calc_height;
 }
 
 static void
 gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     if (height)
         *height = calc_height;
 }
 
 static void
 gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
-                                GdkWindow            *window,
-                                GtkWidget            *widget,
-                                GdkRectangle         *background_area,
-                                GdkRectangle         *cell_area,
-                                GdkRectangle         *expose_area,
-                                GtkCellRendererState  flags)
+                             GdkWindow            *window,
+                             GtkWidget            *widget,
+                             GdkRectangle         *background_area,
+                             GdkRectangle         *cell_area,
+                             GdkRectangle         *expose_area,
+                             GtkCellRendererState  flags)
 
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
 
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
-    wxDataViewCustomCell *cell = wxrenderer->cell;
-    
+    wxDataViewCustomRenderer *cell = wxrenderer->cell;
+
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
-                                    &rect.x,
-                                    &rect.y,
-                                    &rect.width,
-                                    &rect.height);
+                                   &rect.x,
+                                   &rect.y,
+                                   &rect.width,
+                                   &rect.height);
 
     rect.x += cell_area->x;
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;
 
     rect.x += cell_area->x;
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;
-    
+
     GdkRectangle dummy;
     if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
     {
     GdkRectangle dummy;
     if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
     {
@@ -639,7 +639,7 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
             dc->m_window = window;
             dc->SetUpDC();
         }
             dc->m_window = window;
             dc->SetUpDC();
         }
-        
+
         int state = 0;
         if (flags & GTK_CELL_RENDERER_SELECTED)
             state |= wxDATAVIEW_CELL_SELECTED;
         int state = 0;
         if (flags & GTK_CELL_RENDERER_SELECTED)
             state |= wxDATAVIEW_CELL_SELECTED;
@@ -652,10 +652,10 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
         if (flags & GTK_CELL_RENDERER_FOCUSED)
             state |= wxDATAVIEW_CELL_FOCUSED;
         cell->Render( renderrect, dc, state );
         if (flags & GTK_CELL_RENDERER_FOCUSED)
             state |= wxDATAVIEW_CELL_FOCUSED;
         cell->Render( renderrect, dc, state );
-    }   
+    }
 }
 
 }
 
-static gboolean 
+static gboolean
 gtk_wx_cell_renderer_activate(
                         GtkCellRenderer         *renderer,
                         GdkEvent                *event,
 gtk_wx_cell_renderer_activate(
                         GtkCellRenderer         *renderer,
                         GdkEvent                *event,
@@ -666,36 +666,36 @@ gtk_wx_cell_renderer_activate(
                         GtkCellRendererState     flags )
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
                         GtkCellRendererState     flags )
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
-    wxDataViewCustomCell *cell = wxrenderer->cell;
-    
+    wxDataViewCustomRenderer *cell = wxrenderer->cell;
+
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
     GdkRectangle rect;
     gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
-                                    &rect.x,
-                                    &rect.y,
-                                    &rect.width,
-                                    &rect.height);
+                                   &rect.x,
+                                   &rect.y,
+                                   &rect.width,
+                                   &rect.height);
 
     rect.x += cell_area->x;
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;
 
     rect.x += cell_area->x;
     rect.y += cell_area->y;
     rect.width  -= renderer->xpad * 2;
     rect.height -= renderer->ypad * 2;
-    
+
     wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
     wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
-    
+
     wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
     wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
-    
+
     GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
     GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
-    size_t model_row = (size_t)gtk_tree_path_get_indices (treepath)[0];
+    unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (treepath)[0];
     gtk_tree_path_free( treepath );
     gtk_tree_path_free( treepath );
-    
-    size_t model_col = cell->GetOwner()->GetModelColumn();
-    
+
+    unsigned int model_col = cell->GetOwner()->GetModelColumn();
+
     if (event->type == GDK_BUTTON_PRESS)
     {
         GdkEventButton *button_event = (GdkEventButton*) event;
     if (event->type == GDK_BUTTON_PRESS)
     {
         GdkEventButton *button_event = (GdkEventButton*) event;
-        wxPoint pt( ((int) button_event->x) - renderrect.x, 
+        wxPoint pt( ((int) button_event->x) - renderrect.x,
                     ((int) button_event->y) - renderrect.y );
                     ((int) button_event->y) - renderrect.y );
-        
+
         bool ret = false;
         if (button_event->button == 1)
         {
         bool ret = false;
         if (button_event->button == 1)
         {
@@ -711,61 +711,61 @@ gtk_wx_cell_renderer_activate(
             if (cell->RightClick( pt, renderrect, model, model_col, model_row ))
                 ret = true;
         }
             if (cell->RightClick( pt, renderrect, model, model_col, model_row ))
                 ret = true;
         }
-        
+
         wxrenderer->last_click = button_event->time;
         wxrenderer->last_click = button_event->time;
-        
+
         return ret;
     }
         return ret;
     }
-    
+
     return false;
 }
 
     return false;
 }
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // wxGtkDataViewListModelNotifier
 // wxGtkDataViewListModelNotifier
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxGtkDataViewListModelNotifier: public wxDataViewListModelNotifier
 {
 public:
     wxGtkDataViewListModelNotifier( GtkWxListStore* gtk_store, wxDataViewListModel *wx_model );
 
 class wxGtkDataViewListModelNotifier: public wxDataViewListModelNotifier
 {
 public:
     wxGtkDataViewListModelNotifier( GtkWxListStore* gtk_store, wxDataViewListModel *wx_model );
-    
+
     virtual bool RowAppended();
     virtual bool RowPrepended();
     virtual bool RowAppended();
     virtual bool RowPrepended();
-    virtual bool RowInserted( size_t before );
-    virtual bool RowDeleted( size_t row );
-    virtual bool RowChanged( size_t row );
-    virtual bool ValueChanged( size_t col, size_t row );
+    virtual bool RowInserted( unsigned int before );
+    virtual bool RowDeleted( unsigned int row );
+    virtual bool RowChanged( unsigned int row );
+    virtual bool ValueChanged( unsigned int col, unsigned int row );
+    virtual bool RowsReordered( unsigned int *new_order );
     virtual bool Cleared();
     virtual bool Cleared();
-    virtual bool ValueChanged( wxDataViewColumn *view_column, size_t model_column, size_t row );
-    
+
     GtkWxListStore      *m_gtk_store;
     wxDataViewListModel *m_wx_model;
 };
 
     GtkWxListStore      *m_gtk_store;
     wxDataViewListModel *m_wx_model;
 };
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // wxGtkDataViewListModelNotifier
 // wxGtkDataViewListModelNotifier
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 
-wxGtkDataViewListModelNotifier::wxGtkDataViewListModelNotifier( 
+wxGtkDataViewListModelNotifier::wxGtkDataViewListModelNotifier(
     GtkWxListStore* gtk_store, wxDataViewListModel *wx_model )
 {
     m_gtk_store = gtk_store;
     m_wx_model = wx_model;
 }
     GtkWxListStore* gtk_store, wxDataViewListModel *wx_model )
 {
     m_gtk_store = gtk_store;
     m_wx_model = wx_model;
 }
-    
+
 bool wxGtkDataViewListModelNotifier::RowAppended()
 {
 bool wxGtkDataViewListModelNotifier::RowAppended()
 {
-    size_t pos = m_wx_model->GetNumberOfRows()-1;
-    
+    unsigned int pos = m_wx_model->GetNumberOfRows()-1;
+
     GtkTreeIter iter;
     iter.stamp = m_gtk_store->stamp;
     iter.user_data = (gpointer) pos;
     GtkTreeIter iter;
     iter.stamp = m_gtk_store->stamp;
     iter.user_data = (gpointer) pos;
-    
+
     GtkTreePath *path = gtk_tree_path_new ();
     gtk_tree_path_append_index (path, (gint) pos);
     gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
     gtk_tree_path_free (path);
     GtkTreePath *path = gtk_tree_path_new ();
     gtk_tree_path_append_index (path, (gint) pos);
     gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
     gtk_tree_path_free (path);
-    
+
     return true;
 }
 
     return true;
 }
 
@@ -774,26 +774,40 @@ bool wxGtkDataViewListModelNotifier::RowPrepended()
     GtkTreeIter iter;
     iter.stamp = m_gtk_store->stamp;
     iter.user_data = (gpointer) 0;
     GtkTreeIter iter;
     iter.stamp = m_gtk_store->stamp;
     iter.user_data = (gpointer) 0;
-    
+
     GtkTreePath *path = gtk_tree_path_new ();
     gtk_tree_path_append_index (path, (gint) 0);
     gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
     gtk_tree_path_free (path);
     GtkTreePath *path = gtk_tree_path_new ();
     gtk_tree_path_append_index (path, (gint) 0);
     gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
     gtk_tree_path_free (path);
-    
+
     return true;
 }
 
     return true;
 }
 
-bool wxGtkDataViewListModelNotifier::RowInserted( size_t before )
+bool wxGtkDataViewListModelNotifier::RowInserted( unsigned int before )
 {
 {
-    return false;
+    GtkTreeIter iter;
+    iter.stamp = m_gtk_store->stamp;
+    iter.user_data = (gpointer) before;
+
+    GtkTreePath *path = gtk_tree_path_new ();
+    gtk_tree_path_append_index (path, (gint) before);
+    gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
+    gtk_tree_path_free (path);
+
+    return true;
 }
 
 }
 
-bool wxGtkDataViewListModelNotifier::RowDeleted( size_t row )
+bool wxGtkDataViewListModelNotifier::RowDeleted( unsigned int row )
 {
 {
-    return false;
+    GtkTreePath *path = gtk_tree_path_new ();
+    gtk_tree_path_append_index (path, (gint) row);
+    gtk_tree_model_row_deleted (GTK_TREE_MODEL (m_gtk_store), path);
+    gtk_tree_path_free (path);
+
+    return true;
 }
 
 }
 
-bool wxGtkDataViewListModelNotifier::RowChanged( size_t row )
+bool wxGtkDataViewListModelNotifier::RowChanged( unsigned int row )
 {
     GtkTreeIter iter;
     iter.stamp = m_gtk_store->stamp;
 {
     GtkTreeIter iter;
     iter.stamp = m_gtk_store->stamp;
@@ -805,86 +819,115 @@ bool wxGtkDataViewListModelNotifier::RowChanged( size_t row )
     return true;
 }
 
     return true;
 }
 
-bool wxGtkDataViewListModelNotifier::ValueChanged( size_t col, size_t row )
+bool wxGtkDataViewListModelNotifier::ValueChanged( unsigned int model_col, unsigned int 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( unsigned int *new_order )
 {
 {
-    GtkTreeView *widget = GTK_TREE_VIEW(view_column->GetOwner()->m_treeview);
-    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(view_column->GetGtkHandle());
+    // Assume sizeof(unsigned int)= == 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);
+
+    // 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) );
 
 
-    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 );
+        node = node->GetNext();
+    }
 
     return true;
 }
 
 
     return true;
 }
 
-// --------------------------------------------------------- 
-// wxDataViewCell
-// --------------------------------------------------------- 
+bool wxGtkDataViewListModelNotifier::Cleared()
+{
+    return false;
+}
+
+// ---------------------------------------------------------
+// wxDataViewRenderer
+// ---------------------------------------------------------
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
 
 
-wxDataViewCell::wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode ) :
-    wxDataViewCellBase( varianttype, mode )
+wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode ) :
+    wxDataViewRendererBase( varianttype, mode )
 {
     m_renderer = NULL;
 }
 
 {
     m_renderer = NULL;
 }
 
-// --------------------------------------------------------- 
-// wxDataViewTextCell
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+// wxDataViewTextRenderer
+// ---------------------------------------------------------
 
 extern "C" {
 
 extern "C" {
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, 
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     gchar *arg1, gchar *arg2, gpointer user_data );
 }
 
     gchar *arg1, gchar *arg2, gpointer user_data );
 }
 
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, 
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
-    wxDataViewTextCell *cell = (wxDataViewTextCell*) user_data;
-    
+    wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;
+
     wxString tmp = wxGTK_CONV_BACK( arg2 );
     wxVariant value = tmp;
     if (!cell->Validate( value ))
         return;
     wxString tmp = wxGTK_CONV_BACK( arg2 );
     wxVariant value = tmp;
     if (!cell->Validate( value ))
         return;
-        
+
     wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
     wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
-    
+
     GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
     GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
-    size_t model_row = (size_t)gtk_tree_path_get_indices (path)[0];
+    unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (path)[0];
     gtk_tree_path_free( path );
     gtk_tree_path_free( path );
-    
-    size_t model_col = cell->GetOwner()->GetModelColumn();
-    
+
+    unsigned int model_col = cell->GetOwner()->GetModelColumn();
+
     model->SetValue( value, model_col, model_row );
     model->ValueChanged( model_col, model_row );
 }
 
     model->SetValue( value, model_col, model_row );
     model->ValueChanged( model_col, model_row );
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewTextCell, wxDataViewCell)
+IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
 
 
-wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewCellMode mode ) :
-    wxDataViewCell( varianttype, mode )
+wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode ) :
+    wxDataViewRenderer( varianttype, mode )
 {
     m_renderer = (void*) gtk_cell_renderer_text_new();
 {
     m_renderer = (void*) gtk_cell_renderer_text_new();
-    
+
     if (m_mode & wxDATAVIEW_CELL_EDITABLE)
     {
         GValue gvalue = { 0, };
     if (m_mode & wxDATAVIEW_CELL_EDITABLE)
     {
         GValue gvalue = { 0, };
@@ -892,85 +935,143 @@ wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewC
         g_value_set_boolean( &gvalue, true );
         g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue );
         g_value_unset( &gvalue );
         g_value_set_boolean( &gvalue, true );
         g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue );
         g_value_unset( &gvalue );
-        
+
         g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
     }
 }
 
         g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
     }
 }
 
-bool wxDataViewTextCell::SetValue( const wxVariant &value )
+bool wxDataViewTextRenderer::SetValue( const wxVariant &value )
 {
     wxString tmp = value;
 {
     wxString tmp = value;
-    
+
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
     g_value_set_string( &gvalue, wxGTK_CONV( tmp ) );
     g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
     g_value_unset( &gvalue );
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
     g_value_set_string( &gvalue, wxGTK_CONV( tmp ) );
     g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
     g_value_unset( &gvalue );
-    
+
     return true;
 }
 
     return true;
 }
 
-bool wxDataViewTextCell::GetValue( wxVariant &value )
+bool wxDataViewTextRenderer::GetValue( wxVariant &value )
 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
     g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
     g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
-    wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &gvalue ) ); 
+    wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &gvalue ) );
     g_value_unset( &gvalue );
     g_value_unset( &gvalue );
-    
+
     value = tmp;
 
     return true;
 }
 
 // --------------------------------------------------------- 
     value = tmp;
 
     return true;
 }
 
 // --------------------------------------------------------- 
-// wxDataViewToggleCell
+// wxDataViewBitmapRenderer
 // --------------------------------------------------------- 
 
 // --------------------------------------------------------- 
 
+IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)
+
+wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode ) :
+    wxDataViewRenderer( varianttype, mode )
+{
+    m_renderer = (void*) gtk_cell_renderer_pixbuf_new();
+}
+
+bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
+{
+    if (value.GetType() == wxT("wxBitmap"))
+    {
+        wxBitmap bitmap;
+        bitmap << value;
+        
+        // This may create a Pixbuf representation in the
+        // wxBitmap object (and it will stay there)
+        GdkPixbuf *pixbuf = bitmap.GetPixbuf();
+        
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_OBJECT );
+        g_value_set_object( &gvalue, pixbuf );
+        g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue );
+        g_value_unset( &gvalue );
+        
+        return true;
+    }
+    
+    if (value.GetType() == wxT("wxIcon"))
+    {
+        wxIcon bitmap;
+        bitmap << value;
+        
+        // This may create a Pixbuf representation in the
+        // wxBitmap object (and it will stay there)
+        GdkPixbuf *pixbuf = bitmap.GetPixbuf();
+        
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_OBJECT );
+        g_value_set_object( &gvalue, pixbuf );
+        g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue );
+        g_value_unset( &gvalue );
+        
+        return true;
+    }
+    
+    return false;
+}
+
+bool wxDataViewBitmapRenderer::GetValue( wxVariant &value )
+{
+    return false;
+}
+    
+// ---------------------------------------------------------
+// wxDataViewToggleRenderer
+// ---------------------------------------------------------
+
 extern "C" {
 extern "C" {
-static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, 
+static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     gchar *path, gpointer user_data );
 }
 
     gchar *path, gpointer user_data );
 }
 
-static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, 
+static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     gchar *path, gpointer user_data )
 {
     gchar *path, gpointer user_data )
 {
-    wxDataViewToggleCell *cell = (wxDataViewToggleCell*) user_data;
+    wxDataViewToggleRenderer *cell = (wxDataViewToggleRenderer*) user_data;
 
 
-    // get old value    
+    // get old value
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(renderer), "active", &gvalue );
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(renderer), "active", &gvalue );
-    bool tmp = g_value_get_boolean( &gvalue ); 
+    bool tmp = g_value_get_boolean( &gvalue );
     g_value_unset( &gvalue );
     // invert it
     tmp = !tmp;
     g_value_unset( &gvalue );
     // invert it
     tmp = !tmp;
-    
+
     wxVariant value = tmp;
     if (!cell->Validate( value ))
         return;
     wxVariant value = tmp;
     if (!cell->Validate( value ))
         return;
-        
+
     wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
     wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
-    
+
     GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
     GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
-    size_t model_row = (size_t)gtk_tree_path_get_indices (gtk_path)[0];
+    unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (gtk_path)[0];
     gtk_tree_path_free( gtk_path );
     gtk_tree_path_free( gtk_path );
-    
-    size_t model_col = cell->GetOwner()->GetModelColumn();
-    
+
+    unsigned int model_col = cell->GetOwner()->GetModelColumn();
+
     model->SetValue( value, model_col, model_row );
     model->ValueChanged( model_col, model_row );
 }
 
     model->SetValue( value, model_col, model_row );
     model->ValueChanged( model_col, model_row );
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCell)
+IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
 
 
-wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, 
+wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode ) :
                         wxDataViewCellMode mode ) :
-    wxDataViewCell( varianttype, mode )
+    wxDataViewRenderer( varianttype, mode )
 {
     m_renderer = (void*) gtk_cell_renderer_toggle_new();
 {
     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 );
     }
     {
         g_signal_connect_after( m_renderer, "toggled", G_CALLBACK(wxGtkToggleRendererToggledCallback), this );
     }
@@ -992,35 +1093,35 @@ wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype,
     }
 }
 
     }
 }
 
-bool wxDataViewToggleCell::SetValue( const wxVariant &value )
+bool wxDataViewToggleRenderer::SetValue( const wxVariant &value )
 {
     bool tmp = value;
 {
     bool tmp = value;
-    
+
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_value_set_boolean( &gvalue, tmp );
     g_object_set_property( G_OBJECT(m_renderer), "active", &gvalue );
     g_value_unset( &gvalue );
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_value_set_boolean( &gvalue, tmp );
     g_object_set_property( G_OBJECT(m_renderer), "active", &gvalue );
     g_value_unset( &gvalue );
-    
+
     return true;
 }
 
     return true;
 }
 
-bool wxDataViewToggleCell::GetValue( wxVariant &value )
+bool wxDataViewToggleRenderer::GetValue( wxVariant &value )
 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(m_renderer), "active", &gvalue );
 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(m_renderer), "active", &gvalue );
-    bool tmp = g_value_get_boolean( &gvalue ); 
+    bool tmp = g_value_get_boolean( &gvalue );
     g_value_unset( &gvalue );
     g_value_unset( &gvalue );
-    
+
     value = tmp;
 
     return true;
 }
     value = tmp;
 
     return true;
 }
-    
-// --------------------------------------------------------- 
-// wxDataViewCustomCell
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
+// wxDataViewCustomRenderer
+// ---------------------------------------------------------
 
 class wxDataViewCtrlDC: public wxWindowDC
 {
 
 class wxDataViewCtrlDC: public wxWindowDC
 {
@@ -1043,31 +1144,31 @@ public:
     }
 };
 
     }
 };
 
-// --------------------------------------------------------- 
-// wxDataViewCustomCell
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+// wxDataViewCustomRenderer
+// ---------------------------------------------------------
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell)
+IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 
-wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype, 
+wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
                           wxDataViewCellMode mode, bool no_init ) :
                           wxDataViewCellMode mode, bool no_init ) :
-    wxDataViewCell( varianttype, mode )
+    wxDataViewRenderer( varianttype, mode )
 {
     m_dc = NULL;
 {
     m_dc = NULL;
-    
+
     if (no_init)
         m_renderer = NULL;
     else
         Init();
 }
 
     if (no_init)
         m_renderer = NULL;
     else
         Init();
 }
 
-bool wxDataViewCustomCell::Init()
+bool wxDataViewCustomRenderer::Init()
 {
     GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
     renderer->cell = this;
 {
     GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
     renderer->cell = this;
-    
+
     m_renderer = (void*) renderer;
     m_renderer = (void*) renderer;
-    
+
     if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
     {
         GValue gvalue = { 0, };
     if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
     {
         GValue gvalue = { 0, };
@@ -1076,17 +1177,17 @@ bool wxDataViewCustomCell::Init()
         g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue );
         g_value_unset( &gvalue );
     }
         g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue );
         g_value_unset( &gvalue );
     }
-    
+
     return true;
 }
 
     return true;
 }
 
-wxDataViewCustomCell::~wxDataViewCustomCell()
+wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
 {
     if (m_dc)
         delete m_dc;
 }
 
 {
     if (m_dc)
         delete m_dc;
 }
 
-wxDC *wxDataViewCustomCell::GetDC()
+wxDC *wxDataViewCustomRenderer::GetDC()
 {
     if (m_dc == NULL)
     {
 {
     if (m_dc == NULL)
     {
@@ -1096,28 +1197,28 @@ wxDC *wxDataViewCustomCell::GetDC()
             return NULL;
         m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() );
     }
             return NULL;
         m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() );
     }
-        
+
     return m_dc;
 }
     return m_dc;
 }
-    
-// --------------------------------------------------------- 
-// wxDataViewProgressCell
-// --------------------------------------------------------- 
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell)
+// ---------------------------------------------------------
+// wxDataViewProgressRenderer
+// ---------------------------------------------------------
 
 
-wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, 
+IMPLEMENT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer)
+
+wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
     const wxString &varianttype, wxDataViewCellMode mode ) :
     const wxString &varianttype, wxDataViewCellMode mode ) :
-    wxDataViewCustomCell( varianttype, mode, true )  
+    wxDataViewCustomRenderer( varianttype, mode, true )
 {
     m_label = label;
     m_value = 0;
 {
     m_label = label;
     m_value = 0;
-    
+
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
     {
         m_renderer = (void*) gtk_cell_renderer_progress_new();
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
     {
         m_renderer = (void*) gtk_cell_renderer_progress_new();
-        
+
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
         g_value_set_boolean( &gvalue, wxGTK_CONV(m_label) );
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
         g_value_set_boolean( &gvalue, wxGTK_CONV(m_label) );
@@ -1128,15 +1229,15 @@ wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label,
 #endif
     {
         // Use custom cell code
 #endif
     {
         // Use custom cell code
-        wxDataViewCustomCell::Init();
+        wxDataViewCustomRenderer::Init();
     }
 }
 
     }
 }
 
-wxDataViewProgressCell::~wxDataViewProgressCell()
+wxDataViewProgressRenderer::~wxDataViewProgressRenderer()
 {
 }
 
 {
 }
 
-bool wxDataViewProgressCell::SetValue( const wxVariant &value )
+bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
 {
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
 {
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
@@ -1152,15 +1253,15 @@ bool wxDataViewProgressCell::SetValue( const wxVariant &value )
 #endif
     {
         m_value = (long) value;
 #endif
     {
         m_value = (long) value;
-    
+
         if (m_value < 0) m_value = 0;
         if (m_value > 100) m_value = 100;
     }
         if (m_value < 0) m_value = 0;
         if (m_value > 100) m_value = 100;
     }
-    
+
     return true;
 }
     return true;
 }
-    
-bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state )
+
+bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
     double pct = (double)m_value / 100.0;
     wxRect bar = cell;
 {
     double pct = (double)m_value / 100.0;
     wxRect bar = cell;
@@ -1172,24 +1273,24 @@ bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state )
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
     dc->SetPen( *wxBLACK_PEN );
     dc->DrawRectangle( cell );
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
     dc->SetPen( *wxBLACK_PEN );
     dc->DrawRectangle( cell );
-    
+
     return true;
 }
 
     return true;
 }
 
-wxSize wxDataViewProgressCell::GetSize()
+wxSize wxDataViewProgressRenderer::GetSize()
 {
     return wxSize(40,12);
 }
 {
     return wxSize(40,12);
 }
-    
-// --------------------------------------------------------- 
-// wxDataViewDateCell
-// --------------------------------------------------------- 
 
 
-class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow
+// ---------------------------------------------------------
+// wxDataViewDateRenderer
+// ---------------------------------------------------------
+
+class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow
 {
 {
-public: 
-    wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value,
-        wxDataViewListModel *model, size_t col, size_t row ) :
+public:
+    wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value,
+        wxDataViewListModel *model, unsigned int col, unsigned int row ) :
         wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
     {
         m_model = model;
         wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
     {
         m_model = model;
@@ -1201,27 +1302,27 @@ public:
         SetSizer( sizer );
         sizer->Fit( this );
     }
         SetSizer( sizer );
         sizer->Fit( this );
     }
-    
+
     virtual void OnDismiss()
     {
     }
     virtual void OnDismiss()
     {
     }
-    
+
     void OnCalendar( wxCalendarEvent &event );
     void OnCalendar( wxCalendarEvent &event );
-    
+
     wxCalendarCtrl      *m_cal;
     wxCalendarCtrl      *m_cal;
-    wxDataViewListModel *m_model; 
-    size_t               m_col;
-    size_t               m_row;
-    
+    wxDataViewListModel *m_model;
+    unsigned int               m_col;
+    unsigned int               m_row;
+
 private:
     DECLARE_EVENT_TABLE()
 };
 
 private:
     DECLARE_EVENT_TABLE()
 };
 
-BEGIN_EVENT_TABLE(wxDataViewDateCellPopupTransient,wxPopupTransientWindow)
-    EVT_CALENDAR( -1, wxDataViewDateCellPopupTransient::OnCalendar )
+BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow)
+    EVT_CALENDAR( -1, wxDataViewDateRendererPopupTransient::OnCalendar )
 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 
-void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event )
+void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event )
 {
     wxDateTime date = event.GetDate();
     wxVariant value = date;
 {
     wxDateTime date = event.GetDate();
     wxVariant value = date;
@@ -1230,22 +1331,22 @@ void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event )
     DismissAndNotify();
 }
 
     DismissAndNotify();
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateCell, wxDataViewCustomCell)
+IMPLEMENT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer)
 
 
-wxDataViewDateCell::wxDataViewDateCell( const wxString &varianttype,
+wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode ) :
                         wxDataViewCellMode mode ) :
-    wxDataViewCustomCell( varianttype, mode )
+    wxDataViewCustomRenderer( varianttype, mode )
 {
 }
 {
 }
-    
-bool wxDataViewDateCell::SetValue( const wxVariant &value )
+
+bool wxDataViewDateRenderer::SetValue( const wxVariant &value )
 {
     m_date = value.GetDateTime();
 {
     m_date = value.GetDateTime();
-    
+
     return true;
 }
 
     return true;
 }
 
-bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int state )
+bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
     dc->SetFont( GetOwner()->GetOwner()->GetFont() );
     wxString tmp = m_date.FormatDate();
 {
     dc->SetFont( GetOwner()->GetOwner()->GetFont() );
     wxString tmp = m_date.FormatDate();
@@ -1254,7 +1355,7 @@ bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int state )
     return true;
 }
 
     return true;
 }
 
-wxSize wxDataViewDateCell::GetSize()
+wxSize wxDataViewDateRenderer::GetSize()
 {
     wxDataViewCtrl* view = GetOwner()->GetOwner();
     wxString tmp = m_date.FormatDate();
 {
     wxDataViewCtrl* view = GetOwner()->GetOwner();
     wxString tmp = m_date.FormatDate();
@@ -1263,12 +1364,13 @@ wxSize wxDataViewDateCell::GetSize()
     return wxSize(x,y+d);
 }
 
     return wxSize(x,y+d);
 }
 
-bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row )
+bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row )
 {
 {
-    wxVariant variant = model->GetValue( col, row );
+    wxVariant variant;
+    model->GetValue( variant, col, row );
     wxDateTime value = variant.GetDateTime();
 
     wxDateTime value = variant.GetDateTime();
 
-    wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient( 
+    wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(
         GetOwner()->GetOwner()->GetParent(), &value, model, col, row );
     wxPoint pos = wxGetMousePosition();
     popup->Move( pos );
         GetOwner()->GetOwner()->GetParent(), &value, model, col, row );
     wxPoint pos = wxGetMousePosition();
     popup->Move( pos );
@@ -1278,9 +1380,30 @@ bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size
     return true;
 }
 
     return true;
 }
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // wxDataViewColumn
 // wxDataViewColumn
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+
+
+static gboolean
+gtk_dataview_header_button_press_callback( GtkWidget *widget,
+                                           GdkEventButton *gdk_event,
+                                           wxDataViewColumn *column )
+{
+    if (gdk_event->type != GDK_BUTTON_PRESS)
+        return TRUE;
+        
+    if (gdk_event->button == 1)
+    {
+        wxDataViewCtrl *dv = column->GetOwner();
+        wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
+        event.SetDataViewColumn( column );
+        event.SetModel( dv->GetModel() );
+        dv->GetEventHandler()->ProcessEvent( event );
+    }
+    
+    return TRUE;
+}
 
 extern "C" {
 static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
 extern "C" {
 static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
@@ -1299,50 +1422,245 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 {
     g_return_if_fail (GTK_IS_WX_LIST_STORE (model));
     GtkWxListStore *list_store = (GtkWxListStore *) model;
 {
     g_return_if_fail (GTK_IS_WX_LIST_STORE (model));
     GtkWxListStore *list_store = (GtkWxListStore *) model;
-    
-    wxDataViewCell *cell = (wxDataViewCell*) data;
 
 
-    size_t model_row = (size_t) iter->user_data;
-    
-    wxVariant value = list_store->model->GetValue( 
-        cell->GetOwner()->GetModelColumn(), model_row );
+    wxDataViewRenderer *cell = (wxDataViewRenderer*) data;
+
+    unsigned int model_row = (unsigned int) iter->user_data;
+
+    wxVariant value;
+    list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );
 
     if (value.GetType() != cell->GetVariantType())
 
     if (value.GetType() != cell->GetVariantType())
-        wxPrintf( wxT("Wrong type\n") );
-                                            
+        wxLogError( wxT("Wrong type, required: %s but: %s"), 
+                    value.GetType().c_str(), 
+                    cell->GetVariantType().c_str() );
+
     cell->SetValue( value );
 }
 
     cell->SetValue( value );
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
+IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 
 
-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, 
-    size_t model_column, int flags ) :
-    wxDataViewColumnBase( title, cell, model_column, flags )
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, unsigned int model_column,
+    int width, int flags ) :
+    wxDataViewColumnBase( title, cell, model_column, width, flags )
 {
 {
+    m_isConnected = false;
+
     GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
     GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
-    
+
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
-   
-    gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
+    m_column = (void*) column;
     
     
-    gtk_tree_view_column_pack_start( column, renderer, TRUE );
+    gtk_tree_view_column_set_clickable( column, true );
     
     
-    gtk_tree_view_column_set_cell_data_func( column, renderer, 
+    SetTitle( title );
+
+    if (flags & wxDATAVIEW_COL_RESIZABLE)
+        gtk_tree_view_column_set_resizable( column, true );
+    if (flags & wxDATAVIEW_COL_HIDDEN)
+        gtk_tree_view_column_set_visible( column, false );
+    if (flags & wxDATAVIEW_COL_SORTABLE)
+        gtk_tree_view_column_set_sort_indicator( column, true );
+
+    if (width > 0)
+    {
+        gtk_tree_view_column_set_fixed_width( column, width );
+        gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
+    }
+
+    gtk_tree_view_column_pack_end( column, renderer, FALSE );
+
+    gtk_tree_view_column_set_cell_data_func( column, renderer,
         wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
         wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
-       
+
+}
+
+wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, unsigned int model_column,
+    int width, int flags ) :
+    wxDataViewColumnBase( bitmap, cell, model_column, width, flags )
+{
+    m_isConnected = false;
+    
+    GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
+
+    GtkTreeViewColumn *column = gtk_tree_view_column_new();
     m_column = (void*) column;
     m_column = (void*) column;
+
+    SetBitmap( bitmap );
+
+    if (flags & wxDATAVIEW_COL_RESIZABLE)
+        gtk_tree_view_column_set_resizable( column, true );
+    if (flags & wxDATAVIEW_COL_HIDDEN)
+        gtk_tree_view_column_set_visible( column, false );
+    if (flags & wxDATAVIEW_COL_SORTABLE)
+        gtk_tree_view_column_set_sort_indicator( column, true );
+
+    if (width > 0)
+    {
+        gtk_tree_view_column_set_fixed_width( column, width );
+        gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
+    }
+
+    gtk_tree_view_column_pack_end( column, renderer, FALSE );
+
+    gtk_tree_view_column_set_cell_data_func( column, renderer,
+        wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
 }
 
 wxDataViewColumn::~wxDataViewColumn()
 {
 }
 
 }
 
 wxDataViewColumn::~wxDataViewColumn()
 {
 }
 
+void wxDataViewColumn::OnInternalIdle()
+{
+    if (m_isConnected)
+        return;
+        
+    if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview))
+    {
+        GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+        if (column->button)
+        {
+            g_signal_connect(column->button, "button_press_event",
+                      G_CALLBACK (gtk_dataview_header_button_press_callback), this);
+    
+            m_isConnected = true;
+        }
+    }
+}
+
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
     wxDataViewColumnBase::SetTitle( title );
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
     wxDataViewColumnBase::SetTitle( title );
-    
+
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+    
+    if (m_isConnected)
+    {
+        // disconnect before column->button gets recreated
+        g_signal_handlers_disconnect_by_func( column->button, 
+                      (void*) gtk_dataview_header_button_press_callback, this);
+                      
+        m_isConnected = false;
+    }
+
     gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
     gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
+
+    gtk_tree_view_column_set_widget( column, NULL );
+}
+
+void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
+{
+    wxDataViewColumnBase::SetBitmap( bitmap );
+
+    GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+    if (bitmap.Ok())
+    {
+        GtkImage *gtk_image = GTK_IMAGE( gtk_image_new() );
+        
+        GdkBitmap *mask = (GdkBitmap *) NULL;
+        if (bitmap.GetMask())
+            mask = bitmap.GetMask()->GetBitmap();
+
+        if (bitmap.HasPixbuf())
+        {
+            gtk_image_set_from_pixbuf(GTK_IMAGE(gtk_image),
+                                      bitmap.GetPixbuf());
+        }
+        else
+        {
+            gtk_image_set_from_pixmap(GTK_IMAGE(gtk_image),
+                                      bitmap.GetPixmap(), mask);
+        }
+        gtk_widget_show( GTK_WIDGET(gtk_image) );
+        
+        gtk_tree_view_column_set_widget( column, GTK_WIDGET(gtk_image) );
+    }
+    else
+    {
+        gtk_tree_view_column_set_widget( column, NULL );
+    }
+}
+
+void wxDataViewColumn::SetAlignment( wxAlignment align )
+{
+    GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+    
+    gfloat xalign = 0.0;
+    if (align == wxALIGN_RIGHT)
+        xalign = 1.0;
+    if (align == wxALIGN_CENTER)
+        xalign = 0.5;
+        
+    gtk_tree_view_column_set_alignment( column, xalign );    
+}
+
+void wxDataViewColumn::SetSortable( bool sortable )
+{
+    GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+    gtk_tree_view_column_set_sort_indicator( column, sortable );
+}
+
+bool wxDataViewColumn::GetSortable()
+{
+    GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+    return gtk_tree_view_column_get_sort_indicator( column );
+}
+
+void wxDataViewColumn::SetSortOrder( bool ascending )
+{
+    GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+    
+    if (ascending)
+        gtk_tree_view_column_set_sort_order( column, GTK_SORT_ASCENDING );
+    else
+        gtk_tree_view_column_set_sort_order( column, GTK_SORT_DESCENDING );
+}
+
+bool wxDataViewColumn::IsSortOrderAscending()
+{
+    GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+    
+    return (gtk_tree_view_column_get_sort_order( column ) != GTK_SORT_DESCENDING);
+}
+
+int wxDataViewColumn::GetWidth()
+{
+    return gtk_tree_view_column_get_width( (GtkTreeViewColumn *)m_column );
+}
+
+void wxDataViewColumn::SetFixedWidth( int width )
+{
+    gtk_tree_view_column_set_fixed_width( (GtkTreeViewColumn *)m_column, width );
+}
+
+int wxDataViewColumn::GetFixedWidth()
+{
+    return gtk_tree_view_column_get_fixed_width( (GtkTreeViewColumn *)m_column );
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewCtrl signal callbacks
+//-----------------------------------------------------------------------------
+
+static void
+wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ROW_SELECTED, dv->GetId() );
+    event.SetRow( dv->GetSelection() );
+    event.SetModel( dv->GetModel() );
+    dv->GetEventHandler()->ProcessEvent( event );
+}
+
+static void
+wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path, 
+                                   GtkTreeViewColumn *column, wxDataViewCtrl *dv )
+{
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED, dv->GetId() );
+    unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0];
+    event.SetRow( row );
+    event.SetModel( dv->GetModel() );
+    dv->GetEventHandler()->ProcessEvent( event );
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
@@ -1353,45 +1671,74 @@ IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
 wxDataViewCtrl::~wxDataViewCtrl()
 {
 
 wxDataViewCtrl::~wxDataViewCtrl()
 {
+    if (m_notifier)
+        GetModel()->RemoveNotifier( m_notifier );
 }
 
 void wxDataViewCtrl::Init()
 {
 }
 
 void wxDataViewCtrl::Init()
 {
+    m_notifier = NULL;
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos, const wxSize& size, 
+           const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator )
 {
     Init();
            long style, const wxValidator& validator )
 {
     Init();
-    
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+
+    m_needParent = true;
+    m_acceptsFocus = true;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator ))
     {
         wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator ))
     {
         wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
-        return FALSE;
+        return false;
     }
 
     m_widget = gtk_scrolled_window_new (NULL, NULL);
     }
 
     m_widget = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (m_widget), GTK_SHADOW_IN);
+
+    GtkScrolledWindowSetBorder(m_widget, style);
 
     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);
-    
+
     m_parent->DoAddChild( this );
 
     m_parent->DoAddChild( this );
 
+    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);
+    g_signal_connect_after (m_treeview, "row_activated",
+                            G_CALLBACK (wxdataview_row_activated_callback), this);
+
     PostCreation(size);
 
     return true;
 }
 
     PostCreation(size);
 
     return true;
 }
 
+void wxDataViewCtrl::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+    
+    unsigned int cols = GetNumberOfColumns();
+    unsigned int i;
+    for (i = 0; i < cols; i++)
+    {
+        wxDataViewColumn *col = GetColumn( i );
+        col->OnInternalIdle();
+    }
+}
+
 bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
 bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
@@ -1400,14 +1747,13 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )
     GtkWxListStore *gtk_store = wxgtk_list_store_new();
     gtk_store->model = 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 );
 
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) );
     g_object_unref( gtk_store );
-    
+
     return true;
 }
 
     return true;
 }
 
@@ -1415,7 +1761,7 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
-        
+
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
 
     gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
 
     gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
@@ -1423,6 +1769,147 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     return true;
 }
 
     return true;
 }
 
+void wxDataViewCtrl::SetSelection( int row )
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    
+    if (row < 0)
+    {
+        gtk_tree_selection_unselect_all( selection );
+    }
+    else
+    {
+        GtkTreePath *path = gtk_tree_path_new ();
+        gtk_tree_path_append_index( path, row );
+        
+        gtk_tree_selection_select_path( selection, path );
+        
+        gtk_tree_path_free( path );
+    }
+}
 
 
-#endif // wxUSE_DATAVIEWCTRL
+void wxDataViewCtrl::Unselect( unsigned int row )
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    
+    GtkTreePath *path = gtk_tree_path_new ();
+    gtk_tree_path_append_index( path, row );
+        
+    gtk_tree_selection_unselect_path( selection, path );
+        
+    gtk_tree_path_free( path );
+}
+
+void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to )
+{
+}
+
+void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections)
+{
+}
+    
+bool wxDataViewCtrl::IsSelected( unsigned int row ) const
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    
+    GtkTreePath *path = gtk_tree_path_new ();
+    gtk_tree_path_append_index( path, row );
+    
+    gboolean ret =  gtk_tree_selection_path_is_selected( selection, path );
+    
+    gtk_tree_path_free( path );
+    
+    return ret;
+}
 
 
+int wxDataViewCtrl::GetSelection() const
+{
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    if (HasFlag(wxDV_MULTIPLE))
+    {
+        GtkTreeModel *model;
+        GList *list = gtk_tree_selection_get_selected_rows( selection, &model );
+        
+        // do something
+        if (list)
+        {
+            // list = g_list_nth( list, 0 );  should be a noop
+            GtkTreePath *path = (GtkTreePath*) list->data;
+            
+            unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0];
+        
+            // delete list
+            g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL );
+            g_list_free( list );
+            
+            return (int) row;
+        }
+    }
+    else
+    {
+        
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+        gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
+        if (has_selection)
+        {
+            unsigned int row = (wxUIntPtr) iter.user_data;
+            return (int) row;
+        }
+    }
+    
+    return -1;
+}
+
+int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const
+{
+    aSelections.Clear();
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+    if (HasFlag(wxDV_MULTIPLE))
+    {
+        GtkTreeModel *model;
+        GList *list = gtk_tree_selection_get_selected_rows( selection, &model );
+        
+        int count = 0;
+        while (list)
+        {
+            
+            // list = g_list_nth( list, 0 );  should be a noop
+            GtkTreePath *path = (GtkTreePath*) list->data;
+            
+            unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0];
+            
+            aSelections.Add( (int) row );
+        
+            list = g_list_next( list );            
+        }
+        
+        // delete list
+        g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL );
+        g_list_free( list );
+        
+        return count;
+    }
+    else
+    {
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+        gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
+        if (has_selection)
+        {
+            unsigned int row = (wxUIntPtr) iter.user_data;
+            aSelections.Add( (int) row );
+            return 1;
+        }
+    }
+    
+    return 0;
+}
+
+
+#endif
+    // !wxUSE_GENERICDATAVIEWCTRL
+
+#endif
+    // wxUSE_DATAVIEWCTRL
wxWidgets (Impactor)