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
This commit is contained in:
Havoc Pennington 2001-10-08 05:01:09 +00:00 committed by Havoc Pennington
parent b6c2df953d
commit d85ec9a062
10 changed files with 62 additions and 9 deletions

View File

@ -1,3 +1,11 @@
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>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to

View File

@ -1,3 +1,11 @@
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>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to

View File

@ -1,3 +1,11 @@
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>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to

View File

@ -1,3 +1,11 @@
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>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to

View File

@ -1,3 +1,11 @@
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>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to

View File

@ -1,3 +1,11 @@
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>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to

View File

@ -1,3 +1,11 @@
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>
* gdk/x11/gdkx.h (GDK_CURSOR_XCURSOR): Replace reference to

View File

@ -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)
{

View File

@ -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

View File

@ -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,