Author: mkestner
Date: 2005-04-11 23:39:23 -0400 (Mon, 11 Apr 2005)
New Revision: 42817
Modified:
trunk/gtk-sharp/ChangeLog
trunk/gtk-sharp/doc/en/Gdk/Pixbuf.xml
trunk/gtk-sharp/doc/en/Gtk/TreePath.xml
trunk/gtk-sharp/gdk/Pixbuf.custom
Log:
2005-04-11 Mike Kestner <[EMAIL PROTECTED]>
* gdk/Pixbuf.custom : fix out params on RenderPixmapAndMask* methods.
Modified: trunk/gtk-sharp/ChangeLog
===================================================================
--- trunk/gtk-sharp/ChangeLog 2005-04-12 01:53:25 UTC (rev 42816)
+++ trunk/gtk-sharp/ChangeLog 2005-04-12 03:39:23 UTC (rev 42817)
@@ -1,3 +1,7 @@
+2005-04-11 Mike Kestner <[EMAIL PROTECTED]>
+
+ * gdk/Pixbuf.custom : fix out params on RenderPixmapAndMask* methods.
+
2005-04-11 Dan Winship <[EMAIL PROTECTED]>
* generator/ClassBase.cs (ParseImplements): record both managed
Modified: trunk/gtk-sharp/doc/en/Gdk/Pixbuf.xml
===================================================================
--- trunk/gtk-sharp/doc/en/Gdk/Pixbuf.xml 2005-04-12 01:53:25 UTC (rev
42816)
+++ trunk/gtk-sharp/doc/en/Gdk/Pixbuf.xml 2005-04-12 03:39:23 UTC (rev
42817)
@@ -1460,75 +1460,68 @@
</Docs>
</Member>
<Member MemberName="RenderPixmapAndMask">
- <MemberSignature Language="C#" Value="public void RenderPixmapAndMask
(Gdk.Pixmap pixmap_return, Gdk.Pixmap mask_return, int alpha_threshold);" />
+ <MemberSignature Language="C#" Value="public void RenderPixmapAndMask
(out Gdk.Pixmap pixmap_return, out Gdk.Pixmap mask_return, int
alpha_threshold);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
- <Parameter Name="pixmap_return" Type="Gdk.Pixmap" />
- <Parameter Name="mask_return" Type="Gdk.Pixmap" />
+ <Parameter Name="pixmap_return" Type="Gdk.Pixmap&" RefType="out" />
+ <Parameter Name="mask_return" Type="Gdk.Pixmap&" RefType="out" />
<Parameter Name="alpha_threshold" Type="System.Int32" />
</Parameters>
<Docs>
- <summary>
- Creates a pixmap and a mask bitmap which are returned in the
- <paramref name="pixmap_return" /> and <paramref name="mask_return" />
- arguments, respectively, and renders a pixbuf and its
- corresponding thresholded alpha mask to them. This is merely a
convenience
- function; applications that need to render pixbufs with dither
offsets or to
- given drawables should use <see
cref="M:Gdk.Pixbuf.RenderToDrawableAlpha" />
- or <see cref="M:Gdk.Pixbuf.RenderToDrawable" /> and
- <see cref="M:Gdk.Pixbuf.RenderThresholdAlpha" />.
- </summary>
+ <summary>Creates pixmap and mask bitmaps for a given alpha
threshold.</summary>
<param name="pixmap_return">a <see cref="T:Gdk.Pixmap" /></param>
<param name="mask_return">a <see cref="T:Gdk.Pixmap" /></param>
<param name="alpha_threshold">a <see cref="T:System.Int32" />,
threshold value for opacity.</param>
<remarks>
+ <para>
+ This is merely a convenience function; applications that need to
render pixbufs with dither offsets or to
+ given drawables should use <see
cref="M:Gdk.Pixbuf.RenderToDrawableAlpha" />
+ or <see cref="M:Gdk.Pixbuf.RenderToDrawable" /> and <see
cref="M:Gdk.Pixbuf.RenderThresholdAlpha" />.
+ </para>
+ <para>
The pixmap that is created is created for the colormap returned
by <see cref="M:Gdk.Rgb.GetColormap" />. You normally will want to
instead use
the actual colormap for a widget, and use
<see cref="M:Gdk.Pixbuf.RenderPixmapAndMaskForColormap" />,
If the pixbuf does not have an alpha channel, then <paramref
name="mask_return" /> will be set
to <see langword="null" />.
+ </para>
</remarks>
</Docs>
</Member>
<Member MemberName="RenderPixmapAndMaskForColormap">
- <MemberSignature Language="C#" Value="public void
RenderPixmapAndMaskForColormap (Gdk.Colormap colormap, Gdk.Pixmap
pixmap_return, Gdk.Pixmap mask_return, int alpha_threshold);" />
+ <MemberSignature Language="C#" Value="public void
RenderPixmapAndMaskForColormap (Gdk.Colormap colormap, out Gdk.Pixmap
pixmap_return, out Gdk.Pixmap mask_return, int alpha_threshold);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="colormap" Type="Gdk.Colormap" />
- <Parameter Name="pixmap_return" Type="Gdk.Pixmap" />
- <Parameter Name="mask_return" Type="Gdk.Pixmap" />
+ <Parameter Name="pixmap_return" Type="Gdk.Pixmap&" RefType="out" />
+ <Parameter Name="mask_return" Type="Gdk.Pixmap&" RefType="out" />
<Parameter Name="alpha_threshold" Type="System.Int32" />
</Parameters>
<Docs>
- <summary>
- Creates a pixmap and a mask bitmap which are returned in the
- <paramref name="pixmap_return" /> and <paramref name="mask_return"
/>
- arguments, respectively, and renders a pixbuf and its
- corresponding thresholded alpha mask to them.
- This is merely a convenience
- function; applications that need to render pixbufs with dither
offsets or to
- given drawables should use <see
cref="M:Gdk.Pixbuf.RenderToDrawableAlpha" />
- or <see cref="M:Gdk.Pixbuf.RenderToDrawable" /> and
- <see cref="M:Gdk.Pixbuf.RenderThresholdAlpha" />.
- </summary>
+ <summary>Creates pixmap and mask bitmaps for a given alpha threshold
using a specified colormap.</summary>
<param name="colormap">a <see cref="T:Gdk.Colormap" /></param>
<param name="pixmap_return">a <see cref="T:Gdk.Pixmap" /></param>
<param name="mask_return">a <see cref="T:Gdk.Pixmap" /></param>
- <param name="alpha_threshold">a <see cref="T:System.Int32" /></param>
+ <param name="alpha_threshold">a <see cref="T:System.Int32" />,
threshold value for opacity.</param>
<remarks>
+ <para>
+ This is merely a convenience function; applications that need to
render pixbufs with dither offsets or to
+ given drawables should use <see
cref="M:Gdk.Pixbuf.RenderToDrawableAlpha" /> or <see
cref="M:Gdk.Pixbuf.RenderToDrawable" /> and <see
cref="M:Gdk.Pixbuf.RenderThresholdAlpha" />.
+ </para>
+ <para>
The pixmap that is created uses the <see cref="T:Gdk.Colormap" />
specified by <paramref name="colormap" />.
- This colormap must match the colormap of the window where the pixmap
- will eventually be used or an error will result.
+ This colormap must match the colormap of the window where the
pixmap will eventually be used or an error will result.
If the pixbuf does not have an alpha channel, then <paramref
name="mask_return" /> will be set
to <see langword="null" />.
- </remarks>
+ </para>
+ </remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
Modified: trunk/gtk-sharp/doc/en/Gtk/TreePath.xml
===================================================================
--- trunk/gtk-sharp/doc/en/Gtk/TreePath.xml 2005-04-12 01:53:25 UTC (rev
42816)
+++ trunk/gtk-sharp/doc/en/Gtk/TreePath.xml 2005-04-12 03:39:23 UTC (rev
42817)
@@ -281,5 +281,19 @@
<remarks>Returns the native <see cref="T:GLib.GType" /> value for <see
cref="T:Gtk.TreePath" />.</remarks>
</Docs>
</Member>
+ <Member MemberName=".ctor">
+ <MemberSignature Language="C#" Value="public TreePath (int [] indices);"
/>
+ <MemberType>Constructor</MemberType>
+ <ReturnValue />
+ <Parameters>
+ <Parameter Name="indices" Type="System.Int32[]" />
+ </Parameters>
+ <Docs>
+ <summary>Creates a path for a set of indices.</summary>
+ <param name="indices">a <see cref="T:System.Int32" /></param>
+ <returns>a <see cref="T:Gtk.TreePath" /></returns>
+ <remarks />
+ </Docs>
+ </Member>
</Members>
-</Type>
\ No newline at end of file
+</Type>
Modified: trunk/gtk-sharp/gdk/Pixbuf.custom
===================================================================
--- trunk/gtk-sharp/gdk/Pixbuf.custom 2005-04-12 01:53:25 UTC (rev 42816)
+++ trunk/gtk-sharp/gdk/Pixbuf.custom 2005-04-12 03:39:23 UTC (rev 42817)
@@ -58,17 +58,25 @@
}
[DllImport("libgdk-win32-2.0-0.dll")]
- static extern void gdk_pixbuf_render_pixmap_and_mask(IntPtr
raw, IntPtr pixmap_return, IntPtr mask_return, int alpha_threshold);
+ static extern void gdk_pixbuf_render_pixmap_and_mask (IntPtr
raw, out IntPtr pixmap_return, out IntPtr mask_return, int alpha_threshold);
- public void RenderPixmapAndMask(Gdk.Pixmap pixmap_return,
Gdk.Pixmap mask_return, int alpha_threshold) {
- gdk_pixbuf_render_pixmap_and_mask(Handle,
pixmap_return.Handle, mask_return.Handle, alpha_threshold);
+ public void RenderPixmapAndMask (out Pixmap pixmap_return, out
Pixmap mask_return, int alpha_threshold)
+ {
+ IntPtr mask_handle, pixmap_handle;
+ gdk_pixbuf_render_pixmap_and_mask (Handle, out
pixmap_handle, out mask_handle, alpha_threshold);
+ pixmap_return = GLib.Object.GetObject (pixmap_handle)
as Pixmap;
+ mask_return = GLib.Object.GetObject (mask_handle) as
Pixmap;
}
[DllImport("libgdk-win32-2.0-0.dll")]
- static extern void
gdk_pixbuf_render_pixmap_and_mask_for_colormap(IntPtr raw, IntPtr colormap,
IntPtr pixmap_return, IntPtr mask_return, int alpha_threshold);
+ static extern void
gdk_pixbuf_render_pixmap_and_mask_for_colormap (IntPtr raw, IntPtr colormap,
out IntPtr pixmap_return, out IntPtr mask_return, int alpha_threshold);
- public void RenderPixmapAndMaskForColormap(Gdk.Colormap
colormap, Gdk.Pixmap pixmap_return, Gdk.Pixmap mask_return, int
alpha_threshold) {
- gdk_pixbuf_render_pixmap_and_mask_for_colormap(Handle,
colormap.Handle, pixmap_return.Handle, mask_return.Handle, alpha_threshold);
+ public void RenderPixmapAndMaskForColormap (Colormap colormap,
out Pixmap pixmap_return, out Pixmap mask_return, int alpha_threshold)
+ {
+ IntPtr mask_handle, pixmap_handle;
+ gdk_pixbuf_render_pixmap_and_mask_for_colormap (Handle,
colormap == null ? IntPtr.Zero : colormap.Handle, out pixmap_handle, out
mask_handle, alpha_threshold);
+ pixmap_return = GLib.Object.GetObject (pixmap_handle)
as Pixmap;
+ mask_return = GLib.Object.GetObject (mask_handle) as
Pixmap;
}
[DllImport("libgdk-win32-2.0-0.dll")]
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
