Merge commit '4645e19ce9e8f8034233ac965a4103a13b75714c' into garux-merge

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

diff --git a/libs/gtkutil/paned.cpp b/libs/gtkutil/paned.cpp
index 4149f8b7f9864d17f18c82f8378fa4aa8e2b0f53..4f724eef96bd6c247bd11044f0911278a5de39d4 100644 (file)
--- a/libs/gtkutil/paned.cpp
+++ b/libs/gtkutil/paned.cpp
@@ -34,7 +34,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 +42,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 +50,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 );
        }
@@ -70,25 +70,25 @@ 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 ), GTK_WIDGET( vsplit ) );
+               gtk_paned_add1( GTK_PANED( hsplit ), vsplit  );
                vsplit.show();
 
                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  ) );
        }
        {
                auto vsplit = ui::VPaned(ui::New);
-               gtk_paned_add2( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
+               gtk_paned_add2( GTK_PANED( hsplit ), vsplit  );
                vsplit.show();
 
                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;
 }