marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11.drv: Remove call to XCreateFontSet.

oldstable
Nigel Liang 2007-06-21 13:29:13 -07:00 committed by Alexandre Julliard
parent 893eec9ff7
commit 2f3a02ea2f
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/winex11.drv/xim.c
View File

@ -456,9 +456,6 @@ err:
XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
{
XFontSet fontSet = NULL;
char **list;
int count;
XPoint spot = {0};
XVaNestedList preedit = NULL;
XVaNestedList status = NULL;
@ -485,29 +482,6 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
return xic;
}
if (((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) ||
((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0))
{
fontSet = XCreateFontSet(display,
"*", /*FIXME*/
&list, &count, NULL);
TRACE("ximFontSet = %p\n", fontSet);
TRACE("list = %p, count = %d\n", list, count);
if (list != NULL)
{
int i;
for (i = 0; i < count; ++i)
{
TRACE("list[%d] = %s\n", i, list[i]);
}
XFreeStringList(list);
}
}
/* create callbacks */
P_StartCB.client_data = NULL;
P_StartCB.callback = (XIMProc)XIMPreEditStartCallback;
@ -521,7 +495,6 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0)
{
preedit = XVaCreateNestedList(0,
XNFontSet, fontSet,
XNSpotLocation, &spot,
XNPreeditStartCallback, &P_StartCB,
XNPreeditDoneCallback, &P_DoneCB,
@ -545,7 +518,6 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
if ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0)
{
status = XVaCreateNestedList(0,
XNFontSet, fontSet,
NULL);
TRACE("status = %p\n", status);
}