From 705b50e8d9e634e3738370eff8451ab3f9feacfd Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 9 Aug 2005 15:17:09 +0000 Subject: modify ComboBox with a tree inside to follow previous __create_tree_model() change --- perl-install/interactive/gtk.pm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'perl-install') diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 154de0285..f35ddb438 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -578,15 +578,13 @@ sub ask_fromW { } else { $model = __create_tree_model($e); $w = Gtk2::ComboBox->new_with_model($model); - $w->pack_start(my $renderer = Gtk2::CellRendererText->new, 0); - $w->set_attributes($renderer, "text", 0); - $w->pack_start($renderer = Gtk2::CellRendererPixbuf->new, 0); - $w->set_attributes($renderer, "pixbuf", 1); - $w->pack_start($renderer = Gtk2::CellRendererText->new, 0); - $w->set_attributes($renderer, "text", 2); - ${$e->{val}} = top(split($sep, ${$e->{val}})) if $e->{separator}; - - $w->set_active($model->{indexes}{ ref($e->{val}) ? may_apply($e->{format}, ${$e->{val}}) : $formatted_list[0] }); + + $w->pack_start(my $texrender = Gtk2::CellRendererText->new, 0); + $w->add_attribute($texrender, text => 0); + if ($e->{image2f}) { + $w->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0); + $w->add_attribute($pixrender, pixbuf => 1); + } } ($real_w, $w) = ($w, $w->entry); -- cgit v1.2.1