Merge commit 'cac514541c3ae6f72c4c00c19c215ff62a023df4' into garux-merge

[xonotic/netradiant.git] / libs / gtkutil / paned.cpp

diff --git a/libs/gtkutil/paned.cpp b/libs/gtkutil/paned.cpp
index 4f724eef96bd6c247bd11044f0911278a5de39d4..89025f62a5d0a9aa6b7f961fa88c918b7b47ebcc 100644 (file)
--- a/libs/gtkutil/paned.cpp
+++ b/libs/gtkutil/paned.cpp
@@ -22,7 +22,6 @@
 #include "paned.h"
 
 #include <gtk/gtk.h>
-#include <uilib/uilib.h>
 
 #include "frame.h"
 
@@ -61,7 +60,7 @@ PanedState g_hpaned = { 0.5f, -1, };
 PanedState g_vpaned1 = { 0.5f, -1, };
 PanedState g_vpaned2 = { 0.5f, -1, };
 
-ui::HPaned create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widget botleft, ui::Widget botright ){
+ui::Widget create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widget botleft, ui::Widget botright, ui::Widget& vsplit1, ui::Widget& vsplit2 ){
        auto hsplit = ui::HPaned(ui::New);
        hsplit.show();
 
@@ -70,25 +69,27 @@ ui::HPaned create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widg
 
        {
                auto vsplit = ui::VPaned(ui::New);
-               gtk_paned_add1( GTK_PANED( hsplit ), vsplit  );
-               vsplit.show();
+               vsplit1 = vsplit;
+               gtk_paned_add1( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
+               gtk_widget_show( GTK_WIDGET( vsplit ) );
 
                vsplit.connect( "size_allocate", G_CALLBACK( vpaned_allocate ), &g_vpaned1 );
                vsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_vpaned1 );
 
-               gtk_paned_add1( GTK_PANED( vsplit ), create_framed_widget( topleft  ) );
-               gtk_paned_add2( GTK_PANED( vsplit ), create_framed_widget( topright  ) );
+               gtk_paned_add1( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( topleft ) ) );
+               gtk_paned_add2( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( botleft ) ) );
        }
        {
                auto vsplit = ui::VPaned(ui::New);
-               gtk_paned_add2( GTK_PANED( hsplit ), vsplit  );
-               vsplit.show();
+               vsplit2 = vsplit;
+               gtk_paned_add2( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
+               gtk_widget_show( GTK_WIDGET( vsplit ) );
 
                vsplit.connect( "size_allocate", G_CALLBACK( vpaned_allocate ), &g_vpaned2 );
                vsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_vpaned2 );
 
-               gtk_paned_add1( GTK_PANED( vsplit ), create_framed_widget( botleft  ) );
-               gtk_paned_add2( GTK_PANED( vsplit ), create_framed_widget( botright  ) );
+               gtk_paned_add1( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( topright ) ) );
+               gtk_paned_add2( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( botright ) ) );
        }
        return hsplit;
 }