summaryrefslogtreecommitdiff
path: root/testsuite/gsk
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 /testsuite/gsk
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 'testsuite/gsk')
-rw-r--r--testsuite/gsk/compare-render.c4
-rw-r--r--testsuite/gsk/test-render-nodes.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/gsk/compare-render.c b/testsuite/gsk/compare-render.c
index f83e4e0650..a39ad4a264 100644
--- a/testsuite/gsk/compare-render.c
+++ b/testsuite/gsk/compare-render.c
@@ -67,7 +67,7 @@ main (int argc, char **argv)
cairo_surface_t *diff_surface = NULL;
GdkTexture *texture;
GskRenderer *renderer;
- GdkWindow *window;
+ GdkSurface *window;
GskRenderNode *node;
const char *node_file;
const char *png_file;
@@ -79,7 +79,7 @@ main (int argc, char **argv)
node_file = argv[1];
png_file = argv[2];
- window = gdk_window_new_toplevel (gdk_display_get_default(), 10 , 10);
+ window = gdk_surface_new_toplevel (gdk_display_get_default(), 10 , 10);
renderer = gsk_renderer_new_for_window (window);
g_test_message ("Node file: '%s'\n", node_file);
diff --git a/testsuite/gsk/test-render-nodes.c b/testsuite/gsk/test-render-nodes.c
index 2f89f2a6eb..9a25463f46 100644
--- a/testsuite/gsk/test-render-nodes.c
+++ b/testsuite/gsk/test-render-nodes.c
@@ -667,7 +667,7 @@ load_node_file (GFile *file, gboolean generate)
GBytes *bytes;
GskRenderNode *node;
GskRenderer *renderer;
- GdkWindow *window;
+ GdkSurface *window;
GdkTexture *texture = NULL;
cairo_surface_t *surface;
char *png_file;
@@ -696,7 +696,7 @@ load_node_file (GFile *file, gboolean generate)
return;
}
- window = gdk_window_new_toplevel (gdk_display_get_default(), 10 , 10);
+ window = gdk_surface_new_toplevel (gdk_display_get_default(), 10 , 10);
renderer = gsk_renderer_new_for_window (window);
texture = gsk_renderer_render_texture (renderer, node, NULL);
@@ -721,7 +721,7 @@ load_node_file (GFile *file, gboolean generate)
g_object_unref (window);
gsk_renderer_unrealize (renderer);
g_object_unref (renderer);
- gdk_window_destroy (window);
+ gdk_surface_destroy (window);
gsk_render_node_unref (node);