Applied patch [ 800086 ] GridCellTextEditor wxTE_RICH misbehaving

Don't set the value of the hidden editor control (useless)

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 6e36f1d0fdf88f8f6e7d504607601b1a19a9256f..753fcf01b729b24696101ed7dd09d944e7aec28e 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -668,7 +668,8 @@ bool wxGridCellTextEditor::EndEdit(int row, int col,
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;
         grid->GetTable()->SetValue(row, col, value);
 
     m_startValue = wxEmptyString;

-    Text()->SetValue(m_startValue);
+    // No point in setting the text of the hidden control
+    //Text()->SetValue(m_startValue);

 
     return changed;
 }
 
     return changed;
 }


@@ -4240,9 +4241,9 @@ void wxGrid::CalcDimensions()
     GetViewStart( &x, &y );
 
     // ensure the position is valid for the new scroll ranges
     GetViewStart( &x, &y );
 
     // ensure the position is valid for the new scroll ranges

-        if ( x >= w )
+    if ( x >= w )

         x = wxMax( w - 1, 0 );
         x = wxMax( w - 1, 0 );

-        if ( y >= h )
+    if ( y >= h )

         y = wxMax( h - 1, 0 );
 
     // do set scrollbar parameters
         y = wxMax( h - 1, 0 );
 
     // do set scrollbar parameters