changed bad stylecontrol-center

1 files changed, 8 insertions, 8 deletions

diff --git a/control-center b/control-center
index bcf29a61..90b8ebd4 100755
--- a/control-center
+++ b/control-center
@@ -222,7 +222,7 @@ my @back;
 ($back[0], undef) = gtkcreate_png_('mcc-left-back');
 ($back[2], undef) = gtkcreate_png_('mcc-left-back2');
 $back[1] = $back[0];
-my $style_dflt = Gtk::Widget->get_default_style;
+#my $style_dflt = Gtk::Widget->get_default_style;
 # fontsets *must* be used in order to allow proper font selection for non
 # latin1 languages; never use a simple font, *always* load a fontset
 # $style_dflt->font(Gtk::Gdk::Font->fontset_load(_("-*-times-bold-r-normal-*-14-*-*-*-p-*-iso8859-1,*-r-*")));
@@ -248,7 +248,7 @@ foreach (@tree) {
 				     if (!defined($dbl_area_left) || $darea_left->{state} != $dbl_area_left->{state} ) {
 					 my $state = $darea_left->{state};
 					 my ($pix, $width, $height) = create_pix_text($darea_left, $text, "#0#0#0",
-									$style_dflt->font,
+									$darea_left->style->font,
 								       max($dx-40, 0), $dy, 0, 0, $back[$state], 160, 45, 0, 1, $state); 
 					 $dbl_area_left = new Gtk::Gdk::Pixmap($darea_left->window, $dx, $dy);
 					 $dbl_area_left->{state} = $darea_left->{state};
@@ -418,7 +418,7 @@ $darea1->signal_connect( expose_event => sub {
 	 $pix_dbl = new Gtk::Gdk::Pixmap($darea1->window, $dx, $dy);
 
 	 fill_tiled($darea1, $pix_dbl, $pixmap_back_right, 540, 460, $dx, $dy);
-	 my $style = Gtk::Widget->get_default_style;
+	 my $style = $darea1->style->copy();;
 	 $style->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*")));
 		      #_("-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*")));
 	 $pix_dbl->draw_string($style->font, $darea1->style->black_gc, 80, 115, _("Welcome to the Mandrake Control Center") );
@@ -433,9 +433,9 @@ $darea1->signal_connect( expose_event => sub {
 		 [_("Hostname:"), $nodename],
 		 [_("Kernel Version:"), "$release"],# $version"],
 		 [_("Machine:"), $machine] ) {
-	     $pix_dbl->draw_string($style_dflt->font, $darea1->style->black_gc, 80, 150+$i, $_->[0]);
-	     $pix_dbl->draw_string($style_dflt->font, $darea1->style->black_gc, 81, 150+$i, $_->[0]);
-	     $pix_dbl->draw_string($style_dflt->font, $darea1->style->black_gc, 200, 150+$i, $_->[1]);
+	     $pix_dbl->draw_string($darea1->style->font, $darea1->style->black_gc, 80, 150+$i, $_->[0]);
+	     $pix_dbl->draw_string($darea1->style->font, $darea1->style->black_gc, 81, 150+$i, $_->[0]);
+	     $pix_dbl->draw_string($darea1->style->font, $darea1->style->black_gc, 200, 150+$i, $_->[1]);
 	     $i+=20;
 	 }
      }
@@ -448,7 +448,7 @@ $darea1->signal_connect( expose_event => sub {
 
 my $cursor = new Gtk::Gdk::Cursor 15;
 foreach (@tree) {
-    my $w = gtkicons_labels_widget($_->[2], $window_global, "#0#0#0", $style_dflt->font,
+    my $w = gtkicons_labels_widget($_->[2], $window_global, "#0#0#0", $window_global->style->font,
 				   #"-urw-times-bold-r-normal-*-*-100-*-*-p-*-iso8859-1"),
 				   $pixmap_back_right, 540, 460, 55, 50, 50, 50, 50, 50, \&compute_exec_string, $exec_hash);
     $notebook_global->append_page($w);
@@ -713,7 +713,7 @@ sub about_mdk_cc {
     $bbox1->add($button);
 
     my $label = new Gtk::Label( _("Mandrake Control Center %s\n", $_version) );
-    my $style1 = Gtk::Widget->get_default_style;
+    my $style1 = $label->style;
     $style1->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*")));
     $label->set_style($style1); 
     $window_about->vbox->pack_start( $label, 1, 1, 0 );