diff options
author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/llwindow/llwindowmacosx.h | |
parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rw-r--r-- | indra/llwindow/llwindowmacosx.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 1927f9bf31..fd9e5c8484 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -88,6 +88,8 @@ public: /*virtual*/ void *getPlatformWindow(); /*virtual*/ void bringToFront() {}; + /*virtual*/ void allowLanguageTextInput(BOOL b); + protected: LLWindowMacOSX( char *title, char *name, int x, int y, int width, int height, U32 flags, @@ -163,6 +165,12 @@ protected: NMRec mBounceRec; LLTimer mBounceTimer; + // Imput method management through Text Service Manager. + TSMDocumentID mTSMDocument; + BOOL mLanguageTextInputAllowed; + ScriptCode mTSMScriptCode; + LangCode mTSMLangCode; + friend class LLWindowManager; }; |