Wrap more GTK

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

diff --git a/contrib/prtview/ConfigDialog.cpp b/contrib/prtview/ConfigDialog.cpp
index 391c1e6fa8dce532cc898fea4d6a2be2f53713dc..86828d090c12f5c3cd6a6bbb4ff695bd8ead1f4a 100644 (file)
--- a/contrib/prtview/ConfigDialog.cpp
+++ b/contrib/prtview/ConfigDialog.cpp
@@ -40,13 +40,10 @@ 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;
 }
 
@@ -83,7 +80,7 @@ static int DoColor( PackedColour *c ){
        gtk_color_selection_get_current_color( GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dlg)) ), &clr );
 
        gtk_grab_remove( dlg );
-       gtk_widget_destroy( dlg );
+       dlg.destroy();
 
        if ( ret == IDOK ) {
                *c = RGB( clr.red / (65535 / 255), clr.green / (65535 / 255), clr.blue / (65535 / 255));
@@ -329,7 +326,7 @@ void DoConfigDialog(){
                                          (GtkAttachOptions) ( 0 ), 0, 0 );
        polyscheck.connect( "toggled", G_CALLBACK( OnPoly ), NULL );
 
-       auto zlist = ui::ComboBoxText();
+       auto zlist = ui::ComboBoxText(ui::New);
        gtk_widget_show( zlist );
        gtk_box_pack_start( GTK_BOX( vbox2 ), zlist, TRUE, FALSE, 0 );
 
@@ -476,5 +473,5 @@ void DoConfigDialog(){
                gtk_main_iteration();
 
        gtk_grab_remove( dlg );
-       gtk_widget_destroy( dlg );
+       dlg.destroy();
 }