X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d496ecbc48803b41b33e57d331895df5bfc7f56..6945b5878c8d46a56f1a59f558837a0943492f3c:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index f55b65de94..5239bad72f 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -17,6 +17,10 @@ #include "wx/dataview.h" #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" @@ -33,13 +37,6 @@ class wxDataViewCtrl; -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -301,8 +298,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 @@ -698,6 +696,7 @@ gtk_wx_cell_renderer_activate( { 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; @@ -713,18 +712,6 @@ gtk_wx_cell_renderer_activate( 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; } @@ -743,6 +730,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; @@ -812,9 +800,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() @@ -1172,6 +1209,51 @@ wxSize wxDataViewProgressCell::GetSize() // 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, @@ -1207,6 +1289,16 @@ wxSize wxDataViewDateCell::GetSize() 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; } @@ -1237,11 +1329,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 ); } @@ -1286,10 +1378,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, @@ -1333,10 +1428,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 );