2000-10-05 01:04:57 +00:00
|
|
|
/* gtkliststore.c
|
|
|
|
* Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <string.h>
|
2002-10-07 19:10:39 +00:00
|
|
|
#include <gobject/gvaluecollector.h>
|
2000-10-05 01:04:57 +00:00
|
|
|
#include "gtktreemodel.h"
|
|
|
|
#include "gtkliststore.h"
|
|
|
|
#include "gtktreedatalist.h"
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
#include "gtktreednd.h"
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
#define G_SLIST(x) ((GSList *) x)
|
2001-09-04 22:15:18 +00:00
|
|
|
#define GTK_LIST_STORE_IS_SORTED(list) (GTK_LIST_STORE (list)->sort_column_id != -2)
|
2001-07-09 17:09:35 +00:00
|
|
|
#define VALID_ITER(iter, list_store) (iter!= NULL && iter->user_data != NULL && list_store->stamp == iter->stamp)
|
2000-10-27 23:34:58 +00:00
|
|
|
|
|
|
|
static void gtk_list_store_init (GtkListStore *list_store);
|
|
|
|
static void gtk_list_store_class_init (GtkListStoreClass *class);
|
|
|
|
static void gtk_list_store_tree_model_init (GtkTreeModelIface *iface);
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
static void gtk_list_store_drag_source_init(GtkTreeDragSourceIface *iface);
|
|
|
|
static void gtk_list_store_drag_dest_init (GtkTreeDragDestIface *iface);
|
2001-03-23 00:35:19 +00:00
|
|
|
static void gtk_list_store_sortable_init (GtkTreeSortableIface *iface);
|
2001-10-01 20:12:47 +00:00
|
|
|
static void gtk_list_store_finalize (GObject *object);
|
Behaviour change, apply changes if the entry of the editable gets a focus
Tue Oct 15 00:53:14 2002 Kristian Rietveld <kris@gtk.org>
Behaviour change, apply changes if the entry of the editable gets
a focus out event (#82405).
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event):
new function,
(gtk_cell_renderer_text_start_editing): stop editing and apply
changes on focus-out.
Tue Oct 15 00:47:35 2002 Kristian Rietveld <kris@gtk.org>
Fixes an *evil* GtkTreeModelSort bug, #93629.
* gtk/gtktreemodel.c (release_row_references): return if the
refs->list is NULL.
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_changed): if we
are swapping two rows (re-insertion on row_changed), also *emit*
a rows_reordered signal. oops.
Tue Oct 15 00:45:03 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_remove_silently): free
the actual link after the node has been removed (#92014).
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_column_finalize):
free the cell_list and the child if the exists (#92014).
Tue Oct 15 00:40:25 2002 Kristian Rietveld <kris@gtk.org>
Don't accept drops if the model has been sorted, #93758)
* gtk/gtkliststore.c (gtk_list_store_row_drop_possible): return
FALSE if the list has been sorted.
* gtk/gtktreestore.c (gtk_tree_store_row_drop_possible): check
if drag_dest is a TreeStore, return FALSE if the tree has been
sorted.
Tue Oct 15 00:33:59 2002 Kristian Rietveld <kris@gtk.org>
Compiler warning fixage, (#85858, #85859, #85860, #85872)
* gtk/gtkcellrendererpixbuf (gtk_cell_renderer_pixbuf_render):
s/guint/GtkCellRendererState/.
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render):
ditto.
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render),
(gtk_cell_renderer_toggle_activate): ditto.
* gtk/gtkliststore.c (gtk_list_store_get_flags): a
s/guint/GtkTreeModelFlags/ on the return type.
2002-10-14 22:50:18 +00:00
|
|
|
static GtkTreeModelFlags gtk_list_store_get_flags (GtkTreeModel *tree_model);
|
2000-10-27 23:34:58 +00:00
|
|
|
static gint gtk_list_store_get_n_columns (GtkTreeModel *tree_model);
|
2000-11-10 19:38:53 +00:00
|
|
|
static GType gtk_list_store_get_column_type (GtkTreeModel *tree_model,
|
|
|
|
gint index);
|
2000-10-27 23:34:58 +00:00
|
|
|
static gboolean gtk_list_store_get_iter (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreePath *path);
|
|
|
|
static GtkTreePath *gtk_list_store_get_path (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter);
|
|
|
|
static void gtk_list_store_get_value (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gint column,
|
|
|
|
GValue *value);
|
|
|
|
static gboolean gtk_list_store_iter_next (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter);
|
|
|
|
static gboolean gtk_list_store_iter_children (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *parent);
|
|
|
|
static gboolean gtk_list_store_iter_has_child (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter);
|
|
|
|
static gint gtk_list_store_iter_n_children (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter);
|
|
|
|
static gboolean gtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *parent,
|
|
|
|
gint n);
|
|
|
|
static gboolean gtk_list_store_iter_parent (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *child);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-03-23 00:35:19 +00:00
|
|
|
|
2001-06-30 02:38:17 +00:00
|
|
|
static void gtk_list_store_set_n_columns (GtkListStore *list_store,
|
|
|
|
gint n_columns);
|
|
|
|
static void gtk_list_store_set_column_type (GtkListStore *list_store,
|
|
|
|
gint column,
|
|
|
|
GType type);
|
|
|
|
|
|
|
|
|
2001-03-23 00:35:19 +00:00
|
|
|
/* Drag and Drop */
|
2003-01-14 22:57:37 +00:00
|
|
|
static gboolean real_gtk_list_store_row_draggable (GtkTreeDragSource *drag_source,
|
|
|
|
GtkTreePath *path);
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
static gboolean gtk_list_store_drag_data_delete (GtkTreeDragSource *drag_source,
|
|
|
|
GtkTreePath *path);
|
|
|
|
static gboolean gtk_list_store_drag_data_get (GtkTreeDragSource *drag_source,
|
|
|
|
GtkTreePath *path,
|
|
|
|
GtkSelectionData *selection_data);
|
|
|
|
static gboolean gtk_list_store_drag_data_received (GtkTreeDragDest *drag_dest,
|
|
|
|
GtkTreePath *dest,
|
|
|
|
GtkSelectionData *selection_data);
|
2001-01-31 00:57:49 +00:00
|
|
|
static gboolean gtk_list_store_row_drop_possible (GtkTreeDragDest *drag_dest,
|
2001-11-06 19:10:03 +00:00
|
|
|
GtkTreePath *dest_path,
|
|
|
|
GtkSelectionData *selection_data);
|
2001-03-23 00:35:19 +00:00
|
|
|
|
2001-03-30 01:26:30 +00:00
|
|
|
|
2001-03-23 00:35:19 +00:00
|
|
|
/* sortable */
|
2001-09-03 23:37:39 +00:00
|
|
|
static void gtk_list_store_sort (GtkListStore *list_store);
|
|
|
|
static void gtk_list_store_sort_iter_changed (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gint column);
|
|
|
|
static gboolean gtk_list_store_get_sort_column_id (GtkTreeSortable *sortable,
|
|
|
|
gint *sort_column_id,
|
|
|
|
GtkSortType *order);
|
|
|
|
static void gtk_list_store_set_sort_column_id (GtkTreeSortable *sortable,
|
|
|
|
gint sort_column_id,
|
|
|
|
GtkSortType order);
|
|
|
|
static void gtk_list_store_set_sort_func (GtkTreeSortable *sortable,
|
|
|
|
gint sort_column_id,
|
|
|
|
GtkTreeIterCompareFunc func,
|
|
|
|
gpointer data,
|
|
|
|
GtkDestroyNotify destroy);
|
|
|
|
static void gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable,
|
|
|
|
GtkTreeIterCompareFunc func,
|
|
|
|
gpointer data,
|
|
|
|
GtkDestroyNotify destroy);
|
|
|
|
static gboolean gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable);
|
|
|
|
|
2002-11-18 19:33:28 +00:00
|
|
|
static void gtk_list_store_move (GtkListStore *store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *path,
|
|
|
|
gboolean before);
|
|
|
|
|
2001-03-23 00:35:19 +00:00
|
|
|
|
2001-10-09 22:24:23 +00:00
|
|
|
static GObjectClass *parent_class = NULL;
|
|
|
|
|
2001-03-23 00:35:19 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
static void
|
|
|
|
validate_list_store (GtkListStore *list_store)
|
|
|
|
{
|
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
|
|
|
{
|
|
|
|
g_assert (g_slist_length (list_store->root) == list_store->length);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
g_assert (g_slist_last (list_store->root) == list_store->tail);
|
|
|
|
}
|
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2002-10-07 19:10:39 +00:00
|
|
|
GType
|
2000-10-05 01:04:57 +00:00
|
|
|
gtk_list_store_get_type (void)
|
|
|
|
{
|
2001-02-21 23:49:22 +00:00
|
|
|
static GType list_store_type = 0;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
if (!list_store_type)
|
|
|
|
{
|
|
|
|
static const GTypeInfo list_store_info =
|
|
|
|
{
|
|
|
|
sizeof (GtkListStoreClass),
|
|
|
|
NULL, /* base_init */
|
|
|
|
NULL, /* base_finalize */
|
|
|
|
(GClassInitFunc) gtk_list_store_class_init,
|
|
|
|
NULL, /* class_finalize */
|
|
|
|
NULL, /* class_data */
|
|
|
|
sizeof (GtkListStore),
|
|
|
|
0,
|
|
|
|
(GInstanceInitFunc) gtk_list_store_init,
|
|
|
|
};
|
|
|
|
|
2000-10-16 23:11:55 +00:00
|
|
|
static const GInterfaceInfo tree_model_info =
|
|
|
|
{
|
|
|
|
(GInterfaceInitFunc) gtk_list_store_tree_model_init,
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
static const GInterfaceInfo drag_source_info =
|
|
|
|
{
|
|
|
|
(GInterfaceInitFunc) gtk_list_store_drag_source_init,
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const GInterfaceInfo drag_dest_info =
|
|
|
|
{
|
|
|
|
(GInterfaceInitFunc) gtk_list_store_drag_dest_init,
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
};
|
2001-03-23 00:35:19 +00:00
|
|
|
|
|
|
|
static const GInterfaceInfo sortable_info =
|
|
|
|
{
|
|
|
|
(GInterfaceInitFunc) gtk_list_store_sortable_init,
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2002-10-07 19:10:39 +00:00
|
|
|
list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkListStore",
|
|
|
|
&list_store_info, 0);
|
|
|
|
|
2000-10-16 23:11:55 +00:00
|
|
|
g_type_add_interface_static (list_store_type,
|
|
|
|
GTK_TYPE_TREE_MODEL,
|
|
|
|
&tree_model_info);
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
g_type_add_interface_static (list_store_type,
|
|
|
|
GTK_TYPE_TREE_DRAG_SOURCE,
|
|
|
|
&drag_source_info);
|
|
|
|
g_type_add_interface_static (list_store_type,
|
|
|
|
GTK_TYPE_TREE_DRAG_DEST,
|
|
|
|
&drag_dest_info);
|
2001-03-23 00:35:19 +00:00
|
|
|
g_type_add_interface_static (list_store_type,
|
|
|
|
GTK_TYPE_TREE_SORTABLE,
|
|
|
|
&sortable_info);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return list_store_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_list_store_class_init (GtkListStoreClass *class)
|
|
|
|
{
|
2001-02-21 23:49:22 +00:00
|
|
|
GObjectClass *object_class;
|
|
|
|
|
2001-10-09 22:24:23 +00:00
|
|
|
parent_class = g_type_class_peek_parent (class);
|
2001-02-21 23:49:22 +00:00
|
|
|
object_class = (GObjectClass*) class;
|
2001-10-01 20:12:47 +00:00
|
|
|
|
|
|
|
object_class->finalize = gtk_list_store_finalize;
|
2000-10-16 23:11:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_list_store_tree_model_init (GtkTreeModelIface *iface)
|
|
|
|
{
|
2000-11-09 16:52:17 +00:00
|
|
|
iface->get_flags = gtk_list_store_get_flags;
|
2000-10-16 23:11:55 +00:00
|
|
|
iface->get_n_columns = gtk_list_store_get_n_columns;
|
2000-11-10 19:38:53 +00:00
|
|
|
iface->get_column_type = gtk_list_store_get_column_type;
|
2000-10-26 00:36:47 +00:00
|
|
|
iface->get_iter = gtk_list_store_get_iter;
|
2000-10-16 23:11:55 +00:00
|
|
|
iface->get_path = gtk_list_store_get_path;
|
2000-10-27 23:34:58 +00:00
|
|
|
iface->get_value = gtk_list_store_get_value;
|
2000-10-26 00:36:47 +00:00
|
|
|
iface->iter_next = gtk_list_store_iter_next;
|
|
|
|
iface->iter_children = gtk_list_store_iter_children;
|
|
|
|
iface->iter_has_child = gtk_list_store_iter_has_child;
|
|
|
|
iface->iter_n_children = gtk_list_store_iter_n_children;
|
|
|
|
iface->iter_nth_child = gtk_list_store_iter_nth_child;
|
|
|
|
iface->iter_parent = gtk_list_store_iter_parent;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
static void
|
|
|
|
gtk_list_store_drag_source_init (GtkTreeDragSourceIface *iface)
|
|
|
|
{
|
2003-01-14 22:57:37 +00:00
|
|
|
iface->row_draggable = real_gtk_list_store_row_draggable;
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
iface->drag_data_delete = gtk_list_store_drag_data_delete;
|
|
|
|
iface->drag_data_get = gtk_list_store_drag_data_get;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-03-23 00:35:19 +00:00
|
|
|
gtk_list_store_drag_dest_init (GtkTreeDragDestIface *iface)
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
{
|
|
|
|
iface->drag_data_received = gtk_list_store_drag_data_received;
|
2001-01-31 00:57:49 +00:00
|
|
|
iface->row_drop_possible = gtk_list_store_row_drop_possible;
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
}
|
|
|
|
|
2001-03-23 00:35:19 +00:00
|
|
|
static void
|
|
|
|
gtk_list_store_sortable_init (GtkTreeSortableIface *iface)
|
|
|
|
{
|
|
|
|
iface->get_sort_column_id = gtk_list_store_get_sort_column_id;
|
|
|
|
iface->set_sort_column_id = gtk_list_store_set_sort_column_id;
|
2001-06-15 23:03:27 +00:00
|
|
|
iface->set_sort_func = gtk_list_store_set_sort_func;
|
2001-09-03 23:37:39 +00:00
|
|
|
iface->set_default_sort_func = gtk_list_store_set_default_sort_func;
|
|
|
|
iface->has_default_sort_func = gtk_list_store_has_default_sort_func;
|
2001-03-23 00:35:19 +00:00
|
|
|
}
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
static void
|
|
|
|
gtk_list_store_init (GtkListStore *list_store)
|
|
|
|
{
|
|
|
|
list_store->root = NULL;
|
2001-01-10 23:44:22 +00:00
|
|
|
list_store->tail = NULL;
|
2001-03-23 00:35:19 +00:00
|
|
|
list_store->sort_list = NULL;
|
2000-11-09 16:52:17 +00:00
|
|
|
list_store->stamp = g_random_int ();
|
2001-01-31 00:57:49 +00:00
|
|
|
list_store->length = 0;
|
2001-09-04 22:15:18 +00:00
|
|
|
list_store->sort_column_id = -2;
|
2001-11-14 02:06:28 +00:00
|
|
|
list_store->columns_dirty = FALSE;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-02-03 01:09:41 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_new:
|
|
|
|
* @n_columns: number of columns in the list store
|
2001-06-08 16:50:58 +00:00
|
|
|
* @Varargs: all #GType types for the columns, from first to last
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2001-06-30 02:38:17 +00:00
|
|
|
* Creates a new list store as with @n_columns columns each of the types passed
|
2001-12-06 21:38:12 +00:00
|
|
|
* in. As an example, <literal>gtk_tree_store_new (3, G_TYPE_INT, G_TYPE_STRING,
|
|
|
|
* GDK_TYPE_PIXBUF);</literal> will create a new #GtkListStore with three columns, of type
|
|
|
|
* int, string and #GdkPixbuf respectively.
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2001-02-03 01:09:41 +00:00
|
|
|
* Return value: a new #GtkListStore
|
|
|
|
**/
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkListStore *
|
2001-06-30 02:38:17 +00:00
|
|
|
gtk_list_store_new (gint n_columns,
|
2000-10-05 01:04:57 +00:00
|
|
|
...)
|
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkListStore *retval;
|
2000-10-05 01:04:57 +00:00
|
|
|
va_list args;
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
g_return_val_if_fail (n_columns > 0, NULL);
|
|
|
|
|
2002-10-07 19:10:39 +00:00
|
|
|
retval = g_object_new (GTK_TYPE_LIST_STORE, NULL);
|
2000-10-27 23:34:58 +00:00
|
|
|
gtk_list_store_set_n_columns (retval, n_columns);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
va_start (args, n_columns);
|
2000-10-27 23:34:58 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
for (i = 0; i < n_columns; i++)
|
2001-03-10 01:34:48 +00:00
|
|
|
{
|
|
|
|
GType type = va_arg (args, GType);
|
|
|
|
if (! _gtk_tree_data_list_check_type (type))
|
|
|
|
{
|
2002-10-07 19:10:39 +00:00
|
|
|
g_warning ("%s: Invalid type %s passed to gtk_list_store_new\n",
|
|
|
|
G_STRLOC, g_type_name (type));
|
|
|
|
g_object_unref (retval);
|
2001-03-10 01:34:48 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
gtk_list_store_set_column_type (retval, i, type);
|
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
va_end (args);
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2001-06-30 21:15:27 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_list_store_newv:
|
|
|
|
* @n_columns: number of columns in the list store
|
|
|
|
* @types: an array of #GType types for the columns, from first to last
|
|
|
|
*
|
2001-12-06 21:38:12 +00:00
|
|
|
* Non-vararg creation function. Used primarily by language bindings.
|
2001-06-30 21:15:27 +00:00
|
|
|
*
|
|
|
|
* Return value: a new #GtkListStore
|
|
|
|
**/
|
|
|
|
GtkListStore *
|
|
|
|
gtk_list_store_newv (gint n_columns,
|
|
|
|
GType *types)
|
|
|
|
{
|
|
|
|
GtkListStore *retval;
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
g_return_val_if_fail (n_columns > 0, NULL);
|
|
|
|
|
2002-10-07 19:10:39 +00:00
|
|
|
retval = g_object_new (GTK_TYPE_LIST_STORE, NULL);
|
2001-06-30 21:15:27 +00:00
|
|
|
gtk_list_store_set_n_columns (retval, n_columns);
|
|
|
|
|
|
|
|
for (i = 0; i < n_columns; i++)
|
|
|
|
{
|
|
|
|
if (! _gtk_tree_data_list_check_type (types[i]))
|
|
|
|
{
|
2002-10-07 19:10:39 +00:00
|
|
|
g_warning ("%s: Invalid type %s passed to gtk_list_store_newv\n",
|
|
|
|
G_STRLOC, g_type_name (types[i]));
|
|
|
|
g_object_unref (retval);
|
2001-06-30 21:15:27 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
gtk_list_store_set_column_type (retval, i, types[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_set_column_types:
|
|
|
|
* @list_store: A #GtkListStore
|
|
|
|
* @n_columns: Number of columns for the list store
|
2001-12-06 21:38:12 +00:00
|
|
|
* @types: An array length n of #GTypes
|
2001-11-14 02:06:28 +00:00
|
|
|
*
|
2001-12-06 21:38:12 +00:00
|
|
|
* This function is meant primarily for #GObjects that inherit from #GtkListStore,
|
|
|
|
* and should only be used when constructing a new #GtkListStore. It will not
|
|
|
|
* function after a row has been added, or a method on the #GtkTreeModel
|
2001-11-14 02:06:28 +00:00
|
|
|
* interface is called.
|
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_list_store_set_column_types (GtkListStore *list_store,
|
|
|
|
gint n_columns,
|
|
|
|
GType *types)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
|
|
|
g_return_if_fail (list_store->columns_dirty == 0);
|
|
|
|
|
|
|
|
gtk_list_store_set_n_columns (list_store, n_columns);
|
|
|
|
for (i = 0; i < n_columns; i++)
|
|
|
|
{
|
|
|
|
if (! _gtk_tree_data_list_check_type (types[i]))
|
|
|
|
{
|
|
|
|
g_warning ("%s: Invalid type %s passed to gtk_list_store_set_column_types\n", G_STRLOC, g_type_name (types[i]));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
gtk_list_store_set_column_type (list_store, i, types[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-06-30 02:38:17 +00:00
|
|
|
static void
|
2000-10-05 01:04:57 +00:00
|
|
|
gtk_list_store_set_n_columns (GtkListStore *list_store,
|
|
|
|
gint n_columns)
|
|
|
|
{
|
|
|
|
GType *new_columns;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
2000-10-27 23:34:58 +00:00
|
|
|
g_return_if_fail (n_columns > 0);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
if (list_store->n_columns == n_columns)
|
|
|
|
return;
|
|
|
|
|
|
|
|
new_columns = g_new0 (GType, n_columns);
|
|
|
|
if (list_store->column_headers)
|
|
|
|
{
|
|
|
|
/* copy the old header orders over */
|
|
|
|
if (n_columns >= list_store->n_columns)
|
|
|
|
memcpy (new_columns, list_store->column_headers, list_store->n_columns * sizeof (gchar *));
|
|
|
|
else
|
|
|
|
memcpy (new_columns, list_store->column_headers, n_columns * sizeof (GType));
|
|
|
|
|
|
|
|
g_free (list_store->column_headers);
|
|
|
|
}
|
|
|
|
|
2001-03-23 00:35:19 +00:00
|
|
|
if (list_store->sort_list)
|
|
|
|
_gtk_tree_data_list_header_free (list_store->sort_list);
|
|
|
|
|
|
|
|
list_store->sort_list = _gtk_tree_data_list_header_new (n_columns, list_store->column_headers);
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
list_store->column_headers = new_columns;
|
|
|
|
list_store->n_columns = n_columns;
|
|
|
|
}
|
|
|
|
|
2001-06-30 02:38:17 +00:00
|
|
|
static void
|
2000-10-05 01:04:57 +00:00
|
|
|
gtk_list_store_set_column_type (GtkListStore *list_store,
|
|
|
|
gint column,
|
|
|
|
GType type)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
|
|
|
g_return_if_fail (column >=0 && column < list_store->n_columns);
|
2002-10-07 19:10:39 +00:00
|
|
|
|
2001-03-10 01:34:48 +00:00
|
|
|
if (!_gtk_tree_data_list_check_type (type))
|
|
|
|
{
|
2001-08-19 23:46:59 +00:00
|
|
|
g_warning ("%s: Invalid type %s passed to gtk_list_store_set_column_type\n", G_STRLOC, g_type_name (type));
|
2001-03-10 01:34:48 +00:00
|
|
|
return;
|
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
list_store->column_headers[column] = type;
|
|
|
|
}
|
|
|
|
|
2001-10-01 20:12:47 +00:00
|
|
|
static void
|
|
|
|
gtk_list_store_finalize (GObject *object)
|
|
|
|
{
|
|
|
|
GtkListStore *list_store = GTK_LIST_STORE (object);
|
|
|
|
|
2002-09-11 19:52:31 +00:00
|
|
|
g_slist_foreach (list_store->root, (GFunc) _gtk_tree_data_list_free, list_store->column_headers);
|
|
|
|
g_slist_free (list_store->root);
|
|
|
|
|
2001-10-01 20:12:47 +00:00
|
|
|
_gtk_tree_data_list_header_free (list_store->sort_list);
|
|
|
|
g_free (list_store->column_headers);
|
|
|
|
|
|
|
|
if (list_store->default_sort_destroy)
|
|
|
|
{
|
2002-03-03 05:41:28 +00:00
|
|
|
GtkDestroyNotify d = list_store->default_sort_destroy;
|
|
|
|
|
2001-10-01 20:12:47 +00:00
|
|
|
list_store->default_sort_destroy = NULL;
|
2002-03-03 05:41:28 +00:00
|
|
|
d (list_store->default_sort_data);
|
2001-10-01 20:12:47 +00:00
|
|
|
list_store->default_sort_data = NULL;
|
|
|
|
}
|
2001-10-09 22:24:23 +00:00
|
|
|
|
2002-09-11 19:52:31 +00:00
|
|
|
/* must chain up */
|
2001-10-09 22:24:23 +00:00
|
|
|
(* parent_class->finalize) (object);
|
2001-10-01 20:12:47 +00:00
|
|
|
}
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
/* Fulfill the GtkTreeModel requirements */
|
Behaviour change, apply changes if the entry of the editable gets a focus
Tue Oct 15 00:53:14 2002 Kristian Rietveld <kris@gtk.org>
Behaviour change, apply changes if the entry of the editable gets
a focus out event (#82405).
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event):
new function,
(gtk_cell_renderer_text_start_editing): stop editing and apply
changes on focus-out.
Tue Oct 15 00:47:35 2002 Kristian Rietveld <kris@gtk.org>
Fixes an *evil* GtkTreeModelSort bug, #93629.
* gtk/gtktreemodel.c (release_row_references): return if the
refs->list is NULL.
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_changed): if we
are swapping two rows (re-insertion on row_changed), also *emit*
a rows_reordered signal. oops.
Tue Oct 15 00:45:03 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_remove_silently): free
the actual link after the node has been removed (#92014).
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_column_finalize):
free the cell_list and the child if the exists (#92014).
Tue Oct 15 00:40:25 2002 Kristian Rietveld <kris@gtk.org>
Don't accept drops if the model has been sorted, #93758)
* gtk/gtkliststore.c (gtk_list_store_row_drop_possible): return
FALSE if the list has been sorted.
* gtk/gtktreestore.c (gtk_tree_store_row_drop_possible): check
if drag_dest is a TreeStore, return FALSE if the tree has been
sorted.
Tue Oct 15 00:33:59 2002 Kristian Rietveld <kris@gtk.org>
Compiler warning fixage, (#85858, #85859, #85860, #85872)
* gtk/gtkcellrendererpixbuf (gtk_cell_renderer_pixbuf_render):
s/guint/GtkCellRendererState/.
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render):
ditto.
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render),
(gtk_cell_renderer_toggle_activate): ditto.
* gtk/gtkliststore.c (gtk_list_store_get_flags): a
s/guint/GtkTreeModelFlags/ on the return type.
2002-10-14 22:50:18 +00:00
|
|
|
static GtkTreeModelFlags
|
2000-11-09 16:52:17 +00:00
|
|
|
gtk_list_store_get_flags (GtkTreeModel *tree_model)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), 0);
|
|
|
|
|
2001-06-12 18:12:08 +00:00
|
|
|
return GTK_TREE_MODEL_ITERS_PERSIST | GTK_TREE_MODEL_LIST_ONLY;
|
2000-11-09 16:52:17 +00:00
|
|
|
}
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
static gint
|
|
|
|
gtk_list_store_get_n_columns (GtkTreeModel *tree_model)
|
|
|
|
{
|
2001-11-14 02:06:28 +00:00
|
|
|
GtkListStore *list_store = (GtkListStore *) tree_model;
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), 0);
|
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
list_store->columns_dirty = TRUE;
|
|
|
|
|
|
|
|
return list_store->n_columns;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2000-11-10 19:38:53 +00:00
|
|
|
static GType
|
|
|
|
gtk_list_store_get_column_type (GtkTreeModel *tree_model,
|
|
|
|
gint index)
|
|
|
|
{
|
2001-11-14 02:06:28 +00:00
|
|
|
GtkListStore *list_store = (GtkListStore *) tree_model;
|
|
|
|
|
2000-11-10 19:38:53 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), G_TYPE_INVALID);
|
|
|
|
g_return_val_if_fail (index < GTK_LIST_STORE (tree_model)->n_columns &&
|
|
|
|
index >= 0, G_TYPE_INVALID);
|
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
list_store->columns_dirty = TRUE;
|
|
|
|
|
|
|
|
return list_store->column_headers[index];
|
2000-11-10 19:38:53 +00:00
|
|
|
}
|
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
static gboolean
|
2000-10-26 00:36:47 +00:00
|
|
|
gtk_list_store_get_iter (GtkTreeModel *tree_model,
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreeIter *iter,
|
2000-10-05 01:04:57 +00:00
|
|
|
GtkTreePath *path)
|
|
|
|
{
|
2001-11-14 02:06:28 +00:00
|
|
|
GtkListStore *list_store = (GtkListStore *) tree_model;
|
2001-01-31 00:57:49 +00:00
|
|
|
GSList *list;
|
|
|
|
gint i;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), FALSE);
|
2001-03-28 01:54:14 +00:00
|
|
|
g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
|
2001-01-31 00:57:49 +00:00
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
list_store->columns_dirty = TRUE;
|
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
i = gtk_tree_path_get_indices (path)[0];
|
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
if (i >= list_store->length)
|
2001-01-31 00:57:49 +00:00
|
|
|
return FALSE;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
list = g_slist_nth (G_SLIST (list_store->root), i);
|
2000-10-27 23:34:58 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
/* If this fails, list_store->length has gotten mangled. */
|
|
|
|
g_assert (list);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
iter->stamp = list_store->stamp;
|
2001-01-31 00:57:49 +00:00
|
|
|
iter->user_data = list;
|
2001-11-14 02:06:28 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
return TRUE;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static GtkTreePath *
|
|
|
|
gtk_list_store_get_path (GtkTreeModel *tree_model,
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreeIter *iter)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
GtkTreePath *retval;
|
|
|
|
GSList *list;
|
|
|
|
gint i = 0;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), NULL);
|
2000-10-27 23:34:58 +00:00
|
|
|
g_return_val_if_fail (iter->stamp == GTK_LIST_STORE (tree_model)->stamp, NULL);
|
2002-02-25 21:20:25 +00:00
|
|
|
if (G_SLIST (iter->user_data) == G_SLIST (GTK_LIST_STORE (tree_model)->tail))
|
|
|
|
{
|
|
|
|
retval = gtk_tree_path_new ();
|
|
|
|
gtk_tree_path_append_index (retval, GTK_LIST_STORE (tree_model)->length - 1);
|
|
|
|
return retval;
|
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
for (list = G_SLIST (GTK_LIST_STORE (tree_model)->root); list; list = list->next)
|
|
|
|
{
|
2001-01-04 23:36:19 +00:00
|
|
|
if (list == G_SLIST (iter->user_data))
|
2000-10-05 01:04:57 +00:00
|
|
|
break;
|
2000-10-27 23:34:58 +00:00
|
|
|
i++;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
if (list == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
retval = gtk_tree_path_new ();
|
|
|
|
gtk_tree_path_append_index (retval, i);
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-10-27 23:34:58 +00:00
|
|
|
gtk_list_store_get_value (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gint column,
|
|
|
|
GValue *value)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
GtkTreeDataList *list;
|
|
|
|
gint tmp_column = column;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (tree_model));
|
|
|
|
g_return_if_fail (column < GTK_LIST_STORE (tree_model)->n_columns);
|
2000-10-27 23:34:58 +00:00
|
|
|
g_return_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-01-04 23:36:19 +00:00
|
|
|
list = G_SLIST (iter->user_data)->data;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
while (tmp_column-- > 0 && list)
|
|
|
|
list = list->next;
|
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
if (list == NULL)
|
|
|
|
g_value_init (value, GTK_LIST_STORE (tree_model)->column_headers[column]);
|
|
|
|
else
|
|
|
|
_gtk_tree_data_list_node_to_value (list,
|
|
|
|
GTK_LIST_STORE (tree_model)->column_headers[column],
|
|
|
|
value);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2000-10-26 00:36:47 +00:00
|
|
|
gtk_list_store_iter_next (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), FALSE);
|
|
|
|
g_return_val_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp, FALSE);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-05-22 19:18:47 +00:00
|
|
|
iter->user_data = G_SLIST (iter->user_data)->next;
|
|
|
|
|
|
|
|
return (iter->user_data != NULL);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
static gboolean
|
2000-10-26 00:36:47 +00:00
|
|
|
gtk_list_store_iter_children (GtkTreeModel *tree_model,
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *parent)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2001-01-31 00:57:49 +00:00
|
|
|
/* this is a list, nodes have no children */
|
2001-01-09 17:45:34 +00:00
|
|
|
if (parent)
|
2001-01-31 00:57:49 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* but if parent == NULL we return the list itself as children of the
|
|
|
|
* "root"
|
|
|
|
*/
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
if (GTK_LIST_STORE (tree_model)->root)
|
2001-01-09 17:45:34 +00:00
|
|
|
{
|
|
|
|
iter->stamp = GTK_LIST_STORE (tree_model)->stamp;
|
|
|
|
iter->user_data = GTK_LIST_STORE (tree_model)->root;
|
|
|
|
return TRUE;
|
|
|
|
}
|
2001-01-31 00:57:49 +00:00
|
|
|
else
|
|
|
|
return FALSE;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2000-10-26 00:36:47 +00:00
|
|
|
gtk_list_store_iter_has_child (GtkTreeModel *tree_model,
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreeIter *iter)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
2000-10-26 00:36:47 +00:00
|
|
|
gtk_list_store_iter_n_children (GtkTreeModel *tree_model,
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreeIter *iter)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2001-07-09 17:09:35 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), -1);
|
|
|
|
if (iter == NULL)
|
2001-01-31 00:57:49 +00:00
|
|
|
return GTK_LIST_STORE (tree_model)->length;
|
2001-07-09 17:09:35 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp, -1);
|
|
|
|
return 0;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
static gboolean
|
2000-10-26 00:36:47 +00:00
|
|
|
gtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *parent,
|
Fix GtkTreeNode *node ->GtkTreeNode node issue.
2000-10-15 <jrb@redhat.com>
* gtk/gtktreeview.c, gtk/gtktreeview.h, gtk/gtktreestore.h,
gtk/gtktreestore.c, gtk/gtkliststore.h, gtk/gtkliststore.c,
gtk/gtkmodelsimple.c, gtk/gtkmodelsimple.h, gtk/gtktreedatalist.c,
gtk/gtktreemodel.h, gtk/gtktreeselection.c,
gtk/gtktreeselection.h: Fix GtkTreeNode *node ->GtkTreeNode node
issue.
2000-10-15 17:46:23 +00:00
|
|
|
gint n)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2001-01-31 00:57:49 +00:00
|
|
|
GSList *child;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), FALSE);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
if (parent)
|
2001-01-31 00:57:49 +00:00
|
|
|
return FALSE;
|
2000-10-27 23:34:58 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
child = g_slist_nth (G_SLIST (GTK_LIST_STORE (tree_model)->root), n);
|
2000-10-27 23:34:58 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
if (child)
|
|
|
|
{
|
|
|
|
iter->stamp = GTK_LIST_STORE (tree_model)->stamp;
|
2001-03-28 03:09:03 +00:00
|
|
|
iter->user_data = child;
|
2001-01-31 00:57:49 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
2000-10-27 23:34:58 +00:00
|
|
|
else
|
2001-01-31 00:57:49 +00:00
|
|
|
return FALSE;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
static gboolean
|
|
|
|
gtk_list_store_iter_parent (GtkTreeModel *tree_model,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *child)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
return FALSE;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-10-27 00:41:12 +00:00
|
|
|
static gboolean
|
2001-09-27 00:09:41 +00:00
|
|
|
gtk_list_store_real_set_value (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gint column,
|
2002-01-30 23:51:04 +00:00
|
|
|
GValue *value,
|
|
|
|
gboolean sort)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
GtkTreeDataList *list;
|
|
|
|
GtkTreeDataList *prev;
|
2002-07-01 21:15:35 +00:00
|
|
|
gint old_column = column;
|
2001-03-10 01:34:48 +00:00
|
|
|
GValue real_value = {0, };
|
|
|
|
gboolean converted = FALSE;
|
2001-09-27 00:09:41 +00:00
|
|
|
gboolean retval = FALSE;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-09-27 00:09:41 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
|
|
|
|
g_return_val_if_fail (VALID_ITER (iter, list_store), FALSE);
|
|
|
|
g_return_val_if_fail (column >= 0 && column < list_store->n_columns, FALSE);
|
|
|
|
g_return_val_if_fail (G_IS_VALUE (value), FALSE);
|
2001-03-10 01:34:48 +00:00
|
|
|
|
2001-03-10 17:13:46 +00:00
|
|
|
if (! g_type_is_a (G_VALUE_TYPE (value), list_store->column_headers[column]))
|
2001-03-10 01:34:48 +00:00
|
|
|
{
|
2001-03-10 17:13:46 +00:00
|
|
|
if (! (g_value_type_compatible (G_VALUE_TYPE (value), list_store->column_headers[column]) &&
|
|
|
|
g_value_type_compatible (list_store->column_headers[column], G_VALUE_TYPE (value))))
|
2001-03-10 01:34:48 +00:00
|
|
|
{
|
|
|
|
g_warning ("%s: Unable to convert from %s to %s\n",
|
|
|
|
G_STRLOC,
|
|
|
|
g_type_name (G_VALUE_TYPE (value)),
|
2001-03-10 17:13:46 +00:00
|
|
|
g_type_name (list_store->column_headers[column]));
|
2001-09-27 00:09:41 +00:00
|
|
|
return retval;
|
2001-03-10 01:34:48 +00:00
|
|
|
}
|
|
|
|
if (!g_value_transform (value, &real_value))
|
|
|
|
{
|
|
|
|
g_warning ("%s: Unable to make conversion from %s to %s\n",
|
|
|
|
G_STRLOC,
|
|
|
|
g_type_name (G_VALUE_TYPE (value)),
|
2001-03-10 17:13:46 +00:00
|
|
|
g_type_name (list_store->column_headers[column]));
|
2001-03-10 01:34:48 +00:00
|
|
|
g_value_unset (&real_value);
|
2001-09-27 00:09:41 +00:00
|
|
|
return retval;
|
2001-03-10 01:34:48 +00:00
|
|
|
}
|
|
|
|
converted = TRUE;
|
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-01-04 23:36:19 +00:00
|
|
|
prev = list = G_SLIST (iter->user_data)->data;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
while (list != NULL)
|
|
|
|
{
|
|
|
|
if (column == 0)
|
|
|
|
{
|
2001-03-10 01:34:48 +00:00
|
|
|
if (converted)
|
|
|
|
_gtk_tree_data_list_value_to_node (list, &real_value);
|
|
|
|
else
|
|
|
|
_gtk_tree_data_list_value_to_node (list, value);
|
2001-09-27 00:09:41 +00:00
|
|
|
retval = TRUE;
|
2001-03-10 01:34:48 +00:00
|
|
|
if (converted)
|
|
|
|
g_value_unset (&real_value);
|
add a gtk_list_store_sort_iter_changed line for some special case ...
Tue Nov 26 22:26:04 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtk{tree,list}store.c (gtk_{tree,list}_store_real_set_value):
add a gtk_list_store_sort_iter_changed line for some special
case ... (#96647 (issue 1), testcases from Soeren Sandmann and
Daniel Elstner).
Tue Nov 26 22:18:06 2002 Kristian Rietveld <kris@gtk.org>
Inconsistent state for toggle renderers, requested by Paolo Bacchilega
in #88130.
* gtk/gtktreeprivate.h: move GtkCellRendererInfo here.
* gtk/gtkcellrenderer.c: moved GtkCellRendererInfo away,
fix some indentation issues.
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_class_init),
(gtk_cell_renderer_toggle_set_property),
(gtk_cell_renderer_toggle_get_property),
(gtk_cell_renderer_toggle_render): add an inconsistent property.
* gtk/gtkstyle.c (gtk_default_draw_check),
(gtk_default_draw_option): support drawing inconsistent
options/checks for cells.
Tue Nov 26 22:14:14 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_editing_done),
(gtk_cell_renderer_text_start_editing): add a focus_out_id to avoid
calling _editing_done twice (which has nasty side-effects). (#96647,
(issue 2) testcase from Soeren Sandmann).
Tue Nov 26 22:12:21 2002 Kristian Rietveld <kris@gtk.org>
#82739, patch from Padraig O'Briain.
* gtk/gtktreeviewcolumn.[ch]: add
gtk_tree_view_column_cell_get_position()
Tue Nov 26 22:06:29 2002 Kristian Rietveld <kris@gtk.org>
Yes, this chunk breaks ABI compatibility. Owen knows about it and
agreed with it. It doesn't break ABI that bad though, things will
still work. Please keep it silent :P.
This patch fixes some keynav issues reported by Narayana Pattipati
in #81633. (Also mentioned in #92037 (Sun tracking bug)).
* gtk/gtkmarshalers.list: add two silly marshalers
* gtk/gtktreeview.[ch] (gtk_tree_view_real_select_all),
(gtk_tree_view_real_unselect_all),
(gtk_tree_view_real_select_cursor_row),
(gtk_tree_view_real_toggle_cursor_row),
(gtk_tree_view_real_expand_collapse_cursor_row),
(gtk_tree_view_real_start_interactive_search): change the return
type from void to gboolean, update prototypes, functions, signals and
entries in GtkTreeViewClass,
(gtk_tree_view_class_init): add select_cursor_row binding for
enter key,
(gtk_tree_view_key_press): only navigate the header button if the
header is also visible ...
Tue Nov 26 22:05:48 2002 Kristian Rietveld <kris@gtk.org>
API bit of #75745, reported by Richard Hult.
* gtk/gtkcellrenderer.h (GtkCellRendererState): add
GTK_CELL_RENDERER_FOCUSED, rest of this bug fix will follow later.
2002-11-26 21:28:01 +00:00
|
|
|
if (sort && GTK_LIST_STORE_IS_SORTED (list_store))
|
|
|
|
gtk_list_store_sort_iter_changed (list_store, iter, old_column);
|
2001-09-27 00:09:41 +00:00
|
|
|
return retval;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
column--;
|
|
|
|
prev = list;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
2001-01-04 23:36:19 +00:00
|
|
|
if (G_SLIST (iter->user_data)->data == NULL)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2001-01-04 23:36:19 +00:00
|
|
|
G_SLIST (iter->user_data)->data = list = _gtk_tree_data_list_alloc ();
|
2000-10-05 01:04:57 +00:00
|
|
|
list->next = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
list = prev->next = _gtk_tree_data_list_alloc ();
|
2000-10-05 01:04:57 +00:00
|
|
|
list->next = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (column != 0)
|
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
list->next = _gtk_tree_data_list_alloc ();
|
2000-10-05 01:04:57 +00:00
|
|
|
list = list->next;
|
|
|
|
list->next = NULL;
|
|
|
|
column --;
|
|
|
|
}
|
2001-02-22 01:56:08 +00:00
|
|
|
|
2001-03-10 01:34:48 +00:00
|
|
|
if (converted)
|
2001-03-10 17:13:46 +00:00
|
|
|
_gtk_tree_data_list_value_to_node (list, &real_value);
|
2001-03-10 01:34:48 +00:00
|
|
|
else
|
|
|
|
_gtk_tree_data_list_value_to_node (list, value);
|
2002-07-01 21:15:35 +00:00
|
|
|
|
2001-09-27 00:09:41 +00:00
|
|
|
retval = TRUE;
|
2001-03-10 01:34:48 +00:00
|
|
|
if (converted)
|
|
|
|
g_value_unset (&real_value);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2002-01-30 23:51:04 +00:00
|
|
|
if (sort && GTK_LIST_STORE_IS_SORTED (list_store))
|
2002-07-01 21:15:35 +00:00
|
|
|
gtk_list_store_sort_iter_changed (list_store, iter, old_column);
|
2001-09-27 00:09:41 +00:00
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_list_store_set_value:
|
|
|
|
* @list_store: A #GtkListStore
|
|
|
|
* @iter: A valid #GtkTreeIter for the row being modified
|
|
|
|
* @column: column number to modify
|
|
|
|
* @value: new value for the cell
|
|
|
|
*
|
|
|
|
* Sets the data in the cell specified by @iter and @column.
|
|
|
|
* The type of @value must be convertible to the type of the
|
|
|
|
* column.
|
|
|
|
*
|
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_list_store_set_value (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gint column,
|
|
|
|
GValue *value)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
|
|
|
g_return_if_fail (VALID_ITER (iter, list_store));
|
|
|
|
g_return_if_fail (column >= 0 && column < list_store->n_columns);
|
|
|
|
g_return_if_fail (G_IS_VALUE (value));
|
|
|
|
|
2002-01-30 23:51:04 +00:00
|
|
|
if (gtk_list_store_real_set_value (list_store, iter, column, value, TRUE))
|
2001-09-27 00:09:41 +00:00
|
|
|
{
|
|
|
|
GtkTreePath *path;
|
|
|
|
|
|
|
|
path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
|
|
|
|
gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
|
|
|
|
gtk_tree_path_free (path);
|
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-02-03 01:09:41 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_set_valist:
|
2001-09-08 18:23:47 +00:00
|
|
|
* @list_store: A #GtkListStore
|
|
|
|
* @iter: A valid #GtkTreeIter for the row being modified
|
2001-02-03 01:09:41 +00:00
|
|
|
* @var_args: va_list of column/value pairs
|
|
|
|
*
|
2001-10-18 22:05:23 +00:00
|
|
|
* See gtk_list_store_set(); this version takes a va_list for use by language
|
2001-09-27 00:09:41 +00:00
|
|
|
* bindings.
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2001-02-03 01:09:41 +00:00
|
|
|
**/
|
2001-01-08 18:26:05 +00:00
|
|
|
void
|
|
|
|
gtk_list_store_set_valist (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter,
|
2001-02-03 01:09:41 +00:00
|
|
|
va_list var_args)
|
2001-01-08 18:26:05 +00:00
|
|
|
{
|
|
|
|
gint column;
|
2001-09-27 00:09:41 +00:00
|
|
|
gboolean emit_signal = FALSE;
|
2002-01-30 23:51:04 +00:00
|
|
|
gboolean maybe_need_sort = FALSE;
|
2002-02-11 15:48:22 +00:00
|
|
|
GtkTreeIterCompareFunc func = NULL;
|
2001-01-08 18:26:05 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
2001-07-09 17:09:35 +00:00
|
|
|
g_return_if_fail (VALID_ITER (iter, list_store));
|
2001-01-08 18:26:05 +00:00
|
|
|
|
|
|
|
column = va_arg (var_args, gint);
|
|
|
|
|
2002-01-31 01:17:21 +00:00
|
|
|
if (GTK_LIST_STORE_IS_SORTED (list_store))
|
2002-01-30 23:51:04 +00:00
|
|
|
{
|
2002-01-31 01:17:21 +00:00
|
|
|
if (list_store->sort_column_id != -1)
|
|
|
|
{
|
|
|
|
GtkTreeDataSortHeader *header;
|
|
|
|
header = _gtk_tree_data_list_get_header (list_store->sort_list,
|
|
|
|
list_store->sort_column_id);
|
|
|
|
g_return_if_fail (header != NULL);
|
|
|
|
g_return_if_fail (header->func != NULL);
|
|
|
|
func = header->func;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
func = list_store->default_sort_func;
|
|
|
|
}
|
2002-01-30 23:51:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (func != gtk_tree_data_list_compare_func)
|
|
|
|
maybe_need_sort = TRUE;
|
|
|
|
|
2001-01-08 18:26:05 +00:00
|
|
|
while (column != -1)
|
|
|
|
{
|
|
|
|
GValue value = { 0, };
|
|
|
|
gchar *error = NULL;
|
|
|
|
|
|
|
|
if (column >= list_store->n_columns)
|
|
|
|
{
|
|
|
|
g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
g_value_init (&value, list_store->column_headers[column]);
|
|
|
|
|
2001-02-17 06:04:40 +00:00
|
|
|
G_VALUE_COLLECT (&value, var_args, 0, &error);
|
2001-01-08 18:26:05 +00:00
|
|
|
if (error)
|
|
|
|
{
|
|
|
|
g_warning ("%s: %s", G_STRLOC, error);
|
|
|
|
g_free (error);
|
|
|
|
|
|
|
|
/* we purposely leak the value here, it might not be
|
|
|
|
* in a sane state if an error condition occoured
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2001-04-12 16:11:54 +00:00
|
|
|
/* FIXME: instead of calling this n times, refactor with above */
|
2001-09-27 00:09:41 +00:00
|
|
|
emit_signal = gtk_list_store_real_set_value (list_store,
|
|
|
|
iter,
|
|
|
|
column,
|
2002-01-30 23:51:04 +00:00
|
|
|
&value,
|
|
|
|
FALSE) || emit_signal;
|
|
|
|
|
|
|
|
if (func == gtk_tree_data_list_compare_func &&
|
|
|
|
column == list_store->sort_column_id)
|
|
|
|
maybe_need_sort = TRUE;
|
2001-01-08 18:26:05 +00:00
|
|
|
|
|
|
|
g_value_unset (&value);
|
|
|
|
|
|
|
|
column = va_arg (var_args, gint);
|
|
|
|
}
|
2001-09-27 00:09:41 +00:00
|
|
|
|
2002-01-30 23:51:04 +00:00
|
|
|
if (maybe_need_sort && GTK_LIST_STORE_IS_SORTED (list_store))
|
|
|
|
gtk_list_store_sort_iter_changed (list_store, iter, list_store->sort_column_id);
|
|
|
|
|
2001-09-27 00:09:41 +00:00
|
|
|
if (emit_signal)
|
|
|
|
{
|
|
|
|
GtkTreePath *path;
|
|
|
|
|
|
|
|
path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
|
|
|
|
gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
|
|
|
|
gtk_tree_path_free (path);
|
|
|
|
}
|
2001-01-08 18:26:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_list_store_set:
|
|
|
|
* @list_store: a #GtkListStore
|
|
|
|
* @iter: row iterator
|
|
|
|
* @Varargs: pairs of column number and value, terminated with -1
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2001-01-08 18:26:05 +00:00
|
|
|
* Sets the value of one or more cells in the row referenced by @iter.
|
|
|
|
* The variable argument list should contain integer column numbers,
|
2001-02-03 01:09:41 +00:00
|
|
|
* each column number followed by the value to be set.
|
2001-01-08 18:26:05 +00:00
|
|
|
* The list is terminated by a -1. For example, to set column 0 with type
|
2001-12-06 21:38:12 +00:00
|
|
|
* %G_TYPE_STRING to "Foo", you would write <literal>gtk_list_store_set (store, iter,
|
|
|
|
* 0, "Foo", -1)</literal>.
|
2001-01-08 18:26:05 +00:00
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_list_store_set (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
...)
|
|
|
|
{
|
|
|
|
va_list var_args;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
2001-07-09 17:09:35 +00:00
|
|
|
g_return_if_fail (iter != NULL);
|
|
|
|
g_return_if_fail (iter->stamp == list_store->stamp);
|
2001-01-08 18:26:05 +00:00
|
|
|
|
|
|
|
va_start (var_args, iter);
|
|
|
|
gtk_list_store_set_valist (list_store, iter, var_args);
|
|
|
|
va_end (var_args);
|
|
|
|
}
|
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
static GSList*
|
|
|
|
remove_link_saving_prev (GSList *list,
|
|
|
|
GSList *link,
|
|
|
|
GSList **prevp)
|
|
|
|
{
|
|
|
|
GSList *tmp;
|
|
|
|
GSList *prev;
|
|
|
|
|
|
|
|
prev = NULL;
|
|
|
|
tmp = list;
|
|
|
|
|
|
|
|
while (tmp)
|
|
|
|
{
|
|
|
|
if (tmp == link)
|
|
|
|
{
|
|
|
|
if (prev)
|
2001-01-31 00:57:49 +00:00
|
|
|
prev->next = link->next;
|
|
|
|
|
|
|
|
if (list == link)
|
2001-01-10 23:44:22 +00:00
|
|
|
list = list->next;
|
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
link->next = NULL;
|
2001-01-10 23:44:22 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
prev = tmp;
|
|
|
|
tmp = tmp->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
*prevp = prev;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
static void
|
|
|
|
gtk_list_store_remove_silently (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreePath *path)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2001-01-04 23:36:19 +00:00
|
|
|
if (G_SLIST (iter->user_data)->data)
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
{
|
|
|
|
_gtk_tree_data_list_free ((GtkTreeDataList *) G_SLIST (iter->user_data)->data,
|
|
|
|
list_store->column_headers);
|
|
|
|
G_SLIST (iter->user_data)->data = NULL;
|
|
|
|
}
|
2001-01-10 23:44:22 +00:00
|
|
|
|
|
|
|
{
|
|
|
|
GSList *prev = NULL;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
list_store->root = remove_link_saving_prev (G_SLIST (list_store->root),
|
|
|
|
G_SLIST (iter->user_data),
|
|
|
|
&prev);
|
2001-01-31 00:57:49 +00:00
|
|
|
|
|
|
|
list_store->length -= 1;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
if (iter->user_data == list_store->tail)
|
|
|
|
list_store->tail = prev;
|
Behaviour change, apply changes if the entry of the editable gets a focus
Tue Oct 15 00:53:14 2002 Kristian Rietveld <kris@gtk.org>
Behaviour change, apply changes if the entry of the editable gets
a focus out event (#82405).
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event):
new function,
(gtk_cell_renderer_text_start_editing): stop editing and apply
changes on focus-out.
Tue Oct 15 00:47:35 2002 Kristian Rietveld <kris@gtk.org>
Fixes an *evil* GtkTreeModelSort bug, #93629.
* gtk/gtktreemodel.c (release_row_references): return if the
refs->list is NULL.
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_changed): if we
are swapping two rows (re-insertion on row_changed), also *emit*
a rows_reordered signal. oops.
Tue Oct 15 00:45:03 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_remove_silently): free
the actual link after the node has been removed (#92014).
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_column_finalize):
free the cell_list and the child if the exists (#92014).
Tue Oct 15 00:40:25 2002 Kristian Rietveld <kris@gtk.org>
Don't accept drops if the model has been sorted, #93758)
* gtk/gtkliststore.c (gtk_list_store_row_drop_possible): return
FALSE if the list has been sorted.
* gtk/gtktreestore.c (gtk_tree_store_row_drop_possible): check
if drag_dest is a TreeStore, return FALSE if the tree has been
sorted.
Tue Oct 15 00:33:59 2002 Kristian Rietveld <kris@gtk.org>
Compiler warning fixage, (#85858, #85859, #85860, #85872)
* gtk/gtkcellrendererpixbuf (gtk_cell_renderer_pixbuf_render):
s/guint/GtkCellRendererState/.
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render):
ditto.
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render),
(gtk_cell_renderer_toggle_activate): ditto.
* gtk/gtkliststore.c (gtk_list_store_get_flags): a
s/guint/GtkTreeModelFlags/ on the return type.
2002-10-14 22:50:18 +00:00
|
|
|
|
|
|
|
g_slist_free (G_SLIST (iter->user_data));
|
2001-01-10 23:44:22 +00:00
|
|
|
}
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
}
|
|
|
|
|
2001-02-03 01:09:41 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_remove:
|
2001-09-08 18:23:47 +00:00
|
|
|
* @list_store: A #GtkListStore
|
|
|
|
* @iter: A valid #GtkTreeIter
|
2001-02-03 01:09:41 +00:00
|
|
|
*
|
2001-10-18 22:05:23 +00:00
|
|
|
* Removes the given row from the list store. After being removed,
|
|
|
|
* @iter is set to be the next valid row, or invalidated if it pointed
|
|
|
|
* to the last row in @list_store.
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2002-06-04 17:17:49 +00:00
|
|
|
* Return value: %TRUE if @iter is valid, %FALSE if not.
|
2001-02-03 01:09:41 +00:00
|
|
|
**/
|
2002-06-04 17:17:49 +00:00
|
|
|
gboolean
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
gtk_list_store_remove (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter)
|
|
|
|
{
|
|
|
|
GtkTreePath *path;
|
2001-09-08 18:23:47 +00:00
|
|
|
GSList *next;
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
|
2002-06-04 17:17:49 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
|
|
|
|
g_return_val_if_fail (VALID_ITER (iter, list_store), FALSE);
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
|
2001-09-08 18:23:47 +00:00
|
|
|
next = G_SLIST (iter->user_data)->next;
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
path = gtk_list_store_get_path (GTK_TREE_MODEL (list_store), iter);
|
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
validate_list_store (list_store);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
gtk_list_store_remove_silently (list_store, iter, path);
|
|
|
|
|
2001-03-28 01:54:14 +00:00
|
|
|
validate_list_store (list_store);
|
2001-02-22 01:56:08 +00:00
|
|
|
|
2001-09-12 23:16:18 +00:00
|
|
|
gtk_tree_model_row_deleted (GTK_TREE_MODEL (list_store), path);
|
2000-10-27 23:34:58 +00:00
|
|
|
gtk_tree_path_free (path);
|
2001-09-08 18:23:47 +00:00
|
|
|
|
|
|
|
if (next)
|
|
|
|
{
|
|
|
|
iter->stamp = list_store->stamp;
|
|
|
|
iter->user_data = next;
|
2002-06-04 17:17:49 +00:00
|
|
|
return TRUE;
|
2001-09-08 18:23:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
iter->stamp = 0;
|
|
|
|
}
|
2002-06-04 17:17:49 +00:00
|
|
|
|
|
|
|
return FALSE;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
static void
|
|
|
|
insert_after (GtkListStore *list_store,
|
|
|
|
GSList *sibling,
|
|
|
|
GSList *new_list)
|
|
|
|
{
|
|
|
|
g_return_if_fail (sibling != NULL);
|
|
|
|
g_return_if_fail (new_list != NULL);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
/* insert new node after list */
|
|
|
|
new_list->next = sibling->next;
|
|
|
|
sibling->next = new_list;
|
|
|
|
|
|
|
|
/* if list was the tail, the new node is the new tail */
|
2001-03-23 00:35:19 +00:00
|
|
|
if (sibling == ((GSList *) list_store->tail))
|
2001-01-10 23:44:22 +00:00
|
|
|
list_store->tail = new_list;
|
2001-01-31 00:57:49 +00:00
|
|
|
|
|
|
|
list_store->length += 1;
|
2001-01-10 23:44:22 +00:00
|
|
|
}
|
|
|
|
|
2001-02-03 01:09:41 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_insert:
|
2001-09-08 18:23:47 +00:00
|
|
|
* @list_store: A #GtkListStore
|
|
|
|
* @iter: An unset #GtkTreeIter to set to the new row
|
2001-02-03 01:09:41 +00:00
|
|
|
* @position: position to insert the new row
|
|
|
|
*
|
2001-09-08 18:23:47 +00:00
|
|
|
* Creates a new row at @position. @iter will be changed to point to this new
|
|
|
|
* row. If @position is larger than the number of rows on the list, then the
|
|
|
|
* new row will be appended to the list. The row will be empty before this
|
2001-10-18 22:05:23 +00:00
|
|
|
* function is called. To fill in values, you need to call gtk_list_store_set()
|
|
|
|
* or gtk_list_store_set_value().
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2001-02-03 01:09:41 +00:00
|
|
|
**/
|
2000-10-27 23:34:58 +00:00
|
|
|
void
|
|
|
|
gtk_list_store_insert (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
gint position)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
GSList *list;
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreePath *path;
|
2001-01-10 23:44:22 +00:00
|
|
|
GSList *new_list;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
|
|
|
g_return_if_fail (iter != NULL);
|
2001-01-10 23:44:22 +00:00
|
|
|
g_return_if_fail (position >= 0);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
list_store->columns_dirty = TRUE;
|
|
|
|
|
2001-03-28 01:54:14 +00:00
|
|
|
if (position == 0 ||
|
|
|
|
GTK_LIST_STORE_IS_SORTED (list_store))
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
gtk_list_store_prepend (list_store, iter);
|
|
|
|
return;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
list = g_slist_nth (G_SLIST (list_store->root), position - 1);
|
2001-01-10 23:44:22 +00:00
|
|
|
|
|
|
|
if (list == NULL)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
/* position if off the end of the list, append it */
|
|
|
|
gtk_list_store_append (list_store, iter);
|
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
return;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
2001-01-10 23:44:22 +00:00
|
|
|
|
2003-04-14 12:02:57 +00:00
|
|
|
new_list = g_slist_alloc ();
|
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
insert_after (list_store, list, new_list);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
iter->stamp = list_store->stamp;
|
|
|
|
iter->user_data = new_list;
|
2001-01-31 00:57:49 +00:00
|
|
|
|
|
|
|
validate_list_store (list_store);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
path = gtk_tree_path_new ();
|
|
|
|
gtk_tree_path_append_index (path, position);
|
2001-09-12 23:16:18 +00:00
|
|
|
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
|
2000-10-27 23:34:58 +00:00
|
|
|
gtk_tree_path_free (path);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-02-03 01:09:41 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_insert_before:
|
2001-09-08 18:23:47 +00:00
|
|
|
* @list_store: A #GtkListStore
|
|
|
|
* @iter: An unset #GtkTreeIter to set to the new row
|
|
|
|
* @sibling: A valid #GtkTreeIter, or %NULL
|
2001-02-03 01:09:41 +00:00
|
|
|
*
|
2001-10-18 22:05:23 +00:00
|
|
|
* Inserts a new row before @sibling. If @sibling is %NULL, then the row will be
|
|
|
|
* appended to the end of the list. @iter will be changed to point to this new
|
|
|
|
* row. The row will be empty before this function is called. To fill in values,
|
|
|
|
* you need to call gtk_list_store_set() or gtk_list_store_set_value().
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2001-02-03 01:09:41 +00:00
|
|
|
**/
|
2000-10-27 23:34:58 +00:00
|
|
|
void
|
|
|
|
gtk_list_store_insert_before (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *sibling)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreePath *path;
|
2001-01-10 23:44:22 +00:00
|
|
|
GSList *list, *prev, *new_list;
|
2000-10-27 23:34:58 +00:00
|
|
|
gint i = 0;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
|
|
|
g_return_if_fail (iter != NULL);
|
2001-07-09 17:09:35 +00:00
|
|
|
if (sibling)
|
|
|
|
g_return_if_fail (VALID_ITER (sibling, list_store));
|
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
list_store->columns_dirty = TRUE;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-03-28 01:54:14 +00:00
|
|
|
if (GTK_LIST_STORE_IS_SORTED (list_store))
|
|
|
|
{
|
|
|
|
gtk_list_store_prepend (list_store, iter);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
if (sibling == NULL)
|
2000-10-27 23:34:58 +00:00
|
|
|
{
|
|
|
|
gtk_list_store_append (list_store, iter);
|
|
|
|
return;
|
|
|
|
}
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
new_list = g_slist_alloc ();
|
2000-10-27 23:34:58 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
prev = NULL;
|
|
|
|
list = list_store->root;
|
2001-01-04 23:36:19 +00:00
|
|
|
while (list && list != sibling->user_data)
|
2000-10-27 23:34:58 +00:00
|
|
|
{
|
|
|
|
prev = list;
|
|
|
|
list = list->next;
|
|
|
|
i++;
|
|
|
|
}
|
2001-01-10 23:44:22 +00:00
|
|
|
|
|
|
|
if (list != sibling->user_data)
|
|
|
|
{
|
|
|
|
g_warning ("%s: sibling iterator invalid? not found in the list", G_STRLOC);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if there are no nodes, we become the list tail, otherwise we
|
|
|
|
* are inserting before any existing nodes so we can't change
|
|
|
|
* the tail
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (list_store->root == NULL)
|
|
|
|
list_store->tail = new_list;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
if (prev)
|
|
|
|
{
|
2001-01-10 23:44:22 +00:00
|
|
|
new_list->next = prev->next;
|
|
|
|
prev->next = new_list;
|
2000-10-27 23:34:58 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2001-01-10 23:44:22 +00:00
|
|
|
new_list->next = list_store->root;
|
|
|
|
list_store->root = new_list;
|
2000-10-27 23:34:58 +00:00
|
|
|
}
|
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
iter->stamp = list_store->stamp;
|
|
|
|
iter->user_data = new_list;
|
2001-01-31 00:57:49 +00:00
|
|
|
|
|
|
|
list_store->length += 1;
|
|
|
|
|
|
|
|
validate_list_store (list_store);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
path = gtk_tree_path_new ();
|
|
|
|
gtk_tree_path_append_index (path, i);
|
2001-09-12 23:16:18 +00:00
|
|
|
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
|
2000-10-27 23:34:58 +00:00
|
|
|
gtk_tree_path_free (path);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-02-03 01:09:41 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_insert_after:
|
2001-09-08 18:23:47 +00:00
|
|
|
* @list_store: A #GtkListStore
|
|
|
|
* @iter: An unset #GtkTreeIter to set to the new row
|
|
|
|
* @sibling: A valid #GtkTreeIter, or %NULL
|
2001-02-03 01:09:41 +00:00
|
|
|
*
|
2001-10-18 22:05:23 +00:00
|
|
|
* Inserts a new row after @sibling. If @sibling is %NULL, then the row will be
|
|
|
|
* prepended to the beginning of the list. @iter will be changed to point to
|
|
|
|
* this new row. The row will be empty after this function is called. To fill
|
|
|
|
* in values, you need to call gtk_list_store_set() or gtk_list_store_set_value().
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2001-02-03 01:09:41 +00:00
|
|
|
**/
|
2000-10-27 23:34:58 +00:00
|
|
|
void
|
|
|
|
gtk_list_store_insert_after (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *sibling)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreePath *path;
|
2001-01-10 23:44:22 +00:00
|
|
|
GSList *list, *new_list;
|
2000-10-27 23:34:58 +00:00
|
|
|
gint i = 0;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
2001-01-10 23:44:22 +00:00
|
|
|
g_return_if_fail (iter != NULL);
|
2000-10-27 23:34:58 +00:00
|
|
|
if (sibling)
|
2001-07-09 17:09:35 +00:00
|
|
|
g_return_if_fail (VALID_ITER (sibling, list_store));
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
list_store->columns_dirty = TRUE;
|
|
|
|
|
2001-03-28 01:54:14 +00:00
|
|
|
if (sibling == NULL ||
|
|
|
|
GTK_LIST_STORE_IS_SORTED (list_store))
|
2000-10-27 23:34:58 +00:00
|
|
|
{
|
|
|
|
gtk_list_store_prepend (list_store, iter);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2001-01-04 23:36:19 +00:00
|
|
|
for (list = list_store->root; list && list != sibling->user_data; list = list->next)
|
2000-10-27 23:34:58 +00:00
|
|
|
i++;
|
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
g_return_if_fail (list == sibling->user_data);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
new_list = g_slist_alloc ();
|
2000-10-27 23:34:58 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
insert_after (list_store, list, new_list);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
iter->stamp = list_store->stamp;
|
|
|
|
iter->user_data = new_list;
|
2001-01-31 00:57:49 +00:00
|
|
|
|
|
|
|
validate_list_store (list_store);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
path = gtk_tree_path_new ();
|
2002-02-05 21:53:51 +00:00
|
|
|
gtk_tree_path_append_index (path, i + 1);
|
2001-09-12 23:16:18 +00:00
|
|
|
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
|
2000-10-27 23:34:58 +00:00
|
|
|
gtk_tree_path_free (path);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-02-03 01:09:41 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_prepend:
|
2001-09-08 18:23:47 +00:00
|
|
|
* @list_store: A #GtkListStore
|
|
|
|
* @iter: An unset #GtkTreeIter to set to the prepend row
|
2001-02-03 01:09:41 +00:00
|
|
|
*
|
2001-12-06 21:38:12 +00:00
|
|
|
* Prepends a new row to @list_store. @iter will be changed to point to this new
|
2001-10-18 22:05:23 +00:00
|
|
|
* row. The row will be empty after this function is called. To fill in
|
|
|
|
* values, you need to call gtk_list_store_set() or gtk_list_store_set_value().
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2001-02-03 01:09:41 +00:00
|
|
|
**/
|
2000-10-27 23:34:58 +00:00
|
|
|
void
|
|
|
|
gtk_list_store_prepend (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreePath *path;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
|
|
|
g_return_if_fail (iter != NULL);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
iter->stamp = list_store->stamp;
|
2001-01-04 23:36:19 +00:00
|
|
|
iter->user_data = g_slist_alloc ();
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
list_store->columns_dirty = TRUE;
|
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
if (list_store->root == NULL)
|
|
|
|
list_store->tail = iter->user_data;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-04 23:36:19 +00:00
|
|
|
G_SLIST (iter->user_data)->next = G_SLIST (list_store->root);
|
|
|
|
list_store->root = iter->user_data;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
list_store->length += 1;
|
|
|
|
|
|
|
|
validate_list_store (list_store);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
path = gtk_tree_path_new ();
|
|
|
|
gtk_tree_path_append_index (path, 0);
|
2001-09-12 23:16:18 +00:00
|
|
|
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
|
2000-10-27 23:34:58 +00:00
|
|
|
gtk_tree_path_free (path);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-02-03 01:09:41 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_append:
|
2001-09-08 18:23:47 +00:00
|
|
|
* @list_store: A #GtkListStore
|
|
|
|
* @iter: An unset #GtkTreeIter to set to the appended row
|
2001-02-03 01:09:41 +00:00
|
|
|
*
|
2001-09-08 18:23:47 +00:00
|
|
|
* Appends a new row to @list_store. @iter will be changed to point to this new
|
|
|
|
* row. The row will be empty after this function is called. To fill in
|
2001-10-18 22:05:23 +00:00
|
|
|
* values, you need to call gtk_list_store_set() or gtk_list_store_set_value().
|
2001-03-28 01:54:14 +00:00
|
|
|
*
|
2001-02-03 01:09:41 +00:00
|
|
|
**/
|
2000-10-27 23:34:58 +00:00
|
|
|
void
|
|
|
|
gtk_list_store_append (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
2000-10-27 23:34:58 +00:00
|
|
|
GtkTreePath *path;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
|
|
|
g_return_if_fail (iter != NULL);
|
|
|
|
|
2001-11-14 02:06:28 +00:00
|
|
|
list_store->columns_dirty = TRUE;
|
|
|
|
|
2001-03-28 01:54:14 +00:00
|
|
|
if (GTK_LIST_STORE_IS_SORTED (list_store))
|
|
|
|
{
|
|
|
|
gtk_list_store_prepend (list_store, iter);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
iter->stamp = list_store->stamp;
|
2001-01-04 23:36:19 +00:00
|
|
|
iter->user_data = g_slist_alloc ();
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
if (list_store->tail)
|
2001-03-23 00:35:19 +00:00
|
|
|
((GSList *)list_store->tail)->next = iter->user_data;
|
2000-10-27 23:34:58 +00:00
|
|
|
else
|
2001-01-04 23:36:19 +00:00
|
|
|
list_store->root = iter->user_data;
|
2000-10-27 23:34:58 +00:00
|
|
|
|
2001-01-10 23:44:22 +00:00
|
|
|
list_store->tail = iter->user_data;
|
2001-01-31 00:57:49 +00:00
|
|
|
|
|
|
|
list_store->length += 1;
|
|
|
|
|
|
|
|
validate_list_store (list_store);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2000-10-27 23:34:58 +00:00
|
|
|
path = gtk_tree_path_new ();
|
2001-02-28 00:35:25 +00:00
|
|
|
gtk_tree_path_append_index (path, list_store->length - 1);
|
2001-09-12 23:16:18 +00:00
|
|
|
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
|
2000-10-27 23:34:58 +00:00
|
|
|
gtk_tree_path_free (path);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
|
2001-12-06 21:38:12 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_clear:
|
|
|
|
* @list_store: a #GtkListStore.
|
|
|
|
*
|
|
|
|
* Removes all rows from the list store.
|
|
|
|
*
|
|
|
|
**/
|
2001-06-19 23:15:22 +00:00
|
|
|
void
|
|
|
|
gtk_list_store_clear (GtkListStore *list_store)
|
|
|
|
{
|
|
|
|
GtkTreeIter iter;
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
|
|
|
|
|
|
|
|
while (list_store->root)
|
|
|
|
{
|
|
|
|
iter.stamp = list_store->stamp;
|
|
|
|
iter.user_data = list_store->root;
|
|
|
|
gtk_list_store_remove (list_store, &iter);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-06-04 17:17:49 +00:00
|
|
|
/**
|
|
|
|
* gtk_list_store_iter_is_valid:
|
|
|
|
* @list_store: A #GtkListStore.
|
|
|
|
* @iter: A #GtkTreeIter.
|
|
|
|
*
|
|
|
|
* WARNING: This function is slow. Only use it for debugging and/or testing
|
|
|
|
* purposes.
|
|
|
|
*
|
|
|
|
* Checks if the given iter is a valid iter for this #GtkListStore.
|
|
|
|
*
|
|
|
|
* Return value: %TRUE if the iter is valid, %FALSE if the iter is invalid.
|
2002-11-28 00:33:17 +00:00
|
|
|
*
|
|
|
|
* Since: 2.2
|
2002-06-04 17:17:49 +00:00
|
|
|
**/
|
|
|
|
gboolean
|
|
|
|
gtk_list_store_iter_is_valid (GtkListStore *list_store,
|
|
|
|
GtkTreeIter *iter)
|
|
|
|
{
|
|
|
|
GList *list;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
|
|
|
|
g_return_val_if_fail (iter != NULL, FALSE);
|
|
|
|
|
|
|
|
if (!VALID_ITER (iter, list_store))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (iter->user_data == list_store->root)
|
|
|
|
return TRUE;
|
|
|
|
if (iter->user_data == list_store->tail)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
for (list = ((GList *)list_store->root)->next; list; list = list->next)
|
|
|
|
if (list == iter->user_data)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
2001-06-19 23:15:22 +00:00
|
|
|
|
2003-01-14 22:57:37 +00:00
|
|
|
static gboolean real_gtk_list_store_row_draggable (GtkTreeDragSource *drag_source,
|
|
|
|
GtkTreePath *path)
|
|
|
|
{
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
static gboolean
|
|
|
|
gtk_list_store_drag_data_delete (GtkTreeDragSource *drag_source,
|
|
|
|
GtkTreePath *path)
|
|
|
|
{
|
|
|
|
GtkTreeIter iter;
|
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (drag_source), FALSE);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source),
|
|
|
|
&iter,
|
|
|
|
path))
|
|
|
|
{
|
2001-06-19 23:15:22 +00:00
|
|
|
gtk_list_store_remove (GTK_LIST_STORE (drag_source), &iter);
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
2001-06-19 23:15:22 +00:00
|
|
|
return FALSE;
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gtk_list_store_drag_data_get (GtkTreeDragSource *drag_source,
|
|
|
|
GtkTreePath *path,
|
|
|
|
GtkSelectionData *selection_data)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (drag_source), FALSE);
|
|
|
|
|
|
|
|
/* Note that we don't need to handle the GTK_TREE_MODEL_ROW
|
|
|
|
* target, because the default handler does it for us, but
|
|
|
|
* we do anyway for the convenience of someone maybe overriding the
|
|
|
|
* default handler.
|
|
|
|
*/
|
|
|
|
|
2001-10-31 21:55:55 +00:00
|
|
|
if (gtk_tree_set_row_drag_data (selection_data,
|
|
|
|
GTK_TREE_MODEL (drag_source),
|
|
|
|
path))
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
{
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME handle text targets at least. */
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gtk_list_store_drag_data_received (GtkTreeDragDest *drag_dest,
|
|
|
|
GtkTreePath *dest,
|
|
|
|
GtkSelectionData *selection_data)
|
|
|
|
{
|
|
|
|
GtkTreeModel *tree_model;
|
|
|
|
GtkListStore *list_store;
|
|
|
|
GtkTreeModel *src_model = NULL;
|
|
|
|
GtkTreePath *src_path = NULL;
|
|
|
|
gboolean retval = FALSE;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (drag_dest), FALSE);
|
|
|
|
|
|
|
|
tree_model = GTK_TREE_MODEL (drag_dest);
|
|
|
|
list_store = GTK_LIST_STORE (drag_dest);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-10-31 21:55:55 +00:00
|
|
|
if (gtk_tree_get_row_drag_data (selection_data,
|
|
|
|
&src_model,
|
|
|
|
&src_path) &&
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
src_model == tree_model)
|
|
|
|
{
|
|
|
|
/* Copy the given row to a new position */
|
|
|
|
GtkTreeIter src_iter;
|
|
|
|
GtkTreeIter dest_iter;
|
|
|
|
GtkTreePath *prev;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
if (!gtk_tree_model_get_iter (src_model,
|
|
|
|
&src_iter,
|
|
|
|
src_path))
|
2001-01-31 00:57:49 +00:00
|
|
|
{
|
|
|
|
goto out;
|
|
|
|
}
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
|
|
|
|
/* Get the path to insert _after_ (dest is the path to insert _before_) */
|
|
|
|
prev = gtk_tree_path_copy (dest);
|
|
|
|
|
|
|
|
if (!gtk_tree_path_prev (prev))
|
|
|
|
{
|
|
|
|
/* dest was the first spot in the list; which means we are supposed
|
|
|
|
* to prepend.
|
|
|
|
*/
|
|
|
|
gtk_list_store_prepend (GTK_LIST_STORE (tree_model),
|
|
|
|
&dest_iter);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
retval = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_model),
|
|
|
|
&dest_iter,
|
|
|
|
prev))
|
|
|
|
{
|
|
|
|
GtkTreeIter tmp_iter = dest_iter;
|
2002-03-07 08:03:09 +00:00
|
|
|
|
|
|
|
if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_model), "gtk-tree-model-drop-append")))
|
|
|
|
gtk_list_store_append (GTK_LIST_STORE (tree_model), &dest_iter);
|
|
|
|
else
|
|
|
|
gtk_list_store_insert_after (GTK_LIST_STORE (tree_model),
|
|
|
|
&dest_iter, &tmp_iter);
|
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
retval = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-03-07 08:03:09 +00:00
|
|
|
g_object_set_data (G_OBJECT (tree_model), "gtk-tree-model-drop-append",
|
|
|
|
NULL);
|
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
gtk_tree_path_free (prev);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
/* If we succeeded in creating dest_iter, copy data from src
|
|
|
|
*/
|
|
|
|
if (retval)
|
|
|
|
{
|
|
|
|
GtkTreeDataList *dl = G_SLIST (src_iter.user_data)->data;
|
|
|
|
GtkTreeDataList *copy_head = NULL;
|
|
|
|
GtkTreeDataList *copy_prev = NULL;
|
|
|
|
GtkTreeDataList *copy_iter = NULL;
|
2001-02-22 01:56:08 +00:00
|
|
|
GtkTreePath *path;
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
gint col;
|
|
|
|
|
|
|
|
col = 0;
|
|
|
|
while (dl)
|
|
|
|
{
|
|
|
|
copy_iter = _gtk_tree_data_list_node_copy (dl,
|
|
|
|
list_store->column_headers[col]);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
if (copy_head == NULL)
|
|
|
|
copy_head = copy_iter;
|
|
|
|
|
|
|
|
if (copy_prev)
|
|
|
|
copy_prev->next = copy_iter;
|
|
|
|
|
|
|
|
copy_prev = copy_iter;
|
|
|
|
|
|
|
|
dl = dl->next;
|
|
|
|
++col;
|
|
|
|
}
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-03-28 03:09:03 +00:00
|
|
|
dest_iter.stamp = GTK_LIST_STORE (tree_model)->stamp;
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
G_SLIST (dest_iter.user_data)->data = copy_head;
|
2001-02-22 01:56:08 +00:00
|
|
|
|
|
|
|
path = gtk_list_store_get_path (GTK_TREE_MODEL (tree_model), &dest_iter);
|
2001-09-12 23:16:18 +00:00
|
|
|
gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_model), path, &dest_iter);
|
2001-02-22 01:56:08 +00:00
|
|
|
gtk_tree_path_free (path);
|
|
|
|
}
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME maybe add some data targets eventually, or handle text
|
|
|
|
* targets in the simple case.
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2001-03-28 01:54:14 +00:00
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
if (src_path)
|
|
|
|
gtk_tree_path_free (src_path);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
|
|
|
return retval;
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
}
|
2001-01-31 00:57:49 +00:00
|
|
|
|
|
|
|
static gboolean
|
2001-11-06 19:10:03 +00:00
|
|
|
gtk_list_store_row_drop_possible (GtkTreeDragDest *drag_dest,
|
|
|
|
GtkTreePath *dest_path,
|
|
|
|
GtkSelectionData *selection_data)
|
2001-01-31 00:57:49 +00:00
|
|
|
{
|
|
|
|
gint *indices;
|
2001-11-06 19:10:03 +00:00
|
|
|
GtkTreeModel *src_model = NULL;
|
|
|
|
GtkTreePath *src_path = NULL;
|
|
|
|
gboolean retval = FALSE;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (drag_dest), FALSE);
|
|
|
|
|
Behaviour change, apply changes if the entry of the editable gets a focus
Tue Oct 15 00:53:14 2002 Kristian Rietveld <kris@gtk.org>
Behaviour change, apply changes if the entry of the editable gets
a focus out event (#82405).
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event):
new function,
(gtk_cell_renderer_text_start_editing): stop editing and apply
changes on focus-out.
Tue Oct 15 00:47:35 2002 Kristian Rietveld <kris@gtk.org>
Fixes an *evil* GtkTreeModelSort bug, #93629.
* gtk/gtktreemodel.c (release_row_references): return if the
refs->list is NULL.
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_changed): if we
are swapping two rows (re-insertion on row_changed), also *emit*
a rows_reordered signal. oops.
Tue Oct 15 00:45:03 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_remove_silently): free
the actual link after the node has been removed (#92014).
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_column_finalize):
free the cell_list and the child if the exists (#92014).
Tue Oct 15 00:40:25 2002 Kristian Rietveld <kris@gtk.org>
Don't accept drops if the model has been sorted, #93758)
* gtk/gtkliststore.c (gtk_list_store_row_drop_possible): return
FALSE if the list has been sorted.
* gtk/gtktreestore.c (gtk_tree_store_row_drop_possible): check
if drag_dest is a TreeStore, return FALSE if the tree has been
sorted.
Tue Oct 15 00:33:59 2002 Kristian Rietveld <kris@gtk.org>
Compiler warning fixage, (#85858, #85859, #85860, #85872)
* gtk/gtkcellrendererpixbuf (gtk_cell_renderer_pixbuf_render):
s/guint/GtkCellRendererState/.
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render):
ditto.
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render),
(gtk_cell_renderer_toggle_activate): ditto.
* gtk/gtkliststore.c (gtk_list_store_get_flags): a
s/guint/GtkTreeModelFlags/ on the return type.
2002-10-14 22:50:18 +00:00
|
|
|
/* don't accept drops if the list has been sorted */
|
|
|
|
if (GTK_LIST_STORE_IS_SORTED (drag_dest))
|
|
|
|
return FALSE;
|
|
|
|
|
2001-11-06 19:10:03 +00:00
|
|
|
if (!gtk_tree_get_row_drag_data (selection_data,
|
|
|
|
&src_model,
|
|
|
|
&src_path))
|
|
|
|
goto out;
|
2003-01-27 21:41:06 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
if (src_model != GTK_TREE_MODEL (drag_dest))
|
2001-11-06 19:10:03 +00:00
|
|
|
goto out;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-01-31 00:57:49 +00:00
|
|
|
if (gtk_tree_path_get_depth (dest_path) != 1)
|
2001-11-06 19:10:03 +00:00
|
|
|
goto out;
|
2001-01-31 00:57:49 +00:00
|
|
|
|
|
|
|
/* can drop before any existing node, or before one past any existing. */
|
|
|
|
|
|
|
|
indices = gtk_tree_path_get_indices (dest_path);
|
|
|
|
|
|
|
|
if (indices[0] <= GTK_LIST_STORE (drag_dest)->length)
|
2001-11-06 19:10:03 +00:00
|
|
|
retval = TRUE;
|
|
|
|
|
|
|
|
out:
|
|
|
|
gtk_tree_path_free (src_path);
|
|
|
|
|
|
|
|
return retval;
|
2001-01-31 00:57:49 +00:00
|
|
|
}
|
2001-03-23 00:35:19 +00:00
|
|
|
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
/* Sorting and reordering */
|
2001-03-28 01:54:14 +00:00
|
|
|
typedef struct _SortTuple
|
|
|
|
{
|
|
|
|
gint offset;
|
|
|
|
GSList *el;
|
|
|
|
} SortTuple;
|
|
|
|
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
/* Reordering */
|
|
|
|
static gint
|
|
|
|
gtk_list_store_reorder_func (gconstpointer a,
|
|
|
|
gconstpointer b,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
SortTuple *a_reorder;
|
|
|
|
SortTuple *b_reorder;
|
|
|
|
|
|
|
|
a_reorder = (SortTuple *)a;
|
|
|
|
b_reorder = (SortTuple *)b;
|
|
|
|
|
|
|
|
if (a_reorder->offset < b_reorder->offset)
|
|
|
|
return -1;
|
|
|
|
if (a_reorder->offset > b_reorder->offset)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_list_store_reorder:
|
|
|
|
* @store: A #GtkTreeStore.
|
|
|
|
* @new_order: An integer array indicating the new order for the list.
|
|
|
|
*
|
|
|
|
* Reorders @store to follow the order indicated by @new_order. Note that
|
|
|
|
* this function only works with unsorted stores.
|
2002-11-28 00:33:17 +00:00
|
|
|
*
|
|
|
|
* Since: 2.2
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_list_store_reorder (GtkListStore *store,
|
|
|
|
gint *new_order)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
GSList *current_list;
|
|
|
|
GtkTreePath *path;
|
|
|
|
SortTuple *sort_array;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (store));
|
|
|
|
g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
|
|
|
|
g_return_if_fail (new_order != NULL);
|
|
|
|
|
|
|
|
sort_array = g_new (SortTuple, store->length);
|
|
|
|
|
|
|
|
current_list = store->root;
|
|
|
|
|
|
|
|
for (i = 0; i < store->length; i++)
|
|
|
|
{
|
|
|
|
sort_array[i].offset = new_order[i];
|
|
|
|
sort_array[i].el = current_list;
|
|
|
|
|
|
|
|
current_list = current_list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_qsort_with_data (sort_array,
|
|
|
|
store->length,
|
|
|
|
sizeof (SortTuple),
|
|
|
|
gtk_list_store_reorder_func,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
for (i = 0; i < store->length - 1; i++)
|
|
|
|
G_SLIST (sort_array[i].el)->next = G_SLIST (sort_array[i+1].el);
|
|
|
|
|
|
|
|
store->root = G_SLIST (sort_array[0].el);
|
|
|
|
store->tail = G_SLIST (sort_array[store->length-1].el);
|
|
|
|
G_SLIST (store->tail)->next = NULL;
|
|
|
|
|
|
|
|
/* emit signal */
|
|
|
|
path = gtk_tree_path_new ();
|
|
|
|
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (store),
|
|
|
|
path, NULL, new_order);
|
|
|
|
gtk_tree_path_free (path);
|
|
|
|
g_free (sort_array);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_list_store_swap:
|
|
|
|
* @store: A #GtkListStore.
|
|
|
|
* @a: A #GtkTreeIter.
|
|
|
|
* @b: Another #GtkTreeIter.
|
|
|
|
*
|
|
|
|
* Swaps @a and @b in @store. Note that this function only works with
|
|
|
|
* unsorted stores.
|
2002-11-28 00:33:17 +00:00
|
|
|
*
|
|
|
|
* Since: 2.2
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_list_store_swap (GtkListStore *store,
|
|
|
|
GtkTreeIter *a,
|
|
|
|
GtkTreeIter *b)
|
|
|
|
{
|
|
|
|
GSList *i, *prev_a = NULL, *prev_b = NULL;
|
|
|
|
gint j, a_count = 0, b_count = 0, *order;
|
|
|
|
GtkTreePath *path;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (store));
|
|
|
|
g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
|
|
|
|
g_return_if_fail (VALID_ITER (a, store));
|
|
|
|
g_return_if_fail (VALID_ITER (b, store));
|
|
|
|
|
|
|
|
if (a->user_data == b->user_data)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (a->user_data == store->root)
|
|
|
|
prev_a = NULL;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = store->root; i; i = i->next, a_count++)
|
|
|
|
if (i->next == a->user_data)
|
|
|
|
{
|
|
|
|
prev_a = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
a_count++;
|
|
|
|
}
|
|
|
|
|
2002-11-18 19:33:28 +00:00
|
|
|
if (b->user_data == store->root)
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
prev_b = NULL;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = store->root; i; i = i->next, b_count++)
|
|
|
|
if (i->next == b->user_data)
|
|
|
|
{
|
|
|
|
prev_b = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
b_count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!prev_a)
|
|
|
|
store->root = b->user_data;
|
|
|
|
else
|
|
|
|
prev_a->next = b->user_data;
|
|
|
|
|
|
|
|
if (!prev_b)
|
|
|
|
store->root = a->user_data;
|
|
|
|
else
|
|
|
|
prev_b->next = a->user_data;
|
|
|
|
|
|
|
|
/* think a_next inspead of a_prev here ... */
|
|
|
|
prev_a = G_SLIST (a->user_data)->next;
|
|
|
|
prev_b = G_SLIST (b->user_data)->next;
|
|
|
|
|
|
|
|
G_SLIST (a->user_data)->next = prev_b;
|
|
|
|
G_SLIST (b->user_data)->next = prev_a;
|
|
|
|
|
2003-01-27 21:41:06 +00:00
|
|
|
/* update tail if needed */
|
|
|
|
if (! G_SLIST (a->user_data)->next)
|
|
|
|
store->tail = G_SLIST (a->user_data);
|
|
|
|
else if (! G_SLIST (b->user_data)->next)
|
|
|
|
store->tail = G_SLIST (b->user_data);
|
|
|
|
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
/* emit signal */
|
|
|
|
order = g_new (gint, store->length);
|
|
|
|
for (j = 0; j < store->length; j++)
|
|
|
|
if (j == a_count)
|
|
|
|
order[j] = b_count;
|
|
|
|
else if (j == b_count)
|
|
|
|
order[j] = a_count;
|
|
|
|
else
|
|
|
|
order[j] = j;
|
|
|
|
|
|
|
|
path = gtk_tree_path_new ();
|
|
|
|
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (store),
|
|
|
|
path, NULL, order);
|
|
|
|
gtk_tree_path_free (path);
|
|
|
|
g_free (order);
|
|
|
|
}
|
|
|
|
|
2002-11-18 19:33:28 +00:00
|
|
|
static void
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
gtk_list_store_move (GtkListStore *store,
|
|
|
|
GtkTreeIter *iter,
|
2002-11-18 19:33:28 +00:00
|
|
|
GtkTreeIter *position,
|
|
|
|
gboolean before)
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
{
|
2002-11-18 19:33:28 +00:00
|
|
|
GtkTreeIter dst_a;
|
|
|
|
GSList *i, *a, *prev = NULL, *tmp;
|
|
|
|
gint new_pos = 0, old_pos = 0, j = 0, *order;
|
2003-04-14 12:02:57 +00:00
|
|
|
GtkTreePath *path = NULL, *pos_path = NULL;
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (store));
|
|
|
|
g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
|
|
|
|
g_return_if_fail (VALID_ITER (iter, store));
|
2002-11-18 19:33:28 +00:00
|
|
|
if (position)
|
|
|
|
g_return_if_fail (VALID_ITER (position, store));
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
|
2002-11-18 19:33:28 +00:00
|
|
|
/* lots of sanity checks */
|
|
|
|
if (position)
|
|
|
|
{
|
|
|
|
path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), iter);
|
|
|
|
pos_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), position);
|
|
|
|
|
|
|
|
if (gtk_tree_path_get_depth (pos_path) != 1)
|
|
|
|
goto free_paths_and_out;
|
|
|
|
|
|
|
|
/* if before:
|
|
|
|
* moving the iter before path or "path + 1" doesn't make sense
|
|
|
|
* else
|
|
|
|
* moving the iter before path or "path - 1" doesn't make sense
|
|
|
|
*/
|
|
|
|
if (!gtk_tree_path_compare (path, pos_path))
|
|
|
|
goto free_paths_and_out;
|
|
|
|
|
|
|
|
if (before)
|
|
|
|
gtk_tree_path_next (path);
|
|
|
|
else
|
|
|
|
gtk_tree_path_prev (path);
|
|
|
|
|
|
|
|
if (!gtk_tree_path_compare (path, pos_path))
|
|
|
|
goto free_paths_and_out;
|
|
|
|
|
|
|
|
gtk_tree_path_free (path);
|
2003-04-14 12:02:57 +00:00
|
|
|
path = NULL;
|
2002-11-18 19:33:28 +00:00
|
|
|
}
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
|
2002-11-18 19:33:28 +00:00
|
|
|
/* getting destination iters */
|
|
|
|
if (before && position)
|
|
|
|
{
|
|
|
|
if (gtk_tree_path_get_indices (pos_path)[0] > 0)
|
|
|
|
{
|
|
|
|
gtk_tree_path_prev (pos_path);
|
|
|
|
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &dst_a, pos_path))
|
|
|
|
a = G_SLIST (dst_a.user_data);
|
|
|
|
else
|
|
|
|
a = NULL;
|
|
|
|
gtk_tree_path_next (pos_path);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
a = NULL;
|
|
|
|
}
|
|
|
|
else if (before && !position)
|
|
|
|
a = NULL;
|
|
|
|
else /* !before */
|
|
|
|
{
|
|
|
|
if (position)
|
|
|
|
a = G_SLIST (position->user_data);
|
|
|
|
else
|
|
|
|
a = NULL;
|
|
|
|
}
|
|
|
|
|
2003-04-14 12:02:57 +00:00
|
|
|
/* don't try to reorder the iter to it's own position */
|
|
|
|
if (a)
|
|
|
|
{
|
|
|
|
if (a == iter->user_data)
|
|
|
|
goto free_paths_and_out;
|
|
|
|
}
|
|
|
|
else if (before)
|
|
|
|
{
|
|
|
|
if (iter->user_data == store->tail)
|
|
|
|
goto free_paths_and_out;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (iter->user_data == store->root)
|
|
|
|
goto free_paths_and_out;
|
|
|
|
}
|
|
|
|
|
2002-11-18 19:33:28 +00:00
|
|
|
/* getting the old prev node */
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
if (iter->user_data == store->root)
|
|
|
|
prev = NULL;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = store->root; i; i = i->next, old_pos++)
|
|
|
|
if (i->next == iter->user_data)
|
|
|
|
{
|
|
|
|
prev = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
old_pos++;
|
|
|
|
}
|
|
|
|
|
2002-11-18 19:33:28 +00:00
|
|
|
/* remove node */
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
if (!prev)
|
|
|
|
store->root = G_SLIST (iter->user_data)->next;
|
|
|
|
else
|
2003-01-14 22:30:41 +00:00
|
|
|
{
|
|
|
|
prev->next = G_SLIST (iter->user_data)->next;
|
|
|
|
if (!prev->next)
|
|
|
|
store->tail = prev;
|
|
|
|
}
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
|
2002-11-18 19:33:28 +00:00
|
|
|
/* and reinsert it */
|
|
|
|
if (a)
|
|
|
|
{
|
|
|
|
tmp = a->next;
|
|
|
|
|
|
|
|
a->next = G_SLIST (iter->user_data);
|
|
|
|
a->next->next = tmp;
|
|
|
|
}
|
|
|
|
else if (!a && !before)
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
{
|
2002-11-18 19:33:28 +00:00
|
|
|
tmp = G_SLIST (store->root);
|
|
|
|
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
store->root = G_SLIST (iter->user_data);
|
2002-11-18 19:33:28 +00:00
|
|
|
G_SLIST (store->root)->next = tmp;
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
}
|
2002-11-18 19:33:28 +00:00
|
|
|
else if (!a && before)
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
{
|
2002-11-18 19:33:28 +00:00
|
|
|
G_SLIST (store->tail)->next = G_SLIST (iter->user_data);
|
|
|
|
G_SLIST (iter->user_data)->next = NULL;
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
}
|
|
|
|
|
2003-01-27 21:41:06 +00:00
|
|
|
/* update tail if needed */
|
|
|
|
if (!G_SLIST (iter->user_data)->next)
|
|
|
|
store->tail = G_SLIST (iter->user_data);
|
|
|
|
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
/* emit signal */
|
2002-11-18 19:33:28 +00:00
|
|
|
if (position)
|
|
|
|
new_pos = gtk_tree_path_get_indices (pos_path)[0];
|
|
|
|
else if (before)
|
|
|
|
new_pos = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) - 1;
|
|
|
|
else
|
|
|
|
new_pos = 0;
|
|
|
|
|
|
|
|
if (new_pos > old_pos)
|
|
|
|
{
|
2003-01-14 22:30:41 +00:00
|
|
|
if (before && position)
|
2002-11-18 19:33:28 +00:00
|
|
|
new_pos--;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-01-14 22:30:41 +00:00
|
|
|
if (!before && position)
|
2002-11-18 19:33:28 +00:00
|
|
|
new_pos++;
|
|
|
|
}
|
|
|
|
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
order = g_new (gint, store->length);
|
2002-11-18 19:33:28 +00:00
|
|
|
if (new_pos > old_pos)
|
|
|
|
{
|
|
|
|
for (j = 0; j < store->length; j++)
|
|
|
|
if (j < old_pos)
|
|
|
|
order[j] = j;
|
|
|
|
else if (j >= old_pos && j < new_pos)
|
|
|
|
order[j] = j + 1;
|
|
|
|
else if (j == new_pos)
|
|
|
|
order[j] = old_pos;
|
|
|
|
else
|
|
|
|
order[j] = j;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (j = 0; j < store->length; j++)
|
|
|
|
if (j == new_pos)
|
|
|
|
order[j] = old_pos;
|
|
|
|
else if (j > new_pos && j <= old_pos)
|
|
|
|
order[j] = j - 1;
|
|
|
|
else
|
|
|
|
order[j] = j;
|
|
|
|
}
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
|
|
|
|
path = gtk_tree_path_new ();
|
|
|
|
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (store),
|
|
|
|
path, NULL, order);
|
|
|
|
gtk_tree_path_free (path);
|
2002-11-18 19:33:28 +00:00
|
|
|
if (position)
|
|
|
|
gtk_tree_path_free (pos_path);
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
g_free (order);
|
2002-11-18 19:33:28 +00:00
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
free_paths_and_out:
|
2003-04-14 12:02:57 +00:00
|
|
|
if (path)
|
|
|
|
gtk_tree_path_free (path);
|
|
|
|
if (pos_path)
|
|
|
|
gtk_tree_path_free (pos_path);
|
2002-11-18 19:33:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_list_store_move_before:
|
|
|
|
* @store: A #GtkListStore.
|
|
|
|
* @iter: A #GtkTreeIter.
|
|
|
|
* @position: A #GtkTreeIter, or %NULL.
|
|
|
|
*
|
|
|
|
* Moves @iter in @store to the position before @position. Note that this
|
|
|
|
* function only works with unsorted stores. If @position is %NULL, @iter
|
|
|
|
* will be moved to the end of the list.
|
2002-11-28 00:33:17 +00:00
|
|
|
*
|
|
|
|
* Since: 2.2
|
2002-11-18 19:33:28 +00:00
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_list_store_move_before (GtkListStore *store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *position)
|
|
|
|
{
|
|
|
|
gtk_list_store_move (store, iter, position, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_list_store_move_after:
|
|
|
|
* @store: A #GtkListStore.
|
|
|
|
* @iter: A #GtkTreeIter.
|
2002-11-28 00:33:17 +00:00
|
|
|
* @position: A #GtkTreeIter or %NULL.
|
2002-11-18 19:33:28 +00:00
|
|
|
*
|
|
|
|
* Moves @iter in @store to the position after @position. Note that this
|
|
|
|
* function only works with unsorted stores. If @position is %NULL, @iter
|
|
|
|
* will be moved to the start of the list.
|
2002-11-28 00:33:17 +00:00
|
|
|
*
|
|
|
|
* Since: 2.2
|
2002-11-18 19:33:28 +00:00
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_list_store_move_after (GtkListStore *store,
|
|
|
|
GtkTreeIter *iter,
|
|
|
|
GtkTreeIter *position)
|
|
|
|
{
|
|
|
|
gtk_list_store_move (store, iter, position, FALSE);
|
API additions: _move, _reorder and _swap for stores, path constructor.
Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org>
API additions: _move, _reorder and _swap for stores, path
constructor.
* gtk/gtktreemodel.[ch] (gtk_tree_path_new_from_indices): new function.
* gtk/gtkliststore.[ch]: added gtk_list_store_reorder_func (private),
gtk_list_store_reorder, gtk_list_store_swap, gtk_list_store_move.
* gtk/gtktreestore.[ch]: added gtk_tree_store_reorder_func (private),
gtk_tree_store_reorder, gtk_tree_store_swap, gtk_tree_store_move.
Fri Jul 26 22:32:57 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreestore.c (node_free): return FALSE,
(gtk_tree_store_finalize): use g_node_traverse instead of
g_node_children_foreach, so the whole tree will be freed (#88854,
patch from Emmanuel Briot).
Fri Jul 26 22:32:24 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_button_press): fix some memleaks,
(#84426, patch from Matthias Clasen).
Fri Jul 26 22:31:25 2002 Kristian Rietveld <kris@gtk.org>
Merge from stable:
* gtk/gtktreeview.c (gtk_tree_view_unref_tree_helper): _iter_children
check shouldn't be in g_return_return_val_if_fail (pointed out by
Josh Green, #88997),
(gtk_tree_view_set_model): call _gtk_tree_view_column_unset_model
for each column when we unset the model (part of #82484),
(gtk_tree_view_get_cell_area): return if we ran out of tree or
if we got an invalid path (#82376).
* gtk/gtktreeprivate.h: add _gtk_tree_view_column_unset_model.
* gtk/gtktreeviewcolumn.c: implement _gtk_tree_view_column_unset_model
which disconnects the sort_column_changed_signal (part of #82484).
* gtk/gtkliststore.c (gtk_list_store_insert): append row if the
given postion is off the end of the tree (#85813).
* gtk/gtkentry.c (gtk_cell_editable_key_press_event): let's use
2-space indent, commit changes if up/down keys has been pressed,
this overrides the focus key foo so the user won't be surprised
(#84665).
2002-07-26 20:51:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Sorting */
|
2001-03-28 01:54:14 +00:00
|
|
|
static gint
|
2001-06-14 23:25:52 +00:00
|
|
|
gtk_list_store_compare_func (gconstpointer a,
|
|
|
|
gconstpointer b,
|
|
|
|
gpointer user_data)
|
2001-03-28 01:54:14 +00:00
|
|
|
{
|
|
|
|
GtkListStore *list_store = user_data;
|
|
|
|
GSList *el_a; /* Los Angeles? */
|
|
|
|
GSList *el_b;
|
|
|
|
GtkTreeIter iter_a;
|
|
|
|
GtkTreeIter iter_b;
|
|
|
|
gint retval;
|
2001-09-03 23:37:39 +00:00
|
|
|
GtkTreeIterCompareFunc func;
|
|
|
|
gpointer data;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
|
|
|
|
2001-09-03 23:37:39 +00:00
|
|
|
if (list_store->sort_column_id != -1)
|
|
|
|
{
|
|
|
|
GtkTreeDataSortHeader *header;
|
|
|
|
|
|
|
|
header = _gtk_tree_data_list_get_header (list_store->sort_list,
|
|
|
|
list_store->sort_column_id);
|
|
|
|
g_return_val_if_fail (header != NULL, 0);
|
|
|
|
g_return_val_if_fail (header->func != NULL, 0);
|
|
|
|
|
|
|
|
func = header->func;
|
|
|
|
data = header->data;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (list_store->default_sort_func != NULL, 0);
|
|
|
|
func = list_store->default_sort_func;
|
|
|
|
data = list_store->default_sort_data;
|
|
|
|
}
|
2001-03-28 01:54:14 +00:00
|
|
|
|
|
|
|
el_a = ((SortTuple *) a)->el;
|
|
|
|
el_b = ((SortTuple *) b)->el;
|
|
|
|
|
|
|
|
iter_a.stamp = list_store->stamp;
|
|
|
|
iter_a.user_data = el_a;
|
|
|
|
iter_b.stamp = list_store->stamp;
|
|
|
|
iter_b.user_data = el_b;
|
|
|
|
|
2001-09-03 23:37:39 +00:00
|
|
|
retval = (* func) (GTK_TREE_MODEL (list_store), &iter_a, &iter_b, data);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-08-23 18:33:37 +00:00
|
|
|
if (list_store->order == GTK_SORT_DESCENDING)
|
2001-03-28 01:54:14 +00:00
|
|
|
{
|
|
|
|
if (retval > 0)
|
|
|
|
retval = -1;
|
|
|
|
else if (retval < 0)
|
|
|
|
retval = 1;
|
|
|
|
}
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_list_store_sort (GtkListStore *list_store)
|
|
|
|
{
|
|
|
|
GArray *sort_array;
|
|
|
|
gint i;
|
|
|
|
gint *new_order;
|
|
|
|
GSList *list;
|
|
|
|
GtkTreePath *path;
|
|
|
|
|
|
|
|
if (list_store->length <= 1)
|
|
|
|
return;
|
|
|
|
|
|
|
|
g_assert (GTK_LIST_STORE_IS_SORTED (list_store));
|
|
|
|
|
|
|
|
list = G_SLIST (list_store->root);
|
|
|
|
|
|
|
|
sort_array = g_array_sized_new (FALSE, FALSE,
|
|
|
|
sizeof (SortTuple),
|
|
|
|
list_store->length);
|
|
|
|
|
|
|
|
for (i = 0; i < list_store->length; i++)
|
|
|
|
{
|
2003-03-31 19:51:48 +00:00
|
|
|
SortTuple tuple = {0,};
|
2001-03-28 01:54:14 +00:00
|
|
|
|
|
|
|
/* If this fails, we are in an inconsistent state. Bad */
|
|
|
|
g_return_if_fail (list != NULL);
|
|
|
|
|
|
|
|
tuple.offset = i;
|
|
|
|
tuple.el = list;
|
|
|
|
g_array_append_val (sort_array, tuple);
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
2001-06-14 23:25:52 +00:00
|
|
|
g_array_sort_with_data (sort_array, gtk_list_store_compare_func, list_store);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
|
|
|
for (i = 0; i < list_store->length - 1; i++)
|
|
|
|
g_array_index (sort_array, SortTuple, i).el->next =
|
|
|
|
g_array_index (sort_array, SortTuple, i + 1).el;
|
|
|
|
g_array_index (sort_array, SortTuple, list_store->length - 1).el->next = NULL;
|
|
|
|
list_store->root = g_array_index (sort_array, SortTuple, 0).el;
|
2002-07-05 10:44:36 +00:00
|
|
|
list_store->tail = g_array_index (sort_array, SortTuple, list_store->length - 1).el;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
|
|
|
/* Let the world know about our new order */
|
|
|
|
new_order = g_new (gint, list_store->length);
|
|
|
|
for (i = 0; i < list_store->length; i++)
|
|
|
|
new_order[i] = g_array_index (sort_array, SortTuple, i).offset;
|
2002-01-09 20:43:11 +00:00
|
|
|
|
2001-03-28 01:54:14 +00:00
|
|
|
path = gtk_tree_path_new ();
|
2001-09-12 23:16:18 +00:00
|
|
|
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
|
2002-01-09 20:43:11 +00:00
|
|
|
path, NULL, new_order);
|
2001-03-28 01:54:14 +00:00
|
|
|
gtk_tree_path_free (path);
|
|
|
|
g_free (new_order);
|
|
|
|
g_array_free (sort_array, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_list_store_sort_iter_changed (GtkListStore *list_store,
|
2001-04-01 05:52:23 +00:00
|
|
|
GtkTreeIter *iter,
|
|
|
|
gint column)
|
2001-03-28 01:54:14 +00:00
|
|
|
|
|
|
|
{
|
|
|
|
GSList *prev = NULL;
|
|
|
|
GSList *next = NULL;
|
|
|
|
GSList *list = G_SLIST (list_store->root);
|
2001-04-01 05:52:23 +00:00
|
|
|
GtkTreePath *tmp_path;
|
2001-03-28 01:54:14 +00:00
|
|
|
GtkTreeIter tmp_iter;
|
|
|
|
gint cmp_a = 0;
|
|
|
|
gint cmp_b = 0;
|
2001-04-01 05:52:23 +00:00
|
|
|
gint i;
|
|
|
|
gint old_location;
|
|
|
|
gint new_location;
|
|
|
|
gint *new_order;
|
2001-09-03 23:37:39 +00:00
|
|
|
GtkTreeIterCompareFunc func;
|
|
|
|
gpointer data;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
|
|
|
if (list_store->length < 2)
|
|
|
|
return;
|
|
|
|
|
|
|
|
tmp_iter.stamp = list_store->stamp;
|
2001-09-03 23:37:39 +00:00
|
|
|
|
|
|
|
if (list_store->sort_column_id != -1)
|
|
|
|
{
|
|
|
|
GtkTreeDataSortHeader *header;
|
|
|
|
header = _gtk_tree_data_list_get_header (list_store->sort_list,
|
|
|
|
list_store->sort_column_id);
|
|
|
|
g_return_if_fail (header != NULL);
|
|
|
|
g_return_if_fail (header->func != NULL);
|
|
|
|
func = header->func;
|
|
|
|
data = header->data;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
g_return_if_fail (list_store->default_sort_func != NULL);
|
|
|
|
func = list_store->default_sort_func;
|
|
|
|
data = list_store->default_sort_data;
|
|
|
|
}
|
2001-04-01 05:52:23 +00:00
|
|
|
|
|
|
|
/* If it's the built in function, we don't sort. */
|
2001-09-03 23:37:39 +00:00
|
|
|
if (func == gtk_tree_data_list_compare_func &&
|
2001-04-01 05:52:23 +00:00
|
|
|
list_store->sort_column_id != column)
|
|
|
|
return;
|
|
|
|
|
|
|
|
old_location = 0;
|
2001-03-28 01:54:14 +00:00
|
|
|
/* First we find the iter, its prev, and its next */
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
if (list == G_SLIST (iter->user_data))
|
|
|
|
break;
|
|
|
|
prev = list;
|
|
|
|
list = list->next;
|
2001-04-01 05:52:23 +00:00
|
|
|
old_location++;
|
2001-03-28 01:54:14 +00:00
|
|
|
}
|
|
|
|
g_assert (list != NULL);
|
|
|
|
|
|
|
|
next = list->next;
|
|
|
|
|
|
|
|
/* Check the common case, where we don't need to sort it moved. */
|
|
|
|
if (prev != NULL)
|
|
|
|
{
|
|
|
|
tmp_iter.user_data = prev;
|
2001-09-03 23:37:39 +00:00
|
|
|
cmp_a = (* func) (GTK_TREE_MODEL (list_store), &tmp_iter, iter, data);
|
2001-03-28 01:54:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (next != NULL)
|
|
|
|
{
|
|
|
|
tmp_iter.user_data = next;
|
2001-09-03 23:37:39 +00:00
|
|
|
cmp_b = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data);
|
2001-03-28 01:54:14 +00:00
|
|
|
}
|
|
|
|
|
2001-08-23 18:33:37 +00:00
|
|
|
if (list_store->order == GTK_SORT_DESCENDING)
|
2001-03-28 01:54:14 +00:00
|
|
|
{
|
|
|
|
if (cmp_a < 0)
|
|
|
|
cmp_a = 1;
|
|
|
|
else if (cmp_a > 0)
|
|
|
|
cmp_a = -1;
|
|
|
|
|
|
|
|
if (cmp_b < 0)
|
|
|
|
cmp_b = 1;
|
|
|
|
else if (cmp_b > 0)
|
|
|
|
cmp_b = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prev == NULL && cmp_b <= 0)
|
|
|
|
return;
|
|
|
|
else if (next == NULL && cmp_a <= 0)
|
|
|
|
return;
|
|
|
|
else if (prev != NULL && next != NULL &&
|
|
|
|
cmp_a <= 0 && cmp_b <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* We actually need to sort it */
|
|
|
|
/* First, remove the old link. */
|
|
|
|
|
|
|
|
if (prev == NULL)
|
|
|
|
list_store->root = next;
|
|
|
|
else
|
|
|
|
prev->next = next;
|
|
|
|
if (next == NULL)
|
|
|
|
list_store->tail = prev;
|
|
|
|
list->next = NULL;
|
|
|
|
|
|
|
|
/* FIXME: as an optimization, we can potentially start at next */
|
|
|
|
prev = NULL;
|
|
|
|
list = G_SLIST (list_store->root);
|
2001-04-01 05:52:23 +00:00
|
|
|
new_location = 0;
|
2001-03-28 01:54:14 +00:00
|
|
|
tmp_iter.user_data = list;
|
2001-08-23 18:33:37 +00:00
|
|
|
if (list_store->order == GTK_SORT_DESCENDING)
|
2001-09-03 23:37:39 +00:00
|
|
|
cmp_a = (* func) (GTK_TREE_MODEL (list_store), &tmp_iter, iter, data);
|
2001-03-28 01:54:14 +00:00
|
|
|
else
|
2001-09-03 23:37:39 +00:00
|
|
|
cmp_a = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data);
|
2001-03-28 01:54:14 +00:00
|
|
|
|
|
|
|
while ((list->next) && (cmp_a > 0))
|
|
|
|
{
|
|
|
|
prev = list;
|
|
|
|
list = list->next;
|
2001-04-01 05:52:23 +00:00
|
|
|
new_location++;
|
2001-03-28 01:54:14 +00:00
|
|
|
tmp_iter.user_data = list;
|
2001-08-23 18:33:37 +00:00
|
|
|
if (list_store->order == GTK_SORT_DESCENDING)
|
2001-09-03 23:37:39 +00:00
|
|
|
cmp_a = (* func) (GTK_TREE_MODEL (list_store), &tmp_iter, iter, data);
|
2001-03-28 01:54:14 +00:00
|
|
|
else
|
2001-09-03 23:37:39 +00:00
|
|
|
cmp_a = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data);
|
2001-03-28 01:54:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((!list->next) && (cmp_a > 0))
|
|
|
|
{
|
2002-02-11 15:06:59 +00:00
|
|
|
new_location++;
|
2001-03-28 01:54:14 +00:00
|
|
|
list->next = G_SLIST (iter->user_data);
|
|
|
|
list_store->tail = list->next;
|
|
|
|
}
|
|
|
|
else if (prev)
|
|
|
|
{
|
|
|
|
prev->next = G_SLIST (iter->user_data);
|
|
|
|
G_SLIST (iter->user_data)->next = list;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
G_SLIST (iter->user_data)->next = G_SLIST (list_store->root);
|
|
|
|
list_store->root = G_SLIST (iter->user_data);
|
|
|
|
}
|
2001-04-01 05:52:23 +00:00
|
|
|
|
|
|
|
/* Emit the reordered signal. */
|
|
|
|
new_order = g_new (int, list_store->length);
|
|
|
|
if (old_location < new_location)
|
|
|
|
for (i = 0; i < list_store->length; i++)
|
|
|
|
{
|
|
|
|
if (i < old_location ||
|
|
|
|
i > new_location)
|
|
|
|
new_order[i] = i;
|
|
|
|
else if (i >= old_location &&
|
|
|
|
i < new_location)
|
|
|
|
new_order[i] = i + 1;
|
|
|
|
else if (i == new_location)
|
|
|
|
new_order[i] = old_location;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
for (i = 0; i < list_store->length; i++)
|
|
|
|
{
|
|
|
|
if (i < new_location ||
|
|
|
|
i > old_location)
|
|
|
|
new_order[i] = i;
|
|
|
|
else if (i > new_location &&
|
|
|
|
i <= old_location)
|
|
|
|
new_order[i] = i - 1;
|
|
|
|
else if (i == new_location)
|
|
|
|
new_order[i] = old_location;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp_path = gtk_tree_path_new ();
|
|
|
|
tmp_iter.user_data = NULL;
|
|
|
|
|
2001-09-12 23:16:18 +00:00
|
|
|
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
|
2002-02-10 22:53:20 +00:00
|
|
|
tmp_path, NULL,
|
2001-09-12 23:16:18 +00:00
|
|
|
new_order);
|
2001-04-01 05:52:23 +00:00
|
|
|
gtk_tree_path_free (tmp_path);
|
|
|
|
g_free (new_order);
|
2001-03-28 01:54:14 +00:00
|
|
|
}
|
|
|
|
|
2001-03-23 00:35:19 +00:00
|
|
|
static gboolean
|
|
|
|
gtk_list_store_get_sort_column_id (GtkTreeSortable *sortable,
|
|
|
|
gint *sort_column_id,
|
2001-08-23 18:33:37 +00:00
|
|
|
GtkSortType *order)
|
2001-03-23 00:35:19 +00:00
|
|
|
{
|
|
|
|
GtkListStore *list_store = (GtkListStore *) sortable;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (sortable), FALSE);
|
|
|
|
|
2003-01-27 21:41:06 +00:00
|
|
|
if (list_store->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
|
2001-03-23 00:35:19 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (sort_column_id)
|
|
|
|
* sort_column_id = list_store->sort_column_id;
|
|
|
|
if (order)
|
|
|
|
* order = list_store->order;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_list_store_set_sort_column_id (GtkTreeSortable *sortable,
|
|
|
|
gint sort_column_id,
|
2001-08-23 18:33:37 +00:00
|
|
|
GtkSortType order)
|
2001-03-23 00:35:19 +00:00
|
|
|
{
|
|
|
|
GtkListStore *list_store = (GtkListStore *) sortable;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (sortable));
|
|
|
|
|
2001-03-28 01:54:14 +00:00
|
|
|
if ((list_store->sort_column_id == sort_column_id) &&
|
|
|
|
(list_store->order == order))
|
|
|
|
return;
|
|
|
|
|
2003-01-27 21:41:06 +00:00
|
|
|
if (sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
|
2001-09-03 23:37:39 +00:00
|
|
|
{
|
|
|
|
GtkTreeDataSortHeader *header = NULL;
|
|
|
|
|
|
|
|
header = _gtk_tree_data_list_get_header (list_store->sort_list, sort_column_id);
|
|
|
|
|
|
|
|
/* We want to make sure that we have a function */
|
|
|
|
g_return_if_fail (header != NULL);
|
|
|
|
g_return_if_fail (header->func != NULL);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
g_return_if_fail (list_store->default_sort_func != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-03-23 00:35:19 +00:00
|
|
|
list_store->sort_column_id = sort_column_id;
|
|
|
|
list_store->order = order;
|
2001-03-28 01:54:14 +00:00
|
|
|
|
2001-03-29 21:30:05 +00:00
|
|
|
gtk_tree_sortable_sort_column_changed (sortable);
|
2003-01-27 21:41:06 +00:00
|
|
|
|
|
|
|
gtk_list_store_sort (list_store);
|
2001-03-23 00:35:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-06-15 23:03:27 +00:00
|
|
|
gtk_list_store_set_sort_func (GtkTreeSortable *sortable,
|
|
|
|
gint sort_column_id,
|
|
|
|
GtkTreeIterCompareFunc func,
|
|
|
|
gpointer data,
|
|
|
|
GtkDestroyNotify destroy)
|
2001-03-23 00:35:19 +00:00
|
|
|
{
|
|
|
|
GtkListStore *list_store = (GtkListStore *) sortable;
|
|
|
|
GtkTreeDataSortHeader *header = NULL;
|
|
|
|
GList *list;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (sortable));
|
|
|
|
g_return_if_fail (func != NULL);
|
|
|
|
|
|
|
|
for (list = list_store->sort_list; list; list = list->next)
|
|
|
|
{
|
2002-04-02 16:19:33 +00:00
|
|
|
GtkTreeDataSortHeader *list_header;
|
|
|
|
|
|
|
|
list_header = (GtkTreeDataSortHeader*) list->data;
|
|
|
|
if (list_header->sort_column_id == sort_column_id)
|
|
|
|
{
|
|
|
|
header = list_header;
|
|
|
|
break;
|
|
|
|
}
|
2001-03-23 00:35:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (header == NULL)
|
|
|
|
{
|
|
|
|
header = g_new0 (GtkTreeDataSortHeader, 1);
|
|
|
|
header->sort_column_id = sort_column_id;
|
|
|
|
list_store->sort_list = g_list_append (list_store->sort_list, header);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (header->destroy)
|
2002-03-03 05:41:28 +00:00
|
|
|
{
|
|
|
|
GtkDestroyNotify d = header->destroy;
|
|
|
|
|
|
|
|
header->destroy = NULL;
|
|
|
|
d (header->data);
|
|
|
|
}
|
2001-03-23 00:35:19 +00:00
|
|
|
|
|
|
|
header->func = func;
|
|
|
|
header->data = data;
|
|
|
|
header->destroy = destroy;
|
2001-09-03 23:37:39 +00:00
|
|
|
|
2003-01-27 21:41:06 +00:00
|
|
|
if (list_store->sort_column_id == sort_column_id)
|
|
|
|
gtk_list_store_sort (list_store);
|
|
|
|
}
|
2001-09-03 23:37:39 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable,
|
|
|
|
GtkTreeIterCompareFunc func,
|
|
|
|
gpointer data,
|
|
|
|
GtkDestroyNotify destroy)
|
|
|
|
{
|
|
|
|
GtkListStore *list_store = (GtkListStore *) sortable;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_LIST_STORE (sortable));
|
|
|
|
|
|
|
|
if (list_store->default_sort_destroy)
|
2002-03-03 05:41:28 +00:00
|
|
|
{
|
|
|
|
GtkDestroyNotify d = list_store->default_sort_destroy;
|
|
|
|
|
|
|
|
list_store->default_sort_destroy = NULL;
|
|
|
|
d (list_store->default_sort_data);
|
|
|
|
}
|
2001-09-03 23:37:39 +00:00
|
|
|
|
|
|
|
list_store->default_sort_func = func;
|
|
|
|
list_store->default_sort_data = data;
|
|
|
|
list_store->default_sort_destroy = destroy;
|
2003-01-27 21:41:06 +00:00
|
|
|
|
|
|
|
if (list_store->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
|
|
|
|
gtk_list_store_sort (list_store);
|
2001-09-03 23:37:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable)
|
|
|
|
{
|
|
|
|
GtkListStore *list_store = (GtkListStore *) sortable;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GTK_IS_LIST_STORE (sortable), FALSE);
|
|
|
|
|
|
|
|
return (list_store->default_sort_func != NULL);
|
|
|
|
}
|