mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive] 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12376 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2017-08-12 15:28:44 +00:00
parent 7a6124bda6
commit 44a3f9fce9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
View File

@ -1344,7 +1344,7 @@ Fl_Font Fl_Xlib_Graphics_Driver::set_fonts(const char* pattern_name)
pango_font_family_list_faces(families[fam], &faces, &n_faces); pango_font_family_list_faces(families[fam], &faces, &n_faces);
for (int j = 0; j < n_faces; j++) { for (int j = 0; j < n_faces; j++) {
char prefix = ' ', *q; char prefix = ' ', *q;
const char *p = pango_font_face_get_face_name(faces[j]); char *p = (char*)pango_font_face_get_face_name(faces[j]);
// build the font's FLTK name // build the font's FLTK name
if (strcmp(p, "Regular") == 0) p = NULL; if (strcmp(p, "Regular") == 0) p = NULL;
else if (strcmp(p, "Bold Italic") == 0 || strcmp(p, "Bold Oblique") == 0) {p = NULL; prefix = 'P';} else if (strcmp(p, "Bold Italic") == 0 || strcmp(p, "Bold Oblique") == 0) {p = NULL; prefix = 'P';}