Mercurial > sdl-ios-xcode

comparison include/SDL_events.h @ 3167:0c85abc61e47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added a #ifndef SDL_NO_COMPAT around SDL_ActiveEvent and SDL_ResizeEvent so that code that has a #defien SDL_NO_COMPAT before the #include SDL.h with not be able to use these obsolete events.
author Bob Pendleton <bob@pendleton.com>
date Fri, 05 Jun 2009 23:36:00 +0000
parents 9da8f57ab92c
children 91b335df6fc8
comparison
equal deleted inserted replaced
3166:3a63a5824557 3167:0c85abc61e47
311 { 311 {
312 Uint8 type; /**< SDL_SYSWMEVENT */ 312 Uint8 type; /**< SDL_SYSWMEVENT */
313 SDL_SysWMmsg *msg; /**< driver dependent data, defined in SDL_syswm.h */ 313 SDL_SysWMmsg *msg; /**< driver dependent data, defined in SDL_syswm.h */
314 } SDL_SysWMEvent; 314 } SDL_SysWMEvent;
315 315
316 /* Typedefs for backwards compatibility */
317 typedef struct SDL_ActiveEvent
318 {
319 Uint8 type;
320 Uint8 gain;
321 Uint8 state;
322 } SDL_ActiveEvent;
323 typedef struct SDL_ResizeEvent
324 {
325 Uint8 type;
326 int w;
327 int h;
328 } SDL_ResizeEvent;
329
330 typedef struct SDL_ProximityEvent 316 typedef struct SDL_ProximityEvent
331 { 317 {
332 Uint8 type; 318 Uint8 type;
333 Uint8 which; 319 Uint8 which;
334 int cursor; 320 int cursor;
335 int x; 321 int x;
336 int y; 322 int y;
337 } SDL_ProximityEvent; 323 } SDL_ProximityEvent;
324
325 /* Typedefs for backwards compatibility */
326 #ifndef SDL_NO_COMPAT
327 typedef struct SDL_ActiveEvent
328 {
329 Uint8 type;
330 Uint8 gain;
331 Uint8 state;
332 } SDL_ActiveEvent;
333
334 typedef struct SDL_ResizeEvent
335 {
336 Uint8 type;
337 int w;
338 int h;
339 } SDL_ResizeEvent;
340 #endif
338 341
339 /** 342 /**
340 * \union SDL_Event 343 * \union SDL_Event
341 * 344 *
342 * \brief General event structure 345 * \brief General event structure
358 SDL_UserEvent user; /**< Custom event data */ 361 SDL_UserEvent user; /**< Custom event data */
359 SDL_SysWMEvent syswm; /**< System dependent window event data */ 362 SDL_SysWMEvent syswm; /**< System dependent window event data */
360 SDL_ProximityEvent proximity; /**< Proximity In or Out event */ 363 SDL_ProximityEvent proximity; /**< Proximity In or Out event */
361 364
362 /* Temporarily here for backwards compatibility */ 365 /* Temporarily here for backwards compatibility */
366 #ifndef SDL_NO_COMPAT
363 SDL_ActiveEvent active; 367 SDL_ActiveEvent active;
364 SDL_ResizeEvent resize; 368 SDL_ResizeEvent resize;
369 #endif
365 } SDL_Event; 370 } SDL_Event;
366 371
367 372
368 /* Function prototypes */ 373 /* Function prototypes */
369 374