diff options
| author | Greg Ercolano <erco@seriss.com> | 2011-01-13 17:03:49 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2011-01-13 17:03:49 +0000 |
| commit | 8999b88bd88f77d52d4f9c471d83f0a69c311931 (patch) | |
| tree | 81d1a302b2eb72cfc6952647dd4b387e9c5b923c /src | |
| parent | 0c896c024c10390dc080a2320fd566ab216ab78a (diff) | |
Fixes STR #2519; problems building on VS6.
Verified with VS7, which was giving the same errors.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8272 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Text_Display.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index f69c08772..3e1f22fef 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -1938,19 +1938,19 @@ void Fl_Text_Display::draw_string(int style, fsize = styleRec->size; if (style & PRIMARY_MASK) { - if (Fl::focus() == this) background = selection_color(); + if (Fl::focus() == (Fl_Widget*)this) background = selection_color(); else background = fl_color_average(color(), selection_color(), 0.4f); } else if (style & HIGHLIGHT_MASK) { - if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.5f); + if (Fl::focus() == (Fl_Widget*)this) background = fl_color_average(color(), selection_color(), 0.5f); else background = fl_color_average(color(), selection_color(), 0.6f); } else background = color(); foreground = fl_contrast(styleRec->color, background); } else if (style & PRIMARY_MASK) { - if (Fl::focus() == this) background = selection_color(); + if (Fl::focus() == (Fl_Widget*)this) background = selection_color(); else background = fl_color_average(color(), selection_color(), 0.4f); foreground = fl_contrast(textcolor(), background); } else if (style & HIGHLIGHT_MASK) { - if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.5f); + if (Fl::focus() == (Fl_Widget*)this) background = fl_color_average(color(), selection_color(), 0.5f); else background = fl_color_average(color(), selection_color(), 0.6f); foreground = fl_contrast(textcolor(), background); } else { @@ -2011,13 +2011,13 @@ void Fl_Text_Display::clear_rect(int style, return; if (style & PRIMARY_MASK) { - if (Fl::focus()==this) { + if (Fl::focus()==(Fl_Widget*)this) { fl_color(selection_color()); } else { fl_color(fl_color_average(color(), selection_color(), 0.4f)); } } else if (style & HIGHLIGHT_MASK) { - if (Fl::focus()==this) { + if (Fl::focus()==(Fl_Widget*)this) { fl_color(fl_color_average(color(), selection_color(), 0.5f)); } else { fl_color(fl_color_average(color(), selection_color(), 0.6f)); @@ -3448,7 +3448,7 @@ void Fl_Text_Display::draw(void) { // draw the text cursor if (damage() & (FL_DAMAGE_ALL | FL_DAMAGE_SCROLL | FL_DAMAGE_EXPOSE) && !buffer()->primary_selection()->selected() && - mCursorOn && Fl::focus() == this ) { + mCursorOn && Fl::focus() == (Fl_Widget*)this ) { fl_push_clip(text_area.x-LEFT_MARGIN, text_area.y, text_area.w+LEFT_MARGIN+RIGHT_MARGIN, |