summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-21 13:18:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-21 13:18:37 +0000
commitac44e85c31ae86e00dd0a29e2bc7f5aeb1aacb2a (patch)
treee95c296b9246d09246ad6181abb5f5a425815554
parentb06ccc3ddc51b9b1dd01aeeecc28adea69923592 (diff)
downloaddrakx-ac44e85c31ae86e00dd0a29e2bc7f5aeb1aacb2a.tar
drakx-ac44e85c31ae86e00dd0a29e2bc7f5aeb1aacb2a.tar.gz
drakx-ac44e85c31ae86e00dd0a29e2bc7f5aeb1aacb2a.tar.bz2
drakx-ac44e85c31ae86e00dd0a29e2bc7f5aeb1aacb2a.tar.xz
drakx-ac44e85c31ae86e00dd0a29e2bc7f5aeb1aacb2a.zip
when isEmbedded, use $::WizardTable to allow non pop_it when not visible
-rw-r--r--perl-install/ugtk2.pm17
1 files changed, 11 insertions, 6 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index e9b8cb8da..ae696e26b 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -751,7 +751,7 @@ sub new {
$o->{pop_it} ||= $pop_it || $::WizardTable && do {
my @l = $::WizardTable->get_children;
- pop @l if !$::isInstall; #- don't take into account the DrawingArea
+ pop @l if !$::isInstall && $::isWizard; #- don't take into account the DrawingArea
any { $_->visible } @l;
};
@@ -822,14 +822,19 @@ sub new {
$o->{rwindow}->signal_connect(destroy => sub { $o->{destroyed} = 1 });
- if ($::isEmbedded && !$o->{pop_it} && !eval { $::Plug && $::Plug->child }) {
+ if ($::isEmbedded && !$o->{pop_it}) {
$o->{isEmbedded} = 1;
$o->{window} = new Gtk2::HBox(0,0);
$o->{rwindow} = $o->{window};
- $::Plug ||= new Gtk2::Plug($::XID);
- $::Plug->show;
- flush();
- $::Plug->add($o->{window});
+ if (!$::Plug) {
+ $::Plug = new Gtk2::Plug($::XID);
+ $::Plug->show;
+ flush();
+ $::WizardTable = Gtk2::Table->new(2, 2, 0);
+ $::Plug->add($::WizardTable);
+ }
+ $::WizardTable->attach($o->{window}, 0, 2, 1, 2, ['fill', 'expand'], ['fill', 'expand'], 0, 0);
+ $::WizardTable->show;
}
$o;
}