From 7d90ff08f3f3d4d66c5357b2e9bf00755ca5178f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 15 Feb 2020 10:40:05 +1100 Subject: Fix incorrect enum in GHOST test --- intern/ghost/test/multitest/EventToBuf.c | 2 +- intern/ghost/test/multitest/MultiTest.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/ghost/test') diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c index 5aee8a50a8d..57fb950fa8b 100644 --- a/intern/ghost/test/multitest/EventToBuf.c +++ b/intern/ghost/test/multitest/EventToBuf.c @@ -41,7 +41,7 @@ char *eventtype_to_string(GHOST_TEventType type) case GHOST_kEventKeyUp: return "KeyUp"; - case GHOST_kEventQuit: + case GHOST_kEventQuitRequest: return "Quit"; case GHOST_kEventWindowClose: diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index 5c8d3527869..21d706966c1 100644 --- a/intern/ghost/test/multitest/MultiTest.c +++ b/intern/ghost/test/multitest/MultiTest.c @@ -736,7 +736,7 @@ static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time) mask[y][x / 8] |= (1 << (x % 8)); } - GHOST_SetCustomCursorShape(ew->win, bitmap, mask, 16, 16, 0, 0, true); + GHOST_SetCustomCursorShape(ew->win, &bitmap[0][0], &mask[0][0], 16, 16, 0, 0, true); } static void extrawindow_handle(void *priv, GHOST_EventHandle evt) @@ -850,7 +850,7 @@ static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr dat * that is, events without a window. */ switch (type) { - case GHOST_kEventQuit: + case GHOST_kEventQuitRequest: app->exit = 1; break; -- cgit v1.2.3