fix off by one (or rather "off by border width") bug in ScrollWindow() (part of patch...

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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 2e2df49db87ac9102ed8a3bc714b0a68b9c8d55c..cdcd39a1b0b4e2f6096da662bca833e137476d27 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -676,8 +676,8 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
 
         if (dx < 0) s_x += -dx;
         if (dy < 0) s_y += -dy;
 
         if (dx < 0) s_x += -dx;
         if (dy < 0) s_y += -dy;

-        if (dx > 0) d_x = dx + offset.x;
-        if (dy > 0) d_y = dy + offset.y;
+        if (dx > 0) d_x += dx + offset.x;
+        if (dy > 0) d_y += dy + offset.y;

 
         XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y );
 
 
         XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y );