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:
@@ -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;
|
||||
|
Reference in New Issue
Block a user