*/
#include "paned.h"
-
-#include <gtk/gtk.h>
-#include <uilib/uilib.h>
-
#include "frame.h"
-
-class PanedState
-{
-public:
-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 ) );
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 ) );
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 );
}
{
auto vsplit = ui::VPaned(ui::New);
- gtk_paned_add1( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
- gtk_widget_show( 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_widget_show( 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;
}