*ret = gpointer_to_int( data );
}
-static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
- int *loop;
-
- gtk_widget_hide( widget );
- loop = (int*)g_object_get_data( G_OBJECT( widget ), "loop" );
+static gint dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer data ){
+ widget.hide();
+ int *loop = (int *) g_object_get_data(G_OBJECT(widget), "loop");
*loop = 0;
-
return TRUE;
}
{
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_sel));
}
- gtk_widget_destroy (file_sel);
+ ui::Widget(file_sel).destroy();
if ( filename != NULL ) {
strcpy( portals.fn, filename );
}
int DoLoadPortalFileDialog(){
- GtkWidget *dlg, *vbox, *hbox, *button, *entry, *check2d, *check3d;
+ GtkWidget *hbox, *entry, *check2d, *check3d;
int loop = 1, ret = IDCANCEL;
- dlg = ui::Window( ui::window_type::TOP );
+ auto dlg = ui::Window( ui::window_type::TOP );
gtk_window_set_title( GTK_WINDOW( dlg ), "Load .prt" );
- g_signal_connect( GTK_OBJECT( dlg ), "delete_event",
+ dlg.connect( "delete_event",
G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( dlg ), "destroy",
+ dlg.connect( "destroy",
G_CALLBACK( gtk_widget_destroy ), NULL );
g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
- vbox = ui::VBox( FALSE, 5 );
- gtk_widget_show( vbox );
- gtk_container_add( GTK_CONTAINER( dlg ), vbox );
+ auto vbox = ui::VBox( FALSE, 5 );
+ vbox.show();
+ dlg.add(vbox);
gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
- entry = ui::Entry();
+ entry = ui::Entry(ui::New);
gtk_widget_show( entry );
gtk_editable_set_editable( GTK_EDITABLE( entry ), FALSE );
gtk_box_pack_start( GTK_BOX( vbox ), entry, FALSE, FALSE, 0 );
gtk_widget_show( check2d );
gtk_box_pack_start( GTK_BOX( hbox ), check2d, FALSE, FALSE, 0 );
- button = ui::Button( "Change" );
+ auto button = ui::Button( "Change" );
gtk_widget_show( button );
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
- g_signal_connect( GTK_OBJECT( button ), "clicked", G_CALLBACK( change_clicked ), entry );
+ button.connect( "clicked", G_CALLBACK( change_clicked ), entry );
gtk_widget_set_size_request( button, 60, -1 );
hbox = ui::HBox( FALSE, 5 );
button = ui::Button( "Cancel" );
gtk_widget_show( button );
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
- g_signal_connect( GTK_OBJECT( button ), "clicked",
+ button.connect( "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
gtk_widget_set_size_request( button, 60, -1 );
button = ui::Button( "OK" );
gtk_widget_show( button );
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
- g_signal_connect( GTK_OBJECT( button ), "clicked",
+ button.connect( "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_size_request( button, 60, -1 );
}
gtk_grab_remove( dlg );
- gtk_widget_destroy( dlg );
+ dlg.destroy();
return ret;
}