diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-13 22:47:49 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-13 22:47:49 +0000 |
| commit | 75b537e299ea0c8993d08230719799bba05380e0 (patch) | |
| tree | ec926f5787f52f748d47af2c69ca843ef1edaac0 /chrome | |
| parent | cbab76d1c74c93837bc76298d1a2e43646154194 (diff) | |
| download | chromium_src-75b537e299ea0c8993d08230719799bba05380e0.zip chromium_src-75b537e299ea0c8993d08230719799bba05380e0.tar.gz chromium_src-75b537e299ea0c8993d08230719799bba05380e0.tar.bz2 | |
Fix issues with mouseleave messages not getting sent due to some sort of issue with the message cracking macros in hwnd_view_container.h
http://crbug.com/3375
Review URL: http://codereview.chromium.org/7126
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/views/hwnd_view_container.cc | 4 | ||||
| -rw-r--r-- | chrome/views/hwnd_view_container.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/views/hwnd_view_container.cc b/chrome/views/hwnd_view_container.cc index 41a47f4..8000f45 100644 --- a/chrome/views/hwnd_view_container.cc +++ b/chrome/views/hwnd_view_container.cc @@ -535,8 +535,10 @@ void HWNDViewContainer::OnMouseMove(UINT flags, const CPoint& point) { ProcessMouseMoved(point, flags, false); } -void HWNDViewContainer::OnMouseLeave() { +LRESULT HWNDViewContainer::OnMouseLeave(UINT uMsg, WPARAM w_param, + LPARAM l_param) { ProcessMouseExited(); + return 0; } LRESULT HWNDViewContainer::OnMouseWheel(UINT flags, diff --git a/chrome/views/hwnd_view_container.h b/chrome/views/hwnd_view_container.h index 069cc87..2f7a7f3 100644 --- a/chrome/views/hwnd_view_container.h +++ b/chrome/views/hwnd_view_container.h @@ -175,10 +175,10 @@ class HWNDViewContainer : public ViewContainer, MESSAGE_HANDLER_EX(WM_NCUAHDRAWCAPTION, OnNCUAHDrawCaption) MESSAGE_HANDLER_EX(WM_NCUAHDRAWFRAME, OnNCUAHDrawFrame) - // Non-atlcrack.h handlers MESSAGE_HANDLER_EX(WM_GETOBJECT, OnGetObject) MESSAGE_HANDLER_EX(WM_NCMOUSELEAVE, OnNCMouseLeave) + MESSAGE_HANDLER_EX(WM_MOUSELEAVE, OnMouseLeave) // This list is in _ALPHABETICAL_ order! OR I WILL HURT YOU. MSG_WM_ACTIVATE(OnActivate) @@ -205,7 +205,6 @@ class HWNDViewContainer : public ViewContainer, MSG_WM_MBUTTONUP(OnMButtonUp) MSG_WM_MBUTTONDBLCLK(OnMButtonDblClk) MSG_WM_MOUSEACTIVATE(OnMouseActivate) - MSG_WM_MOUSELEAVE(OnMouseLeave) MSG_WM_MOUSEMOVE(OnMouseMove) MSG_WM_MOUSEWHEEL(OnMouseWheel) MSG_WM_MOVE(OnMove) @@ -379,7 +378,7 @@ class HWNDViewContainer : public ViewContainer, virtual void OnMButtonUp(UINT flags, const CPoint& point); virtual LRESULT OnMouseActivate(HWND window, UINT hittest_code, UINT message); virtual void OnMouseMove(UINT flags, const CPoint& point); - virtual void OnMouseLeave(); + virtual LRESULT OnMouseLeave(UINT uMsg, WPARAM w_param, LPARAM l_param); virtual void OnMove(const CPoint& point) { SetMsgHandled(FALSE); } virtual void OnMoving(UINT param, const LPRECT new_bounds) { } virtual LRESULT OnMouseWheel(UINT flags, short distance, const CPoint& point); |