Author: alp
Date: 2007-01-15 02:39:50 -0500 (Mon, 15 Jan 2007)
New Revision: 71005
Modified:
trunk/mcs/class/Mono.Cairo/ChangeLog
trunk/mcs/class/Mono.Cairo/Makefile
trunk/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs
Log:
2007-01-15 Alp Toker <[EMAIL PROTECTED]>
* Mono.Cairo/Surface.cs:
* Makefile: Disable CAIRO_1_2. Patches to make the 1.2 binding work
are being developed out-of-tree but not ready yet.
Modified: trunk/mcs/class/Mono.Cairo/ChangeLog
===================================================================
--- trunk/mcs/class/Mono.Cairo/ChangeLog 2007-01-15 07:39:23 UTC (rev
71004)
+++ trunk/mcs/class/Mono.Cairo/ChangeLog 2007-01-15 07:39:50 UTC (rev
71005)
@@ -1,3 +1,9 @@
+2007-01-15 Alp Toker <[EMAIL PROTECTED]>
+
+ * Mono.Cairo/Surface.cs:
+ * Makefile: Disable CAIRO_1_2. Patches to make the 1.2 binding work
+ are being developed out-of-tree but not ready yet.
+
2007-01-08 Alp Toker <[EMAIL PROTECTED]>
* Mono.Cairo/Context.cs: Implement Context.GlyphExtents().
Modified: trunk/mcs/class/Mono.Cairo/Makefile
===================================================================
--- trunk/mcs/class/Mono.Cairo/Makefile 2007-01-15 07:39:23 UTC (rev 71004)
+++ trunk/mcs/class/Mono.Cairo/Makefile 2007-01-15 07:39:50 UTC (rev 71005)
@@ -3,7 +3,7 @@
include ../../build/rules.make
LIBRARY = Mono.Cairo.dll
-LIB_MCS_FLAGS = -d:CAIRO_1_2
+#LIB_MCS_FLAGS = -d:CAIRO_1_2
NO_TEST = yes
EXTRA_DISTFILES = \
Modified: trunk/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs
===================================================================
--- trunk/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs 2007-01-15 07:39:23 UTC
(rev 71004)
+++ trunk/mcs/class/Mono.Cairo/Mono.Cairo/Surface.cs 2007-01-15 07:39:50 UTC
(rev 71005)
@@ -68,6 +68,7 @@
}
}
+#if CAIRO_1_2
static internal Surface LookupSurface (IntPtr surface)
{
SurfaceType st =
CairoAPI.cairo_surface_get_type (surface);
@@ -82,7 +83,7 @@
return new GlitzSurface
(surface, true);
case SurfaceType.Win32:
return new Win32Surface
(surface, true);
-#if CAIRO_1_2
+//#if CAIRO_1_2
case SurfaceType.Pdf:
return new PdfSurface (surface,
true);
case SurfaceType.PS:
@@ -91,11 +92,12 @@
return new DirectFBSurface
(surface, true);
case SurfaceType.Svg:
return new SvgSurface (surface,
true);
-#endif
+//#endif
default:
return
Surface.LookupExternalSurface (surface);
}
}
+#endif
[Obsolete ("Use an ImageSurface constructor instead.")]
public static Cairo.Surface CreateForImage (
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
