From 6ab895a0996d2bf41db5ce025fdf5c84aa36da43 Mon Sep 17 00:00:00 2001
From: Greg Ercolano <erco@seriss.com>
Date: Mon, 15 Nov 2010 08:01:06 +0000
Subject: Solves STR #2428: Silence double->int conversion warnings

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7838 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Text_Display.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Fl_Text_Display.cxx')

diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx
index 033222db0..457f8e27e 100644
--- a/src/Fl_Text_Display.cxx
+++ b/src/Fl_Text_Display.cxx
@@ -672,7 +672,7 @@ void Fl_Text_Display::wrap_mode(int wrap, int wrapMargin) {
       break;
     case WRAP_AT_COLUMN: 
     default:
-      mWrapMarginPix = col_to_x(wrapMargin);
+      mWrapMarginPix = int(col_to_x(wrapMargin));
       mContinuousWrap = 1;
       break;
     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
     if (charStyle!=style) {
       // 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)
         draw_string( style, startX, Y, startX+w, lineStr+startIndex, i-startIndex );
       if (mode==FIND_INDEX && startX+w>rightClip) {
@@ -1767,7 +1767,7 @@ int Fl_Text_Display::handle_vline(
     }
     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)
     draw_string( style, startX, Y, startX+w, lineStr+startIndex, i-startIndex );
   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;
   while (i<len) {
     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) 
       return i;
     i += cl;
-- 
cgit v1.2.3