X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fgtkmisc.cpp;h=85554502c3e1d4d4eef18ea229a4f665e3b5feb2;hb=4d309f54ecfa248000f5a6fe88d0b7713bde4715;hp=9035dbd269b1c9f68b3fd4d54f19d0da44e405ab;hpb=28c05532c94e82b85bf7324d5c7e0d1f49c8832d;p=xonotic%2Fnetradiant.git

diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index 9035dbd2..85554502 100644
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -97,24 +97,23 @@ ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar toolbar, const ch
 // =============================================================================
 // File dialog
 
-bool color_dialog( ui::Widget parent, Vector3& color, const char* title ){
-	ui::Widget dlg;
+bool color_dialog( ui::Window parent, Vector3& color, const char* title ){
 	GdkColor clr = { 0, guint16(color[0] * 65535), guint16(color[1] * 65535), guint16(color[2] * 65535) };
 	ModalDialog dialog;
 
-	dlg = ui::Widget(gtk_color_selection_dialog_new( title ));
+	auto dlg = ui::Window::from(gtk_color_selection_dialog_new( title ));
 	gtk_color_selection_set_current_color( GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG( dlg )) ), &clr );
-	g_signal_connect( G_OBJECT( dlg ), "delete_event", G_CALLBACK( dialog_delete_callback ), &dialog );
+	dlg.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), &dialog );
 	GtkWidget *ok_button, *cancel_button;
-	g_object_get(dlg, "ok-button", &ok_button, "cancel-button", &cancel_button, nullptr);
-	g_signal_connect( ok_button, "clicked", G_CALLBACK( dialog_button_ok ), &dialog );
-	g_signal_connect( cancel_button, "clicked", G_CALLBACK( dialog_button_cancel ), &dialog );
+	g_object_get(G_OBJECT(dlg), "ok-button", &ok_button, "cancel-button", &cancel_button, nullptr);
+	ui::Widget::from(ok_button).connect( "clicked", G_CALLBACK( dialog_button_ok ), &dialog );
+	ui::Widget::from(cancel_button).connect( "clicked", G_CALLBACK( dialog_button_cancel ), &dialog );
 
 	if ( parent ) {
-		gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( parent ) );
+		gtk_window_set_transient_for( dlg, parent );
 	}
 
-	bool ok = modal_dialog_show( ui::Window(GTK_WINDOW( dlg )), dialog ) == eIDOK;
+	bool ok = modal_dialog_show( dlg, dialog ) == eIDOK;
 	if ( ok ) {
 		gtk_color_selection_get_current_color( GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG( dlg )) ), &clr );
 		color[0] = clr.red / 65535.0f;
@@ -122,26 +121,26 @@ bool color_dialog( ui::Widget parent, Vector3& color, const char* title ){
 		color[2] = clr.blue / 65535.0f;
 	}
 
-	gtk_widget_destroy( dlg );
+	dlg.destroy();
 
 	return ok;
 }
 
 void button_clicked_entry_browse_file( ui::Widget widget, ui::Entry entry ){
-	const char *filename = ui::Widget(gtk_widget_get_toplevel( widget )).file_dialog( TRUE, "Choose File", gtk_entry_get_text( entry ) );
+	const char *filename = widget.file_dialog( TRUE, "Choose File", gtk_entry_get_text( entry ) );
 
 	if ( filename != 0 ) {
-		gtk_entry_set_text( entry, filename );
+		entry.text(filename);
 	}
 }
 
 void button_clicked_entry_browse_directory( ui::Widget widget, ui::Entry entry ){
 	const char* text = gtk_entry_get_text( entry );
-	char *dir = dir_dialog( ui::Widget(gtk_widget_get_toplevel( widget )), "Choose Directory", path_is_absolute( text ) ? text : "" );
+	char *dir = dir_dialog( widget.window(), "Choose Directory", path_is_absolute( text ) ? text : "" );
 
 	if ( dir != 0 ) {
 		gchar* converted = g_filename_to_utf8( dir, -1, 0, 0, 0 );
-		gtk_entry_set_text( entry, converted );
+		entry.text(converted);
 		g_free( dir );
 		g_free( converted );
 	}