Merge commit '70f0925f0000a132c709b935aa5cb0942b5080d9' into master-merge

[xonotic/netradiant.git] / libs / gtkutil / dialog.cpp

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index baee2f69a125673d994e02cc9c3894eb2e430c19..dc4ef7af6bb7cfa4791eb7ebea30add58b3d6253 100644 (file)
--- 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;
 }
@@ -183,7 +185,7 @@ RadioHBox RadioHBox_new( StringArrayRange names ){
        auto radio = ui::RadioButton(ui::null);
        for ( StringArrayRange::Iterator i = names.first; i != names.last; ++i )
        {
-               radio = ui::RadioButton(GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( group, *i ) ));
+               radio = ui::RadioButton::from( gtk_radio_button_new_with_label( group, *i ) );
                radio.show();
                hbox.pack_start( radio, FALSE, FALSE, 0 );
 
@@ -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);