diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llwindow/llwindow.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h index 2a1babb..1d49572 100644 --- a/linden/indra/llwindow/llwindow.h +++ b/linden/indra/llwindow/llwindow.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -81,6 +81,8 @@ class LLSplashScreen; | |||
81 | 81 | ||
82 | class LLWindow; | 82 | class LLWindow; |
83 | 83 | ||
84 | class LLPreeditor; | ||
85 | |||
84 | class LLWindowCallbacks | 86 | class LLWindowCallbacks |
85 | { | 87 | { |
86 | public: | 88 | public: |
@@ -222,8 +224,10 @@ public: | |||
222 | virtual void *getPlatformWindow() = 0; | 224 | virtual void *getPlatformWindow() = 0; |
223 | 225 | ||
224 | // control platform's Language Text Input mechanisms. | 226 | // control platform's Language Text Input mechanisms. |
225 | virtual void allowLanguageTextInput( BOOL b ) {}; | 227 | virtual void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b) {} |
226 | virtual void setLanguageTextInput( const LLCoordGL & pos ) {}; | 228 | virtual void setLanguageTextInput( const LLCoordGL & pos ) {}; |
229 | virtual void updateLanguageTextInputArea() {} | ||
230 | virtual void interruptLanguageTextInput() {} | ||
227 | 231 | ||
228 | protected: | 232 | protected: |
229 | LLWindow(BOOL fullscreen, U32 flags); | 233 | LLWindow(BOOL fullscreen, U32 flags); |
@@ -351,9 +355,6 @@ extern const char* gURLProtocolWhitelistHandler[]; | |||
351 | // Loads a URL with the user's default browser | 355 | // Loads a URL with the user's default browser |
352 | void spawn_web_browser(const char* escaped_url); | 356 | void spawn_web_browser(const char* escaped_url); |
353 | 357 | ||
354 | // Opens a file with ShellExecute. Security risk! | ||
355 | void shell_open(const char* file_path); | ||
356 | |||
357 | void simpleEscapeString ( std::string& stringIn ); | 358 | void simpleEscapeString ( std::string& stringIn ); |
358 | 359 | ||
359 | #endif // _LL_window_h_ | 360 | #endif // _LL_window_h_ |