From b2f9a532e7243aa36052abadcd930edb4924911c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 18 Oct 2004 20:40:36 +0000 Subject: Shortcuts were incorrectly underlined in multi-line labels (STR #566) Remove Winline from GCC options. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3870 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_draw.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx index 84b97cf17..ef44d6420 100644 --- a/src/fl_draw.cxx +++ b/src/fl_draw.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_draw.cxx,v 1.6.2.4.2.16 2004/04/11 04:38:59 easysw Exp $" +// "$Id: fl_draw.cxx,v 1.6.2.4.2.17 2004/10/18 20:40:36 easysw Exp $" // // Label drawing code for the Fast Light Tool Kit (FLTK). // @@ -208,7 +208,7 @@ void fl_draw( callthis(buf,buflen,xpos,ypos-desc); - if (underline_at) + if (underline_at && underline_at >= buf && underline_at < (buf + buflen)) callthis("_",1,xpos+int(fl_width(buf,underline_at-buf)),ypos-desc); if (!*e || (*e == '@' && e[1] != '@')) break; @@ -325,5 +325,5 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) { } // -// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.16 2004/04/11 04:38:59 easysw Exp $". +// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.17 2004/10/18 20:40:36 easysw Exp $". // -- cgit v1.2.3