[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.

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

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index f55b65de94d3f96de1234a61b5eb63a365e5dfdf..9ff06f25be678ce8829f5fa6565ce5d0162452f8 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,13 +10,21 @@
 // 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/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"


@@ -33,13 +41,6 @@
 
 class wxDataViewCtrl;
 
 
 class wxDataViewCtrl;
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -76,7 +77,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);


@@ -87,68 +87,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;


@@ -204,7 +204,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"
 
 //-----------------------------------------------------------------------------


@@ -238,15 +238,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( (size_t) index );

-    
+

     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
 
     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
 


@@ -255,8 +255,8 @@ 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);
 {
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
     g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);


@@ -276,23 +276,23 @@ 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) );
 {
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
     g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) );


@@ -301,14 +301,15 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model,
     wxString mtype = model->GetColType( (size_t) column );
     if (mtype == wxT("string"))
     {
     wxString mtype = model->GetColType( (size_t) column );
     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, (size_t) column, (size_t) 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;


@@ -325,29 +326,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;


@@ -355,72 +356,72 @@ 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;
 }


@@ -467,20 +468,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,


@@ -494,7 +495,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;


@@ -504,17 +505,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 );
     }
 


@@ -558,34 +559,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;
     wxDataViewCustomCell *cell = wxrenderer->cell;
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomCell *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 *


@@ -596,36 +597,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;
     wxDataViewCustomCell *cell = wxrenderer->cell;
 
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomCell *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))
     {


@@ -636,7 +637,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;


@@ -649,10 +650,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,


@@ -664,40 +665,41 @@ gtk_wx_cell_renderer_activate(
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomCell *cell = wxrenderer->cell;
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
     wxDataViewCustomCell *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 );
     size_t model_row = (size_t)gtk_tree_path_get_indices (treepath)[0];
     gtk_tree_path_free( treepath );
     GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
     size_t model_row = (size_t)gtk_tree_path_get_indices (treepath)[0];
     gtk_tree_path_free( treepath );

-    
+

     size_t model_col = cell->GetOwner()->GetModelColumn();
     size_t 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)
         {
             if (cell->LeftClick( pt, renderrect, model, model_col, model_row ))
                 ret = true;
         bool ret = false;
         if (button_event->button == 1)
         {
             if (cell->LeftClick( pt, renderrect, model, model_col, model_row ))
                 ret = true;

+            // TODO: query system double-click time

             if (button_event->time - wxrenderer->last_click < 400)
                 if (cell->Activate( renderrect, model, model_col, model_row ))
                     ret = true;
             if (button_event->time - wxrenderer->last_click < 400)
                 if (cell->Activate( renderrect, model, model_col, model_row ))
                     ret = true;


@@ -707,72 +709,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;
     }

-    
-    if (event->type == GDK_KEY_PRESS)
-    {
-        wxPrintf( wxT("key\n") );
-        GdkEventKey *key_event = (GdkEventKey*) event;
-        if ((key_event->keyval == GDK_Return) ||
-            (key_event->keyval == GDK_Linefeed) || 
-            (key_event->keyval == GDK_Execute))
-        {
-            return cell->Activate( renderrect, model, model_col, model_row );
-        } 
-    }
-    
+

     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 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 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 RowsReordered( size_t *new_order );

     virtual bool Cleared();
     virtual bool Cleared();

-    
+

     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()
 {
     size_t pos = m_wx_model->GetNumberOfRows()-1;
 bool wxGtkDataViewListModelNotifier::RowAppended()
 {
     size_t 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;
 }
 


@@ -781,12 +772,12 @@ 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;
 }
 


@@ -812,9 +803,58 @@ bool wxGtkDataViewListModelNotifier::RowChanged( size_t row )
     return true;
 }
 
     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 );
+        }
+
+        node = node->GetNext();
+    }
+
+    return true;
+}
+
+bool wxGtkDataViewListModelNotifier::RowsReordered( size_t *new_order )
+{
+    // Assume sizeof(size_t)= == sizeof(gint)
+
+    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) );
+
+        node = node->GetNext();
+    }
+
+    return true;

 }
 
 bool wxGtkDataViewListModelNotifier::Cleared()
 }
 
 bool wxGtkDataViewListModelNotifier::Cleared()


@@ -822,9 +862,9 @@ bool wxGtkDataViewListModelNotifier::Cleared()
     return false;
 }
 
     return false;
 }
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewCell
 // wxDataViewCell

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase)
 


