summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-21 14:04:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-21 14:04:06 +0000
commit8d109d783a3df6a0082cae3f23ddfe2b1c15a224 (patch)
tree1277561cc074237003aba12ed3aef8adfc04fbd0 /perl-install/Xconfig
parent58f0fe3f2b72a17fe03fb3f2b3ce73402ade83cd (diff)
downloaddrakx-8d109d783a3df6a0082cae3f23ddfe2b1c15a224.tar
drakx-8d109d783a3df6a0082cae3f23ddfe2b1c15a224.tar.gz
drakx-8d109d783a3df6a0082cae3f23ddfe2b1c15a224.tar.bz2
drakx-8d109d783a3df6a0082cae3f23ddfe2b1c15a224.tar.xz
drakx-8d109d783a3df6a0082cae3f23ddfe2b1c15a224.zip
fix setting the image & colors in resolution chooser
Diffstat (limited to 'perl-install/Xconfig')
-rw-r--r--perl-install/Xconfig/resolution_and_depth.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm
index 4bbb2fad1..45608e1f5 100644
--- a/perl-install/Xconfig/resolution_and_depth.pm
+++ b/perl-install/Xconfig/resolution_and_depth.pm
@@ -213,7 +213,7 @@ sub choose_gtk {
my %monitor_images_x_res = do {
my @l = qw(640 800 1024 1152 1280 1400 1600 1920 2048);
- my %h = map { $_ => gtkcreate_img("monitor-$_.png") } @l;
+ my %h = map { $_ => ugtk2::_find_imgfile("monitor-$_.png") } @l;
#- for the other, use the biggest smaller
foreach my $x_res (uniq map { $_->{X} } @resolutions) {
@@ -225,11 +225,11 @@ sub choose_gtk {
my ($depth_combo, $x_res_combo);
- my $pix_colors = gtkcreate_img("colors");
+ my $pix_colors = Gtk2::Image->new;
my $set_chosen_Depth_image = sub {
- $pix_colors = gtkcreate_img(
+ $pix_colors->set_from_file(ugtk2::_find_imgfile(
$chosen_Depth >= 24 ? "colors.png" :
- $chosen_Depth >= 15 ? "colors16.png" : "colors8.png");
+ $chosen_Depth >= 15 ? "colors16.png" : "colors8.png"));
};
my $set_chosen_Depth = sub {
@@ -238,7 +238,7 @@ sub choose_gtk {
$set_chosen_Depth_image->();
};
- my $pixmap_mo;
+ my $pixmap_mo = Gtk2::Image->new;
my $set_chosen_x_res = sub {
$chosen_x_res = $_[0];
if ($_[1]) {
@@ -249,7 +249,7 @@ sub choose_gtk {
$chosen_y_res = $one->{Y};
}
my $image = $monitor_images_x_res{$chosen_x_res} or internal_error("no image for resolution $chosen_x_res");
- $pixmap_mo = $image;
+ $pixmap_mo->set_from_file($image);
};
$set_chosen_x_res->($chosen_x_res, $chosen_y_res);