Revert a couple files to mono master

* cairo/Cairo.cs: make a static class like master
* cairo/ImageSurface.cs: revert obsolete warning and ws changes
This commit is contained in:
Mike Kestner 2011-04-21 18:01:33 -05:00
parent 9a2fd72001
commit 6647c2609c
2 changed files with 6 additions and 7 deletions

View file

@ -36,10 +36,7 @@ using System.Runtime.InteropServices;
namespace Cairo namespace Cairo
{ {
public class CairoAPI { public static class CairoAPI {
private CairoAPI () {}
static public int Version { static public int Version {
get { get {
return Cairo.NativeMethods.cairo_version (); return Cairo.NativeMethods.cairo_version ();

View file

@ -50,9 +50,11 @@ namespace Cairo {
surfaces [surface] = this; surfaces [surface] = this;
} }
} }
[Obsolete ("Replaced by ctor (byte[] data, Cairo.Format format, int width, int height, int stride)")] [Obsolete ("Use ImageSurface (byte[] data, Cairo.Format format, int width, int height, int stride)")]
public ImageSurface (ref byte[] data, Cairo.Format format, int width, int height, int stride) : this (data, format, width, height, stride) {} public ImageSurface (ref byte[] data, Cairo.Format format, int width, int height, int stride) :this (data, format, width, height, stride)
{
}
public ImageSurface (byte[] data, Cairo.Format format, int width, int height, int stride) public ImageSurface (byte[] data, Cairo.Format format, int width, int height, int stride)
{ {