X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/682214d5c6ec3e56dbdfd0c97d70d87e614b38c2..dad65e8abce518c5cf0bff166dbaee2b8f85d35d:/src/msw/combobox.cpp

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 04c3639c91..c15da2ee31 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -174,6 +174,9 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
         case WM_KEYUP:
         case WM_KEYDOWN:
         case WM_CHAR:
+        case WM_SYSCHAR:
+        case WM_SYSKEYDOWN:
+        case WM_SYSKEYUP:
         case WM_SETFOCUS:
         case WM_KILLFOCUS:
             {
@@ -241,41 +244,41 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
 
 WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-    bool isSize = false;
-    long fromOld, toOld;
+    // TODO: handle WM_CTLCOLOR messages from our EDIT control to be able to
+    //       set its colour correctly (to be the same as our own one)
 
-    // handle WM_CTLCOLOR messages from our EDIT control to be able to set its
-    // colour correctly (to be the same as our own one)
     switch ( nMsg )
     {
         case CB_SETCURSEL:
             // Selection was set with SetSelection.  Update the value too.
             if ((int)wParam > GetCount())
-                m_value = wxEmptyString;
+                m_value.clear();
             else
                 m_value = GetString(wParam);
             m_selectionOld = -1;
             break;
+
         case WM_SIZE:
-            GetSelection(&fromOld, &toOld);
-            isSize = true;
-            break;
-    }
+            {
+                // combobox selection sometimes spontaneously changes when its
+                // size changes, restore it to the old value if necessary
+                long fromOld, toOld;
+                GetSelection(&fromOld, &toOld);
+                WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);
 
-    WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);
+                long fromNew, toNew;
+                GetSelection(&fromNew, &toNew);
 
-    if(isSize)
-    {
-        long fromNew, toNew;
-        GetSelection(&fromNew, &toNew);
+                if ( fromOld != fromNew || toOld != toNew )
+                {
+                    SetSelection(fromOld, toOld);
+                }
 
-        if ( fromOld != fromNew || toOld != toNew )
-        {
-            SetSelection(fromOld, toOld);
-        }
+                return result;
+            }
     }
 
-    return result;
+    return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
 }
 
 bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
@@ -299,12 +302,16 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
                     return true;
                 }
             }
+            // fall through
 
+        case WM_SYSCHAR:
             return HandleChar(wParam, lParam, true /* isASCII */);
 
+        case WM_SYSKEYDOWN:
         case WM_KEYDOWN:
             return HandleKeyDown(wParam, lParam);
 
+        case WM_SYSKEYUP:
         case WM_KEYUP:
             return HandleKeyUp(wParam, lParam);