summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx-objc.mm
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-06-17 08:59:01 -0400
committerGeenz <geenz@geenzo.com>2013-06-17 08:59:01 -0400
commit93531f3ba85748ba5c9f1d797c4925f55fe8b92c (patch)
tree7691427ffccb5a711e7c580062976bbeeadbba95 /indra/llwindow/llwindowmacosx-objc.mm
parentf8abfb63c32a0926a393a4359c6f387482d2448e (diff)
Insert text into the input window when we attempt to insert text without a pre-editor. Also handle backspace as a special case when determining if the input window needs to be displayed.
Diffstat (limited to 'indra/llwindow/llwindowmacosx-objc.mm')
-rwxr-xr-xindra/llwindow/llwindowmacosx-objc.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index 95b9cdb863..7f1af129b4 100755
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -367,9 +367,9 @@ void setupInputWindow(NSWindowRef window, GLViewRef glview)
[[(LLAppDelegate*)[NSApp delegate] inputView] setGLView:(LLOpenGLView*)glview];
}
-void showInputWindow(bool show)
+void showInputWindow(bool show, void* text)
{
- [(LLAppDelegate*)[NSApp delegate] showInputWindow:show];
+ [(LLAppDelegate*)[NSApp delegate] showInputWindow:show withText:(id)text];
}
void commitCurrentPreedit(GLViewRef glView)