Update to 2020

[grrobot] / src / grr_board_view.c

diff --git a/src/grr_board_view.c b/src/grr_board_view.c
index fc46a2145bbf983781109582007a8d1b4cbd3b66..ca1d0e1414334b9192a4c802733af6f4cc951ea1 100644 (file)
--- a/src/grr_board_view.c
+++ b/src/grr_board_view.c
@@ -1,6 +1,6 @@
 /* grr_board_view - GTK+ widget for displaying an rr_board
  *
- * Copyright © 2003 Carl Worth
+ * Copyright © 2003 Carl Worth
  *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
@@ -31,7 +31,8 @@
 
 #include <cairo.h>
 #include <cairo-xlib.h>
-#include <svg-cairo.h>
+#include <librsvg/rsvg.h>
+#include <librsvg/rsvg-cairo.h>
 
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
@@ -354,17 +355,7 @@ grr_board_view_expose (GtkWidget      *widget,
     view = GRR_BOARD_VIEW (widget);
     board = view->board;
 
-    /* Unabstract X from GTK+ */
-    gdk_window_get_internal_paint_info (widget->window, &real_drawable, &x_off, &y_off);
-    dpy = gdk_x11_drawable_get_xdisplay (real_drawable);
-    drawable = gdk_x11_drawable_get_xid (real_drawable);
-
-    /* Ignore GTK+ and use Cairo for drawing. */
-    visual = GDK_VISUAL_XVISUAL (gdk_drawable_get_visual (real_drawable));
-    surface = cairo_xlib_surface_create (dpy, drawable, visual,
-                                        widget->allocation.width,
-                                        widget->allocation.height);
-    xrs = cairo_create (surface);
+    xrs = gdk_cairo_create (widget->window);
 
     new_cell_width = widget->allocation.width / view->board_width;
     if (new_cell_width == 0)