Mercurial > hg > forks > geeqie
changeset 1962:29edd07d1855
Use setWidgetCanDefault() and prevent GTK deprecated warnings.
author | Laurent Monin <zas@norz.org> |
---|---|
date | Sat, 22 Jan 2011 11:32:07 +0100 |
parents | 7b46990710a1 |
children | 98bc67f15914 |
files | src/desktop_file.c src/layout.c src/preferences.c src/ui_help.c src/ui_utildlg.c |
diffstat | 5 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/desktop_file.c Sat Jan 22 11:22:27 2011 +0100 +++ b/src/desktop_file.c Sat Jan 22 11:32:07 2011 +0100 @@ -217,7 +217,7 @@ ew->save_button = pref_button_new(NULL, GTK_STOCK_SAVE, NULL, FALSE, G_CALLBACK(editor_window_save_cb), ew); gtk_container_add(GTK_CONTAINER(button_hbox), ew->save_button); - GTK_WIDGET_SET_FLAGS(ew->save_button, GTK_CAN_DEFAULT); + setWidgetCanDefault(ew->save_button, TRUE); gtk_widget_set_sensitive(ew->save_button, FALSE); gtk_widget_show(ew->save_button); ct_button = ew->save_button; @@ -225,7 +225,7 @@ button = pref_button_new(NULL, GTK_STOCK_CLOSE, NULL, FALSE, G_CALLBACK(editor_window_close_cb), ew); gtk_container_add(GTK_CONTAINER(button_hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_show(button); if (!generic_dialog_get_alternative_button_order(ew->window)) @@ -472,13 +472,13 @@ button = pref_button_new(NULL, GTK_STOCK_NEW, NULL, FALSE, G_CALLBACK(editor_list_window_new_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_show(button); button = pref_button_new(NULL, GTK_STOCK_EDIT, NULL, FALSE, G_CALLBACK(editor_list_window_edit_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_set_sensitive(button, FALSE); gtk_widget_show(button); ewl->edit_button = button; @@ -486,7 +486,7 @@ button = pref_button_new(NULL, GTK_STOCK_DELETE, NULL, FALSE, G_CALLBACK(editor_list_window_delete_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_set_sensitive(button, FALSE); gtk_widget_show(button); ewl->delete_button = button; @@ -494,7 +494,7 @@ button = pref_button_new(NULL, GTK_STOCK_CLOSE, NULL, FALSE, G_CALLBACK(editor_list_window_close_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_show(button); scrolled = gtk_scrolled_window_new(NULL, NULL);
--- a/src/layout.c Sat Jan 22 11:22:27 2011 +0100 +++ b/src/layout.c Sat Jan 22 11:32:07 2011 +0100 @@ -1902,7 +1902,7 @@ button = pref_button_new(NULL, GTK_STOCK_SAVE, NULL, FALSE, G_CALLBACK(layout_config_save_cb), NULL); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_show(button); */ button = pref_button_new(NULL, GTK_STOCK_APPLY, NULL, FALSE,
--- a/src/preferences.c Sat Jan 22 11:22:27 2011 +0100 +++ b/src/preferences.c Sat Jan 22 11:32:07 2011 +0100 @@ -2268,7 +2268,7 @@ button = pref_button_new(NULL, GTK_STOCK_OK, NULL, FALSE, G_CALLBACK(config_window_ok_cb), NULL); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show(button); @@ -2277,19 +2277,19 @@ button = pref_button_new(NULL, GTK_STOCK_SAVE, NULL, FALSE, G_CALLBACK(config_window_save_cb), NULL); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_show(button); button = pref_button_new(NULL, GTK_STOCK_APPLY, NULL, FALSE, G_CALLBACK(config_window_apply_cb), NULL); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_show(button); button = pref_button_new(NULL, GTK_STOCK_CANCEL, NULL, FALSE, G_CALLBACK(config_window_close_cb), NULL); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_show(button); if (!generic_dialog_get_alternative_button_order(configwindow)) @@ -2417,13 +2417,13 @@ button = pref_button_new(NULL, NULL, _("Credits..."), FALSE, G_CALLBACK(about_credits_cb), NULL); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_show(button); button = pref_button_new(NULL, GTK_STOCK_CLOSE, NULL, FALSE, G_CALLBACK(about_window_close), NULL); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show(button);
--- a/src/ui_help.c Sat Jan 22 11:22:27 2011 +0100 +++ b/src/ui_help.c Sat Jan 22 11:32:07 2011 +0100 @@ -249,7 +249,7 @@ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(help_window_close), window); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show(button);
--- a/src/ui_utildlg.c Sat Jan 22 11:22:27 2011 +0100 +++ b/src/ui_utildlg.c Sat Jan 22 11:32:07 2011 +0100 @@ -150,7 +150,7 @@ button = pref_button_new(NULL, stock_id, text, FALSE, G_CALLBACK(generic_dialog_click_cb), gd); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + setWidgetCanDefault(button, TRUE); g_object_set_data(G_OBJECT(button), "dialog_function", func_cb); gtk_container_add(GTK_CONTAINER(gd->hbox), button);