diff --git a/docs/changes.txt b/docs/changes.txt
index 1a02d55993..201d7e0771 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -193,6 +193,8 @@ All (GUI):
 Generic:
 
 - file dialog and directory dialog now support drive letters on OS/2
+- fixed scrollbar problem in wxGrid (not showing scrollbars
+  when sizing smaller) (Shane Harper)
 
 Unix:
 
@@ -202,6 +204,11 @@ wxMSW:
 
 - strip ampersands from strings returned by wxMenuBar::GetLabelTop()
 - fixed bug in wxIniConfig::DeleteEntry() (Parinya Thipchart)
+- wxLongLong formatting with MinGW corrected
+
+wxGTK:
+
+- allow calling wxWindow::SetFont if window not yet created
 
 wxOS2:
 - fixed various problems in file handling
@@ -210,7 +217,6 @@ wxOS2:
 - partly fixed wxMouseEvent (reversed coordinate system again, handling of
   CTRL and SHIFT keys. ALT still doesn't work as expected by wxWindows, though)
 
- 
 
 2.4.2
 -----
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 65e74f1090..746f2ff1c3 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -4090,28 +4090,11 @@ void wxGrid::CalcDimensions()
     int x, y;
     GetViewStart( &x, &y );
 
-    // maybe we don't need scrollbars at all?
-    //
-    // also adjust the position to be valid for the new scroll rangs
-    if ( w <= cw )
-    {
-        w = x = 0;
-    }
-    else
-    {
-        if ( x >= w )
-            x = w - 1;
-    }
-
-    if ( h <= ch )
-    {
-        h = y = 0;
-    }
-    else
-    {
-        if ( y >= h )
-            y = h - 1;
-    }
+    // ensure the position is valid for the new scroll ranges
+    if ( x >= w )
+        x = wxMax( w - 1, 0 );
+    if ( y >= h )
+        y = wxMax( h - 1, 0 );
 
     // do set scrollbar parameters
     SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,