@@ -834,33 +874,33 @@ wxDataViewCell::wxDataViewCell( const wxString &varianttype, wxDataViewCellMode
     m_renderer = NULL;
 }
 
     m_renderer = NULL;
 }
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewTextCell
 // wxDataViewTextCell

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 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 )
 {
     wxDataViewTextCell *cell = (wxDataViewTextCell*) user_data;
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
     wxDataViewTextCell *cell = (wxDataViewTextCell*) 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 );
     size_t model_row = (size_t)gtk_tree_path_get_indices (path)[0];
     gtk_tree_path_free( path );
     GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
     size_t model_row = (size_t)gtk_tree_path_get_indices (path)[0];
     gtk_tree_path_free( path );

-    
+

     size_t model_col = cell->GetOwner()->GetModelColumn();
     size_t 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 );
 }


@@ -871,7 +911,7 @@ wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewC
     wxDataViewCell( varianttype, mode )
 {
     m_renderer = (void*) gtk_cell_renderer_text_new();
     wxDataViewCell( varianttype, mode )
 {
     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, };


@@ -879,7 +919,7 @@ 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 );
     }
 }


@@ -887,13 +927,13 @@ wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewC
 bool wxDataViewTextCell::SetValue( const wxVariant &value )
 {
     wxString tmp = value;
 bool wxDataViewTextCell::SetValue( const wxVariant &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;
 }
 


@@ -902,62 +942,62 @@ bool wxDataViewTextCell::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
 // wxDataViewToggleCell

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 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 )
 {
     wxDataViewToggleCell *cell = (wxDataViewToggleCell*) user_data;
 
     gchar *path, gpointer user_data )
 {
     wxDataViewToggleCell *cell = (wxDataViewToggleCell*) 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 );
     size_t model_row = (size_t)gtk_tree_path_get_indices (gtk_path)[0];
     gtk_tree_path_free( gtk_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];
     gtk_tree_path_free( gtk_path );

-    
+

     size_t model_col = cell->GetOwner()->GetModelColumn();
     size_t model_col = cell->GetOwner()->GetModelColumn();

-    
+

     model->SetValue( value, model_col, model_row );
     model->ValueChanged( model_col, model_row );
 }
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCell)
 
     model->SetValue( value, model_col, model_row );
     model->ValueChanged( model_col, model_row );
 }
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCell)
 

-wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, 
+wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype,

                         wxDataViewCellMode mode ) :
     wxDataViewCell( varianttype, mode )
 {
     m_renderer = (void*) gtk_cell_renderer_toggle_new();
                         wxDataViewCellMode mode ) :
     wxDataViewCell( varianttype, mode )
 {
     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 );
     }


@@ -982,13 +1022,13 @@ wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype,
 bool wxDataViewToggleCell::SetValue( const wxVariant &value )
 {
     bool tmp = value;
 bool wxDataViewToggleCell::SetValue( const wxVariant &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;
 }
 


@@ -997,17 +1037,17 @@ bool wxDataViewToggleCell::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
 // wxDataViewCustomCell

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 class wxDataViewCtrlDC: public wxWindowDC
 {
 
 class wxDataViewCtrlDC: public wxWindowDC
 {


@@ -1030,18 +1070,18 @@ public:
     }
 };
 
     }
 };
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewCustomCell
 // wxDataViewCustomCell

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell)
 

-wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype, 
+wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype,

                           wxDataViewCellMode mode, bool no_init ) :
     wxDataViewCell( varianttype, mode )
 {
     m_dc = NULL;
                           wxDataViewCellMode mode, bool no_init ) :
     wxDataViewCell( varianttype, mode )
 {
     m_dc = NULL;

-    
+

     if (no_init)
         m_renderer = NULL;
     else
     if (no_init)
         m_renderer = NULL;
     else


@@ -1052,9 +1092,9 @@ bool wxDataViewCustomCell::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, };


@@ -1063,7 +1103,7 @@ 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;
 }
 


@@ -1083,28 +1123,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
 // wxDataViewProgressCell

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell)
 

-wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, 
+wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label,

     const wxString &varianttype, wxDataViewCellMode mode ) :
     const wxString &varianttype, wxDataViewCellMode mode ) :

-    wxDataViewCustomCell( varianttype, mode, true )  
+    wxDataViewCustomCell( 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) );


@@ -1139,14 +1179,14 @@ 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 )
 {
     double pct = (double)m_value / 100.0;
 bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state )
 {
     double pct = (double)m_value / 100.0;


@@ -1159,7 +1199,7 @@ 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;
 }
 


@@ -1167,10 +1207,55 @@ wxSize wxDataViewProgressCell::GetSize()
 {
     return wxSize(40,12);
 }
 {
     return wxSize(40,12);
 }

-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------

 // wxDataViewDateCell
 // wxDataViewDateCell

