Author: mkestner
Date: 2006-08-10 12:55:58 -0400 (Thu, 10 Aug 2006)
New Revision: 63608
Added:
trunk/gtk-sharp/doc/en/Pango/CairoHelper.xml
Modified:
trunk/gtk-sharp/ChangeLog
trunk/gtk-sharp/pango/Pango.metadata
trunk/gtk-sharp/pango/pango-api-2.10.raw
trunk/gtk-sharp/sources/gtk-sharp-2.10-sources.xml
Log:
2006-08-10 Mike Kestner <[EMAIL PROTECTED]>
* pango/Pango.metadata : some pango_cairo fixup.
* pango/pango-api-2.10.raw : regen with pangocairo.h API.
* sources/gtk-sharp-2.10-sources.xml : don't exclude pangocairo.h.
Modified: trunk/gtk-sharp/ChangeLog
===================================================================
--- trunk/gtk-sharp/ChangeLog 2006-08-10 16:55:37 UTC (rev 63607)
+++ trunk/gtk-sharp/ChangeLog 2006-08-10 16:55:58 UTC (rev 63608)
@@ -1,5 +1,11 @@
2006-08-10 Mike Kestner <[EMAIL PROTECTED]>
+ * pango/Pango.metadata : some pango_cairo fixup.
+ * pango/pango-api-2.10.raw : regen with pangocairo.h API.
+ * sources/gtk-sharp-2.10-sources.xml : don't exclude pangocairo.h.
+
+2006-08-10 Mike Kestner <[EMAIL PROTECTED]>
+
* parser/gapi2xml.pl : class parsing regex needs to handle protected
comments too.
Added: trunk/gtk-sharp/doc/en/Pango/CairoHelper.xml
===================================================================
--- trunk/gtk-sharp/doc/en/Pango/CairoHelper.xml 2006-08-10 16:55:37 UTC
(rev 63607)
+++ trunk/gtk-sharp/doc/en/Pango/CairoHelper.xml 2006-08-10 16:55:58 UTC
(rev 63608)
@@ -0,0 +1,216 @@
+<Type Name="CairoHelper" FullName="Pango.CairoHelper">
+ <TypeSignature Language="C#" Value="public class CairoHelper" />
+ <AssemblyInfo>
+ <AssemblyName>pango-sharp</AssemblyName>
+ <AssemblyVersion>2.10.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <Base>
+ <BaseTypeName>System.Object</BaseTypeName>
+ </Base>
+ <Interfaces />
+ <Members>
+ <Member MemberName=".ctor">
+ <MemberSignature Language="C#" Value="public CairoHelper ();" />
+ <MemberType>Constructor</MemberType>
+ <Parameters />
+ <Docs>
+ <summary>Do not use.</summary>
+ <remarks>No instance methods exist for this class.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="ShowLayout">
+ <MemberSignature Language="C#" Value="public static void ShowLayout
(Cairo.Context cr, Pango.Layout layout);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="cr" Type="Cairo.Context" />
+ <Parameter Name="layout" Type="Pango.Layout" />
+ </Parameters>
+ <Docs>
+ <param name="cr">a Cairo context.</param>
+ <param name="layout">The layout to render.</param>
+ <summary>Renders the contents of a Layout on a context.</summary>
+ <remarks>The top left corner of the Layout is located at the current
point of the context.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="ShowLayoutLine">
+ <MemberSignature Language="C#" Value="public static void ShowLayoutLine
(Cairo.Context cr, Pango.LayoutLine line);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="cr" Type="Cairo.Context" />
+ <Parameter Name="line" Type="Pango.LayoutLine" />
+ </Parameters>
+ <Docs>
+ <param name="cr">a cairo context.</param>
+ <param name="line">a line in a layout.</param>
+ <summary>Renders a layout line on a context.</summary>
+ <remarks>The origin of the glyphs is located at the current point of
the context.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="LayoutLinePath">
+ <MemberSignature Language="C#" Value="public static void LayoutLinePath
(Cairo.Context cr, Pango.LayoutLine line);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="cr" Type="Cairo.Context" />
+ <Parameter Name="line" Type="Pango.LayoutLine" />
+ </Parameters>
+ <Docs>
+ <param name="cr">a cairo context.</param>
+ <param name="line"> a layout line.</param>
+ <summary>Adds the glyphs in a line to the current path of a
context.</summary>
+ <remarks>The origin of the glyphs is located at the current point of
the context.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="UpdateContext">
+ <MemberSignature Language="C#" Value="public static void UpdateContext
(Cairo.Context cr, Pango.Context context);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="cr" Type="Cairo.Context" />
+ <Parameter Name="context" Type="Pango.Context" />
+ </Parameters>
+ <Docs>
+ <param name="cr">a cairo context.</param>
+ <param name="context">a Pango context.</param>
+ <summary>Updates a Pango context to match the transformation and
target surface of a cairo context.</summary>
+ <remarks />
+ </Docs>
+ </Member>
+ <Member MemberName="ContextGetResolution">
+ <MemberSignature Language="C#" Value="public static double
ContextGetResolution (Pango.Context context);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Double</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="context" Type="Pango.Context" />
+ </Parameters>
+ <Docs>
+ <param name="context">a Pango context.</param>
+ <summary>Gets the resolution for a context.</summary>
+ <returns>the dots per inch, or a negative value if none has been
set.</returns>
+ <remarks />
+ </Docs>
+ </Member>
+ <Member MemberName="GlyphStringPath">
+ <MemberSignature Language="C#" Value="public static void GlyphStringPath
(Cairo.Context cr, Pango.Font font, Pango.GlyphString glyphs);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="cr" Type="Cairo.Context" />
+ <Parameter Name="font" Type="Pango.Font" />
+ <Parameter Name="glyphs" Type="Pango.GlyphString" />
+ </Parameters>
+ <Docs>
+ <param name="cr">a cairo context.</param>
+ <param name="font">a font.</param>
+ <param name="glyphs">a glyph string.</param>
+ <summary>Adds a glyph string to the current path of a cairo
context.</summary>
+ <remarks>The origin of the glyph string is the current point of the
context.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="ContextSetResolution">
+ <MemberSignature Language="C#" Value="public static void
ContextSetResolution (Pango.Context context, double dpi);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="context" Type="Pango.Context" />
+ <Parameter Name="dpi" Type="System.Double" />
+ </Parameters>
+ <Docs>
+ <param name="context">a pango context.</param>
+ <param name="dpi">dots per inch.</param>
+ <summary>Sets the resolution for a context.</summary>
+ <remarks />
+ </Docs>
+ </Member>
+ <Member MemberName="CreateLayout">
+ <MemberSignature Language="C#" Value="public static Pango.Layout
CreateLayout (Cairo.Context cr);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>Pango.Layout</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="cr" Type="Cairo.Context" />
+ </Parameters>
+ <Docs>
+ <param name="cr">a cairo context.</param>
+ <summary>Creates a pango layout for a cairo context.</summary>
+ <returns>a pango layout.</returns>
+ <remarks />
+ </Docs>
+ </Member>
+ <Member MemberName="ShowGlyphString">
+ <MemberSignature Language="C#" Value="public static void ShowGlyphString
(Cairo.Context cr, Pango.Font font, Pango.GlyphString glyphs);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="cr" Type="Cairo.Context" />
+ <Parameter Name="font" Type="Pango.Font" />
+ <Parameter Name="glyphs" Type="Pango.GlyphString" />
+ </Parameters>
+ <Docs>
+ <param name="cr">a cairo context.</param>
+ <param name="font"> a font.</param>
+ <param name="glyphs">a glyph string.</param>
+ <summary>Renders a glyph string to a cairo context.</summary>
+ <remarks>The origin of the glyph string is located at the current
point of the context.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="UpdateLayout">
+ <MemberSignature Language="C#" Value="public static void UpdateLayout
(Cairo.Context cr, Pango.Layout layout);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="cr" Type="Cairo.Context" />
+ <Parameter Name="layout" Type="Pango.Layout" />
+ </Parameters>
+ <Docs>
+ <param name="cr">a cairo context.</param>
+ <param name="layout">a pango layout.</param>
+ <summary>Updates the internal context of a pango layout to the
transformation and target surface of a cairo context.</summary>
+ <remarks />
+ </Docs>
+ </Member>
+ <Member MemberName="LayoutPath">
+ <MemberSignature Language="C#" Value="public static void LayoutPath
(Cairo.Context cr, Pango.Layout layout);" />
+ <MemberType>Method</MemberType>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters>
+ <Parameter Name="cr" Type="Cairo.Context" />
+ <Parameter Name="layout" Type="Pango.Layout" />
+ </Parameters>
+ <Docs>
+ <param name="cr">To be added.</param>
+ <param name="layout">To be added.</param>
+ <summary>Adds the contents of a layout to the path of a cairo
context.</summary>
+ <remarks>The layout origin is located at the current point of the
cairo context.</remarks>
+ </Docs>
+ </Member>
+ </Members>
+ <Docs>
+ <summary>Cairo-related method provider.</summary>
+ <remarks />
+ <since version="Gtk# 2.10" />
+ </Docs>
+</Type>
Modified: trunk/gtk-sharp/pango/Pango.metadata
===================================================================
--- trunk/gtk-sharp/pango/Pango.metadata 2006-08-10 16:55:37 UTC (rev
63607)
+++ trunk/gtk-sharp/pango/Pango.metadata 2006-08-10 16:55:58 UTC (rev
63608)
@@ -19,6 +19,7 @@
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoTabArray']/[EMAIL
PROTECTED]'GetTabs']" name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoFT2SubstituteFunc']"
name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoAttr_']"
name="hidden">1</attr>
+ <attr path="/api/namespace/[EMAIL PROTECTED]'PangoCairo_']"
name="name">CairoHelper</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoGlobal']/[EMAIL
PROTECTED]'GetMirrorChar']" name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoGlobal']/[EMAIL
PROTECTED]'ParseMarkup']" name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoGlobal']/[EMAIL
PROTECTED]'ReadLine']" name="hidden">1</attr>
@@ -27,6 +28,7 @@
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoGlobal']/[EMAIL
PROTECTED]'ScanString']" name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoGlobal']/[EMAIL
PROTECTED]'ScanWord']" name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoGlobal']/[EMAIL
PROTECTED]'SkipSpace']/*/[EMAIL PROTECTED]'pos']" name="pass_as">ref</attr>
+ <attr path="/api/namespace/[EMAIL PROTECTED]'PangoCairoFontMap']"
name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoContext']/[EMAIL
PROTECTED]'ListFamilies']" name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoFont']/[EMAIL
PROTECTED]'Describe']/return-type" name="owned">true</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoFont']/[EMAIL
PROTECTED]'DescriptionsFree']" name="hidden">1</attr>
@@ -74,4 +76,5 @@
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoLayoutLine']/[EMAIL
PROTECTED]'Unref']" name="deprecated">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoScriptIter']"
name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'PangoWin32FontCache']"
name="hidden">1</attr>
+ <add-node path="/api"><symbol type="manual" cname="cairo_t"
name="Cairo.Context"/></add-node>
</metadata>
Modified: trunk/gtk-sharp/pango/pango-api-2.10.raw
===================================================================
--- trunk/gtk-sharp/pango/pango-api-2.10.raw 2006-08-10 16:55:37 UTC (rev
63607)
+++ trunk/gtk-sharp/pango/pango-api-2.10.raw 2006-08-10 16:55:58 UTC (rev
63608)
@@ -206,6 +206,27 @@
<parameter type="gpointer" name="data" />
</parameters>
</callback>
+ <object name="CairoFontMap" cname="PangoCairoFontMap">
+ <method name="CreateContext" cname="pango_cairo_font_map_create_context">
+ <return-type type="PangoContext*" />
+ </method>
+ <method name="GetDefault" cname="pango_cairo_font_map_get_default"
shared="true">
+ <return-type type="PangoFontMap*" />
+ </method>
+ <method name="GetResolution" cname="pango_cairo_font_map_get_resolution">
+ <return-type type="double" />
+ </method>
+ <method name="GetType" cname="pango_cairo_font_map_get_type"
shared="true">
+ <return-type type="GType" />
+ </method>
+ <constructor cname="pango_cairo_font_map_new" />
+ <method name="SetResolution" cname="pango_cairo_font_map_set_resolution">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="double" name="dpi" />
+ </parameters>
+ </method>
+ </object>
<object name="Context" cname="PangoContext" parent="GObject">
<method name="GetBaseDir" cname="pango_context_get_base_dir">
<return-type type="PangoDirection" />
@@ -1894,6 +1915,98 @@
</parameters>
</method>
</class>
+ <class name="Cairo" cname="PangoCairo_">
+ <method name="ContextGetFontOptions"
cname="pango_cairo_context_get_font_options" shared="true">
+ <return-type type="const-cairo_font_options_t*" />
+ <parameters>
+ <parameter type="PangoContext*" name="context" />
+ </parameters>
+ </method>
+ <method name="ContextGetResolution"
cname="pango_cairo_context_get_resolution" shared="true">
+ <return-type type="double" />
+ <parameters>
+ <parameter type="PangoContext*" name="context" />
+ </parameters>
+ </method>
+ <method name="ContextSetFontOptions"
cname="pango_cairo_context_set_font_options" shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="PangoContext*" name="context" />
+ <parameter type="const-cairo_font_options_t*" name="options" />
+ </parameters>
+ </method>
+ <method name="ContextSetResolution"
cname="pango_cairo_context_set_resolution" shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="PangoContext*" name="context" />
+ <parameter type="double" name="dpi" />
+ </parameters>
+ </method>
+ <method name="CreateLayout" cname="pango_cairo_create_layout"
shared="true">
+ <return-type type="PangoLayout*" />
+ <parameters>
+ <parameter type="cairo_t*" name="cr" />
+ </parameters>
+ </method>
+ <method name="GlyphStringPath" cname="pango_cairo_glyph_string_path"
shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="cairo_t*" name="cr" />
+ <parameter type="PangoFont*" name="font" />
+ <parameter type="PangoGlyphString*" name="glyphs" />
+ </parameters>
+ </method>
+ <method name="LayoutLinePath" cname="pango_cairo_layout_line_path"
shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="cairo_t*" name="cr" />
+ <parameter type="PangoLayoutLine*" name="line" />
+ </parameters>
+ </method>
+ <method name="LayoutPath" cname="pango_cairo_layout_path" shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="cairo_t*" name="cr" />
+ <parameter type="PangoLayout*" name="layout" />
+ </parameters>
+ </method>
+ <method name="ShowGlyphString" cname="pango_cairo_show_glyph_string"
shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="cairo_t*" name="cr" />
+ <parameter type="PangoFont*" name="font" />
+ <parameter type="PangoGlyphString*" name="glyphs" />
+ </parameters>
+ </method>
+ <method name="ShowLayout" cname="pango_cairo_show_layout" shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="cairo_t*" name="cr" />
+ <parameter type="PangoLayout*" name="layout" />
+ </parameters>
+ </method>
+ <method name="ShowLayoutLine" cname="pango_cairo_show_layout_line"
shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="cairo_t*" name="cr" />
+ <parameter type="PangoLayoutLine*" name="line" />
+ </parameters>
+ </method>
+ <method name="UpdateContext" cname="pango_cairo_update_context"
shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="cairo_t*" name="cr" />
+ <parameter type="PangoContext*" name="context" />
+ </parameters>
+ </method>
+ <method name="UpdateLayout" cname="pango_cairo_update_layout"
shared="true">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="cairo_t*" name="cr" />
+ <parameter type="PangoLayout*" name="layout" />
+ </parameters>
+ </method>
+ </class>
<class name="Global" cname="PangoGlobal">
<method name="FindBaseDir" cname="pango_find_base_dir" shared="true">
<return-type type="PangoDirection" />
Modified: trunk/gtk-sharp/sources/gtk-sharp-2.10-sources.xml
===================================================================
--- trunk/gtk-sharp/sources/gtk-sharp-2.10-sources.xml 2006-08-10 16:55:37 UTC
(rev 63607)
+++ trunk/gtk-sharp/sources/gtk-sharp-2.10-sources.xml 2006-08-10 16:55:58 UTC
(rev 63608)
@@ -10,7 +10,6 @@
<library name="libpango-1.0-0.dll">
<namespace name="Pango">
<directory path="pango-1.12.3/pango">
- <exclude>pangocairo.h</exclude>
<exclude>pangocairo-atsui.h</exclude>
<exclude>pangocairo-atsuifont.h</exclude>
<exclude>pangocairo-fc.h</exclude>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
