diff options
| -rw-r--r-- | include/m_gui.h | 2 | ||||
| -rw-r--r-- | libs/win32/mir_core.lib | bin | 472966 -> 472972 bytes | |||
| -rw-r--r-- | libs/win64/mir_core.lib | bin | 478022 -> 478026 bytes | |||
| -rw-r--r-- | src/mir_core/src/CTimer.cpp | 4 | ||||
| -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, 5 insertions, 5 deletions
diff --git a/include/m_gui.h b/include/m_gui.h index 3c0d788564..5e597352c5 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -440,7 +440,7 @@ public: virtual BOOL OnTimer();
void Start(int elapse);
- void Stop();
+ bool Stop(); // returns true if timer was active
void StartSafe(int elapse);
void StopSafe();
diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib Binary files differindex 2578fcfb2d..c2b71219b8 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 5f1a002c1b..d3d1f7f49c 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 e03a44666c..b157ec9ec6 100644 --- a/src/mir_core/src/CTimer.cpp +++ b/src/mir_core/src/CTimer.cpp @@ -51,9 +51,9 @@ void CTimer::Start(int elapse) ::SetTimer(m_wnd->GetHwnd(), m_idEvent, elapse, nullptr); } -void CTimer::Stop() +bool CTimer::Stop() { - ::KillTimer(m_wnd->GetHwnd(), m_idEvent); + return 0 != ::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 950ceb9d55..e0aca3aaff 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -971,7 +971,7 @@ CallFunctionSync @1170 ?SetRange@CCtrlProgress@@QAEXGG@Z @1186 NONAME
?SetStep@CCtrlProgress@@QAEXG@Z @1187 NONAME
?Start@CTimer@@QAEXH@Z @1188 NONAME
-?Stop@CTimer@@QAEXXZ @1189 NONAME
+?Stop@CTimer@@QAE_NXZ @1189 NONAME
?AddTimer@CDlgBase@@IAEXPAVCTimer@@@Z @1190 NONAME
?GetItemRect@CCtrlListBox@@QAEHHPAUtagRECT@@@Z @1193 NONAME
?SetItemHeight@CCtrlListBox@@QAEXHH@Z @1194 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 0a9b1f8baf..d0b84bfdd6 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -971,7 +971,7 @@ CallFunctionSync @1170 ?SetRange@CCtrlProgress@@QEAAXGG@Z @1186 NONAME
?SetStep@CCtrlProgress@@QEAAXG@Z @1187 NONAME
?Start@CTimer@@QEAAXH@Z @1188 NONAME
-?Stop@CTimer@@QEAAXXZ @1189 NONAME
+?Stop@CTimer@@QEAA_NXZ @1189 NONAME
?AddTimer@CDlgBase@@IEAAXPEAVCTimer@@@Z @1190 NONAME
?GetItemRect@CCtrlListBox@@QEAAHHPEAUtagRECT@@@Z @1193 NONAME
?SetItemHeight@CCtrlListBox@@QEAAXHH@Z @1194 NONAME
|