diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-02-06 09:53:34 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-02-06 09:53:34 +0000 |
| commit | e7355f82c2409f545210a8738bab262548f75e69 (patch) | |
| tree | cf5729a1d44df53056bb9e67b355bd791994fb0f /gtk/gtkmain.c | |
| parent | 0f1958e355b3c9948f0f1de4487c9a4ac57bda6f (diff) | |
| download | gtk+-e7355f82c2409f545210a8738bab262548f75e69.tar.gz | |
gtk/gtkcontainer.c gtk/gtkexpander.c gtk/gtkframe.c gtk/gtklabel.c
2008-02-06 Michael Natterer <mitch@imendio.com>
* gtk/gtkcontainer.c
* gtk/gtkexpander.c
* gtk/gtkframe.c
* gtk/gtklabel.c
* gtk/gtkmain.c
* gtk/gtkmenu.c
* gtk/gtkmenuitem.c
* gtk/gtkmenushell.c
* gtk/gtknotebook.c
* gtk/gtkseparatortoolitem.c
* gtk/gtksocket.c
* gtk/gtktextlayout.c
* gtk/gtktoggletoolbutton.c
* gtk/gtktoolbutton.c
* gtk/gtktoolitem.c
* gtk/gtktree.c
* gtk/gtktreeitem.c: replace "foo && GTK_IS_FOO (foo)" by simply
"GTK_IS_FOO (foo)".
svn path=/trunk/; revision=19481
Diffstat (limited to 'gtk/gtkmain.c')
| -rw-r--r-- | gtk/gtkmain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index b09afc3c3f..6749252c10 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1636,7 +1636,7 @@ gtk_main_get_window_group (GtkWidget *widget) if (widget) toplevel = gtk_widget_get_toplevel (widget); - if (toplevel && GTK_IS_WINDOW (toplevel)) + if (GTK_IS_WINDOW (toplevel)) return gtk_window_get_group (GTK_WINDOW (toplevel)); else return gtk_window_get_group (NULL); @@ -2293,7 +2293,7 @@ gtk_propagate_event (GtkWidget *widget, GtkWidget *window; window = gtk_widget_get_toplevel (widget); - if (window && GTK_IS_WINDOW (window)) + if (GTK_IS_WINDOW (window)) { /* If there is a grab within the window, give the grab widget * a first crack at the key event @@ -2304,7 +2304,7 @@ gtk_propagate_event (GtkWidget *widget, if (!handled_event) { window = gtk_widget_get_toplevel (widget); - if (window && GTK_IS_WINDOW (window)) + if (GTK_IS_WINDOW (window)) { if (GTK_WIDGET_IS_SENSITIVE (window)) gtk_widget_event (window, event); |