Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-22 15:22:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix STR #2470. Don't call Xutf8TextPropertyToTextList if X_HAVE_UTF8_STRING isn't defined

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7970 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2010-12-07 18:25:15 +00:00
parent 0db080e762
commit 271e1d8212
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_x.cxx
+8 -3
View File
@@ -955,14 +955,19 @@ int fl_handle(const XEvent& thisevent)
text_prop.encoding=actual;
text_prop.nitems=count;
char **text_list;
#ifndef X_HAVE_UTF8_STRING
text_list = (char**)&portion;
#else
int list_count;
Xutf8TextPropertyToTextList(fl_display,
+ (const XTextProperty*)&text_prop, &text_list, &list_count);
Xutf8TextPropertyToTextList(fl_display, (const XTextProperty*)&text_prop, &text_list, &list_count);
#endif
int bytesnew = strlen(*text_list)+1;
XFree(portion);
buffer = (unsigned char*)realloc(buffer, bytesread+bytesnew+remaining);
memcpy(buffer+bytesread, *text_list, bytesnew);
XFree(portion);
#ifdef X_HAVE_UTF8_STRING
XFreeStringList(text_list);
#endif
bytesread += bytesnew - 1;
if (!remaining) break;
}