X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62d249cb22b95c846afdce4d3a0cd1a63a1672b8..eb83d250fcff394c282cc2f6b2bd98fe1b2e9f23:/src/generic/grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 0c7b85e417..4a09bd55fd 100644
--- 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);
+        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);
@@ -1570,7 +1571,6 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
         Combo()->SetSelection(pos);
     }
 
-    Combo()->SetInsertionPointEnd();
     Combo()->SetFocus();
 
     if (evtHandler)