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

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 9c3ff80d3a8e1ee2aadaca4253f57f858a74ad90..8ba55750719a10aa356f280bca6681fd1413fa46 100644 (file)
--- 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))
 {
 
 void wxGenericGrid::OnPaint(wxPaintEvent& WXUNUSED(event))
 {

-  wxRectangle rect;

   int w, h;
   GetClientSize(&w, &h);
 
   int w, h;
   GetClientSize(&w, &h);
 

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index fa2bfe37407a29d39ed31255ab4c4cdd9d7ca1a9..40abc1a3d80ed424de1698277ca886729208a562 100644 (file)
--- 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_xScrollPixelsPerLine = pixelsPerUnitX;
       m_yScrollPixelsPerLine = pixelsPerUnitY;

+      m_xScrollPosition = xPos;
+      m_yScrollPosition = yPos;

       m_xScrollLines = noUnitsX;
       m_yScrollLines = noUnitsY;
 
       m_xScrollLines = noUnitsX;
       m_yScrollLines = noUnitsY;