From d8ce481a7397742a4518f347a9810474f52de112 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 2 Feb 2004 18:51:19 +0000
Subject: use wrapped labels in various places

---
 perl-install/interactive/gtk.pm | 6 +++---
 perl-install/ugtk2.pm           | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 4e3d2666c..4e09e5c18 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -422,7 +422,7 @@ sub ask_fromW {
 		my $f = $e->{icon2f}->($_[0]);
 		$e->{icon} = -e $f ?
 		    gtkcreate_img($f) :
-		    Gtk2::Label->new(may_apply($e->{format}, $_[0]));
+		    Gtk2::WrappedLabel->new(may_apply($e->{format}, $_[0]));
 		$w->add(gtkshow($e->{icon}));
 	    };
 	    $w->signal_connect(clicked => sub {
@@ -441,7 +441,7 @@ sub ask_fromW {
 	    $set = sub { $w->set_active($_[0]) };
 	    $get = sub { $w->get_active };
 	} elsif ($e->{type} eq 'label') {
-	    $w = Gtk2::Label->new(${$e->{val}});
+	    $w = Gtk2::WrappedLabel->new(${$e->{val}});
 	    $set = sub { $w->set($_[0]) };
 	} elsif ($e->{type} eq 'button') {
 	    $w = Gtk2::Button->new_with_label('');
@@ -622,7 +622,7 @@ sub ask_fromW {
     my @adv = map { warp_text($_) } @{$common->{advanced_messages}};
     $advanced_pack = 
       gtkpack_(Gtk2::VBox->new(0,0),
-	       (map { (0, Gtk2::Label->new($_)) } @adv),
+	       (map { (0, Gtk2::WrappedLabel->new($_)) } @adv),
 	       0, Gtk2::HSeparator->new,
 	       1, $create_widgets->(@widgets_advanced));
 
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 260d3e597..1d84b6c50 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -100,7 +100,7 @@ sub gtkset_line_wrap          { $_[0]->set_line_wrap($_[1]); $_[0] }
 sub gtkadd {
     my $w = shift;
     foreach my $l (@_) {
-	ref $l or $l = Gtk2::Label->new($l);
+	ref $l or $l = Gtk2::WrappedLabel->new($l);
 	$w->add(gtkshow($l));
     }
     $w
@@ -110,7 +110,7 @@ sub gtkadd_widget {
     my $sg = shift;
     map {
         my $l = $_;
-        ref $l or $l = Gtk2::Label->new($l);
+        ref $l or $l = Gtk2::WrappedLabel->new($l);
         $sg->add_widget($l);
         $l;
     } @_;
@@ -119,7 +119,7 @@ sub gtkadd_widget {
 sub gtkappend {
     my $w = shift;
     foreach my $l (@_) {
-	ref $l or $l = Gtk2::Label->new($l);
+	ref $l or $l = Gtk2::WrappedLabel->new($l);
 	$w->append(gtkshow($l));
     }
     $w
@@ -235,7 +235,7 @@ sub gtkpowerpack {
 	    }
 	}
 	#- Get and pack the widget (create it if necessary to  a label...)
-	my $widget = ref($_[0]) ? shift : Gtk2::Label->new(shift);
+	my $widget = ref($_[0]) ? shift : Gtk2::WrappedLabel->new(shift);
 	my $pack_call = 'pack_'.($attr{pack_end} ? 'end' : 'start');
 	$box->$pack_call($widget, $attr{expand}, $attr{fill}, $attr{padding});
 	$widget->show;
-- 
cgit v1.2.1