From ef8b008cdbe92cab970b3013c930c322ea3948b1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 2 Oct 2016 18:01:24 +0000
Subject: CDlgBase::AddTimer added

git-svn-id: http://svn.miranda-ng.org/main/trunk@17342 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 bin10/lib/mir_core.lib          | Bin 311018 -> 311330 bytes
 bin10/lib/mir_core64.lib        | Bin 311982 -> 312304 bytes
 bin12/lib/mir_core.lib          | Bin 311018 -> 311330 bytes
 bin12/lib/mir_core64.lib        | Bin 311982 -> 312304 bytes
 bin14/lib/mir_core.lib          | Bin 311018 -> 311330 bytes
 bin14/lib/mir_core64.lib        | Bin 311982 -> 312304 bytes
 include/m_gui.h                 |   1 +
 src/mir_core/src/mir_core.def   |   1 +
 src/mir_core/src/mir_core64.def |   1 +
 src/mir_core/src/ui_utils.cpp   |   7 +++++++
 10 files changed, 10 insertions(+)

diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index 1f559beeb7..e154ffac86 100644
Binary files a/bin10/lib/mir_core.lib and b/bin10/lib/mir_core.lib differ
diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index 76cc57d8ce..3890dcc4eb 100644
Binary files a/bin10/lib/mir_core64.lib and b/bin10/lib/mir_core64.lib differ
diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib
index 1f559beeb7..e154ffac86 100644
Binary files a/bin12/lib/mir_core.lib and b/bin12/lib/mir_core.lib differ
diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib
index 76cc57d8ce..3890dcc4eb 100644
Binary files a/bin12/lib/mir_core64.lib and b/bin12/lib/mir_core64.lib differ
diff --git a/bin14/lib/mir_core.lib b/bin14/lib/mir_core.lib
index 1f559beeb7..e154ffac86 100644
Binary files a/bin14/lib/mir_core.lib and b/bin14/lib/mir_core.lib differ
diff --git a/bin14/lib/mir_core64.lib b/bin14/lib/mir_core64.lib
index 76cc57d8ce..3890dcc4eb 100644
Binary files a/bin14/lib/mir_core64.lib and b/bin14/lib/mir_core64.lib differ
diff --git a/include/m_gui.h b/include/m_gui.h
index 916e0a4038..14e0e5b51c 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -429,6 +429,7 @@ protected:
 
 	// register controls
 	void AddControl(CCtrlBase *ctrl);
+	void AddTimer(CTimer *timer);
 
 	// win32 stuff
 	void ThemeDialogBackground(BOOL tabbed);
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 1c291ab133..21a64dc25f 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -1030,3 +1030,4 @@ CallFunctionSync @1170
 ?SetStep@CProgress@@QAEXG@Z @1187 NONAME
 ?Start@CTimer@@QAEXH@Z @1188 NONAME
 ?Stop@CTimer@@QAEXXZ @1189 NONAME
+?AddTimer@CDlgBase@@IAEXPAVCTimer@@@Z @1190 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index d2662a7730..50b1d8ed5d 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -1030,3 +1030,4 @@ CallFunctionSync @1170
 ?SetStep@CProgress@@QEAAXG@Z @1187 NONAME
 ?Start@CTimer@@QEAAXH@Z @1188 NONAME
 ?Stop@CTimer@@QEAAXXZ @1189 NONAME
+?AddTimer@CDlgBase@@IEAAXPEAVCTimer@@@Z @1190 NONAME
diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp
index 5e58783be2..ddc1088705 100644
--- a/src/mir_core/src/ui_utils.cpp
+++ b/src/mir_core/src/ui_utils.cpp
@@ -288,6 +288,11 @@ CCtrlBase* CDlgBase::FindControl(int idCtrl)
 	return m_controls.find(&search);
 }
 
+void CDlgBase::AddTimer(CTimer *timer)
+{
+	m_timers.insert(timer);
+}
+
 CTimer* CDlgBase::FindTimer(int idEvent)
 {
 	CTimer search(NULL, idEvent);
@@ -738,6 +743,8 @@ BOOL CCtrlHyperlink::OnCommand(HWND, WORD, WORD)
 CTimer::CTimer(CDlgBase *wnd, int idEvent)
 	: m_wnd(wnd), m_idEvent(idEvent)
 {
+	if (wnd)
+		wnd->AddTimer(this);
 }
 
 BOOL CTimer::OnTimer()
-- 
cgit v1.2.3