gDelayNone/gDelayForever to replace TIME_IMMEDIATE/TIME_INFINITE

3 files changed, 9 insertions, 9 deletions

diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c
index c338e24c..2a1e6486 100644
--- a/demos/tools/touch_driver_test/main.c
+++ b/demos/tools/touch_driver_test/main.c
@@ -176,7 +176,7 @@ StepDeviceType:
 	}
 
 	while(1) {
-		pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE);
+		pem = (GEventMouse *)geventEventWait(&gl, gDelayForever);
 		if (isCalibrated) {
 			switch (CheckButtons(pem)) {
 			case BTN_NEXT:
@@ -225,7 +225,7 @@ StepRawReading:
 		// Always sleep a bit first to enable other events. We actually don't
 		// mind missing events for this test.
 		gfxSleepMilliseconds(100);
-		pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE);
+		pem = (GEventMouse *)geventEventWait(&gl, gDelayForever);
 		gwinPrintf(ghc, "%u, %u z=%u b=0x%04x\n", pem->x, pem->y, pem->z, pem->buttons & ~GINPUT_MISSED_MOUSE_EVENT);
 		if ((pem->buttons & GMETA_MOUSE_UP))
 			break;
@@ -265,7 +265,7 @@ StepCalibrate:
 		gwinPrintf(ghc, "Press and release your %s to move on to start calibration.\n", deviceText);
 
 	while(1) {
-		pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE);
+		pem = (GEventMouse *)geventEventWait(&gl, gDelayForever);
 		if (isCalibrated) {
 			switch (CheckButtons(pem)) {
 			case BTN_NEXT:
@@ -317,7 +317,7 @@ StepMouseCoords:
 		// Always sleep a bit first to enable other events. We actually don't
 		// mind missing events for this test.
 		gfxSleepMilliseconds(100);
-		pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE);
+		pem = (GEventMouse *)geventEventWait(&gl, gDelayForever);
 
 		switch (CheckButtons(pem)) {
 		case BTN_NEXT:
@@ -359,7 +359,7 @@ StepMovementJitter:
 	gwinPrintf(ghc, "Press Next or Back to continue.\n\n");
 
 	while(1) {
-		pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE);
+		pem = (GEventMouse *)geventEventWait(&gl, gDelayForever);
 		switch (CheckButtons(pem)) {
 		case BTN_NEXT:
 			break;
@@ -402,7 +402,7 @@ StepClickJitter:
 	gwinPrintf(ghc, "Press Next or Back to continue.\n\n");
 
 	while(1) {
-		pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE);
+		pem = (GEventMouse *)geventEventWait(&gl, gDelayForever);
 		switch (CheckButtons(pem)) {
 		case BTN_NEXT:
 			break;
@@ -444,7 +444,7 @@ StepDrawing:
 	gwinPrintf(ghc, "Press Next or Back to continue.\n\n");
 
 	while(1) {
-		pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE);
+		pem = (GEventMouse *)geventEventWait(&gl, gDelayForever);
 		if (pem->y < bHeight && pem->x >= swidth-2*bWidth) {
 			if ((pem->buttons & GMETA_MOUSE_UP)) {
 				if (pem->x >= swidth-bWidth)
diff --git a/demos/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c
index 9b3c125c..1d38b3de 100644
--- a/demos/tools/touch_raw_readings/main.c
+++ b/demos/tools/touch_raw_readings/main.c
@@ -101,7 +101,7 @@ int main(void) {
 	geventAttachSource(&gl, gs, GLISTEN_MOUSEDOWNMOVES|GLISTEN_MOUSEUPMOVES|GLISTEN_MOUSEMETA|GLISTEN_MOUSENOFILTER);
 
 	while(1) {
-		pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE);
+		pem = (GEventMouse *)geventEventWait(&gl, gDelayForever);
 		gwinPrintf(ghc, "%u, %u z=%u b=0x%04x\n", pem->x, pem->y, pem->z, pem->buttons & ~GINPUT_MISSED_MOUSE_EVENT);
 
 		// Always sleep a bit first to enable other events. We actually don't mind missing events.
diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c
index de814dde..dc396cfb 100644
--- a/demos/tools/uGFXnetDisplay/main.c
+++ b/demos/tools/uGFXnetDisplay/main.c
@@ -198,7 +198,7 @@ static gBool sendpkt(uint16_t *pkt, int len) {
 
 		while(1) {
 			// Get a (mouse) event
-			pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE);
+			pem = (GEventMouse *)geventEventWait(&gl, gDelayForever);
 			if (pem->type != GEVENT_MOUSE && pem->type != GEVENT_TOUCH)
 				continue;