1 files changed, 14 insertions, 12 deletions
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h
index cd7a5102809..92ae4e0e2cf 100644
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -35,11 +35,6 @@ struct ScrArea;
 
 /* wmKeyMap is in DNA_windowmanager.h, it's saveable */
 
-struct wmEventHandler_KeymapFn {
-	void (*handle_post_fn)(wmKeyMap *keymap, wmKeyMapItem *kmi, void *user_data);
-	void  *user_data;
-};
-
 /** Custom types for handlers, for signaling, freeing */
 enum eWM_EventHandlerType {
 	WM_HANDLER_TYPE_GIZMO = 1,
@@ -59,20 +54,27 @@ typedef struct wmEventHandler {
 	const rcti *bblocal, *bbwin;
 } wmEventHandler;
 
+/** Run after the keymap item runs. */
+struct wmEventHandler_KeymapPost {
+	void (*post_fn)(wmKeyMap *keymap, wmKeyMapItem *kmi, void *user_data);
+	void  *user_data;
+};
+
+/** Support for a getter function that looks up the keymap each access. */
+struct wmEventHandler_KeymapDynamic {
+	wmEventHandler_KeymapDynamicFn *keymap_fn;
+	void *user_data;
+};
+
 /** #WM_HANDLER_TYPE_KEYMAP */
 typedef struct wmEventHandler_Keymap {
 	wmEventHandler head;
 
 	/** Pointer to builtin/custom keymaps (never NULL). */
 	wmKeyMap *keymap;
-	/** Run after the keymap item runs. */
-	struct wmEventHandler_KeymapFn keymap_callback;
 
-	/** Support for a getter function that looks up the keymap each access. */
-	struct {
-		wmEventHandler_KeymapDynamicFn *keymap_fn;
-		void *user_data;
-	} dynamic;
+	struct wmEventHandler_KeymapPost post;
+	struct wmEventHandler_KeymapDynamic dynamic;
 
 	struct bToolRef *keymap_tool;
 } wmEventHandler_Keymap;