diff options
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/gtk-demo/application.c | 8 | ||||
| -rw-r--r-- | demos/gtk-demo/changedisplay.c | 6 | ||||
| -rw-r--r-- | demos/gtk-demo/drawingarea.c | 2 | ||||
| -rw-r--r-- | demos/gtk-demo/list_store.c | 2 | ||||
| -rw-r--r-- | demos/gtk-demo/main.c | 2 | ||||
| -rw-r--r-- | demos/widget-factory/widget-factory.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c index dec3ad2974..50fdf7e386 100644 --- a/demos/gtk-demo/application.c +++ b/demos/gtk-demo/application.c @@ -473,11 +473,11 @@ static void window_state_changed (GtkWidget *widget) { DemoApplicationWindow *window = (DemoApplicationWindow *)widget; - GdkWindowState new_state; + GdkSurfaceState new_state; - new_state = gdk_window_get_state (gtk_widget_get_window (widget)); - window->maximized = (new_state & GDK_WINDOW_STATE_MAXIMIZED) != 0; - window->fullscreen = (new_state & GDK_WINDOW_STATE_FULLSCREEN) != 0; + new_state = gdk_surface_get_state (gtk_widget_get_window (widget)); + window->maximized = (new_state & GDK_SURFACE_STATE_MAXIMIZED) != 0; + window->fullscreen = (new_state & GDK_SURFACE_STATE_FULLSCREEN) != 0; } static void diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c index 28cb194229..d6a8533fc6 100644 --- a/demos/gtk-demo/changedisplay.c +++ b/demos/gtk-demo/changedisplay.c @@ -68,19 +68,19 @@ enum static GtkWidget * find_toplevel_at_pointer (GdkDisplay *display) { - GdkWindow *pointer_window; + GdkSurface *pointer_window; GtkWidget *widget = NULL; pointer_window = gdk_device_get_window_at_position (gtk_get_current_event_device (), NULL, NULL); - /* The user data field of a GdkWindow is used to store a pointer + /* The user data field of a GdkSurface is used to store a pointer * to the widget that created it. */ if (pointer_window) { gpointer widget_ptr; - gdk_window_get_user_data (pointer_window, &widget_ptr); + gdk_surface_get_user_data (pointer_window, &widget_ptr); widget = widget_ptr; } diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c index 985345de8a..387754bc25 100644 --- a/demos/gtk-demo/drawingarea.c +++ b/demos/gtk-demo/drawingarea.c @@ -137,7 +137,7 @@ checkerboard_draw (GtkDrawingArea *da, /* At the start of a draw handler, a clip region has been set on * the Cairo context, and the contents have been cleared to the * widget's background color. The docs for - * gdk_window_begin_paint_region() give more details on how this + * gdk_surface_begin_paint_region() give more details on how this * works. */ diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c index 3055eb24c9..0662fd1979 100644 --- a/demos/gtk-demo/list_store.c +++ b/demos/gtk-demo/list_store.c @@ -37,7 +37,7 @@ enum static Bug data[] = { { FALSE, 60482, "Normal", "scrollable notebooks and hidden tabs" }, - { FALSE, 60620, "Critical", "gdk_window_clear_area (gdkwindow-win32.c) is not thread-safe" }, + { FALSE, 60620, "Critical", "gdk_surface_clear_area (gdkwindow-win32.c) is not thread-safe" }, { FALSE, 50214, "Major", "Xft support does not clean up correctly" }, { TRUE, 52877, "Major", "GtkFileSelection needs a refresh method. " }, { FALSE, 56070, "Normal", "Can't click button after setting in sensitive" }, diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index bf009ab46f..27669c2831 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -250,7 +250,7 @@ static gchar *types[] = "GtkTreeSelection ", "GdkDisplay ", "GdkScreen ", - "GdkWindow ", + "GdkSurface ", "GdkEventButton ", "GdkCursor ", "GtkTreeIter ", diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index 64224d0136..f00f84ab3c 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -64,7 +64,7 @@ get_idle (gpointer data) GtkApplication *app = gtk_window_get_application (GTK_WINDOW (window)); gtk_widget_set_sensitive (window, TRUE); - gdk_window_set_cursor (gtk_widget_get_window (window), NULL); + gdk_surface_set_cursor (gtk_widget_get_window (window), NULL); g_application_unmark_busy (G_APPLICATION (app)); return G_SOURCE_REMOVE; @@ -81,7 +81,7 @@ get_busy (GSimpleAction *action, g_application_mark_busy (G_APPLICATION (app)); cursor = gdk_cursor_new_from_name ("wait", NULL); - gdk_window_set_cursor (gtk_widget_get_window (window), cursor); + gdk_surface_set_cursor (gtk_widget_get_window (window), cursor); g_object_unref (cursor); g_timeout_add (5000, get_idle, window); |