X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fgtkutil%2Fdialog.cpp;h=dc4ef7af6bb7cfa4791eb7ebea30add58b3d6253;hb=7e8f20bf007190a80b919a13aee8fa1bfa9dc509;hp=fddf060e670712667dd6077967797604454059e7;hpb=88624ae9e2534d8177214bd3966e0f72a49678eb;p=xonotic%2Fnetradiant.git

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index fddf060e..dc4ef7af 100644
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -86,8 +86,9 @@ gboolean modal_dialog_delete( ui::Widget widget, GdkEvent* event, ModalDialog* d
 }
 
 EMessageBoxReturn modal_dialog_show( ui::Window window, ModalDialog& dialog ){
-	gtk_grab_add( window  );
 	window.show();
+	g_assert( GTK_IS_WINDOW(window) );
+	gtk_grab_add( GTK_WIDGET(window) );
 
 	dialog.loop = true;
 	while ( dialog.loop )
@@ -171,6 +172,7 @@ ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& di
 
 	auto button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
 	alignment.add(button);
+	gtk_widget_grab_focus (button);
 
 	return window;
 }
@@ -210,7 +212,7 @@ PathEntry PathEntry_new(){
 
 	// browse button
 	auto button = ui::Button(ui::New);
-	button_set_icon( button, "ellipsis.bmp" );
+	button_set_icon( button, "ellipsis.png" );
 	button.show();
 	hbox.pack_end(button, FALSE, FALSE, 0);