#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"
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreednd.h>
+#include <gdk/gdkkeysyms.h>
+
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxDataViewCtrl;
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
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
if (n == -1)
return FALSE;
- if (n >= (int) list_store->model->GetNumberOfRows())
+ if (n >= (int) list_store->model->GetNumberOfRows()-1)
return FALSE;
iter->user_data = (gpointer) ++n;
/*< private >*/
wxDataViewCustomCell *cell;
+ guint32 last_click;
};
struct _GtkWxCellRendererClass
{
GtkCellRendererClass cell_parent_class;
-
};
static GtkCellRenderer *gtk_wx_cell_renderer_new (void);
-static void gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell);
-static void gtk_wx_cell_renderer_class_init (GtkWxCellRendererClass *klass);
-static void gtk_wx_cell_renderer_finalize (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);
-static void gtk_wx_cell_renderer_render (GtkCellRenderer *cell,
- GdkWindow *window,
- GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
- GtkCellRendererState flags);
+static void gtk_wx_cell_renderer_init (
+ GtkWxCellRenderer *cell );
+static void gtk_wx_cell_renderer_class_init(
+ GtkWxCellRendererClass *klass );
+static void gtk_wx_cell_renderer_finalize (
+ 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 );
+static void gtk_wx_cell_renderer_render (
+ GtkCellRenderer *cell,
+ 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,
+ GtkWidget *widget,
+ const gchar *path,
+ GdkRectangle *background_area,
+ GdkRectangle *cell_area,
+ GtkCellRendererState flags );
static GObjectClass *cell_parent_class = NULL;
GType
gtk_wx_cell_renderer_get_type (void)
{
- static GType cell_wx_type = 0;
+ static GType cell_wx_type = 0;
- if (!cell_wx_type)
+ if (!cell_wx_type)
{
- static const GTypeInfo cell_wx_info =
- {
- sizeof (GtkWxCellRendererClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_wx_cell_renderer_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkWxCellRenderer),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_wx_cell_renderer_init,
- };
-
- cell_wx_type =
- g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkWxCellRenderer",
- &cell_wx_info, (GTypeFlags)0);
+ static const GTypeInfo cell_wx_info =
+ {
+ sizeof (GtkWxCellRendererClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_wx_cell_renderer_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkWxCellRenderer),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_wx_cell_renderer_init,
+ };
+
+ cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER,
+ "GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 );
}
- return cell_wx_type;
+ return cell_wx_type;
}
static void
gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell)
{
cell->cell = NULL;
+ cell->last_click = 0;
}
static void
cell_class->get_size = gtk_wx_cell_renderer_get_size;
cell_class->render = gtk_wx_cell_renderer_render;
+ cell_class->activate = gtk_wx_cell_renderer_activate;
}
static void
{
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)
}
}
+static gboolean
+gtk_wx_cell_renderer_activate(
+ GtkCellRenderer *renderer,
+ GdkEvent *event,
+ GtkWidget *widget,
+ const gchar *path,
+ GdkRectangle *background_area,
+ GdkRectangle *cell_area,
+ GtkCellRendererState flags )
+{
+ GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
+ wxDataViewCustomCell *cell = wxrenderer->cell;
+
+ GdkRectangle rect;
+ gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
+ &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;
+
+ 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;
+ }
+
+ wxrenderer->last_click = button_event->time;
+
+ return ret;
+ }
+
+ return false;
+}
+
// ---------------------------------------------------------
// wxGtkDataViewListModelNotifier
// ---------------------------------------------------------
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;
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()
if (m_mode & wxDATAVIEW_CELL_EDITABLE)
{
+ g_signal_connect_after( m_renderer, "toggled", G_CALLBACK(wxGtkToggleRendererToggledCallback), this );
+ }
+ else
+ {
+
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_BOOLEAN );
- g_value_set_boolean( &gvalue, true );
+ g_value_set_boolean( &gvalue, false );
g_object_set_property( G_OBJECT(m_renderer), "activatable", &gvalue );
g_value_unset( &gvalue );
-
- g_signal_connect_after( m_renderer, "toggled", G_CALLBACK(wxGtkToggleRendererToggledCallback), this );
+
+ GValue gvalue2 = { 0, };
+ g_value_init( &gvalue2, gtk_cell_renderer_mode_get_type() );
+ g_value_set_enum( &gvalue2, GTK_CELL_RENDERER_MODE_INERT );
+ g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue2 );
+ g_value_unset( &gvalue2 );
+
}
}
public:
wxDataViewCtrlDC( wxDataViewCtrl *window )
{
- GtkWidget *widget = window->GetHandle();
+ 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;
}
};
m_renderer = (void*) renderer;
+ if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
+ {
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
+ g_value_set_enum( &gvalue, GTK_CELL_RENDERER_MODE_ACTIVATABLE );
+ g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue );
+ g_value_unset( &gvalue );
+ }
+
return true;
}
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;
}
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
// ---------------------------------------------------------
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 );
}
wxDataViewCtrl::~wxDataViewCtrl()
{
+ if (m_notifier)
+ GetModel()->RemoveNotifier( m_notifier );
}
void wxDataViewCtrl::Init()
{
+ m_notifier = NULL;
}
bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
return FALSE;
}
+
+ m_widget = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (m_widget), GTK_SHADOW_IN);
+
+ m_treeview = gtk_tree_view_new();
+ gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
- m_widget = gtk_tree_view_new();
+ 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 );
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_widget), GTK_TREE_MODEL(gtk_store) );
+ gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) );
+ g_object_unref( gtk_store );
return true;
}
GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
- gtk_tree_view_append_column( GTK_TREE_VIEW(m_widget), column );
+ gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
return true;
}
projects / wxWidgets.git / blobdiff