summaryrefslogtreecommitdiff
path: root/gtk/a11y
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/a11y')
-rw-r--r--gtk/a11y/gtkentryaccessible.c16
-rw-r--r--gtk/a11y/gtklabelaccessible.c16
-rw-r--r--gtk/a11y/gtktextcellaccessible.c8
-rw-r--r--gtk/a11y/gtktextviewaccessible.c16
-rw-r--r--gtk/a11y/gtktreeviewaccessible.c6
-rw-r--r--gtk/a11y/gtkwidgetaccessible.c16
-rw-r--r--gtk/a11y/gtkwindowaccessible.c26
7 files changed, 52 insertions, 52 deletions
diff --git a/gtk/a11y/gtkentryaccessible.c b/gtk/a11y/gtkentryaccessible.c
index 1061774742..3917b68e80 100644
--- a/gtk/a11y/gtkentryaccessible.c
+++ b/gtk/a11y/gtkentryaccessible.c
@@ -956,7 +956,7 @@ gtk_entry_accessible_get_character_extents (AtkText *text,
PangoRectangle char_rect;
gchar *entry_text;
gint index, x_layout, y_layout;
- GdkWindow *window;
+ GdkSurface *window;
gint x_window, y_window;
GtkAllocation allocation;
@@ -977,7 +977,7 @@ gtk_entry_accessible_get_character_extents (AtkText *text,
_gtk_widget_get_allocation (widget, &allocation);
window = gtk_widget_get_window (widget);
- gdk_window_get_origin (window, &x_window, &y_window);
+ gdk_surface_get_origin (window, &x_window, &y_window);
*x = x_window + allocation.x + x_layout + char_rect.x;
*y = y_window + allocation.y + y_layout + char_rect.y;
@@ -986,8 +986,8 @@ gtk_entry_accessible_get_character_extents (AtkText *text,
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_window;
*y -= y_window;
@@ -1006,7 +1006,7 @@ gtk_entry_accessible_get_offset_at_point (AtkText *atk_text,
gint index, x_layout, y_layout;
gint x_window, y_window;
gint x_local, y_local;
- GdkWindow *window;
+ GdkSurface *window;
glong offset;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text));
@@ -1018,15 +1018,15 @@ gtk_entry_accessible_get_offset_at_point (AtkText *atk_text,
gtk_entry_get_layout_offsets (entry, &x_layout, &y_layout);
window = gtk_widget_get_window (widget);
- gdk_window_get_origin (window, &x_window, &y_window);
+ gdk_surface_get_origin (window, &x_window, &y_window);
x_local = x - x_layout - x_window;
y_local = y - y_layout - y_window;
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_local += x_window;
y_local += y_window;
diff --git a/gtk/a11y/gtklabelaccessible.c b/gtk/a11y/gtklabelaccessible.c
index 91b1ac861d..ac37c6aba0 100644
--- a/gtk/a11y/gtklabelaccessible.c
+++ b/gtk/a11y/gtklabelaccessible.c
@@ -995,7 +995,7 @@ gtk_label_accessible_get_character_extents (AtkText *text,
PangoRectangle char_rect;
const gchar *label_text;
gint index, x_layout, y_layout;
- GdkWindow *window;
+ GdkSurface *window;
gint x_window, y_window;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
@@ -1011,7 +1011,7 @@ gtk_label_accessible_get_character_extents (AtkText *text,
pango_extents_to_pixels (&char_rect, NULL);
window = gtk_widget_get_window (widget);
- gdk_window_get_origin (window, &x_window, &y_window);
+ gdk_surface_get_origin (window, &x_window, &y_window);
*x = x_window + x_layout + char_rect.x;
*y = y_window + y_layout + char_rect.y;
@@ -1020,8 +1020,8 @@ gtk_label_accessible_get_character_extents (AtkText *text,
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_window;
*y -= y_window;
@@ -1040,7 +1040,7 @@ gtk_label_accessible_get_offset_at_point (AtkText *atk_text,
gint index, x_layout, y_layout;
gint x_window, y_window;
gint x_local, y_local;
- GdkWindow *window;
+ GdkSurface *window;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text));
if (widget == NULL)
@@ -1051,15 +1051,15 @@ gtk_label_accessible_get_offset_at_point (AtkText *atk_text,
gtk_label_get_layout_offsets (label, &x_layout, &y_layout);
window = gtk_widget_get_window (widget);
- gdk_window_get_origin (window, &x_window, &y_window);
+ gdk_surface_get_origin (window, &x_window, &y_window);
x_local = x - x_layout - x_window;
y_local = y - y_layout - y_window;
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_local += x_window;
y_local += y_window;
diff --git a/gtk/a11y/gtktextcellaccessible.c b/gtk/a11y/gtktextcellaccessible.c
index a64df616bb..3f8bdb1161 100644
--- a/gtk/a11y/gtktextcellaccessible.c
+++ b/gtk/a11y/gtktextcellaccessible.c
@@ -484,12 +484,12 @@ get_origins (GtkWidget *widget,
gint *x_toplevel,
gint *y_toplevel)
{
- GdkWindow *window;
+ GdkSurface *window;
window = gtk_widget_get_window (widget);
- gdk_window_get_origin (window, x_window, y_window);
- window = gdk_window_get_toplevel (gtk_widget_get_window (widget));
- gdk_window_get_origin (window, x_toplevel, y_toplevel);
+ gdk_surface_get_origin (window, x_window, y_window);
+ window = gdk_surface_get_toplevel (gtk_widget_get_window (widget));
+ gdk_surface_get_origin (window, x_toplevel, y_toplevel);
if (GTK_IS_TREE_VIEW (widget))
{
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;
}
diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
index 05629a06e3..56e231b8b9 100644
--- a/gtk/a11y/gtktreeviewaccessible.c
+++ b/gtk/a11y/gtktreeviewaccessible.c
@@ -1096,11 +1096,11 @@ gtk_tree_view_accessible_get_cell_extents (GtkCellAccessibleParent *parent,
if (coord_type != ATK_XY_WINDOW)
{
- GdkWindow *window;
+ GdkSurface *window;
gint x_toplevel, y_toplevel;
- window = gdk_window_get_toplevel (gtk_widget_get_window (widget));
- gdk_window_get_origin (window, &x_toplevel, &y_toplevel);
+ window = gdk_surface_get_toplevel (gtk_widget_get_window (widget));
+ gdk_surface_get_origin (window, &x_toplevel, &y_toplevel);
w_x += x_toplevel;
w_y += y_toplevel;
diff --git a/gtk/a11y/gtkwidgetaccessible.c b/gtk/a11y/gtkwidgetaccessible.c
index 2bd384c98a..39c2a2bb36 100644
--- a/gtk/a11y/gtkwidgetaccessible.c
+++ b/gtk/a11y/gtkwidgetaccessible.c
@@ -562,7 +562,7 @@ gtk_widget_accessible_get_extents (AtkComponent *component,
gint *height,
AtkCoordType coord_type)
{
- GdkWindow *window;
+ GdkSurface *window;
gint x_window, y_window;
gint x_toplevel, y_toplevel;
GtkWidget *widget;
@@ -594,14 +594,14 @@ gtk_widget_accessible_get_extents (AtkComponent *component,
*y = 0;
window = gtk_widget_get_window (widget);
}
- gdk_window_get_origin (window, &x_window, &y_window);
+ gdk_surface_get_origin (window, &x_window, &y_window);
*x += x_window;
*y += y_window;
if (coord_type == ATK_XY_WINDOW)
{
- window = gdk_window_get_toplevel (gtk_widget_get_window (widget));
- gdk_window_get_origin (window, &x_toplevel, &y_toplevel);
+ window = gdk_surface_get_toplevel (gtk_widget_get_window (widget));
+ gdk_surface_get_origin (window, &x_toplevel, &y_toplevel);
*x -= x_toplevel;
*y -= y_toplevel;
@@ -663,9 +663,9 @@ gtk_widget_accessible_set_extents (AtkComponent *component,
if (coord_type == ATK_XY_WINDOW)
{
gint x_current, y_current;
- GdkWindow *window = gtk_widget_get_window (widget);
+ GdkSurface *window = gtk_widget_get_window (widget);
- gdk_window_get_origin (window, &x_current, &y_current);
+ gdk_surface_get_origin (window, &x_current, &y_current);
x_current += x;
y_current += y;
if (x_current < 0 || y_current < 0)
@@ -703,9 +703,9 @@ gtk_widget_accessible_set_position (AtkComponent *component,
if (coord_type == ATK_XY_WINDOW)
{
gint x_current, y_current;
- GdkWindow *window = gtk_widget_get_window (widget);
+ GdkSurface *window = gtk_widget_get_window (widget);
- gdk_window_get_origin (window, &x_current, &y_current);
+ gdk_surface_get_origin (window, &x_current, &y_current);
x_current += x;
y_current += y;
if (x_current < 0 || y_current < 0)
diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c
index dc0753a5e2..5cb205c403 100644
--- a/gtk/a11y/gtkwindowaccessible.c
+++ b/gtk/a11y/gtkwindowaccessible.c
@@ -226,8 +226,8 @@ gtk_window_accessible_ref_state_set (AtkObject *accessible)
AtkStateSet *state_set;
GtkWidget *widget;
GtkWindow *window;
- GdkWindow *gdk_window;
- GdkWindowState state;
+ GdkSurface *gdk_surface;
+ GdkSurfaceState state;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
if (widget == NULL)
@@ -240,11 +240,11 @@ gtk_window_accessible_ref_state_set (AtkObject *accessible)
if (gtk_window_is_active (window))
atk_state_set_add_state (state_set, ATK_STATE_ACTIVE);
- gdk_window = gtk_widget_get_window (widget);
- if (gdk_window)
+ gdk_surface = gtk_widget_get_window (widget);
+ if (gdk_surface)
{
- state = gdk_window_get_state (gdk_window);
- if (state & GDK_WINDOW_STATE_ICONIFIED)
+ state = gdk_surface_get_state (gdk_surface);
+ if (state & GDK_SURFACE_STATE_ICONIFIED)
atk_state_set_add_state (state_set, ATK_STATE_ICONIFIED);
}
if (gtk_window_get_modal (window))
@@ -305,7 +305,7 @@ static AtkAttributeSet *
gtk_widget_accessible_get_attributes (AtkObject *obj)
{
GtkWidget *window;
- GdkWindowTypeHint hint;
+ GdkSurfaceTypeHint hint;
AtkAttributeSet *attributes;
AtkAttribute *attr;
GEnumClass *class;
@@ -319,7 +319,7 @@ gtk_widget_accessible_get_attributes (AtkObject *obj)
window = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
hint = gtk_window_get_type_hint (GTK_WINDOW (window));
- class = g_type_class_ref (GDK_TYPE_WINDOW_TYPE_HINT);
+ class = g_type_class_ref (GDK_TYPE_SURFACE_TYPE_HINT);
for (value = class->values; value->value_name; value++)
{
if (hint == value->value)
@@ -368,7 +368,7 @@ gtk_window_accessible_get_extents (AtkComponent *component,
AtkCoordType coord_type)
{
GtkWidget *widget;
- GdkWindow *window;
+ GdkSurface *window;
GdkRectangle rect;
gint x_toplevel, y_toplevel;
@@ -389,7 +389,7 @@ gtk_window_accessible_get_extents (AtkComponent *component,
if (window == NULL)
return;
- gdk_window_get_frame_extents (window, &rect);
+ gdk_surface_get_frame_extents (window, &rect);
*width = rect.width;
*height = rect.height;
@@ -404,7 +404,7 @@ gtk_window_accessible_get_extents (AtkComponent *component,
*y = rect.y;
if (coord_type == ATK_XY_WINDOW)
{
- gdk_window_get_origin (window, &x_toplevel, &y_toplevel);
+ gdk_surface_get_origin (window, &x_toplevel, &y_toplevel);
*x -= x_toplevel;
*y -= y_toplevel;
}
@@ -416,7 +416,7 @@ gtk_window_accessible_get_size (AtkComponent *component,
gint *height)
{
GtkWidget *widget;
- GdkWindow *window;
+ GdkSurface *window;
GdkRectangle rect;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component));
@@ -436,7 +436,7 @@ gtk_window_accessible_get_size (AtkComponent *component,
if (window == NULL)
return;
- gdk_window_get_frame_extents (window, &rect);
+ gdk_surface_get_frame_extents (window, &rect);
*width = rect.width;
*height = rect.height;
View Lorry Controller Status