From 2f330b7737ff024b69d1a45017bb524122670ed8 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 26 Jun 2005 07:06:13 +0000 Subject: [PATCH] add GDK_GRAB_BROKEN to the switch cases. Sun Jun 26 00:04:36 2005 Manish Singh * gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add GDK_GRAB_BROKEN to the switch cases. * gtk/gtkmenushell.c (gtk_menu_shell_grab_broken): remove unused variables. * gtk/gtkpaned.c (gtk_paned_grab_broken): return TRUE. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gdk/gdkevents.c | 2 ++ gtk/gtkmenushell.c | 2 -- gtk/gtkpaned.c | 2 ++ 6 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 970a4671e8..35258cefa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sun Jun 26 00:04:36 2005 Manish Singh + + * gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add + GDK_GRAB_BROKEN to the switch cases. + + * gtk/gtkmenushell.c (gtk_menu_shell_grab_broken): remove unused + variables. + + * gtk/gtkpaned.c (gtk_paned_grab_broken): return TRUE. + 2005-06-26 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_grab_broken): Stop column diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 970a4671e8..35258cefa5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Sun Jun 26 00:04:36 2005 Manish Singh + + * gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add + GDK_GRAB_BROKEN to the switch cases. + + * gtk/gtkmenushell.c (gtk_menu_shell_grab_broken): remove unused + variables. + + * gtk/gtkpaned.c (gtk_paned_grab_broken): return TRUE. + 2005-06-26 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_grab_broken): Stop column diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 970a4671e8..35258cefa5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Sun Jun 26 00:04:36 2005 Manish Singh + + * gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add + GDK_GRAB_BROKEN to the switch cases. + + * gtk/gtkmenushell.c (gtk_menu_shell_grab_broken): remove unused + variables. + + * gtk/gtkpaned.c (gtk_paned_grab_broken): return TRUE. + 2005-06-26 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_grab_broken): Stop column diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index a54abde8a5..bcafbde956 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -561,6 +561,7 @@ gdk_event_get_time (GdkEvent *event) case GDK_WINDOW_STATE: case GDK_SETTING: case GDK_OWNER_CHANGE: + case GDK_GRAB_BROKEN: /* return current time */ break; } @@ -637,6 +638,7 @@ gdk_event_get_state (GdkEvent *event, case GDK_WINDOW_STATE: case GDK_SETTING: case GDK_OWNER_CHANGE: + case GDK_GRAB_BROKEN: /* no state field */ break; } diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 123f00911b..f207da7cb3 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -612,8 +612,6 @@ gtk_menu_shell_grab_broken (GtkWidget *widget, GdkEventGrabBroken *event) { GtkMenuShell *menu_shell; - GtkWidget *menu_item; - gint deactivate; g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE); g_return_val_if_fail (event != NULL, FALSE); diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index f0fb5f6eab..f6b32588a6 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -921,6 +921,8 @@ gtk_paned_grab_broken (GtkWidget *widget, paned->in_drag = FALSE; paned->drag_pos = -1; paned->position_set = TRUE; + + return TRUE; } static gboolean