From 472fd05c0a0c7722a67a91bd29a97934332b843c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Aug 2008 11:04:09 +0000 Subject: (_gtk__MagicWindow,wait_messageW) move using $::main_window as transient hint from interactive::gtk::wait_messageW() into _gtk__MagicWindow(), thus fixing focus bug #42750 --- perl-install/NEWS | 2 ++ perl-install/interactive/gtk.pm | 1 - perl-install/mygtk2.pm | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index f0b195429..8b11140c4 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- fix another focus bug (#42750) + Version 11.10 - 14 August 2008 - diskdrake: diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 4d7d4db9d..932d604ba 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -842,7 +842,6 @@ sub wait_messageW { modal => 1, $::isInstall ? (banner => gtknew('Title1', text => $message, widget_name => 'Banner')) : (), no_Window_Manager => exists $o->{no_Window_Manager} ? $o->{no_Window_Manager} : !$::isStandalone, - if__($::main_window, transient_for => $::main_window), child => gtknew('VBox', padding => 4, border_width => 10, children => [ 1, $to_modify, if_(ref($message_modifiable), 0, $message_modifiable), diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index c5987b3a0..e60206f0d 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -615,6 +615,7 @@ sub _gtk_any_Window { } $w->set_modal(delete $opts->{modal}) if exists $opts->{modal}; + $opts->{transient_for} ||= $::main_window; $w->set_modal(1) if exists $opts->{transient_for}; $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for}; $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; -- cgit v1.2.1