From f8ab34e6062806d3c028a4b6068b64dc38066254 Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Wed, 22 Nov 2000 01:00:26 +0000 Subject: [PATCH] GdkEventButton->button can occupy significantly more than 2 bits. Besides, * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly more than 2 bits. Besides, I need to implement an evil hack. :) --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkmenushell.h | 6 +++--- 8 files changed, 31 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80f3da19ee..bb61dcb770 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-11-21 Elliot Lee + * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly + more than 2 bits. Besides, I need to implement an evil hack. :) + Tue Nov 21 14:17:51 GMT 2000 Tony Gale * docs/tutorial/gtk-tut.sgml: minor corrections diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 80f3da19ee..bb61dcb770 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2000-11-21 Elliot Lee + * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly + more than 2 bits. Besides, I need to implement an evil hack. :) + Tue Nov 21 14:17:51 GMT 2000 Tony Gale * docs/tutorial/gtk-tut.sgml: minor corrections diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 80f3da19ee..bb61dcb770 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2000-11-21 Elliot Lee + * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly + more than 2 bits. Besides, I need to implement an evil hack. :) + Tue Nov 21 14:17:51 GMT 2000 Tony Gale * docs/tutorial/gtk-tut.sgml: minor corrections diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 80f3da19ee..bb61dcb770 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2000-11-21 Elliot Lee + * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly + more than 2 bits. Besides, I need to implement an evil hack. :) + Tue Nov 21 14:17:51 GMT 2000 Tony Gale * docs/tutorial/gtk-tut.sgml: minor corrections diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 80f3da19ee..bb61dcb770 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2000-11-21 Elliot Lee + * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly + more than 2 bits. Besides, I need to implement an evil hack. :) + Tue Nov 21 14:17:51 GMT 2000 Tony Gale * docs/tutorial/gtk-tut.sgml: minor corrections diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 80f3da19ee..bb61dcb770 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2000-11-21 Elliot Lee + * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly + more than 2 bits. Besides, I need to implement an evil hack. :) + Tue Nov 21 14:17:51 GMT 2000 Tony Gale * docs/tutorial/gtk-tut.sgml: minor corrections diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 80f3da19ee..bb61dcb770 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2000-11-21 Elliot Lee + * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly + more than 2 bits. Besides, I need to implement an evil hack. :) + Tue Nov 21 14:17:51 GMT 2000 Tony Gale * docs/tutorial/gtk-tut.sgml: minor corrections diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h index 15aafc6d80..3d09f7fbc9 100644 --- a/gtk/gtkmenushell.h +++ b/gtk/gtkmenushell.h @@ -56,15 +56,15 @@ struct _GtkMenuShell GtkWidget *active_menu_item; GtkWidget *parent_menu_shell; + guint button; + guint32 activate_time; + guint active : 1; guint have_grab : 1; guint have_xgrab : 1; - guint button : 2; guint ignore_leave : 1; guint menu_flag : 1; guint ignore_enter : 1; - - guint32 activate_time; }; struct _GtkMenuShellClass