mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Michael R Sweet 2004-10-18 20:40:36 +00:00
parent ca005c4067
commit b2f9a532e7
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -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)

6
configure.in
View File

@ -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

6
src/fl_draw.cxx
View File

@ -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 $".
//