GTK: wrap gtk_box_pack_start

[xonotic/netradiant.git] / contrib / gtkgensurf / view.cpp

diff --git a/contrib/gtkgensurf/view.cpp b/contrib/gtkgensurf/view.cpp
index 00c74aaac601b2d51c8c5ac8b2b1617d9b467f4a..12ac4d943a70cd46c6f720370d84fa64e14852fa 100644 (file)
--- a/contrib/gtkgensurf/view.cpp
+++ b/contrib/gtkgensurf/view.cpp
@@ -363,72 +363,71 @@ static void preview_spin( GtkAdjustment *adj, double *data ){
 }
 
 void CreateViewWindow(){
-       GtkWidget *dlg, *vbox, *hbox, *label, *spin, *frame;
-       GtkObject *adj;
+       GtkWidget *label, *spin;
 
 #ifndef ISOMETRIC
        elevation = PI / 6.;
        azimuth   = PI / 6.;
 #endif
 
-       g_pWndPreview = dlg = ui::Window( ui::window_type::TOP );
+       auto dlg = g_pWndPreview = ui::Window( ui::window_type::TOP );
        gtk_window_set_title( GTK_WINDOW( dlg ), "GtkGenSurf Preview" );
-       g_signal_connect( GTK_OBJECT( dlg ), "delete_event", G_CALLBACK( preview_close ), NULL );
-       g_signal_connect( GTK_OBJECT( dlg ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+       dlg.connect( "delete_event", G_CALLBACK( preview_close ), NULL );
+       dlg.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
        gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pWnd ) );
        gtk_window_set_default_size( GTK_WINDOW( dlg ), 300, 400 );
 
-       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);
 
 #ifndef ISOMETRIC
-       hbox = ui::HBox( TRUE, 5 );
+       auto hbox = ui::HBox( TRUE, 5 );
        gtk_widget_show( hbox );
-       gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, TRUE, 0 );
+       vbox.pack_start( hbox, FALSE, TRUE, 0 );
        gtk_container_set_border_width( GTK_CONTAINER( hbox ), 3 );
 
        label = ui::Label( "Elevation" );
        gtk_widget_show( label );
        gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
-       gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, TRUE, 0 );
+       hbox.pack_start( label, FALSE, TRUE, 0 );
 
-       adj = ui::Adjustment( 30, -90, 90, 1, 10, 0 );
-       g_signal_connect( adj, "value_changed", G_CALLBACK( preview_spin ), &elevation );
+       auto adj = ui::Adjustment( 30, -90, 90, 1, 10, 0 );
+       adj.connect( "value_changed", G_CALLBACK( preview_spin ), &elevation );
        spin = ui::SpinButton( adj, 1, 0 );
        gtk_widget_show( spin );
-       gtk_box_pack_start( GTK_BOX( hbox ), spin, FALSE, TRUE, 0 );
-       g_signal_connect( G_OBJECT( spin ), "focus_out_event", G_CALLBACK( doublevariable_spinfocusout ), &elevation );
+       hbox.pack_start( spin, FALSE, TRUE, 0 );
+       spin.connect( "focus_out_event", G_CALLBACK( doublevariable_spinfocusout ), &elevation );
 
        adj = ui::Adjustment( 30, 0, 359, 1, 10, 0 );
-       g_signal_connect( adj, "value_changed", G_CALLBACK( preview_spin ), &azimuth );
+       adj.connect( "value_changed", G_CALLBACK( preview_spin ), &azimuth );
        spin = ui::SpinButton( adj, 1, 0 );
        gtk_widget_show( spin );
        gtk_spin_button_set_wrap( GTK_SPIN_BUTTON( spin ), TRUE );
-       gtk_box_pack_end( GTK_BOX( hbox ), spin, FALSE, TRUE, 0 );
+       hbox.pack_end(spin, FALSE, TRUE, 0);
 
        label = ui::Label( "Azimuth" );
        gtk_widget_show( label );
        gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
-       gtk_box_pack_end( GTK_BOX( hbox ), label, FALSE, TRUE, 0 );
-       g_signal_connect( G_OBJECT( spin ), "focus_out_event", G_CALLBACK( doublevariable_spinfocusout ), &azimuth );
+       hbox.pack_end(label, FALSE, TRUE, 0);
+       spin.connect( "focus_out_event", G_CALLBACK( doublevariable_spinfocusout ), &azimuth );
 #endif
 
-       frame = ui::Frame( nullptr );
-       gtk_widget_show( frame );
+       auto frame = ui::Frame(ui::null);
+       frame.show();
        gtk_frame_set_shadow_type( GTK_FRAME( frame ), GTK_SHADOW_IN );
-       gtk_box_pack_start( GTK_BOX( vbox ), frame, TRUE, TRUE, 0 );
+       vbox.pack_start( frame, TRUE, TRUE, 0 );
 
        g_pPreviewWidget = g_UIGtkTable.m_pfn_glwidget_new( FALSE, NULL );
 
        gtk_widget_set_events( g_pPreviewWidget, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK );
-       g_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "expose_event", G_CALLBACK( expose ), NULL );
-       g_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "motion_notify_event", G_CALLBACK( motion ), NULL );
-       g_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "button_press_event",
+       g_pPreviewWidget.connect( "expose_event", G_CALLBACK( expose ), NULL );
+       g_pPreviewWidget.connect( "motion_notify_event", G_CALLBACK( motion ), NULL );
+       g_pPreviewWidget.connect( "button_press_event",
                                                G_CALLBACK( button_press ), NULL );
 
        gtk_widget_show( g_pPreviewWidget );
-       gtk_container_add( GTK_CONTAINER( frame ), g_pPreviewWidget );
+       frame.add(ui::Widget(g_pPreviewWidget));
 
        if ( Preview ) {
                gtk_widget_show( g_pWndPreview );