summaryrefslogtreecommitdiff
path: root/indra/llwindow/llmousehandler.h
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-04-01 21:14:16 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-04-01 21:14:16 +0000
commit2130b6b144b64c223a656206f0d3e9babfd9a863 (patch)
tree8f47ce24e0d455c0478e6266d8a7c3874883e055 /indra/llwindow/llmousehandler.h
parentd357bf7ae5c5e0b6e66e7d82ce1677360b4cb990 (diff)
parent3cad30d9ee6a0cd2a68ed213e7383fa11df9d9f5 (diff)
Merged in DV525-merge-6.4.18 (pull request #511)
DRTVWR-525 merge up to 6.4.18
Diffstat (limited to 'indra/llwindow/llmousehandler.h')
-rw-r--r--indra/llwindow/llmousehandler.h12
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;