From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 2 Feb 2008 22:29:19 +0000 (+0000)
Subject: fixed wxTextCtrl to not process clipboard events twice if there's a custom wxEVT_COMM... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b65f16dabd945d95f98809fb78c8d60a08930ac4

fixed wxTextCtrl to not process clipboard events twice if there's a custom wxEVT_COMMAND_TEXT_* handler; move WM_PASTE/CUT/COPY processing to wxWindow where it belongs

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index bb65134622..836db69131 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -205,13 +205,6 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
                 }
             }
             break;
-
-        case WM_CUT:
-        case WM_COPY:
-        case WM_PASTE:
-            if( win->HandleClipboardEvent( message ) )
-                return 0;
-            break;
     }
 
     return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
@@ -302,6 +295,11 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 
         case WM_KILLFOCUS:
             return HandleKillFocus((WXHWND)wParam);
+
+        case WM_CUT:
+        case WM_COPY:
+        case WM_PASTE:
+            return HandleClipboardEvent(msg);
     }
 
     return false;
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 52e5add304..65eeb8967d 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1881,13 +1881,6 @@ WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
                 }
             }
             break;
-
-        case WM_CUT:
-        case WM_COPY:
-        case WM_PASTE:
-            if ( HandleClipboardEvent(nMsg) )
-                lRc = 0;
-            break;
     }
 
     return lRc;
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 25e1dea928..0306420dec 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3164,6 +3164,12 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
             break;
 #endif // wxUSE_HOTKEY
 
+        case WM_CUT:
+        case WM_COPY:
+        case WM_PASTE:
+            processed = HandleClipboardEvent(message);
+            break;
+
         case WM_HSCROLL:
         case WM_VSCROLL:
             {