diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 06:59:42 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 06:59:42 +0000 |
| commit | 8ad24bea01843460275fcbd5d31ac2cc0c1cb30d (patch) | |
| tree | 0e7e7ec3f81e305f0e86b8c68a04dcb4cb9473b5 /views | |
| parent | aacb47604a2e70eb4da3e54c69c16e1da24065a8 (diff) | |
| download | chromium_src-8ad24bea01843460275fcbd5d31ac2cc0c1cb30d.zip chromium_src-8ad24bea01843460275fcbd5d31ac2cc0c1cb30d.tar.gz chromium_src-8ad24bea01843460275fcbd5d31ac2cc0c1cb30d.tar.bz2 | |
Combine WidgetWin KeyEvent handlers.
BUG=72040
TEST=Key Events on Widgets in Windows
Review URL: http://codereview.chromium.org/6813033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/widget_win.cc | 12 | ||||
| -rw-r--r-- | views/widget/widget_win.h | 11 |
2 files changed, 6 insertions, 17 deletions
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index 716012b..7c4cdb4 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -790,17 +790,7 @@ void WidgetWin::OnInputLangChange(DWORD character_set, HKL input_language_id) { } } -LRESULT WidgetWin::OnKeyDown(UINT message, WPARAM w_param, LPARAM l_param) { - MSG msg = { hwnd(), message, w_param, l_param }; - KeyEvent key(msg); - if (input_method_.get()) - input_method_->DispatchKeyEvent(key); - else - DispatchKeyEventPostIME(key); - return 0; -} - -LRESULT WidgetWin::OnKeyUp(UINT message, WPARAM w_param, LPARAM l_param) { +LRESULT WidgetWin::OnKeyEvent(UINT message, WPARAM w_param, LPARAM l_param) { MSG msg = { hwnd(), message, w_param, l_param }; KeyEvent key(msg); if (input_method_.get()) diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h index cca8d92..7464afb 100644 --- a/views/widget/widget_win.h +++ b/views/widget/widget_win.h @@ -269,10 +269,10 @@ class WidgetWin : public ui::WindowImpl, MESSAGE_HANDLER_EX(WM_NCMOUSELEAVE, OnMouseRange) // Key events. - MESSAGE_HANDLER_EX(WM_KEYDOWN, OnKeyDown) - MESSAGE_HANDLER_EX(WM_KEYUP, OnKeyUp) - MESSAGE_HANDLER_EX(WM_SYSKEYDOWN, OnKeyDown) - MESSAGE_HANDLER_EX(WM_SYSKEYUP, OnKeyUp) + MESSAGE_HANDLER_EX(WM_KEYDOWN, OnKeyEvent) + MESSAGE_HANDLER_EX(WM_KEYUP, OnKeyEvent) + MESSAGE_HANDLER_EX(WM_SYSKEYDOWN, OnKeyEvent) + MESSAGE_HANDLER_EX(WM_SYSKEYUP, OnKeyEvent) // IME Events. MESSAGE_HANDLER_EX(WM_IME_SETCONTEXT, OnImeMessages) @@ -363,8 +363,7 @@ class WidgetWin : public ui::WindowImpl, virtual void OnInitMenu(HMENU menu); virtual void OnInitMenuPopup(HMENU menu, UINT position, BOOL is_system_menu); virtual void OnInputLangChange(DWORD character_set, HKL input_language_id); - virtual LRESULT OnKeyDown(UINT message, WPARAM w_param, LPARAM l_param); - virtual LRESULT OnKeyUp(UINT message, WPARAM w_param, LPARAM l_param); + virtual LRESULT OnKeyEvent(UINT message, WPARAM w_param, LPARAM l_param); virtual void OnKillFocus(HWND focused_window); virtual LRESULT OnMouseActivate(UINT message, WPARAM w_param, LPARAM l_param); virtual LRESULT OnMouseRange(UINT message, WPARAM w_param, LPARAM l_param); |