diff options
| author | George Hazan <ghazan@miranda.im> | 2020-01-03 15:25:13 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-01-03 15:25:13 +0300 |
| commit | 2d2166ed2a83bc8ce315f4e7f29c7ab71439a7e4 (patch) | |
| tree | efb76991e12b8dce23893ee2c5b8cf418cd38a8e | |
| parent | f4c7ba6b587dd71da4e44c38fe81e1e4cfdbe10f (diff) | |
CTimer::GetEventId() shall return UINT_PTR as well
| -rw-r--r-- | include/m_gui.h | 2 | ||||
| -rw-r--r-- | libs/win32/mir_core.lib | bin | 461678 -> 461678 bytes | |||
| -rw-r--r-- | libs/win64/mir_core.lib | bin | 466486 -> 466490 bytes | |||
| -rw-r--r-- | src/mir_core/src/mir_core.def | 2 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core64.def | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/include/m_gui.h b/include/m_gui.h index cf69e00560..817c08e8c1 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -487,7 +487,7 @@ class MIR_CORE_EXPORT CTimer public:
CTimer(CDlgBase* wnd, UINT_PTR idEvent);
- __forceinline int GetEventId() const { return m_idEvent; }
+ __forceinline UINT_PTR GetEventId() const { return m_idEvent; }
virtual BOOL OnTimer();
diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib Binary files differindex 09da2b9514..14fc52674b 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 e61ea64958..6cf66cde34 100644 --- a/libs/win64/mir_core.lib +++ b/libs/win64/mir_core.lib diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 070cdf2e8c..1b22df32d6 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -968,7 +968,7 @@ CallFunctionSync @1170 ??_7CProgress@@6B@ @1178 NONAME
??_7CTimer@@6B@ @1179 NONAME
?FindTimer@CDlgBase@@AAEPAVCTimer@@H@Z @1180 NONAME
-?GetEventId@CTimer@@QBEHXZ @1181 NONAME
+?GetEventId@CTimer@@QBEIXZ @1181 NONAME
?Move@CProgress@@QAEGG@Z @1182 NONAME
?OnTimer@CDlgBase@@MAEXPAVCTimer@@@Z @1183 NONAME
?OnTimer@CTimer@@UAEHXZ @1184 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 1cc34ebb73..26b80a6021 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -968,7 +968,7 @@ CallFunctionSync @1170 ??_7CProgress@@6B@ @1178 NONAME
??_7CTimer@@6B@ @1179 NONAME
?FindTimer@CDlgBase@@AEAAPEAVCTimer@@H@Z @1180 NONAME
-?GetEventId@CTimer@@QEBAHXZ @1181 NONAME
+?GetEventId@CTimer@@QEBA_KXZ @1181 NONAME
?Move@CProgress@@QEAAGG@Z @1182 NONAME
?OnTimer@CDlgBase@@MEAAXPEAVCTimer@@@Z @1183 NONAME
?OnTimer@CTimer@@UEAAHXZ @1184 NONAME
|