X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/553f7d8f5608f18b99864cc36d46452d2e1ff05b..50f151d726bce4dc4179fbf98f8ee7c34691229c:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 8ac925600e..d0d6b5d919 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -15,8 +15,15 @@ #if wxUSE_DATAVIEWCTRL #include "wx/dataview.h" + +#ifndef wxUSE_GENERICDATAVIEWCTRL + #include "wx/stockitem.h" #include "wx/dcclient.h" +#include "wx/calctrl.h" +#include "wx/popupwin.h" +#include "wx/sizer.h" +#include "wx/log.h" #include "wx/gtk/private.h" #include "wx/gtk/win_gtk.h" @@ -25,19 +32,14 @@ #include #include +#include + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- class wxDataViewCtrl; -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -299,8 +301,9 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model, wxString mtype = model->GetColType( (size_t) column ); if (mtype == wxT("string")) { + wxVariant variant; g_value_init( value, G_TYPE_STRING ); - wxVariant variant = model->GetValue( (size_t) column, (size_t) iter->user_data ); + model->GetValue( variant, (size_t) column, (size_t) iter->user_data ); g_value_set_string( value, wxGTK_CONV(variant.GetString()) ); } else @@ -447,6 +450,7 @@ struct _GtkWxCellRenderer /*< private >*/ wxDataViewCustomCell *cell; + guint32 last_click; }; struct _GtkWxCellRendererClass @@ -522,6 +526,7 @@ static void gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell) { cell->cell = NULL; + cell->last_click = 0; } static void @@ -627,7 +632,11 @@ gtk_wx_cell_renderer_render (GtkCellRenderer *renderer, { wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); wxWindowDC* dc = (wxWindowDC*) cell->GetDC(); - dc->m_window = window; + if (dc->m_window == NULL) + { + dc->m_window = window; + dc->SetUpDC(); + } int state = 0; if (flags & GTK_CELL_RENDERER_SELECTED) @@ -670,8 +679,43 @@ gtk_wx_cell_renderer_activate( rect.height -= renderer->ypad * 2; wxRect renderrect( rect.x, rect.y, rect.width, rect.height ); + + 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 ); + + size_t model_col = cell->GetOwner()->GetModelColumn(); + + if (event->type == GDK_BUTTON_PRESS) + { + GdkEventButton *button_event = (GdkEventButton*) event; + wxPoint pt( ((int) button_event->x) - renderrect.x, + ((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; + // 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->button == 3) + { + if (cell->RightClick( pt, renderrect, model, model_col, model_row )) + ret = true; + } - return cell->Activate( renderrect ); + wxrenderer->last_click = button_event->time; + + return ret; + } + + return false; } // --------------------------------------------------------- @@ -689,6 +733,7 @@ public: virtual bool RowDeleted( size_t row ); virtual bool RowChanged( size_t row ); virtual bool ValueChanged( size_t col, size_t row ); + virtual bool RowsReordered( size_t *new_order ); virtual bool Cleared(); GtkWxListStore *m_gtk_store; @@ -758,9 +803,58 @@ bool wxGtkDataViewListModelNotifier::RowChanged( size_t row ) return true; } -bool wxGtkDataViewListModelNotifier::ValueChanged( size_t col, size_t row ) +bool wxGtkDataViewListModelNotifier::ValueChanged( size_t model_col, size_t model_row ) { - return RowChanged( row ); + // This adds GTK+'s missing MVC logic for ValueChanged + wxNode *node = GetOwner()->m_viewingColumns.GetFirst(); + while (node) + { + wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData(); + if (viewing_column->m_modelColumn == model_col) + { + GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview); + GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(viewing_column->m_viewColumn->GetGtkHandle()); + + // Get cell area + GtkTreePath *path = gtk_tree_path_new(); + gtk_tree_path_append_index( path, model_row ); + GdkRectangle cell_area; + gtk_tree_view_get_cell_area( widget, path, column, &cell_area ); + gtk_tree_path_free( path ); + + int ydiff = column->button->allocation.height; + // Redraw + gtk_widget_queue_draw_area( GTK_WIDGET(widget), + cell_area.x, ydiff + cell_area.y, cell_area.width, cell_area.height ); + } + + 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() @@ -903,7 +997,7 @@ wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, { 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 ); } @@ -963,16 +1057,16 @@ public: GtkWidget *widget = window->m_treeview; // Set later m_window = NULL; - + m_context = window->GtkGetPangoDefaultContext(); m_layout = pango_layout_new( m_context ); m_fontdesc = pango_font_description_copy( widget->style->font_desc ); m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget ); - SetUpDC(); - - m_owner = window; + // Set m_window later + // SetUpDC(); + // m_owner = window; } }; @@ -1022,7 +1116,13 @@ wxDataViewCustomCell::~wxDataViewCustomCell() wxDC *wxDataViewCustomCell::GetDC() { if (m_dc == NULL) + { + if (GetOwner() == NULL) + return NULL; + if (GetOwner()->GetOwner() == NULL) + return NULL; m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() ); + } return m_dc; } @@ -1108,6 +1208,104 @@ wxSize wxDataViewProgressCell::GetSize() return wxSize(40,12); } +// --------------------------------------------------------- +// 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) + +wxDataViewDateCell::wxDataViewDateCell( const wxString &varianttype, + wxDataViewCellMode mode ) : + wxDataViewCustomCell( varianttype, mode ) +{ +} + +bool wxDataViewDateCell::SetValue( const wxVariant &value ) +{ + m_date = value.GetDateTime(); + + return true; +} + +bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int state ) +{ + dc->SetFont( GetOwner()->GetOwner()->GetFont() ); + wxString tmp = m_date.FormatDate(); + dc->DrawText( tmp, cell.x, cell.y ); + + return true; +} + +wxSize wxDataViewDateCell::GetSize() +{ + wxDataViewCtrl* view = GetOwner()->GetOwner(); + wxString tmp = m_date.FormatDate(); + wxCoord x,y,d; + view->GetTextExtent( tmp, &x, &y, &d ); + return wxSize(x,y+d); +} + +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; +} + // --------------------------------------------------------- // wxDataViewColumn // --------------------------------------------------------- @@ -1134,11 +1332,11 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column, size_t model_row = (size_t) iter->user_data; - wxVariant value = list_store->model->GetValue( - cell->GetOwner()->GetModelColumn(), model_row ); + wxVariant value; + list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row ); if (value.GetType() != cell->GetVariantType()) - wxPrintf( wxT("Wrong type\n") ); + wxLogError( wxT("Wrong type\n") ); cell->SetValue( value ); } @@ -1183,10 +1381,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) wxDataViewCtrl::~wxDataViewCtrl() { + if (m_notifier) + GetModel()->RemoveNotifier( m_notifier ); } void wxDataViewCtrl::Init() { + m_notifier = NULL; } bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, @@ -1230,10 +1431,9 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model ) GtkWxListStore *gtk_store = wxgtk_list_store_new(); gtk_store->model = model; - wxGtkDataViewListModelNotifier *notifier = - new wxGtkDataViewListModelNotifier( gtk_store, model ); + m_notifier = new wxGtkDataViewListModelNotifier( gtk_store, model ); - model->SetNotifier( notifier ); + model->AddNotifier( m_notifier ); gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) ); g_object_unref( gtk_store ); @@ -1253,6 +1453,9 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) return true; } +#endif + // !wxUSE_GENERICDATAVIEWCTRL -#endif // wxUSE_DATAVIEWCTRL +#endif + // wxUSE_DATAVIEWCTRL