diff options
author | Clive Lin <clive@FreeBSD.org> | 2001-12-16 15:21:56 +0000 |
---|---|---|
committer | Clive Lin <clive@FreeBSD.org> | 2001-12-16 15:21:56 +0000 |
commit | 0d819726493b1ebb2b4d0102e6ee3163dfb5ada5 (patch) | |
tree | 949fb9bbcc6a0313011e05fc78382d3e1ed7287d /chinese/gnumeric | |
parent | Upgrade to 1.2.1 (diff) |
Fix gdk_fontset_load () for Chinese fonts.
Submitted by: June-Yen Huang <jihuang@gate.sinica.edu.tw>
Notes
Notes:
svn path=/head/; revision=51628
Diffstat (limited to 'chinese/gnumeric')
-rw-r--r-- | chinese/gnumeric/files/patch-aa | 14 | ||||
-rw-r--r-- | chinese/gnumeric/files/patch-ab | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/chinese/gnumeric/files/patch-aa b/chinese/gnumeric/files/patch-aa index 3856b9fffe13..ffe9ac4029cc 100644 --- a/chinese/gnumeric/files/patch-aa +++ b/chinese/gnumeric/files/patch-aa @@ -1,10 +1,10 @@ ---- src/dialogs/dialog-stf-preview.c.orig Mon Oct 30 17:44:01 2000 -+++ src/dialogs/dialog-stf-preview.c Mon Oct 30 17:44:31 2000 -@@ -711,7 +711,7 @@ - renderdata->gridgroup = NULL; - renderdata->hashtable = g_hash_table_new (g_int_hash, g_int_equal); - -- renderdata->font = gdk_font_load ("fixed"); +--- src/dialogs/dialog-stf-preview.c.orig Fri Dec 14 13:14:57 2001 ++++ src/dialogs/dialog-stf-preview.c Fri Dec 14 13:15:42 2001 +@@ -613,7 +613,7 @@ + * The name of the default font for this locale. + * Preferably something with the correct encoding. + */ +- renderdata->font = gdk_fontset_load (_("fixed")); + renderdata->font = gdk_fontset_load ("-*-medium-r-normal-*-14-*-iso8859-1,-*-medium-r-normal--14-*-*-*-*-*-big5-0"); renderdata->charwidth = gdk_string_width (renderdata->font, "W"); renderdata->charheight = gdk_string_height (renderdata->font, "W"); diff --git a/chinese/gnumeric/files/patch-ab b/chinese/gnumeric/files/patch-ab index e7ee23b97eea..5bab3845277b 100644 --- a/chinese/gnumeric/files/patch-ab +++ b/chinese/gnumeric/files/patch-ab @@ -1,14 +1,18 @@ ---- src/style.c.orig Tue Sep 19 09:41:02 2000 -+++ src/style.c Mon Oct 30 23:11:36 2000 -@@ -70,9 +70,9 @@ +--- src/style.c.orig Fri Dec 14 13:16:08 2001 ++++ src/style.c Fri Dec 14 13:18:30 2001 +@@ -79,13 +79,13 @@ } /* Worst case scenario */ - font->gdk_font = gnome_display_font_get_gdk_font (font->dfont); + font->gdk_font = gdk_fontset_load ("-*-medium-r-normal-*-14-*-iso8859-1,-*-medium-r-normal--14-*-*-*-*-*-big5-0"); if (font->gdk_font == NULL) -- font->gdk_font = gdk_font_load ("fixed"); -+ font->gdk_font = gdk_fontset_load ("-*-medium-r-normal-*-14-*-iso8859-1,-*-medium-r-normal--14-*-*-*-*-*-big5-0"); + /* xgettext: + * The name of the default font for this locale. + * Preferably something with the correct encoding. + */ +- font->gdk_font = gdk_fontset_load (_("fixed")); ++ font->gdk_font = gdk_font_load (_("fixed")); else gdk_font_ref (font->gdk_font); |