From 6d08a4cb98cb6351ad8cdded482e46a2a9c12113 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 28 Apr 2018 09:00:02 +1000 Subject: Backport: Remove unused definition and replace 0 with nullptr. Backport of changeset 6754:e62ae5a8a587. --- win32/ScintillaWin.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'win32') diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index d35884dd9..b777ade12 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -131,7 +131,6 @@ #define SCS_SETRECONVERTSTRING 0x00010000 #endif -typedef BOOL (WINAPI *TrackMouseEventSig)(LPTRACKMOUSEEVENT); typedef UINT_PTR (WINAPI *SetCoalescableTimerSig)(HWND hwnd, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc, ULONG uToleranceDelay); @@ -429,7 +428,7 @@ ScintillaWin::ScintillaWin(HWND hwnd) { capturedMouse = false; trackedMouseLeave = false; - SetCoalescableTimerFn = 0; + SetCoalescableTimerFn = nullptr; linesPerScroll = 0; wheelDelta = 0; // Wheel delta from roll -- cgit v1.2.3