!__WX_DC_BLIT_FIXED__ case

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

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index ebd34b371f4e2d995e852dcc6074f49682b0bfc4..7d4d4eafb09437b20f4c141b93e9f2cc31e89c26 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -429,7 +429,7 @@ wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// 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;
 };
 


@@ -569,7 +569,7 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
                                gint            *height)
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
                                gint            *height)
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;

-    wxDataViewCustomCell *cell = wxrenderer->cell;
+    wxDataViewCustomRenderer *cell = wxrenderer->cell;

 
     wxSize size = cell->GetSize();
 
 
     wxSize size = cell->GetSize();
 


@@ -615,7 +615,7 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
 
 {
     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,


@@ -666,7 +666,7 @@ 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,


@@ -879,19 +879,19 @@ bool wxGtkDataViewListModelNotifier::Cleared()
 }
 
 // ---------------------------------------------------------
 }
 
 // ---------------------------------------------------------

-// wxDataViewCell
+// 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" {


@@ -902,7 +902,7 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
 static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     gchar *arg1, gchar *arg2, gpointer user_data )
 {
 static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     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;
 
     wxString tmp = wxGTK_CONV_BACK( arg2 );
     wxVariant value = tmp;


@@ -921,10 +921,10 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
     model->ValueChanged( model_col, model_row );
 }
 
     model->ValueChanged( model_col, model_row );
 }
 

-IMPLEMENT_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();
 


@@ -940,7 +940,7 @@ wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewC
     }
 }
 
     }
 }
 

-bool wxDataViewTextCell::SetValue( const wxVariant &value )
+bool wxDataViewTextRenderer::SetValue( const wxVariant &value )

 {
     wxString tmp = value;
 
 {
     wxString tmp = value;
 


@@ -953,7 +953,7 @@ bool wxDataViewTextCell::SetValue( const wxVariant &value )
     return true;
 }
 
     return true;
 }
 

-bool wxDataViewTextCell::GetValue( wxVariant &value )
+bool wxDataViewTextRenderer::GetValue( wxVariant &value )

 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );


@@ -967,18 +967,18 @@ bool wxDataViewTextCell::GetValue( wxVariant &value )
 }
 
 // --------------------------------------------------------- 
 }
 
 // --------------------------------------------------------- 

-// wxDataViewBitmapCell
+// wxDataViewBitmapRenderer

 // --------------------------------------------------------- 
 
 // --------------------------------------------------------- 
 

-IMPLEMENT_CLASS(wxDataViewBitmapCell, wxDataViewCell)
+IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)

 
 

-wxDataViewBitmapCell::wxDataViewBitmapCell( const wxString &varianttype, wxDataViewCellMode mode ) :
-    wxDataViewCell( varianttype, mode )
+wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode ) :
+    wxDataViewRenderer( varianttype, mode )

 {
     m_renderer = (void*) gtk_cell_renderer_pixbuf_new();
 }
 
 {
     m_renderer = (void*) gtk_cell_renderer_pixbuf_new();
 }
 

-bool wxDataViewBitmapCell::SetValue( const wxVariant &value )
+bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )

 {
     if (value.GetType() == wxT("wxBitmap"))
     {
 {
     if (value.GetType() == wxT("wxBitmap"))
     {


@@ -1019,13 +1019,13 @@ bool wxDataViewBitmapCell::SetValue( const wxVariant &value )
     return false;
 }
 
     return false;
 }
 

-bool wxDataViewBitmapCell::GetValue( wxVariant &value )
+bool wxDataViewBitmapRenderer::GetValue( wxVariant &value )

 {
     return false;
 }
     
 // ---------------------------------------------------------
 {
     return false;
 }
     
 // ---------------------------------------------------------

-// wxDataViewToggleCell
+// wxDataViewToggleRenderer

 // ---------------------------------------------------------
 
 extern "C" {
 // ---------------------------------------------------------
 
 extern "C" {


@@ -1036,7 +1036,7 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
 static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     gchar *path, gpointer user_data )
 {
 static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     gchar *path, gpointer user_data )
 {

-    wxDataViewToggleCell *cell = (wxDataViewToggleCell*) user_data;
+    wxDataViewToggleRenderer *cell = (wxDataViewToggleRenderer*) user_data;

 
     // get old value
     GValue gvalue = { 0, };
 
     // get old value
     GValue gvalue = { 0, };


@@ -1063,11 +1063,11 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     model->ValueChanged( model_col, model_row );
 }
 
     model->ValueChanged( model_col, model_row );
 }
 

-IMPLEMENT_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();
 


@@ -1093,7 +1093,7 @@ wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype,
     }
 }
 
     }
 }
 

-bool wxDataViewToggleCell::SetValue( const wxVariant &value )
+bool wxDataViewToggleRenderer::SetValue( const wxVariant &value )

 {
     bool tmp = value;
 
 {
     bool tmp = value;
 


@@ -1106,7 +1106,7 @@ bool wxDataViewToggleCell::SetValue( const wxVariant &value )
     return true;
 }
 
     return true;
 }
 

-bool wxDataViewToggleCell::GetValue( wxVariant &value )
+bool wxDataViewToggleRenderer::GetValue( wxVariant &value )

 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
 {
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_BOOLEAN );


@@ -1120,7 +1120,7 @@ bool wxDataViewToggleCell::GetValue( wxVariant &value )
 }
 
 // ---------------------------------------------------------
 }
 
 // ---------------------------------------------------------

