From 4b74730b1d7d7b7bbb3374f457d64977facd7e91 Mon Sep 17 00:00:00 2001 From: Vraiment Date: Wed, 9 Aug 2017 00:23:18 -0700 Subject: [PATCH] Fixed some event code that depends on the SDL version --- SDL2pp/Private/EventHandler.hh | 3 +++ SDL2pp/Private/EventTypeFilters.hh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/SDL2pp/Private/EventHandler.hh b/SDL2pp/Private/EventHandler.hh index fc673c7..be2c31f 100644 --- a/SDL2pp/Private/EventHandler.hh +++ b/SDL2pp/Private/EventHandler.hh @@ -29,6 +29,7 @@ #include #include +#include namespace SDL2pp { /* @@ -40,7 +41,9 @@ namespace Private { */ using ValidEventTypes = std::tuple< SDL_Event, +#if SDL_VERSION_ATLEAST(2, 0, 5) SDL_AudioDeviceEvent, +#endif SDL_ControllerAxisEvent, SDL_ControllerButtonEvent, SDL_ControllerDeviceEvent, diff --git a/SDL2pp/Private/EventTypeFilters.hh b/SDL2pp/Private/EventTypeFilters.hh index 3ff4404..5d7a008 100644 --- a/SDL2pp/Private/EventTypeFilters.hh +++ b/SDL2pp/Private/EventTypeFilters.hh @@ -80,7 +80,7 @@ namespace Private { #if SDL_VERSION_ATLEAST(2, 0, 5) SDL2PP_DEFINE_EVENT_MAPPING(SDL_DropEvent, event.type == SDL_DROPFILE || event.type == SDL_DROPTEXT || event.type == SDL_DROPBEGIN || event.type == SDL_DROPCOMPLETE, event.drop); #else - SDL2PP_DEFINE_EVENT_MAPPING(SDL_DropEvent, event.type == SDL_DROPFILE || event.type == SDL_DROPTEXT, event.drop); + SDL2PP_DEFINE_EVENT_MAPPING(SDL_DropEvent, event.type == SDL_DROPFILE, event.drop); #endif SDL2PP_DEFINE_EVENT_MAPPING(SDL_JoyAxisEvent, event.type == SDL_JOYAXISMOTION, event.jaxis); SDL2PP_DEFINE_EVENT_MAPPING(SDL_JoyBallEvent, event.type == SDL_JOYBALLMOTION, event.jball);