Commit d85ec9a0 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

remove unused enum

2001-10-08  Havoc Pennington  <hp@pobox.com>

	* 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
parent b6c2df95
2001-10-08 Havoc Pennington <hp@pobox.com>
* 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 <matthiasc@poet.de> 2001-10-06 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to
......
2001-10-08 Havoc Pennington <hp@pobox.com>
* 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 <matthiasc@poet.de> 2001-10-06 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to
......
2001-10-08 Havoc Pennington <hp@pobox.com>
* 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 <matthiasc@poet.de> 2001-10-06 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to
......
2001-10-08 Havoc Pennington <hp@pobox.com>
* 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 <matthiasc@poet.de> 2001-10-06 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to
......
2001-10-08 Havoc Pennington <hp@pobox.com>
* 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 <matthiasc@poet.de> 2001-10-06 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to
......
2001-10-08 Havoc Pennington <hp@pobox.com>
* 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 <matthiasc@poet.de> 2001-10-06 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to
......
2001-10-08 Havoc Pennington <hp@pobox.com>
* 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 <matthiasc@poet.de> 2001-10-06 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to * gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to
......
...@@ -81,14 +81,6 @@ struct _StockItemDisplay ...@@ -81,14 +81,6 @@ struct _StockItemDisplay
GtkWidget *icon_image; GtkWidget *icon_image;
}; };
/* columns in the tree model */
enum {
COLUMN_ICON_MACRO,
COLUMN_LABEL,
COLUMN_ACCEL,
COLUMN_ID
};
static gchar* static gchar*
id_to_macro (const gchar *id) id_to_macro (const gchar *id)
{ {
......
...@@ -245,6 +245,8 @@ gtk_tree_selection_get_mode (GtkTreeSelection *selection) ...@@ -245,6 +245,8 @@ gtk_tree_selection_get_mode (GtkTreeSelection *selection)
* *
* Sets the selection function. If set, this function is called before any node * 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. * 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 void
gtk_tree_selection_set_select_function (GtkTreeSelection *selection, gtk_tree_selection_set_select_function (GtkTreeSelection *selection,
...@@ -1010,7 +1012,9 @@ gtk_tree_selection_real_select_node (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); path = _gtk_tree_view_find_path (selection->tree_view, tree, node);
if (selection->user_func) 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; selected = TRUE;
} }
else else
......
...@@ -37,6 +37,7 @@ extern "C" { ...@@ -37,6 +37,7 @@ extern "C" {
typedef gboolean (* GtkTreeSelectionFunc) (GtkTreeSelection *selection, typedef gboolean (* GtkTreeSelectionFunc) (GtkTreeSelection *selection,
GtkTreeModel *model, GtkTreeModel *model,
GtkTreePath *path, GtkTreePath *path,
gboolean path_currently_selected,
gpointer data); gpointer data);
typedef void (* GtkTreeSelectionForeachFunc) (GtkTreeModel *model, typedef void (* GtkTreeSelectionForeachFunc) (GtkTreeModel *model,
GtkTreePath *path, GtkTreePath *path,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment