GTK: wrap gtk_box_pack_start

[xonotic/netradiant.git] / contrib / prtview / AboutDialog.cpp

diff --git a/contrib/prtview/AboutDialog.cpp b/contrib/prtview/AboutDialog.cpp
index c90c319fc9391f63a9fa9a3266bfd937bc508a16..c517e6c1427b55cd2f4d0b9314415544b6124792 100644 (file)
--- a/contrib/prtview/AboutDialog.cpp
+++ b/contrib/prtview/AboutDialog.cpp
@@ -39,62 +39,56 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
        *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;
 }
 
 void DoAboutDlg(){
-       GtkWidget *dlg, *hbox, *vbox, *button, *label;
        int loop = 1, ret = IDCANCEL;
 
-       dlg = ui::Window( ui::window_type::TOP );
-       gtk_window_set_title( GTK_WINDOW( dlg ), "About Portal Viewer" );
-       g_signal_connect( GTK_OBJECT( dlg ), "delete_event",
-                                         G_CALLBACK( dialog_delete_callback ), NULL );
-       g_signal_connect( GTK_OBJECT( dlg ), "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 );
+       auto dlg = ui::Window(ui::window_type::TOP);
+       gtk_window_set_title(dlg, "About Portal Viewer");
+       dlg.connect("delete_event", G_CALLBACK(dialog_delete_callback), NULL);
+       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);
 
-       hbox = ui::HBox( FALSE, 10 );
-       gtk_widget_show( hbox );
-       gtk_container_add( GTK_CONTAINER( dlg ), hbox );
-       gtk_container_set_border_width( GTK_CONTAINER( hbox ), 10 );
+       auto hbox = ui::HBox(FALSE, 10);
+       hbox.show();
+       dlg.add(hbox);
+       gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
 
        char const *label_text = "Version 1.000\n\n"
-                                                  "Gtk port by Leonardo Zide\nleo@lokigames.com\n\n"
-                                                  "Written by Geoffrey DeWan\ngdewan@prairienet.org\n\n"
-                                                  "Built against NetRadiant " RADIANT_VERSION "\n"
-                                                  __DATE__;
-       gtk_widget_show( label );
-       gtk_box_pack_start( GTK_BOX( hbox ), label, TRUE, TRUE, 0 );
-       gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
-
-       vbox = ui::VBox( FALSE, 0 );
-       gtk_widget_show( vbox );
-       gtk_box_pack_start( GTK_BOX( hbox ), vbox, FALSE, FALSE, 0 );
-
-       button = ui::Button( "OK" );
-       gtk_widget_show( button );
-       gtk_box_pack_start( GTK_BOX( vbox ), button, FALSE, FALSE, 0 );
-       g_signal_connect( GTK_OBJECT( button ), "clicked",
-                                               G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
-       gtk_widget_set_size_request( button, 60, -1 );
-
-       gtk_grab_add( dlg );
-       gtk_widget_show( dlg );
-
-       while ( loop )
+                       "Gtk port by Leonardo Zide\nleo@lokigames.com\n\n"
+                       "Written by Geoffrey DeWan\ngdewan@prairienet.org\n\n"
+                       "Built against NetRadiant " RADIANT_VERSION "\n"
+                       __DATE__;
+       auto label = ui::Label(label_text);
+       label.show();
+       hbox.pack_start( label, TRUE, TRUE, 0);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+
+       auto vbox = ui::VBox(FALSE, 0);
+       vbox.show();
+       hbox.pack_start( vbox, FALSE, FALSE, 0);
+
+       auto button = ui::Button("OK");
+       button.show();
+       vbox.pack_start( button, FALSE, FALSE, 0);
+       button.connect("clicked", G_CALLBACK(dialog_button_callback), GINT_TO_POINTER(IDOK));
+       button.dimensions(60, -1);
+
+       gtk_grab_add(dlg);
+       dlg.show();
+
+       while (loop)
                gtk_main_iteration();
 
-       gtk_grab_remove( dlg );
-       gtk_widget_destroy( dlg );
+       gtk_grab_remove(dlg);
+       dlg.destroy();
 }