AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 22:30:22 +00:00
Code Issues Projects Releases Wiki Activity

surface: Inline function

Browse Source 
Fixes compile error with -DG_DISBALE_CHECKS
This commit is contained in:
Benjamin Otte 2020-02-22 06:50:58 +01:00
parent a12e563cd2
commit ce3ed45e81
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/wayland/gdksurface-wayland.c
View File

@ -2369,12 +2369,6 @@ should_be_mapped (GdkSurface *surface)
return TRUE; return TRUE;
} }
static gboolean
should_map_as_popup (GdkSurface *surface)
{
return GDK_SURFACE_TYPE (surface) == GDK_SURFACE_POPUP;
}
static void static void
gdk_wayland_surface_map_toplevel (GdkSurface *surface) gdk_wayland_surface_map_toplevel (GdkSurface *surface)
{ {
@ -2397,7 +2391,7 @@ gdk_wayland_surface_show (GdkSurface *surface,
{ {
GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
g_return_if_fail (!should_map_as_popup (surface)); g_return_if_fail (GDK_SURFACE_TYPE (surface) != GDK_SURFACE_POPUP);
if (!impl->display_server.wl_surface) if (!impl->display_server.wl_surface)
gdk_wayland_surface_create_surface (surface); gdk_wayland_surface_create_surface (surface);
@ -2790,7 +2784,7 @@ gdk_wayland_surface_present_popup (GdkSurface *surface,
GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface)); GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
GdkWaylandSurface *impl; GdkWaylandSurface *impl;
g_return_val_if_fail (should_map_as_popup (surface), FALSE); g_return_val_if_fail (GDK_SURFACE_TYPE (surface) == GDK_SURFACE_POPUP, FALSE);
impl = GDK_WAYLAND_SURFACE (surface); impl = GDK_WAYLAND_SURFACE (surface);
@ -4319,7 +4313,7 @@ gdk_wayland_surface_set_transient_for_exported (GdkSurface *surface,
g_return_val_if_fail (GDK_IS_WAYLAND_SURFACE (surface), FALSE); g_return_val_if_fail (GDK_IS_WAYLAND_SURFACE (surface), FALSE);
g_return_val_if_fail (GDK_IS_WAYLAND_DISPLAY (display), FALSE); g_return_val_if_fail (GDK_IS_WAYLAND_DISPLAY (display), FALSE);
g_return_val_if_fail (!should_map_as_popup (surface), FALSE); g_return_val_if_fail (GDK_SURFACE_TYPE (surface) != GDK_SURFACE_POPUP, FALSE);
impl = GDK_WAYLAND_SURFACE (surface); impl = GDK_WAYLAND_SURFACE (surface);
display_wayland = GDK_WAYLAND_DISPLAY (display); display_wayland = GDK_WAYLAND_DISPLAY (display);