diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 01:14:15 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 01:14:15 +0000 |
| commit | 748776a567d2e6c76b25a46511fd352562026755 (patch) | |
| tree | 0d16fd1848e8643e934931b7e4830e4cda1e1587 /ui/views | |
| parent | b58f8147cd1b3247aa3ec698eb12b9c16194d5c5 (diff) | |
| download | chromium_src-748776a567d2e6c76b25a46511fd352562026755.zip chromium_src-748776a567d2e6c76b25a46511fd352562026755.tar.gz chromium_src-748776a567d2e6c76b25a46511fd352562026755.tar.bz2 | |
Update LocatedEvent and MouseWheelEvent.
Refactor RootView::OnMouseWheel and WidgetGtk::ProcessScroll.
Rename RootView's and MenuHostRootView's ProcessMouseWheelEvent to OnMouseWheel.
Merge event_x's GetMouseEventType into EventTypeFromNative and detect wheel events.
Update NativeWidgetWin::MakeMSG and WidgetWin::MakeMSG.
Add some needed support functions.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6469106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/widget/native_widget_win.cc | 7 | ||||
| -rw-r--r-- | ui/views/widget/native_widget_win.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index 250ae2f..bc89810 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -613,13 +613,14 @@ bool NativeWidgetWin::ProcessMouseRange(UINT message, WPARAM w_param, } void NativeWidgetWin::MakeMSG(MSG* msg, UINT message, WPARAM w_param, - LPARAM l_param) const { + LPARAM l_param, DWORD time, LONG x, LONG y) const { msg->hwnd = hwnd(); msg->message = message; msg->wParam = w_param; msg->lParam = l_param; - msg->time = 0; - msg->pt.x = msg->pt.y = 0; + msg->time = time; + msg->pt.x = x; + msg->pt.y = y; } void NativeWidgetWin::CloseNow() { diff --git a/ui/views/widget/native_widget_win.h b/ui/views/widget/native_widget_win.h index f5c8eec..c3e724e 100644 --- a/ui/views/widget/native_widget_win.h +++ b/ui/views/widget/native_widget_win.h @@ -238,7 +238,8 @@ class NativeWidgetWin : public NativeWidget, void ProcessMouseExited(); // Fills out a MSG struct with the supplied values. - void MakeMSG(MSG* msg, UINT message, WPARAM w_param, LPARAM l_param) const; + void MakeMSG(MSG* msg, UINT message, WPARAM w_param, LPARAM l_param, + DWORD time = 0, LONG x = 0, LONG y = 0) const; void CloseNow(); |