-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+
+class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow
+{
+public:
+    wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value,
+        wxDataViewListModel *model, size_t col, size_t row ) :
+        wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
+    {
+        m_model = model;
+        m_col = col;
+        m_row = row;
+        m_cal = new wxCalendarCtrl( this, -1, *value );
+        wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+        sizer->Add( m_cal, 1, wxGROW );
+        SetSizer( sizer );
+        sizer->Fit( this );
+    }
+
+    virtual void OnDismiss()
+    {
+    }
+
+    void OnCalendar( wxCalendarEvent &event );
+
+    wxCalendarCtrl      *m_cal;
+    wxDataViewListModel *m_model;
+    size_t               m_col;
+    size_t               m_row;
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxDataViewDateCellPopupTransient,wxPopupTransientWindow)
+    EVT_CALENDAR( -1, wxDataViewDateCellPopupTransient::OnCalendar )
+END_EVENT_TABLE()
+
+void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event )
+{
+    wxDateTime date = event.GetDate();
+    wxVariant value = date;
+    m_model->SetValue( value, m_col, m_row );
+    m_model->ValueChanged( m_col, m_row );
+    DismissAndNotify();
+}

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateCell, wxDataViewCustomCell)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateCell, wxDataViewCustomCell)
 


@@ -1179,11 +1264,11 @@ wxDataViewDateCell::wxDataViewDateCell( const wxString &varianttype,
     wxDataViewCustomCell( varianttype, mode )
 {
 }
     wxDataViewCustomCell( varianttype, mode )
 {
 }

-    
+

 bool wxDataViewDateCell::SetValue( const wxVariant &value )
 {
     m_date = value.GetDateTime();
 bool wxDataViewDateCell::SetValue( const wxVariant &value )
 {
     m_date = value.GetDateTime();

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -1207,13 +1292,23 @@ wxSize wxDataViewDateCell::GetSize()
 
 bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row )
 {
 
 bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row )
 {

+    wxVariant variant;
+    model->GetValue( variant, col, row );
+    wxDateTime value = variant.GetDateTime();
+
+    wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient(
+        GetOwner()->GetOwner()->GetParent(), &value, model, col, row );
+    wxPoint pos = wxGetMousePosition();
+    popup->Move( pos );
+    popup->Layout();
+    popup->Popup( popup->m_cal );

 
     return true;
 }
 
 
     return true;
 }
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewColumn
 // wxDataViewColumn

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 extern "C" {
 static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
 extern "C" {
 static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,


@@ -1232,37 +1327,47 @@ 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;
     wxDataViewCell *cell = (wxDataViewCell*) data;
 
     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())
 
     if (value.GetType() != cell->GetVariantType())

-        wxPrintf( wxT("Wrong type\n") );
-                                            
+        wxLogError( wxT("Wrong type\n") );
+

     cell->SetValue( value );
 }
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 
     cell->SetValue( value );
 }
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 

-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, 
-    size_t model_column, int flags ) :
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
+    int fixed_width, wxDataViewColumnSizing sizing, int flags ) :

     wxDataViewColumnBase( title, cell, model_column, flags )
 {
     GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
     wxDataViewColumnBase( title, cell, model_column, flags )
 {
     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) );
     gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );

-    
+
+    if (sizing == wxDATAVIEW_COL_WIDTH_FIXED)
+        gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
+    else if (sizing == wxDATAVIEW_COL_WIDTH_GROW)
+        gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_GROW_ONLY );
+    else
+        gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_AUTOSIZE );
+
+    if (fixed_width > 0)
+        gtk_tree_view_column_set_fixed_width( column, fixed_width );
+

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

-    
-    gtk_tree_view_column_set_cell_data_func( column, renderer, 
+
+    gtk_tree_view_column_set_cell_data_func( column, renderer,

         wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
         wxGtkTreeCellDataFunc, (gpointer) cell, NULL );

-       
+

     m_column = (void*) column;
 }
 
     m_column = (void*) column;
 }
 


@@ -1273,11 +1378,26 @@ wxDataViewColumn::~wxDataViewColumn()
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
     wxDataViewColumnBase::SetTitle( title );
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
     wxDataViewColumnBase::SetTitle( title );

-    
+

     GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
     gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
 }
 
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
     gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
 }
 

+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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------


@@ -1286,38 +1406,48 @@ 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 );
 
     PostCreation(size);
     m_parent->DoAddChild( this );
 
     PostCreation(size);


@@ -1333,14 +1463,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;
 }
 


@@ -1348,7 +1477,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 );


@@ -1356,6 +1485,8 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
     return true;
 }
 
     return true;
 }
 

+#endif
+    // !wxUSE_GENERICDATAVIEWCTRL

 
 

-#endif // wxUSE_DATAVIEWCTRL
-
+#endif
+    // wxUSE_DATAVIEWCTRL