Forward WM_{CUT,COPY,PASTE} from edit control to wxComboBox in wxMSW too.

This allows us to receive wxClipboardTextEvents from wxComboBox as well.

Update the documentation to mention this.

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

interface/wx/event.h

@@ -2159,8 +2159,8 @@ public:
     text was copied or cut.
 
     @note
-    These events are currently only generated by wxTextCtrl under GTK+.
+    These events are currently only generated by wxTextCtrl in wxGTK and wxOSX
-    They are generated by all controls under Windows.
+    but are also generated by wxComboBox without wxCB_READONLY style in wxMSW.
 
     @beginEventTable{wxClipboardTextEvent}
     @event{EVT_TEXT_COPY(id, func)}

src/msw/combobox.cpp

@@ -93,6 +93,36 @@ static WNDPROC gs_wndprocEdit = (WNDPROC)NULL;
 // implementation
 // ============================================================================
 
+namespace
+{
+
+// Check if the given message should be forwarded from the edit control which
+// is part of the combobox to wxComboBox itself. All messages generating the
+// events that the code using wxComboBox could be interested in must be
+// forwarded.
+bool ShouldForwardFromEditToCombo(UINT message)
+{
+    switch ( message )
+    {
+        case WM_KEYUP:
+        case WM_KEYDOWN:
+        case WM_CHAR:
+        case WM_SYSCHAR:
+        case WM_SYSKEYDOWN:
+        case WM_SYSKEYUP:
+        case WM_SETFOCUS:
+        case WM_KILLFOCUS:
+        case WM_CUT:
+        case WM_COPY:
+        case WM_PASTE:
+            return true;
+    }
+
+    return false;
+}
+
+} // anonymous namespace
+
 // ----------------------------------------------------------------------------
 // wnd proc for subclassed edit control
 // ----------------------------------------------------------------------------
@@ -105,49 +135,34 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
     HWND hwndCombo = ::GetParent(hWnd);
     wxWindow *win = wxFindWinFromHandle((WXHWND)hwndCombo);
 
-    switch ( message )
+    if ( ShouldForwardFromEditToCombo(message) )
     {
-        // forward some messages to the combobox to generate the appropriate
+        wxComboBox *combo = wxDynamicCast(win, wxComboBox);
-        // wxEvents from them
+        if ( !combo )
-        case WM_KEYUP:
+        {
-        case WM_KEYDOWN:
+            // we can get WM_KILLFOCUS while our parent is already half
-        case WM_CHAR:
+            // destroyed and hence doesn't look like a combobx any
-        case WM_SYSCHAR:
+            // longer, check for it to avoid bogus assert failures
-        case WM_SYSKEYDOWN:
+            if ( !win->IsBeingDeleted() )
-        case WM_SYSKEYUP:
-        case WM_SETFOCUS:
-        case WM_KILLFOCUS:
             {
-                wxComboBox *combo = wxDynamicCast(win, wxComboBox);
+                wxFAIL_MSG( wxT("should have combo as parent") );
-                if ( !combo )
-                {
-                    // we can get WM_KILLFOCUS while our parent is already half
-                    // destroyed and hence doesn't look like a combobx any
-                    // longer, check for it to avoid bogus assert failures
-                    if ( !win->IsBeingDeleted() )
-                    {
-                        wxFAIL_MSG( wxT("should have combo as parent") );
-                    }
-                }
-                else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
-                {
-                    // handled by parent
-                    return 0;
-                }
             }
-            break;
+        }
+        else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
+        {
+            // handled by parent
+            return 0;
+        }
+    }
+    else if ( message == WM_GETDLGCODE )
+    {
+        wxCHECK_MSG( win, 0, wxT("should have a parent") );
 
-        case WM_GETDLGCODE:
+        if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
-            {
+        {
-                wxCHECK_MSG( win, 0, wxT("should have a parent") );
+            // need to return a custom dlg code or we'll never get it
-
+            return DLGC_WANTMESSAGE;
-                if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
+        }
-                {
-                    // need to return a custom dlg code or we'll never get it
-                    return DLGC_WANTMESSAGE;
-                }
-            }
-            break;
     }
 
     return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
@@ -235,21 +250,16 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
                     return true;
                 }
             }
-            // fall through
+            // fall through, WM_CHAR is one of the message we should forward.
 
-        case WM_SYSCHAR:
+        default:
-        case WM_SYSKEYDOWN:
+            if ( ShouldForwardFromEditToCombo(msg) )
-        case WM_KEYDOWN:
+            {
-        case WM_SYSKEYUP:
+                // For all the messages forward from the edit control the
-        case WM_KEYUP:
+                // result is not used.
-        case WM_SETFOCUS:
+                WXLRESULT result;
-        case WM_KILLFOCUS:
+                return MSWHandleMessage(&result, msg, wParam, lParam);
-        case WM_CUT:
+            }
-        case WM_COPY:
-        case WM_PASTE:
-            // For the messages above the result is not used.
-            WXLRESULT result;
-            return MSWHandleMessage(&result, msg, wParam, lParam);
     }
 
     return false;