Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an off-by-one error

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-02-13 23:05:20 +00:00
parent f567fcfadc
commit 0fcf2b15da
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/src/stc/PlatWX.cpp
View File

@@ -411,7 +411,7 @@ void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase,
// ybase is where the baseline should be, but wxWin uses the upper left // ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text... // corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1);
} }
void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase, void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
@@ -424,7 +424,7 @@ void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
hdc->SetClippingRegion(wxRectFromPRectangle(rc)); hdc->SetClippingRegion(wxRectFromPRectangle(rc));
// see comments above // see comments above
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1);
hdc->DestroyClippingRegion(); hdc->DestroyClippingRegion();
} }
@@ -439,7 +439,7 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase,
// ybase is where the baseline should be, but wxWin uses the upper left // ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text... // corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1);
hdc->SetBackgroundMode(wxSOLID); hdc->SetBackgroundMode(wxSOLID);
} }

6
src/stc/PlatWX.cpp
View File

@@ -411,7 +411,7 @@ void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase,
// ybase is where the baseline should be, but wxWin uses the upper left // ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text... // corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1);
} }
void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase, void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
@@ -424,7 +424,7 @@ void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
hdc->SetClippingRegion(wxRectFromPRectangle(rc)); hdc->SetClippingRegion(wxRectFromPRectangle(rc));
// see comments above // see comments above
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1);
hdc->DestroyClippingRegion(); hdc->DestroyClippingRegion();
} }
@@ -439,7 +439,7 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase,
// ybase is where the baseline should be, but wxWin uses the upper left // ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text... // corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1);
hdc->SetBackgroundMode(wxSOLID); hdc->SetBackgroundMode(wxSOLID);
} }