summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-12 12:36:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-12 12:36:22 +0000
commit6af4eaa570b24e5fb20a1c176a49cce5ddad49a9 (patch)
tree3202b36e8dd1e46e90689b52684e577184bb3fac
parent212c6f3f817a03ef6e18d991aa6d821902a04d55 (diff)
downloaddrakx-backup-do-not-use-6af4eaa570b24e5fb20a1c176a49cce5ddad49a9.tar
drakx-backup-do-not-use-6af4eaa570b24e5fb20a1c176a49cce5ddad49a9.tar.gz
drakx-backup-do-not-use-6af4eaa570b24e5fb20a1c176a49cce5ddad49a9.tar.bz2
drakx-backup-do-not-use-6af4eaa570b24e5fb20a1c176a49cce5ddad49a9.tar.xz
drakx-backup-do-not-use-6af4eaa570b24e5fb20a1c176a49cce5ddad49a9.zip
- fix gtkadd()
- fix displaying banner - no banner if no ::Wizard_title (as used to be)
-rw-r--r--perl-install/mygtk2.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 763f55bf7..64e5c216a 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -66,7 +66,7 @@ sub gtkadd {
my %opts = @_;
$class =~ s/^Gtk2::(Gdk::)?// or internal_error("gtkadd unknown class $class");
- _gtk('gtkadd', $w, $class, \%opts);
+ _gtk($w, $class, 'gtkadd', \%opts);
}
@@ -458,7 +458,7 @@ sub _gtk__MagicWindow {
if (!$::WizardWindow) {
my $banner;
- if (!$::isEmbedded && !$::isInstall) {
+ if (!$::isEmbedded && !$::isInstall && $::Wizard_title) {
$banner = Gtk2::Banner->new($opts->{icon_no_error}, $::Wizard_title) or log::l("ERROR: missing wizard banner");
}
$::WizardTable = gtknew('VBox', if_($banner, children_tight => [ $banner ]));
@@ -481,7 +481,7 @@ sub _gtk__MagicWindow {
%$opts = ();
}
- gtkset($::WizardTable, children_loose => [ $sub_child ]);
+ gtkadd($::WizardTable, children_loose => [ $sub_child ]);
$w = $::WizardWindow;
}
$w;