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
This commit is contained in:
Václav Slavík
2008-02-02 22:29:19 +00:00
parent e8769ed11c
commit b65f16dabd
3 changed files with 11 additions and 14 deletions

View File

@@ -205,13 +205,6 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
} }
} }
break; 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); 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: case WM_KILLFOCUS:
return HandleKillFocus((WXHWND)wParam); return HandleKillFocus((WXHWND)wParam);
case WM_CUT:
case WM_COPY:
case WM_PASTE:
return HandleClipboardEvent(msg);
} }
return false; return false;

View File

@@ -1881,13 +1881,6 @@ WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
} }
} }
break; break;
case WM_CUT:
case WM_COPY:
case WM_PASTE:
if ( HandleClipboardEvent(nMsg) )
lRc = 0;
break;
} }
return lRc; return lRc;

View File

@@ -3164,6 +3164,12 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
break; break;
#endif // wxUSE_HOTKEY #endif // wxUSE_HOTKEY
case WM_CUT:
case WM_COPY:
case WM_PASTE:
processed = HandleClipboardEvent(message);
break;
case WM_HSCROLL: case WM_HSCROLL:
case WM_VSCROLL: case WM_VSCROLL:
{ {