diff options
| author | Michael Natterer <mitch@imendio.com> | 2007-04-02 16:32:22 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2007-04-02 16:32:22 +0000 |
| commit | d7c5a3010a98a5f2cf3190f8cd98c8cab2af94fc (patch) | |
| tree | 1440caf04001d66fafcc4330955cf22b024ea31e /gtk/gtkmenushell.c | |
| parent | c524f988bf8e6217fc7c22be1f4784ce00daee55 (diff) | |
| download | gtk+-d7c5a3010a98a5f2cf3190f8cd98c8cab2af94fc.tar.gz | |
remove artifact from the time when type checking casts warned on NULL,
2007-04-02 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): remove
artifact from the time when type checking casts warned on NULL,
some whitespace cleanup.
svn path=/trunk/; revision=17578
Diffstat (limited to 'gtk/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 74596ec96c..9862b5b64f 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -1195,16 +1195,16 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, case GTK_MENU_DIR_PARENT: if (parent_menu_shell) { - if (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement == - GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement) + if (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement == + GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement) gtk_menu_shell_deselect (menu_shell); - else + else { if (PACK_DIRECTION (parent_menu_shell) == GTK_PACK_DIRECTION_LTR) gtk_menu_shell_move_selected (parent_menu_shell, -1); else gtk_menu_shell_move_selected (parent_menu_shell, 1); - gtk_menu_shell_select_submenu_first (parent_menu_shell); + gtk_menu_shell_select_submenu_first (parent_menu_shell); } } /* If there is no parent and the submenu is in the opposite direction @@ -1222,7 +1222,7 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, _gtk_menu_shell_select_last (submenu, TRUE); } break; - + case GTK_MENU_DIR_CHILD: if (menu_shell->active_menu_item && _gtk_menu_item_is_selectable (menu_shell->active_menu_item) && @@ -1233,18 +1233,13 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, } /* Try to find a menu running the opposite direction */ - while (parent_menu_shell && + while (parent_menu_shell && (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement == GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement)) { - GtkWidget *tmp_widget = parent_menu_shell->parent_menu_shell; - - if (tmp_widget) - parent_menu_shell = GTK_MENU_SHELL (tmp_widget); - else - parent_menu_shell = NULL; + parent_menu_shell = GTK_MENU_SHELL (parent_menu_shell->parent_menu_shell); } - + if (parent_menu_shell) { if (PACK_DIRECTION (parent_menu_shell) == GTK_PACK_DIRECTION_LTR) @@ -1255,7 +1250,7 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, gtk_menu_shell_select_submenu_first (parent_menu_shell); } break; - + case GTK_MENU_DIR_PREV: gtk_menu_shell_move_selected (menu_shell, -1); if (!had_selection && @@ -1263,6 +1258,7 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, menu_shell->children) _gtk_menu_shell_select_last (menu_shell, TRUE); break; + case GTK_MENU_DIR_NEXT: gtk_menu_shell_move_selected (menu_shell, 1); if (!had_selection && |