diff options
| author | damien <damien@mandriva.com> | 2002-02-28 17:50:31 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2002-02-28 17:50:31 +0000 |
| commit | 5388dfcde06664e288cb66b778e64b91f81a5f05 (patch) | |
| tree | c682fe4924d3cc18a245f8d68461bc37c46e64a3 | |
| parent | 5c92113fbbcd1c34c0d9b9c049268a3e0d82965d (diff) | |
| download | control-center-5388dfcde06664e288cb66b778e64b91f81a5f05.tar control-center-5388dfcde06664e288cb66b778e64b91f81a5f05.tar.gz control-center-5388dfcde06664e288cb66b778e64b91f81a5f05.tar.bz2 control-center-5388dfcde06664e288cb66b778e64b91f81a5f05.tar.xz control-center-5388dfcde06664e288cb66b778e64b91f81a5f05.zip | |
corrected bad style initialization
| -rwxr-xr-x | control-center | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/control-center b/control-center index 24185e76..bcf29a61 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 = new Gtk::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-*"))); @@ -418,9 +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_dflt = new Gtk::Style; - my $style = new Gtk::Style; -# $style_dflt->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-*-100-*-*-p-*-iso8859-1,*-r-*"))); + my $style = Gtk::Widget->get_default_style; $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") ); @@ -429,9 +427,6 @@ $darea1->signal_connect( expose_event => sub { while (<VERS>) { push (@revtree,$_) } my @info_tree = split / /, $revtree[0]; my ($sysname, $nodename, $release, $version, $machine) = POSIX::uname(); - my $style1 = new Gtk::Style; - $style1->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*"))); - #_("-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"))); my $i=0; foreach( [_("System:"), "$info_tree[0] $info_tree[1] $info_tree[3] $info_tree[4]"], @@ -718,7 +713,7 @@ sub about_mdk_cc { $bbox1->add($button); my $label = new Gtk::Label( _("Mandrake Control Center %s\n", $_version) ); - my $style1 = new Gtk::Style; + my $style1 = Gtk::Widget->get_default_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 ); |