From f6695239d5cc549254a0d599134916f68a5eb553 Mon Sep 17 00:00:00 2001 From: Vraiment Date: Tue, 8 Aug 2017 20:26:52 -0700 Subject: [PATCH] Added SDL_UserEvent support --- SDL2pp/Private/EventHandler.hh | 2 +- SDL2pp/Private/EventTypeFilters.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SDL2pp/Private/EventHandler.hh b/SDL2pp/Private/EventHandler.hh index a869e7e..9ca240d 100644 --- a/SDL2pp/Private/EventHandler.hh +++ b/SDL2pp/Private/EventHandler.hh @@ -62,7 +62,7 @@ namespace Private { SDL_TextEditingEvent, SDL_TextInputEvent, SDL_TouchFingerEvent, - //SDL_UserEvent, <- User events are a special case + SDL_UserEvent, SDL_WindowEvent >; diff --git a/SDL2pp/Private/EventTypeFilters.hh b/SDL2pp/Private/EventTypeFilters.hh index c0dcaac..3ff4404 100644 --- a/SDL2pp/Private/EventTypeFilters.hh +++ b/SDL2pp/Private/EventTypeFilters.hh @@ -97,7 +97,7 @@ namespace Private { SDL2PP_DEFINE_EVENT_MAPPING(SDL_TextEditingEvent, event.type == SDL_TEXTEDITING, event.edit); SDL2PP_DEFINE_EVENT_MAPPING(SDL_TextInputEvent, event.type == SDL_TEXTINPUT, event.text); SDL2PP_DEFINE_EVENT_MAPPING(SDL_TouchFingerEvent, event.type == SDL_FINGERMOTION || event.type == SDL_FINGERDOWN || event.type == SDL_FINGERUP, event.tfinger); - //SDL2PP_DEFINE_EVENT_MAPPING(SDL_UserEvent, event.type == SDL_USEREVENT, event.user); <- This won't work + SDL2PP_DEFINE_EVENT_MAPPING(SDL_UserEvent, SDL_USEREVENT <= event.type && event.type <= SDL_LASTEVENT, event.user); SDL2PP_DEFINE_EVENT_MAPPING(SDL_WindowEvent, event.type == SDL_WINDOWEVENT, event.window); #undef SDL2PP_DEFINE_EVENT_MAPPING