summaryrefslogtreecommitdiff
path: root/gtk/gtktreeitem.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2001-03-24 06:10:40 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-03-24 06:10:40 +0000
commit207e3bb9771b9e28c93cf2da5edebab543ed6a36 (patch)
tree0b1e1e598064d006384e4a3ccbb98e7aaf011b79 /gtk/gtktreeitem.c
parentb6b4e13fd8b21077ec8646a9c6e161782c04d32a (diff)
downloadgtk+-207e3bb9771b9e28c93cf2da5edebab543ed6a36.tar.gz
make this somewhat key-navigable
2001-03-23 Havoc Pennington <hp@pobox.com> * gtk/gtkhsv.c: make this somewhat key-navigable * gtk/gtkfontsel.c: mnemonics * gtk/gtkgamma.c: mnemonics * gtk/gtkcolorsel.c: add mnemonics to labels 2001-03-22 Havoc Pennington <hp@pobox.com> Applied big patch from Seth Lytle to fix event handler return values, slightly modified. * gtk/gtkcalendar.c (gtk_calendar_button_press): return TRUE if handled. (gtk_calendar_key_press): return TRUE for GDK_space triggers select_day * gtk/gtkclist.c (gtk_clist_button_press): return TRUE if handled (gtk_clist_button_release): return TRUE if handled * gtk/gtkcolorsel.c (mouse_release): (palette_activate): (palette_press): (palette_new): (mouse_press): (get_screen_color): fixed return type (void to gboolean), return TRUE, added GTK_SIGNAL_FUNC cast * gtk/gtkcombo.c (gtk_combo_popup_button_press): fixed return type (void to gboolean), and return TRUE (gtk_combo_button_release): changed return value to TRUE after gtk_grab_add on combo->popwin * gtk/gtkctree.c (gtk_ctree_button_press): return TRUE if triggers a collapse or expand * gtk/gtkcurve.c (gtk_curve_graph_events): return TRUE for button/motion * gtk/gtkdnd.c (gtk_drag_source_event_cb): return TRUE for button press/release and motion that trigger act * gtk/gtkentry.c (gtk_entry_button_release): return TRUE * gtk/gtkfontsel.c (gtk_font_selection_size_key_press): return TRUE for GDK_Return * gtk/gtklist.c (gtk_list_button_press): return TRUE mostly (gtk_list_button_release): return TRUE if selection * gtk/gtklistitem.c (gtk_list_item_button_press): return TRUE on press * gtk/gtkmenushell.c (gtk_menu_shell_button_press): (gtk_menu_shell_button_release): chain parent_menu_shell retval * gtk/gtknotebook.c (gtk_notebook_button_press): return FALSE if nothing triggered (gtk_notebook_button_release): return TRUE if we do anything * gtk/gtkspinbutton.c (gtk_spin_button_button_press): (gtk_spin_button_button_release): return TRUE or chained retval * gtk/gtktext.c (gtk_text_button_press): (gtk_text_button_release): return TRUE (gtk_text_key_press): remove redundant retval code * gtk/gtktreeitem.c (gtk_tree_item_button_press): return TRUE if button and sensitive (gtk_tree_item_subtree_button_click): changed type to gint, and return TRUE if sensitive * gtk/gtktooltips.c (gtk_tooltips_event_handler): deactivate implies return TRUE
Diffstat (limited to 'gtk/gtktreeitem.c')
-rw-r--r--gtk/gtktreeitem.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index 162161ac16..15c3e2a2fd 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -84,7 +84,7 @@ static void gtk_real_tree_item_collapse (GtkTreeItem *item);
static void gtk_real_tree_item_expand (GtkTreeItem *item);
static void gtk_real_tree_item_collapse (GtkTreeItem *item);
static void gtk_tree_item_destroy (GtkObject *object);
-static void gtk_tree_item_subtree_button_click (GtkWidget *widget);
+static gint gtk_tree_item_subtree_button_click (GtkWidget *widget);
static void gtk_tree_item_subtree_button_changed_state (GtkWidget *widget);
static void gtk_tree_item_map(GtkWidget*);
@@ -172,7 +172,7 @@ gtk_tree_item_class_init (GtkTreeItemClass *class)
}
/* callback for event box mouse event */
-static void
+static gint
gtk_tree_item_subtree_button_click (GtkWidget *widget)
{
GtkTreeItem* item;
@@ -182,12 +182,14 @@ gtk_tree_item_subtree_button_click (GtkWidget *widget)
item = (GtkTreeItem*) gtk_object_get_user_data (GTK_OBJECT (widget));
if (!GTK_WIDGET_IS_SENSITIVE (item))
- return;
+ return FALSE;
if (item->expanded)
gtk_tree_item_collapse (item);
else
gtk_tree_item_expand (item);
+
+ return TRUE;
}
/* callback for event box state changed */
@@ -711,7 +713,7 @@ gtk_tree_item_button_press (GtkWidget *widget,
&& !GTK_WIDGET_HAS_FOCUS (widget))
gtk_widget_grab_focus (widget);
- return FALSE;
+ return (event->type == GDK_BUTTON_PRESS && GTK_WIDGET_IS_SENSITIVE(widget));
}
static gint