Applied patch [ 863936 ] wxGrid scroll bars not drawn.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 4e88793b0b9f71e351ac0acb674314ee15c59615..f6d6043082d241902a44005c4cdc9e3fb2fa011e 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -107,6 +107,9 @@ All (GUI):
 - added resolution option to JPEG image handler (Jeff Burton)
 - added wxCalendarEvent::SetDate, wxCalendarEvent::SetWeekDay
 - wxGenericDirCtrl now accepts multiple wildcards
+- added focus event forwarding to wxGrid (Peter Laufenberg)
+- fixed scrollbar problem in wxGrid (not showing scrollbars
+  when sizing smaller) (Shane Harper)
 
 wxMSW:
 

diff --git a/docs/toback24.txt b/docs/toback24.txt
index 698d16fb0fac6c22a39178582693fa4a09349377..3a3c9d442dc9e25c60d79c33c62e2555ee9c6f07 100644 (file)
--- a/docs/toback24.txt
+++ b/docs/toback24.txt
@@ -238,6 +238,17 @@ Checking in src/generic/dirctrlg.cpp;
 /pack/cvsroots/wxwindows/wxWindows/src/generic/dirctrlg.cpp,v  <--  dirctrlg.cpp
 new revision: 1.81; previous revision: 1.80
 
+33. Apply patch [ 873021 ] Bug fix for MSW wxComboBox
+
+wxComboBox::GetValue within a wxEVT_COMMAND_TEXT_UPDATED event
+should now pass the correct value even if the handler for
+wxEVT_COMMAND_COMBOBOX_SELECTED changed the selection.
+
+Checking in src/msw/combobox.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/msw/combobox.cpp,v  <--  combobox.cpp
+new revision: 1.72; previous revision: 1.71
+done
+
 
 TODO for 2.4 (items that are not backports)
 ===========================================

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index df678794c9b960ca2e8b35c8c8b1c2a722df8f6e..6e36f1d0fdf88f8f6e7d504607601b1a19a9256f 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -4239,28 +4239,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
-    {
+    // ensure the position is valid for the new scroll ranges
         if ( x >= w )
-            x = w - 1;
-    }
-
-    if ( h <= ch )
-    {
-        h = y = 0;
-    }
-    else
-    {
+        x = wxMax( w - 1, 0 );
         if ( y >= h )
-            y = h - 1;
-    }
+        y = wxMax( h - 1, 0 );
 
     // do set scrollbar parameters
     SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,