From 955978c6c6b267f3999030e08893706b7061ae5f Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 15 Nov 2016 10:53:22 +0100 Subject: [PATCH] Changed: Use _T macro and TCHAR to support UNICODE --- .../world_editor/world_editor/world_editor_doc.h | 1 - .../world_editor_sound_plugin/DialogFlags.cpp | 8 ++++---- .../world_editor_sound_plugin/sound_plugin.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h index f3f5d4b47..4d124eeab 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h @@ -23,7 +23,6 @@ #include #include -#include #if _MSC_VER > 1000 #pragma once diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp index 83c9ab58a..4416a0c5d 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp @@ -127,14 +127,14 @@ void CDialogFlags::init(CSoundPlugin *plugin) col.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; col.fmt = LVCFMT_LEFT; col.cx = 140; - col.pszText = "bank names"; - col.cchTextMax = sizeof("bank names"); + col.pszText = _T("bank names"); + col.cchTextMax = _tcslen(col.pszText)+1; _SbList.InsertColumn(0, &col); col.fmt = LVCFMT_RIGHT; col.cx = 50; - col.pszText = "size"; - col.cchTextMax = sizeof("size"); + col.pszText = _T("size"); + col.cchTextMax = _tcslen(col.pszText)+1; _SbList.InsertColumn(1, &col); } diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp index 45e93d731..c92e90918 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp @@ -195,7 +195,7 @@ void CSoundPlugin::ReInit() } catch(...) { - MessageBox(NULL, "Error while initializing audio mixer.\n", "ERROR", MB_ICONERROR); + MessageBox(NULL, _T("Error while initializing audio mixer.\n"), _T("ERROR"), MB_ICONERROR); exit(1); }