include/SDL_syswm.h
changeset 8134 7c9192be51a7
parent 8062 4fc5f66d63cc
child 8149 681eb46b8ac4
     1.1 --- a/include/SDL_syswm.h	Tue Jan 28 00:05:23 2014 -0500
     1.2 +++ b/include/SDL_syswm.h	Tue Jan 28 09:13:46 2014 -0300
     1.3 @@ -101,10 +101,10 @@
     1.4      SDL_SYSWM_UNKNOWN,
     1.5      SDL_SYSWM_WINDOWS,
     1.6      SDL_SYSWM_X11,
     1.7 -    SDL_SYSWM_WAYLAND,
     1.8      SDL_SYSWM_DIRECTFB,
     1.9      SDL_SYSWM_COCOA,
    1.10      SDL_SYSWM_UIKIT,
    1.11 +    SDL_SYSWM_WAYLAND,
    1.12  } SDL_SYSWM_TYPE;
    1.13  
    1.14  /**
    1.15 @@ -176,14 +176,6 @@
    1.16              Window window;              /**< The X11 window */
    1.17          } x11;
    1.18  #endif
    1.19 -#if defined(SDL_VIDEO_DRIVER_WAYLAND)
    1.20 -        struct
    1.21 -        {
    1.22 -            struct wl_display *display;            /**< Wayland display */
    1.23 -            struct wl_surface *surface;            /**< Wayland surface */
    1.24 -            struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */
    1.25 -        } wl;
    1.26 -#endif
    1.27  #if defined(SDL_VIDEO_DRIVER_DIRECTFB)
    1.28          struct
    1.29          {
    1.30 @@ -204,6 +196,14 @@
    1.31              UIWindow *window;           /* The UIKit window */
    1.32          } uikit;
    1.33  #endif
    1.34 +#if defined(SDL_VIDEO_DRIVER_WAYLAND)
    1.35 +        struct
    1.36 +        {
    1.37 +            struct wl_display *display;            /**< Wayland display */
    1.38 +            struct wl_surface *surface;            /**< Wayland surface */
    1.39 +            struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */
    1.40 +        } wl;
    1.41 +#endif
    1.42          /* Can't have an empty union */
    1.43          int dummy;
    1.44      } info;