mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
34 lines
976 B
Diff
34 lines
976 B
Diff
|
--- gtk+-1.2.10/gdk/gdkfont.c.missingchar Mon Aug 13 13:37:52 2001
|
||
|
|
+++ gtk+-1.2.10/gdk/gdkfont.c Mon Aug 13 13:39:30 2001
|
||
|
|
@@ -461,7 +461,6 @@
|
||
|
|
GdkFontPrivate *private;
|
||
|
|
XCharStruct *chars;
|
||
|
|
gint width;
|
||
|
|
- guint ch = character & 0xff; /* get rid of sign-extension */
|
||
|
|
XFontStruct *xfont;
|
||
|
|
XFontSet fontset;
|
||
|
|
|
||
|
|
@@ -474,21 +473,7 @@
|
||
|
|
case GDK_FONT_FONT:
|
||
|
|
/* only 8 bits characters are considered here */
|
||
|
|
xfont = (XFontStruct *) private->xfont;
|
||
|
|
- if ((xfont->min_byte1 == 0) &&
|
||
|
|
- (xfont->max_byte1 == 0) &&
|
||
|
|
- (ch >= xfont->min_char_or_byte2) &&
|
||
|
|
- (ch <= xfont->max_char_or_byte2))
|
||
|
|
- {
|
||
|
|
- chars = xfont->per_char;
|
||
|
|
- if (chars)
|
||
|
|
- width = chars[ch - xfont->min_char_or_byte2].width;
|
||
|
|
- else
|
||
|
|
- width = xfont->min_bounds.width;
|
||
|
|
- }
|
||
|
|
- else
|
||
|
|
- {
|
||
|
|
- width = XTextWidth (xfont, &character, 1);
|
||
|
|
- }
|
||
|
|
+ width = XTextWidth (xfont, &character, 1);
|
||
|
|
break;
|
||
|
|
case GDK_FONT_FONTSET:
|
||
|
|
fontset = (XFontSet) private->xfont;
|