From d0783fce4aa3092d6a83ddead3e0224c16df82b9 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 20 Aug 2007 19:03:40 +0000 Subject: use set_image() to set button image, to be able to add both label and image --- perl-install/mygtk2.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'perl-install/mygtk2.pm') diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index ec8249fa9..6569c3180 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -147,7 +147,7 @@ sub _gtk_any_Button { if ($class eq 'RadioButton') { @radio_options = delete $opts->{group}; } - $w = $opts->{image} || $opts->{child} ? "Gtk2::$class"->new : + $w = $opts->{child} ? "Gtk2::$class"->new : delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') : $opts->{text} ? "Gtk2::$class"->new_with_label(@radio_options, delete $opts->{text} || '') : "Gtk2::$class"->new(@radio_options); @@ -155,10 +155,11 @@ sub _gtk_any_Button { $w->{format} = delete $opts->{format} if exists $opts->{format}; } - if (my $widget = delete $opts->{image} || delete $opts->{child}) { + if (my $widget = delete $opts->{child}) { $w->add($widget); $widget->show; } + $w->set_image(delete $opts->{image}) if exists $opts->{image}; $w->set_relief(delete $opts->{relief}) if exists $opts->{relief}; if (my $text_ref = delete $opts->{text_ref}) { -- cgit v1.2.1