callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

in comparisions with GTK_TYPE_STRING, use the fundamental type to catch

Browse Source 
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:
Tim Janik
1999-01-13 20:36:23 +00:00
committed by Tim Janik
parent aca733c310
commit 52a441445c
9 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkmenushell.c
View File

@ -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,