diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-08-29 01:32:52 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-09-26 15:11:33 +0200 |
| commit | a6e936788a7fbf9c492a3160c6213e88b84b269e (patch) | |
| tree | 344720a8fdf0d4fe0a9dfbcd6c12353867a92f17 /gdk/x11 | |
| parent | 9f47be221689646f4de7e9138bfccf89310f2281 (diff) | |
| download | gtk+-a6e936788a7fbf9c492a3160c6213e88b84b269e.tar.gz | |
gdk: gdk_drawable_get_screen/visual => gdk_window_get_screen/visual
Diffstat (limited to 'gdk/x11')
| -rw-r--r-- | gdk/x11/gdkdrawable-x11.c | 3 | ||||
| -rw-r--r-- | gdk/x11/gdkgeometry-x11.c | 4 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 2011a1c7e0..c080a2233b 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -256,7 +256,7 @@ gdk_x11_create_cairo_surface (GdkDrawable *drawable, GdkDrawableImplX11 *impl = GDK_DRAWABLE_IMPL_X11 (drawable); GdkVisual *visual; - visual = gdk_drawable_get_visual (drawable); + visual = gdk_window_get_visual (impl->wrapper); if (visual) return cairo_xlib_surface_create (GDK_SCREEN_XDISPLAY (impl->screen), impl->xid, @@ -274,7 +274,6 @@ gdk_x11_create_cairo_surface (GdkDrawable *drawable, "so why is this code even reached?"); return NULL; } - } static cairo_surface_t * diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c index de6ac462e7..2ec2e08d48 100644 --- a/gdk/x11/gdkgeometry-x11.c +++ b/gdk/x11/gdkgeometry-x11.c @@ -233,8 +233,8 @@ _get_scratch_gc (GdkWindowObject *window, cairo_region_t *clip_region) gint n_rects; gint depth; - screen = GDK_SCREEN_X11 (gdk_drawable_get_screen (GDK_DRAWABLE (window))); - depth = gdk_drawable_get_depth (GDK_DRAWABLE (window)) - 1; + screen = GDK_SCREEN_X11 (gdk_window_get_screen (GDK_WINDOW (window))); + depth = gdk_visual_get_depth (gdk_window_get_visual (GDK_WINDOW (window))) - 1; if (!screen->subwindow_gcs[depth]) { diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 4f949717ea..e7e8251297 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -292,7 +292,7 @@ gdk_x11_window_create_pixmap_surface (GdkWindow *window, DefaultDepthOfScreen (GDK_SCREEN_XSCREEN (GDK_WINDOW_SCREEN (window)))); surface = cairo_xlib_surface_create (GDK_WINDOW_XDISPLAY (window), pixmap, - GDK_VISUAL_XVISUAL (gdk_drawable_get_visual (window)), + GDK_VISUAL_XVISUAL (gdk_window_get_visual (window)), width, height); attach_free_pixmap_handler (surface, GDK_WINDOW_DISPLAY (window), pixmap); @@ -1130,7 +1130,7 @@ _gdk_windowing_window_destroy_foreign (GdkWindow *window) static GdkWindow * get_root (GdkWindow *window) { - GdkScreen *screen = gdk_drawable_get_screen (window); + GdkScreen *screen = gdk_window_get_screen (window); return gdk_screen_get_root_window (screen); } @@ -3037,7 +3037,7 @@ _gdk_windowing_get_device_state (GdkDisplay *display, x, y, NULL, NULL, mask); - *screen = gdk_drawable_get_screen (root); + *screen = gdk_window_get_screen (root); } else { @@ -3062,7 +3062,7 @@ _gdk_windowing_get_device_state (GdkDisplay *display, if (root != None) { GdkWindow *gdk_root = gdk_window_lookup_for_display (display, root); - *screen = gdk_drawable_get_screen (gdk_root); + *screen = gdk_window_get_screen (gdk_root); } *x = rootx; |