From 3ab53b37c6e80b2b768617848f4e01e7163bc494 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 11 Aug 2016 08:28:53 +0000
Subject: CDlgBase::EndModal(INT_PTR nResult) - new method to close modal
 dialog

git-svn-id: http://svn.miranda-ng.org/main/trunk@17176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_core/src/mir_core.def   | 1 +
 src/mir_core/src/mir_core64.def | 1 +
 src/mir_core/src/ui_utils.cpp   | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 08474a3565..3c214307b8 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -474,6 +474,7 @@ mir_wstrcmpi                  @280
 ?UnlockBuffer@?$CMSimpleStringT@_W@@QAEXXZ @538 NONAME
 ?c_str@?$CMSimpleStringT@D@@QBEPBDXZ @539 NONAME
 ?c_str@?$CMSimpleStringT@_W@@QBEPB_WXZ @540 NONAME
+?EndModal@CDlgBase@@QAEXH@Z @541 NONAME
 ??0CCtrlBase@@QAE@ABV0@@Z @609 NONAME
 ??0CCtrlBase@@QAE@PAVCDlgBase@@H@Z @610 NONAME
 ??0CCtrlButton@@QAE@ABV0@@Z @611 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 8f80acc931..e988dcc60b 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -474,6 +474,7 @@ mir_wstrcmpi                  @280
 ?UnlockBuffer@?$CMSimpleStringT@_W@@QEAAXXZ @538 NONAME
 ?c_str@?$CMSimpleStringT@D@@QEBAPEBDXZ @539 NONAME
 ?c_str@?$CMSimpleStringT@_W@@QEBAPEB_WXZ @540 NONAME
+?EndModal@CDlgBase@@QEAAX_J@Z @541 NONAME
 ??0CCtrlBase@@QEAA@AEBV0@@Z @609 NONAME
 ??0CCtrlBase@@QEAA@PEAVCDlgBase@@H@Z @610 NONAME
 ??0CCtrlButton@@QEAA@AEBV0@@Z @611 NONAME
diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp
index 307298a86d..0d479dac63 100644
--- a/src/mir_core/src/ui_utils.cpp
+++ b/src/mir_core/src/ui_utils.cpp
@@ -78,6 +78,11 @@ int CDlgBase::DoModal()
 	return DialogBoxParam(m_hInst, MAKEINTRESOURCE(m_idDialog), m_hwndParent, GlobalDlgProc, (LPARAM)this);
 }
 
+void CDlgBase::EndModal(INT_PTR nResult)
+{
+	::EndDialog(m_hwnd, nResult);
+}
+
 void CDlgBase::NotifyChange(void)
 {
 	if (m_hwndParent)
@@ -198,7 +203,7 @@ INT_PTR CDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 		OnClose();
 		if (!m_lresult) {
 			if (m_isModal)
-				EndDialog(m_hwnd, 0);
+				EndModal(0);
 			else
 				DestroyWindow(m_hwnd);
 		}
-- 
cgit v1.2.3