diff options
author | Alexander Larsson <alexl@redhat.com> | 2018-03-20 11:40:08 +0100 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2018-03-20 11:40:08 +0100 |
commit | 391727bd0dff0f1d2d937f125bb08a541da02348 (patch) | |
tree | d7bac00df572f7efde9c8a9ffde46accb971ad20 /gtk/a11y/gtktextviewaccessible.c | |
parent | f7326ff828ad133a7884906ad4cd03e2d9980535 (diff) | |
download | gtk+-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/a11y/gtktextviewaccessible.c')
-rw-r--r-- | gtk/a11y/gtktextviewaccessible.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/a11y/gtktextviewaccessible.c b/gtk/a11y/gtktextviewaccessible.c index c50439e9ed..5aa72d5160 100644 --- a/gtk/a11y/gtktextviewaccessible.c +++ b/gtk/a11y/gtktextviewaccessible.c @@ -446,7 +446,7 @@ gtk_text_view_accessible_get_offset_at_point (AtkText *text, GtkTextIter iter; gint x_widget, y_widget, x_window, y_window, buff_x, buff_y; GtkWidget *widget; - GdkWindow *window; + GdkSurface *window; GdkRectangle rect; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -455,7 +455,7 @@ gtk_text_view_accessible_get_offset_at_point (AtkText *text, view = GTK_TEXT_VIEW (widget); window = gtk_widget_get_window (widget); - gdk_window_get_origin (window, &x_widget, &y_widget); + gdk_surface_get_origin (window, &x_widget, &y_widget); if (coords == ATK_XY_SCREEN) { @@ -464,8 +464,8 @@ gtk_text_view_accessible_get_offset_at_point (AtkText *text, } else if (coords == ATK_XY_WINDOW) { - window = gdk_window_get_toplevel (window); - gdk_window_get_origin (window, &x_window, &y_window); + window = gdk_surface_get_toplevel (window); + gdk_surface_get_origin (window, &x_window, &y_window); x = x - x_widget + x_window; y = y - y_widget + y_window; @@ -506,7 +506,7 @@ gtk_text_view_accessible_get_character_extents (AtkText *text, GtkTextIter iter; GtkWidget *widget; GdkRectangle rectangle; - GdkWindow *window; + GdkSurface *window; gint x_widget, y_widget, x_window, y_window; *x = 0; @@ -527,7 +527,7 @@ gtk_text_view_accessible_get_character_extents (AtkText *text, if (window == NULL) return; - gdk_window_get_origin (window, &x_widget, &y_widget); + gdk_surface_get_origin (window, &x_widget, &y_widget); *height = rectangle.height; *width = rectangle.width; @@ -536,8 +536,8 @@ gtk_text_view_accessible_get_character_extents (AtkText *text, rectangle.x, rectangle.y, x, y); if (coords == ATK_XY_WINDOW) { - window = gdk_window_get_toplevel (window); - gdk_window_get_origin (window, &x_window, &y_window); + window = gdk_surface_get_toplevel (window); + gdk_surface_get_origin (window, &x_window, &y_window); *x += x_widget - x_window; *y += y_widget - y_window; } |