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 | |
| parent | 7b0c5a98abfcd122f2f88d55b3c1b09391a1af8a (diff) | |
| download | scintilla-mirror-7d604cbdd43d33fa3f19e86fa868d8d8f9a0fc18.tar.gz | |
Added TickerID typedef to ease merging FOX code.
| -rw-r--r-- | include/Platform.h | 1 | ||||
| -rw-r--r-- | src/Editor.h | 2 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/Platform.h b/include/Platform.h index 634792960..235123a55 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -51,6 +51,7 @@ typedef void *FontID; typedef void *SurfaceID; typedef void *WindowID; typedef void *MenuID; +typedef void *TickerID; /** * A geometric point class. diff --git a/src/Editor.h b/src/Editor.h index 1e2310513..3a02ebd2a 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -26,7 +26,7 @@ public: bool ticking; int ticksToWait; enum {tickSize = 100}; - int tickerID; + TickerID tickerID; Timer(); }; 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; } } |