diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-07 11:45:09 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-07 11:45:09 -0800 |
| commit | cbea2b235f688d6d35a2deaa420ab57ffcc78372 (patch) | |
| tree | 2ad5e1ec8756fccb5d669c5356b59ecf0ab36d5b /indra/llwindow/llwindowmacosx.h | |
| parent | b7bab35cb58a33014bb05f2d77b03e58d9e90651 (diff) | |
| parent | 75c1fb26649df73770459a31641c434e156e2c17 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index fbfa07fab4..bd3e46ebb4 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -34,6 +34,7 @@ #define LL_LLWINDOWMACOSX_H #include "llwindow.h" +#include "llwindowcallbacks.h" #include "lltimer.h" @@ -159,8 +160,12 @@ protected: void adjustCursorDecouple(bool warpingMouse = false); void fixWindowSize(void); void stopDockTileBounce(); - - + static MASK modifiersToMask(SInt16 modifiers); + static OSErr dragTrackingHandler(DragTrackingMessage message, WindowRef theWindow, + void * handlerRefCon, DragRef theDrag); + static OSErr dragReceiveHandler(WindowRef theWindow, void * handlerRefCon, DragRef theDrag); + OSErr handleDragNDrop(DragRef theDrag, LLWindowCallbacks::DragNDropAction action); + // // Platform specific variables // @@ -197,7 +202,7 @@ protected: NMRec mBounceRec; LLTimer mBounceTimer; - // Imput method management through Text Service Manager. + // Input method management through Text Service Manager. TSMDocumentID mTSMDocument; BOOL mLanguageTextInputAllowed; ScriptCode mTSMScriptCode; |