Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: client_config compilation

Browse source
This commit is contained in:
kervala 2010-06-16 21:47:22 +02:00
parent a6bb1d8ac5
commit bad13335a2
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/tools/client/client_config/client_config.h
View file

@ -72,8 +72,6 @@ extern CClientConfigApp theApp;
// Helper to set text in a window // Helper to set text in a window
// fallback to ascii set if the OS doesn't support unicode (windows 95/98/me) // fallback to ascii set if the OS doesn't support unicode (windows 95/98/me)
void setWindowText(HWND hwnd, LPCWSTR lpText); void setWindowText(HWND hwnd, LPCWSTR lpText);
// Test if os support unicode. Shouldn't call function such as SendMessageW if not supported
bool supportUnicode();

5
code/ryzom/tools/client/client_config/client_configDlg.cpp
View file

@ -24,6 +24,7 @@
#include "database.h" #include "database.h"
#include <nel/misc/debug.h> #include <nel/misc/debug.h>
#include <nel/misc/system_utils.h>
#define ICON_ZONE_WIDTH 128 #define ICON_ZONE_WIDTH 128
@ -299,7 +300,7 @@ void CClient_configDlg::changeLanguage (const char *language)
CMenu* pSysMenu = GetSystemMenu(FALSE); CMenu* pSysMenu = GetSystemMenu(FALSE);
if (pSysMenu) if (pSysMenu)
{ {
if (supportUnicode()) if (CSystemUtils::supportUnicode())
{ {
nlverify (::ModifyMenuW(*pSysMenu, IDM_ABOUTBOX, MF_BYCOMMAND|MF_STRING, IDM_ABOUTBOX, (WCHAR*)NLMISC::CI18N::get ("uiConfigMenuAbout").c_str())); nlverify (::ModifyMenuW(*pSysMenu, IDM_ABOUTBOX, MF_BYCOMMAND|MF_STRING, IDM_ABOUTBOX, (WCHAR*)NLMISC::CI18N::get ("uiConfigMenuAbout").c_str()));
} }
@ -321,7 +322,7 @@ void CClient_configDlg::translateTree ()
// Set the item text // Set the item text
uint page = Tree.GetItemData (item); uint page = Tree.GetItemData (item);
ucstring name = NLMISC::CI18N::get (Pages[page].Name); ucstring name = NLMISC::CI18N::get (Pages[page].Name);
if (supportUnicode()) if (CSystemUtils::supportUnicode())
{ {
TVITEMEXW itemDesc; TVITEMEXW itemDesc;
memset (&itemDesc, 0, sizeof(TVITEMEXW)); memset (&itemDesc, 0, sizeof(TVITEMEXW));