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 a78966e7efe8a872175cf61e17650c28e12e3738..89025f62a5d0a9aa6b7f961fa88c918b7b47ebcc 100644 (file)
--- a/libs/gtkutil/paned.cpp
+++ b/libs/gtkutil/paned.cpp
@@ -21,8 +21,7 @@
 
 #include "paned.h"
 
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
+#include <gtk/gtk.h>
 
 #include "frame.h"
 
@@ -34,7 +33,7 @@ float position;
 int size;
 };
 
-gboolean hpaned_allocate( GtkWidget* widget, GtkAllocation* allocation, PanedState* paned ){
+gboolean hpaned_allocate(ui::Widget widget, GtkAllocation* allocation, PanedState* paned ){
        if ( paned->size != allocation->width ) {
                paned->size = allocation->width;
                gtk_paned_set_position( GTK_PANED( widget ), static_cast<int>( paned->size * paned->position ) );
@@ -42,7 +41,7 @@ gboolean hpaned_allocate( GtkWidget* widget, GtkAllocation* allocation, PanedSta
        return FALSE;
 }
 
-gboolean vpaned_allocate( GtkWidget* widget, GtkAllocation* allocation, PanedState* paned ){
+gboolean vpaned_allocate(ui::Widget widget, GtkAllocation* allocation, PanedState* paned ){
        if ( paned->size != allocation->height ) {
                paned->size = allocation->height;
                gtk_paned_set_position( GTK_PANED( widget ), static_cast<int>( paned->size * paned->position ) );
@@ -50,7 +49,7 @@ gboolean vpaned_allocate( GtkWidget* widget, GtkAllocation* allocation, PanedSta
        return FALSE;
 }
 
-gboolean paned_position( GtkWidget* widget, gpointer dummy, PanedState* paned ){
+gboolean paned_position(ui::Widget widget, gpointer dummy, PanedState* paned ){
        if ( paned->size != -1 ) {
                paned->position = gtk_paned_get_position( GTK_PANED( widget ) ) / static_cast<float>( paned->size );
        }
@@ -61,36 +60,36 @@ PanedState g_hpaned = { 0.5f, -1, };
 PanedState g_vpaned1 = { 0.5f, -1, };
 PanedState g_vpaned2 = { 0.5f, -1, };
 
-GtkWidget* create_split_views( GtkWidget* topleft, GtkWidget* botleft, GtkWidget* topright, GtkWidget* botright, GtkWidget*& vsplit1, GtkWidget*& vsplit2 ){
-       GtkHPaned* hsplit = GTK_HPANED( gtk_hpaned_new() );
-       gtk_widget_show( GTK_WIDGET( hsplit ) );
+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();
 
-       g_signal_connect( G_OBJECT( hsplit ), "size_allocate", G_CALLBACK( hpaned_allocate ), &g_hpaned );
-       g_signal_connect( G_OBJECT( hsplit ), "notify::position", G_CALLBACK( paned_position ), &g_hpaned );
+       hsplit.connect( "size_allocate", G_CALLBACK( hpaned_allocate ), &g_hpaned );
+       hsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_hpaned );
 
        {
-               GtkVPaned* vsplit = GTK_VPANED( gtk_vpaned_new() );
-               vsplit1 = GTK_WIDGET( vsplit );
+               auto vsplit = ui::VPaned(ui::New);
+               vsplit1 = vsplit;
                gtk_paned_add1( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
                gtk_widget_show( GTK_WIDGET( vsplit ) );
 
-               g_signal_connect( G_OBJECT( vsplit ), "size_allocate", G_CALLBACK( vpaned_allocate ), &g_vpaned1 );
-               g_signal_connect( G_OBJECT( vsplit ), "notify::position", G_CALLBACK( paned_position ), &g_vpaned1 );
+               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 ), GTK_WIDGET( create_framed_widget( topleft ) ) );
                gtk_paned_add2( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( botleft ) ) );
        }
        {
-               GtkVPaned* vsplit = GTK_VPANED( gtk_vpaned_new() );
-               vsplit2 = GTK_WIDGET( vsplit );
+               auto vsplit = ui::VPaned(ui::New);
+               vsplit2 = vsplit;
                gtk_paned_add2( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
                gtk_widget_show( GTK_WIDGET( vsplit ) );
 
-               g_signal_connect( G_OBJECT( vsplit ), "size_allocate", G_CALLBACK( vpaned_allocate ), &g_vpaned2 );
-               g_signal_connect( G_OBJECT( vsplit ), "notify::position", G_CALLBACK( paned_position ), &g_vpaned2 );
+               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 ), GTK_WIDGET( create_framed_widget( topright ) ) );
                gtk_paned_add2( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( botright ) ) );
        }
-       return GTK_WIDGET( hsplit );
+       return hsplit;
 }