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

Fix compiler warnings.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2016-05-31 12:09:52 +00:00
parent 5991a49ffe
commit 77f607224c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Fl_Input_.cxx
View File

@ -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)); fl_draw(buf+offset1, offset2-offset1, x1, (float)(Y+ypos+desc));
if (Fl::screen_driver()->has_marked_text() && Fl::compose_state) { if (Fl::screen_driver()->has_marked_text() && Fl::compose_state) {
fl_color( fl_color_average(textcolor(), color(), 0.6) ); fl_color( fl_color_average(textcolor(), color(), 0.6f) );
float width = fl_width(buf+offset1, offset2-offset1); float width = (float)fl_width(buf+offset1, offset2-offset1);
fl_line(x1, Y+ypos+height-1, x1+width, Y+ypos+height-1); fl_line((int)x1, Y+ypos+height-1, (int)(x1+width), Y+ypos+height-1);
} }
if (pp < e) { if (pp < e) {
fl_color(tc); fl_color(tc);
@ -378,7 +378,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
} else { } else {
fl_rectf((int)(xpos+curx+0.5), Y+ypos, 2, height); 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: CONTINUE:

4
src/Fl_Text_Display.cxx
View File

@ -2206,8 +2206,8 @@ void Fl_Text_Display::draw_string(int style,
if (can_leak) fl_push_clip(X, Y, toX - X, mMaxsize); if (can_leak) fl_push_clip(X, Y, toX - X, mMaxsize);
fl_draw( string, nChars, X, Y + mMaxsize - fl_descent()); fl_draw( string, nChars, X, Y + mMaxsize - fl_descent());
if (Fl::screen_driver()->has_marked_text() && Fl::compose_state && (style & PRIMARY_MASK)) { if (Fl::screen_driver()->has_marked_text() && Fl::compose_state && (style & PRIMARY_MASK)) {
fl_color( fl_color_average(foreground, background, 0.6) ); fl_color( fl_color_average(foreground, background, 0.6f) );
fl_line(X, Y + mMaxsize - 1, X + fl_width(string, nChars), Y + mMaxsize - 1); fl_line(X, Y + mMaxsize - 1, X + (int)fl_width(string, nChars), Y + mMaxsize - 1);
} }
if (can_leak) fl_pop_clip(); if (can_leak) fl_pop_clip();
} }

4
src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
View File

@ -256,8 +256,8 @@ void Fl_WinAPI_Printer_Driver::rotate (float rot_angle)
XFORM mat; XFORM mat;
float angle; float angle;
angle = (float) - (rot_angle * M_PI / 180.); angle = (float) - (rot_angle * M_PI / 180.);
mat.eM11 = cos(angle); mat.eM11 = (float)cos(angle);
mat.eM12 = sin(angle); mat.eM12 = (float)sin(angle);
mat.eM21 = - mat.eM12; mat.eM21 = - mat.eM12;
mat.eM22 = mat.eM11; mat.eM22 = mat.eM11;
mat.eDx = mat.eDy = 0; mat.eDx = mat.eDy = 0;