mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CMake config.h and compiler warnings.

Browse Source 
Fixed warnings: -Wsign-compare, -Wunused-but-set-variable.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12155 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2016-12-23 15:40:25 +00:00
parent 60a9eee30d
commit 3145e06585
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configh.cmake.in
View File

@ -86,18 +86,18 @@
/* /*
* USE_XFT * USE_XFT
* *
* Use the new Xft library to draw anti-aliased text. * Use the Xft library to draw anti-aliased text.
*/ */
#cmakedefine01 USE_XFT #cmakedefine01 USE_XFT
/* /*
* USE_PANGO: * USE_PANGO
* *
* Use the pango library to draw UTF8 text. * Use the pango library to draw UTF-8 text.
*/ */
#cmakedefine USE_PANGO 1 #cmakedefine01 USE_PANGO
/* /*
* HAVE_XDBE: * HAVE_XDBE:
@ -183,7 +183,7 @@
* to be ported to the core driver setup. * to be ported to the core driver setup.
*/ */
#cmakedefine FL_PORTING 0 #cmakedefine FL_PORTING 1
/* /*
* HAVE_OVERLAY: * HAVE_OVERLAY:

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

@ -1223,14 +1223,10 @@ void Fl_Xlib_Graphics_Driver::do_draw(int from_right, const char *str, int n, in
} }
const char *old = 0; const char *old = 0;
if (!str2) old = pango_layout_get_text(playout_); if (!str2) old = pango_layout_get_text(playout_);
if (!old || strlen(old) != n || memcmp(str, old, n)) // do not re-set text if equal to text already in layout if (!old || (int)strlen(old) != n || memcmp(str, old, n)) // do not re-set text if equal to text already in layout
pango_layout_set_text(playout_, str, n); pango_layout_set_text(playout_, str, n);
if (str2) free(str2); if (str2) free(str2);
int found=0;
if(strstr(str, "α")) {
found=1;
}
XftColor color; XftColor color;
Fl_Color c = this->color(); Fl_Color c = this->color();
color.pixel = fl_xpixel(c); color.pixel = fl_xpixel(c);