mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solves STR #2428: Silence double->int conversion warnings

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7838 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Greg Ercolano 2010-11-15 08:01:06 +00:00
parent e5ac1f7b97
commit 6ab895a099
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Fl_Text_Display.cxx
View File

@ -672,7 +672,7 @@ void Fl_Text_Display::wrap_mode(int wrap, int wrapMargin) {
break; break;
case WRAP_AT_COLUMN: case WRAP_AT_COLUMN:
default: default:
mWrapMarginPix = col_to_x(wrapMargin); mWrapMarginPix = int(col_to_x(wrapMargin));
mContinuousWrap = 1; mContinuousWrap = 1;
break; break;
case WRAP_AT_PIXEL: case WRAP_AT_PIXEL:
@ -1747,7 +1747,7 @@ int Fl_Text_Display::handle_vline(
// FIXME: if the character is an optional hyphen, we need to ignore it unless we wrap the text // FIXME: if the character is an optional hyphen, we need to ignore it unless we wrap the text
if (charStyle!=style) { if (charStyle!=style) {
// draw a segment whenever the style changes // draw a segment whenever the style changes
int w = string_width( lineStr+startIndex, i-startIndex, style ); int w = int( string_width( lineStr+startIndex, i-startIndex, style ) );
if (mode==DRAW_LINE) if (mode==DRAW_LINE)
draw_string( style, startX, Y, startX+w, lineStr+startIndex, i-startIndex ); draw_string( style, startX, Y, startX+w, lineStr+startIndex, i-startIndex );
if (mode==FIND_INDEX && startX+w>rightClip) { if (mode==FIND_INDEX && startX+w>rightClip) {
@ -1767,7 +1767,7 @@ int Fl_Text_Display::handle_vline(
} }
i += len; i += len;
} }
int w = string_width( lineStr+startIndex, i-startIndex, style ); int w = int( string_width( lineStr+startIndex, i-startIndex, style ) );
if (mode==DRAW_LINE) if (mode==DRAW_LINE)
draw_string( style, startX, Y, startX+w, lineStr+startIndex, i-startIndex ); draw_string( style, startX, Y, startX+w, lineStr+startIndex, i-startIndex );
if (mode==FIND_INDEX) { if (mode==FIND_INDEX) {
@ -1809,7 +1809,7 @@ int Fl_Text_Display::find_x(const char *s, int len, int style, int x) const {
int i = 0; int i = 0;
while (i<len) { while (i<len) {
int cl = fl_utf8len(s[i]); int cl = fl_utf8len(s[i]);
int w = string_width(s, i+cl, style); int w = int( string_width(s, i+cl, style) );
if (w>x) if (w>x)
return i; return i;
i += cl; i += cl;