From 18ab944a932ab0b8e5e5bd93c923fc20517256eb Mon Sep 17 00:00:00 2001
From: Richard Frith-MacDonald <rfm@gnu.org>
Date: Fri, 5 Mar 2010 06:52:53 +0000
Subject: [PATCH] update to avoid obsolete function

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@29844 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                  |  6 ++++++
 Source/cairo/CairoGState.m |  2 +-
 Source/gsc/GSGState.m      | 12 ++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d668883..a738a67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-05 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/cairo/CairoGState.m:
+	* Source/gsc/GSGState.m:
+	Use the -zone method rather than GSObjCZone()
+
 2010-02-24 16:45-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/win32/WIN32Server.m: Added a boolean to control if 
diff --git a/Source/cairo/CairoGState.m b/Source/cairo/CairoGState.m
index d67fac7..00b47ed 100644
--- a/Source/cairo/CairoGState.m
+++ b/Source/cairo/CairoGState.m
@@ -90,7 +90,7 @@ static float floatToUserSpace(NSAffineTransform *ctm, float f)
 {
   NSAffineTransform *ictm;
   
-  ictm = [ctm copyWithZone: GSObjCZone(ctm)];
+  ictm = [ctm copyWithZone: [ctm zone]];
   [ictm invert];
   f = floatFromUserSpace(ictm, f);
   RELEASE(ictm);
diff --git a/Source/gsc/GSGState.m b/Source/gsc/GSGState.m
index 50287bf..0bf17d8 100644
--- a/Source/gsc/GSGState.m
+++ b/Source/gsc/GSGState.m
@@ -78,7 +78,7 @@
 
 - (id) deepen
 {
-  NSZone *zone = GSObjCZone(self);
+  NSZone *zone = [self zone];
 
   if (path)
     self->path = [path copyWithZone: zone];
@@ -644,7 +644,7 @@ typedef enum {
   if (ctm)
     [ctm makeIdentityMatrix];
   else
-    ctm = [[NSAffineTransform allocWithZone: GSObjCZone(self)] init];
+    ctm = [[NSAffineTransform allocWithZone: [self zone]] init];
 
    /* Initialize colors. By default the same color is used for filling and 
      stroking unless fill and/or stroke color is set explicitly */
@@ -657,7 +657,7 @@ typedef enum {
   if (textCtm)
     [textCtm makeIdentityMatrix];
   else
-    textCtm = [[NSAffineTransform allocWithZone: GSObjCZone(self)] init];
+    textCtm = [[NSAffineTransform allocWithZone: [self zone]] init];
 }
 
 - (void)DPScurrentflat: (float *)flatness 
@@ -699,7 +699,7 @@ typedef enum {
     }
 
   // This is rather slow, but it is not used very often
-  ictm = [ctm copyWithZone: GSObjCZone(self)];
+  ictm = [ctm copyWithZone: [self zone]];
   [ictm invert];
   user = [ictm transformPoint: [path currentPoint]];
   RELEASE(ictm);
@@ -946,7 +946,7 @@ typedef enum {
 {
   // This is rather slow, but it is not used very often
   NSBezierPath *newPath = [path copy];
-  NSAffineTransform *ictm = [ctm copyWithZone: GSObjCZone(self)];
+  NSAffineTransform *ictm = [ctm copyWithZone: [self zone]];
 
   [ictm invert];
   [newPath transformUsingAffineTransform: ictm];
@@ -1248,7 +1248,7 @@ typedef enum {
 
   // The coordinates we get here are already in device space,
   // but compositeToPoint needs user space coordinates
-  ictm = [ctm copyWithZone: GSObjCZone(self)];
+  ictm = [ctm copyWithZone: [self zone]];
   [ictm invert];
 
   size = [pattern size];