Replace some deprecated GTK functions

- Replace gtk_{button,combo_box}_set_focus_on_click with gtk_widget_set_focus_on_click.
- Replace gtk_misc_set_padding with gtk_widget_set_margin_start.

diff --git a/src/pan-view/pan-view-filter.cc b/src/pan-view/pan-view-filter.cc
index 80b4785..7bba497 100644 (file)
--- a/src/pan-view/pan-view-filter.cc
+++ b/src/pan-view/pan-view-filter.cc
@@ -55,7 +55,7 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw)
                                   0, PAN_VIEW_FILTER_GROUP, 1, _("Group"), 2, _("G"), -1);
 
                ui->filter_mode_combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(ui->filter_mode_model));
-               gtk_combo_box_set_focus_on_click(GTK_COMBO_BOX(ui->filter_mode_combo), FALSE);
+               gtk_widget_set_focus_on_click(ui->filter_mode_combo, FALSE);
                gtk_combo_box_set_active(GTK_COMBO_BOX(ui->filter_mode_combo), 0);
 
                GtkCellRenderer *render = gtk_cell_renderer_text_new();
@@ -89,7 +89,7 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw)
        // Build the spin-button to show/hide the filter UI.
        ui->filter_button = gtk_toggle_button_new();
        gtk_button_set_relief(GTK_BUTTON(ui->filter_button), GTK_RELIEF_NONE);
-       gtk_button_set_focus_on_click(GTK_BUTTON(ui->filter_button), FALSE);
+       gtk_widget_set_focus_on_click(ui->filter_button, FALSE);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        gtk_container_add(GTK_CONTAINER(ui->filter_button), hbox);
        gtk_widget_show(hbox);

diff --git a/src/pan-view/pan-view-search.cc b/src/pan-view/pan-view-search.cc
index 7a65615..33238b1 100644 (file)
--- a/src/pan-view/pan-view-search.cc
+++ b/src/pan-view/pan-view-search.cc
@@ -55,7 +55,7 @@ PanViewSearchUi *pan_search_ui_new(PanWindow *pw)
        // Build the spin-button to show/hide the search UI.
        ui->search_button = gtk_toggle_button_new();
        gtk_button_set_relief(GTK_BUTTON(ui->search_button), GTK_RELIEF_NONE);
-       gtk_button_set_focus_on_click(GTK_BUTTON(ui->search_button), FALSE);
+       gtk_widget_set_focus_on_click(ui->search_button, FALSE);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        gtk_container_add(GTK_CONTAINER(ui->search_button), hbox);
        gtk_widget_show(hbox);

diff --git a/src/preferences.cc b/src/preferences.cc
index 77e29b7..322ea97 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -2790,7 +2790,7 @@ static void config_tab_metadata(GtkWidget *notebook)
 
        gtk_label_set_xalign(GTK_LABEL(label), 0.0);
        gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-       gtk_misc_set_padding(GTK_MISC(label), 22, 0);
+       gtk_widget_set_margin_start(label, 22);
        pref_spacer(group, PREF_PAD_GROUP);
 
        group = pref_group_new(vbox, FALSE, _("Step 1 Options:"), GTK_ORIENTATION_VERTICAL);