Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

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

diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/contrib/prtview/LoadPortalFileDialog.cpp
index aef0e3f507e59ad492556d00bef7ab19bae3feb7..9ebcd69b916ddba8f24a5eeb35684d4930c3c67a 100644 (file)
--- a/contrib/prtview/LoadPortalFileDialog.cpp
+++ b/contrib/prtview/LoadPortalFileDialog.cpp
@@ -33,11 +33,10 @@
 #include "prtview.h"
 #include "portals.h"
 
-static void dialog_button_callback( GtkWidget *widget, gpointer data ){
-       GtkWidget *parent;
+static void dialog_button_callback( ui::Widget widget, gpointer data ){
        int *loop, *ret;
 
-       parent = gtk_widget_get_toplevel( widget );
+       auto parent = widget.window();
        loop = (int*)g_object_get_data( G_OBJECT( parent ), "loop" );
        ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" );
 
@@ -52,14 +51,13 @@ static gint dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer
        return TRUE;
 }
 
-static void change_clicked( GtkWidget *widget, gpointer data ){
-       GtkWidget* file_sel;
+static void change_clicked(ui::Widget widget, gpointer data ){
        char* filename = NULL;
 
-       file_sel = gtk_file_chooser_dialog_new ( "Locate portal (.prt) file", nullptr, GTK_FILE_CHOOSER_ACTION_OPEN,
+       auto file_sel = ui::Widget::from(gtk_file_chooser_dialog_new ( "Locate portal (.prt) file", nullptr, GTK_FILE_CHOOSER_ACTION_OPEN,
                                                                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                                                                         GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                                                                        nullptr);
+                                                                                        nullptr));
 
        gtk_file_chooser_set_filename( GTK_FILE_CHOOSER(file_sel), portals.fn );
 
@@ -80,7 +78,7 @@ int DoLoadPortalFileDialog(){
        int loop = 1, ret = IDCANCEL;
 
        auto dlg = ui::Window( ui::window_type::TOP );
-       gtk_window_set_title( GTK_WINDOW( dlg ), "Load .prt" );
+       gtk_window_set_title( dlg, "Load .prt" );
        dlg.connect( "delete_event",
                                                G_CALLBACK( dialog_delete_callback ), NULL );
        dlg.connect( "destroy",
@@ -94,45 +92,45 @@ int DoLoadPortalFileDialog(){
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
 
        auto entry = ui::Entry(ui::New);
-       gtk_widget_show( entry );
+       entry.show();
        gtk_editable_set_editable( GTK_EDITABLE( entry ), FALSE );
        vbox.pack_start( entry, FALSE, FALSE, 0 );
 
        auto hbox = ui::HBox( FALSE, 5 );
-       gtk_widget_show( hbox );
+       hbox.show();
        vbox.pack_start( hbox, FALSE, FALSE, 0 );
 
        auto check3d = ui::CheckButton( "Show 3D" );
-       gtk_widget_show( check3d );
+       check3d.show();
        hbox.pack_start( check3d, FALSE, FALSE, 0 );
 
        auto check2d = ui::CheckButton( "Show 2D" );
-       gtk_widget_show( check2d );
+       check2d.show();
        hbox.pack_start( check2d, FALSE, FALSE, 0 );
 
        auto button = ui::Button( "Change" );
-       gtk_widget_show( button );
+       button.show();
        hbox.pack_end(button, FALSE, FALSE, 0);
        button.connect( "clicked", G_CALLBACK( change_clicked ), entry );
-       gtk_widget_set_size_request( button, 60, -1 );
+       button.dimensions(60, -1);
 
        hbox = ui::HBox( FALSE, 5 );
-       gtk_widget_show( hbox );
+       hbox.show();
        vbox.pack_start( hbox, FALSE, FALSE, 0 );
 
        button = ui::Button( "Cancel" );
-       gtk_widget_show( button );
+       button.show();
        hbox.pack_end(button, FALSE, FALSE, 0);
        button.connect( "clicked",
                                                G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
-       gtk_widget_set_size_request( button, 60, -1 );
+       button.dimensions(60, -1);
 
        button = ui::Button( "OK" );
-       gtk_widget_show( button );
+       button.show();
        hbox.pack_end(button, FALSE, FALSE, 0);
        button.connect( "clicked",
                                                G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
-       gtk_widget_set_size_request( button, 60, -1 );
+       button.dimensions(60, -1);
 
        strcpy( portals.fn, GlobalRadiant().getMapName() );
        char* fn = strrchr( portals.fn, '.' );
@@ -147,7 +145,7 @@ int DoLoadPortalFileDialog(){
        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( check3d ), portals.show_3d );
 
        gtk_grab_add( dlg );
-       gtk_widget_show( dlg );
+       dlg.show();
 
        while ( loop )
                gtk_main_iteration();