* gdk/gdk-symbols.xml: alias GdkBitmap to GdkPixmap [Fixes

* #68824]

        * gdk/Gdk.metadata: Remove the earlier GdkBitmap hack now that
        it's aliased. Also move Gdk.Bitmap.CreateFromData to
        Gdk.Pixmap.CreateBitmapFromData

        * gdk/Pixbuf.custom (RenderPixmapAndMask,
        RenderPixmapAndMaskForColormap, RenderThresholdAlpha):
        s/Bitmap/Pixmap/

        * sample/GtkDemo/DemoTextView.cs: uncomment the fg/bg stipple
        code, since that works now

        * parser/gapi-fixup.cs: Add an "add-node" rule. This turned out
        * to
        not actually be needed for this fix, but we know we'll need it
        later, so here it is.

svn path=/trunk/gtk-sharp/; revision=37055
This commit is contained in:
Dan Winship 2004-12-03 20:42:12 +00:00
parent 3d6cb09562
commit e0a0bd13fa
18 changed files with 147 additions and 183 deletions

View File

@ -1,3 +1,22 @@
2004-12-03 Dan Winship <danw@novell.com>
* gdk/gdk-symbols.xml: alias GdkBitmap to GdkPixmap [Fixes #68824]
* gdk/Gdk.metadata: Remove the earlier GdkBitmap hack now that
it's aliased. Also move Gdk.Bitmap.CreateFromData to
Gdk.Pixmap.CreateBitmapFromData
* gdk/Pixbuf.custom (RenderPixmapAndMask,
RenderPixmapAndMaskForColormap, RenderThresholdAlpha):
s/Bitmap/Pixmap/
* sample/GtkDemo/DemoTextView.cs: uncomment the fg/bg stipple
code, since that works now
* parser/gapi-fixup.cs: Add an "add-node" rule. This turned out to
not actually be needed for this fix, but we know we'll need it
later, so here it is.
2004-12-03 Jorge Garcia <jgarcia@ac.upc.es>
* glib/Type.cs: add Int64 and UInt64 support.

View File

@ -3,6 +3,18 @@
* en/Gtk/TextBuffer.xml:
* en/Gtk/TextView.xml: update for TextIter pass-by-ref changes
* en/Gdk/Bitmap.xml: gone
* en/Gdk/GC.xml:
* en/Gdk/PangoAttrStipple.xml:
* en/Gdk/Pixbuf.xml:
* en/Gdk/Pixmap.xml:
* en/Gdk/Window.xml:
* en/Gtk/Drag.xml:
* en/Gtk/Image.xml:
* en/Gtk/TextAppearance.xml:
* en/Gtk/Widget.xml: update for Gdk.Bitmap -> Gdk.Pixmap aliasing
2004-12-02 Shane Landrum <epicene@pobox.com>
* en/Gtk/EntryCompletionMatchFunc.xml

View File

@ -1,105 +0,0 @@
<Type Name="Bitmap" FullName="Gdk.Bitmap">
<TypeSignature Language="C#" Value="public class Bitmap : Gdk.Drawable, IWrapper, IDisposable" Maintainer="auto" />
<AssemblyInfo>
<AssemblyName>gdk-sharp</AssemblyName>
<AssemblyPublicKey>
</AssemblyPublicKey>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
<AssemblyCulture>neutral</AssemblyCulture>
<Attributes />
</AssemblyInfo>
<ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
<Docs>
<summary>This represents an X server bitmap.</summary>
<remarks>To be added</remarks>
</Docs>
<Base>
<BaseTypeName>Gdk.Drawable</BaseTypeName>
</Base>
<Interfaces>
<Interface>
<InterfaceName>GLib.IWrapper</InterfaceName>
</Interface>
<Interface>
<InterfaceName>System.IDisposable</InterfaceName>
</Interface>
</Interfaces>
<Attributes />
<Members>
<Member MemberName="Finalize">
<MemberSignature Language="C#" Value="protected override void Finalize ();" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>Disposes the resources associated with the object.</summary>
<remarks />
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public Bitmap (IntPtr raw);" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters>
<Parameter Name="raw" Type="System.IntPtr" />
</Parameters>
<Docs>
<summary>Internal constructor</summary>
<param name="raw">Pointer to the C object.</param>
<returns>An instance of Bitmap, wrapping the C object.</returns>
<remarks>
<para>This is an internal constructor, and should not be used by user code.</para>
</remarks>
</Docs>
</Member>
<Member MemberName="CreateFromData">
<MemberSignature Language="C#" Value="public static Gdk.Bitmap CreateFromData (Gdk.Drawable drawable, string data, int width, int height);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gdk.Bitmap</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="drawable" Type="Gdk.Drawable" />
<Parameter Name="data" Type="System.String" />
<Parameter Name="width" Type="System.Int32" />
<Parameter Name="height" Type="System.Int32" />
</Parameters>
<Docs>
<summary>Creates a new bitmap from data in XBM format.</summary>
<param name="drawable">A <see cref="T:Gdk.Drawable" />, used to determine default values for the new pixmap. Can be null, in which case the root window is used.</param>
<param name="data">A string representing the XBM data.</param>
<param name="width">The width of the new pixmap in pixels.</param>
<param name="height">The height of the new pixmap in pixels.</param>
<returns>The <see cref="T:Gdk.Bitmap" />.</returns>
<remarks>None.</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="protected Bitmap (GLib.GType gtype);" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters>
<Parameter Name="gtype" Type="GLib.GType" />
</Parameters>
<Docs>
<summary>Internal constructor</summary>
<param name="gtype">a <see cref="T:GLib.GType" /></param>
<returns>a <see cref="T:Gdk.Bitmap" /></returns>
<remarks>This is a constructor used by derivative types of <see cref="T:Gdk.Bitmap" /> that would have their own GLib.GType assigned to it. This is not typically used by C# code.</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="protected Bitmap ();" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters />
<Docs>
<summary>Default constructor.</summary>
<returns>A new <see cref="T:Gdk.Bitmap" /></returns>
<remarks>None.</remarks>
</Docs>
</Member>
</Members>
</Type>

View File

@ -319,10 +319,10 @@
</Docs>
</Member>
<Member MemberName="ClipMask">
<MemberSignature Language="C#" Value="public Gdk.Bitmap ClipMask { set; };" />
<MemberSignature Language="C#" Value="public Gdk.Pixmap ClipMask { set; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>Gdk.Bitmap</ReturnType>
<ReturnType>Gdk.Pixmap</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>

View File

@ -32,17 +32,17 @@
</Docs>
</Member>
<Member MemberName="New">
<MemberSignature Language="C#" Value="public static Gdk.PangoAttrStipple New (Gdk.Bitmap stipple);" />
<MemberSignature Language="C#" Value="public static Gdk.PangoAttrStipple New (Gdk.Pixmap stipple);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gdk.PangoAttrStipple</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="stipple" Type="Gdk.Bitmap" />
<Parameter Name="stipple" Type="Gdk.Pixmap" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="stipple">To be added: an object of type 'Gdk.Bitmap'</param>
<param name="stipple">To be added: an object of type 'Gdk.Pixmap'</param>
<returns>To be added: an object of type 'Gdk.PangoAttrStipple'</returns>
<remarks>To be added</remarks>
</Docs>
@ -64,17 +64,17 @@
</Docs>
</Member>
<Member MemberName="stipple">
<MemberSignature Language="C#" Value="public Gdk.Bitmap stipple { set; get; };" />
<MemberSignature Language="C#" Value="public Gdk.Pixmap stipple { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>Gdk.Bitmap</ReturnType>
<ReturnType>Gdk.Pixmap</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="value">To be added: an object of type 'Gdk.Bitmap'</param>
<returns>To be added: an object of type 'Gdk.Bitmap'</returns>
<param name="value">To be added: an object of type 'Gdk.Pixmap'</param>
<returns>To be added: an object of type 'Gdk.Pixmap'</returns>
<remarks>To be added</remarks>
</Docs>
</Member>

View File

@ -564,13 +564,13 @@
</Docs>
</Member>
<Member MemberName="RenderThresholdAlpha">
<MemberSignature Language="C#" Value="public void RenderThresholdAlpha (Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);" />
<MemberSignature Language="C#" Value="public void RenderThresholdAlpha (Gdk.Pixmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="bitmap" Type="Gdk.Bitmap" />
<Parameter Name="bitmap" Type="Gdk.Pixmap" />
<Parameter Name="src_x" Type="System.Int32" />
<Parameter Name="src_y" Type="System.Int32" />
<Parameter Name="dest_x" Type="System.Int32" />
@ -580,12 +580,11 @@
<Parameter Name="alpha_threshold" Type="System.Int32" />
</Parameters>
<Docs>
<summary>Render pixbuf alpha channel as a bi-level clip mask to a <see cref="T:Gdk.Bitmap" /></summary>
<param name="bitmap">The destination object of type 'Gdk.Bitmap'</param>
<summary>Render pixbuf alpha channel as a bi-level clip mask to a <see cref="T:Gdk.Pixmap" /></summary>
<param name="bitmap">The destination, a 1-bit-depth <see cref="T:Gdk.Pixmap" />.</param>
<param name="src_x">Source X coordinate.</param>
<param name="src_y">Source Y coordinate.</param>
<param name="dest_x">Destination X coordinate.
</param>
<param name="dest_x">Destination X coordinate.</param>
<param name="dest_y">Destination Y coordinate.</param>
<param name="width">The width of the region to modify, or -1 to use <see cref="P:Gdk.Pixbuf.Width" />.</param>
<param name="height">The height of the region to reder or -1 to use <see cref="P:Gdk.Pixbuf.Height" /></param>
@ -1483,14 +1482,14 @@ Gdk.Pixbuf pb = new Gdk.Pixbuf(memorystream);
</Docs>
</Member>
<Member MemberName="RenderPixmapAndMask">
<MemberSignature Language="C#" Value="public void RenderPixmapAndMask (Gdk.Pixmap pixmap_return, Gdk.Bitmap mask_return, int alpha_threshold);" />
<MemberSignature Language="C#" Value="public void RenderPixmapAndMask (Gdk.Pixmap pixmap_return, 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.Bitmap" />
<Parameter Name="mask_return" Type="Gdk.Pixmap" />
<Parameter Name="alpha_threshold" Type="System.Int32" />
</Parameters>
<Docs>
@ -1505,20 +1504,20 @@ Gdk.Pixbuf pb = new Gdk.Pixbuf(memorystream);
<see cref="M:Gdk.Pixbuf.RenderThresholdAlpha" />.
</summary>
<param name="pixmap_return">a <see cref="T:Gdk.Pixmap" /></param>
<param name="mask_return">a <see cref="T:Gdk.Bitmap" /></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>
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
If the pixbuf does not have an alpha channel, then <paramref name="mask_return" /> will be set
to <see langword="null" />.
</remarks>
</Docs>
</Member>
<Member MemberName="RenderPixmapAndMaskForColormap">
<MemberSignature Language="C#" Value="public void RenderPixmapAndMaskForColormap (Gdk.Colormap colormap, Gdk.Pixmap pixmap_return, Gdk.Bitmap mask_return, int alpha_threshold);" />
<MemberSignature Language="C#" Value="public void RenderPixmapAndMaskForColormap (Gdk.Colormap colormap, Gdk.Pixmap pixmap_return, Gdk.Pixmap mask_return, int alpha_threshold);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -1526,7 +1525,7 @@ Gdk.Pixbuf pb = new Gdk.Pixbuf(memorystream);
<Parameters>
<Parameter Name="colormap" Type="Gdk.Colormap" />
<Parameter Name="pixmap_return" Type="Gdk.Pixmap" />
<Parameter Name="mask_return" Type="Gdk.Bitmap" />
<Parameter Name="mask_return" Type="Gdk.Pixmap" />
<Parameter Name="alpha_threshold" Type="System.Int32" />
</Parameters>
<Docs>
@ -1543,13 +1542,13 @@ Gdk.Pixbuf pb = new Gdk.Pixbuf(memorystream);
</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.Bitmap" /></param>
<param name="mask_return">a <see cref="T:Gdk.Pixmap" /></param>
<param name="alpha_threshold">a <see cref="T:System.Int32" /></param>
<remarks>
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.
If the pixbuf does not have an alpha channel, then *<paramref name="mask_return" /> will be set
If the pixbuf does not have an alpha channel, then <paramref name="mask_return" /> will be set
to <see langword="null" />.
</remarks>
</Docs>

View File

@ -396,5 +396,27 @@ For example in the X backend, a native pixmap handle is an Xlib XID.
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="CreateBitmapFromData">
<MemberSignature Language="C#" Value="public static Gdk.Pixmap CreateBitmapFromData (Gdk.Drawable drawable, string data, int width, int height);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gdk.Pixmap</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="drawable" Type="Gdk.Drawable" />
<Parameter Name="data" Type="System.String" />
<Parameter Name="width" Type="System.Int32" />
<Parameter Name="height" Type="System.Int32" />
</Parameters>
<Docs>
<summary>Creates a new bitmap from data in XBM format.</summary>
<param name="drawable">A <see cref="T:Gdk.Drawable" />, used to determine default values for the new pixmap.</param>
<param name="data">A string representing the XBM data.</param>
<param name="width">The width of the new pixmap in pixels.</param>
<param name="height">The height of the new pixmap in pixels.</param>
<returns>The bitmap.</returns>
<remarks>None.</remarks>
</Docs>
</Member>
</Members>
</Type>

View File

@ -785,7 +785,7 @@ in a child).
</Docs>
</Member>
<Member MemberName="SetIcon">
<MemberSignature Language="C#" Value="public void SetIcon (Gdk.Window icon_window, Gdk.Pixmap pixmap, Gdk.Bitmap mask);" />
<MemberSignature Language="C#" Value="public void SetIcon (Gdk.Window icon_window, Gdk.Pixmap pixmap, Gdk.Pixmap mask);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -793,7 +793,7 @@ in a child).
<Parameters>
<Parameter Name="icon_window" Type="Gdk.Window" />
<Parameter Name="pixmap" Type="Gdk.Pixmap" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
</Parameters>
<Docs>
<summary>
@ -801,7 +801,7 @@ in a child).
</summary>
<param name="icon_window">A <see cref="T:Gdk.Window" /></param>
<param name="pixmap">A <see cref="T:Gdk.Pixmap" /></param>
<param name="mask">A <see cref="T:Gdk.Bitmap" /></param>
<param name="mask">mask bitmap</param>
<remarks>
If using GTK+, investigate
<see cref="M:Gtk.Window.SetDefaultIconList" /> first, and then <see cref="M:Gtk.Window.SetIconList" />
@ -1093,13 +1093,13 @@ in a child).
</Docs>
</Member>
<Member MemberName="ShapeCombineMask">
<MemberSignature Language="C#" Value="public void ShapeCombineMask (Gdk.Bitmap mask, int x, int y);" />
<MemberSignature Language="C#" Value="public void ShapeCombineMask (Gdk.Pixmap mask, int x, int y);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
<Parameter Name="x" Type="System.Int32" />
<Parameter Name="y" Type="System.Int32" />
</Parameters>
@ -1115,7 +1115,7 @@ in a child).
<paramref name="x" />/<paramref name="y" /> parameters are not
used.</p>
</summary>
<param name="mask">A <see cref="T:Gdk.Bitmap" />, a shape mask</param>
<param name="mask">A <see cref="T:Gdk.Pixmap" />, a shape mask</param>
<param name="x">A <see cref="T:System.Int32" />, X position of shape mask with respect to this window</param>
<param name="y">A <see cref="T:System.Int32" />, Y position of shape mask with respect to this window</param>
<remarks>

