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_draw.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_draw.cxx')
| -rw-r--r-- | src/fl_draw.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx index 657ee05ec..46ca4bdec 100644 --- a/src/fl_draw.cxx +++ b/src/fl_draw.cxx @@ -118,7 +118,7 @@ fl_expand_text(const char* from, char* buf, int maxbuf, double maxw, int& n, if (!c || c == ' ' || c == '\n') { // test for word-wrap: if (word_start < p && wrap) { - double newwidth = w + fl_width(word_end, o-word_end); + double newwidth = w + fl_width(word_end, (int) (o-word_end) ); if (word_end > buf && newwidth > maxw) { // break before this word o = word_end; p = word_start; @@ -135,7 +135,7 @@ fl_expand_text(const char* from, char* buf, int maxbuf, double maxw, int& n, if (o > e) break; // don't overflow buffer if (c == '\t') { - for (c = fl_utf_nb_char((uchar*)buf, o-buf)%8; c<8 && o<e; c++) + for (c = fl_utf_nb_char((uchar*)buf, (int) (o-buf) )%8; c<8 && o<e; c++) *o++ = ' '; } else if (c == '&' && fl_draw_shortcut && *(p+1)) { if (*(p+1) == '&') {p++; *o++ = '&';} @@ -160,9 +160,9 @@ fl_expand_text(const char* from, char* buf, int maxbuf, double maxw, int& n, } } - width = w + fl_width(word_end, o-word_end); + width = w + fl_width(word_end, (int) (o-word_end)); *o = 0; - n = o-buf; + n = (int) (o-buf); return p; } @@ -303,7 +303,7 @@ void fl_draw( callthis(buf,buflen,xpos,ypos-desc); if (underline_at && underline_at >= buf && underline_at < (buf + buflen)) - callthis("_",1,xpos+int(fl_width(buf,underline_at-buf)),ypos-desc); + callthis("_",1,xpos+int(fl_width(buf,(int) (underline_at-buf))),ypos-desc); if (!*e || (*e == '@' && e[1] != '@')) break; p = e; |