diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:49:26 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:49:26 +0300 |
| commit | b52384d9ef81ed91b52db853af349a1a8ec8bfdb (patch) | |
| tree | aa6d272de0228428d0217aa7f61fbbc84eddb5da /indra/llwindow/llmousehandler.h | |
| parent | 19ff86fabd84ba45bbbdfd1fa5393fb9ab89dddf (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
# indra/newview/lltoolpie.cpp
Diffstat (limited to 'indra/llwindow/llmousehandler.h')
| -rw-r--r-- | indra/llwindow/llmousehandler.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/llwindow/llmousehandler.h b/indra/llwindow/llmousehandler.h index 1dcd0348d8..d221dd117c 100644 --- a/indra/llwindow/llmousehandler.h +++ b/indra/llwindow/llmousehandler.h @@ -29,6 +29,7 @@ #include "linden_common.h" #include "llrect.h" +#include "indra_constants.h" // Mostly-abstract interface. // Intended for use via multiple inheritance. @@ -46,16 +47,7 @@ public: SHOW_ALWAYS, } EShowToolTip; - typedef enum { - CLICK_LEFT, - CLICK_MIDDLE, - CLICK_RIGHT, - CLICK_BUTTON4, - CLICK_BUTTON5, - CLICK_DOUBLELEFT - } EClickType; - - virtual BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down); + virtual BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down); virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) = 0; virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask) = 0; virtual BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask) = 0; |