commit 51f73a8b49fff558474ab73c2324ce8cfa7fa93b
parent 59309a6501a767ea3b20954d781aae1cfb7d14a9
Author: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Date: Wed, 8 Nov 2017 20:12:29 +0100
Drop no longer used gtk+2 utility functions
With requiring gtk+2 >=2.24 the following functions are obsolete:
gtkut_widget_set_mapped
gtkut_widget_set_realized
gtkut_widget_set_can_default
gtkut_widget_set_receives_default
gtkut_widget_set_can_focus
gtkut_widget_set_has_window
Replace all occurrences with the underlying function.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Diffstat:
28 files changed, 76 insertions(+), 116 deletions(-)
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -1009,7 +1009,7 @@ static void addressbook_create(void)
/* Address index */
ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
- gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[0].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(ctree)->column[0].button, FALSE);
gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
@@ -1087,7 +1087,7 @@ static void addressbook_create(void)
G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
for (i = 0; i < N_LIST_COLS; i++)
- gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button,
+ gtk_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button,
FALSE);
g_signal_connect(G_OBJECT(clist), "tree_select_row",
@@ -1158,18 +1158,18 @@ static void addressbook_create(void)
gtkut_stock_button_add_help(hbbox, &help_btn);
edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
- gtkut_widget_set_can_default(edit_btn, TRUE);
+ gtk_widget_set_can_default(edit_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
- gtkut_widget_set_can_default(del_btn, TRUE);
+ gtk_widget_set_can_default(del_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), del_btn, TRUE, TRUE, 0);
reg_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
- gtkut_widget_set_can_default(reg_btn, TRUE);
+ gtk_widget_set_can_default(reg_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), reg_btn, TRUE, TRUE, 0);
lup_btn = gtk_button_new_from_stock(GTK_STOCK_FIND);
- gtkut_widget_set_can_default(lup_btn, TRUE);
+ gtk_widget_set_can_default(lup_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(help_btn), "clicked",
@@ -1187,19 +1187,19 @@ static void addressbook_create(void)
to_btn = gtk_button_new_with_label
(prefs_common_translated_header_name("To:"));
- gtkut_widget_set_can_default(to_btn, TRUE);
+ gtk_widget_set_can_default(to_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), to_btn, TRUE, TRUE, 0);
cc_btn = gtk_button_new_with_label
(prefs_common_translated_header_name("Cc:"));
- gtkut_widget_set_can_default(cc_btn, TRUE);
+ gtk_widget_set_can_default(cc_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), cc_btn, TRUE, TRUE, 0);
bcc_btn = gtk_button_new_with_label
(prefs_common_translated_header_name("Bcc:"));
- gtkut_widget_set_can_default(bcc_btn, TRUE);
+ gtk_widget_set_can_default(bcc_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtkut_widget_set_can_default(close_btn, TRUE);
+ gtk_widget_set_can_default(close_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), close_btn, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(to_btn), "clicked",
diff --git a/src/addrgather.c b/src/addrgather.c
@@ -475,7 +475,7 @@ static void addrgather_page_finish( gint pageNum, gchar *pageLbl ) {
GTK_CMCLIST(clistCount), FIELD_COL_COUNT, FIELDS_COL_WIDTH_COUNT );
for( i = 0; i < FIELDS_N_COLS; i++ )
- gtkut_widget_set_can_focus(GTK_CMCLIST(clistCount)->column[i].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(clistCount)->column[i].button, FALSE);
addrgather_dlg.clistCount = clistCount;
}
diff --git a/src/alertpanel.c b/src/alertpanel.c
@@ -327,7 +327,7 @@ static void alertpanel_create(const gchar *title,
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtkut_widget_set_can_focus(label, FALSE);
+ gtk_widget_set_can_focus(label, FALSE);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
diff --git a/src/crash.c b/src/crash.c
@@ -251,17 +251,17 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
button3 = gtk_button_new_with_label(_("Close"));
gtk_widget_show(button3);
gtk_container_add(GTK_CONTAINER(hbuttonbox4), button3);
- gtkut_widget_set_can_default(button3, TRUE);
+ gtk_widget_set_can_default(button3, TRUE);
button4 = gtk_button_new_with_label(_("Save..."));
gtk_widget_show(button4);
gtk_container_add(GTK_CONTAINER(hbuttonbox4), button4);
- gtkut_widget_set_can_default(button4, TRUE);
+ gtk_widget_set_can_default(button4, TRUE);
button5 = gtk_button_new_with_label(_("Create bug report"));
gtk_widget_show(button5);
gtk_container_add(GTK_CONTAINER(hbuttonbox4), button5);
- gtkut_widget_set_can_default(button5, TRUE);
+ gtk_widget_set_can_default(button5, TRUE);
g_signal_connect(G_OBJECT(window1), "delete_event",
G_CALLBACK(gtk_main_quit), NULL);
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -1088,7 +1088,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
gtk_cmclist_set_column_width( GTK_CMCLIST(clist), EMAIL_COL_ALIAS, EMAIL_COL_WIDTH_ALIAS );
for( i = 0; i < EMAIL_N_COLS; i++ )
- gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button, FALSE);
/* Data entry area */
table = gtk_table_new( 4, 2, FALSE);
@@ -1298,7 +1298,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
gtk_cmclist_set_column_width( GTK_CMCLIST(clist), ATTRIB_COL_VALUE, ATTRIB_COL_WIDTH_VALUE );
for( i = 0; i < ATTRIB_N_COLS; i++ )
- gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button, FALSE);
/* Data entry area */
#ifndef GENERIC_UMPC
diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c
@@ -336,7 +336,7 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
gtk_cmclist_set_auto_sort(GTK_CMCLIST(clist), TRUE);
for (i = 0; i < ATTRIB_N_COLS; i++)
- gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button, FALSE);
/* Data entry area */
table = gtk_table_new(4, 2, FALSE);
diff --git a/src/editgroup.c b/src/editgroup.c
@@ -363,7 +363,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
gtk_cmclist_set_auto_sort( GTK_CMCLIST(clist_group), TRUE );
for( i = 0; i < GROUP_N_COLS; i++ )
- gtkut_widget_set_can_focus(GTK_CMCLIST(clist_group)->column[i].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(clist_group)->column[i].button, FALSE);
/* Available list */
vboxl = gtk_vbox_new( FALSE, 0 );
@@ -395,7 +395,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
gtk_cmclist_set_auto_sort( GTK_CMCLIST(clist_avail), TRUE );
for( i = 0; i < GROUP_N_COLS; i++ )
- gtkut_widget_set_can_focus(GTK_CMCLIST(clist_avail)->column[i].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(clist_avail)->column[i].button, FALSE);
/* Status line */
hsbox = gtk_hbox_new(FALSE, 0);
diff --git a/src/folderview.c b/src/folderview.c
@@ -473,7 +473,7 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
/* don't let title buttons take key focus */
for (i = 0; i < N_FOLDER_COLS; i++) {
- gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button, FALSE);
gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[i],
prefs_common.folder_col_size[i]);
gtk_cmclist_set_column_visibility
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
@@ -216,7 +216,7 @@ static void grouplist_dialog_create(void)
GTK_CMCTREE_EXPANDER_TRIANGLE);
for (i = 0; i < 3; i++)
- gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button, FALSE);
g_signal_connect(G_OBJECT(ctree), "button-press-event",
G_CALLBACK(button_press_cb), NULL);
diff --git a/src/gtk/gtkcmclist.c b/src/gtk/gtkcmclist.c
@@ -1127,8 +1127,8 @@ gtk_cmclist_init (GtkCMCList *clist)
{
clist->flags = 0;
- gtkut_widget_set_has_window (GTK_WIDGET(clist), TRUE);
- gtkut_widget_set_can_focus (GTK_WIDGET(clist), TRUE);
+ gtk_widget_set_has_window (GTK_WIDGET(clist), TRUE);
+ gtk_widget_set_can_focus (GTK_WIDGET(clist), TRUE);
GTK_CMCLIST_SET_FLAG (clist, CMCLIST_DRAW_DRAG_LINE);
GTK_CMCLIST_SET_FLAG (clist, CMCLIST_USE_DRAG_ICONS);
@@ -1490,7 +1490,7 @@ gtk_cmclist_column_title_active (GtkCMCList *clist,
g_signal_handlers_disconnect_matched(G_OBJECT (clist->column[column].button), G_SIGNAL_MATCH_FUNC,
0, 0, 0, column_title_passive_func, 0);
- gtkut_widget_set_can_focus (clist->column[column].button, TRUE);
+ gtk_widget_set_can_focus (clist->column[column].button, TRUE);
if (gtk_widget_get_visible (GTK_WIDGET(clist)))
gtk_widget_queue_draw (clist->column[column].button);
}
@@ -1526,7 +1526,7 @@ gtk_cmclist_column_title_passive (GtkCMCList *clist,
g_signal_connect (G_OBJECT (clist->column[column].button), "event",
G_CALLBACK(column_title_passive_func), NULL);
- gtkut_widget_set_can_focus (clist->column[column].button, FALSE);
+ gtk_widget_set_can_focus (clist->column[column].button, FALSE);
if (gtk_widget_get_visible (GTK_WIDGET(clist)))
gtk_widget_queue_draw (clist->column[column].button);
}
@@ -4614,7 +4614,7 @@ gtk_cmclist_realize (GtkWidget *widget)
clist = GTK_CMCLIST (widget);
- gtkut_widget_set_realized (widget, TRUE);
+ gtk_widget_set_realized (widget, TRUE);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
@@ -4771,7 +4771,7 @@ gtk_cmclist_unrealize (GtkWidget *widget)
if (gtk_widget_get_mapped (widget))
gtk_cmclist_unmap (widget);
- gtkut_widget_set_mapped (widget, FALSE);
+ gtk_widget_set_mapped (widget, FALSE);
/* detach optional row/cell styles */
if (gtk_widget_get_realized (widget))
@@ -4834,7 +4834,7 @@ gtk_cmclist_map (GtkWidget *widget)
if (!gtk_widget_get_mapped (widget))
{
- gtkut_widget_set_mapped (widget, TRUE);
+ gtk_widget_set_mapped (widget, TRUE);
/* map column buttons */
for (i = 0; i < clist->columns; i++)
@@ -4873,7 +4873,7 @@ gtk_cmclist_unmap (GtkWidget *widget)
if (gtk_widget_get_mapped (widget))
{
- gtkut_widget_set_mapped (widget, FALSE);
+ gtk_widget_set_mapped (widget, FALSE);
if (clist_has_grab (clist))
{
diff --git a/src/gtk/gtkcmoptionmenu.c b/src/gtk/gtkcmoptionmenu.c
@@ -183,9 +183,9 @@ gtk_cmoption_menu_child_type (GtkContainer *container)
static void
gtk_cmoption_menu_init (GtkCMOptionMenu *option_menu)
{
- gtkut_widget_set_can_focus (GTK_WIDGET(option_menu), TRUE);
- gtkut_widget_set_can_default (GTK_WIDGET(option_menu), FALSE);
- gtkut_widget_set_receives_default (GTK_WIDGET(option_menu), FALSE);
+ gtk_widget_set_can_focus (GTK_WIDGET(option_menu), TRUE);
+ gtk_widget_set_can_default (GTK_WIDGET(option_menu), FALSE);
+ gtk_widget_set_receives_default (GTK_WIDGET(option_menu), FALSE);
option_menu->menu = NULL;
option_menu->menu_item = NULL;
diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c
@@ -287,7 +287,7 @@ gtk_shruler_init (GtkSHRuler *ruler)
{
GtkSHRulerPrivate *priv = GTK_SHRULER_GET_PRIVATE (ruler);
- gtkut_widget_set_has_window (GTK_WIDGET (ruler), FALSE);
+ gtk_widget_set_has_window (GTK_WIDGET (ruler), FALSE);
priv->orientation = GTK_ORIENTATION_HORIZONTAL;
#if !GTK_CHECK_VERSION(3, 0, 0)
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
@@ -125,7 +125,7 @@ void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
*help_btn = gtk_button_new_from_stock(GTK_STOCK_HELP);
- gtkut_widget_set_can_default(*help_btn, TRUE);
+ gtk_widget_set_can_default(*help_btn, TRUE);
gtk_box_pack_end(GTK_BOX (bbox), *help_btn, TRUE, TRUE, 0);
gtk_button_box_set_child_secondary(GTK_BUTTON_BOX (bbox),
*help_btn, TRUE);
@@ -162,20 +162,20 @@ void gtkut_stock_button_set_create(GtkWidget **bbox,
gtk_box_set_spacing(GTK_BOX(*bbox), 5);
*button1 = gtk_button_new_from_stock(label1);
- gtkut_widget_set_can_default(*button1, TRUE);
+ gtk_widget_set_can_default(*button1, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
gtk_widget_show(*button1);
if (button2) {
*button2 = gtk_button_new_from_stock(label2);
- gtkut_widget_set_can_default(*button2, TRUE);
+ gtk_widget_set_can_default(*button2, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
gtk_widget_show(*button2);
}
if (button3) {
*button3 = gtk_button_new_from_stock(label3);
- gtkut_widget_set_can_default(*button3, TRUE);
+ gtk_widget_set_can_default(*button3, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
gtk_widget_show(*button3);
}
@@ -196,7 +196,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
*button1 = gtk_button_new_with_mnemonic(text1);
gtk_button_set_image(GTK_BUTTON(*button1),
gtk_image_new_from_stock(label1, GTK_ICON_SIZE_BUTTON));
- gtkut_widget_set_can_default(*button1, TRUE);
+ gtk_widget_set_can_default(*button1, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
gtk_widget_show(*button1);
@@ -204,7 +204,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
*button2 = gtk_button_new_with_mnemonic(text2);
gtk_button_set_image(GTK_BUTTON(*button2),
gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
- gtkut_widget_set_can_default(*button2, TRUE);
+ gtk_widget_set_can_default(*button2, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
gtk_widget_show(*button2);
}
@@ -213,7 +213,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
*button3 = gtk_button_new_with_mnemonic(text3);
gtk_button_set_image(GTK_BUTTON(*button3),
gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
- gtkut_widget_set_can_default(*button3, TRUE);
+ gtk_widget_set_can_default(*button3, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
gtk_widget_show(*button3);
}
@@ -1700,36 +1700,6 @@ claws_input_add (gint source,
return result;
}
-void gtkut_widget_set_mapped(GtkWidget *widget, gboolean mapped)
-{
- gtk_widget_set_mapped(widget, mapped);
-}
-
-void gtkut_widget_set_realized(GtkWidget *widget, gboolean realized)
-{
- gtk_widget_set_realized(widget, realized);
-}
-
-void gtkut_widget_set_can_default(GtkWidget *widget, gboolean can_default)
-{
- gtk_widget_set_can_default(widget, can_default);
-}
-
-void gtkut_widget_set_receives_default(GtkWidget *widget, gboolean receives_default)
-{
- gtk_widget_set_receives_default(widget, receives_default);
-}
-
-void gtkut_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
-{
- gtk_widget_set_can_focus(widget, can_focus);
-}
-
-void gtkut_widget_set_has_window(GtkWidget *widget, gboolean has_window)
-{
- gtk_widget_set_has_window(widget, has_window);
-}
-
/**
* Load a pixbuf fitting inside the specified size. EXIF orientation is
* respected if available.
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
@@ -140,14 +140,6 @@ void gtkut_widget_init (void);
void gtkut_widget_set_app_icon (GtkWidget *widget);
void gtkut_widget_set_composer_icon (GtkWidget *widget);
-void gtkut_widget_set_mapped (GtkWidget *widget, gboolean mapped);
-void gtkut_widget_set_realized (GtkWidget *widget, gboolean realized);
-void gtkut_widget_set_can_default (GtkWidget *widget, gboolean can_default);
-void gtkut_widget_set_receives_default (GtkWidget *widget, gboolean receives_default);
-void gtkut_widget_set_can_focus (GtkWidget *widget, gboolean can_focus);
-void gtkut_widget_set_has_window (GtkWidget *widget, gboolean has_window);
-
-
GtkWidget *gtkut_account_menu_new (GList *ac_list,
GCallback callback,
gpointer data);
diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c
@@ -158,8 +158,8 @@ static void gtk_vscrollbutton_init(GtkVScrollbutton *scrollbutton)
gtk_widget_show(arrow);
gtk_container_add(GTK_CONTAINER(scrollbutton->downbutton), arrow);
gtk_widget_set_size_request(scrollbutton->downbutton, -1, 16);
- gtkut_widget_set_can_focus(scrollbutton->upbutton, FALSE);
- gtkut_widget_set_can_focus(scrollbutton->downbutton, FALSE);
+ gtk_widget_set_can_focus(scrollbutton->upbutton, FALSE);
+ gtk_widget_set_can_focus(scrollbutton->downbutton, FALSE);
gtk_widget_show(scrollbutton->downbutton);
gtk_widget_show(scrollbutton->upbutton);
diff --git a/src/headerview.c b/src/headerview.c
@@ -100,11 +100,11 @@ HeaderView *headerview_create(void)
gtk_label_set_selectable(GTK_LABEL(subject_body_label), TRUE);
gtk_label_set_selectable(GTK_LABEL(tags_body_label), TRUE);
- gtkut_widget_set_can_focus(from_body_label, FALSE);
- gtkut_widget_set_can_focus(to_body_label, FALSE);
- gtkut_widget_set_can_focus(ng_body_label, FALSE);
- gtkut_widget_set_can_focus(subject_body_label, FALSE);
- gtkut_widget_set_can_focus(tags_body_label, FALSE);
+ gtk_widget_set_can_focus(from_body_label, FALSE);
+ gtk_widget_set_can_focus(to_body_label, FALSE);
+ gtk_widget_set_can_focus(ng_body_label, FALSE);
+ gtk_widget_set_can_focus(subject_body_label, FALSE);
+ gtk_widget_set_can_focus(tags_body_label, FALSE);
gtk_box_pack_start(GTK_BOX(hbox1), from_header_label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox1), from_body_label, FALSE, FALSE, 0);
diff --git a/src/image_viewer.c b/src/image_viewer.c
@@ -285,7 +285,7 @@ static MimeViewer *image_viewer_create(void)
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
- gtkut_widget_set_can_focus(notebook, FALSE);
+ gtk_widget_set_can_focus(notebook, FALSE);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
diff --git a/src/importldif.c b/src/importldif.c
@@ -763,7 +763,7 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
/* Remove focus capability for column headers */
for( i = 0; i < FIELDS_N_COLS; i++ ) {
- gtkut_widget_set_can_focus(
+ gtk_widget_set_can_focus(
GTK_CMCLIST(clist_field)->column[i].button,
FALSE);
}
@@ -980,7 +980,7 @@ static void imp_ldif_dialog_create() {
btnProceed = gtk_button_new_with_mnemonic(_("Proceed"));
gtk_button_set_image(GTK_BUTTON(btnProceed),
gtk_image_new_from_stock(GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON));
- gtkut_widget_set_can_default(btnProceed, TRUE);
+ gtk_widget_set_can_default(btnProceed, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), btnProceed, TRUE, TRUE, 0);
gtk_widget_hide(btnProceed);
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -1968,7 +1968,7 @@ MainWindow *main_window_create()
online_pixmap = stock_pixmap_widget(STOCK_PIXMAP_ONLINE);
offline_pixmap = stock_pixmap_widget(STOCK_PIXMAP_OFFLINE);
online_switch = gtk_button_new ();
- gtkut_widget_set_can_focus(online_switch, FALSE);
+ gtk_widget_set_can_focus(online_switch, FALSE);
CLAWS_SET_TIP(online_switch,
_("You are online. Click the icon to go offline"));
offline_switch = gtk_button_new ();
@@ -1988,7 +1988,7 @@ MainWindow *main_window_create()
ac_button = gtk_button_new();
CLAWS_SET_TIP(ac_button, _("Select account"));
- gtkut_widget_set_can_focus(ac_button, FALSE);
+ gtk_widget_set_can_focus(ac_button, FALSE);
gtk_widget_set_size_request(ac_button, -1, 0);
gtk_box_pack_end(GTK_BOX(hbox_stat), ac_button, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(ac_button), "button_press_event",
diff --git a/src/message_search.c b/src/message_search.c
@@ -214,23 +214,23 @@ static void message_search_create(void)
gtkut_stock_button_add_help(confirm_area, &help_btn);
prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
- gtkut_widget_set_can_default(prev_btn, TRUE);
+ gtk_widget_set_can_default(prev_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
gtk_widget_show(prev_btn);
next_btn = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
- gtkut_widget_set_can_default(next_btn, TRUE);
+ gtk_widget_set_can_default(next_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
gtk_widget_show(next_btn);
close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtkut_widget_set_can_default(close_btn, TRUE);
+ gtk_widget_set_can_default(close_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
gtk_widget_show(close_btn);
/* stop button hidden */
stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
- gtkut_widget_set_can_default(stop_btn, TRUE);
+ gtk_widget_set_can_default(stop_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
gtk_widget_show (confirm_area);
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -332,7 +332,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
mime_notebook = gtk_notebook_new();
gtk_widget_show(mime_notebook);
- gtkut_widget_set_can_focus(mime_notebook, FALSE);
+ gtk_widget_set_can_focus(mime_notebook, FALSE);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(mime_notebook), FALSE);
diff --git a/src/plugins/pgpcore/claws.def b/src/plugins/pgpcore/claws.def
@@ -48,7 +48,6 @@ gtk_cmclist_sort
gtkut_get_browse_file_btn
gtkut_get_options_frame
gtkut_stock_button_set_create
-gtkut_widget_set_can_default
gtkut_window_new
input_dialog
label_window_create
diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
@@ -437,7 +437,7 @@ create_dialog (struct select_keys_s *sk)
&dont_encrypt_btn, _("Do_n't encrypt"));
cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtkut_widget_set_can_default(cancel_btn, TRUE);
+ gtk_widget_set_can_default(cancel_btn, TRUE);
gtk_box_pack_start(GTK_BOX(bbox), cancel_btn, TRUE, TRUE, 0);
gtk_widget_show(cancel_btn);
gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
diff --git a/src/plugins/rssyl/claws.def b/src/plugins/rssyl/claws.def
@@ -78,7 +78,6 @@ gtk_cmctree_is_ancestor
gtk_cmctree_node_get_row_data
gtkut_get_browse_file_btn
gtkut_widget_draw_now
-gtkut_widget_set_can_default
gtkut_window_new
inc_offline_should_override
input_dialog
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
@@ -967,7 +967,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
btn_install = gtk_button_new_with_label (_("Install new..."));
gtk_widget_show (btn_install);
gtk_box_pack_start (GTK_BOX (hbox3), btn_install, FALSE, FALSE, 0);
- gtkut_widget_set_can_default (btn_install, TRUE);
+ gtk_widget_set_can_default (btn_install, TRUE);
btn_more = gtkut_get_link_btn((GtkWidget *)window, THEMES_URI, _("Get more..."));
gtk_widget_show (btn_more);
@@ -1099,7 +1099,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
btn_remove = gtk_button_new_with_label (_("Remove"));
gtk_widget_show (btn_remove);
gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_remove);
- gtkut_widget_set_can_default (btn_remove, TRUE);
+ gtk_widget_set_can_default (btn_remove, TRUE);
#ifdef HAVE_SVG
PACK_FRAME(vbox1, frame_scaling, _("SVG rendering"));
diff --git a/src/summary_search.c b/src/summary_search.c
@@ -477,28 +477,28 @@ static void summary_search_create(void)
gtkut_stock_button_add_help(confirm_area, &help_btn);
all_btn = gtk_button_new_with_mnemonic(_("Find _all"));
- gtkut_widget_set_can_default(all_btn, TRUE);
+ gtk_widget_set_can_default(all_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), all_btn, TRUE, TRUE, 0);
gtk_widget_show(all_btn);
prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
- gtkut_widget_set_can_default(prev_btn, TRUE);
+ gtk_widget_set_can_default(prev_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
gtk_widget_show(prev_btn);
next_btn = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
- gtkut_widget_set_can_default(next_btn, TRUE);
+ gtk_widget_set_can_default(next_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
gtk_widget_show(next_btn);
close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtkut_widget_set_can_default(close_btn, TRUE);
+ gtk_widget_set_can_default(close_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
gtk_widget_show(close_btn);
/* stop button hidden */
stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
- gtkut_widget_set_can_default(stop_btn, TRUE);
+ gtk_widget_set_can_default(stop_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -554,7 +554,7 @@ SummaryView *summary_create(MainWindow *mainwin)
toggle_search = gtk_toggle_button_new();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
prefs_common.show_searchbar);
- gtkut_widget_set_can_focus(toggle_search, FALSE);
+ gtk_widget_set_can_focus(toggle_search, FALSE);
gtk_widget_show(toggle_search);
CLAWS_SET_TIP(toggle_search, _("Toggle quick search bar"));
@@ -6551,7 +6551,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);
for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
- gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[pos].button,
+ gtk_widget_set_can_focus(GTK_CMCLIST(ctree)->column[pos].button,
FALSE);
if (((pos == summaryview->col_pos[S_COL_FROM] && !FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
(pos == summaryview->col_pos[S_COL_TO] && FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -2103,7 +2103,7 @@ static void toolbar_buttons_cb(GtkWidget *widget,
#ifndef GENERIC_UMPC
#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
- gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
+ gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
@@ -2116,7 +2116,7 @@ static void toolbar_buttons_cb(GtkWidget *widget,
item = GTK_WIDGET(gtk_toggle_tool_button_new()); \
gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(item), icon); \
gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), text); \
- gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
+ gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
@@ -2140,9 +2140,9 @@ static void toolbar_buttons_cb(GtkWidget *widget,
gchild = gtk_container_get_children( \
GTK_CONTAINER(child)); \
btn = (GtkWidget *)gchild->data; \
- gtkut_widget_set_can_focus(btn, FALSE); \
+ gtk_widget_set_can_focus(btn, FALSE); \
arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
- gtkut_widget_set_can_focus(arr, FALSE); \
+ gtk_widget_set_can_focus(arr, FALSE); \
g_list_free(gchild); \
gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \
gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \
@@ -2153,7 +2153,7 @@ static void toolbar_buttons_cb(GtkWidget *widget,
#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
- gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
+ gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
@@ -2164,7 +2164,7 @@ static void toolbar_buttons_cb(GtkWidget *widget,
item = GTK_WIDGET(gtk_toggle_tool_button_new()); \
gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(item), icon); \
gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), text); \
- gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
+ gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
@@ -2183,9 +2183,9 @@ static void toolbar_buttons_cb(GtkWidget *widget,
gchild = gtk_container_get_children( \
GTK_CONTAINER(child)); \
btn = (GtkWidget *)gchild->data; \
- gtkut_widget_set_can_focus(btn, FALSE); \
+ gtk_widget_set_can_focus(btn, FALSE); \
arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
- gtkut_widget_set_can_focus(arr, FALSE); \
+ gtk_widget_set_can_focus(arr, FALSE); \
g_list_free(gchild); \
gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \
gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \
