summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx-objc.h
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-22 19:59:49 -0500
committerGeenz <geenz@geenzo.com>2013-01-22 19:59:49 -0500
commit461ab912a58b67579fffdf70ec7e38d682927185 (patch)
tree2489ae49226618c7797478ec5ac7b9cef8d540cf /indra/llwindow/llwindowmacosx-objc.h
parent29e747c4f17818816c502a3aa653b828e689be4a (diff)
Initial Cocoa drag and drop support.
Diffstat (limited to 'indra/llwindow/llwindowmacosx-objc.h')
-rw-r--r--indra/llwindow/llwindowmacosx-objc.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h
index 57b3d11296..ebc1633f9d 100644
--- a/indra/llwindow/llwindowmacosx-objc.h
+++ b/indra/llwindow/llwindowmacosx-objc.h
@@ -24,14 +24,6 @@
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
-#include <boost/tr1/functional.hpp>
-typedef std::tr1::function<void(unsigned short, unsigned int)> KeyCallback;
-typedef std::tr1::function<void(unsigned int)> ModifierCallback;
-typedef std::tr1::function<void(float*, unsigned int)> MouseCallback;
-typedef std::tr1::function<void(wchar_t, unsigned int)> UnicodeCallback;
-typedef std::tr1::function<void(unsigned int, unsigned int)> ResizeCallback;
-typedef std::tr1::function<void(float)> ScrollWheelCallback;
-typedef std::tr1::function<void()> VoidCallback;
// This will actually hold an NSCursor*, but that type is only available in objective C.
typedef void *CursorRef;
@@ -59,6 +51,7 @@ void setIBeamCursor();
void setPointingHandCursor();
void setCopyCursor();
void setCrossCursor();
+void setNotAllowedCursor();
void hideNSCursor();
void showNSCursor();
void hideNSCursorTillMove(bool hide);
@@ -103,6 +96,12 @@ void callMiddleMouseUp(float *pos, unsigned int mask);
void callFocus();
void callFocusLost();
+#include <string>
+void callHandleDragEntered(std::string url);
+void callHandleDragExited(std::string url);
+void callHandleDragUpdated(std::string url);
+void callHandleDragDropped(std::string url);
+
NSWindowRef getMainAppWindow();
GLViewRef getGLView();