Author: manolo
Date: 2010-12-15 01:21:14 -0800 (Wed, 15 Dec 2010)
New Revision: 8030
Log:
Removed MSWin compiler warnings
Modified:
branches/branch-1.3/src/Fl_Text_Display.cxx
Modified: branches/branch-1.3/src/Fl_Text_Display.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Text_Display.cxx 2010-12-14 21:07:45 UTC (rev
8029)
+++ branches/branch-1.3/src/Fl_Text_Display.cxx 2010-12-15 09:21:14 UTC (rev
8030)
@@ -1743,7 +1743,7 @@
int w = 0;
if (prevChar=='\t') {
// draw a single Tab space
- int tab = col_to_x(8);
+ int tab = (int)col_to_x(8);
int xAbs = (mode==GET_WIDTH) ? startX :
startX+mHorizOffset-text_area.x;
w = (((xAbs/tab)+1)*tab) - xAbs;
if (mode==DRAW_LINE)
@@ -1776,7 +1776,7 @@
int w = 0;
if (currChar=='\t') {
// draw a single Tab space
- int tab = col_to_x(8);
+ int tab = (int)col_to_x(8);
int xAbs = (mode==GET_WIDTH) ? startX : startX+mHorizOffset-text_area.x;
w = (((xAbs/tab)+1)*tab) - xAbs;
if (mode==DRAW_LINE)
@@ -3117,7 +3117,7 @@
// FIXME: it is not a good idea to simply add character widths because on
// some platforms, the width is a floating point value and depends on
the
// previous character as well.
- width += measure_proportional_character(s, width, p+styleBufOffset);
+ width += measure_proportional_character(s, (int)width, p+styleBufOffset);
}
/* If character exceeded wrap margin, find the break point and wrap there
*/
@@ -3131,7 +3131,7 @@
width = 0;
int iMax = buf->next_char(p);
for (i=buf->next_char(b); i<iMax; i = buf->next_char(i)) {
- width += measure_proportional_character(buf->address(i), width,
+ width += measure_proportional_character(buf->address(i),
(int)width,
i+styleBufOffset);
colNum++;
}
@@ -3200,7 +3200,7 @@
IS_UTF8_ALIGNED(s)
if (*s=='\t') {
- int tab = col_to_x(8);
+ int tab = (int)col_to_x(8);
return (((xPix/tab)+1)*tab) - xPix;
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
