summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-08 11:14:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-08 11:14:31 +0000
commitb80a27d639f0d1159f89d063144bb30696dd575a (patch)
treeb92bbde961e250f5657d6a510df39e4a7528f98b
parent05692781c18db21f639aa5323a066fab118b8dd7 (diff)
downloaddrakx-backup-do-not-use-b80a27d639f0d1159f89d063144bb30696dd575a.tar
drakx-backup-do-not-use-b80a27d639f0d1159f89d063144bb30696dd575a.tar.gz
drakx-backup-do-not-use-b80a27d639f0d1159f89d063144bb30696dd575a.tar.bz2
drakx-backup-do-not-use-b80a27d639f0d1159f89d063144bb30696dd575a.tar.xz
drakx-backup-do-not-use-b80a27d639f0d1159f89d063144bb30696dd575a.zip
workaround a weird pb with gtk: still re-creating help Gtk::Text at each step :-/
-rw-r--r--perl-install/install_gtk.pm4
-rw-r--r--perl-install/install_steps_gtk.pm3
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 9dac51447..f33495571 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -96,16 +96,14 @@ sub create_help_window {
if ($w = $o->{help_window}) {
$_->destroy foreach $w->{window}->children;
} else {
- $w = bless {}, 'my_gtk';
+ $w = $o->{help_window} = bless {}, 'my_gtk';
$w->{rwindow} = $w->{window} = new Gtk::Window;
$w->{rwindow}->set_uposition($::rootwidth - $::helpwidth, $::rootheight - $::helpheight);
$w->{rwindow}->set_usize($::helpwidth, $::helpheight);
$w->{rwindow}->set_title('skip');
- $w->sync;
};
gtkadd($w->{window}, createScrolledWindow($o->{help_window_text} = new Gtk::Text));
$w->show;
- $o->{help_window} = $w;
}
#------------------------------------------------------------------------------
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 98928e8a9..10f964191 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -123,7 +123,8 @@ sub enteringStep {
printf "Entering step `%s'\n", $o->{steps}{$step}{text};
$o->SUPER::enteringStep($step);
install_gtk::create_steps_window($o);
- $o->set_help($step);
+ install_gtk::create_help_window($o); #- HACK: without this it doesn't work (reaches step doPartitionDisks then fail)
+ $o->set_help($o->{step});
}
sub leavingStep {
my ($o, $step) = @_;