View File

@ -317,7 +317,7 @@
</Docs>
</Member>
<Member MemberName="SetIconPixmap">
<MemberSignature Language="C#" Value="public static void SetIconPixmap (Gdk.DragContext context, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask, int hot_x, int hot_y);" />
<MemberSignature Language="C#" Value="public static void SetIconPixmap (Gdk.DragContext context, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Pixmap mask, int hot_x, int hot_y);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -326,7 +326,7 @@
<Parameter Name="context" Type="Gdk.DragContext" />
<Parameter Name="colormap" Type="Gdk.Colormap" />
<Parameter Name="pixmap" Type="Gdk.Pixmap" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
<Parameter Name="hot_x" Type="System.Int32" />
<Parameter Name="hot_y" Type="System.Int32" />
</Parameters>
@ -398,7 +398,7 @@
</Docs>
</Member>
<Member MemberName="SourceSetIcon">
<MemberSignature Language="C#" Value="public static void SourceSetIcon (Gtk.Widget widget, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask);" />
<MemberSignature Language="C#" Value="public static void SourceSetIcon (Gtk.Widget widget, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Pixmap mask);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -407,7 +407,7 @@
<Parameter Name="widget" Type="Gtk.Widget" />
<Parameter Name="colormap" Type="Gdk.Colormap" />
<Parameter Name="pixmap" Type="Gdk.Pixmap" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
</Parameters>
<Docs>
<summary>Sets the icon that will be used for drags from a particular <paramref name="widget" /> from a pixmap/mask.</summary>
@ -550,7 +550,7 @@
</Docs>
</Member>
<Member MemberName="SetDefaultIcon">
<MemberSignature Language="C#" Value="public static void SetDefaultIcon (Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask, int hot_x, int hot_y);" />
<MemberSignature Language="C#" Value="public static void SetDefaultIcon (Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Pixmap mask, int hot_x, int hot_y);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -558,7 +558,7 @@
<Parameters>
<Parameter Name="colormap" Type="Gdk.Colormap" />
<Parameter Name="pixmap" Type="Gdk.Pixmap" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
<Parameter Name="hot_x" Type="System.Int32" />
<Parameter Name="hot_y" Type="System.Int32" />
</Parameters>
@ -566,7 +566,7 @@
<summary>To be added</summary>
<param name="colormap">a <see cref="T:Gdk.Colormap" /></param>
<param name="pixmap">a <see cref="T:Gdk.Pixmap" /></param>
<param name="mask">a <see cref="T:Gdk.Bitmap" /></param>
<param name="mask">a <see cref="T:Gdk.Pixmap" /></param>
<param name="hot_x">a <see cref="T:System.Int32" /></param>
<param name="hot_y">a <see cref="T:System.Int32" /></param>
<remarks>To be added</remarks>

