mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-11 11:20:12 +00:00
in comparisions with GTK_TYPE_STRING, use the fundamental type to catch
Wed Jan 13 20:14:32 1999 Tim Janik <timj@gtk.org> * gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use the fundamental type to catch GTK_TYPE_IDENTIFIER as well. * gtk/gtkmenushell.c: (gtk_real_menu_shell_activate_current): (gtk_menu_shell_button_release): asure that we only activate sensitive menu items, reported by Dave Cole <dave@dccs.com.au>.
This commit is contained in:
parent
aca733c310
commit
52a441445c
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
Wed Jan 13 20:14:32 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use
|
||||
the fundamental type to catch GTK_TYPE_IDENTIFIER as well.
|
||||
|
||||
* gtk/gtkmenushell.c:
|
||||
(gtk_real_menu_shell_activate_current):
|
||||
(gtk_menu_shell_button_release): asure that we only activate sensitive
|
||||
menu items, reported by Dave Cole <dave@dccs.com.au>.
|
||||
|
||||
Wed Jan 13 13:28:00 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Jan 13 20:14:32 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use
|
||||
the fundamental type to catch GTK_TYPE_IDENTIFIER as well.
|
||||
|
||||
* gtk/gtkmenushell.c:
|
||||
(gtk_real_menu_shell_activate_current):
|
||||
(gtk_menu_shell_button_release): asure that we only activate sensitive
|
||||
menu items, reported by Dave Cole <dave@dccs.com.au>.
|
||||
|
||||
Wed Jan 13 13:28:00 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Jan 13 20:14:32 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use
|
||||
the fundamental type to catch GTK_TYPE_IDENTIFIER as well.
|
||||
|
||||
* gtk/gtkmenushell.c:
|
||||
(gtk_real_menu_shell_activate_current):
|
||||
(gtk_menu_shell_button_release): asure that we only activate sensitive
|
||||
menu items, reported by Dave Cole <dave@dccs.com.au>.
|
||||
|
||||
Wed Jan 13 13:28:00 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Jan 13 20:14:32 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use
|
||||
the fundamental type to catch GTK_TYPE_IDENTIFIER as well.
|
||||
|
||||
* gtk/gtkmenushell.c:
|
||||
(gtk_real_menu_shell_activate_current):
|
||||
(gtk_menu_shell_button_release): asure that we only activate sensitive
|
||||
menu items, reported by Dave Cole <dave@dccs.com.au>.
|
||||
|
||||
Wed Jan 13 13:28:00 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Jan 13 20:14:32 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use
|
||||
the fundamental type to catch GTK_TYPE_IDENTIFIER as well.
|
||||
|
||||
* gtk/gtkmenushell.c:
|
||||
(gtk_real_menu_shell_activate_current):
|
||||
(gtk_menu_shell_button_release): asure that we only activate sensitive
|
||||
menu items, reported by Dave Cole <dave@dccs.com.au>.
|
||||
|
||||
Wed Jan 13 13:28:00 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Jan 13 20:14:32 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use
|
||||
the fundamental type to catch GTK_TYPE_IDENTIFIER as well.
|
||||
|
||||
* gtk/gtkmenushell.c:
|
||||
(gtk_real_menu_shell_activate_current):
|
||||
(gtk_menu_shell_button_release): asure that we only activate sensitive
|
||||
menu items, reported by Dave Cole <dave@dccs.com.au>.
|
||||
|
||||
Wed Jan 13 13:28:00 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Jan 13 20:14:32 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use
|
||||
the fundamental type to catch GTK_TYPE_IDENTIFIER as well.
|
||||
|
||||
* gtk/gtkmenushell.c:
|
||||
(gtk_real_menu_shell_activate_current):
|
||||
(gtk_menu_shell_button_release): asure that we only activate sensitive
|
||||
menu items, reported by Dave Cole <dave@dccs.com.au>.
|
||||
|
||||
Wed Jan 13 13:28:00 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know
|
||||
|
@ -407,7 +407,7 @@ gtk_arg_copy (GtkArg *src_arg,
|
||||
dest_arg->type = src_arg->type;
|
||||
dest_arg->d = src_arg->d;
|
||||
|
||||
if (src_arg->type == GTK_TYPE_STRING)
|
||||
if (GTK_FUNDAMENTAL_TYPE (src_arg->type) == GTK_TYPE_STRING)
|
||||
GTK_VALUE_STRING (*dest_arg) = g_strdup (GTK_VALUE_STRING (*src_arg));
|
||||
|
||||
return dest_arg;
|
||||
|
@ -506,7 +506,8 @@ gtk_menu_shell_button_release (GtkWidget *widget,
|
||||
|
||||
if ((event->time - menu_shell->activate_time) > MENU_SHELL_TIMEOUT)
|
||||
{
|
||||
if (menu_item && (menu_shell->active_menu_item == menu_item))
|
||||
if (menu_item && (menu_shell->active_menu_item == menu_item) &&
|
||||
GTK_WIDGET_IS_SENSITIVE (menu_item))
|
||||
{
|
||||
if (GTK_MENU_ITEM (menu_item)->submenu == NULL)
|
||||
{
|
||||
@ -968,6 +969,7 @@ gtk_real_menu_shell_activate_current (GtkMenuShell *menu_shell,
|
||||
gboolean force_hide)
|
||||
{
|
||||
if (menu_shell->active_menu_item &&
|
||||
GTK_WIDGET_IS_SENSITIVE (menu_shell->active_menu_item) &&
|
||||
GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu == NULL)
|
||||
{
|
||||
gtk_menu_shell_activate_item (menu_shell,
|
||||
|
Loading…
Reference in New Issue
Block a user