#include "wx/calctrl.h"
#include "wx/popupwin.h"
#include "wx/icon.h"
+#include "wx/list.h"
+#include "wx/listimpl.cpp"
#include "wx/gtk/private.h"
#include <gobject/gvaluecollector.h>
#include <gtk/gtktreemodel.h>
+#include <gtk/gtktreesortable.h>
#include <gtk/gtktreednd.h>
#include <gdk/gdkkeysyms.h>
//-----------------------------------------------------------------------------
-// classes
//-----------------------------------------------------------------------------
-class wxDataViewCtrl;
+class wxDataViewCtrlInternal;
+
+wxDataViewCtrlInternal *g_internal = NULL;
+
+class wxGtkTreeModelNode;
+
+extern "C" {
+typedef struct _GtkWxTreeModel GtkWxTreeModel;
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewCtrlInternal
+//-----------------------------------------------------------------------------
+
+WX_DECLARE_LIST(wxDataViewItem, ItemList);
+WX_DEFINE_LIST(ItemList);
+
+class wxDataViewCtrlInternal
+{
+public:
+ wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *owner );
+ ~wxDataViewCtrlInternal();
+
+ gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path );
+ GtkTreePath *get_path( GtkTreeIter *iter);
+ GtkTreePath *get_path_safe( GtkTreeIter *iter);
+ gboolean iter_next( GtkTreeIter *iter );
+ gboolean iter_children( GtkTreeIter *iter, GtkTreeIter *parent);
+ gboolean iter_has_child( GtkTreeIter *iter );
+ gint iter_n_children( GtkTreeIter *iter );
+ gboolean iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n );
+ gboolean iter_parent( GtkTreeIter *iter, GtkTreeIter *child );
+
+ wxDataViewModel* GetDataViewModel() { return m_wx_model; }
+ wxDataViewCtrl* GetOwner() { return m_owner; }
+ GtkWxTreeModel* GetGtkModel() { return m_gtk_model; }
+
+ bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
+ bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
+ bool ItemChanged( const wxDataViewItem &item );
+ bool ValueChanged( const wxDataViewItem &item, unsigned int col );
+ bool Cleared();
+ void Resort();
+
+ void SetSortOrder( GtkSortType sort_order ) { m_sort_order = sort_order; }
+ GtkSortType GetSortOrder() { return m_sort_order; }
+
+protected:
+ void InitTree();
+ wxGtkTreeModelNode *FindNode( const wxDataViewItem &item );
+ wxGtkTreeModelNode *FindNode( GtkTreeIter *iter );
+ wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item );
+ wxGtkTreeModelNode *FindParentNode( GtkTreeIter *iter );
+ void BuildBranch( wxGtkTreeModelNode *branch );
+
+private:
+ wxGtkTreeModelNode *m_root;
+ wxDataViewModel *m_wx_model;
+ GtkWxTreeModel *m_gtk_model;
+ wxDataViewCtrl *m_owner;
+ GtkSortType m_sort_order;
+};
+
+
+//-----------------------------------------------------------------------------
+// wxGtkTreeModelNode
+//-----------------------------------------------------------------------------
+
+int LINKAGEMODE wxGtkTreeModelNodeCmp( void *id1, void *id2 );
+
+WX_DEFINE_ARRAY_PTR( wxGtkTreeModelNode*, wxGtkTreeModelNodes );
+WX_DEFINE_SORTED_ARRAY( void* , wxGtkTreeModelChildren );
+
+class wxGtkTreeModelNode
+{
+public:
+ wxGtkTreeModelNode( wxGtkTreeModelNode* parent, const wxDataViewItem &item,
+ wxDataViewCtrlInternal *internal )
+ {
+ m_parent = parent;
+ m_item = item;
+ m_internal = internal;
+ g_internal = internal;
+ m_children = new wxGtkTreeModelChildren( wxGtkTreeModelNodeCmp );
+ }
+
+ ~wxGtkTreeModelNode()
+ {
+ g_internal = m_internal;
+ size_t count = m_children->GetCount();
+ size_t i;
+ for (i = 0; i < count; i++)
+ {
+ wxGtkTreeModelNode *child = m_nodes.Item( i );
+ delete child;
+ }
+ delete m_children;
+ }
+
+ unsigned int AddNode( wxGtkTreeModelNode* child )
+ {
+ g_internal = m_internal;
+ m_nodes.Add( child );
+ return m_children->Add( child->GetItem().GetID() );
+ }
+
+ unsigned int AddLeave( void* id )
+ {
+ g_internal = m_internal;
+ return m_children->Add( id );
+ }
+
+ void DeleteChild( void* id )
+ {
+ g_internal = m_internal;
+ size_t pos;
+ size_t count = m_children->GetCount();
+ for (pos = 0; pos < count; pos++)
+ {
+ if (m_children->Item( pos ) == id)
+ {
+ m_children->RemoveAt( pos );
+ break;
+ }
+ }
+ count = m_nodes.GetCount();
+ for (pos = 0; pos < count; pos++)
+ {
+ wxGtkTreeModelNode *node = m_nodes.Item( pos );
+ if (node->GetItem().GetID() == id)
+ {
+ m_nodes.RemoveAt( pos );
+ delete node;
+ break;
+ }
+ }
+
+ }
+
+ wxGtkTreeModelNode* GetParent()
+ { return m_parent; }
+ wxGtkTreeModelNodes &GetNodes()
+ { return m_nodes; }
+ wxGtkTreeModelChildren &GetChildren()
+ { return *m_children; }
+
+ unsigned int GetChildCount() { return m_children->GetCount(); }
+ unsigned int GetNodesCount() { return m_nodes.GetCount(); }
+
+ wxDataViewItem &GetItem() { return m_item; }
+ wxDataViewCtrlInternal *GetInternal() { return m_internal; }
+
+ void Resort();
+
+private:
+ wxGtkTreeModelNode *m_parent;
+ wxGtkTreeModelNodes m_nodes;
+ wxGtkTreeModelChildren *m_children;
+ wxDataViewItem m_item;
+ wxDataViewCtrlInternal *m_internal;
+};
+
+
+int LINKAGEMODE wxGtkTreeModelNodeCmp( void* id1, void* id2 )
+{
+ int ret = g_internal->GetDataViewModel()->Compare( id1, id2 );
+ if (g_internal->GetSortOrder() == GTK_SORT_DESCENDING)
+ return -ret;
+ return ret;
+}
//-----------------------------------------------------------------------------
// data
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
-// define new GTK+ class wxGtkListStore
+// define new GTK+ class wxGtkTreeModel
//-----------------------------------------------------------------------------
extern "C" {
-#define GTK_TYPE_WX_LIST_STORE (gtk_wx_list_store_get_type ())
-#define GTK_WX_LIST_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_LIST_STORE, GtkWxListStore))
-#define GTK_WX_LIST_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_LIST_STORE, GtkWxListStoreClass))
-#define GTK_IS_WX_LIST_STORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_LIST_STORE))
-#define GTK_IS_WX_LIST_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_LIST_STORE))
-#define GTK_WX_LIST_STORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_LIST_STORE, GtkWxListStoreClass))
+#define GTK_TYPE_WX_TREE_MODEL (gtk_wx_tree_model_get_type ())
+#define GTK_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModel))
+#define GTK_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass))
+#define GTK_IS_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_TREE_MODEL))
+#define GTK_IS_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_TREE_MODEL))
+#define GTK_WX_TREE_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass))
-GType gtk_wx_list_store_get_type (void);
+GType gtk_wx_tree_model_get_type (void);
-typedef struct _GtkWxListStore GtkWxListStore;
-typedef struct _GtkWxListStoreClass GtkWxListStoreClass;
+typedef struct _GtkWxTreeModelClass GtkWxTreeModelClass;
-struct _GtkWxListStore
+struct _GtkWxTreeModel
{
GObject parent;
/*< private >*/
gint stamp;
- wxDataViewListModel *model;
+ wxDataViewCtrlInternal *internal;
};
-struct _GtkWxListStoreClass
+struct _GtkWxTreeModelClass
{
GObjectClass list_parent_class;
};
-static GtkWxListStore *wxgtk_list_store_new (void);
-static void wxgtk_list_store_init (GtkWxListStore *list_store);
-static void wxgtk_list_store_class_init (GtkWxListStoreClass *klass);
-static void wxgtk_list_store_tree_model_init (GtkTreeModelIface *iface);
-static void wxgtk_list_store_finalize (GObject *object);
-static GtkTreeModelFlags wxgtk_list_store_get_flags (GtkTreeModel *tree_model);
-static gint wxgtk_list_store_get_n_columns (GtkTreeModel *tree_model);
-static GType wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
+static GtkWxTreeModel *wxgtk_tree_model_new (void);
+static void wxgtk_tree_model_init (GtkWxTreeModel *tree_model);
+static void wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass);
+static void wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface);
+static void wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface);
+static void wxgtk_tree_model_finalize (GObject *object);
+static GtkTreeModelFlags wxgtk_tree_model_get_flags (GtkTreeModel *tree_model);
+static gint wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model);
+static GType wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model,
gint index);
-static gboolean wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
+static gboolean wxgtk_tree_model_get_iter (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreePath *path);
-static GtkTreePath *wxgtk_list_store_get_path (GtkTreeModel *tree_model,
+static GtkTreePath *wxgtk_tree_model_get_path (GtkTreeModel *tree_model,
GtkTreeIter *iter);
-static void wxgtk_list_store_get_value (GtkTreeModel *tree_model,
+static GtkTreePath *wxgtk_tree_model_get_path_safe (GtkTreeModel *tree_model,
+ GtkTreeIter *iter);
+static void wxgtk_tree_model_get_value (GtkTreeModel *tree_model,
GtkTreeIter *iter,
gint column,
GValue *value);
-static gboolean wxgtk_list_store_iter_next (GtkTreeModel *tree_model,
+static gboolean wxgtk_tree_model_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter);
-static gboolean wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
+static gboolean wxgtk_tree_model_iter_children (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent);
-static gboolean wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
+static gboolean wxgtk_tree_model_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter);
-static gint wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
+static gint wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter);
-static gboolean wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
+static gboolean wxgtk_tree_model_iter_nth_child (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent,
gint n);
-static gboolean wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
+static gboolean wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *child);
+/* sortable */
+static gboolean wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable,
+ gint *sort_column_id,
+ GtkSortType *order);
+static void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkSortType order);
+static void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy);
+static void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy);
+static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable);
+
+
+
static GObjectClass *list_parent_class = NULL;
GType
-gtk_wx_list_store_get_type (void)
+gtk_wx_tree_model_get_type (void)
{
- static GType list_store_type = 0;
+ static GType tree_model_type = 0;
- if (!list_store_type)
+ if (!tree_model_type)
{
- const GTypeInfo list_store_info =
+ const GTypeInfo tree_model_info =
{
- sizeof (GtkWxListStoreClass),
+ sizeof (GtkWxTreeModelClass),
NULL, /* base_init */
NULL, /* base_finalize */
- (GClassInitFunc) wxgtk_list_store_class_init,
+ (GClassInitFunc) wxgtk_tree_model_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
- sizeof (GtkWxListStore),
+ sizeof (GtkWxTreeModel),
0,
- (GInstanceInitFunc) wxgtk_list_store_init,
+ (GInstanceInitFunc) wxgtk_tree_model_init,
+ };
+
+ static const GInterfaceInfo tree_model_iface_info =
+ {
+ (GInterfaceInitFunc) wxgtk_tree_model_tree_model_init,
+ NULL,
+ NULL
};
- static const GInterfaceInfo tree_model_info =
- {
- (GInterfaceInitFunc) wxgtk_list_store_tree_model_init,
- NULL,
- NULL
- };
+ static const GInterfaceInfo sortable_iface_info =
+ {
+ (GInterfaceInitFunc) wxgtk_tree_model_sortable_init,
+ NULL,
+ NULL
+ };
- list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxListStore",
- &list_store_info, (GTypeFlags)0 );
+ tree_model_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxTreeModel",
+ &tree_model_info, (GTypeFlags)0 );
- g_type_add_interface_static (list_store_type,
- GTK_TYPE_TREE_MODEL,
- &tree_model_info);
+ g_type_add_interface_static (tree_model_type,
+ GTK_TYPE_TREE_MODEL,
+ &tree_model_iface_info);
+ g_type_add_interface_static (tree_model_type,
+ GTK_TYPE_TREE_SORTABLE,
+ &sortable_iface_info);
}
- return list_store_type;
+ return tree_model_type;
}
-static GtkWxListStore *
-wxgtk_list_store_new(void)
+static GtkWxTreeModel *
+wxgtk_tree_model_new(void)
{
- GtkWxListStore *retval = (GtkWxListStore *) g_object_new (GTK_TYPE_WX_LIST_STORE, NULL);
+ GtkWxTreeModel *retval = (GtkWxTreeModel *) g_object_new (GTK_TYPE_WX_TREE_MODEL, NULL);
return retval;
}
static void
-wxgtk_list_store_class_init (GtkWxListStoreClass *klass)
+wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass)
{
list_parent_class = (GObjectClass*) g_type_class_peek_parent (klass);
GObjectClass *object_class = (GObjectClass*) klass;
- object_class->finalize = wxgtk_list_store_finalize;
+ object_class->finalize = wxgtk_tree_model_finalize;
}
static void
-wxgtk_list_store_tree_model_init (GtkTreeModelIface *iface)
-{
- iface->get_flags = wxgtk_list_store_get_flags;
- iface->get_n_columns = wxgtk_list_store_get_n_columns;
- iface->get_column_type = wxgtk_list_store_get_column_type;
- iface->get_iter = wxgtk_list_store_get_iter;
- iface->get_path = wxgtk_list_store_get_path;
- iface->get_value = wxgtk_list_store_get_value;
- iface->iter_next = wxgtk_list_store_iter_next;
- iface->iter_children = wxgtk_list_store_iter_children;
- iface->iter_has_child = wxgtk_list_store_iter_has_child;
- iface->iter_n_children = wxgtk_list_store_iter_n_children;
- iface->iter_nth_child = wxgtk_list_store_iter_nth_child;
- iface->iter_parent = wxgtk_list_store_iter_parent;
+wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface)
+{
+ iface->get_flags = wxgtk_tree_model_get_flags;
+ iface->get_n_columns = wxgtk_tree_model_get_n_columns;
+ iface->get_column_type = wxgtk_tree_model_get_column_type;
+ iface->get_iter = wxgtk_tree_model_get_iter;
+ iface->get_path = wxgtk_tree_model_get_path;
+ iface->get_value = wxgtk_tree_model_get_value;
+ iface->iter_next = wxgtk_tree_model_iter_next;
+ iface->iter_children = wxgtk_tree_model_iter_children;
+ iface->iter_has_child = wxgtk_tree_model_iter_has_child;
+ iface->iter_n_children = wxgtk_tree_model_iter_n_children;
+ iface->iter_nth_child = wxgtk_tree_model_iter_nth_child;
+ iface->iter_parent = wxgtk_tree_model_iter_parent;
}
static void
-wxgtk_list_store_init (GtkWxListStore *list_store)
+wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface)
{
- list_store->model = NULL;
- list_store->stamp = g_random_int();
+ iface->get_sort_column_id = wxgtk_tree_model_get_sort_column_id;
+ iface->set_sort_column_id = wxgtk_tree_model_set_sort_column_id;
+ iface->set_sort_func = wxgtk_tree_model_set_sort_func;
+ iface->set_default_sort_func = wxgtk_tree_model_set_default_sort_func;
+ iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func;
}
static void
-wxgtk_list_store_finalize (GObject *object)
+wxgtk_tree_model_init (GtkWxTreeModel *tree_model)
{
- /* GtkWxListStore *list_store = GTK_WX_LIST_STORE (object); */
-
- /* we need to sort out, which class deletes what */
- /* delete list_store->model; */
+ tree_model->internal = NULL;
+ tree_model->stamp = g_random_int();
+}
+static void
+wxgtk_tree_model_finalize (GObject *object)
+{
/* must chain up */
(* list_parent_class->finalize) (object);
}
} // extern "C"
//-----------------------------------------------------------------------------
-// implement callbacks from wxGtkListStore class by letting
-// them call the methods of wxWidgets' wxDataViewListModel
+// implement callbacks from wxGtkTreeModel class by letting
+// them call the methods of wxWidgets' wxDataViewModel
//-----------------------------------------------------------------------------
static GtkTreeModelFlags
-wxgtk_list_store_get_flags (GtkTreeModel *tree_model)
+wxgtk_tree_model_get_flags (GtkTreeModel *tree_model)
{
- g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), (GtkTreeModelFlags)0 );
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (tree_model), (GtkTreeModelFlags)0 );
- // GTK+ list store uses a linked list for storing the
- // items and a pointer to a child is used as the member
- // field of a GtkTreeIter. This means that the iter is
- // valid in the GtkListStore as long as the child exists.
- // We use the index of the row and since the index of a
- // specific row will change if a row above is deleted,
- // the iter does not persist
- return /* GTK_TREE_MODEL_ITERS_PERSIST | */ GTK_TREE_MODEL_LIST_ONLY;
+ return GTK_TREE_MODEL_ITERS_PERSIST;
}
static gint
-wxgtk_list_store_get_n_columns (GtkTreeModel *tree_model)
+wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model)
{
- GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
- g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), 0);
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), 0);
- return list_store->model->GetNumberOfCols();
+ return wxtree_model->internal->GetDataViewModel()->GetColumnCount();
}
static GType
-wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
+wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model,
gint index)
{
- GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
- g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), G_TYPE_INVALID);
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), G_TYPE_INVALID);
GType gtype = G_TYPE_INVALID;
- wxString wxtype = list_store->model->GetColType( (unsigned int) index );
+ wxString wxtype = wxtree_model->internal->GetDataViewModel()->GetColumnType( (unsigned int) index );
if (wxtype == wxT("string"))
gtype = G_TYPE_STRING;
}
static gboolean
-wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
+wxgtk_tree_model_get_iter (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreePath *path)
{
- GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
- g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
- unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];
-
- if (i >= list_store->model->GetNumberOfRows())
- return FALSE;
+ return wxtree_model->internal->get_iter( iter, path );
+}
- iter->stamp = list_store->stamp;
- // user_data is just the index
- iter->user_data = (gpointer) i;
+static GtkTreePath *
+wxgtk_tree_model_get_path (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
+{
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), NULL);
+ g_return_val_if_fail (iter->stamp == GTK_WX_TREE_MODEL (wxtree_model)->stamp, NULL);
- return TRUE;
+ return wxtree_model->internal->get_path( iter );
}
static GtkTreePath *
-wxgtk_list_store_get_path (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+wxgtk_tree_model_get_path_safe (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
{
- g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), NULL);
- g_return_val_if_fail (iter->stamp == GTK_WX_LIST_STORE (tree_model)->stamp, NULL);
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), NULL);
+ g_return_val_if_fail (iter->stamp == GTK_WX_TREE_MODEL (wxtree_model)->stamp, NULL);
- GtkTreePath *retval = gtk_tree_path_new ();
- // user_data is just the index
- int i = (wxUIntPtr) iter->user_data;
- gtk_tree_path_append_index (retval, i);
- return retval;
+ return wxtree_model->internal->get_path_safe( iter );
}
static void
-wxgtk_list_store_get_value (GtkTreeModel *tree_model,
+wxgtk_tree_model_get_value (GtkTreeModel *tree_model,
GtkTreeIter *iter,
gint column,
GValue *value)
{
- GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
- g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) );
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model) );
- wxDataViewListModel *model = list_store->model;
- wxString mtype = model->GetColType( (unsigned int) column );
+ wxDataViewModel *model = wxtree_model->internal->GetDataViewModel();
+ wxString mtype = model->GetColumnType( (unsigned int) column );
if (mtype == wxT("string"))
{
wxVariant variant;
g_value_init( value, G_TYPE_STRING );
- model->GetValue( variant,
- (unsigned int) column,
- (unsigned int) iter->user_data );
+ wxDataViewItem item( (void*) iter->user_data );
+ model->GetValue( variant, item, (unsigned int) column );
- // FIXME: we should support different encodings here
- g_value_set_string( value, wxGTK_CONV_SYS(variant.GetString()) );
+ g_value_set_string( value, variant.GetString().utf8_str() );
}
else
{
}
static gboolean
-wxgtk_list_store_iter_next (GtkTreeModel *tree_model,
+wxgtk_tree_model_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
- GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-
- g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE);
-
- int n = (wxUIntPtr) iter->user_data;
-
- if (n == -1)
- return FALSE;
-
- if (n >= (int) list_store->model->GetNumberOfRows()-1)
- return FALSE;
-
- iter->user_data = (gpointer) ++n;
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+ g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
- return TRUE;
+ return wxtree_model->internal->iter_next( iter );
}
static gboolean
-wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
+wxgtk_tree_model_iter_children (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent)
{
- g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
- GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-
- // this is a list, nodes have no children
- if (parent)
- return FALSE;
-
- iter->stamp = list_store->stamp;
- iter->user_data = (gpointer) -1;
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+ g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE);
- return TRUE;
+ return wxtree_model->internal->iter_children( iter, parent );
}
static gboolean
-wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
+wxgtk_tree_model_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- return FALSE;
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+ g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
+
+ return wxtree_model->internal->iter_has_child( iter );
}
static gint
-wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
+wxgtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), -1);
- GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
-
- if (iter == NULL)
- return (gint) list_store->model->GetNumberOfRows();
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+ g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0);
- g_return_val_if_fail (list_store->stamp == iter->stamp, -1);
-
- return 0;
+ return wxtree_model->internal->iter_n_children( iter );
}
static gboolean
-wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
+wxgtk_tree_model_iter_nth_child (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent,
gint n)
{
- g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
- GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
- if (parent)
- return FALSE;
+ return wxtree_model->internal->iter_nth_child( iter, parent, n );
+}
- if (n < 0)
- return FALSE;
+static gboolean
+wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ GtkTreeIter *child)
+{
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
+ g_return_val_if_fail (wxtree_model->stamp == child->stamp, FALSE);
+
+ return wxtree_model->internal->iter_parent( iter, child );
+}
- if (n >= (gint) list_store->model->GetNumberOfRows())
- return FALSE;
+/* sortable */
+gboolean wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable,
+ gint *sort_column_id,
+ GtkSortType *order)
+{
+ GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
- iter->stamp = list_store->stamp;
- iter->user_data = (gpointer) n;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE);
+ if (sort_column_id)
+ *sort_column_id = tree_model->internal->GetDataViewModel()->GetSortingColumn();
+
+ if (order)
+ *order = tree_model->internal->GetSortOrder();
+
return TRUE;
}
-static gboolean
-wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreeIter *child)
+void wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkSortType order)
+{
+ GtkWxTreeModel *tree_model = (GtkWxTreeModel *) sortable;
+ g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+
+ if ((sort_column_id == (gint) tree_model->internal->GetDataViewModel()->GetSortingColumn()) &&
+ (order == tree_model->internal->GetSortOrder()))
+ return;
+
+ tree_model->internal->GetDataViewModel()->SetSortingColumn( sort_column_id );
+
+ tree_model->internal->SetSortOrder( order );
+
+ gtk_tree_sortable_sort_column_changed (sortable);
+
+ tree_model->internal->GetDataViewModel()->Resort();
+}
+
+void wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy)
+{
+ g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+ g_return_if_fail (func != NULL);
+}
+
+void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy)
+{
+ g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) );
+ g_return_if_fail (func != NULL);
+
+ wxPrintf( "wxgtk_tree_model_set_default_sort_func\n" );
+}
+
+gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable)
{
return FALSE;
}
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags );
+static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
+ GtkCellRenderer *cell,
+ GdkEvent *event,
+ GtkWidget *widget,
+ const gchar *path,
+ GdkRectangle *background_area,
+ GdkRectangle *cell_area,
+ GtkCellRendererState flags );
+
static GObjectClass *cell_parent_class = NULL;
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;
+ cell_class->start_editing = gtk_wx_cell_renderer_start_editing;
}
static void
return (GtkCellRenderer*) g_object_new (GTK_TYPE_WX_CELL_RENDERER, NULL);
}
+
+
+static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
+ GtkCellRenderer *renderer,
+ GdkEvent *event,
+ GtkWidget *widget,
+ const gchar *path,
+ GdkRectangle *background_area,
+ GdkRectangle *cell_area,
+ GtkCellRendererState flags )
+{
+ GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
+ wxDataViewCustomRenderer *cell = wxrenderer->cell;
+ if (!cell->HasEditorCtrl())
+ return NULL;
+
+ 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 );
+ wxRect renderrect( cell_area->x, cell_area->y, cell_area->width, cell_area->height );
+
+ GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
+ GtkTreeIter iter;
+ cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, treepath );
+ wxDataViewItem item( (void*) iter.user_data );
+ gtk_tree_path_free( treepath );
+
+ cell->StartEditing( item, renderrect );
+
+ return NULL;
+}
+
static void
gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
GtkWidget *widget,
wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
- wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
+ wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
- unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (treepath)[0];
+ // TODO
+ wxDataViewItem item;
gtk_tree_path_free( treepath );
unsigned int model_col = cell->GetOwner()->GetModelColumn();
- if (event->type == GDK_BUTTON_PRESS)
+ if (!event)
+ {
+ bool ret = false;
+
+ // activated by <ENTER>
+ if (cell->Activate( renderrect, model, item, model_col ))
+ ret = true;
+
+ return ret;
+ }
+ else if (event->type == GDK_BUTTON_PRESS)
{
GdkEventButton *button_event = (GdkEventButton*) event;
wxPoint pt( ((int) button_event->x) - renderrect.x,
bool ret = false;
if (button_event->button == 1)
{
- if (cell->LeftClick( pt, renderrect, model, model_col, model_row ))
+ if (cell->LeftClick( pt, renderrect, model, item, model_col ))
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 ))
+ if (cell->Activate( renderrect, model, item, model_col ))
ret = true;
}
if (button_event->button == 3)
{
- if (cell->RightClick( pt, renderrect, model, model_col, model_row ))
+ if (cell->RightClick( pt, renderrect, model, item, model_col ))
ret = true;
}
}
// ---------------------------------------------------------
-// wxGtkDataViewListModelNotifier
+// wxGtkDataViewModelNotifier
// ---------------------------------------------------------
-class wxGtkDataViewListModelNotifier: public wxDataViewListModelNotifier
+class wxGtkDataViewModelNotifier: public wxDataViewModelNotifier
{
public:
- wxGtkDataViewListModelNotifier( GtkWxListStore* gtk_store, wxDataViewListModel *wx_model );
-
- virtual bool RowAppended();
- virtual bool RowPrepended();
- virtual bool RowInserted( unsigned int before );
- virtual bool RowDeleted( unsigned int row );
- virtual bool RowChanged( unsigned int row );
- virtual bool ValueChanged( unsigned int col, unsigned int row );
- virtual bool RowsReordered( unsigned int *new_order );
+ wxGtkDataViewModelNotifier( GtkWxTreeModel *wxgtk_model,
+ wxDataViewModel *wx_model,
+ wxDataViewCtrl *ctrl );
+ ~wxGtkDataViewModelNotifier();
+
+ virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
+ virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
+ virtual bool ItemChanged( const wxDataViewItem &item );
+ virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col );
virtual bool Cleared();
+ virtual void Resort();
- GtkWxListStore *m_gtk_store;
- wxDataViewListModel *m_wx_model;
+ GtkWxTreeModel *m_wxgtk_model;
+ wxDataViewModel *m_wx_model;
+ wxDataViewCtrl *m_owner;
};
// ---------------------------------------------------------
// wxGtkDataViewListModelNotifier
// ---------------------------------------------------------
-wxGtkDataViewListModelNotifier::wxGtkDataViewListModelNotifier(
- GtkWxListStore* gtk_store, wxDataViewListModel *wx_model )
+wxGtkDataViewModelNotifier::wxGtkDataViewModelNotifier(
+ GtkWxTreeModel* wxgtk_model, wxDataViewModel *wx_model,
+ wxDataViewCtrl *ctrl )
{
- m_gtk_store = gtk_store;
+ m_wxgtk_model = wxgtk_model;
m_wx_model = wx_model;
+ m_owner = ctrl;
}
-bool wxGtkDataViewListModelNotifier::RowAppended()
+wxGtkDataViewModelNotifier::~wxGtkDataViewModelNotifier()
{
- unsigned int pos = m_wx_model->GetNumberOfRows()-1;
-
- GtkTreeIter iter;
- iter.stamp = m_gtk_store->stamp;
- iter.user_data = (gpointer) pos;
-
- GtkTreePath *path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, (gint) pos);
- gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
- gtk_tree_path_free (path);
-
- return true;
+ m_wx_model = NULL;
+ m_wxgtk_model = NULL;
}
-bool wxGtkDataViewListModelNotifier::RowPrepended()
+bool wxGtkDataViewModelNotifier::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
{
+ m_owner->GtkGetInternal()->ItemAdded( parent, item );
+
GtkTreeIter iter;
- iter.stamp = m_gtk_store->stamp;
- iter.user_data = (gpointer) 0;
+ iter.stamp = m_wxgtk_model->stamp;
+ iter.user_data = (gpointer) item.GetID();
- GtkTreePath *path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, (gint) 0);
- gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
+ GtkTreePath *path = wxgtk_tree_model_get_path(
+ GTK_TREE_MODEL(m_wxgtk_model), &iter );
+ gtk_tree_model_row_inserted(
+ GTK_TREE_MODEL(m_wxgtk_model), path, &iter);
gtk_tree_path_free (path);
return true;
}
-bool wxGtkDataViewListModelNotifier::RowInserted( unsigned int before )
+bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
{
GtkTreeIter iter;
- iter.stamp = m_gtk_store->stamp;
- iter.user_data = (gpointer) before;
+ iter.stamp = m_wxgtk_model->stamp;
+ iter.user_data = (gpointer) item.GetID();
- GtkTreePath *path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, (gint) before);
- gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
+ GtkTreePath *path = wxgtk_tree_model_get_path_safe(
+ GTK_TREE_MODEL(m_wxgtk_model), &iter );
+ gtk_tree_model_row_deleted(
+ GTK_TREE_MODEL(m_wxgtk_model), path );
gtk_tree_path_free (path);
+ m_owner->GtkGetInternal()->ItemDeleted( parent, item );
+
return true;
}
-bool wxGtkDataViewListModelNotifier::RowDeleted( unsigned int row )
+void wxGtkDataViewModelNotifier::Resort()
{
- GtkTreePath *path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, (gint) row);
- gtk_tree_model_row_deleted (GTK_TREE_MODEL (m_gtk_store), path);
- gtk_tree_path_free (path);
-
- return true;
+ m_owner->GtkGetInternal()->Resort();
}
-bool wxGtkDataViewListModelNotifier::RowChanged( unsigned int row )
+bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item )
{
GtkTreeIter iter;
- iter.stamp = m_gtk_store->stamp;
- iter.user_data = (gpointer) row;
- GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (m_gtk_store), &iter);
- gtk_tree_model_row_changed (GTK_TREE_MODEL (m_gtk_store), path, &iter);
+ iter.stamp = m_wxgtk_model->stamp;
+ iter.user_data = (gpointer) item.GetID();
+
+ GtkTreePath *path = wxgtk_tree_model_get_path(
+ GTK_TREE_MODEL(m_wxgtk_model), &iter );
+ gtk_tree_model_row_changed(
+ GTK_TREE_MODEL(m_wxgtk_model), path, &iter );
gtk_tree_path_free (path);
+ m_owner->GtkGetInternal()->ItemChanged( item );
+
return true;
}
-bool wxGtkDataViewListModelNotifier::ValueChanged( unsigned int model_col, unsigned int model_row )
+bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsigned int model_col )
{
// This adds GTK+'s missing MVC logic for ValueChanged
- wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
- while (node)
+ unsigned int index;
+ for (index = 0; index < m_owner->GetColumnCount(); index++)
{
- wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
- if (viewing_column->m_modelColumn == model_col)
+ wxDataViewColumn *column = m_owner->GetColumn( index );
+ if (column->GetModelColumn() == 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());
+ GtkTreeView *widget = GTK_TREE_VIEW(m_owner->m_treeview);
+ GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle());
// Get cell area
- GtkTreePath *path = gtk_tree_path_new();
- gtk_tree_path_append_index( path, model_row );
+ GtkTreeIter iter;
+ iter.stamp = m_wxgtk_model->stamp;
+ iter.user_data = (gpointer) item.GetID();
+ GtkTreePath *path = wxgtk_tree_model_get_path(
+ GTK_TREE_MODEL(m_wxgtk_model), &iter );
GdkRectangle cell_area;
- gtk_tree_view_get_cell_area( widget, path, column, &cell_area );
+ gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area );
gtk_tree_path_free( path );
- int ydiff = column->button->allocation.height;
+ GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget );
+ double d = gtk_adjustment_get_value( hadjust );
+ int xdiff = (int) d;
+
+ int ydiff = gcolumn->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 );
+ cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height );
+
+ m_owner->GtkGetInternal()->ValueChanged( item, model_col );
+
+ return true;
}
-
- node = node->GetNext();
}
- return true;
+ return false;
}
-bool wxGtkDataViewListModelNotifier::RowsReordered( unsigned int *new_order )
+bool wxGtkDataViewModelNotifier::Cleared()
{
- // Assume sizeof(unsigned int)= == 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;
-}
+ // TODO: delete everything
-bool wxGtkDataViewListModelNotifier::Cleared()
-{
+ m_owner->GtkGetInternal()->Cleared();
+
return false;
}
IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
-wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode ) :
- wxDataViewRendererBase( varianttype, mode )
+wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode,
+ int align ) :
+ wxDataViewRendererBase( varianttype, mode, align )
{
m_renderer = NULL;
+
+ // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor,
+ // after the m_renderer pointer has been initialized
}
-// ---------------------------------------------------------
-// wxDataViewTextRenderer
-// ---------------------------------------------------------
+void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
+{
+ GtkCellRendererMode gtkMode;
+ switch (mode)
+ {
+ case wxDATAVIEW_CELL_INERT:
+ gtkMode = GTK_CELL_RENDERER_MODE_INERT;
+ break;
+ case wxDATAVIEW_CELL_ACTIVATABLE:
+ gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
+ break;
+ case wxDATAVIEW_CELL_EDITABLE:
+ gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE;
+ break;
+ }
-extern "C" {
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
- gchar *arg1, gchar *arg2, gpointer user_data );
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
+ g_value_set_enum( &gvalue, gtkMode );
+ g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue );
+ g_value_unset( &gvalue );
}
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
- gchar *arg1, gchar *arg2, gpointer user_data )
+wxDataViewCellMode wxDataViewRenderer::GetMode() const
{
- wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;
-
- wxString tmp = wxGTK_CONV_BACK( arg2 );
- wxVariant value = tmp;
- if (!cell->Validate( value ))
- return;
+ wxDataViewCellMode ret;
- wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
+ GValue gvalue;
+ g_object_get( G_OBJECT(m_renderer), "mode", &gvalue, NULL);
- GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
- unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (path)[0];
- gtk_tree_path_free( path );
+ switch (g_value_get_enum(&gvalue))
+ {
+ case GTK_CELL_RENDERER_MODE_INERT:
+ ret = wxDATAVIEW_CELL_INERT;
+ break;
+ case GTK_CELL_RENDERER_MODE_ACTIVATABLE:
+ ret = wxDATAVIEW_CELL_ACTIVATABLE;
+ break;
+ case GTK_CELL_RENDERER_MODE_EDITABLE:
+ ret = wxDATAVIEW_CELL_EDITABLE;
+ break;
+ }
- unsigned int model_col = cell->GetOwner()->GetModelColumn();
+ g_value_unset( &gvalue );
- model->SetValue( value, model_col, model_row );
- model->ValueChanged( model_col, model_row );
+ return ret;
}
-IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
-
-wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode ) :
- wxDataViewRenderer( varianttype, mode )
+void wxDataViewRenderer::SetAlignment( int align )
{
- m_renderer = (void*) gtk_cell_renderer_text_new();
+ // horizontal alignment:
- if (m_mode & wxDATAVIEW_CELL_EDITABLE)
- {
- GValue gvalue = { 0, };
- g_value_init( &gvalue, G_TYPE_BOOLEAN );
- g_value_set_boolean( &gvalue, true );
- g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue );
- g_value_unset( &gvalue );
+ gfloat xalign = 0.0;
+ if (align & wxALIGN_RIGHT)
+ xalign = 1.0;
+ else if (align & wxALIGN_CENTER_HORIZONTAL)
+ xalign = 0.5;
- g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
- }
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, G_TYPE_FLOAT );
+ g_value_set_float( &gvalue, xalign );
+ g_object_set_property( G_OBJECT(m_renderer), "xalign", &gvalue );
+ g_value_unset( &gvalue );
+
+ // vertical alignment:
+
+ gfloat yalign = 0.0;
+ if (align & wxALIGN_BOTTOM)
+ yalign = 1.0;
+ else if (align & wxALIGN_CENTER_VERTICAL)
+ yalign = 0.5;
+
+ GValue gvalue2 = { 0, };
+ g_value_init( &gvalue2, G_TYPE_FLOAT );
+ g_value_set_float( &gvalue2, yalign );
+ g_object_set_property( G_OBJECT(m_renderer), "yalign", &gvalue2 );
+ g_value_unset( &gvalue2 );
}
-bool wxDataViewTextRenderer::SetValue( const wxVariant &value )
+int wxDataViewRenderer::GetAlignment() const
{
- wxString tmp = value;
+ int ret = 0;
+ GValue gvalue;
+
+ // horizontal alignment:
+
+ g_object_get( G_OBJECT(m_renderer), "xalign", &gvalue, NULL );
+ float xalign = g_value_get_float( &gvalue );
+ if (xalign < 0.5)
+ ret |= wxALIGN_LEFT;
+ else if (xalign == 0.5)
+ ret |= wxALIGN_CENTER_HORIZONTAL;
+ else
+ ret |= wxALIGN_RIGHT;
+ g_value_unset( &gvalue );
+
+
+ // vertical alignment:
+
+ g_object_get( G_OBJECT(m_renderer), "yalign", &gvalue, NULL );
+ float yalign = g_value_get_float( &gvalue );
+ if (yalign < 0.5)
+ ret |= wxALIGN_TOP;
+ else if (yalign == 0.5)
+ ret |= wxALIGN_CENTER_VERTICAL;
+ else
+ ret |= wxALIGN_BOTTOM;
+ g_value_unset( &gvalue );
+
+ return ret;
+}
+
+
+
+// ---------------------------------------------------------
+// wxDataViewTextRenderer
+// ---------------------------------------------------------
+
+extern "C" {
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
+ gchar *arg1, gchar *arg2, gpointer user_data );
+}
+
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
+ gchar *arg1, gchar *arg2, gpointer user_data )
+{
+ wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;
+
+ wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont());
+ wxVariant value = tmp;
+ if (!cell->Validate( value ))
+ return;
+
+ wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
+
+ GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
+ GtkTreeIter iter;
+ cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, path );
+ wxDataViewItem item( (void*) iter.user_data );;
+ gtk_tree_path_free( path );
+
+ unsigned int model_col = cell->GetOwner()->GetModelColumn();
+
+ model->SetValue( value, item, model_col );
+ model->ValueChanged( item, model_col );
+}
+
+IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
+
+wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode,
+ int align ) :
+ wxDataViewRenderer( varianttype, mode, align )
+{
+ m_renderer = (GtkCellRenderer*) gtk_cell_renderer_text_new();
+
+ if (mode & wxDATAVIEW_CELL_EDITABLE)
+ {
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, G_TYPE_BOOLEAN );
+ g_value_set_boolean( &gvalue, true );
+ g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue );
+ g_value_unset( &gvalue );
+
+ g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
+ }
+
+ SetMode(mode);
+ SetAlignment(align);
+}
+
+bool wxDataViewTextRenderer::SetValue( const wxVariant &value )
+{
+ wxString tmp = value;
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING );
return true;
}
-bool wxDataViewTextRenderer::GetValue( wxVariant &value )
+bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const
{
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING );
g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
- wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &gvalue ) );
+ wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ),
+ wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() );
g_value_unset( &gvalue );
value = tmp;
return true;
}
-// ---------------------------------------------------------
+void wxDataViewTextRenderer::SetAlignment( int align )
+{
+ wxDataViewRenderer::SetAlignment(align);
+
+ if (gtk_check_version(2,10,0))
+ return;
+
+ // horizontal alignment:
+ PangoAlignment pangoAlign = PANGO_ALIGN_LEFT;
+ if (align & wxALIGN_RIGHT)
+ pangoAlign = PANGO_ALIGN_RIGHT;
+ else if (align & wxALIGN_CENTER_HORIZONTAL)
+ pangoAlign = PANGO_ALIGN_CENTER;
+
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
+ g_value_set_enum( &gvalue, pangoAlign );
+ g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue );
+ g_value_unset( &gvalue );
+}
+
+// ---------------------------------------------------------
// wxDataViewBitmapRenderer
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)
-wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode ) :
- wxDataViewRenderer( varianttype, mode )
+wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode,
+ int align ) :
+ wxDataViewRenderer( varianttype, mode, align )
{
- m_renderer = (void*) gtk_cell_renderer_pixbuf_new();
+ m_renderer = (GtkCellRenderer*) gtk_cell_renderer_pixbuf_new();
+
+ SetMode(mode);
+ SetAlignment(align);
}
bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
{
wxBitmap bitmap;
bitmap << value;
-
+
// This may create a Pixbuf representation in the
// wxBitmap object (and it will stay there)
GdkPixbuf *pixbuf = bitmap.GetPixbuf();
-
+
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_OBJECT );
g_value_set_object( &gvalue, pixbuf );
g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue );
g_value_unset( &gvalue );
-
+
return true;
}
-
+
if (value.GetType() == wxT("wxIcon"))
{
wxIcon bitmap;
bitmap << value;
-
+
// This may create a Pixbuf representation in the
// wxBitmap object (and it will stay there)
GdkPixbuf *pixbuf = bitmap.GetPixbuf();
-
+
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_OBJECT );
g_value_set_object( &gvalue, pixbuf );
g_object_set_property( G_OBJECT(m_renderer), "pixbuf", &gvalue );
g_value_unset( &gvalue );
-
+
return true;
}
-
+
return false;
}
-bool wxDataViewBitmapRenderer::GetValue( wxVariant &value )
+bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) const
{
return false;
}
-
+
// ---------------------------------------------------------
// wxDataViewToggleRenderer
// ---------------------------------------------------------
if (!cell->Validate( value ))
return;
- wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
+ wxDataViewModel *model = cell->GetOwner()->GetOwner()->GetModel();
GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
- unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (gtk_path)[0];
+ GtkTreeIter iter;
+ cell->GetOwner()->GetOwner()->GtkGetInternal()->get_iter( &iter, gtk_path );
+ wxDataViewItem item( (void*) iter.user_data );;
gtk_tree_path_free( gtk_path );
unsigned int model_col = cell->GetOwner()->GetModelColumn();
- model->SetValue( value, model_col, model_row );
- model->ValueChanged( model_col, model_row );
+ model->SetValue( value, item, model_col );
+ model->ValueChanged( item, model_col );
}
IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
- wxDataViewCellMode mode ) :
- wxDataViewRenderer( varianttype, mode )
+ wxDataViewCellMode mode, int align ) :
+ wxDataViewRenderer( varianttype, mode, align )
{
- m_renderer = (void*) gtk_cell_renderer_toggle_new();
+ m_renderer = (GtkCellRenderer*) gtk_cell_renderer_toggle_new();
- if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
+ if (mode & wxDATAVIEW_CELL_ACTIVATABLE)
{
- g_signal_connect_after( m_renderer, "toggled", G_CALLBACK(wxGtkToggleRendererToggledCallback), this );
+ 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, false );
g_object_set_property( G_OBJECT(m_renderer), "activatable", &gvalue );
g_value_unset( &gvalue );
-
- 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 );
-
}
+
+ SetMode(mode);
+ SetAlignment(align);
}
bool wxDataViewToggleRenderer::SetValue( const wxVariant &value )
return true;
}
-bool wxDataViewToggleRenderer::GetValue( wxVariant &value )
+bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const
{
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_BOOLEAN );
IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
- wxDataViewCellMode mode, bool no_init ) :
- wxDataViewRenderer( varianttype, mode )
+ wxDataViewCellMode mode, int align,
+ bool no_init ) :
+ wxDataViewRenderer( varianttype, mode, align )
{
m_dc = NULL;
if (no_init)
m_renderer = NULL;
else
- Init();
+ Init(mode, align);
}
-bool wxDataViewCustomRenderer::Init()
+bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align)
{
GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
renderer->cell = this;
- m_renderer = (void*) renderer;
+ m_renderer = (GtkCellRenderer*) 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 );
- }
+ SetMode(mode);
+ SetAlignment(align);
return true;
}
IMPLEMENT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer)
wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
- const wxString &varianttype, wxDataViewCellMode mode ) :
- wxDataViewCustomRenderer( varianttype, mode, true )
+ const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+ wxDataViewCustomRenderer( varianttype, mode, align, true )
{
m_label = label;
m_value = 0;
#ifdef __WXGTK26__
if (!gtk_check_version(2,6,0))
{
- m_renderer = (void*) gtk_cell_renderer_progress_new();
+ m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new();
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING );
g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) );
g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
g_value_unset( &gvalue );
+
+ SetMode(mode);
+ SetAlignment(align);
}
else
#endif
{
// Use custom cell code
- wxDataViewCustomRenderer::Init();
+ wxDataViewCustomRenderer::Init(mode, align);
}
}
return true;
}
+bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const
+{
+ return false;
+}
+
bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int state )
{
double pct = (double)m_value / 100.0;
return true;
}
-wxSize wxDataViewProgressRenderer::GetSize()
+wxSize wxDataViewProgressRenderer::GetSize() const
{
return wxSize(40,12);
}
{
public:
wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value,
- wxDataViewListModel *model, unsigned int col, unsigned int row ) :
+ wxDataViewModel *model, const wxDataViewItem &item, unsigned int col ) :
wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
{
m_model = model;
+ m_item = item;
m_col = col;
- m_row = row;
m_cal = new wxCalendarCtrl( this, -1, *value );
wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
sizer->Add( m_cal, 1, wxGROW );
void OnCalendar( wxCalendarEvent &event );
- wxCalendarCtrl *m_cal;
- wxDataViewListModel *m_model;
- unsigned int m_col;
- unsigned int m_row;
+ wxCalendarCtrl *m_cal;
+ wxDataViewModel *m_model;
+ wxDataViewItem m_item;
+ unsigned int m_col;
private:
DECLARE_EVENT_TABLE()
{
wxDateTime date = event.GetDate();
wxVariant value = date;
- m_model->SetValue( value, m_col, m_row );
- m_model->ValueChanged( m_col, m_row );
+ m_model->SetValue( value, m_item, m_col );
+ m_model->ValueChanged( m_item, m_col );
DismissAndNotify();
}
IMPLEMENT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer)
wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype,
- wxDataViewCellMode mode ) :
- wxDataViewCustomRenderer( varianttype, mode )
+ wxDataViewCellMode mode, int align ) :
+ wxDataViewCustomRenderer( varianttype, mode, align )
{
+ SetMode(mode);
+ SetAlignment(align);
}
bool wxDataViewDateRenderer::SetValue( const wxVariant &value )
return true;
}
+bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
+{
+ return false;
+}
+
bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )
{
dc->SetFont( GetOwner()->GetOwner()->GetFont() );
return true;
}
-wxSize wxDataViewDateRenderer::GetSize()
+wxSize wxDataViewDateRenderer::GetSize() const
{
- wxDataViewCtrl* view = GetOwner()->GetOwner();
wxString tmp = m_date.FormatDate();
wxCoord x,y,d;
- view->GetTextExtent( tmp, &x, &y, &d );
+ GetView()->GetTextExtent( tmp, &x, &y, &d );
return wxSize(x,y+d);
}
-bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row )
+bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewModel *model,
+ const wxDataViewItem &item, unsigned int col )
{
wxVariant variant;
- model->GetValue( variant, col, row );
+ model->GetValue( variant, item, col );
wxDateTime value = variant.GetDateTime();
wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(
- GetOwner()->GetOwner()->GetParent(), &value, model, col, row );
+ GetOwner()->GetOwner()->GetParent(), &value, model, item, col );
wxPoint pos = wxGetMousePosition();
popup->Move( pos );
popup->Layout();
wxDataViewColumn *column )
{
if (gdk_event->type != GDK_BUTTON_PRESS)
- return TRUE;
-
+ return FALSE;
+
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 );
+ if (dv->GetEventHandler()->ProcessEvent( event ))
+ return TRUE;
}
-
- return TRUE;
+
+ return FALSE;
}
extern "C" {
GtkTreeIter *iter,
gpointer data )
{
- g_return_if_fail (GTK_IS_WX_LIST_STORE (model));
- GtkWxListStore *list_store = (GtkWxListStore *) model;
+ g_return_if_fail (GTK_IS_WX_TREE_MODEL (model));
+ GtkWxTreeModel *tree_model = (GtkWxTreeModel *) model;
wxDataViewRenderer *cell = (wxDataViewRenderer*) data;
- unsigned int model_row = (unsigned int) iter->user_data;
+ wxDataViewItem item( (void*) iter->user_data );
wxVariant value;
- list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );
+ tree_model->internal->GetDataViewModel()->GetValue( value, item, cell->GetOwner()->GetModelColumn() );
if (value.GetType() != cell->GetVariantType())
- wxLogError( wxT("Wrong type, required: %s but: %s"),
- value.GetType().c_str(),
+ wxLogError( wxT("Wrong type, required: %s but: %s"),
+ value.GetType().c_str(),
cell->GetVariantType().c_str() );
cell->SetValue( value );
-}
-IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
+#if 0
+ wxListItemAttr attr;
+ tree_model->model->GetAttr( attr, cell->GetOwner()->GetModelColumn(), model_row );
-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;
+ if (attr.HasBackgroundColour())
+ {
+ wxColour colour = attr.GetBackgroundColour();
+ const GdkColor * const gcol = colour.GetColor();
- GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, GDK_TYPE_COLOR );
+ g_value_set_boxed( &gvalue, gcol );
+ g_object_set_property( G_OBJECT(renderer), "cell-background_gdk", &gvalue );
+ g_value_unset( &gvalue );
+ }
+ else
+ {
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, G_TYPE_BOOLEAN );
+ g_value_set_boolean( &gvalue, FALSE );
+ g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue );
+ g_value_unset( &gvalue );
+ }
+#endif
- GtkTreeViewColumn *column = gtk_tree_view_column_new();
- 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_HIDDEN)
- gtk_tree_view_column_set_visible( column, false );
- if (flags & wxDATAVIEW_COL_SORTABLE)
- gtk_tree_view_column_set_sort_indicator( column, true );
+IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
- 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 );
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
+ unsigned int model_column, int width,
+ wxAlignment align, int flags ) :
+ wxDataViewColumnBase( title, cell, model_column, width, align, flags )
+{
+ Init( align, flags, width );
- gtk_tree_view_column_pack_end( column, renderer, FALSE );
+ gtk_tree_view_column_set_clickable( GTK_TREE_VIEW_COLUMN(m_column), TRUE );
+ SetTitle( title );
+}
- 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,
+ wxAlignment align, int flags ) :
+ wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags )
+{
+ Init( align, flags, width );
+ SetBitmap( bitmap );
}
-wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, unsigned int model_column,
- int width, int flags ) :
- wxDataViewColumnBase( bitmap, cell, model_column, width, flags )
+void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
{
m_isConnected = false;
-
- GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
+ GtkCellRenderer *renderer = (GtkCellRenderer *) GetRenderer()->GetGtkHandle();
GtkTreeViewColumn *column = gtk_tree_view_column_new();
- m_column = (void*) column;
+ m_column = (GtkWidget*) column;
- SetBitmap( bitmap );
+ SetFlags( flags );
+ SetAlignment( align );
- 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 );
+ // NOTE: we prefer not to call SetMinWidth(wxDVC_DEFAULT_MINWIDTH);
+ // as GTK+ is smart and unless explicitely told, will set the minimal
+ // width to the title's lenght, which is a better default
- if (width > 0)
- gtk_tree_view_column_set_fixed_width( column, width );
- else
- gtk_tree_view_column_set_fixed_width( column, 70 ); // FIXME
-
+ // the GTK_TREE_VIEW_COLUMN_FIXED is required by the "fixed height" mode
+ // that we use for the wxDataViewCtrl
+ gtk_tree_view_column_set_fixed_width( column, width < 0 ? wxDVC_DEFAULT_WIDTH : 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_pack_end( column, renderer, TRUE );
gtk_tree_view_column_set_cell_data_func( column, renderer,
- wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
+ wxGtkTreeCellDataFunc, (gpointer) GetRenderer(), NULL );
}
wxDataViewColumn::~wxDataViewColumn()
{
if (m_isConnected)
return;
-
+
if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview))
{
- GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(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;
-
+
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+
gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(GetTitle(), GetOwner()->GetFont() ) );
}
void wxDataViewColumn::SetTitle( const wxString &title )
{
- wxDataViewColumnBase::SetTitle( title );
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
- 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);
-
+ g_signal_handlers_disconnect_by_func( column->button,
+ (GtkWidget*) gtk_dataview_header_button_press_callback, this);
+
m_isConnected = false;
}
gtk_tree_view_column_set_widget( column, NULL );
}
+wxString wxDataViewColumn::GetTitle() const
+{
+ const gchar *str = gtk_tree_view_column_get_title( GTK_TREE_VIEW_COLUMN(m_column) );
+ return wxConvFileName->cMB2WX(str);
+}
+
void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
{
wxDataViewColumnBase::SetBitmap( bitmap );
- GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
if (bitmap.Ok())
{
GtkImage *gtk_image = GTK_IMAGE( gtk_image_new() );
-
+
GdkBitmap *mask = (GdkBitmap *) NULL;
if (bitmap.GetMask())
mask = bitmap.GetMask()->GetBitmap();
bitmap.GetPixmap(), mask);
}
gtk_widget_show( GTK_WIDGET(gtk_image) );
-
+
gtk_tree_view_column_set_widget( column, GTK_WIDGET(gtk_image) );
}
else
}
}
+void wxDataViewColumn::SetHidden( bool hidden )
+{
+ gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden );
+}
+
+void wxDataViewColumn::SetResizeable( bool resizeable )
+{
+ gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizeable );
+}
+
void wxDataViewColumn::SetAlignment( wxAlignment align )
{
- GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
-
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+
gfloat xalign = 0.0;
if (align == wxALIGN_RIGHT)
xalign = 1.0;
- if (align == wxALIGN_CENTER)
+ if (align == wxALIGN_CENTER_HORIZONTAL ||
+ align == wxALIGN_CENTER)
xalign = 0.5;
-
- gtk_tree_view_column_set_alignment( column, xalign );
+
+ gtk_tree_view_column_set_alignment( column, xalign );
+}
+
+wxAlignment wxDataViewColumn::GetAlignment() const
+{
+ gfloat xalign = gtk_tree_view_column_get_alignment( GTK_TREE_VIEW_COLUMN(m_column) );
+
+ if (xalign == 1.0)
+ return wxALIGN_RIGHT;
+ if (xalign == 0.5)
+ return wxALIGN_CENTER_HORIZONTAL;
+
+ return wxALIGN_LEFT;
}
void wxDataViewColumn::SetSortable( bool sortable )
{
- GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
- gtk_tree_view_column_set_sort_indicator( column, sortable );
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+
+ if (sortable)
+ gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
+ else
+ gtk_tree_view_column_set_sort_column_id( column, -1 );
+}
+
+bool wxDataViewColumn::IsSortable() const
+{
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+ return (gtk_tree_view_column_get_sort_column_id( column ) != -1);
+}
+
+bool wxDataViewColumn::IsResizeable() const
+{
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+ return gtk_tree_view_column_get_resizable( column );
}
-bool wxDataViewColumn::GetSortable()
+bool wxDataViewColumn::IsHidden() const
{
- GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
- return gtk_tree_view_column_get_sort_indicator( column );
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+ return !gtk_tree_view_column_get_visible( column );
}
void wxDataViewColumn::SetSortOrder( bool ascending )
{
- GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
-
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(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()
+bool wxDataViewColumn::IsSortOrderAscending() const
{
- GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
-
+ GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+
return (gtk_tree_view_column_get_sort_order( column ) != GTK_SORT_DESCENDING);
}
-int wxDataViewColumn::GetWidth()
+void wxDataViewColumn::SetMinWidth( int width )
{
- return gtk_tree_view_column_get_width( (GtkTreeViewColumn *)m_column );
+ gtk_tree_view_column_set_min_width( GTK_TREE_VIEW_COLUMN(m_column), width );
}
-void wxDataViewColumn::SetFixedWidth( int width )
+int wxDataViewColumn::GetMinWidth() const
{
- gtk_tree_view_column_set_fixed_width( (GtkTreeViewColumn *)m_column, width );
+ return gtk_tree_view_column_get_min_width( GTK_TREE_VIEW_COLUMN(m_column) );
}
-int wxDataViewColumn::GetFixedWidth()
+int wxDataViewColumn::GetWidth() const
{
- return gtk_tree_view_column_get_fixed_width( (GtkTreeViewColumn *)m_column );
+ return gtk_tree_view_column_get_width( GTK_TREE_VIEW_COLUMN(m_column) );
}
-//-----------------------------------------------------------------------------
-// wxDataViewCtrl signal callbacks
-//-----------------------------------------------------------------------------
-
-static void
-wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv )
+void wxDataViewColumn::SetWidth( int width )
{
- 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 );
+ gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
}
-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
+// wxGtkTreeModelNode
//-----------------------------------------------------------------------------
-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,
- const wxPoint& pos, const wxSize& size,
- long style, const wxValidator& validator )
+void wxGtkTreeModelNode::Resort()
{
- Init();
+ g_internal = m_internal;
+
+ size_t child_count = GetChildCount();
+ if (child_count == 0)
+ return;
- m_needParent = true;
- m_acceptsFocus = true;
+ size_t node_count = GetNodesCount();
- if (!PreCreation( parent, pos, size ) ||
- !CreateBase( parent, id, pos, size, style, validator ))
+ if (child_count == 1)
{
- wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
- return false;
+ if (node_count == 1)
+ {
+ wxGtkTreeModelNode *node = m_nodes.Item( 0 );
+ node->Resort();
+ }
+ return;
}
- m_widget = gtk_scrolled_window_new (NULL, NULL);
+ wxGtkTreeModelChildren *new_array = new wxGtkTreeModelChildren( wxGtkTreeModelNodeCmp );
- GtkScrolledWindowSetBorder(m_widget, style);
+ size_t pos;
+ for (pos = 0; pos < child_count; pos++)
+ new_array->Add( m_children->Item( pos ) );
- m_treeview = gtk_tree_view_new();
- gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
+ gint *new_order = new gint[child_count];
+
+ for (pos = 0; pos < child_count; pos++)
+ {
+ void *id = new_array->Item( pos );
+ size_t old_pos;
+ for (old_pos = 0; old_pos < child_count; old_pos++)
+ {
+ if (id == m_children->Item(old_pos))
+ {
+ new_order[pos] = old_pos;
+ break;
+ }
+ }
+ }
+
+// for (pos = 0; pos < count; pos++)
+// m_children->Clear();
+ delete m_children;
+
+ m_children = new_array;
+
+ GtkTreeModel *gtk_tree_model = GTK_TREE_MODEL( m_internal->GetGtkModel() );
-#ifdef __WXGTK26__
- if (!gtk_check_version(2,6,0))
- gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), TRUE );
-#endif
+ GtkTreePath *path = gtk_tree_path_new ();
+ wxGtkTreeModelNode *parent = GetParent();
+ void *id = GetItem().GetID();
- if (style & wxDV_MULTIPLE)
+ while (parent)
{
- GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
- gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE );
+ int pos = parent->GetChildren().Index( id );
+ gtk_tree_path_prepend_index( path, pos );
+ id = parent->GetItem().GetID();
+ parent = parent->GetParent();
}
+
+ GtkTreeIter iter;
+ iter.user_data = id;
+ iter.stamp = m_internal->GetGtkModel()->stamp;
+ gtk_tree_model_rows_reordered( gtk_tree_model, path, &iter, new_order );
+
+ gtk_tree_path_free (path);
+
+ delete [] new_order;
+
+ for (pos = 0; pos < node_count; pos++)
+ {
+ wxGtkTreeModelNode *node = m_nodes.Item( pos );
+ node->Resort();
+ }
+}
- 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 );
-
- PostCreation(size);
+//-----------------------------------------------------------------------------
+// wxDataViewCtrlInternal
+//-----------------------------------------------------------------------------
- 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);
+wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner,
+ wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model )
+{
+ m_owner = owner;
+ m_wx_model = wx_model;
+ m_gtk_model = gtk_model;
+ m_root = NULL;
+ m_sort_order = GTK_SORT_ASCENDING;
+ InitTree();
+}
+
+wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
+{
+ g_object_unref( m_gtk_model );
+}
+
+void wxDataViewCtrlInternal::InitTree()
+{
+ wxDataViewItem item;
+ m_root = new wxGtkTreeModelNode( NULL, item, this );
- return true;
+ BuildBranch( m_root );
}
-void wxDataViewCtrl::OnInternalIdle()
+void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
{
- wxWindow::OnInternalIdle();
-
- unsigned int cols = GetNumberOfColumns();
- unsigned int i;
- for (i = 0; i < cols; i++)
+ if (node->GetChildCount() == 0)
{
- wxDataViewColumn *col = GetColumn( i );
- col->OnInternalIdle();
+ wxDataViewItem child = m_wx_model->GetFirstChild( node->GetItem() );
+ while (child.IsOk())
+ {
+ if (m_wx_model->IsContainer( child ))
+ node->AddNode( new wxGtkTreeModelNode( node, child, this ) );
+ else
+ node->AddLeave( child.GetID() );
+
+ // Don't send any events here
+
+ child = m_wx_model->GetNextSibling( child );
+ }
}
}
-bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )
+void wxDataViewCtrlInternal::Resort()
{
- if (!wxDataViewCtrlBase::AssociateModel( model ))
- return false;
-
- GtkWxListStore *gtk_store = wxgtk_list_store_new();
- gtk_store->model = model;
+ m_root->Resort();
+}
- m_notifier = new wxGtkDataViewListModelNotifier( gtk_store, model );
+bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
+{
+ wxGtkTreeModelNode *parent_node = FindNode( parent );
+ if (m_wx_model->IsContainer( item ))
+ parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) );
+ else
+ parent_node->AddLeave( item.GetID() );
+
+ wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, m_owner->GetId() );
+ event.SetEventObject( m_owner );
+ event.SetModel( m_owner->GetModel() );
+ event.SetItem( item );
+ m_owner->GetEventHandler()->ProcessEvent( event );
- model->AddNotifier( m_notifier );
+ return true;
+}
- gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) );
- g_object_unref( gtk_store );
+bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
+{
+ wxGtkTreeModelNode *parent_node = FindNode( parent );
+ parent_node->DeleteChild( item.GetID() );
+
+ wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, m_owner->GetId() );
+ event.SetEventObject( m_owner );
+ event.SetModel( m_owner->GetModel() );
+ event.SetItem( item );
+ m_owner->GetEventHandler()->ProcessEvent( event );
return true;
}
-bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
+bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item )
{
- if (!wxDataViewCtrlBase::AppendColumn(col))
- return false;
-
- GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
+ wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED, m_owner->GetId() );
+ event.SetEventObject( m_owner );
+ event.SetModel( m_owner->GetModel() );
+ event.SetItem( item );
+ m_owner->GetEventHandler()->ProcessEvent( event );
+
+ return true;
+}
- gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
+bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int col )
+{
+ wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, m_owner->GetId() );
+ event.SetEventObject( m_owner );
+ event.SetModel( m_owner->GetModel() );
+ event.SetColumn( col );
+ event.SetItem( item );
+ m_owner->GetEventHandler()->ProcessEvent( event );
+
+ return true;
+}
+bool wxDataViewCtrlInternal::Cleared()
+{
+ wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, m_owner->GetId() );
+ event.SetEventObject( m_owner );
+ event.SetModel( m_owner->GetModel() );
+ m_owner->GetEventHandler()->ProcessEvent( event );
+
return true;
}
-void wxDataViewCtrl::SetSelection( int row )
+gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
{
- GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+ g_internal = this;
- if (row < 0)
- {
- gtk_tree_selection_unselect_all( selection );
- }
- else
+ int depth = gtk_tree_path_get_depth( path );
+
+ wxGtkTreeModelNode *node = m_root;
+
+ int i;
+ for (i = 0; i < depth; i++)
{
- GtkTreePath *path = gtk_tree_path_new ();
- gtk_tree_path_append_index( path, row );
+ BuildBranch( node );
- gtk_tree_selection_select_path( selection, path );
+ gint pos = gtk_tree_path_get_indices (path)[i];
+ if (pos < 0) return FALSE;
+ if ((size_t)pos >= node->GetChildCount()) return FALSE;
- gtk_tree_path_free( path );
+ void* id = node->GetChildren().Item( (size_t) pos );
+
+ if (i == depth-1)
+ {
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = id;
+ return TRUE;
+ }
+
+ size_t count = node->GetNodes().GetCount();
+ size_t pos2;
+ for (pos2 = 0; pos2 < count; pos2++)
+ {
+ wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 );
+ if (child_node->GetItem().GetID() == id)
+ {
+ node = child_node;
+ break;
+ }
+ }
}
+
+ return FALSE;
}
-void wxDataViewCtrl::Unselect( unsigned int row )
+GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
{
- GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+ g_internal = this;
- GtkTreePath *path = gtk_tree_path_new ();
- gtk_tree_path_append_index( path, row );
+ GtkTreePath *retval = gtk_tree_path_new ();
+ void *id = iter->user_data;
+
+ wxGtkTreeModelNode *node = FindParentNode( iter );
+ while (node)
+ {
+ int pos = node->GetChildren().Index( id );
+ gtk_tree_path_prepend_index( retval, pos );
- gtk_tree_selection_unselect_path( selection, path );
+ id = node->GetItem().GetID();
+ node = node->GetParent();
+ }
+
+ return retval;
+}
+
+GtkTreePath *wxDataViewCtrlInternal::get_path_safe( GtkTreeIter *iter )
+{
+ g_internal = this;
+
+ GtkTreePath *retval = gtk_tree_path_new ();
+ void *id = iter->user_data;
+
+ wxGtkTreeModelNode *node = FindParentNode( iter );
+ while (node)
+ {
+ size_t pos;
+ for (pos = 0; pos < node->GetChildren().GetCount(); pos++)
+ {
+ if (id == node->GetChildren().Item( pos ))
+ {
+ gtk_tree_path_prepend_index( retval, (int) pos );
+ continue;
+ }
+ }
+
+ id = node->GetItem().GetID();
+ node = node->GetParent();
+ }
+
+ return retval;
+}
+
+gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
+{
+ g_internal = this;
+
+ wxGtkTreeModelNode *parent = FindParentNode( iter );
+ if( parent == NULL )
+ return FALSE;
+
+ unsigned int pos = parent->GetChildren().Index( iter->user_data );
+
+ if (pos == parent->GetChildCount()-1)
+ return FALSE;
- gtk_tree_path_free( path );
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = parent->GetChildren().Item( pos+1 );
+
+ return TRUE;
}
-void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to )
+gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
{
+ g_internal = this;
+
+ wxDataViewItem item( (void*) parent->user_data );
+
+ if (!m_wx_model->IsContainer( item ))
+ return FALSE;
+
+ wxGtkTreeModelNode *parent_node = FindNode( parent );
+ BuildBranch( parent_node );
+
+ if (parent_node->GetChildCount() == 0)
+ return FALSE;
+
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 );
+
+ return TRUE;
}
-void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections)
+gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
{
+ g_internal = this;
+
+ wxDataViewItem item( (void*) iter->user_data );
+ bool is_container = m_wx_model->IsContainer( item );
+
+ if (!is_container)
+ return FALSE;
+
+ wxGtkTreeModelNode *node = FindNode( iter );
+ BuildBranch( node );
+
+ return (node->GetChildCount() > 0);
}
+
+gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
+{
+ g_internal = this;
+
+ wxDataViewItem item( (void*) iter->user_data );
-bool wxDataViewCtrl::IsSelected( unsigned int row ) const
+ if (!m_wx_model->IsContainer( item ))
+ return 0;
+
+ wxGtkTreeModelNode *parent_node = FindNode( iter );
+ BuildBranch( parent_node );
+
+ // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() );
+
+ return parent_node->GetChildCount();
+}
+
+gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n )
{
- GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+ g_internal = this;
- GtkTreePath *path = gtk_tree_path_new ();
- gtk_tree_path_append_index( path, row );
+ void* id = NULL;
+ if (parent) id = (void*) parent->user_data;
+ wxDataViewItem item( id );
- gboolean ret = gtk_tree_selection_path_is_selected( selection, path );
+ if (!m_wx_model->IsContainer( item ))
+ return FALSE;
- gtk_tree_path_free( path );
+ wxGtkTreeModelNode *parent_node = FindNode( parent );
+ BuildBranch( parent_node );
+
+ // wxPrintf( "iter_nth_child %d\n", n );
- return ret;
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = parent_node->GetChildren().Item( n );
+
+ return TRUE;
}
-int wxDataViewCtrl::GetSelection() const
+gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
{
- GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
- if (HasFlag(wxDV_MULTIPLE))
+ g_internal = this;
+
+ wxGtkTreeModelNode *node = FindParentNode( child );
+ if (!node)
+ return FALSE;
+
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = (gpointer) node->GetItem().GetID();
+
+ return TRUE;
+}
+
+static wxGtkTreeModelNode*
+wxDataViewCtrlInternal_FindNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item )
+{
+ if( model == NULL )
+ return NULL;
+
+ ItemList list;
+ list.DeleteContents( true );
+ wxDataViewItem it( item );
+ while( it.IsOk() )
{
- GtkTreeModel *model;
- GList *list = gtk_tree_selection_get_selected_rows( selection, &model );
-
- // do something
- if (list)
- {
- // list = g_list_nth( list, 0 ); should be a noop
- GtkTreePath *path = (GtkTreePath*) list->data;
-
- unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0];
-
- // delete list
- g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL );
- g_list_free( list );
-
- return (int) row;
- }
+ wxDataViewItem * pItem = new wxDataViewItem( it );
+ list.Insert( pItem );
+ it = model->GetParent( it );
}
- else
+
+ wxGtkTreeModelNode * node = treeNode;
+ for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() )
{
-
- GtkTreeModel *model;
- GtkTreeIter iter;
- gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
- if (has_selection)
+ if( node && node->GetNodes().GetCount() != 0 )
{
- unsigned int row = (wxUIntPtr) iter.user_data;
- return (int) row;
+ int len = node->GetNodes().GetCount();
+ wxGtkTreeModelNodes nodes = node->GetNodes();
+ int j = 0;
+ for( ; j < len; j ++)
+ {
+ if( nodes[j]->GetItem() == *(n->GetData()))
+ {
+ node = nodes[j];
+ break;
+ }
+ }
+
+ if( j == len )
+ {
+ return NULL;
+ }
}
+ else
+ return NULL;
+ }
+ return node;
+
+}
+
+wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( GtkTreeIter *iter )
+{
+ if (!iter)
+ return m_root;
+
+ wxDataViewItem item( (void*) iter->user_data );
+ if (!item.IsOk())
+ return m_root;
+
+ wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
+
+ if (!result)
+ {
+ wxPrintf( "Not found %d\n", (int) iter->user_data );
+ char *crash = NULL;
+ *crash = 0;
}
- return -1;
+ return result;
}
-int wxDataViewCtrl::GetSelections(wxArrayInt& aSelections) const
+wxGtkTreeModelNode *wxDataViewCtrlInternal::FindNode( const wxDataViewItem &item )
{
- aSelections.Clear();
+ if (!item.IsOk())
+ return m_root;
- GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
- if (HasFlag(wxDV_MULTIPLE))
+ wxGtkTreeModelNode *result = wxDataViewCtrlInternal_FindNode( m_wx_model, m_root, item );
+
+ if (!result)
{
- GtkTreeModel *model;
- GList *list = gtk_tree_selection_get_selected_rows( selection, &model );
-
- int count = 0;
- while (list)
+ wxPrintf( "Not found %d\n", (int) item.GetID() );
+ char *crash = NULL;
+ *crash = 0;
+ }
+
+ return result;
+}
+
+static wxGtkTreeModelNode*
+wxDataViewCtrlInternal_FindParentNode( wxDataViewModel * model, wxGtkTreeModelNode *treeNode, const wxDataViewItem &item )
+{
+ if( model == NULL )
+ return NULL;
+
+ ItemList list;
+ list.DeleteContents( true );
+ if( !item.IsOk() )
+ return NULL;
+
+ wxDataViewItem it( model->GetParent( item ) );
+ while( it.IsOk() )
+ {
+ wxDataViewItem * pItem = new wxDataViewItem( it );
+ list.Insert( pItem );
+ it = model->GetParent( it );
+ }
+
+ wxGtkTreeModelNode * node = treeNode;
+ for( ItemList::compatibility_iterator n = list.GetFirst(); n; n = n->GetNext() )
+ {
+ if( node && node->GetNodes().GetCount() != 0 )
{
-
- // list = g_list_nth( list, 0 ); should be a noop
- GtkTreePath *path = (GtkTreePath*) list->data;
-
- unsigned int row = (unsigned int)gtk_tree_path_get_indices (path)[0];
-
- aSelections.Add( (int) row );
-
- list = g_list_next( list );
+ int len = node->GetNodes().GetCount();
+ wxGtkTreeModelNodes nodes = node->GetNodes();
+ int j = 0;
+ for( ; j < len; j ++)
+ {
+ if( nodes[j]->GetItem() == *(n->GetData()))
+ {
+ node = nodes[j];
+ break;
+ }
+ }
+
+ if( j == len )
+ {
+ return NULL;
+ }
}
+ else
+ return NULL;
+ }
+ //Examine whether the node is item's parent node
+ int len = node->GetChildCount();
+ for( int i = 0; i < len ; i ++ )
+ {
+ if( node->GetChildren().Item( i ) == item.GetID() )
+ return node;
+ }
+ return NULL;
+}
+
+wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( GtkTreeIter *iter )
+{
+ if (!iter)
+ return NULL;
- // delete list
- g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL );
- g_list_free( list );
-
- return count;
+ wxDataViewItem item( (void*) iter->user_data );
+ if (!item.IsOk())
+ return NULL;
+
+ return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item );
+}
+
+wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem &item )
+{
+ if (!item.IsOk())
+ return NULL;
+
+ return wxDataViewCtrlInternal_FindParentNode( m_wx_model, m_root, item );
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewCtrl signal callbacks
+//-----------------------------------------------------------------------------
+
+static void
+wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv )
+{
+ if (!GTK_WIDGET_REALIZED(dv->m_widget))
+ return;
+
+ wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, dv->GetId() );
+ // TODO: item
+ 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_ITEM_ACTIVATED, dv->GetId() );
+
+ GtkTreeIter iter;
+ dv->GtkGetInternal()->get_iter( &iter, path );
+ wxDataViewItem item( (void*) iter.user_data );;
+ event.SetItem( item );
+ event.SetModel( dv->GetModel() );
+ dv->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewCtrl
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// InsertChild for wxDataViewCtrl
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child )
+{
+ wxDataViewCtrl * dvc = (wxDataViewCtrl*) parent;
+ GtkWidget *treeview = dvc->GtkGetTreeView();
+
+ // Insert widget in GtkTreeView
+ if (GTK_WIDGET_REALIZED(treeview))
+ gtk_widget_set_parent_window( child->m_widget,
+ gtk_tree_view_get_bin_window( GTK_TREE_VIEW(treeview) ) );
+ gtk_widget_set_parent( child->m_widget, treeview );
+}
+
+static
+void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
+ GtkAllocation *alloc,
+ wxDataViewCtrl *win )
+{
+ wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+ while (node)
+ {
+ wxWindow *child = node->GetData();
+
+ GtkRequisition req;
+ gtk_widget_size_request( child->m_widget, &req );
+
+ GtkAllocation alloc;
+ alloc.x = child->m_x;
+ alloc.y = child->m_y;
+ alloc.width = child->m_width;
+ alloc.height = child->m_height;
+ gtk_widget_size_allocate( child->m_widget, &alloc );
+
+ node = node->GetNext();
+ }
+}
+
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
+
+wxDataViewCtrl::~wxDataViewCtrl()
+{
+ if (m_notifier)
+ GetModel()->RemoveNotifier( m_notifier );
+
+ // remove the model from the GtkTreeView before it gets destroyed by the
+ // wxDataViewCtrlBase's dtor
+ gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL );
+
+ delete m_internal;
+}
+
+void wxDataViewCtrl::Init()
+{
+ m_notifier = NULL;
+}
+
+bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos, const wxSize& size,
+ long style, const wxValidator& validator )
+{
+ Init();
+
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator ))
+ {
+ wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
+ return false;
+ }
+
+ m_insertCallback = wxInsertChildInDataViewCtrl;
+
+ m_widget = gtk_scrolled_window_new (NULL, NULL);
+
+ GtkScrolledWindowSetBorder(m_widget, style);
+
+ m_treeview = gtk_tree_view_new();
+ gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
+
+ g_signal_connect (m_treeview, "size_allocate",
+ G_CALLBACK (gtk_dataviewctrl_size_callback), this);
+
+#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) );
+ gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE );
+ }
+
+ gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(m_treeview), (style & wxDV_NO_HEADER) == 0 );
+
+#ifdef __WXGTK210__
+ if (!gtk_check_version(2,10,0))
+ {
+ GtkTreeViewGridLines grid = GTK_TREE_VIEW_GRID_LINES_NONE;
+
+ if ((style & wxDV_HORIZ_RULES) != 0 &&
+ (style & wxDV_VERT_RULES) != 0)
+ grid = GTK_TREE_VIEW_GRID_LINES_BOTH;
+ else if (style & wxDV_VERT_RULES)
+ grid = GTK_TREE_VIEW_GRID_LINES_VERTICAL;
+ else if (style & wxDV_HORIZ_RULES)
+ grid = GTK_TREE_VIEW_GRID_LINES_HORIZONTAL;
+
+ gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid );
+ }
+ else
+#endif
+ {
+ gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_HORIZ_RULES) != 0 );
+ }
+
+ 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 );
+
+ PostCreation(size);
+
+ GtkEnableSelectionEvents();
+
+ 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 = GetColumnCount();
+ unsigned int i;
+ for (i = 0; i < cols; i++)
+ {
+ wxDataViewColumn *col = GetColumn( i );
+ col->OnInternalIdle();
+ }
+}
+
+bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
+{
+ if (!wxDataViewCtrlBase::AssociateModel( model ))
+ return false;
+
+ GtkWxTreeModel *gtk_model = wxgtk_tree_model_new();
+ m_internal = new wxDataViewCtrlInternal( this, model, gtk_model );
+ gtk_model->internal = m_internal;
+
+ m_notifier = new wxGtkDataViewModelNotifier( gtk_model, model, this );
+
+ model->AddNotifier( m_notifier );
+
+ gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_model) );
+
+ // unref in wxDataViewCtrlInternal
+ // g_object_unref( gtk_model );
+
+ return true;
+}
+
+bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
+{
+ if (!wxDataViewCtrlBase::AppendColumn(col))
+ return false;
+
+ GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
+
+ gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
+
+ return true;
+}
+
+wxDataViewItem wxDataViewCtrl::GetSelection()
+{
+ GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+
+ if (m_windowStyle & wxDV_MULTIPLE)
+ {
}
else
{
- GtkTreeModel *model;
GtkTreeIter iter;
- gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
- if (has_selection)
+ if (gtk_tree_selection_get_selected( selection, NULL, &iter ))
{
- unsigned int row = (wxUIntPtr) iter.user_data;
- aSelections.Add( (int) row );
- return 1;
+ wxDataViewItem item( (void*) iter.user_data );
+ return item;
}
}
- return 0;
+ return wxDataViewItem(0);
+}
+
+void wxDataViewCtrl::DoSetExpanderColumn()
+{
+}
+
+void wxDataViewCtrl::DoSetIndent()
+{
+}
+
+void wxDataViewCtrl::GtkDisableSelectionEvents()
+{
+ 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);
+}
+
+void wxDataViewCtrl::GtkEnableSelectionEvents()
+{
+ GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
+ g_signal_handlers_disconnect_by_func( selection,
+ (gpointer) (wxdataview_selection_changed_callback), this);
}
// static
projects / wxWidgets.git / blobdiff