View File

@ -62,19 +62,19 @@
</Docs>
</Member>
<Member MemberName="SetFromImage">
<MemberSignature Language="C#" Value="public void SetFromImage (Gdk.Image gdk_image, Gdk.Bitmap mask);" />
<MemberSignature Language="C#" Value="public void SetFromImage (Gdk.Image gdk_image, Gdk.Pixmap mask);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="gdk_image" Type="Gdk.Image" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
</Parameters>
<Docs>
<summary>Creates a <see cref="T:Gtk.Image" /> widget displaying an image with a mask.</summary>
<param name="gdk_image">an object of type <see cref="T:Gdk.Image" /></param>
<param name="mask">an object of type <see cref="T:Gdk.Bitmap" /></param>
<param name="mask">an object of type <see cref="T:Gdk.Pixmap" /></param>
<remarks>
Creates a <see cref="T:Gtk.Image" /> widget displaying an image with a mask.
A <see cref="T:Gdk.Image" /> is a client-side image buffer in the pixel format of the current display.
@ -105,19 +105,19 @@
</Docs>
</Member>
<Member MemberName="SetFromPixmap">
<MemberSignature Language="C#" Value="public void SetFromPixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);" />
<MemberSignature Language="C#" Value="public void SetFromPixmap (Gdk.Pixmap pixmap, Gdk.Pixmap mask);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="pixmap" Type="Gdk.Pixmap" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
</Parameters>
<Docs>
<summary>Creates a <see cref="T:Gtk.Image" /> widget displaying an image with a mask.</summary>
<param name="pixmap">an object of type <see cref="T:Gdk.Pixmap" /></param>
<param name="mask">an object of type <see cref="T:Gdk.Bitmap" /></param>
<param name="mask">an object of type <see cref="T:Gdk.Pixmap" /></param>
<remarks>
Creates a <see cref="T:Gtk.Image" /> widget displaying an image with a mask.
A <see cref="T:Gdk.Image" /> is a client-side image buffer in the pixel format of the current display.
@ -219,22 +219,22 @@
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public Image (Gdk.Image image, Gdk.Bitmap mask);" />
<MemberSignature Language="C#" Value="public Image (Gdk.Image image, Gdk.Pixmap mask);" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters>
<Parameter Name="image" Type="Gdk.Image" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
</Parameters>
<Docs>
<summary>This constructor is used to create an instance of
<see cref="T:Gtk.Image" /> containing the <see cref="T:Gdk.Image" />
and the <see cref="T:Gdk.Bitmap" /> passed to it.</summary>
passed to it, masked by the given <see cref="T:Gdk.Pixmap" />.</summary>
<param name="image">
<see cref="T:Gdk.Image" /> to be displayed
by the Image.</param>
<param name="mask">
<see cref="T:Gdk.Bitmap" /> mask to be used.</param>
<see cref="T:Gdk.Pixmap" /> mask to be used.</param>
<returns>An instance of type <see cref="T:Gtk.Image" />.</returns>
<remarks />
</Docs>
@ -258,21 +258,22 @@
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public Image (Gdk.Pixmap pixmap, Gdk.Bitmap mask);" />
<MemberSignature Language="C#" Value="public Image (Gdk.Pixmap pixmap, Gdk.Pixmap mask);" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters>
<Parameter Name="pixmap" Type="Gdk.Pixmap" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
</Parameters>
<Docs>
<summary>This constructor is used to create an instance of
<see cref="T:Gtk.Image" /> containing the <see cref="T:Gdk.Pixmap" /> and the <see cref="Gtk.Bitmap" /> mask passed to it.</summary>
<see cref="T:Gtk.Image" /> containing the <see cref="T:Gdk.Pixmap" /> passed to it,
masked by the given <see cref="Gdk.Pixmap" />.</summary>
<param name="pixmap">
<see cref="T:Gdk.Pixmap" /> displayed by
the Image.</param>
<param name="mask">
<see cref="T:Gdk.Bitmap" /> mask used by
<see cref="T:Gdk.Pixmap" /> mask used by
the Image.</param>
<returns>An instance of type <see cref="T:Gtk.Image" />.</returns>
<remarks />
@ -566,36 +567,36 @@
</Docs>
</Member>
<Member MemberName="Set">
<MemberSignature Language="C#" Value="public void Set (Gdk.Image val, Gdk.Bitmap mask);" />
<MemberSignature Language="C#" Value="public void Set (Gdk.Image val, Gdk.Pixmap mask);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="val" Type="Gdk.Image" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="val">a <see cref="T:Gdk.Image" /></param>
<param name="mask">a <see cref="T:Gdk.Bitmap" /></param>
<param name="mask">a <see cref="T:Gdk.Pixmap" /></param>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="Get">
<MemberSignature Language="C#" Value="public void Get (Gdk.Image val, Gdk.Bitmap mask);" />
<MemberSignature Language="C#" Value="public void Get (Gdk.Image val, Gdk.Pixmap mask);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="val" Type="Gdk.Image" />
<Parameter Name="mask" Type="Gdk.Bitmap" />
<Parameter Name="mask" Type="Gdk.Pixmap" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="val">a <see cref="T:Gdk.Image" /></param>
<param name="mask">a <see cref="T:Gdk.Bitmap" /></param>
<param name="mask">a <see cref="T:Gdk.Pixmap" /></param>
<remarks>To be added</remarks>
</Docs>
</Member>

