summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.h
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-02-09 15:56:42 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-02-09 15:56:42 -0800
commit22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch)
treec6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/llwindow/llwindowmacosx.h
parentf040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff)
parent465a3356a2f32362837d5231a21b9151f45f890b (diff)
Merge
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rw-r--r--indra/llwindow/llwindowmacosx.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 377f10b6d4..7c6b324029 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -120,6 +120,10 @@ public:
static std::vector<std::string> getDynamicFallbackFontList();
+ // Provide native key event data
+ /*virtual*/ LLSD getNativeKeyData();
+
+
protected:
LLWindowMacOSX(LLWindowCallbacks* callbacks,
const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags,
@@ -218,6 +222,7 @@ protected:
friend class LLWindowManager;
static WindowRef sMediaWindow;
+ EventRef mRawKeyEvent;
};