aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/proto_draw.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-11-26 20:26:09 +0000
committerGerald Combs <gerald@wireshark.org>2006-11-26 20:26:09 +0000
commitd6708de7caafa870848acaf65b9624eaf7caad07 (patch)
tree5bb24586ae3826b5b3facd04f4ff8850ad11a885 /gtk/proto_draw.c
parent07a6f489a3c6832d38e9e520ff01d10fbbd958bd (diff)
Make keyboard navigation common for all tree views (for GTK2, at least).
svn path=/trunk/; revision=19994
Diffstat (limited to 'gtk/proto_draw.c')
-rw-r--r--gtk/proto_draw.c72
1 files changed, 0 insertions, 72 deletions
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index dc8659bac7..6fdc204505 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1754,77 +1754,6 @@ static void tree_cell_renderer(GtkTreeViewColumn *tree_column _U_,
}
#endif
-
-#if GTK_MAJOR_VERSION >= 2
-static int
-tree_view_key_pressed_cb(GtkCTree *ctree _U_, GdkEventKey *event, gpointer user_data _U_)
-{
- GtkTreeSelection* selection;
- GtkTreeIter iter;
- GtkTreeIter parent;
- GtkTreeModel* model;
- GtkTreePath* path;
- gboolean expanded;
- gboolean has_parent;
-
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
- if(!selection) {
- return FALSE;
- }
-
- if(!gtk_tree_selection_get_selected (selection, &model, &iter)) {
- return FALSE;
- }
-
- path = gtk_tree_model_get_path(model, &iter);
- if(!path) {
- return FALSE;
- }
- expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(tree_view), path);
-
- switch (event->keyval) {
- case GDK_Left:
- if(expanded) {
- /* subtree is expanded, collapse it */
- gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree_view), path);
- return TRUE;
- }
- /* No break - fall through to jumping to the parent */
- case GDK_BackSpace:
- if (!expanded) {
- /* subtree is already collapsed, jump to parent node */
- has_parent = gtk_tree_model_iter_parent(model, &parent, &iter);
- path = gtk_tree_model_get_path(model, &parent);
- if(!path) {
- return FALSE;
- }
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(tree_view), path,
- NULL /* focus_column */,
- FALSE /* !start_editing */);
- return TRUE;
- }
- break;
- case GDK_Right:
- /* try to expand the subtree */
- gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, FALSE /* !open_all */);
- return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
- /* Reverse the current state. */
- if (expanded)
- gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree_view), path);
- else
- gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, FALSE /* !open_all */);
- return TRUE;
- }
-
- return FALSE;
-}
-#endif
-
-
-
GtkWidget *
main_tree_view_new(e_prefs *prefs, GtkWidget **tree_view_p)
{
@@ -1873,7 +1802,6 @@ main_tree_view_new(e_prefs *prefs, GtkWidget **tree_view_p)
GTK_TREE_VIEW_COLUMN_AUTOSIZE);
SIGNAL_CONNECT(tree_view, "row-expanded", expand_tree, NULL);
SIGNAL_CONNECT(tree_view, "row-collapsed", collapse_tree, NULL);
- SIGNAL_CONNECT(tree_view, "key-press-event", tree_view_key_pressed_cb, NULL );
#endif
gtk_container_add( GTK_CONTAINER(tv_scrollw), tree_view );
set_ptree_sel_browse(tree_view, prefs->gui_ptree_sel_browse);