pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added a #ifndef SDL_NO_COMPAT around SDL_ActiveEvent and SDL_ResizeEvent so that code

Browse source 
that has a #defien SDL_NO_COMPAT before the #include SDL.h with not be able to use
these obsolete events.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403624
This commit is contained in:
Bob Pendleton 2009-06-05 23:36:00 +00:00
parent 3795d42a61
commit 2011e3d29b
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
include/SDL_events.h
View file

@ -313,20 +313,6 @@ typedef struct SDL_SysWMEvent
SDL_SysWMmsg *msg; /**< driver dependent data, defined in SDL_syswm.h */ SDL_SysWMmsg *msg; /**< driver dependent data, defined in SDL_syswm.h */
} SDL_SysWMEvent; } SDL_SysWMEvent;
/* Typedefs for backwards compatibility */
typedef struct SDL_ActiveEvent
{
Uint8 type;
Uint8 gain;
Uint8 state;
} SDL_ActiveEvent;
typedef struct SDL_ResizeEvent
{
Uint8 type;
int w;
int h;
} SDL_ResizeEvent;
typedef struct SDL_ProximityEvent typedef struct SDL_ProximityEvent
{ {
Uint8 type; Uint8 type;
@ -336,6 +322,23 @@ typedef struct SDL_ProximityEvent
int y; int y;
} SDL_ProximityEvent; } SDL_ProximityEvent;
/* Typedefs for backwards compatibility */
#ifndef SDL_NO_COMPAT
typedef struct SDL_ActiveEvent
{
Uint8 type;
Uint8 gain;
Uint8 state;
} SDL_ActiveEvent;
typedef struct SDL_ResizeEvent
{
Uint8 type;
int w;
int h;
} SDL_ResizeEvent;
#endif
/** /**
* \union SDL_Event * \union SDL_Event
* *
@ -360,8 +363,10 @@ typedef union SDL_Event
SDL_ProximityEvent proximity; /**< Proximity In or Out event */ SDL_ProximityEvent proximity; /**< Proximity In or Out event */
/* Temporarily here for backwards compatibility */ /* Temporarily here for backwards compatibility */
#ifndef SDL_NO_COMPAT
SDL_ActiveEvent active; SDL_ActiveEvent active;
SDL_ResizeEvent resize; SDL_ResizeEvent resize;
#endif
} SDL_Event; } SDL_Event;