diff options
| -rw-r--r-- | bin10/lib/mir_core.lib | bin | 301568 -> 301830 bytes | |||
| -rw-r--r-- | bin10/lib/mir_core64.lib | bin | 302552 -> 302824 bytes | |||
| -rw-r--r-- | bin12/lib/mir_core.lib | bin | 301568 -> 301830 bytes | |||
| -rw-r--r-- | bin12/lib/mir_core64.lib | bin | 302552 -> 302824 bytes | |||
| -rw-r--r-- | bin14/lib/mir_core.lib | bin | 301568 -> 301830 bytes | |||
| -rw-r--r-- | bin14/lib/mir_core64.lib | bin | 302552 -> 302824 bytes | |||
| -rw-r--r-- | include/m_gui.h | 3 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core.def | 1 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core64.def | 1 | ||||
| -rw-r--r-- | src/mir_core/src/ui_utils.cpp | 7 |
10 files changed, 10 insertions, 2 deletions
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib Binary files differindex 885a7f985d..e2bbe89dbb 100644 --- a/bin10/lib/mir_core.lib +++ b/bin10/lib/mir_core.lib diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib Binary files differindex bb8acd7e4c..0fe2c7b8da 100644 --- a/bin10/lib/mir_core64.lib +++ b/bin10/lib/mir_core64.lib diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib Binary files differindex 885a7f985d..e2bbe89dbb 100644 --- a/bin12/lib/mir_core.lib +++ b/bin12/lib/mir_core.lib diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib Binary files differindex bb8acd7e4c..0fe2c7b8da 100644 --- a/bin12/lib/mir_core64.lib +++ b/bin12/lib/mir_core64.lib diff --git a/bin14/lib/mir_core.lib b/bin14/lib/mir_core.lib Binary files differindex 885a7f985d..e2bbe89dbb 100644 --- a/bin14/lib/mir_core.lib +++ b/bin14/lib/mir_core.lib diff --git a/bin14/lib/mir_core64.lib b/bin14/lib/mir_core64.lib Binary files differindex bb8acd7e4c..0fe2c7b8da 100644 --- a/bin14/lib/mir_core64.lib +++ b/bin14/lib/mir_core64.lib diff --git a/include/m_gui.h b/include/m_gui.h index 980774a28b..bea30ce302 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -381,7 +381,8 @@ public: // general utilities
void Create();
void Show(int nCmdShow = SW_SHOW);
- int DoModal();
+ int DoModal();
+ void EndModal(INT_PTR nResult);
void SetCaption(const wchar_t *ptszCaption);
void NotifyChange(void); // sends a notification to a parent window
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);
}
|