Merge branch 'master' of https://github.com/sabrogden/Ditto

src/AdvGeneral.cpp

@@ -976,9 +976,9 @@ void CAdvGeneral::OnSize(UINT nType, int cx, int cy)
 void CAdvGeneral::OnBnClickedBtCompactAndRepair()
 {
 	auto msg = theApp.m_Language.GetString("CompactRepairWarning", "Warning this can take quite a long time and require up to double the hard drive space as your current database size, Continue?");
-	int ret = MessageBox(msg, _T("Ditto"), MB_YESNOCANCEL);
+	int ret = MessageBox(msg, _T("Ditto"), MB_OKCANCEL);
 
-	if (ret == IDYES)
+	if (ret == IDOK)
 	{
 		CWaitCursor wait;
 

src/CopyProperties.cpp

@@ -322,7 +322,7 @@ void CCopyProperties::OnOK()
 
 				if(CheckGlobalHotKey(clip) == FALSE)
 				{
-					if(MessageBox(_T("Error registering global hot key\n\nContinue?"), _T(""), MB_YESNOCANCEL |MB_ICONWARNING) != IDYES)
+					if(MessageBox(_T("Error registering global hot key\n\nContinue?"), _T(""), MB_OKCANCEL |MB_ICONWARNING) != IDOK)
 					{
 						return;
 					}
@@ -330,7 +330,7 @@ void CCopyProperties::OnOK()
 
 				if(CheckMoveToGroupGlobalHotKey(clip) == FALSE)
 				{
-					if(MessageBox(_T("Error registering global move to group hot key\n\nContinue?"), _T(""), MB_YESNOCANCEL |MB_ICONWARNING) != IDYES)
+					if(MessageBox(_T("Error registering global move to group hot key\n\nContinue?"), _T(""), MB_OKCANCEL |MB_ICONWARNING) != IDOK)
 					{
 						return;
 					}

src/DeleteClipData.cpp

@@ -572,7 +572,7 @@ void CDeleteClipData::ApplyDelete()
 	if (m_applyingDelete)
 		return;
 
-	if (MessageBox(_T("Delete selected items?  This cannot be undone!"), _T(""), MB_YESNOCANCEL | MB_ICONWARNING) == IDYES)
+	if (MessageBox(_T("Delete selected items?  This cannot be undone!"), _T(""), MB_OKCANCEL | MB_ICONWARNING) == IDOK)
 	{
 		m_clipList.EnableWindow(FALSE);
 		m_applyingDelete = true;

src/MainFrm.cpp

@@ -1502,8 +1502,8 @@ LRESULT CMainFrame::OnRestoreDb(WPARAM wParam, LPARAM lParam)
 
 void CMainFrame::OnFirstDeleteallnonusedclips()
 {
-	int nRet = MessageBox(theApp.m_Language.GetString("Delete_All_Non_Used_Clips", "Delete all clips that are not groups, in groups, marked as never auto delete, has a shortcut key or marked as sticky.\r\n\r\nThis cannot be undone."), _T("Ditto"), MB_YESNOCANCEL | MB_TOPMOST);
-	if (nRet != IDYES)
+	int nRet = MessageBox(theApp.m_Language.GetString("Delete_All_Non_Used_Clips", "Delete all clips that are not groups, in groups, marked as never auto delete, has a shortcut key or marked as sticky.\r\n\r\nThis cannot be undone."), _T("Ditto"), MB_OKCANCEL | MB_TOPMOST);
+	if (nRet != IDOK)
 	{
 		return;
 	}

src/OptionsGeneral.cpp

@@ -268,7 +268,7 @@ BOOL COptionsGeneral::OnApply()
 			CString cs;
 			cs.Format(_T("The database %s does not exist.\n\nCreate a new database?"), resolvedPath);
 
-			if(MessageBox(cs, _T("Ditto"), MB_YESNOCANCEL) == IDYES)
+			if(MessageBox(cs, _T("Ditto"), MB_OKCANCEL) == IDOK)
 			{
 				// -- create a new one
 				if(CreateDB(resolvedPath))

src/OptionsStats.cpp

@@ -135,7 +135,7 @@ void COptionsStats::OnResetCounts()
 
 void COptionsStats::OnRemoveAll() 
 {
-	if(MessageBox(theApp.m_Language.GetString("Remove_All", "This will remove all Copy Entries!\n\nContinue?"), _T("Warning"), MB_YESNOCANCEL) == IDYES)
+	if(MessageBox(theApp.m_Language.GetString("Remove_All", "This will remove all Copy Entries!\n\nContinue?"), _T("Warning"), MB_OKCANCEL) == IDOK)
 	{
 		if( DeleteAllIDs() )
 		{

src/QPasteWnd.cpp

@@ -7795,10 +7795,10 @@ bool CQPasteWnd::DoDeleteAllNonUsedClips()
 	bool bStartValue = m_bHideWnd;
 	m_bHideWnd = false;
 
-	int nRet = MessageBox(theApp.m_Language.GetString("Delete_All_Non_Used_Clips", "Delete all clips that are not groups, in groups, marked as never auto delete, has a shortcut key or marked as sticky.\r\n\r\nThis cannot be undone."), _T("Ditto"), MB_YESNOCANCEL | MB_TOPMOST);
+	int nRet = MessageBox(theApp.m_Language.GetString("Delete_All_Non_Used_Clips", "Delete all clips that are not groups, in groups, marked as never auto delete, has a shortcut key or marked as sticky.\r\n\r\nThis cannot be undone."), _T("Ditto"), MB_OKCANCEL | MB_TOPMOST);
 
 	m_bHideWnd = bStartValue;
-	if (nRet != IDYES)
+	if (nRet != IDOK)
 	{
 		return false;
 	}