summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-28 17:59:53 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-28 17:59:53 +0000
commit73bc8a29df41af7c387f55634617072718b4dce2 (patch)
treee4a45622a36417d1a89567e0d8b0200950dd7d92
parent2ca5c111460c911e1f2360dffe8f56df97a6a7fb (diff)
downloaddrakx-73bc8a29df41af7c387f55634617072718b4dce2.tar
drakx-73bc8a29df41af7c387f55634617072718b4dce2.tar.gz
drakx-73bc8a29df41af7c387f55634617072718b4dce2.tar.bz2
drakx-73bc8a29df41af7c387f55634617072718b4dce2.tar.xz
drakx-73bc8a29df41af7c387f55634617072718b4dce2.zip
(create_dialog) enable to pass an already created Gtk2::Label
-rw-r--r--perl-install/ugtk2.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 46cef2ec5..1a575896b 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -377,14 +377,13 @@ sub create_dialog {
my $ret = 0;
my $dialog = _create_dialog($title, $o_options);
$dialog->set_border_width(10);
- my $text = $o_options->{use_markup} ? gtkset_markup(Gtk2::WrappedLabel->new, $label) : Gtk2::WrappedLabel->new($label);
+ my $text = ref($label) ? $label : $o_options->{use_markup} ? gtkset_markup(Gtk2::WrappedLabel->new, $label) : Gtk2::WrappedLabel->new($label);
gtkpack($dialog->vbox,
gtkpack_(Gtk2::HBox->new,
if_($o_options->{stock}, 0, Gtk2::Image->new_from_stock($o_options->{stock}, 'dialog')),
1, create_scrolled_window($text, [ 'never', 'automatic' ]),
),
);
- $text->set_line_wrap(1);
if ($o_options->{cancel}) {
my $button2 = Gtk2::Button->new(N("Cancel"));