don't call SetInsertionPointEnd() on a read-only combobox (patch 1828963)

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 0c7b85e417e96b5309db9c3cdcd254ff5f7b61e3..4a09bd55fd413420496175ccfd39eded8c399a22 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1560,8 +1560,9 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
     if (m_allowOthers)
     {
         Combo()->SetValue(m_startValue);
     if (m_allowOthers)
     {
         Combo()->SetValue(m_startValue);

+        Combo()->SetInsertionPointEnd();

     }
     }

-    else
+    else // the combobox is read-only

     {
         // find the right position, or default to the first if not found
         int pos = Combo()->FindString(m_startValue);
     {
         // find the right position, or default to the first if not found
         int pos = Combo()->FindString(m_startValue);


@@ -1570,7 +1571,6 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
         Combo()->SetSelection(pos);
     }
 
         Combo()->SetSelection(pos);
     }
 

-    Combo()->SetInsertionPointEnd();

     Combo()->SetFocus();
 
     if (evtHandler)
     Combo()->SetFocus();
 
     if (evtHandler)