diff options
| author | George Hazan <ghazan@miranda.im> | 2020-01-03 14:33:14 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-01-03 14:33:14 +0300 |
| commit | d79e8a0ecf46e860c4ae9bae0bd9ea53e6cad382 (patch) | |
| tree | a1b97019f40589c101520f288042ef97344a6001 | |
| parent | 0e45166366f9f8a438dc01bb1bb95d21cc50a94d (diff) | |
CTimer::CTimer() : parameter type is changed to UINT_PTR, as presumed
| -rw-r--r-- | include/m_gui.h | 4 | ||||
| -rw-r--r-- | libs/win32/mir_core.lib | bin | 461678 -> 461678 bytes | |||
| -rw-r--r-- | libs/win64/mir_core.lib | bin | 466482 -> 466486 bytes | |||
| -rw-r--r-- | src/mir_core/src/CTimer.cpp | 6 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core.def | 2 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core64.def | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/include/m_gui.h b/include/m_gui.h index e469ffcf83..cf69e00560 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -485,7 +485,7 @@ class MIR_CORE_EXPORT CTimer friend class CDlgBase;
public:
- CTimer(CDlgBase* wnd, int idEvent);
+ CTimer(CDlgBase* wnd, UINT_PTR idEvent);
__forceinline int GetEventId() const { return m_idEvent; }
@@ -497,7 +497,7 @@ public: CCallback<CTimer> OnEvent;
protected:
- int m_idEvent;
+ UINT_PTR m_idEvent;
CDlgBase* m_wnd;
};
diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib Binary files differindex 99be1dce2a..09da2b9514 100644 --- a/libs/win32/mir_core.lib +++ b/libs/win32/mir_core.lib diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib Binary files differindex 3e2ceafd8a..e61ea64958 100644 --- a/libs/win64/mir_core.lib +++ b/libs/win64/mir_core.lib diff --git a/src/mir_core/src/CTimer.cpp b/src/mir_core/src/CTimer.cpp index 52a8f14a91..d4df04649a 100644 --- a/src/mir_core/src/CTimer.cpp +++ b/src/mir_core/src/CTimer.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ///////////////////////////////////////////////////////////////////////////////////////// // CTimer -CTimer::CTimer(CDlgBase *wnd, int idEvent) +CTimer::CTimer(CDlgBase *wnd, UINT_PTR idEvent) : m_wnd(wnd), m_idEvent(idEvent) { if (wnd) @@ -40,10 +40,10 @@ BOOL CTimer::OnTimer() void CTimer::Start(int elapse) { - SetTimer(m_wnd->GetHwnd(), m_idEvent, elapse, nullptr); + ::SetTimer(m_wnd->GetHwnd(), m_idEvent, elapse, nullptr); } void CTimer::Stop() { - KillTimer(m_wnd->GetHwnd(), m_idEvent); + ::KillTimer(m_wnd->GetHwnd(), m_idEvent); } diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 3163bc75d7..070cdf2e8c 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -962,7 +962,7 @@ db_get_current @1169 CallFunctionSync @1170
??0CProgress@@QAE@PAVCDlgBase@@H@Z @1172 NONAME
??0CTimer@@QAE@ABV0@@Z @1173 NONAME
-??0CTimer@@QAE@PAVCDlgBase@@H@Z @1174 NONAME
+??0CTimer@@QAE@PAVCDlgBase@@I@Z @1174 NONAME
??1CProgress@@UAE@XZ @1175 NONAME
??4CTimer@@QAEAAV0@ABV0@@Z @1177 NONAME
??_7CProgress@@6B@ @1178 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index e0ecff0900..1cc34ebb73 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -962,7 +962,7 @@ db_get_current @1169 CallFunctionSync @1170
??0CProgress@@QEAA@PEAVCDlgBase@@H@Z @1172 NONAME
??0CTimer@@QEAA@AEBV0@@Z @1173 NONAME
-??0CTimer@@QEAA@PEAVCDlgBase@@H@Z @1174 NONAME
+??0CTimer@@QEAA@PEAVCDlgBase@@_K@Z @1174 NONAME
??1CProgress@@UEAA@XZ @1175 NONAME
??4CTimer@@QEAAAEAV0@AEBV0@@Z @1177 NONAME
??_7CProgress@@6B@ @1178 NONAME
|