diff options
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowcallbacks.cpp | 2 | ||||
| -rw-r--r-- | indra/llwindow/llwindowcallbacks.h | 2 | ||||
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp index 343ec5f9f7..e39edec588 100644 --- a/indra/llwindow/llwindowcallbacks.cpp +++ b/indra/llwindow/llwindowcallbacks.cpp @@ -52,7 +52,7 @@ BOOL LLWindowCallbacks::handleUnicodeChar(llwchar uni_char, MASK mask) return FALSE; } -BOOL LLWindowCallbacks::handleUnicodeString(char *uni_str) +BOOL LLWindowCallbacks::handleUnicodeString(char *uni_str, bool editing) { return FALSE; } diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h index 2a9fcf402a..22a5a9e891 100644 --- a/indra/llwindow/llwindowcallbacks.h +++ b/indra/llwindow/llwindowcallbacks.h @@ -37,7 +37,7 @@ public: virtual BOOL handleTranslatedKeyUp(KEY key, MASK mask); virtual void handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level); virtual BOOL handleUnicodeChar(llwchar uni_char, MASK mask); - virtual BOOL handleUnicodeString(char *uni_str); + virtual BOOL handleUnicodeString(char *uni_str, bool editing); virtual BOOL handleMouseDown(LLWindow *window, LLCoordGL pos, MASK mask); virtual BOOL handleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask); diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index bbc966fb25..f56b6bfa7b 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -1893,12 +1893,12 @@ void LLWindowSDL::gatherInput() break; case SDL_TEXTINPUT: - mCallbacks->handleUnicodeString(event.text.text); + mCallbacks->handleUnicodeString(event.text.text, false); break; case SDL_TEXTEDITING: - mCallbacks->handleUnicodeString(event.edit.text); - break; + mCallbacks->handleUnicodeString(event.edit.text, true); + break; case SDL_KEYUP: mKeyScanCode = event.key.keysym.scancode; |