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

don't cast a NULL pointer.

Browse Source 
Sun Mar 15 08:27:06 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtkmenu.c (gtk_menu_key_press): don't cast a NULL pointer.
This commit is contained in:
Tim Janik
1998-03-15 07:33:13 +00:00
committed by Tim Janik
parent bfc969f697
commit 9addd8da2c
10 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkmenu.c
View File

@ -736,8 +736,6 @@ gtk_menu_key_press (GtkWidget *widget,
{
GtkAllocation allocation;
GtkAcceleratorTable *table;
GtkMenuShell *menu_shell;
GtkMenuItem *menu_item;
gchar *signame;
int delete;
@ -750,11 +748,16 @@ gtk_menu_key_press (GtkWidget *widget,
if (delete || ((event->keyval >= 0x20) && (event->keyval <= 0xFF)))
{
menu_shell = GTK_MENU_SHELL (widget);
menu_item = GTK_MENU_ITEM (menu_shell->active_menu_item);
GtkMenuShell *menu_shell;
if (menu_item && GTK_BIN (menu_item)->child)
menu_shell = GTK_MENU_SHELL (widget);
if (menu_shell->active_menu_item && GTK_BIN (menu_shell->active_menu_item)->child)
{
GtkMenuItem *menu_item;
menu_item = GTK_MENU_ITEM (menu_shell->active_menu_item);
/* block resizes */
gtk_container_block_resize (GTK_CONTAINER (widget));