TheCloud/libSDL2pp
1
0
Fork 0
mirror of https://github.com/libSDL2pp/libSDL2pp.git synced 2025-08-03 19:05:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some event code that depends on the SDL version

Browse Source
This commit is contained in:
Vraiment 2017-08-09 00:23:18 -07:00
parent 3c903e101f
commit 4b74730b1d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SDL2pp/Private/EventHandler.hh
View File

@ -29,6 +29,7 @@
#include <type_traits> #include <type_traits>
#include <SDL_events.h> #include <SDL_events.h>
#include <SDL_version.h>
namespace SDL2pp { namespace SDL2pp {
/* /*
@ -40,7 +41,9 @@ namespace Private {
*/ */
using ValidEventTypes = std::tuple< using ValidEventTypes = std::tuple<
SDL_Event, SDL_Event,
#if SDL_VERSION_ATLEAST(2, 0, 5)
SDL_AudioDeviceEvent, SDL_AudioDeviceEvent,
#endif
SDL_ControllerAxisEvent, SDL_ControllerAxisEvent,
SDL_ControllerButtonEvent, SDL_ControllerButtonEvent,
SDL_ControllerDeviceEvent, SDL_ControllerDeviceEvent,

2
SDL2pp/Private/EventTypeFilters.hh
View File

@ -80,7 +80,7 @@ namespace Private {
#if SDL_VERSION_ATLEAST(2, 0, 5) #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); 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 #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 #endif
SDL2PP_DEFINE_EVENT_MAPPING(SDL_JoyAxisEvent, event.type == SDL_JOYAXISMOTION, event.jaxis); SDL2PP_DEFINE_EVENT_MAPPING(SDL_JoyAxisEvent, event.type == SDL_JOYAXISMOTION, event.jaxis);
SDL2PP_DEFINE_EVENT_MAPPING(SDL_JoyBallEvent, event.type == SDL_JOYBALLMOTION, event.jball); SDL2PP_DEFINE_EVENT_MAPPING(SDL_JoyBallEvent, event.type == SDL_JOYBALLMOTION, event.jball);