View File

@ -48,32 +48,32 @@
</Docs>
</Member>
<Member MemberName="fg_stipple">
<MemberSignature Language="C#" Value="public Gdk.Bitmap fg_stipple { set; get; };" />
<MemberSignature Language="C#" Value="public Gdk.Pixmap fg_stipple { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>Gdk.Bitmap</ReturnType>
<ReturnType>Gdk.Pixmap</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>A stipple (dotted) pattern for the foreground color.</summary>
<param name="value">a <see cref="T:Gdk.Bitmap" /></param>
<returns>a <see cref="T:Gdk.Bitmap" /></returns>
<param name="value">a 1-bit-deep <see cref="T:Gdk.Pixmap" /></param>
<returns>a <see cref="T:Gdk.Pixmap" /></returns>
<remarks />
</Docs>
</Member>
<Member MemberName="bg_stipple">
<MemberSignature Language="C#" Value="public Gdk.Bitmap bg_stipple { set; get; };" />
<MemberSignature Language="C#" Value="public Gdk.Pixmap bg_stipple { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>Gdk.Bitmap</ReturnType>
<ReturnType>Gdk.Pixmap</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>A stipple (dotted) pattern for the background color.</summary>
<param name="value">a <see cref="T:Gdk.Bitmap" /></param>
<returns>a <see cref="T:Gdk.Bitmap" /></returns>
<param name="value">a 1-bit-deep <see cref="T:Gdk.Pixmap" /></param>
<returns>a <see cref="T:Gdk.Pixmap" /></returns>
<remarks />
</Docs>
</Member>

