From: Tim Janik Date: Wed, 13 Jan 1999 20:36:23 +0000 (+0000) Subject: in comparisions with GTK_TYPE_STRING, use the fundamental type to catch X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=52a441445ccbc226ed39813d35c34694f91aa731;p=~andy%2Fgtk in comparisions with GTK_TYPE_STRING, use the fundamental type to catch Wed Jan 13 20:14:32 1999 Tim Janik * 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 . --- diff --git a/ChangeLog b/ChangeLog index 58d92d6bc..a4deec829 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Wed Jan 13 20:14:32 1999 Tim Janik + + * 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 . + Wed Jan 13 13:28:00 1999 Tim Janik * gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 58d92d6bc..a4deec829 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +Wed Jan 13 20:14:32 1999 Tim Janik + + * 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 . + Wed Jan 13 13:28:00 1999 Tim Janik * gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 58d92d6bc..a4deec829 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Wed Jan 13 20:14:32 1999 Tim Janik + + * 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 . + Wed Jan 13 13:28:00 1999 Tim Janik * gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 58d92d6bc..a4deec829 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Wed Jan 13 20:14:32 1999 Tim Janik + + * 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 . + Wed Jan 13 13:28:00 1999 Tim Janik * gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 58d92d6bc..a4deec829 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Wed Jan 13 20:14:32 1999 Tim Janik + + * 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 . + Wed Jan 13 13:28:00 1999 Tim Janik * gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 58d92d6bc..a4deec829 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Wed Jan 13 20:14:32 1999 Tim Janik + + * 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 . + Wed Jan 13 13:28:00 1999 Tim Janik * gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 58d92d6bc..a4deec829 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Wed Jan 13 20:14:32 1999 Tim Janik + + * 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 . + Wed Jan 13 13:28:00 1999 Tim Janik * gtk/gtkwidget.c: eliminate queue_clears or queue_draws where we know diff --git a/gtk/gtkarg.c b/gtk/gtkarg.c index ff543e63c..15c0501d8 100644 --- a/gtk/gtkarg.c +++ b/gtk/gtkarg.c @@ -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; diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 0f6555d1b..7583ea71f 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -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,