From d85ec9a0624b140b42dfb7740bfc155e6d633463 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 8 Oct 2001 05:01:09 +0000 Subject: [PATCH] remove unused enum 2001-10-08 Havoc Pennington * demos/gtk-demo/stock_browser.c: remove unused enum * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node): pass the current selection state of the node in to the user selection func --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ demos/gtk-demo/stock_browser.c | 8 -------- gtk/gtktreeselection.c | 6 +++++- gtk/gtktreeselection.h | 1 + 10 files changed, 62 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07c1b6b6fe..048dacbf49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-10-08 Havoc Pennington + + * demos/gtk-demo/stock_browser.c: remove unused enum + + * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node): + pass the current selection state of the node in to the user + selection func + 2001-10-06 Matthias Clasen * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 07c1b6b6fe..048dacbf49 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2001-10-08 Havoc Pennington + + * demos/gtk-demo/stock_browser.c: remove unused enum + + * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node): + pass the current selection state of the node in to the user + selection func + 2001-10-06 Matthias Clasen * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 07c1b6b6fe..048dacbf49 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2001-10-08 Havoc Pennington + + * demos/gtk-demo/stock_browser.c: remove unused enum + + * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node): + pass the current selection state of the node in to the user + selection func + 2001-10-06 Matthias Clasen * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 07c1b6b6fe..048dacbf49 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2001-10-08 Havoc Pennington + + * demos/gtk-demo/stock_browser.c: remove unused enum + + * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node): + pass the current selection state of the node in to the user + selection func + 2001-10-06 Matthias Clasen * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 07c1b6b6fe..048dacbf49 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2001-10-08 Havoc Pennington + + * demos/gtk-demo/stock_browser.c: remove unused enum + + * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node): + pass the current selection state of the node in to the user + selection func + 2001-10-06 Matthias Clasen * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 07c1b6b6fe..048dacbf49 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2001-10-08 Havoc Pennington + + * demos/gtk-demo/stock_browser.c: remove unused enum + + * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node): + pass the current selection state of the node in to the user + selection func + 2001-10-06 Matthias Clasen * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 07c1b6b6fe..048dacbf49 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2001-10-08 Havoc Pennington + + * demos/gtk-demo/stock_browser.c: remove unused enum + + * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node): + pass the current selection state of the node in to the user + selection func + 2001-10-06 Matthias Clasen * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to diff --git a/demos/gtk-demo/stock_browser.c b/demos/gtk-demo/stock_browser.c index 5594a423d6..b66edda1ae 100644 --- a/demos/gtk-demo/stock_browser.c +++ b/demos/gtk-demo/stock_browser.c @@ -81,14 +81,6 @@ struct _StockItemDisplay GtkWidget *icon_image; }; -/* columns in the tree model */ -enum { - COLUMN_ICON_MACRO, - COLUMN_LABEL, - COLUMN_ACCEL, - COLUMN_ID -}; - static gchar* id_to_macro (const gchar *id) { diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index a524400068..cbf2c43a5b 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -245,6 +245,8 @@ gtk_tree_selection_get_mode (GtkTreeSelection *selection) * * Sets the selection function. If set, this function is called before any node * is selected or unselected, giving some control over which nodes are selected. + * The select function should return %TRUE if the state of the node may be toggled, + * and %FALSE if the state of the node should be left unchanged. **/ void gtk_tree_selection_set_select_function (GtkTreeSelection *selection, @@ -1010,7 +1012,9 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection, path = _gtk_tree_view_find_path (selection->tree_view, tree, node); if (selection->user_func) { - if ((*selection->user_func) (selection, selection->tree_view->priv->model, path, selection->user_data)) + if ((*selection->user_func) (selection, selection->tree_view->priv->model, path, + GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED), + selection->user_data)) selected = TRUE; } else diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h index 11286bdabf..2ef1a31e7b 100644 --- a/gtk/gtktreeselection.h +++ b/gtk/gtktreeselection.h @@ -37,6 +37,7 @@ extern "C" { typedef gboolean (* GtkTreeSelectionFunc) (GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, + gboolean path_currently_selected, gpointer data); typedef void (* GtkTreeSelectionForeachFunc) (GtkTreeModel *model, GtkTreePath *path,