From 21f708b5b86a2b2a43a34ad81675d7d757b263eb Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 5 Aug 2010 18:57:15 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- .../tools/client/client_config/client_config.cpp | 2 +- .../tools/client/client_config/client_configDlg.cpp | 8 ++++---- .../client/client_config/ryzom_configuration.vcproj | 11 ++++++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/code/ryzom/tools/client/client_config/client_config.cpp b/code/ryzom/tools/client/client_config/client_config.cpp index 301e9c3aa..97a0f1ce1 100644 --- a/code/ryzom/tools/client/client_config/client_config.cpp +++ b/code/ryzom/tools/client/client_config/client_config.cpp @@ -191,7 +191,7 @@ BOOL CClientConfigApp::InitInstance() DestroyWindow (SlashScreen); - int nResponse = dlg.DoModal(); + sint nResponse = (sint)dlg.DoModal(); if (nResponse == IDOK) { // dismissed with OK diff --git a/code/ryzom/tools/client/client_config/client_configDlg.cpp b/code/ryzom/tools/client/client_config/client_configDlg.cpp index d07b26b3b..9c2de231b 100644 --- a/code/ryzom/tools/client/client_config/client_configDlg.cpp +++ b/code/ryzom/tools/client/client_config/client_configDlg.cpp @@ -320,7 +320,7 @@ void CClient_configDlg::translateTree () while (item) { // Set the item text - uint page = Tree.GetItemData (item); + uint page = (uint)Tree.GetItemData (item); ucstring name = NLMISC::CI18N::get (Pages[page].Name); if (NLMISC::CSystemUtils::supportUnicode()) { @@ -416,7 +416,7 @@ void CClient_configDlg::OnPaint() dc.SetBkMode (TRANSPARENT); dc.SelectObject (&BarFont); CRect labelRect (LARGE_LABEL_START_X, LARGE_LABEL_START_Y, LARGE_LABEL_END_X, LARGE_LABEL_END_Y); - DrawTextW (&(*dc), (WCHAR*)TopLargeLabel.c_str (), TopLargeLabel.size (), &labelRect, DT_LEFT|DT_TOP); + DrawTextW (&(*dc), (WCHAR*)TopLargeLabel.c_str (), (sint)TopLargeLabel.size (), &labelRect, DT_LEFT|DT_TOP); CDialog::OnPaint(); } @@ -471,8 +471,8 @@ BOOL CClient_configDlg::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) if (item) { // Get the page - uint pageId = Tree.GetItemData (item); - setPage (pageId) ; + uint pageId = (uint)Tree.GetItemData (item); + setPage (pageId); } } break; diff --git a/code/ryzom/tools/client/client_config/ryzom_configuration.vcproj b/code/ryzom/tools/client/client_config/ryzom_configuration.vcproj index 15e22dba7..ddbd36f60 100644 --- a/code/ryzom/tools/client/client_config/ryzom_configuration.vcproj +++ b/code/ryzom/tools/client/client_config/ryzom_configuration.vcproj @@ -1,7 +1,7 @@ @@ -457,6 +458,14 @@ + + +