From 93da5a0578e7f16ea846eb257f36a24e316ef8d4 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Sun, 8 Jul 2018 15:15:15 +1000
Subject: gDelayNone/gDelayForever to replace TIME_IMMEDIATE/TIME_INFINITE

---
 drivers/multiple/Win32/gdisp_lld_Win32.c                  | 4 ++--
 drivers/multiple/Win32/ginput_lld_toggle_config.h         | 2 +-
 drivers/multiple/uGFXnet/ginput_lld_mouse_config.h        | 4 ++--
 drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'drivers')

diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c
index fff7fd58..128b4e2d 100644
--- a/drivers/multiple/Win32/gdisp_lld_Win32.c
+++ b/drivers/multiple/Win32/gdisp_lld_Win32.c
@@ -544,7 +544,7 @@ static LRESULT myWindowProc(HWND hWnd,	UINT Msg, WPARAM wParam, LPARAM lParam)
 					rect.bottom = GDISP_SCREEN_HEIGHT + WIN32_BUTTON_AREA;
 					InvalidateRect(hWnd, &rect, FALSE);
 					UpdateWindow(hWnd);
-					#if GINPUT_TOGGLE_POLL_PERIOD == TIME_INFINITE
+					#if GINPUT_TOGGLE_POLL_PERIOD == gDelayForever
 						ginputToggleWakeup();
 					#endif
 				}
@@ -567,7 +567,7 @@ static LRESULT myWindowProc(HWND hWnd,	UINT Msg, WPARAM wParam, LPARAM lParam)
 						rect.bottom = GDISP_SCREEN_HEIGHT + WIN32_BUTTON_AREA;
 						InvalidateRect(hWnd, &rect, FALSE);
 						UpdateWindow(hWnd);
-						#if GINPUT_TOGGLE_POLL_PERIOD == TIME_INFINITE
+						#if GINPUT_TOGGLE_POLL_PERIOD == gDelayForever
 							ginputToggleWakeup();
 						#endif
 					}
diff --git a/drivers/multiple/Win32/ginput_lld_toggle_config.h b/drivers/multiple/Win32/ginput_lld_toggle_config.h
index fbebfee9..2ee79ea0 100644
--- a/drivers/multiple/Win32/ginput_lld_toggle_config.h
+++ b/drivers/multiple/Win32/ginput_lld_toggle_config.h
@@ -10,7 +10,7 @@
 
 #if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE
 
-#define GINPUT_TOGGLE_POLL_PERIOD		TIME_INFINITE	// We are interrupt driven (or polled - either works here)
+#define GINPUT_TOGGLE_POLL_PERIOD		gDelayForever	// We are interrupt driven (or polled - either works here)
 
 // This driver is unique in that it can support 8 buttons per window across multiple windows.
 // GINPUT_TOGGLE_CONFIG_ENTRIES just must be less than the number of GDISP windows (GDISP_DRIVER_COUNT_WIN32).
diff --git a/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h b/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h
index 3d8841cf..499da6e8 100644
--- a/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h
+++ b/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h
@@ -13,7 +13,7 @@
 //	When operating in touch mode we allow sloppier clicks etc
 #if 1
 	#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_MOUSE
-	#define GINPUT_MOUSE_CLICK_TIME					TIME_INFINITE			// Long click != Context Click
+	#define GINPUT_MOUSE_CLICK_TIME					gDelayForever			// Long click != Context Click
 	#define GINPUT_MOUSE_NEED_CALIBRATION			GFXOFF
 	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	GFXOFF
 	#define GINPUT_MOUSE_READ_CYCLES				1
@@ -32,7 +32,7 @@
 #endif
 
 // This driver supports both an "interrupt" mode, and a polled mode
-#define GINPUT_MOUSE_POLL_PERIOD				TIME_INFINITE			// Interrupt driven by the Window thread
+#define GINPUT_MOUSE_POLL_PERIOD				gDelayForever			// Interrupt driven by the Window thread
 //#define GINPUT_MOUSE_POLL_PERIOD				25						// Poll driven
 
 // This driver does not require rotation of co-ordinates for orientations other than 0.
diff --git a/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h b/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h
index 3d8841cf..499da6e8 100644
--- a/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h
+++ b/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h
@@ -13,7 +13,7 @@
 //	When operating in touch mode we allow sloppier clicks etc
 #if 1
 	#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_MOUSE
-	#define GINPUT_MOUSE_CLICK_TIME					TIME_INFINITE			// Long click != Context Click
+	#define GINPUT_MOUSE_CLICK_TIME					gDelayForever			// Long click != Context Click
 	#define GINPUT_MOUSE_NEED_CALIBRATION			GFXOFF
 	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	GFXOFF
 	#define GINPUT_MOUSE_READ_CYCLES				1
@@ -32,7 +32,7 @@
 #endif
 
 // This driver supports both an "interrupt" mode, and a polled mode
-#define GINPUT_MOUSE_POLL_PERIOD				TIME_INFINITE			// Interrupt driven by the Window thread
+#define GINPUT_MOUSE_POLL_PERIOD				gDelayForever			// Interrupt driven by the Window thread
 //#define GINPUT_MOUSE_POLL_PERIOD				25						// Poll driven
 
 // This driver does not require rotation of co-ordinates for orientations other than 0.
-- 
cgit v1.2.3