-// wxDataViewCustomCell
+// wxDataViewCustomRenderer

 // ---------------------------------------------------------
 
 class wxDataViewCtrlDC: public wxWindowDC
 // ---------------------------------------------------------
 
 class wxDataViewCtrlDC: public wxWindowDC


@@ -1145,14 +1145,14 @@ public:
 };
 
 // ---------------------------------------------------------
 };
 
 // ---------------------------------------------------------

-// wxDataViewCustomCell
+// wxDataViewCustomRenderer

 // ---------------------------------------------------------
 
 // ---------------------------------------------------------
 

-IMPLEMENT_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;
 


@@ -1162,7 +1162,7 @@ wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype,
         Init();
 }
 
         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;


@@ -1181,13 +1181,13 @@ bool wxDataViewCustomCell::Init()
     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)
     {


@@ -1202,14 +1202,14 @@ wxDC *wxDataViewCustomCell::GetDC()
 }
 
 // ---------------------------------------------------------
 }
 
 // ---------------------------------------------------------

-// wxDataViewProgressCell
+// wxDataViewProgressRenderer

 // ---------------------------------------------------------
 
 // ---------------------------------------------------------
 

-IMPLEMENT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell)
+IMPLEMENT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer)

 
 

-wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label,
+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;


@@ -1229,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))


@@ -1261,7 +1261,7 @@ bool wxDataViewProgressCell::SetValue( const wxVariant &value )
     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;


@@ -1277,19 +1277,19 @@ bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state )
     return true;
 }
 
     return true;
 }
 

-wxSize wxDataViewProgressCell::GetSize()
+wxSize wxDataViewProgressRenderer::GetSize()

 {
     return wxSize(40,12);
 }
 
 // ---------------------------------------------------------
 {
     return wxSize(40,12);
 }
 
 // ---------------------------------------------------------

-// wxDataViewDateCell
+// wxDataViewDateRenderer

 // ---------------------------------------------------------
 
 // ---------------------------------------------------------
 

-class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow
+class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow

 {
 public:
 {
 public:

-    wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value,
+    wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value,

         wxDataViewListModel *model, unsigned int col, unsigned int row ) :
         wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
     {
         wxDataViewListModel *model, unsigned int col, unsigned int row ) :
         wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
     {


@@ -1318,11 +1318,11 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     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;


@@ -1331,22 +1331,22 @@ void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event )
     DismissAndNotify();
 }
 
     DismissAndNotify();
 }
 

-IMPLEMENT_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();
 
     return true;
 }
 
 {
     m_date = value.GetDateTime();
 
     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();


@@ -1355,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();


@@ -1364,13 +1364,13 @@ wxSize wxDataViewDateCell::GetSize()
     return wxSize(x,y+d);
 }
 
     return wxSize(x,y+d);
 }
 

-bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row )
+bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row )

 {
     wxVariant variant;
     model->GetValue( variant, col, row );
     wxDateTime value = variant.GetDateTime();
 
 {
     wxVariant variant;
     model->GetValue( variant, col, row );
     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 );


@@ -1384,6 +1384,27 @@ bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, unsi
 // 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,
                             GtkCellRenderer *cell,
 extern "C" {
 static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
                             GtkCellRenderer *cell,


@@ -1402,7 +1423,7 @@ 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;
+    wxDataViewRenderer *cell = (wxDataViewRenderer*) data;

 
     unsigned int model_row = (unsigned int) iter->user_data;
 
 
     unsigned int model_row = (unsigned int) iter->user_data;
 


@@ -1419,15 +1440,20 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
 IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 
 
 IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 

-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, unsigned int model_column,
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, unsigned int model_column,

     int width, int flags ) :
     wxDataViewColumnBase( title, cell, model_column, width, flags )
 {
     int width, int flags ) :
     wxDataViewColumnBase( title, cell, model_column, width, flags )
 {

+    m_isConnected = false;
+

     GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
 
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
     GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
 
     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_set_clickable( column, true );
+    
+    SetTitle( title );

 
     if (flags & wxDATAVIEW_COL_RESIZABLE)
         gtk_tree_view_column_set_resizable( column, true );
 
     if (flags & wxDATAVIEW_COL_RESIZABLE)
         gtk_tree_view_column_set_resizable( column, true );


@@ -1447,19 +1473,155 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell,
     gtk_tree_view_column_set_cell_data_func( column, renderer,
         wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
 
     gtk_tree_view_column_set_cell_data_func( column, renderer,
         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 );
 
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
 void wxDataViewColumn::SetTitle( const wxString &title )
 {
     wxDataViewColumnBase::SetTitle( title );
 
     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()
 }
 
 int wxDataViewColumn::GetWidth()


@@ -1490,6 +1652,17 @@ wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCt
     dv->GetEventHandler()->ProcessEvent( event );
 }
 
     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 );
+}
+

 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------


@@ -1545,12 +1718,27 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     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);
     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 ))


@@ -1583,6 +1771,33 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 
 void wxDataViewCtrl::SetSelection( int row )
 {
 
 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 );
+    }
+}
+
+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::SetSelectionRange( unsigned int from, unsigned int to )


@@ -1595,7 +1810,16 @@ void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections)
     
 bool wxDataViewCtrl::IsSelected( unsigned int row ) const
 {
     
 bool wxDataViewCtrl::IsSelected( unsigned int row ) const
 {

-    return false;
+    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
 }
 
 int wxDataViewCtrl::GetSelection() const