diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-03-03 18:39:33 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-03-03 18:39:33 +0000 |
| commit | bcb6720d6ef761d71a4ac30438f4b1ab39ef3c41 (patch) | |
| tree | 90b444581d45a492d845d85dd608c0e6f32c41a8 /gtk | |
| parent | efefd9f0bab3c57494a55b0418b5d488f0dae64b (diff) | |
| download | gtk+-bcb6720d6ef761d71a4ac30438f4b1ab39ef3c41.tar.gz | |
Remove spurious const.
Sat Mar 3 13:32:47 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimmodule.c (gtk_im_module_init): Remove spurious
const.
* gdk-pixbuf-2.0.pc.in gtk+-2.0.pc.in: Fix include path.
* gtk/gtkdialog.c (gtk_dialog_set_default_response): If there
is no focus widget for the dialog currently, grab the focus as well
as the default.
* gtk/gtkdialog.c (gtk_dialog_set_default_response): Get
the action area's children to iterate through, not the
dialog's children.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkdialog.c | 11 | ||||
| -rw-r--r-- | gtk/gtkimmodule.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 0f13d57a4e..cdacccaf49 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -511,7 +511,7 @@ gtk_dialog_set_default_response (GtkDialog *dialog, GList *children; GList *tmp_list; - children = gtk_container_children (GTK_CONTAINER (dialog)); + children = gtk_container_children (GTK_CONTAINER (dialog->action_area)); tmp_list = children; while (tmp_list != NULL) @@ -521,8 +521,13 @@ gtk_dialog_set_default_response (GtkDialog *dialog, "gtk-dialog-response-data"); if (rd && rd->response_id == response_id) - gtk_widget_grab_default (widget); - + { + gtk_widget_grab_default (widget); + + if (!GTK_WINDOW (dialog)->focus_widget) + gtk_widget_grab_focus (widget); + } + tmp_list = g_list_next (tmp_list); } diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index 017f7ecfb0..7d882a293e 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -227,7 +227,7 @@ gtk_im_module_init () { GString *line_buf = g_string_new (NULL); GString *tmp_buf = g_string_new (NULL); - const gchar *filename = gtk_rc_get_im_module_file(); + gchar *filename = gtk_rc_get_im_module_file(); FILE *file; gboolean have_error = FALSE; |