diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-12-11 20:51:51 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-12-11 20:51:51 -0500 |
| commit | 02b9ac8d9a349b757a426842b5125057d11c0bbb (patch) | |
| tree | 2d678cd9cb39b76914266229a73d52f4108543b9 /indra/llwindow | |
| parent | 4e894eb2a7ed6651c54890cd20106bfacd61ef0a (diff) | |
SL-10153: Fix OSMessageBoxWin32() to handle non-ASCII text.
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 4ee4a5357c..504c1589b0 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -3275,8 +3275,10 @@ S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 t break; } - // HACK! Doesn't properly handle wide strings! - int retval_win = MessageBoxA(NULL, text.c_str(), caption.c_str(), uType); + int retval_win = MessageBoxW(NULL, // HWND + ll_convert_string_to_wide(text).c_str(), + ll_convert_string_to_wide(caption).c_str(), + uType); S32 retval; switch(retval_win) |