X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08c8690cf0ea7b961373ecaddecc28bd40403e30..35c2acd4a81a3b41ced9253f744a00e64de2a423:/src/msw/combobox.cpp?ds=sidebyside

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 642e48329a..e61f41c12b 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,18 +244,41 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
 
 WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-    // handle WM_CTLCOLOR messages from our EDIT control to be able to set its
-    // colour correctly (to be the same as our own one)
+    // 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)
+
     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:
+        // wxStaticBox can generate this message, when modifying the control's style.
+        // This causes the content of the combobox to be selected, for some reason.
+        case WM_STYLECHANGED:
+            {
+                // 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);
+
+                long fromNew, toNew;
+                GetSelection(&fromNew, &toNew);
+
+                if ( fromOld != fromNew || toOld != toNew )
+                {
+                    SetSelection(fromOld, toOld);
+                }
+
+                return result;
+            }
     }
 
     return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
@@ -279,12 +305,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);
 
@@ -304,11 +334,13 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     int sel = -1;
     switch ( param )
     {
+        case CBN_SELENDOK:
         case CBN_SELCHANGE:
             sel = GetSelection();
 
-            // somehow we get 2 CBN_SELCHANGE events with the same index when
-            // the user selects an item in the combobox -- ignore duplicates
+            // we may sometimes get 2 CBN_SELCHANGE events or a CBN_SELENDOK
+            // before CBN_SELCHANGE with the same index when the user selects
+            // an item in the combobox -- ignore duplicates
             if ( sel > -1 && sel != m_selectionOld )
             {
                 m_selectionOld = sel;
@@ -456,6 +488,11 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
                       );
 
+    // usually WS_TABSTOP is added by wxControl::MSWGetStyle() but as we're
+    // created hidden (see Create() above), it is not done for us but we still
+    // want to have this style
+    msStyle |= WS_TABSTOP;
+
     // remove the style always added by wxChoice
     msStyle &= ~CBS_DROPDOWNLIST;
 
@@ -476,29 +513,6 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
-// ----------------------------------------------------------------------------
-// wxComboBox geometry
-// ----------------------------------------------------------------------------
-
-void
-wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // work around a Windows bug (search for "Bug in Windows Combobox" in
-    // Google Groups): resizing the combobox changes the selection in it
-    long fromOld, toOld;
-    GetSelection(&fromOld, &toOld);
-
-    wxChoice::DoSetSize(x, y, width, height, sizeFlags);
-
-    long fromNew, toNew;
-    GetSelection(&fromNew, &toNew);
-
-    if ( fromOld != fromNew || toOld != toNew )
-    {
-        SetSelection(fromOld, toOld);
-    }
-}
-
 // ----------------------------------------------------------------------------
 // wxComboBox text control-like methods
 // ----------------------------------------------------------------------------
@@ -558,6 +572,9 @@ void wxComboBox::SelectAll()
 
 bool wxComboBox::CanUndo() const
 {
+    if (!IsEditable())
+        return false;
+
     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
@@ -567,6 +584,9 @@ bool wxComboBox::CanUndo() const
 
 bool wxComboBox::CanRedo() const
 {
+    if (!IsEditable())
+        return false;
+
     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
@@ -589,7 +609,7 @@ bool wxComboBox::CanCopy() const
 
 bool wxComboBox::CanCut() const
 {
-    return CanCopy() && IsEditable();
+    return IsEditable() && CanCopy() ;
 }
 
 bool wxComboBox::CanPaste() const
@@ -650,11 +670,10 @@ void wxComboBox::SetInsertionPointEnd()
 
 long wxComboBox::GetInsertionPoint() const
 {
-    // CB_GETEDITSEL returns the index of the last character after selection in
-    // its high-order word
+    // CB_GETEDITSEL returns the index of the first character of the selection in
+    // its low-order word
     DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
-
-    return HIWORD(pos);
+    return LOWORD(pos);
 }
 
 wxTextPos wxComboBox::GetLastPosition() const
@@ -678,6 +697,10 @@ void wxComboBox::Replace(long from, long to, const wxString& value)
 
     // Paste into edit control
     SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);
+#else
+    wxUnusedVar(from);
+    wxUnusedVar(to);
+    wxUnusedVar(value);
 #endif
 }