GTK: wrap GTK_WIDGET

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

diff --git a/libs/gtkutil/paned.cpp b/libs/gtkutil/paned.cpp
index 446a8bb4f2d409984cbf79101d29bda5402ebaef..1aeec45c7067f7927009a1afcc4affb8c08d9ecf 100644 (file)
--- a/libs/gtkutil/paned.cpp
+++ b/libs/gtkutil/paned.cpp
@@ -61,34 +61,34 @@ PanedState g_hpaned = { 0.5f, -1, };
 PanedState g_vpaned1 = { 0.5f, -1, };
 PanedState g_vpaned2 = { 0.5f, -1, };
 
-GtkHPaned* create_split_views( GtkWidget* topleft, GtkWidget* topright, GtkWidget* botleft, GtkWidget* botright ){
-       GtkHPaned* hsplit = ui::HPaned();
-       gtk_widget_show( GTK_WIDGET( hsplit ) );
+ui::HPaned create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widget botleft, ui::Widget botright ){
+       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 = ui::VPaned();
-               gtk_paned_add1( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
-               gtk_widget_show( GTK_WIDGET( vsplit ) );
+               auto vsplit = ui::VPaned(ui::New);
+               gtk_paned_add1( GTK_PANED( hsplit ), vsplit  );
+               vsplit.show();
 
-               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( topright ) ) );
+               gtk_paned_add1( GTK_PANED( vsplit ), create_framed_widget( topleft  ) );
+               gtk_paned_add2( GTK_PANED( vsplit ), create_framed_widget( topright  ) );
        }
        {
-               GtkVPaned* vsplit = ui::VPaned();
-               gtk_paned_add2( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
-               gtk_widget_show( GTK_WIDGET( vsplit ) );
+               auto vsplit = ui::VPaned(ui::New);
+               gtk_paned_add2( GTK_PANED( hsplit ), vsplit  );
+               vsplit.show();
 
-               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( botleft ) ) );
-               gtk_paned_add2( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( botright ) ) );
+               gtk_paned_add1( GTK_PANED( vsplit ), create_framed_widget( botleft  ) );
+               gtk_paned_add2( GTK_PANED( vsplit ), create_framed_widget( botright  ) );
        }
        return hsplit;
 }