griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-08-08 17:56:56 +10:00
parent 451203c58d 697d4b227e
commit e4b68befa2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@@ -598,13 +598,15 @@ GHOST_WindowX11(GHOST_SystemX11 *system,
}
#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
static void destroyICCallback(XIC /*xic*/, XPointer ptr, XPointer /*data*/)
static Bool destroyICCallback(XIC /*xic*/, XPointer ptr, XPointer /*data*/)
{
GHOST_PRINT("XIM input context destroyed\n");
if (ptr) {
*(XIC *)ptr = NULL;
}
/* Ignored by X11. */
return True;
}
bool GHOST_WindowX11::createX11_XIC()