From f7a8bac5e63086245245953bed598f9254e857ec Mon Sep 17 00:00:00 2001
From: Kristian Rietveld <kris@gtk.org>
Date: Sat, 24 Jul 2010 10:52:37 +0200
Subject: [PATCH] quartz: Make backend compile again

---
 gdk/quartz/gdkdrawable-quartz.c | 29 -----------------------------
 gdk/quartz/gdkprivate-quartz.h  |  9 ++++-----
 gdk/quartz/gdkwindow-quartz.c   |  4 +---
 3 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/gdk/quartz/gdkdrawable-quartz.c b/gdk/quartz/gdkdrawable-quartz.c
index 5b26434d3..ddb481a38 100644
--- a/gdk/quartz/gdkdrawable-quartz.c
+++ b/gdk/quartz/gdkdrawable-quartz.c
@@ -147,33 +147,6 @@ gdk_quartz_get_depth (GdkDrawable *drawable)
   return gdk_drawable_get_depth (GDK_DRAWABLE_IMPL_QUARTZ (drawable)->wrapper);
 }
 
-static inline void
-gdk_quartz_fix_cap_not_last_line (GdkGCQuartz *private,
-				  gint         x1,
-				  gint         y1,
-				  gint         x2,
-				  gint         y2,
-				  gint        *xfix,
-				  gint        *yfix)
-{
-  *xfix = 0;
-  *yfix = 0;
-
-  if (private->cap_style == GDK_CAP_NOT_LAST && private->line_width == 0)
-    {
-      /* fix only vertical and horizontal lines for now */
-
-      if (y1 == y2 && x1 != x2)
-	{
-	  *xfix = (x1 < x2) ? -1 : 1;
-	}
-      else if (x1 == x2 && y1 != y2)
-	{
-	  *yfix = (y1 < y2) ? -1 : 1;
-	}
-    }
-}
-
 static void
 gdk_drawable_impl_quartz_finalize (GObject *object)
 {
@@ -195,8 +168,6 @@ gdk_drawable_impl_quartz_class_init (GdkDrawableImplQuartzClass *klass)
 
   object_class->finalize = gdk_drawable_impl_quartz_finalize;
 
-  drawable_class->create_gc = _gdk_quartz_gc_new;
-
   drawable_class->ref_cairo_surface = gdk_quartz_ref_cairo_surface;
 
   drawable_class->set_colormap = gdk_quartz_set_colormap;
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index fbf75c243..6c4d79323 100644
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -143,11 +143,10 @@ void        _gdk_quartz_drawable_flush  (GdkDrawable *drawable);
 void        _gdk_quartz_window_scroll      (GdkWindow       *window,
                                             gint             dx,
                                             gint             dy);
-void        _gdk_quartz_window_queue_translation (GdkWindow *window,
-						  GdkGC     *gc,
-                                                  cairo_region_t *area,
-                                                  gint       dx,
-                                                  gint       dy);
+void        _gdk_quartz_window_translate   (GdkWindow       *window,
+                                            cairo_region_t  *area,
+                                            gint             dx,
+                                            gint             dy);
 gboolean    _gdk_quartz_window_queue_antiexpose  (GdkWindow *window,
                                                   cairo_region_t *area);
 
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index de0ca408a..2d0f8d94c 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -286,10 +286,8 @@ gdk_window_impl_quartz_begin_paint_region (GdkPaintable    *paintable,
     }
   else
     {
-      int x, y;
       int x_offset, y_offset;
       int width, height;
-      cairo_rectangle_int_t rect;
       cairo_t *cr;
 
       x_offset = y_offset = 0;
@@ -316,7 +314,7 @@ gdk_window_impl_quartz_begin_paint_region (GdkPaintable    *paintable,
 
       gdk_drawable_get_size (GDK_DRAWABLE (bg_pixmap), &width, &height);
 
-      cr = gdk_cairo_create (impl);
+      cr = gdk_cairo_create (GDK_DRAWABLE (impl));
       
       gdk_cairo_set_source_pixmap (cr, bg_pixmap, x_offset, y_offset);
       cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
-- 
2.43.2