Author: manolo
Date: 2011-02-07 08:04:59 -0800 (Mon, 07 Feb 2011)
New Revision: 8398
Log:
Fix STR #2557.
Modified:
branches/branch-1.3/src/fl_draw.cxx
Modified: branches/branch-1.3/src/fl_draw.cxx
===================================================================
--- branches/branch-1.3/src/fl_draw.cxx 2011-02-07 14:30:30 UTC (rev 8397)
+++ branches/branch-1.3/src/fl_draw.cxx 2011-02-07 16:04:59 UTC (rev 8398)
@@ -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 @@
*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);
}
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
