From 8809c5d65dd20895dcae90e9d2af05fd271f2e9e Mon Sep 17 00:00:00 2001 From: Fabien Costantini Date: Thu, 5 Apr 2012 05:12:30 +0000 Subject: Fixed build error in msvs because Fl ref to FULLSCREEN enum was not accessible in Fl_Widget. new inline is_fullscreen() getter has been implemented to avoid a build error with (at least) msvc compilers. Fixed a ton of warnings / problems when bilding on windows 64 bits target with ms toolchain. cleaned up about 200 warnings raised when building win74 targets. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_font.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/fl_font.cxx') diff --git a/src/fl_font.cxx b/src/fl_font.cxx index a03c17f35..6f5f5e0e1 100644 --- a/src/fl_font.cxx +++ b/src/fl_font.cxx @@ -57,20 +57,20 @@ double fl_width(const char* c) { - if (c) return fl_width(c, strlen(c)); + if (c) return fl_width(c, (int) strlen(c)); else return 0.0f; } void fl_draw(const char* str, int x, int y) { - fl_draw(str, strlen(str), x, y); + fl_draw(str, (int) strlen(str), x, y); } void fl_draw(int angle, const char* str, int x, int y) { - fl_draw(angle, str, strlen(str), x, y);//must be fixed! + fl_draw(angle, str, (int) strlen(str), x, y);//must be fixed! } void fl_text_extents(const char *c, int &dx, int &dy, int &w, int &h) { - if (c) fl_text_extents(c, strlen(c), dx, dy, w, h); + if (c) fl_text_extents(c, (int) strlen(c), dx, dy, w, h); else { w = 0; h = 0; dx = 0; dy = 0; -- cgit v1.2.3