diff options
| author | nyamatongwe <devnull@localhost> | 2002-01-13 10:07:20 +0000 | 
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2002-01-13 10:07:20 +0000 | 
| commit | 7d604cbdd43d33fa3f19e86fa868d8d8f9a0fc18 (patch) | |
| tree | 4b8cccdacc801f4105b6d0420d139284e70dfa10 /win32/ScintillaWin.cxx | |
| parent | 7b0c5a98abfcd122f2f88d55b3c1b09391a1af8a (diff) | |
| download | scintilla-mirror-7d604cbdd43d33fa3f19e86fa868d8d8f9a0fc18.tar.gz | |
Added TickerID typedef to ease merging FOX code.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 4 | 
1 files changed, 2 insertions, 2 deletions
| 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;  		}  	} | 
