diff options
| author | Geenz <geenz@geenzo.com> | 2013-03-19 05:50:50 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-03-19 05:50:50 -0400 |
| commit | ad26f3c39002b6043e5fc4e00f9793e0f0e4941c (patch) | |
| tree | 8cfc1c4de80259d9a18eaed3bc085ac6b320a7f8 /indra/llwindow/llwindowmacosx.cpp | |
| parent | 3c60fb24ca3685614880645af61d44287c369aea (diff) | |
IME support (and revamped text input support) semi-working.
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 34cc371526..08612bace4 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -223,7 +223,10 @@ void callUnicodeCallback(wchar_t character, unsigned int mask) void callFocus() { - gWindowImplementation->getCallbacks()->handleFocus(gWindowImplementation); + if (gWindowImplementation) + { + gWindowImplementation->getCallbacks()->handleFocus(gWindowImplementation); + } } void callFocusLost() @@ -369,9 +372,12 @@ void callHandleDragDropped(std::string url) void callQuitHandler() { - if(gWindowImplementation->getCallbacks()->handleCloseRequest(gWindowImplementation)) + if (gWindowImplementation) { - gWindowImplementation->getCallbacks()->handleQuit(gWindowImplementation); + if(gWindowImplementation->getCallbacks()->handleCloseRequest(gWindowImplementation)) + { + gWindowImplementation->getCallbacks()->handleQuit(gWindowImplementation); + } } } |