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_Text_Display.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_Text_Display.cxx')
| -rw-r--r-- | src/Fl_Text_Display.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index eba2557e3..fa1f6fe1f 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -723,7 +723,7 @@ void Fl_Text_Display::insert(const char* text) { int pos = mCursorPos; - mCursorToHint = pos + strlen( text ); + mCursorToHint = (int) (pos + strlen( text )); mBuffer->insert( pos, text ); mCursorToHint = NO_HINT; } @@ -743,7 +743,7 @@ void Fl_Text_Display::overstrike(const char* text) { int startPos = mCursorPos; Fl_Text_Buffer *buf = mBuffer; int lineStart = buf->line_start( startPos ); - int textLen = strlen( text ); + int textLen = (int) strlen( text ); int i, p, endPos, indent, startIndent, endIndent; const char *c; unsigned int ch; @@ -3703,7 +3703,7 @@ int Fl_Text_Display::handle(int event) { } const char* copy = buffer()->selection_text(); - if (*copy) Fl::copy(copy, strlen(copy), 0); + if (*copy) Fl::copy(copy, (int) strlen(copy), 0); free((void*)copy); return 1; } @@ -3737,7 +3737,7 @@ int Fl_Text_Display::handle(int event) { if ((Fl::event_state()&(FL_CTRL|FL_COMMAND)) && Fl::event_key()=='c') { if (!buffer()->selected()) return 1; const char *copy = buffer()->selection_text(); - if (*copy) Fl::copy(copy, strlen(copy), 1); + if (*copy) Fl::copy(copy, (int) strlen(copy), 1); free((void*)copy); return 1; } @@ -3746,7 +3746,7 @@ int Fl_Text_Display::handle(int event) { if ((Fl::event_state()&(FL_CTRL|FL_COMMAND)) && Fl::event_key()=='a') { buffer()->select(0,buffer()->length()); const char *copy = buffer()->selection_text(); - if (*copy) Fl::copy(copy, strlen(copy), 0); + if (*copy) Fl::copy(copy, (int) strlen(copy), 0); free((void*)copy); return 1; } |