X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ee2c58bd8c50bee46936d0f88ccb41793400382..b64e7047020ed19c55fb0179e849554d138d8b06:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index ebd34b371f..49f3dedb26 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -299,6 +299,7 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model, GtkWxListStore *list_store = (GtkWxListStore *) tree_model; g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) ); +#if 0 wxDataViewListModel *model = list_store->model; wxString mtype = model->GetColType( (unsigned int) column ); if (mtype == wxT("string")) @@ -311,6 +312,7 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model, else { } +#endif #if 0 GtkTreeDataList *list; @@ -429,7 +431,7 @@ wxgtk_list_store_iter_parent (GtkTreeModel *tree_model, } //----------------------------------------------------------------------------- -// define new GTK+ class wxGtkCellRenderer +// define new GTK+ class wxGtkRendererRenderer //----------------------------------------------------------------------------- extern "C" { @@ -451,7 +453,7 @@ struct _GtkWxCellRenderer GtkCellRenderer parent; /*< private >*/ - wxDataViewCustomCell *cell; + wxDataViewCustomRenderer *cell; guint32 last_click; }; @@ -569,7 +571,7 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, gint *height) { GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; - wxDataViewCustomCell *cell = wxrenderer->cell; + wxDataViewCustomRenderer *cell = wxrenderer->cell; wxSize size = cell->GetSize(); @@ -615,7 +617,7 @@ gtk_wx_cell_renderer_render (GtkCellRenderer *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, @@ -666,7 +668,7 @@ gtk_wx_cell_renderer_activate( 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, @@ -879,19 +881,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; } // --------------------------------------------------------- -// wxDataViewTextCell +// wxDataViewTextRenderer // --------------------------------------------------------- extern "C" { @@ -902,7 +904,7 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, 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; @@ -921,10 +923,10 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer, 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(); @@ -940,20 +942,24 @@ wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewC } } -bool wxDataViewTextCell::SetValue( const wxVariant &value ) +bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) { wxString tmp = value; GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); +#if wxUSE_UNICODE g_value_set_string( &gvalue, wxGTK_CONV( tmp ) ); +#else + g_value_set_string( &gvalue, wxGTK_CONV_FONT( tmp, GetOwner()->GetOwner()->GetFont() ) ); +#endif g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); g_value_unset( &gvalue ); return true; } -bool wxDataViewTextCell::GetValue( wxVariant &value ) +bool wxDataViewTextRenderer::GetValue( wxVariant &value ) { GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); @@ -967,18 +973,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(); } -bool wxDataViewBitmapCell::SetValue( const wxVariant &value ) +bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) { if (value.GetType() == wxT("wxBitmap")) { @@ -1019,13 +1025,13 @@ bool wxDataViewBitmapCell::SetValue( const wxVariant &value ) return false; } -bool wxDataViewBitmapCell::GetValue( wxVariant &value ) +bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) { return false; } // --------------------------------------------------------- -// wxDataViewToggleCell +// wxDataViewToggleRenderer // --------------------------------------------------------- extern "C" { @@ -1036,7 +1042,7 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, 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, }; @@ -1063,11 +1069,11 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer, 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 ) : - wxDataViewCell( varianttype, mode ) + wxDataViewRenderer( varianttype, mode ) { m_renderer = (void*) gtk_cell_renderer_toggle_new(); @@ -1093,7 +1099,7 @@ wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, } } -bool wxDataViewToggleCell::SetValue( const wxVariant &value ) +bool wxDataViewToggleRenderer::SetValue( const wxVariant &value ) { bool tmp = value; @@ -1106,7 +1112,7 @@ bool wxDataViewToggleCell::SetValue( const wxVariant &value ) return true; } -bool wxDataViewToggleCell::GetValue( wxVariant &value ) +bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) { GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_BOOLEAN ); @@ -1120,7 +1126,7 @@ bool wxDataViewToggleCell::GetValue( wxVariant &value ) } // --------------------------------------------------------- -// wxDataViewCustomCell +// wxDataViewCustomRenderer // --------------------------------------------------------- class wxDataViewCtrlDC: public wxWindowDC @@ -1145,14 +1151,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 ) : - wxDataViewCell( varianttype, mode ) + wxDataViewRenderer( varianttype, mode ) { m_dc = NULL; @@ -1162,7 +1168,7 @@ wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype, Init(); } -bool wxDataViewCustomCell::Init() +bool wxDataViewCustomRenderer::Init() { GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new(); renderer->cell = this; @@ -1181,13 +1187,13 @@ bool wxDataViewCustomCell::Init() return true; } -wxDataViewCustomCell::~wxDataViewCustomCell() +wxDataViewCustomRenderer::~wxDataViewCustomRenderer() { if (m_dc) delete m_dc; } -wxDC *wxDataViewCustomCell::GetDC() +wxDC *wxDataViewCustomRenderer::GetDC() { if (m_dc == NULL) { @@ -1202,14 +1208,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 ) : - wxDataViewCustomCell( varianttype, mode, true ) + wxDataViewCustomRenderer( varianttype, mode, true ) { m_label = label; m_value = 0; @@ -1221,7 +1227,11 @@ wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_boolean( &gvalue, wxGTK_CONV(m_label) ); +#if wxUSE_UNICODE + g_value_set_string( &gvalue, wxGTK_CONV(m_label) ); +#else + g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) ); +#endif g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); g_value_unset( &gvalue ); } @@ -1229,23 +1239,23 @@ wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, #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)) { - gint tmp = (int) value; + gint tmp = (long) value; GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_INT ); - g_value_set_boolean( &gvalue, tmp ); + g_value_set_int( &gvalue, tmp ); g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue ); g_value_unset( &gvalue ); } @@ -1261,7 +1271,7 @@ bool wxDataViewProgressCell::SetValue( const wxVariant &value ) 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; @@ -1277,19 +1287,19 @@ bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state ) return true; } -wxSize wxDataViewProgressCell::GetSize() +wxSize wxDataViewProgressRenderer::GetSize() { return wxSize(40,12); } // --------------------------------------------------------- -// wxDataViewDateCell +// wxDataViewDateRenderer // --------------------------------------------------------- -class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow +class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow { public: - wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value, + wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, wxDataViewListModel *model, unsigned int col, unsigned int row ) : wxPopupTransientWindow( parent, wxBORDER_SIMPLE ) { @@ -1318,11 +1328,11 @@ private: DECLARE_EVENT_TABLE() }; -BEGIN_EVENT_TABLE(wxDataViewDateCellPopupTransient,wxPopupTransientWindow) - EVT_CALENDAR( -1, wxDataViewDateCellPopupTransient::OnCalendar ) +BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow) + EVT_CALENDAR( -1, wxDataViewDateRendererPopupTransient::OnCalendar ) END_EVENT_TABLE() -void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event ) +void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event ) { wxDateTime date = event.GetDate(); wxVariant value = date; @@ -1331,22 +1341,22 @@ void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event ) DismissAndNotify(); } -IMPLEMENT_CLASS(wxDataViewDateCell, wxDataViewCustomCell) +IMPLEMENT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer) -wxDataViewDateCell::wxDataViewDateCell( const wxString &varianttype, +wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype, 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; } -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(); @@ -1355,7 +1365,7 @@ bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int state ) return true; } -wxSize wxDataViewDateCell::GetSize() +wxSize wxDataViewDateRenderer::GetSize() { wxDataViewCtrl* view = GetOwner()->GetOwner(); wxString tmp = m_date.FormatDate(); @@ -1364,13 +1374,13 @@ wxSize wxDataViewDateCell::GetSize() 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(); - wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient( + wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( GetOwner()->GetOwner()->GetParent(), &value, model, col, row ); wxPoint pos = wxGetMousePosition(); popup->Move( pos ); @@ -1384,6 +1394,27 @@ bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, unsi // 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, @@ -1402,7 +1433,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, 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; @@ -1419,15 +1450,20 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, 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 ) { + m_isConnected = false; + 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 ); @@ -1437,29 +1473,186 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, 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 ); - } + else + gtk_tree_view_column_set_fixed_width( column, 70 ); // FIXME + + 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( 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; + + 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 ); + else + gtk_tree_view_column_set_fixed_width( column, 70 ); // FIXME + + 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() { } +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::SetOwner( wxDataViewCtrl *owner ) +{ + wxDataViewColumnBase::SetOwner( owner ); + + GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column; + +#if wxUSE_UNICODE +#else + gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(GetTitle(), GetOwner()->GetFont() ) ); +#endif +} + 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; + } + +#if wxUSE_UNICODE gtk_tree_view_column_set_title( column, wxGTK_CONV(title) ); +#else + if (GetOwner()) + gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(title, GetOwner()->GetFont() ) ); + else + gtk_tree_view_column_set_title( column, "" ); +#endif + + 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() @@ -1484,12 +1677,26 @@ int wxDataViewColumn::GetFixedWidth() static void wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv ) { + if (!GTK_WIDGET_REALIZED(dv->m_widget)) + return; + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ROW_SELECTED, dv->GetId() ); event.SetRow( dv->GetSelection() ); event.SetModel( dv->GetModel() ); dv->GetEventHandler()->ProcessEvent( event ); } +static void +wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path, + GtkTreeViewColumn *column, wxDataViewCtrl *dv ) +{ + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED, dv->GetId() ); + unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0]; + event.SetRow( row ); + event.SetModel( dv->GetModel() ); + dv->GetEventHandler()->ProcessEvent( event ); +} + //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- @@ -1530,6 +1737,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, m_treeview = gtk_tree_view_new(); gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); +#ifdef __WXGTK26__ + if (!gtk_check_version(2,6,0)) + gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), TRUE ); +#endif + if (style & wxDV_MULTIPLE) { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); @@ -1542,15 +1754,30 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); + PostCreation(size); + 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); - - PostCreation(size); + g_signal_connect_after (m_treeview, "row_activated", + G_CALLBACK (wxdataview_row_activated_callback), this); 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 )) @@ -1583,6 +1810,33 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) 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 ) @@ -1595,7 +1849,16 @@ void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections) 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 @@ -1683,6 +1946,13 @@ int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const return 0; } +// static +wxVisualAttributes +wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new); +} + #endif // !wxUSE_GENERICDATAVIEWCTRL