diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-10 20:21:12 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-10 20:21:12 +0000 |
| commit | 1de7440c8c35ad07fddff8d6a3156ab817a640e6 (patch) | |
| tree | 6df276a863500fc5a4b954150cadfa256e532c18 /gdk/gdksurface.c | |
| parent | 5c87432a0c971b2bbd28548348612d37e4af5e0e (diff) | |
| parent | d5d4af585d5a5340f174700d95f7b9e394dcbe9f (diff) | |
| download | gtk+-1de7440c8c35ad07fddff8d6a3156ab817a640e6.tar.gz | |
Merge branch 'gdk-cleanups' into 'master'
Gdk cleanups
Closes #2790
See merge request GNOME/gtk!2553
Diffstat (limited to 'gdk/gdksurface.c')
| -rw-r--r-- | gdk/gdksurface.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 3624aadeca..168a1264fa 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -462,7 +462,7 @@ gdk_surface_init (GdkSurface *surface) { /* 0-initialization is good for all other fields. */ - surface->state = GDK_SURFACE_STATE_WITHDRAWN; + surface->state = GDK_TOPLEVEL_STATE_WITHDRAWN; surface->fullscreen_mode = GDK_FULLSCREEN_ON_CURRENT_MONITOR; surface->width = 1; surface->height = 1; @@ -730,7 +730,7 @@ gdk_surface_set_property (GObject *object, } } -#define GDK_SURFACE_IS_STICKY(surface) (((surface)->state & GDK_SURFACE_STATE_STICKY)) +#define GDK_SURFACE_IS_STICKY(surface) (((surface)->state & GDK_TOPLEVEL_STATE_STICKY)) static void gdk_surface_get_property (GObject *object, @@ -935,7 +935,7 @@ _gdk_surface_destroy_hierarchy (GdkSurface *surface, _gdk_surface_clear_update_area (surface); - surface->state |= GDK_SURFACE_STATE_WITHDRAWN; + surface->state |= GDK_TOPLEVEL_STATE_WITHDRAWN; surface->destroyed = TRUE; surface_remove_from_pointer_info (surface, surface->display); @@ -1686,7 +1686,7 @@ gdk_surface_hide (GdkSurface *surface) was_mapped = GDK_SURFACE_IS_MAPPED (surface); if (GDK_SURFACE_IS_MAPPED (surface)) - gdk_synthesize_surface_state (surface, 0, GDK_SURFACE_STATE_WITHDRAWN); + gdk_synthesize_surface_state (surface, 0, GDK_TOPLEVEL_STATE_WITHDRAWN); if (was_mapped) { @@ -2632,7 +2632,7 @@ gdk_surface_set_shadow_width (GdkSurface *surface, void gdk_surface_set_state (GdkSurface *surface, - GdkSurfaceState new_state) + GdkToplevelState new_state) { gboolean was_mapped, mapped; gboolean was_sticky, sticky; @@ -2665,9 +2665,9 @@ gdk_surface_set_state (GdkSurface *surface, } void -gdk_synthesize_surface_state (GdkSurface *surface, - GdkSurfaceState unset_flags, - GdkSurfaceState set_flags) +gdk_synthesize_surface_state (GdkSurface *surface, + GdkToplevelState unset_flags, + GdkToplevelState set_flags) { gdk_surface_set_state (surface, (surface->state | set_flags) & ~unset_flags); } |