summaryrefslogtreecommitdiff
path: root/gtk/gtkheaderbar.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2018-03-20 11:40:08 +0100
committerAlexander Larsson <alexl@redhat.com>2018-03-20 11:40:08 +0100
commit391727bd0dff0f1d2d937f125bb08a541da02348 (patch)
treed7bac00df572f7efde9c8a9ffde46accb971ad20 /gtk/gtkheaderbar.c
parentf7326ff828ad133a7884906ad4cd03e2d9980535 (diff)
downloadgtk+-391727bd0dff0f1d2d937f125bb08a541da02348.tar.gz
GdkWindow -> GdkSurface initial type rename
This renames the GdkWindow class and related classes (impl, backend subclasses) to surface. Additionally it renames related types: GdkWindowAttr, GdkWindowPaint, GdkWindowWindowClass, GdkWindowType, GdkWindowTypeHint, GdkWindowHints, GdkWindowState, GdkWindowEdge This is an automatic conversion using the below commands: git sed -f g GdkWindowWindowClass GdkSurfaceSurfaceClass git sed -f g GdkWindow GdkSurface git sed -f g "gdk_window\([ _\(\),;]\|$\)" "gdk_surface\1" # Avoid hitting gdk_windowing git sed -f g "GDK_WINDOW\([ _\(]\|$\)" "GDK_SURFACE\1" # Avoid hitting GDK_WINDOWING git sed "GDK_\([A-Z]*\)IS_WINDOW\([_ (]\|$\)" "GDK_\1IS_SURFACE\2" git sed GDK_TYPE_WINDOW GDK_TYPE_SURFACE git sed -f g GdkPointerWindowInfo GdkPointerSurfaceInfo git sed -f g "BROADWAY_WINDOW" "BROADWAY_SURFACE" git sed -f g "broadway_window" "broadway_surface" git sed -f g "BroadwayWindow" "BroadwaySurface" git sed -f g "WAYLAND_WINDOW" "WAYLAND_SURFACE" git sed -f g "wayland_window" "wayland_surface" git sed -f g "WaylandWindow" "WaylandSurface" git sed -f g "X11_WINDOW" "X11_SURFACE" git sed -f g "x11_window" "x11_surface" git sed -f g "X11Window" "X11Surface" git sed -f g "WIN32_WINDOW" "WIN32_SURFACE" git sed -f g "win32_window" "win32_surface" git sed -f g "Win32Window" "Win32Surface" git sed -f g "QUARTZ_WINDOW" "QUARTZ_SURFACE" git sed -f g "quartz_window" "quartz_surface" git sed -f g "QuartzWindow" "QuartzSurface" git checkout NEWS* po-properties
Diffstat (limited to 'gtk/gtkheaderbar.c')
-rw-r--r--gtk/gtkheaderbar.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index a919fc8235..e9b9657f24 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -94,7 +94,7 @@ struct _GtkHeaderBarPrivate
GtkWidget *titlebar_icon;
- GdkWindowState state;
+ GdkSurfaceState state;
guint shows_app_menu : 1;
};
@@ -326,7 +326,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
is_sovereign_window = (!gtk_window_get_modal (window) &&
gtk_window_get_transient_for (window) == NULL &&
- gtk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_NORMAL);
+ gtk_window_get_type_hint (window) == GDK_SURFACE_TYPE_HINT_NORMAL);
tokens = g_strsplit (layout_desc, ":", 2);
if (tokens)
@@ -1801,19 +1801,19 @@ window_state_changed (GtkWidget *widget)
{
GtkHeaderBar *bar = GTK_HEADER_BAR (widget);
GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar);
- GdkWindowState changed, new_state;
+ GdkSurfaceState changed, new_state;
- new_state = gdk_window_get_state (_gtk_widget_get_window (widget));
+ new_state = gdk_surface_get_state (_gtk_widget_get_window (widget));
changed = new_state ^ priv->state;
priv->state = new_state;
- if (changed & (GDK_WINDOW_STATE_FULLSCREEN |
- GDK_WINDOW_STATE_MAXIMIZED |
- GDK_WINDOW_STATE_TILED |
- GDK_WINDOW_STATE_TOP_TILED |
- GDK_WINDOW_STATE_RIGHT_TILED |
- GDK_WINDOW_STATE_BOTTOM_TILED |
- GDK_WINDOW_STATE_LEFT_TILED))
+ if (changed & (GDK_SURFACE_STATE_FULLSCREEN |
+ GDK_SURFACE_STATE_MAXIMIZED |
+ GDK_SURFACE_STATE_TILED |
+ GDK_SURFACE_STATE_TOP_TILED |
+ GDK_SURFACE_STATE_RIGHT_TILED |
+ GDK_SURFACE_STATE_BOTTOM_TILED |
+ GDK_SURFACE_STATE_LEFT_TILED))
_gtk_header_bar_update_window_buttons (bar);
}
@@ -1988,7 +1988,7 @@ gtk_header_bar_init (GtkHeaderBar *bar)
priv->decoration_layout = NULL;
priv->decoration_layout_set = FALSE;
priv->shows_app_menu = FALSE;
- priv->state = GDK_WINDOW_STATE_WITHDRAWN;
+ priv->state = GDK_SURFACE_STATE_WITHDRAWN;
init_sizing_box (bar);
construct_label_box (bar);