diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-01-12 13:24:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-01-12 13:24:16 +0000 |
| commit | 6cf928fcc1227753f6f4e7da0ae50968efb037b8 (patch) | |
| tree | 7cfddcb53dd07a804c123957baf2af389bd2ef8c | |
| parent | 1f83a97620e5ab86f703e071ac3e3b874a64e6df (diff) | |
| download | drakx-6cf928fcc1227753f6f4e7da0ae50968efb037b8.tar drakx-6cf928fcc1227753f6f4e7da0ae50968efb037b8.tar.gz drakx-6cf928fcc1227753f6f4e7da0ae50968efb037b8.tar.bz2 drakx-6cf928fcc1227753f6f4e7da0ae50968efb037b8.tar.xz drakx-6cf928fcc1227753f6f4e7da0ae50968efb037b8.zip | |
return the child when MagicWindow is using the $::WizardWindow
(otherwise the user of the MagicWindow can destroy the WizardWindow)
| -rw-r--r-- | perl-install/mygtk2.pm | 2 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index 64e5c216a..6b7811ab4 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -482,7 +482,7 @@ sub _gtk__MagicWindow { } gtkadd($::WizardTable, children_loose => [ $sub_child ]); - $w = $::WizardWindow; + $w = $sub_child; } $w; } diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index d0e42d711..8cd3d27dd 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -840,13 +840,13 @@ sub new { if_($o->{transient} && $o->{transient} =~ /Gtk2::Window/, transient_for => $o->{transient}), ); - if ($window == $::WizardWindow) { + if ($window->isa('Gtk2::Window')) { + $o->{rwindow} = $window; + $o->{pop_it} = 1; + } else { $o->{rwindow} = $o->{window}; set_main_window_size($o->{window}); $o->{window}->set_border_width(10); - } else { - $o->{rwindow} = $window; - $o->{pop_it} = 1; } $o; } |