X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=contrib%2Fprtview%2FLoadPortalFileDialog.cpp;h=890658e14733d2929a1d9c627da74ddfe0aad447;hb=a9e5bfdf2a458e89978ee52ebbd3711884b54b29;hp=aef0e3f507e59ad492556d00bef7ab19bae3feb7;hpb=2951e448a7f008f2438be4bd5feba2e4f4400eef;p=xonotic%2Fnetradiant.git

diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/contrib/prtview/LoadPortalFileDialog.cpp
index aef0e3f5..890658e1 100644
--- 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" );
 
@@ -80,7 +79,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 +93,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 +146,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();