From 7d604cbdd43d33fa3f19e86fa868d8d8f9a0fc18 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Sun, 13 Jan 2002 10:07:20 +0000
Subject: Added TickerID typedef to ease merging FOX code.

---
 win32/ScintillaWin.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index ae6018f94..42d835cfb 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -832,9 +832,9 @@ void ScintillaWin::SetTicking(bool on) {
 	if (timer.ticking != on) {
 		timer.ticking = on;
 		if (timer.ticking) {
-			timer.tickerID = ::SetTimer(MainHWND(), 1, timer.tickSize, NULL);
+			timer.tickerID = reinterpret_cast<TickerID>(::SetTimer(MainHWND(), 1, timer.tickSize, NULL));
 		} else {
-			::KillTimer(MainHWND(), timer.tickerID);
+			::KillTimer(MainHWND(), reinterpret_cast<UINT>(timer.tickerID));
 			timer.tickerID = 0;
 		}
 	}
-- 
cgit v1.2.3