Allow using horizontal cursor navigation keys in non-readonly wxComboCtrl.

Don't intercept Left/Right/Home/End keys until the control is read-only,
otherwise they're more useful for navigating in its text part than in its
drop-down.

Closes #14648.

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

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 353790fe1955f4424543b4e6a128d2bc7288d22e..01118eafb7b347b42d860d002ad8c435b1370db9 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -277,12 +277,14 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar
             keychar = 0;
     }
 
             keychar = 0;
     }
 

-    if ( keycode == WXK_DOWN || keycode == WXK_NUMPAD_DOWN || keycode == WXK_RIGHT )
+    const bool readOnly = (comboStyle & wxCB_READONLY) != 0;
+
+    if ( keycode == WXK_DOWN || keycode == WXK_NUMPAD_DOWN || ( keycode == WXK_RIGHT && readOnly ) )

     {
         value++;
         StopPartialCompletion();
     }
     {
         value++;
         StopPartialCompletion();
     }

-    else if ( keycode == WXK_UP || keycode == WXK_NUMPAD_UP || keycode == WXK_LEFT )
+    else if ( keycode == WXK_UP || keycode == WXK_NUMPAD_UP || ( keycode == WXK_LEFT && readOnly ) )

     {
         value--;
         StopPartialCompletion();
     {
         value--;
         StopPartialCompletion();


@@ -297,17 +299,17 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar
         value-=10;
         StopPartialCompletion();
     }
         value-=10;
         StopPartialCompletion();
     }

-    else if ( keycode == WXK_HOME || keycode == WXK_NUMPAD_HOME )
+    else if ( ( keycode == WXK_HOME || keycode == WXK_NUMPAD_HOME ) && readOnly )

     {
         value=0;
         StopPartialCompletion();
     }
     {
         value=0;
         StopPartialCompletion();
     }

-    else if ( keycode == WXK_END || keycode == WXK_NUMPAD_END )
+    else if ( ( keycode == WXK_END || keycode == WXK_NUMPAD_END ) && readOnly )

     {
         value=itemCount-1;
         StopPartialCompletion();
     }
     {
         value=itemCount-1;
         StopPartialCompletion();
     }

-    else if ( keychar && (comboStyle & wxCB_READONLY) )
+    else if ( keychar && readOnly )

     {
         // Try partial completion
 
     {
         // Try partial completion