diff options
| author | Fabien Costantini <fabien@onepost.net> | 2012-04-05 05:12:30 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2012-04-05 05:12:30 +0000 |
| commit | 8809c5d65dd20895dcae90e9d2af05fd271f2e9e (patch) | |
| tree | d53cbf6d921ae68bda31b6c5d522dc8c87ee9bd1 /src/fl_plastic.cxx | |
| parent | 37ea8ba9e635e9655417714bd49ab7bb2b36beb5 (diff) | |
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
Diffstat (limited to 'src/fl_plastic.cxx')
| -rw-r--r-- | src/fl_plastic.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fl_plastic.cxx b/src/fl_plastic.cxx index 7c90a519f..dd70a2bbc 100644 --- a/src/fl_plastic.cxx +++ b/src/fl_plastic.cxx @@ -72,7 +72,7 @@ inline Fl_Color shade_color(uchar gc, Fl_Color bc) { static void frame_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { uchar *g = fl_gray_ramp(); - int b = strlen(c) / 4 + 1; + int b = ((int) strlen(c)) / 4 + 1; for (x += b, y += b, w -= 2 * b, h -= 2 * b; b > 1; b --) { @@ -92,7 +92,7 @@ static void frame_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { static void frame_round(int x, int y, int w, int h, const char *c, Fl_Color bc) { uchar *g = fl_gray_ramp(); - int b = strlen(c) / 4 + 1; + size_t b = strlen(c) / 4 + 1; if (w==h) { for (; b > 1; b --, x ++, y ++, w -= 2, h -= 2) @@ -147,8 +147,8 @@ static void frame_round(int x, int y, int w, int h, const char *c, Fl_Color bc) static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { uchar *g = fl_gray_ramp(); int i, j; - int clen = strlen(c) - 1; - int chalf = clen / 2; + int clen = (int) strlen(c) - 1; + int chalf = clen / 2; int cstep = 1; if (h < (w * 2)) { @@ -219,8 +219,8 @@ static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { static void shade_round(int x, int y, int w, int h, const char *c, Fl_Color bc) { uchar *g = fl_gray_ramp(); int i; - int clen = strlen(c) - 1; - int chalf = clen / 2; + int clen = (int) (strlen(c) - 1); + int chalf = clen / 2; if (w>h) { int d = h/2; |