From facf67ae3226105910c983a8fa8760414bf703e9 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Wed, 5 Dec 2007 23:43:56 +0000 Subject: EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release --- indra/llwindow/llwindowmacosx.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/llwindow/llwindowmacosx.h') diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index ee3019bd21..2a4cf97308 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -111,8 +111,10 @@ public: /*virtual*/ void *getPlatformWindow(); /*virtual*/ void bringToFront() {}; - /*virtual*/ void allowLanguageTextInput(BOOL b); - + /*virtual*/ void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b); + /*virtual*/ void updateLanguageTextInputArea(const LLCoordGL& caret, const LLRect& bounds); + /*virtual*/ void interruptLanguageTextInput(); + protected: LLWindowMacOSX( char *title, char *name, int x, int y, int width, int height, U32 flags, @@ -193,6 +195,7 @@ protected: BOOL mLanguageTextInputAllowed; ScriptCode mTSMScriptCode; LangCode mTSMLangCode; + LLPreeditor* mPreeditor; friend class LLWindowManager; }; -- cgit v1.2.3