From 79660586188ba968bb95f9ef198f56fa4d1ff972 Mon Sep 17 00:00:00 2001 From: Arnon Gilboa Date: Mon, 25 Oct 2010 08:35:34 +0200 Subject: spicec-win: map title string from utf8 to utf16 Fix win client broken by the utf8 patch. --- client/windows/red_window.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client/windows/red_window.cpp b/client/windows/red_window.cpp index 8248aeec..6d8a70d8 100644 --- a/client/windows/red_window.cpp +++ b/client/windows/red_window.cpp @@ -448,7 +448,14 @@ RedWindow::~RedWindow() void RedWindow::set_title(std::string& title) { - SetWindowText(_win, title.c_str()); + int len = MultiByteToWideChar(CP_UTF8, 0, title.c_str(), title.length(), NULL, 0) + 1; + WCHAR* wtitle = new WCHAR[len * sizeof(WCHAR)]; + + if (wtitle && MultiByteToWideChar(CP_UTF8, 0, title.c_str(), title.length(), wtitle, len)) { + wtitle[len - 1] = L'\0'; + SetWindowText(_win, wtitle); + } + delete []wtitle; } void RedWindow::set_icon(Icon* icon) -- cgit