diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtkmenushell.c | 5 |
8 files changed, 38 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Mar 15 22:44:33 1998 Tim Janik <timj@gimp.org> + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): for now reverted + the last change, since it broke click-select-click menus for gimp. + Sun Mar 15 20:13:42 1998 Tim Janik <timj@gimp.org> * gtk/gtkmain.c (gtk_quit_destructor): removed the ugly check whether diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e0bdd7e469..9882755303 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Mar 15 22:44:33 1998 Tim Janik <timj@gimp.org> + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): for now reverted + the last change, since it broke click-select-click menus for gimp. + Sun Mar 15 20:13:42 1998 Tim Janik <timj@gimp.org> * gtk/gtkmain.c (gtk_quit_destructor): removed the ugly check whether diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e0bdd7e469..9882755303 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Mar 15 22:44:33 1998 Tim Janik <timj@gimp.org> + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): for now reverted + the last change, since it broke click-select-click menus for gimp. + Sun Mar 15 20:13:42 1998 Tim Janik <timj@gimp.org> * gtk/gtkmain.c (gtk_quit_destructor): removed the ugly check whether diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e0bdd7e469..9882755303 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Mar 15 22:44:33 1998 Tim Janik <timj@gimp.org> + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): for now reverted + the last change, since it broke click-select-click menus for gimp. + Sun Mar 15 20:13:42 1998 Tim Janik <timj@gimp.org> * gtk/gtkmain.c (gtk_quit_destructor): removed the ugly check whether diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e0bdd7e469..9882755303 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Mar 15 22:44:33 1998 Tim Janik <timj@gimp.org> + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): for now reverted + the last change, since it broke click-select-click menus for gimp. + Sun Mar 15 20:13:42 1998 Tim Janik <timj@gimp.org> * gtk/gtkmain.c (gtk_quit_destructor): removed the ugly check whether diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e0bdd7e469..9882755303 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Mar 15 22:44:33 1998 Tim Janik <timj@gimp.org> + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): for now reverted + the last change, since it broke click-select-click menus for gimp. + Sun Mar 15 20:13:42 1998 Tim Janik <timj@gimp.org> * gtk/gtkmain.c (gtk_quit_destructor): removed the ugly check whether diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e0bdd7e469..9882755303 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Mar 15 22:44:33 1998 Tim Janik <timj@gimp.org> + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): for now reverted + the last change, since it broke click-select-click menus for gimp. + Sun Mar 15 20:13:42 1998 Tim Janik <timj@gimp.org> * gtk/gtkmain.c (gtk_quit_destructor): removed the ugly check whether diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 8b362ee66e..0763952f57 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -303,7 +303,7 @@ gtk_menu_shell_button_press (GtkWidget *widget, menu_shell->active = TRUE; } menu_shell->button = event->button; - + menu_item = gtk_get_event_widget ((GdkEvent*) event); if (!GTK_WIDGET_IS_SENSITIVE (menu_item)) @@ -350,8 +350,9 @@ gtk_menu_shell_button_release (GtkWidget *widget, menu_shell = GTK_MENU_SHELL (widget); if (menu_shell->active) { - if (event->button != menu_shell->button) + if (menu_shell->button && (event->button != menu_shell->button)) { + menu_shell->button = 0; if (menu_shell->parent_menu_shell) gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent*) event); return TRUE; |