Fixed an off-by-one error

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 50ffa9ac8fe73f285cb55f7acc808a382da56a7b..f06a6d78e3f46972f17cf88688b9fb8c7de6bae5 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -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
     // corner, so I need to calculate the real position for the text...
 
     // 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...

-    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));
 
     // see comments above
     hdc->SetClippingRegion(wxRectFromPRectangle(rc));
 
     // 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
     // corner, so I need to calculate the real position for the text...
 
     // 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...

-    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);
 }

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 50ffa9ac8fe73f285cb55f7acc808a382da56a7b..f06a6d78e3f46972f17cf88688b9fb8c7de6bae5 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -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
     // corner, so I need to calculate the real position for the text...
 
     // 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...

-    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));
 
     // see comments above
     hdc->SetClippingRegion(wxRectFromPRectangle(rc));
 
     // 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
     // corner, so I need to calculate the real position for the text...
 
     // 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...

-    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);
 }