View File

@ -966,13 +966,13 @@
</Docs>
</Member>
<Member MemberName="ShapeCombineMask">
<MemberSignature Language="C#" Value="public void ShapeCombineMask (Gdk.Bitmap shape_mask, int offset_x, int offset_y);" />
<MemberSignature Language="C#" Value="public void ShapeCombineMask (Gdk.Pixmap shape_mask, int offset_x, int offset_y);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="shape_mask" Type="Gdk.Bitmap" />
<Parameter Name="shape_mask" Type="Gdk.Pixmap" />
<Parameter Name="offset_x" Type="System.Int32" />
<Parameter Name="offset_y" Type="System.Int32" />
</Parameters>

View File

@ -1,6 +1,5 @@
<?xml version="1.0"?>
<metadata>
<attr path="//*[@type='GdkBitmap**']" name="type">GdkPixmap**</attr>
<attr path="/api/namespace/boxed[@cname='GdkColor']/method[@name='Copy']" name="hidden">1</attr>
<attr path="/api/namespace/boxed[@cname='GdkColor']/method[@name='Free']" name="hidden">1</attr>
<attr path="/api/namespace/boxed[@cname='GdkColor']/method[@name='Hash']" name="hidden">1</attr>
@ -35,7 +34,9 @@
<attr path="/api/namespace/class[@cname='GdkText_']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GdkWindowClass']/member[@name='Output']" name="name">InputOutput</attr>
<attr path="/api/namespace/enum[@cname='GdkWindowClass']/member[@name='Only']" name="name">InputOnly</attr>
<attr path="/api/namespace/object[@cname='GdkBitmap']" name="parent">GdkDrawable</attr>
<attr path="/api/namespace/object[@cname='GdkBitmap']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkBitmap']/method[@name='CreateFromData']" name="name">CreateBitmapFromData</attr>
<move-node path="/api/namespace/object[@cname='GdkBitmap']/method[@name='CreateBitmapFromData']">/api/namespace/object[@cname='GdkPixmap']</move-node>
<attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='AllocColor']/*/*[@type='GdkColor*']" name="pass_as">ref</attr>
<attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='AllocColors']/*/*[@type='GdkColor*']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='AllocColors']/*/*[@name='success']" name="array">1</attr>

View File

@ -60,21 +60,21 @@
[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);
public void RenderPixmapAndMask(Gdk.Pixmap pixmap_return, Gdk.Bitmap 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);
}
[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);
public void RenderPixmapAndMaskForColormap(Gdk.Colormap colormap, Gdk.Pixmap pixmap_return, Gdk.Bitmap 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);
}
[DllImport("libgdk-win32-2.0-0.dll")]
static extern void gdk_pixbuf_render_threshold_alpha(IntPtr raw, IntPtr bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);
public void RenderThresholdAlpha(Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold) {
public void RenderThresholdAlpha(Gdk.Pixmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold) {
gdk_pixbuf_render_threshold_alpha(Handle, bitmap.Handle, src_x, src_y, dest_x, dest_y, width, height, alpha_threshold);
}

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<api>
<symbol type="alias" cname="GdkBitmap" name="GdkPixmap" />
<symbol type="manual" cname="GdkEvent" name="Gdk.Event"/>
<symbol type="manual" cname="GdkEventAny" name="Gdk.Event"/>
<symbol type="manual" cname="GdkEventButton" name="Gdk.EventButton"/>

View File

@ -77,6 +77,17 @@ namespace GtkSharp.Parsing {
XPathNavigator meta_nav = meta_doc.CreateNavigator ();
XPathNavigator api_nav = api_doc.CreateNavigator ();
XPathNodeIterator add_iter = meta_nav.Select ("/metadata/add-node");
while (add_iter.MoveNext ()) {
string path = add_iter.Current.GetAttribute ("path", "");
XPathNodeIterator api_iter = api_nav.Select (path);
while (api_iter.MoveNext ()) {
XmlElement api_node = ((IHasXmlNode)api_iter.Current).GetNode () as XmlElement;
foreach (XmlNode child in ((IHasXmlNode)add_iter.Current).GetNode().ChildNodes)
api_node.AppendChild (api_doc.ImportNode (child, true));
}
}
XPathNodeIterator attr_iter = meta_nav.Select ("/metadata/attr");
while (attr_iter.MoveNext ()) {
string path = attr_iter.Current.GetAttribute ("path", "");

View File

@ -172,9 +172,9 @@ namespace GtkDemo
store.AppendValues ("Stock Item and Icon Browser (10% complete)", "DemoStockBrowser.cs", false);
parent = store.AppendValues ("Text Widget");
store.AppendValues (parent, "HyperText (50%)", "DemoHyperText.cs", false);
store.AppendValues (parent, "Multiple Views (95%)", "DemoTextView.cs", false);
store.AppendValues (parent, "Multiple Views", "DemoTextView.cs", false);
parent = store.AppendValues ("Tree View");
store.AppendValues (parent, "Editable Cells", "DemoEditableCells", false);
store.AppendValues (parent, "Editable Cells", "DemoEditableCells.cs", false);
store.AppendValues (parent, "List Store", "DemoListStore.cs", false);
store.AppendValues (parent, "Tree Store", "DemoTreeStore.cs", false);

View File

@ -167,16 +167,19 @@ namespace GtkDemo
int gray50_width = 2;
int gray50_height = 2;
string gray50_bits = new string ((char) 0x02, (char) 0x01);
// Pixmap stipple = Pixmap.CreateFromData (null, (string) gray50_bits, gray50_width, gray50_height, 16, Color.Zero, Color.Zero);
// The C gtk-demo passes NULL for the drawable param, which isn't
// multi-head safe, so it seems bad to allow it in the C# API.
// But the Window isn't realized at this point, so we can't get
// an actual Drawable from it. So we kludge for now.
Pixmap stipple = Pixmap.CreateBitmapFromData (Gdk.Screen.Default.RootWindow, (string) gray50_bits, gray50_width, gray50_height);
tag = new TextTag ("background_stipple");
// tag.BackgroundStipple = stipple;
// Cannot convert type 'Gdk.Bitmap' to 'Gdk.Pixmap'
tag.BackgroundStipple = stipple;
buffer.TagTable.Add (tag);
tag = new TextTag ("foreground_stipple");
// Cannot convert type 'Gdk.Bitmap' to 'Gdk.Pixmap'
// tag.ForegroundStipple = stipple;
tag.ForegroundStipple = stipple;
buffer.TagTable.Add (tag);
tag = new TextTag ("big_gap_before_line");