diff options
author | Geenz <geenz@geenzo.com> | 2013-03-19 05:50:50 -0400 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-03-19 05:50:50 -0400 |
commit | ad26f3c39002b6043e5fc4e00f9793e0f0e4941c (patch) | |
tree | 8cfc1c4de80259d9a18eaed3bc085ac6b320a7f8 /indra/llwindow/llopenglview-objc.h | |
parent | 3c60fb24ca3685614880645af61d44287c369aea (diff) |
IME support (and revamped text input support) semi-working.
Diffstat (limited to 'indra/llwindow/llopenglview-objc.h')
-rw-r--r-- | indra/llwindow/llopenglview-objc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llopenglview-objc.h b/indra/llwindow/llopenglview-objc.h index c3ae34ea50..c144831da4 100644 --- a/indra/llwindow/llopenglview-objc.h +++ b/indra/llwindow/llopenglview-objc.h @@ -15,9 +15,10 @@ // Some nasty shovelling of LLOpenGLView from LLNativeBindings to prevent any C++ <-> Obj-C interop oddities. // Redraw callback handling removed (for now) due to being unneeded in the patch that preceeds this addition. -@interface LLOpenGLView : NSOpenGLView +@interface LLOpenGLView : NSOpenGLView <NSTextInputClient> { std::string mLastDraggedUrl; + unsigned int mModifiers; } - (id) initWithSamples:(NSUInteger)samples; - (id) initWithSamples:(NSUInteger)samples andVsync:(BOOL)vsync; |