From b20d37c79c59799c21894022968c2f42fa1d9566 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 9 Oct 2008 23:53:18 +0000 Subject: [PATCH] 2008-10-09 Mike Kestner * cairo/*.cs: flatten source hierarchy to simplify win32 build. * sample/Makefile.am: fix a ref issue with local cairo. svn path=/trunk/gtk-sharp/; revision=115401 --- ChangeLog | 5 ++ cairo/{Mono.Cairo => }/Antialias.cs | 0 cairo/{Mono.Cairo => }/Cairo.cs | 5 +- cairo/{Mono.Cairo => }/Content.cs | 0 cairo/{Mono.Cairo => }/Context.cs | 0 cairo/{Mono.Cairo => }/DirectFBSurface.cs | 0 cairo/{Mono.Cairo => }/Extend.cs | 0 cairo/{Mono.Cairo => }/FillRule.cs | 0 cairo/{Mono.Cairo => }/Filter.cs | 0 cairo/{Mono.Cairo => }/FontExtents.cs | 0 cairo/{Mono.Cairo => }/FontFace.cs | 0 cairo/{Mono.Cairo => }/FontOptions.cs | 0 cairo/{Mono.Cairo => }/FontSlant.cs | 0 cairo/{Mono.Cairo => }/FontType.cs | 0 cairo/{Mono.Cairo => }/FontWeight.cs | 0 cairo/{Mono.Cairo => }/Format.cs | 0 cairo/{Mono.Cairo => }/GlitzSurface.cs | 0 cairo/{Mono.Cairo => }/Glyph.cs | 0 cairo/{Mono.Cairo => }/Gradient.cs | 0 cairo/{Mono.Cairo => }/HintMetrics.cs | 0 cairo/{Mono.Cairo => }/HintStyle.cs | 0 cairo/{Mono.Cairo => }/ImageSurface.cs | 0 cairo/{Mono.Cairo => }/LineCap.cs | 0 cairo/{Mono.Cairo => }/LineJoin.cs | 0 cairo/{Mono.Cairo => }/LinearGradient.cs | 0 cairo/Makefile.am | 94 +++++++++++------------ cairo/{Mono.Cairo => }/Matrix.cs | 0 cairo/{Mono.Cairo => }/NativeMethods.cs | 5 +- cairo/{Mono.Cairo => }/Operator.cs | 0 cairo/{Mono.Cairo => }/PSSurface.cs | 0 cairo/{Mono.Cairo => }/Path.cs | 0 cairo/{Mono.Cairo => }/Pattern.cs | 0 cairo/{Mono.Cairo => }/PatternType.cs | 0 cairo/{Mono.Cairo => }/PdfSurface.cs | 0 cairo/{Mono.Cairo => }/RadialGradient.cs | 0 cairo/{Mono.Cairo => }/Rectangle.cs | 0 cairo/{Mono.Cairo => }/ScaledFont.cs | 0 cairo/{Mono.Cairo => }/SolidPattern.cs | 0 cairo/{Mono.Cairo => }/Status.cs | 0 cairo/{Mono.Cairo => }/SubpixelOrder.cs | 0 cairo/{Mono.Cairo => }/Surface.cs | 0 cairo/{Mono.Cairo => }/SurfacePattern.cs | 0 cairo/{Mono.Cairo => }/SurfaceType.cs | 0 cairo/{Mono.Cairo => }/SvgSurface.cs | 0 cairo/{Mono.Cairo => }/SvgVersion.cs | 0 cairo/{Mono.Cairo => }/TextExtents.cs | 0 cairo/{Mono.Cairo => }/Win32Surface.cs | 0 cairo/{Mono.Cairo => }/XcbSurface.cs | 0 cairo/{Mono.Cairo => }/XlibSurface.cs | 0 sample/Makefile.am | 8 +- 50 files changed, 67 insertions(+), 50 deletions(-) rename cairo/{Mono.Cairo => }/Antialias.cs (100%) rename cairo/{Mono.Cairo => }/Cairo.cs (97%) rename cairo/{Mono.Cairo => }/Content.cs (100%) rename cairo/{Mono.Cairo => }/Context.cs (100%) rename cairo/{Mono.Cairo => }/DirectFBSurface.cs (100%) rename cairo/{Mono.Cairo => }/Extend.cs (100%) rename cairo/{Mono.Cairo => }/FillRule.cs (100%) rename cairo/{Mono.Cairo => }/Filter.cs (100%) rename cairo/{Mono.Cairo => }/FontExtents.cs (100%) rename cairo/{Mono.Cairo => }/FontFace.cs (100%) rename cairo/{Mono.Cairo => }/FontOptions.cs (100%) rename cairo/{Mono.Cairo => }/FontSlant.cs (100%) rename cairo/{Mono.Cairo => }/FontType.cs (100%) rename cairo/{Mono.Cairo => }/FontWeight.cs (100%) rename cairo/{Mono.Cairo => }/Format.cs (100%) rename cairo/{Mono.Cairo => }/GlitzSurface.cs (100%) rename cairo/{Mono.Cairo => }/Glyph.cs (100%) rename cairo/{Mono.Cairo => }/Gradient.cs (100%) rename cairo/{Mono.Cairo => }/HintMetrics.cs (100%) rename cairo/{Mono.Cairo => }/HintStyle.cs (100%) rename cairo/{Mono.Cairo => }/ImageSurface.cs (100%) rename cairo/{Mono.Cairo => }/LineCap.cs (100%) rename cairo/{Mono.Cairo => }/LineJoin.cs (100%) rename cairo/{Mono.Cairo => }/LinearGradient.cs (100%) rename cairo/{Mono.Cairo => }/Matrix.cs (100%) rename cairo/{Mono.Cairo => }/NativeMethods.cs (99%) rename cairo/{Mono.Cairo => }/Operator.cs (100%) rename cairo/{Mono.Cairo => }/PSSurface.cs (100%) rename cairo/{Mono.Cairo => }/Path.cs (100%) rename cairo/{Mono.Cairo => }/Pattern.cs (100%) rename cairo/{Mono.Cairo => }/PatternType.cs (100%) rename cairo/{Mono.Cairo => }/PdfSurface.cs (100%) rename cairo/{Mono.Cairo => }/RadialGradient.cs (100%) rename cairo/{Mono.Cairo => }/Rectangle.cs (100%) rename cairo/{Mono.Cairo => }/ScaledFont.cs (100%) rename cairo/{Mono.Cairo => }/SolidPattern.cs (100%) rename cairo/{Mono.Cairo => }/Status.cs (100%) rename cairo/{Mono.Cairo => }/SubpixelOrder.cs (100%) rename cairo/{Mono.Cairo => }/Surface.cs (100%) rename cairo/{Mono.Cairo => }/SurfacePattern.cs (100%) rename cairo/{Mono.Cairo => }/SurfaceType.cs (100%) rename cairo/{Mono.Cairo => }/SvgSurface.cs (100%) rename cairo/{Mono.Cairo => }/SvgVersion.cs (100%) rename cairo/{Mono.Cairo => }/TextExtents.cs (100%) rename cairo/{Mono.Cairo => }/Win32Surface.cs (100%) rename cairo/{Mono.Cairo => }/XcbSurface.cs (100%) rename cairo/{Mono.Cairo => }/XlibSurface.cs (100%) diff --git a/ChangeLog b/ChangeLog index a7de242f8..bf7c380f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-09 Mike Kestner + + * cairo/*.cs: flatten source hierarchy to simplify win32 build. + * sample/Makefile.am: fix a ref issue with local cairo. + 2008-10-09 Mike Kestner * configure.in.in: magic for local Mono.Cairo build. diff --git a/cairo/Mono.Cairo/Antialias.cs b/cairo/Antialias.cs similarity index 100% rename from cairo/Mono.Cairo/Antialias.cs rename to cairo/Antialias.cs diff --git a/cairo/Mono.Cairo/Cairo.cs b/cairo/Cairo.cs similarity index 97% rename from cairo/Mono.Cairo/Cairo.cs rename to cairo/Cairo.cs index c0a5f2ab0..3eb667a47 100644 --- a/cairo/Mono.Cairo/Cairo.cs +++ b/cairo/Cairo.cs @@ -36,7 +36,10 @@ using System.Runtime.InteropServices; namespace Cairo { - public static class CairoAPI { + public class CairoAPI { + + private CairoAPI () {} + static public int Version { get { return Cairo.NativeMethods.cairo_version (); diff --git a/cairo/Mono.Cairo/Content.cs b/cairo/Content.cs similarity index 100% rename from cairo/Mono.Cairo/Content.cs rename to cairo/Content.cs diff --git a/cairo/Mono.Cairo/Context.cs b/cairo/Context.cs similarity index 100% rename from cairo/Mono.Cairo/Context.cs rename to cairo/Context.cs diff --git a/cairo/Mono.Cairo/DirectFBSurface.cs b/cairo/DirectFBSurface.cs similarity index 100% rename from cairo/Mono.Cairo/DirectFBSurface.cs rename to cairo/DirectFBSurface.cs diff --git a/cairo/Mono.Cairo/Extend.cs b/cairo/Extend.cs similarity index 100% rename from cairo/Mono.Cairo/Extend.cs rename to cairo/Extend.cs diff --git a/cairo/Mono.Cairo/FillRule.cs b/cairo/FillRule.cs similarity index 100% rename from cairo/Mono.Cairo/FillRule.cs rename to cairo/FillRule.cs diff --git a/cairo/Mono.Cairo/Filter.cs b/cairo/Filter.cs similarity index 100% rename from cairo/Mono.Cairo/Filter.cs rename to cairo/Filter.cs diff --git a/cairo/Mono.Cairo/FontExtents.cs b/cairo/FontExtents.cs similarity index 100% rename from cairo/Mono.Cairo/FontExtents.cs rename to cairo/FontExtents.cs diff --git a/cairo/Mono.Cairo/FontFace.cs b/cairo/FontFace.cs similarity index 100% rename from cairo/Mono.Cairo/FontFace.cs rename to cairo/FontFace.cs diff --git a/cairo/Mono.Cairo/FontOptions.cs b/cairo/FontOptions.cs similarity index 100% rename from cairo/Mono.Cairo/FontOptions.cs rename to cairo/FontOptions.cs diff --git a/cairo/Mono.Cairo/FontSlant.cs b/cairo/FontSlant.cs similarity index 100% rename from cairo/Mono.Cairo/FontSlant.cs rename to cairo/FontSlant.cs diff --git a/cairo/Mono.Cairo/FontType.cs b/cairo/FontType.cs similarity index 100% rename from cairo/Mono.Cairo/FontType.cs rename to cairo/FontType.cs diff --git a/cairo/Mono.Cairo/FontWeight.cs b/cairo/FontWeight.cs similarity index 100% rename from cairo/Mono.Cairo/FontWeight.cs rename to cairo/FontWeight.cs diff --git a/cairo/Mono.Cairo/Format.cs b/cairo/Format.cs similarity index 100% rename from cairo/Mono.Cairo/Format.cs rename to cairo/Format.cs diff --git a/cairo/Mono.Cairo/GlitzSurface.cs b/cairo/GlitzSurface.cs similarity index 100% rename from cairo/Mono.Cairo/GlitzSurface.cs rename to cairo/GlitzSurface.cs diff --git a/cairo/Mono.Cairo/Glyph.cs b/cairo/Glyph.cs similarity index 100% rename from cairo/Mono.Cairo/Glyph.cs rename to cairo/Glyph.cs diff --git a/cairo/Mono.Cairo/Gradient.cs b/cairo/Gradient.cs similarity index 100% rename from cairo/Mono.Cairo/Gradient.cs rename to cairo/Gradient.cs diff --git a/cairo/Mono.Cairo/HintMetrics.cs b/cairo/HintMetrics.cs similarity index 100% rename from cairo/Mono.Cairo/HintMetrics.cs rename to cairo/HintMetrics.cs diff --git a/cairo/Mono.Cairo/HintStyle.cs b/cairo/HintStyle.cs similarity index 100% rename from cairo/Mono.Cairo/HintStyle.cs rename to cairo/HintStyle.cs diff --git a/cairo/Mono.Cairo/ImageSurface.cs b/cairo/ImageSurface.cs similarity index 100% rename from cairo/Mono.Cairo/ImageSurface.cs rename to cairo/ImageSurface.cs diff --git a/cairo/Mono.Cairo/LineCap.cs b/cairo/LineCap.cs similarity index 100% rename from cairo/Mono.Cairo/LineCap.cs rename to cairo/LineCap.cs diff --git a/cairo/Mono.Cairo/LineJoin.cs b/cairo/LineJoin.cs similarity index 100% rename from cairo/Mono.Cairo/LineJoin.cs rename to cairo/LineJoin.cs diff --git a/cairo/Mono.Cairo/LinearGradient.cs b/cairo/LinearGradient.cs similarity index 100% rename from cairo/Mono.Cairo/LinearGradient.cs rename to cairo/LinearGradient.cs diff --git a/cairo/Makefile.am b/cairo/Makefile.am index 8fe5d021f..22792ae1b 100644 --- a/cairo/Makefile.am +++ b/cairo/Makefile.am @@ -12,53 +12,53 @@ noinst_DATA = $(TARGET) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk AssemblyInfo.cs sources = \ - Mono.Cairo/Antialias.cs \ - Mono.Cairo/Cairo.cs \ - Mono.Cairo/Content.cs \ - Mono.Cairo/Context.cs \ - Mono.Cairo/DirectFBSurface.cs \ - Mono.Cairo/Extend.cs \ - Mono.Cairo/FillRule.cs \ - Mono.Cairo/Filter.cs \ - Mono.Cairo/FontExtents.cs \ - Mono.Cairo/FontFace.cs \ - Mono.Cairo/FontOptions.cs \ - Mono.Cairo/FontSlant.cs \ - Mono.Cairo/FontType.cs \ - Mono.Cairo/FontWeight.cs \ - Mono.Cairo/Format.cs \ - Mono.Cairo/GlitzSurface.cs \ - Mono.Cairo/Glyph.cs \ - Mono.Cairo/Gradient.cs \ - Mono.Cairo/HintMetrics.cs \ - Mono.Cairo/HintStyle.cs \ - Mono.Cairo/ImageSurface.cs \ - Mono.Cairo/LinearGradient.cs \ - Mono.Cairo/LineCap.cs \ - Mono.Cairo/LineJoin.cs \ - Mono.Cairo/Matrix.cs \ - Mono.Cairo/NativeMethods.cs \ - Mono.Cairo/Operator.cs \ - Mono.Cairo/Path.cs \ - Mono.Cairo/Pattern.cs \ - Mono.Cairo/PatternType.cs \ - Mono.Cairo/PdfSurface.cs \ - Mono.Cairo/PSSurface.cs \ - Mono.Cairo/RadialGradient.cs \ - Mono.Cairo/Rectangle.cs \ - Mono.Cairo/ScaledFont.cs \ - Mono.Cairo/SolidPattern.cs \ - Mono.Cairo/Status.cs \ - Mono.Cairo/SubpixelOrder.cs \ - Mono.Cairo/Surface.cs \ - Mono.Cairo/SurfacePattern.cs \ - Mono.Cairo/SurfaceType.cs \ - Mono.Cairo/SvgSurface.cs \ - Mono.Cairo/SvgVersion.cs \ - Mono.Cairo/TextExtents.cs \ - Mono.Cairo/Win32Surface.cs \ - Mono.Cairo/XcbSurface.cs \ - Mono.Cairo/XlibSurface.cs \ + Antialias.cs \ + Cairo.cs \ + Content.cs \ + Context.cs \ + DirectFBSurface.cs \ + Extend.cs \ + FillRule.cs \ + Filter.cs \ + FontExtents.cs \ + FontFace.cs \ + FontOptions.cs \ + FontSlant.cs \ + FontType.cs \ + FontWeight.cs \ + Format.cs \ + GlitzSurface.cs \ + Glyph.cs \ + Gradient.cs \ + HintMetrics.cs \ + HintStyle.cs \ + ImageSurface.cs \ + LinearGradient.cs \ + LineCap.cs \ + LineJoin.cs \ + Matrix.cs \ + NativeMethods.cs \ + Operator.cs \ + Path.cs \ + Pattern.cs \ + PatternType.cs \ + PdfSurface.cs \ + PSSurface.cs \ + RadialGradient.cs \ + Rectangle.cs \ + ScaledFont.cs \ + SolidPattern.cs \ + Status.cs \ + SubpixelOrder.cs \ + Surface.cs \ + SurfacePattern.cs \ + SurfaceType.cs \ + SvgSurface.cs \ + SvgVersion.cs \ + TextExtents.cs \ + Win32Surface.cs \ + XcbSurface.cs \ + XlibSurface.cs \ # build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs diff --git a/cairo/Mono.Cairo/Matrix.cs b/cairo/Matrix.cs similarity index 100% rename from cairo/Mono.Cairo/Matrix.cs rename to cairo/Matrix.cs diff --git a/cairo/Mono.Cairo/NativeMethods.cs b/cairo/NativeMethods.cs similarity index 99% rename from cairo/Mono.Cairo/NativeMethods.cs rename to cairo/NativeMethods.cs index 64bc4dd65..eb929a5b7 100644 --- a/cairo/Mono.Cairo/NativeMethods.cs +++ b/cairo/NativeMethods.cs @@ -39,8 +39,11 @@ namespace Cairo // sort these so it is easier to find what is missing // http://www.cairographics.org/manual/ix01.html - public static class NativeMethods + public class NativeMethods { + + private NativeMethods () {} + const string cairo = "libcairo-2.dll"; //[DllImport (cairo)] diff --git a/cairo/Mono.Cairo/Operator.cs b/cairo/Operator.cs similarity index 100% rename from cairo/Mono.Cairo/Operator.cs rename to cairo/Operator.cs diff --git a/cairo/Mono.Cairo/PSSurface.cs b/cairo/PSSurface.cs similarity index 100% rename from cairo/Mono.Cairo/PSSurface.cs rename to cairo/PSSurface.cs diff --git a/cairo/Mono.Cairo/Path.cs b/cairo/Path.cs similarity index 100% rename from cairo/Mono.Cairo/Path.cs rename to cairo/Path.cs diff --git a/cairo/Mono.Cairo/Pattern.cs b/cairo/Pattern.cs similarity index 100% rename from cairo/Mono.Cairo/Pattern.cs rename to cairo/Pattern.cs diff --git a/cairo/Mono.Cairo/PatternType.cs b/cairo/PatternType.cs similarity index 100% rename from cairo/Mono.Cairo/PatternType.cs rename to cairo/PatternType.cs diff --git a/cairo/Mono.Cairo/PdfSurface.cs b/cairo/PdfSurface.cs similarity index 100% rename from cairo/Mono.Cairo/PdfSurface.cs rename to cairo/PdfSurface.cs diff --git a/cairo/Mono.Cairo/RadialGradient.cs b/cairo/RadialGradient.cs similarity index 100% rename from cairo/Mono.Cairo/RadialGradient.cs rename to cairo/RadialGradient.cs diff --git a/cairo/Mono.Cairo/Rectangle.cs b/cairo/Rectangle.cs similarity index 100% rename from cairo/Mono.Cairo/Rectangle.cs rename to cairo/Rectangle.cs diff --git a/cairo/Mono.Cairo/ScaledFont.cs b/cairo/ScaledFont.cs similarity index 100% rename from cairo/Mono.Cairo/ScaledFont.cs rename to cairo/ScaledFont.cs diff --git a/cairo/Mono.Cairo/SolidPattern.cs b/cairo/SolidPattern.cs similarity index 100% rename from cairo/Mono.Cairo/SolidPattern.cs rename to cairo/SolidPattern.cs diff --git a/cairo/Mono.Cairo/Status.cs b/cairo/Status.cs similarity index 100% rename from cairo/Mono.Cairo/Status.cs rename to cairo/Status.cs diff --git a/cairo/Mono.Cairo/SubpixelOrder.cs b/cairo/SubpixelOrder.cs similarity index 100% rename from cairo/Mono.Cairo/SubpixelOrder.cs rename to cairo/SubpixelOrder.cs diff --git a/cairo/Mono.Cairo/Surface.cs b/cairo/Surface.cs similarity index 100% rename from cairo/Mono.Cairo/Surface.cs rename to cairo/Surface.cs diff --git a/cairo/Mono.Cairo/SurfacePattern.cs b/cairo/SurfacePattern.cs similarity index 100% rename from cairo/Mono.Cairo/SurfacePattern.cs rename to cairo/SurfacePattern.cs diff --git a/cairo/Mono.Cairo/SurfaceType.cs b/cairo/SurfaceType.cs similarity index 100% rename from cairo/Mono.Cairo/SurfaceType.cs rename to cairo/SurfaceType.cs diff --git a/cairo/Mono.Cairo/SvgSurface.cs b/cairo/SvgSurface.cs similarity index 100% rename from cairo/Mono.Cairo/SvgSurface.cs rename to cairo/SvgSurface.cs diff --git a/cairo/Mono.Cairo/SvgVersion.cs b/cairo/SvgVersion.cs similarity index 100% rename from cairo/Mono.Cairo/SvgVersion.cs rename to cairo/SvgVersion.cs diff --git a/cairo/Mono.Cairo/TextExtents.cs b/cairo/TextExtents.cs similarity index 100% rename from cairo/Mono.Cairo/TextExtents.cs rename to cairo/TextExtents.cs diff --git a/cairo/Mono.Cairo/Win32Surface.cs b/cairo/Win32Surface.cs similarity index 100% rename from cairo/Mono.Cairo/Win32Surface.cs rename to cairo/Win32Surface.cs diff --git a/cairo/Mono.Cairo/XcbSurface.cs b/cairo/XcbSurface.cs similarity index 100% rename from cairo/Mono.Cairo/XcbSurface.cs rename to cairo/XcbSurface.cs diff --git a/cairo/Mono.Cairo/XlibSurface.cs b/cairo/XlibSurface.cs similarity index 100% rename from cairo/Mono.Cairo/XlibSurface.cs rename to cairo/XlibSurface.cs diff --git a/sample/Makefile.am b/sample/Makefile.am index 97bc805f5..ef58893aa 100755 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -1,5 +1,11 @@ SUBDIRS = test GtkDemo pixmaps valtest opaquetest +if ENABLE_MONO_CAIRO +cairo_ref=-r:$(top_builddir)/cairo/Mono.Cairo.dll +else +cairo_ref=$(MONO_CAIRO_LIBS) +endif + if ENABLE_GLADE GLADE_TARGETS=glade-viewer.exe glade-test.exe GLADE_ASSEMBLY=../glade/glade-sharp.dll @@ -69,7 +75,7 @@ glade-test.exe: $(srcdir)/GladeTest.cs $(srcdir)/test.glade $(assemblies) $(CSC) /resource:$(srcdir)/test.glade,test.glade /out:glade-test.exe $(references) $(srcdir)/GladeTest.cs cairo-sample.exe: $(srcdir)/CairoSample.cs $(assemblies) - $(CSC) /out:cairo-sample.exe $(references) /r:Mono.Cairo $(srcdir)/CairoSample.cs + $(CSC) /out:cairo-sample.exe $(references) $(cairo_ref) $(srcdir)/CairoSample.cs testdnd.exe: $(srcdir)/TestDnd.cs $(assemblies) $(CSC) /debug /unsafe /out:testdnd.exe $(references) $(srcdir)/TestDnd.cs