changeset 1963:98bc67f15914

Use setWidgetCanFocus() and prevent GTK deprecated warnings.
author Laurent Monin <zas@norz.org>
date Sat, 22 Jan 2011 11:33:54 +0100
parents 29edd07d1855
children 47b2a4ce3894
files src/cache_maint.c src/layout_config.c src/preferences.c src/ui_tabcomp.c
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/cache_maint.c	Sat Jan 22 11:32:07 2011 +0100
+++ b/src/cache_maint.c	Sat Jan 22 11:33:54 2011 +0100
@@ -338,7 +338,7 @@
 	gtk_widget_show(hbox);
 
 	cm->entry = gtk_entry_new();
-	GTK_WIDGET_UNSET_FLAGS(cm->entry, GTK_CAN_FOCUS);
+	setWidgetCanFocus(cm->entry, FALSE);
 	gtk_editable_set_editable(GTK_EDITABLE(cm->entry), FALSE);
 	gtk_box_pack_start(GTK_BOX(hbox), cm->entry, TRUE, TRUE, 0);
 	gtk_widget_show(cm->entry);
@@ -910,7 +910,7 @@
 	hbox = pref_box_new(cd->gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
 
 	cd->progress = gtk_entry_new();
-	GTK_WIDGET_UNSET_FLAGS(cd->progress, GTK_CAN_FOCUS);
+	setWidgetCanFocus(cd->progress, FALSE);
 	gtk_editable_set_editable(GTK_EDITABLE(cd->progress), FALSE);
 	gtk_entry_set_text(GTK_ENTRY(cd->progress), _("click start to begin"));
 	gtk_box_pack_start(GTK_BOX(hbox), cd->progress, TRUE, TRUE, 0);
--- a/src/layout_config.c	Sat Jan 22 11:32:07 2011 +0100
+++ b/src/layout_config.c	Sat Jan 22 11:33:54 2011 +0100
@@ -222,7 +222,7 @@
 
 	button = gtk_button_new_with_label(text);
 	gtk_widget_set_sensitive(button, FALSE);
-	GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
+	setWidgetCanFocus(button, FALSE);
 	gtk_table_attach_defaults(GTK_TABLE(table), button, x1, x2, y1, y2);
 	gtk_widget_show(button);
 }
--- a/src/preferences.c	Sat Jan 22 11:32:07 2011 +0100
+++ b/src/preferences.c	Sat Jan 22 11:33:54 2011 +0100
@@ -961,7 +961,7 @@
 				    _("This will remove the trash contents."));
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, safe_delete_clear_ok_cb, TRUE);
 	entry = gtk_entry_new();
-	GTK_WIDGET_UNSET_FLAGS(entry, GTK_CAN_FOCUS);
+	setWidgetCanFocus(entry, FALSE);
 	gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
 	if (options->file_ops.safe_delete_path) gtk_entry_set_text(GTK_ENTRY(entry), options->file_ops.safe_delete_path);
 	gtk_box_pack_start(GTK_BOX(gd->vbox), entry, FALSE, FALSE, 0);
--- a/src/ui_tabcomp.c	Sat Jan 22 11:32:07 2011 +0100
+++ b/src/ui_tabcomp.c	Sat Jan 22 11:33:54 2011 +0100
@@ -688,7 +688,7 @@
 	GdkPixbuf *pixbuf;
 
 	button = gtk_button_new();
-	GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
+	setWidgetCanFocus(button, FALSE);
 	g_signal_connect(G_OBJECT(button), "size_allocate",
 			 G_CALLBACK(tab_completion_button_size_allocate), parent);
 	g_signal_connect(G_OBJECT(button), "clicked",