Mercurial > sdl-ios-xcode
diff src/video/x11/SDL_x11video.h @ 4661:03dcb795c583
Merged changes from the main SDL codebase
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 12 Jul 2010 21:09:23 -0700 |
| parents | 057e8762d2a1 15d2c6f40c48 |
| children | c24ba2cc9583 |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11video.h Mon Jul 12 22:03:25 2010 -0400 +++ b/src/video/x11/SDL_x11video.h Mon Jul 12 21:09:23 2010 -0700 @@ -48,6 +48,7 @@ #include "SDL_x11dyn.h" +#include "SDL_x11clipboard.h" #include "SDL_x11events.h" #include "SDL_x11gamma.h" #include "SDL_x11keyboard.h" @@ -68,12 +69,12 @@ int numwindows; SDL_WindowData **windowlist; int windowlistlength; - int keyboard; Atom WM_DELETE_WINDOW; SDL_scancode key_layout[256]; + SDL_bool selection_waiting; } SDL_VideoData; -extern SDL_bool X11_UseDirectColorVisuals(); +extern SDL_bool X11_UseDirectColorVisuals(void); #endif /* _SDL_x11video_h */