summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2002-03-13 20:29:26 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2002-03-13 20:29:26 (GMT)
commit7c73456401724698a1a4675d475d953d17558911 (patch)
tree1ee8143deb06f712f0dfdc375e375e4bb7e5b99d /Source
parent6349735590508504435612e36b48d782e9d068e6 (diff)
downloadCMake-7c73456401724698a1a4675d475d953d17558911.zip
CMake-7c73456401724698a1a4675d475d953d17558911.tar.gz
CMake-7c73456401724698a1a4675d475d953d17558911.tar.bz2
Remove warnings
Diffstat (limited to 'Source')
-rw-r--r--Source/MFCDialog/CMakeSetup.cpp2
-rw-r--r--Source/MFCDialog/CMakeSetupDialog.cpp6
-rw-r--r--Source/MFCDialog/PathDialog.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/Source/MFCDialog/CMakeSetup.cpp b/Source/MFCDialog/CMakeSetup.cpp
index 6cf1bc1..e0661a0 100644
--- a/Source/MFCDialog/CMakeSetup.cpp
+++ b/Source/MFCDialog/CMakeSetup.cpp
@@ -63,7 +63,7 @@ BOOL CMakeSetup::InitInstance()
CMakeSetupDialog dlg(cmdInfo);
m_pMainWnd = &dlg;
- int nResponse = dlg.DoModal();
+ INT_PTR nResponse = dlg.DoModal();
if (nResponse == IDOK)
{
// TODO: Place code here to handle when the dialog is
diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index 4b9e2dc..ea3611e 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -601,7 +601,7 @@ void CMakeSetupDialog::OnChangeWhereBuild()
// copy from the cache manager to the cache edit list box
void CMakeSetupDialog::FillCacheGUIFromCacheManager()
{
- int size = m_CacheEntriesList.GetItems().size();
+ size_t size = m_CacheEntriesList.GetItems().size();
bool reverseOrder = false;
// if there are already entries in the cache, then
// put the new ones in the top, so they show up first
@@ -830,8 +830,8 @@ void CMakeSetupDialog::OnSize(UINT nType, int cx, int cy)
m_VersionDisplay.SetWindowPos(&wndTop, 5, cy-23, 0, 0,
SWP_NOSIZE | SWP_NOZORDER);
- deltax = deltax + m_deltaXRemainder;
- m_deltaXRemainder = deltax%2;
+ deltax = int(deltax + m_deltaXRemainder);
+ m_deltaXRemainder = float(deltax%2);
m_MouseHelp.GetWindowRect(&cRect);
this->ScreenToClient(&cRect);
m_MouseHelp.SetWindowPos(&wndTop, cRect.left + deltax/2,
diff --git a/Source/MFCDialog/PathDialog.cpp b/Source/MFCDialog/PathDialog.cpp
index 58337f9..f920ce7 100644
--- a/Source/MFCDialog/PathDialog.cpp
+++ b/Source/MFCDialog/PathDialog.cpp
@@ -293,7 +293,7 @@ int CPathDialog::Touch(LPCTSTR lpPath, BOOL bValidate)
TCHAR szPath[MAX_PATH];
_tcscpy(szPath, lpPath);
- int nLen = _tcslen(szPath);
+ size_t nLen = _tcslen(szPath);
int i;
if(nLen==3)
@@ -355,7 +355,7 @@ int CPathDialog::ConcatPath(LPTSTR lpRoot, LPCTSTR lpMorePath)
return 1;
}
- int nLen = _tcslen(lpRoot);
+ size_t nLen = _tcslen(lpRoot);
if(nLen<3)
{