aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindowwin32.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llwindow/llwindowwin32.h')
-rw-r--r--linden/indra/llwindow/llwindowwin32.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index 0f0cf7c..938ece9 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -2,6 +2,8 @@
2 * @file llwindowwin32.h 2 * @file llwindowwin32.h
3 * @brief Windows implementation of LLWindow class 3 * @brief Windows implementation of LLWindow class
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 7 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#ifndef LL_LLWINDOWWIN32_H 32#ifndef LL_LLWINDOWWIN32_H
@@ -107,6 +110,7 @@ public:
107 /*virtual*/ void focusClient(); 110 /*virtual*/ void focusClient();
108 111
109 /*virtual*/ void allowLanguageTextInput(BOOL b); 112 /*virtual*/ void allowLanguageTextInput(BOOL b);
113 /*virtual*/ void setLanguageTextInput( const LLCoordGL & pos );
110 114
111protected: 115protected:
112 LLWindowWin32( 116 LLWindowWin32(
@@ -176,11 +180,10 @@ protected:
176 BOOL mMousePositionModified; 180 BOOL mMousePositionModified;
177 BOOL mInputProcessingPaused; 181 BOOL mInputProcessingPaused;
178 182
179 // The following five variables are for Language Text Input control. 183 // The following variables are for Language Text Input control.
180 // They are all static, since one context is shared by all LLWindowWin32 184 // They are all static, since one context is shared by all LLWindowWin32
181 // instances. 185 // instances.
182 static BOOL sLanguageTextInputAllowed; 186 static BOOL sLanguageTextInputAllowed;
183 static BOOL sWinIMEOpened;
184 static HKL sWinInputLocale; 187 static HKL sWinInputLocale;
185 static DWORD sWinIMEConversionMode; 188 static DWORD sWinIMEConversionMode;
186 static DWORD sWinIMESentenceMode; 189 static DWORD sWinIMESentenceMode;