summaryrefslogtreecommitdiff
path: root/gtk/gtkcontainer.c
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-12-03 06:52:48 +0000
committerTim Janik <timj@src.gnome.org>1998-12-03 06:52:48 +0000
commit1ec6733573ac3d0ff8d7359f25adc45fb0f42376 (patch)
tree91f413467b168e8f8e29298888726fbbb429634e /gtk/gtkcontainer.c
parent7cc3040412061f147c21c3c701bd211458029f9d (diff)
downloadgtk+-1ec6733573ac3d0ff8d7359f25adc45fb0f42376.tar.gz
moved checks upon focus setting from gtk_window_real_set_focus to
Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org> * gtk/gtkwindow.c: moved checks upon focus setting from gtk_window_real_set_focus to gtk_window_set_focus, so we don't emit the signal if unneccessary. * gtk/gtkwidget.c (gtk_widget_grab_focus): clear up the old focus containers when grabbing focus on a new widget. this is based on a patch from Alexis Mikhailov, submitted to gtk-list on 4 Nov 1998. * gtk/gtkclist.c (gtk_clist_focus_out): set CLIST_CHILD_HAS_FOCUS flag, so we take the buttons into consideration upon the next focus request. * gtk/gtkcontainer.c (gtk_container_set_focus_child): fixed an assertment.
Diffstat (limited to 'gtk/gtkcontainer.c')
-rw-r--r--gtk/gtkcontainer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index b42358b2f9..ceb0e83b31 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1206,13 +1206,13 @@ gtk_container_focus (GtkContainer *container,
}
void
-gtk_container_set_focus_child (GtkContainer *container,
- GtkWidget *widget)
+gtk_container_set_focus_child (GtkContainer *container,
+ GtkWidget *widget)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
if (widget)
- g_return_if_fail (GTK_IS_WIDGET (container));
+ g_return_if_fail (GTK_IS_WIDGET (widget));
gtk_signal_emit (GTK_OBJECT (container), container_signals[SET_FOCUS_CHILD], widget);
}