diff options
author | Geenz <geenz@geenzo.com> | 2013-01-08 16:22:54 -0500 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-01-08 16:22:54 -0500 |
commit | 09b07e3619a71f142c1a3af41244d756e1230142 (patch) | |
tree | 5474f6c3a557693794714eaa7247a87edb6df8b1 /indra/llwindow/llwindowmacosx-objc.h | |
parent | 9ce3ab1a5248423eeea4d843bfb8407ed62b305e (diff) |
Big change set:
- LLAppDelegate header relocated to LLWindow. Definition is still present in secondlife-bin (for compatibility reasons when loading a nib).
- Return key handling fixed.
- Command key now acts the same as the control key by issuing control character codes when the command key is pressed.
- We now retrieve the window pointer directly from the app delegate in LLWindow.
Diffstat (limited to 'indra/llwindow/llwindowmacosx-objc.h')
-rw-r--r-- | indra/llwindow/llwindowmacosx-objc.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index 414491f948..57b3d11296 100644 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -38,8 +38,19 @@ typedef void *CursorRef; typedef void *NSWindowRef; typedef void *GLViewRef; +// These are defined in llappviewermacosx.cpp. +bool initViewer(); +void handleQuit(); +bool runMainLoop(); +void initMainLoop(); +void cleanupViewer(); + /* Defined in llwindowmacosx-objc.mm: */ +int createNSApp(int argc, const char **argv); void setupCocoa(); +bool pasteBoardAvailable(); +bool copyToPBoard(const unsigned short *str, unsigned int len); +const unsigned short *copyFromPBoard(); CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY); short releaseImageCursor(CursorRef ref); short setImageCursor(CursorRef ref); |