Merge pull request #934 from sabrogden/delete-clips-escape-key

Don't close delete clips dialog on escape key, changed cancel button …

CP_Main.rc

@@ -949,7 +949,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Delete Clip Data"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    PUSHBUTTON      "Cancel",IDCANCEL,732,294,50,14
+    PUSHBUTTON      "Close",IDCLOSE,732,294,50,14
     CONTROL         "",IDC_LIST2,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,105,775,185
     CONTROL         "",IDC_TIME_CREATE_START,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_DISABLED | WS_TABSTOP | 0x8,203,40,60,15
     CONTROL         "",IDC_DATE_CREATE_START,"SysDateTimePick32",DTS_RIGHTALIGN | WS_DISABLED | WS_TABSTOP,147,40,53,15

src/DeleteClipData.cpp

@@ -81,7 +81,7 @@ BEGIN_MESSAGE_MAP(CDeleteClipData, CDialog)
 	ON_NOTIFY(LVN_GETDISPINFO, IDC_LIST2, &CDeleteClipData::OnLvnGetdispinfoList2)
 	ON_BN_CLICKED(IDC_CHECK_CLIP_TITLE, &CDeleteClipData::OnBnClickedCheckClipTitle)
 	ON_BN_CLICKED(IDC_BUTTON_APPLY, &CDeleteClipData::OnBnClickedButtonApply)
-	ON_BN_CLICKED(IDCANCEL, &CDeleteClipData::OnBnClickedCancel)
+	ON_BN_CLICKED(IDCLOSE, &CDeleteClipData::OnBnClickedClose)
 	ON_WM_TIMER()
 	ON_BN_CLICKED(IDC_CHECK_CREATE_DATE, &CDeleteClipData::OnBnClickedCheckCreateDate)
 	ON_BN_CLICKED(IDC_CHECK_LAST_USE_DATE, &CDeleteClipData::OnBnClickedCheckLastUseDate)
@@ -201,6 +201,12 @@ void CDeleteClipData::OnClose()
 		return;
 	}
 
+	CloseDescriptionWindow();
+	DestroyWindow();
+}
+
+void CDeleteClipData::CloseDescriptionWindow()
+{
 	if (m_pDescriptionWindow != nullptr)
 	{
 		m_pDescriptionWindow->CloseWindow();
@@ -208,7 +214,6 @@ void CDeleteClipData::OnClose()
 		delete m_pDescriptionWindow;
 		m_pDescriptionWindow = nullptr;
 	}
-	DestroyWindow();
 }
 
 void CDeleteClipData::OnSize(UINT nType, int cx, int cy)
@@ -679,17 +684,17 @@ void CDeleteClipData::ApplyDelete()
 	}
 }
 
-void CDeleteClipData::OnBnClickedCancel()
+void CDeleteClipData::OnBnClickedClose()
 {
 	if (m_applyingDelete)
 	{
 		m_cancelDelete = true;
 		return;
 	}
+	CloseDescriptionWindow();
 	DestroyWindow();
 }
 
-
 void CDeleteClipData::OnTimer(UINT_PTR nIDEvent)
 {
 	switch(nIDEvent)
@@ -1191,4 +1196,8 @@ void CDeleteClipData::SaveClipDataItemToFile(CDeleteData item)
 			selectedClip.WriteTextToFile(ofn.lpstrFile, FALSE, FALSE, TRUE);
 		}
 	}
-}
+}
+void CDeleteClipData::OnCancel()
+{
+	//don't close on escape key
+}

src/DeleteClipData.h

@@ -68,6 +68,7 @@ protected:
 	void SetDbSize();
 
 	afx_msg void OnClose();
+	void CloseDescriptionWindow();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnNcDestroy();
 	void LoadItems();
@@ -108,7 +109,7 @@ public:
 	CString m_toDeleteSize;
 	afx_msg void OnBnClickedCheckClipTitle();
 	afx_msg void OnBnClickedButtonApply();
-	afx_msg void OnBnClickedCancel();
+	afx_msg void OnBnClickedClose();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg void OnBnClickedCheckCreateDate();
 	afx_msg void OnBnClickedCheckLastUseDate();
@@ -117,4 +118,5 @@ public:
 	virtual BOOL PreTranslateMessage(MSG* pMsg);	
 	afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
 	void ShowClipPropertiesWindow();
+	virtual void OnCancel();
 };