1 --- gdk/x11/gdkdrawable-x11.c~ 2003-08-18 17:02:39.000000000 +0100
2 +++ gdk/x11/gdkdrawable-x11.c 2004-03-29 21:30:17.000000000 +0100
4 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
8 else if (font->type == GDK_FONT_FONTSET)
10 XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
11 XmbDrawString (xdisplay, impl->xid,
12 fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
16 g_error("undefined font type\n");
19 GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
23 else if (font->type == GDK_FONT_FONTSET)
25 if (sizeof(GdkWChar) == sizeof(wchar_t))
32 g_error("undefined font type\n");
35 --- gdk/x11/gdkim-x11.c~ 2002-11-01 00:45:32.000000000 +0000
36 +++ gdk/x11/gdkim-x11.c 2004-03-29 21:28:30.000000000 +0100
39 _gdk_x11_initialize_locale (void)
43 gchar *current_locale;
44 static char *last_locale = NULL;
47 g_message ("%s multi-byte string functions.",
48 gdk_use_mb ? "Using" : "Not using"));
60 GdkDisplay *display = find_a_display ();
71 gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
76 GdkDisplay *display = find_a_display ();
86 --- gdk/x11/gdkfont-x11.c~ 2003-03-06 20:17:55.000000000 +0000
87 +++ gdk/x11/gdkfont-x11.c 2004-03-29 21:29:40.000000000 +0100
89 width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
93 case GDK_FONT_FONTSET:
94 fontset = (XFontSet) private->xfont;
95 width = XmbTextEscapement (fontset, text, text_length);
106 case GDK_FONT_FONTSET:
107 if (sizeof(GdkWChar) == sizeof(wchar_t))
119 *descent = overall.descent;
122 case GDK_FONT_FONTSET:
123 fontset = (XFontSet) private->xfont;
124 XmbTextExtents (fontset, text, text_length, &ink, &logical);
127 *descent = ink.y + ink.height;
134 *descent = overall.descent;
138 case GDK_FONT_FONTSET:
139 fontset = (XFontSet) private->xfont;
143 *descent = ink.y + ink.height;