diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-11-21 16:57:28 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-11-21 16:57:28 +1100 |
| commit | d941bf1f4060f81e343d97237d2347b035586399 (patch) | |
| tree | 398bba6442ad52969818cbf8b8edaa4a3605ac40 | |
| parent | 0d159a59cb25ad96f808d05cdb883cae4db069f2 (diff) | |
| download | scintilla-mirror-d941bf1f4060f81e343d97237d2347b035586399.tar.gz | |
Backport: Make reference argument const as safe to do so.
Backport of changeset 7771:7935a8d953e5.
| -rw-r--r-- | win32/PlatWin.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index e70b8c365..ce8aecb96 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -468,7 +468,7 @@ public: void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) override; void Copy(PRectangle rc, Point from, Surface &surfaceSource) override; - void DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions); + void DrawTextCommon(PRectangle rc, const Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions); void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override; void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override; void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore) override; @@ -809,7 +809,7 @@ void SurfaceGDI::Copy(PRectangle rc, Point from, Surface &surfaceSource) { typedef VarBuffer<int, stackBufferLength> TextPositionsI; -void SurfaceGDI::DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions) { +void SurfaceGDI::DrawTextCommon(PRectangle rc, const Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions) { SetFont(font_); const RECT rcw = RectFromPRectangle(rc); const int x = static_cast<int>(rc.left); @@ -1022,7 +1022,7 @@ public: void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) override; void Copy(PRectangle rc, Point from, Surface &surfaceSource) override; - void DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions); + void DrawTextCommon(PRectangle rc, const Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions); void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override; void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override; void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore) override; @@ -1476,7 +1476,7 @@ void SurfaceD2D::Copy(PRectangle rc, Point from, Surface &surfaceSource) { } } -void SurfaceD2D::DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions) { +void SurfaceD2D::DrawTextCommon(PRectangle rc, const Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions) { SetFont(font_); // Use Unicode calls |