diff options
| author | nyamatongwe <devnull@localhost> | 2001-10-28 05:08:21 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2001-10-28 05:08:21 +0000 |
| commit | 03a68a2d26c0dcd83d9ec427b57d66c256502bb3 (patch) | |
| tree | b2b80c00705f988876282127e462bfb3b3ff2180 /src | |
| parent | b6272aec16732b184844bd2773f410f3c0a152dd (diff) | |
| download | scintilla-mirror-03a68a2d26c0dcd83d9ec427b57d66c256502bb3.tar.gz | |
Hid implementation of Surface.
Changed DrawText to DrawTextNoClip to avoid name clash with macro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CallTip.cxx | 6 | ||||
| -rw-r--r-- | src/Editor.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/CallTip.cxx b/src/CallTip.cxx index 807b745f6..4e075cf23 100644 --- a/src/CallTip.cxx +++ b/src/CallTip.cxx @@ -81,7 +81,7 @@ void CallTip::PaintCT(Surface *surfaceWindow) { rcClient.left = x; rcClient.top = ytext - ascent - 1; rcClient.right = xEnd; - surfaceWindow->DrawText(rcClient, font, ytext, + surfaceWindow->DrawTextNoClip(rcClient, font, ytext, chunkVal, thisStartHighlight, colourUnSel.allocated, colourBG.allocated); x = xEnd; @@ -91,7 +91,7 @@ void CallTip::PaintCT(Surface *surfaceWindow) { rcClient.top = ytext; rcClient.left = x; rcClient.right = xEnd; - surfaceWindow->DrawText(rcClient, font, ytext, + surfaceWindow->DrawTextNoClip(rcClient, font, ytext, chunkVal + thisStartHighlight, thisEndHighlight - thisStartHighlight, colourSel.allocated, colourBG.allocated); x = xEnd; @@ -100,7 +100,7 @@ void CallTip::PaintCT(Surface *surfaceWindow) { chunkLength - thisEndHighlight); rcClient.left = x; rcClient.right = xEnd; - surfaceWindow->DrawText(rcClient, font, ytext, + surfaceWindow->DrawTextNoClip(rcClient, font, ytext, chunkVal + thisEndHighlight, chunkLength - thisEndHighlight, colourUnSel.allocated, colourBG.allocated); chunkVal = chunkEnd + 1; diff --git a/src/Editor.cxx b/src/Editor.cxx index 039306a41..a39e7096f 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -876,7 +876,7 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) { int xpos = rcNumber.right - width - 3; rcNumber.left = xpos; if ((visibleLine < cs.LinesDisplayed()) && cs.GetVisible(line)) { - surface->DrawText(rcNumber, vs.styles[STYLE_LINENUMBER].font, + surface->DrawTextNoClip(rcNumber, vs.styles[STYLE_LINENUMBER].font, rcNumber.top + vs.maxAscent, number, strlen(number), vs.styles[STYLE_LINENUMBER].fore.allocated, vs.styles[STYLE_LINENUMBER].back.allocated); @@ -1152,7 +1152,7 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis // Only try to draw if really visible - enhances performance by not calling environment to // draw strings that are completely past the right side of the window. if (rcSegment.left <= rcLine.right) { - surface->DrawText(rcSegment, textFont, + surface->DrawTextNoClip(rcSegment, textFont, rcSegment.top + vsDraw.maxAscent, ll.chars + startseg, i - startseg + 1, textFore, textBack); if (vsDraw.viewWhitespace != wsInvisible || @@ -1665,7 +1665,7 @@ long Editor::FormatRange(bool draw, RangeToFormat *pfr) { // Right justify rcNumber.left -= surface->WidthText(vsPrint.styles[STYLE_LINENUMBER].font, number, strlen(number)); - surface->DrawText(rcNumber, vsPrint.styles[STYLE_LINENUMBER].font, + surface->DrawTextNoClip(rcNumber, vsPrint.styles[STYLE_LINENUMBER].font, ypos + vsPrint.maxAscent, number, strlen(number), vsPrint.styles[STYLE_LINENUMBER].fore.allocated, vsPrint.styles[STYLE_LINENUMBER].back.allocated); |