Removed compilation warnings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8037 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
895f80a0c7
commit
ff1d7b6dad
@ -160,8 +160,8 @@ static const char *find_best_font(const char *fname, int size) {
|
||||
name = namebuffer;
|
||||
ptsize = size;
|
||||
} else if (!ptsize || // no fonts yet
|
||||
thissize < ptsize && ptsize > size || // current font too big
|
||||
thissize > ptsize && thissize <= size // current too small
|
||||
(thissize < ptsize && ptsize > size) || // current font too big
|
||||
(thissize > ptsize && thissize <= size) // current too small
|
||||
) {
|
||||
name = thisname;
|
||||
ptsize = thissize;
|
||||
|
@ -260,7 +260,7 @@ static int to_canonical(char *to, const char *from, size_t tolen) {
|
||||
static unsigned int fl_free_font = FL_FREE_FONT;
|
||||
|
||||
Fl_Font Fl::set_fonts(const char* xstarname) {
|
||||
if (fl_free_font > FL_FREE_FONT) // already been here
|
||||
if (fl_free_font > (unsigned)FL_FREE_FONT) // already been here
|
||||
return (Fl_Font)fl_free_font;
|
||||
fl_open_display();
|
||||
int xlistsize;
|
||||
|
Loading…
x
Reference in New Issue
Block a user