From 11ed4f79aa6b24fa3a86beead18519f87a86d1ea Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 17 Jul 1998 21:03:05 +0000
Subject: [PATCH] Bug fix to scrolwin.cpp (position not set in SetScrollbars);
 redundant variable in wxGrid removed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/gridg.cpp    | 1 -
 src/generic/scrolwin.cpp | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 9c3ff80d3a..8ba5575071 100644
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -405,7 +405,6 @@ void wxGenericGrid::SetGridClippingRegion(wxDC *dc)
 
 void wxGenericGrid::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-  wxRectangle rect;
   int w, h;
   GetClientSize(&w, &h);
 
diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index fa2bfe3740..40abc1a3d8 100644
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -96,6 +96,8 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
       
       m_xScrollPixelsPerLine = pixelsPerUnitX;
       m_yScrollPixelsPerLine = pixelsPerUnitY;
+      m_xScrollPosition = xPos;
+      m_yScrollPosition = yPos;
       m_xScrollLines = noUnitsX;
       m_yScrollLines = noUnitsY;
 
-- 
2.45.2