Remove deprecated GtkHPaned, GtkVPaned

Use recommended GtkPaned.

diff --git a/src/layout-image.cc b/src/layout-image.cc
index 84fe604..762d823 100644 (file)
--- a/src/layout-image.cc
+++ b/src/layout-image.cc
@@ -2336,16 +2336,8 @@ GtkWidget *layout_image_setup_split_hv(LayoutWindow *lw, gboolean horizontal)
        layout_image_setup_split_common(lw, 2);
 
        /* horizontal split means vpaned and vice versa */
-       if (horizontal)
-               {
-               paned = gtk_vpaned_new();
-               DEBUG_NAME(paned);
-               }
-       else
-               {
-               paned = gtk_hpaned_new();
-               DEBUG_NAME(paned);
-               }
+       paned = gtk_paned_new(horizontal ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
+       DEBUG_NAME(paned);
 
        gtk_paned_pack1(GTK_PANED(paned), lw->split_images[0]->widget, TRUE, TRUE);
        gtk_paned_pack2(GTK_PANED(paned), lw->split_images[1]->widget, TRUE, TRUE);
@@ -2373,9 +2365,9 @@ static GtkWidget *layout_image_setup_split_triple(LayoutWindow *lw)
 
        gtk_widget_get_allocation(lw->utility_paned, &allocation);
 
-       hpaned1 = gtk_hpaned_new();
+       hpaned1 = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
        DEBUG_NAME(hpaned1);
-       hpaned2 = gtk_hpaned_new();
+       hpaned2 = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
        DEBUG_NAME(hpaned2);
 
        if (lw->bar && gtk_widget_get_visible(lw->bar))
@@ -2419,11 +2411,11 @@ GtkWidget *layout_image_setup_split_quad(LayoutWindow *lw)
 
        layout_image_setup_split_common(lw, 4);
 
-       hpaned = gtk_hpaned_new();
+       hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
        DEBUG_NAME(hpaned);
-       vpaned1 = gtk_vpaned_new();
+       vpaned1 = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
        DEBUG_NAME(vpaned1);
-       vpaned2 = gtk_vpaned_new();
+       vpaned2 = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
        DEBUG_NAME(vpaned2);
 
        gtk_paned_pack1(GTK_PANED(vpaned1), lw->split_images[0]->widget, TRUE, TRUE);

diff --git a/src/layout-util.cc b/src/layout-util.cc
index bc5b294..503c237 100644 (file)
--- a/src/layout-util.cc
+++ b/src/layout-util.cc
@@ -4146,7 +4146,7 @@ GtkWidget *layout_bars_prepare(LayoutWindow *lw, GtkWidget *image)
 {
        if (lw->utility_box) return lw->utility_box;
        lw->utility_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-       lw->utility_paned = gtk_hpaned_new();
+       lw->utility_paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
        DEBUG_NAME(lw->utility_paned);
        gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0);
 

diff --git a/src/layout.cc b/src/layout.cc
index 9c6389a..df91e58 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -367,7 +367,7 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
        g_signal_connect(G_OBJECT(gtk_widget_get_parent(gtk_widget_get_parent(lw->path_entry))), "changed",
                         G_CALLBACK(layout_path_entry_changed_cb), lw);
 
-       box_folders = GTK_WIDGET(gtk_hpaned_new());
+       box_folders = GTK_WIDGET(gtk_paned_new(GTK_ORIENTATION_HORIZONTAL));
        DEBUG_NAME(box_folders);
        gtk_box_pack_start(GTK_BOX(box), box_folders, TRUE, TRUE, 0);
 
@@ -1645,16 +1645,8 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
 
        layout_status_setup(lw, vbox, TRUE);
 
-       if (vertical)
-               {
-               lw->tools_pane = gtk_vpaned_new();
-               DEBUG_NAME(lw->tools_pane);
-               }
-       else
-               {
-               lw->tools_pane = gtk_hpaned_new();
-               DEBUG_NAME(lw->tools_pane);
-               }
+       lw->tools_pane = gtk_paned_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
+       DEBUG_NAME(lw->tools_pane);
        gtk_box_pack_start(GTK_BOX(vbox), lw->tools_pane, TRUE, TRUE, 0);
        gtk_widget_show(lw->tools_pane);
 
@@ -1848,10 +1840,10 @@ static void layout_grid_setup(LayoutWindow *lw)
 
        layout_grid_compute(lw, image_sb, tools, files, &w1, &w2, &w3);
 
-       v = lw->v_pane = gtk_vpaned_new();
+       v = lw->v_pane = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
        DEBUG_NAME(v);
 
-       h = lw->h_pane = gtk_hpaned_new();
+       h = lw->h_pane = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
        DEBUG_NAME(h);
 
        if (!layout_location_vertical(static_cast<LayoutLocation>(priority_location)))

diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc
index d144573..18d858a 100644 (file)
--- a/src/ui-pathsel.cc
+++ b/src/ui-pathsel.cc
@@ -1029,7 +1029,7 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
        hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        if (filter)
                {
-               paned = gtk_hpaned_new();
+               paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
                DEBUG_NAME(paned);
                gtk_table_attach(GTK_TABLE(table), paned, 0, 3, 1, 2,
                                 static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), 0, 0);