diff options
| author | Rob Bradford <rob@linux.intel.com> | 2012-04-16 16:55:43 +0100 |
|---|---|---|
| committer | Rob Bradford <rob@linux.intel.com> | 2012-04-17 14:11:31 +0100 |
| commit | fc58ff1e6a80484e7deaa67baefe5345765dc3b6 (patch) | |
| tree | e34cc19c9b32169417f35877a060985f3a6ed49e /gdk/wayland/gdkwindow-wayland.c | |
| parent | 14fb4984ce1115c335f8c0d226956c204e1cf2c9 (diff) | |
| download | gtk+-fc58ff1e6a80484e7deaa67baefe5345765dc3b6.tar.gz | |
wayland: Rename GdkDisplayWayland to GdkWaylandDisplay
This makes it consistent with the functions in the vtable and also consistent
with other backends.
Diffstat (limited to 'gdk/wayland/gdkwindow-wayland.c')
| -rw-r--r-- | gdk/wayland/gdkwindow-wayland.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 4ec77ff4a2..a8c59b5367 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -310,7 +310,7 @@ typedef struct _GdkWaylandCairoSurfaceData { size_t buf_length; #endif struct wl_buffer *buffer; - GdkDisplayWayland *display; + GdkWaylandDisplay *display; int32_t width, height; } GdkWaylandCairoSurfaceData; @@ -388,7 +388,7 @@ gdk_wayland_cairo_surface_destroy (void *p) } static cairo_surface_t * -gdk_wayland_create_cairo_surface (GdkDisplayWayland *display, +gdk_wayland_create_cairo_surface (GdkWaylandDisplay *display, int width, int height) { GdkWaylandCairoSurfaceData *data; @@ -486,7 +486,7 @@ gdk_wayland_cairo_surface_destroy (void *p) } static cairo_surface_t * -gdk_wayland_create_cairo_surface (GdkDisplayWayland *display, +gdk_wayland_create_cairo_surface (GdkWaylandDisplay *display, int width, int height) { GdkWaylandCairoSurfaceData *data; @@ -530,8 +530,8 @@ static cairo_surface_t * gdk_wayland_window_ref_cairo_surface (GdkWindow *window) { GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); - GdkDisplayWayland *display_wayland = - GDK_DISPLAY_WAYLAND (gdk_window_get_display (impl->wrapper)); + GdkWaylandDisplay *display_wayland = + GDK_WAYLAND_DISPLAY (gdk_window_get_display (impl->wrapper)); if (GDK_WINDOW_DESTROYED (impl->wrapper)) return NULL; @@ -679,12 +679,12 @@ static void gdk_wayland_window_show (GdkWindow *window, gboolean already_mapped) { GdkDisplay *display; - GdkDisplayWayland *display_wayland; + GdkWaylandDisplay *display_wayland; GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); GdkEvent *event; display = gdk_window_get_display (window); - display_wayland = GDK_DISPLAY_WAYLAND (display); + display_wayland = GDK_WAYLAND_DISPLAY (display); if (impl->user_time != 0 && display_wayland->user_time != 0 && |