summaryrefslogtreecommitdiff
path: root/testsuite/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/gtk')
-rw-r--r--testsuite/gtk/defaultvalue.c8
-rw-r--r--testsuite/gtk/gestures.c12
-rw-r--r--testsuite/gtk/notify.c8
-rw-r--r--testsuite/gtk/object.c2
-rw-r--r--testsuite/gtk/objects-finalize.c2
-rw-r--r--testsuite/gtk/templates.c4
6 files changed, 18 insertions, 18 deletions
diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c
index f011682fc4..4b4c89f9d8 100644
--- a/testsuite/gtk/defaultvalue.c
+++ b/testsuite/gtk/defaultvalue.c
@@ -104,9 +104,9 @@ test_type (gconstpointer data)
if (g_type_is_a (type, GTK_TYPE_SETTINGS))
instance = g_object_ref (gtk_settings_get_default ());
- else if (g_type_is_a (type, GDK_TYPE_WINDOW))
+ else if (g_type_is_a (type, GDK_TYPE_SURFACE))
{
- instance = g_object_ref (gdk_window_new_popup (gdk_display_get_default (),
+ instance = g_object_ref (gdk_surface_new_popup (gdk_display_get_default (),
0,
&(GdkRectangle) { 0, 0, 100, 100 }));
}
@@ -354,8 +354,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
}
g_free (pspecs);
- if (g_type_is_a (type, GDK_TYPE_WINDOW))
- gdk_window_destroy (GDK_WINDOW (instance));
+ if (g_type_is_a (type, GDK_TYPE_SURFACE))
+ gdk_surface_destroy (GDK_SURFACE (instance));
else
g_object_unref (instance);
diff --git a/testsuite/gtk/gestures.c b/testsuite/gtk/gestures.c
index 78331c8af3..dd38ffa136 100644
--- a/testsuite/gtk/gestures.c
+++ b/testsuite/gtk/gestures.c
@@ -35,7 +35,7 @@ point_press (PointState *point,
if (point == &mouse_state)
{
ev = gdk_event_new (GDK_BUTTON_PRESS);
- ev->any.window = g_object_ref (gtk_widget_get_window (widget));
+ ev->any.surface = g_object_ref (gtk_widget_get_surface (widget));
ev->button.time = GDK_CURRENT_TIME;
ev->button.x = point->x;
ev->button.y = point->y;
@@ -47,7 +47,7 @@ point_press (PointState *point,
else
{
ev = gdk_event_new (GDK_TOUCH_BEGIN);
- ev->any.window = g_object_ref (gtk_widget_get_window (widget));
+ ev->any.surface = g_object_ref (gtk_widget_get_surface (widget));
ev->touch.time = GDK_CURRENT_TIME;
ev->touch.x = point->x;
ev->touch.y = point->y;
@@ -87,7 +87,7 @@ point_update (PointState *point,
if (point == &mouse_state)
{
ev = gdk_event_new (GDK_MOTION_NOTIFY);
- ev->any.window = g_object_ref (gtk_widget_get_window (widget));
+ ev->any.surface = g_object_ref (gtk_widget_get_surface (widget));
ev->button.time = GDK_CURRENT_TIME;
ev->motion.x = x;
ev->motion.y = y;
@@ -99,7 +99,7 @@ point_update (PointState *point,
return;
ev = gdk_event_new (GDK_TOUCH_UPDATE);
- ev->any.window = g_object_ref (gtk_widget_get_window (widget));
+ ev->any.surface = g_object_ref (gtk_widget_get_surface (widget));
ev->touch.time = GDK_CURRENT_TIME;
ev->touch.x = x;
ev->touch.y = y;
@@ -142,7 +142,7 @@ point_release (PointState *point,
return;
ev = gdk_event_new (GDK_BUTTON_RELEASE);
- ev->any.window = g_object_ref (gtk_widget_get_window (point->widget));
+ ev->any.surface = g_object_ref (gtk_widget_get_surface (point->widget));
ev->button.time = GDK_CURRENT_TIME;
ev->button.x = point->x;
ev->button.y = point->y;
@@ -153,7 +153,7 @@ point_release (PointState *point,
else
{
ev = gdk_event_new (GDK_TOUCH_END);
- ev->any.window = g_object_ref (gtk_widget_get_window (point->widget));
+ ev->any.surface = g_object_ref (gtk_widget_get_surface (point->widget));
ev->touch.time = GDK_CURRENT_TIME;
ev->touch.x = point->x;
ev->touch.y = point->y;
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 3f922a2cbe..846a0ed52a 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -402,9 +402,9 @@ test_type (gconstpointer data)
if (g_type_is_a (type, GTK_TYPE_SETTINGS))
instance = G_OBJECT (g_object_ref (gtk_settings_get_default ()));
- else if (g_type_is_a (type, GDK_TYPE_WINDOW))
+ else if (g_type_is_a (type, GDK_TYPE_SURFACE))
{
- instance = G_OBJECT (g_object_ref (gdk_window_new_popup (display,
+ instance = G_OBJECT (g_object_ref (gdk_surface_new_popup (display,
&(GdkRectangle) { 0, 0, 100, 100 })));
}
else if (g_str_equal (g_type_name (type), "GdkX11Cursor"))
@@ -644,8 +644,8 @@ test_type (gconstpointer data)
}
g_free (pspecs);
- if (g_type_is_a (type, GDK_TYPE_WINDOW))
- gdk_window_destroy (GDK_WINDOW (instance));
+ if (g_type_is_a (type, GDK_TYPE_SURFACE))
+ gdk_surface_destroy (GDK_SURFACE (instance));
else
g_object_unref (instance);
diff --git a/testsuite/gtk/object.c b/testsuite/gtk/object.c
index afbe9fda98..7939b59e56 100644
--- a/testsuite/gtk/object.c
+++ b/testsuite/gtk/object.c
@@ -58,7 +58,7 @@ list_ignore_properties (gboolean buglist)
{ "GtkCList", "selection-mode", (void*) GTK_SELECTION_NONE, },
{ "GtkWidget", "has-default", (void*) TRUE, }, /* conflicts with toplevel-less widgets */
{ "GtkWidget", "display", (void*) MATCH_ANY_VALUE },
- { "GtkWindow", "type-hint", (void*) GDK_WINDOW_TYPE_HINT_DND, }, /* conflicts with ::visible=TRUE */
+ { "GtkWindow", "type-hint", (void*) GDK_SURFACE_TYPE_HINT_DND, }, /* conflicts with ::visible=TRUE */
{ "GtkCellView", "background", (void*) "", }, /* "" is not a valid background color */
{ "GtkColorButton", "color", (void*) NULL, }, /* not a valid boxed color */
{ "GtkInputDialog", "has-separator", (void*) MATCH_ANY_VALUE, }, /* property disabled */
diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index d08c42619c..077783c023 100644
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -107,7 +107,7 @@ main (int argc, char **argv)
G_TYPE_IS_INSTANTIATABLE (all_types[i]) &&
!G_TYPE_IS_ABSTRACT (all_types[i]) &&
#ifdef GDK_WINDOWING_X11
- all_types[i] != GDK_TYPE_X11_WINDOW &&
+ all_types[i] != GDK_TYPE_X11_SURFACE &&
all_types[i] != GDK_TYPE_X11_SCREEN &&
all_types[i] != GDK_TYPE_X11_DISPLAY &&
all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE &&
diff --git a/testsuite/gtk/templates.c b/testsuite/gtk/templates.c
index 712bf3e6aa..4b73e94c12 100644
--- a/testsuite/gtk/templates.c
+++ b/testsuite/gtk/templates.c
@@ -48,10 +48,10 @@ test_dialog_override_property (void)
GtkWidget *dialog;
dialog = g_object_new (GTK_TYPE_DIALOG,
- "type-hint", GDK_WINDOW_TYPE_HINT_UTILITY,
+ "type-hint", GDK_SURFACE_TYPE_HINT_UTILITY,
NULL);
g_assert (GTK_IS_DIALOG (dialog));
- g_assert (gtk_window_get_type_hint (GTK_WINDOW (dialog)) == GDK_WINDOW_TYPE_HINT_UTILITY);
+ g_assert (gtk_window_get_type_hint (GTK_WINDOW (dialog)) == GDK_SURFACE_TYPE_HINT_UTILITY);
gtk_widget_destroy (dialog);
}
View Lorry Controller Status