diff options
| -rw-r--r-- | src/fl_draw.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx index 90a9a0aab..83c9b7428 100644 --- a/src/fl_draw.cxx +++ b/src/fl_draw.cxx @@ -3,7 +3,7 @@ // // Label drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -32,7 +32,6 @@ // Expands all unprintable characters to ^X or \nnn notation // Aligns them against the inside of the box. -#define min(a,b) ((a)<(b)?(a):(b)) #include <FL/fl_utf8.h> #include <FL/Fl.H> #include <FL/fl_draw.H> @@ -216,12 +215,12 @@ void fl_draw( *symptr++ = *str++); *symptr = '\0'; if (isspace(*str)) str++; - symwidth[0] = min(w,h); + symwidth[0] = (w < h ? w : h); } if (str && (p = strrchr(str, '@')) != NULL && p > (str + 1) && p[-1] != '@') { strlcpy(symbol[1], p, sizeof(symbol[1])); - symwidth[1] = min(w,h); + symwidth[1] = (w < h ? w : h); } } |