diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-10-18 20:40:36 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-10-18 20:40:36 +0000 |
| commit | b2f9a532e7243aa36052abadcd930edb4924911c (patch) | |
| tree | 146caa5cc015fce83fe9a0df5eec904080d0fa11 | |
| parent | ca005c406787c5ccf5c0cf0bc5275ea7a6ed1ba7 (diff) | |
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
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/fl_draw.cxx | 6 |
3 files changed, 8 insertions, 6 deletions
@@ -1,6 +1,8 @@ CHANGES IN FLTK 1.1.5 - Documentation updates (STR #568, STR #570) + - Shortcuts were incorrectly underlined in multi-line + labels (STR #566) - More CMake updates (STR #499) - The Watcom C++ compiler needed a small change (STR #567) diff --git a/configure.in b/configure.in index b0cfa6bf3..3e0ae0783 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.118 2004/09/24 20:08:29 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.119 2004/10/18 20:40:36 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -730,7 +730,7 @@ if test -n "$GCC"; then # Show all standard warnings + unused variables, conversion errors, # and inlining problems when compiling... - OPTIM="-Wall -Wunused -Wconversion -Winline $OPTIM" + OPTIM="-Wall -Wunused -Wconversion $OPTIM" # The following additional warnings are useful for tracking down problems... #OPTIM="-Wshadow $OPTIM" @@ -911,5 +911,5 @@ dnl Make sure the fltk-config script is executable... chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.118 2004/09/24 20:08:29 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.119 2004/10/18 20:40:36 easysw Exp $". dnl 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 $". // |