From 8f8a9ef4885bcb00cf9aa17f95abb2ef3b9ff626 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 8 Oct 2023 14:31:15 +1100 Subject: [PATCH] Cleanup: remove unused GHOST_kEventTimer There was a type error assigning customdata, (wmTimer *) was expected although this data isn't created so it was never hit. --- intern/ghost/GHOST_Types.h | 2 -- intern/ghost/intern/GHOST_EventPrinter.cc | 2 -- source/blender/windowmanager/intern/wm_event_system.cc | 10 ---------- 3 files changed, 14 deletions(-) diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index cff5b3702c5..faac0998942 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -304,8 +304,6 @@ typedef enum { GHOST_kEventOpenMainFile, /* Needed for Cocoa to open double-clicked .blend file at startup. */ GHOST_kEventNativeResolutionChange, /* Needed for Cocoa when window moves to other display. */ - GHOST_kEventTimer, - GHOST_kEventImeCompositionStart, GHOST_kEventImeComposition, GHOST_kEventImeCompositionEnd, diff --git a/intern/ghost/intern/GHOST_EventPrinter.cc b/intern/ghost/intern/GHOST_EventPrinter.cc index 96563256953..4f6f453d812 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.cc +++ b/intern/ghost/intern/GHOST_EventPrinter.cc @@ -206,8 +206,6 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent *event) CASE_TYPE(GHOST_kEventNativeResolutionChange); - CASE_TYPE(GHOST_kEventTimer); - CASE_TYPE(GHOST_kEventImeCompositionStart); CASE_TYPE(GHOST_kEventImeComposition); CASE_TYPE(GHOST_kEventImeCompositionEnd); diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index ac3f77e1faf..eb5e6498c6f 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -5827,16 +5827,6 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, const int type, break; } - case GHOST_kEventTimer: { - event.type = TIMER; - event.custom = EVT_DATA_TIMER; - event.customdata = customdata; - event.val = KM_NOTHING; - event.keymodifier = 0; - wm_event_add(win, &event); - - break; - } #ifdef WITH_INPUT_NDOF case GHOST_kEventNDOFMotion: {