diff --git a/src/Fl_Input_.cxx b/src/Fl_Input_.cxx index e1d84fcf9..a7f6a9196 100644 --- a/src/Fl_Input_.cxx +++ b/src/Fl_Input_.cxx @@ -346,9 +346,9 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) { } fl_draw(buf+offset1, offset2-offset1, x1, (float)(Y+ypos+desc)); if (Fl::screen_driver()->has_marked_text() && Fl::compose_state) { - fl_color( fl_color_average(textcolor(), color(), 0.6) ); - float width = fl_width(buf+offset1, offset2-offset1); - fl_line(x1, Y+ypos+height-1, x1+width, Y+ypos+height-1); + fl_color( fl_color_average(textcolor(), color(), 0.6f) ); + float width = (float)fl_width(buf+offset1, offset2-offset1); + fl_line((int)x1, Y+ypos+height-1, (int)(x1+width), Y+ypos+height-1); } if (pp < e) { fl_color(tc); @@ -378,7 +378,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) { } else { fl_rectf((int)(xpos+curx+0.5), Y+ypos, 2, height); } - Fl::insertion_point_location(xpos+curx, Y+ypos+height, height); + Fl::insertion_point_location((int)xpos+curx, Y+ypos+height, height); } CONTINUE: diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 9588e2beb..4d2b8bdd8 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -2206,8 +2206,8 @@ void Fl_Text_Display::draw_string(int style, if (can_leak) fl_push_clip(X, Y, toX - X, mMaxsize); fl_draw( string, nChars, X, Y + mMaxsize - fl_descent()); if (Fl::screen_driver()->has_marked_text() && Fl::compose_state && (style & PRIMARY_MASK)) { - fl_color( fl_color_average(foreground, background, 0.6) ); - fl_line(X, Y + mMaxsize - 1, X + fl_width(string, nChars), Y + mMaxsize - 1); + fl_color( fl_color_average(foreground, background, 0.6f) ); + fl_line(X, Y + mMaxsize - 1, X + (int)fl_width(string, nChars), Y + mMaxsize - 1); } if (can_leak) fl_pop_clip(); } diff --git a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx index ded681695..03e94bee2 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx @@ -256,8 +256,8 @@ void Fl_WinAPI_Printer_Driver::rotate (float rot_angle) XFORM mat; float angle; angle = (float) - (rot_angle * M_PI / 180.); - mat.eM11 = cos(angle); - mat.eM12 = sin(angle); + mat.eM11 = (float)cos(angle); + mat.eM12 = (float)sin(angle); mat.eM21 = - mat.eM12; mat.eM22 = mat.eM11; mat.eDx = mat.eDy = 0;