diff options
| author | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 14:35:28 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 14:35:28 -0700 |
| commit | 930b8ed36e56e08a9449833073dbdd0017bcbaa4 (patch) | |
| tree | 829bb63a8e777eef0c622c085671aebe8ae351c1 /indra/llwindow/llmousehandler.h | |
| parent | 45af049a479928208a1ad30a90c1db6be1969f9a (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge with ti of master after Viewer release
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; |