diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-03-11 19:07:45 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-03-11 19:07:45 +0000 |
| commit | b5ddc23be3da6b3fc8a931236f71a6c775744559 (patch) | |
| tree | 9844ab9c1c9e7d95abc3c61a4185932348440f91 /gtk/gtkmessagedialog.c | |
| parent | b35220fda0525f0876f11b26803a4a03a267b61e (diff) | |
| download | gtk+-b5ddc23be3da6b3fc8a931236f71a6c775744559.tar.gz | |
Back out the put-labels-into-the-standard-focus-chain patches from bug
Thu Mar 11 13:58:24 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmessagedialog.c gtk/gtklabel.c: Back out the
put-labels-into-the-standard-focus-chain patches
from bug #59707.
* gtk/gtklabel.c (gtk_label_focus): Only put the
label in the tab chain when the control key is pressed.
Diffstat (limited to 'gtk/gtkmessagedialog.c')
| -rw-r--r-- | gtk/gtkmessagedialog.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index 06a6ee187b..34a0844356 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -36,8 +36,6 @@ static void gtk_message_dialog_class_init (GtkMessageDialogClass *klass); static void gtk_message_dialog_init (GtkMessageDialog *dialog); - -static void gtk_message_dialog_map (GtkWidget *widget); static void gtk_message_dialog_style_set (GtkWidget *widget, GtkStyle *prev_style); @@ -99,7 +97,6 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class) parent_class = g_type_class_peek_parent (class); - widget_class->map = gtk_message_dialog_map; widget_class->style_set = gtk_message_dialog_style_set; gobject_class->set_property = gtk_message_dialog_set_property; @@ -516,44 +513,6 @@ gtk_message_dialog_add_buttons (GtkMessageDialog* message_dialog, } static void -gtk_message_dialog_map (GtkWidget *widget) -{ - GtkWindow *window; - - window = GTK_WINDOW (widget); - - /* If a default button has not been chosen, then the selectable label will get - * the focus. This looks bad, so give the focus to a button in this case. - */ - - if (!gtk_window_get_focus (window)) - { - GtkWidget *focus_widget; - - if (window->default_widget) - focus_widget = window->default_widget; - else - { - GList *children; - - children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (widget)->action_area)); - - if (children) - focus_widget = GTK_WIDGET (children->data); - else - focus_widget = NULL; - - g_list_free (children); - } - - if (focus_widget) - gtk_widget_grab_focus (focus_widget); - } - - GTK_WIDGET_CLASS (parent_class)->map (widget); -} - -static void gtk_message_dialog_style_set (GtkWidget *widget, GtkStyle *prev_style) { |