diff options
| author | Colin Walters <walters@verbum.org> | 2009-08-18 14:35:10 -0400 |
|---|---|---|
| committer | Johan Dahlin <johan@gnome.org> | 2009-12-16 17:22:01 -0200 |
| commit | 18dc96caf883cad9226cb6e783dd930a7fe62c2e (patch) | |
| tree | 2319c7b1f06738781af07d034672ba61d0a78cd3 /gdk/gdkpixmap.c | |
| parent | 78758d43ea1c2d3e87050eae078e679281d09106 (diff) | |
| download | gtk+-18dc96caf883cad9226cb6e783dd930a7fe62c2e.tar.gz | |
Merge in Gdk-custom.c introspection annotations
The Gdk-custom.c file in gir-repository contained a number of
introspection annotations. Merge those into the GDK source files.
Some documentation was moved from the tmpl/ files to accomodate
the addition of annotations.
https://bugzilla.gnome.org/show_bug.cgi?id=592279
Diffstat (limited to 'gdk/gdkpixmap.c')
| -rw-r--r-- | gdk/gdkpixmap.c | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index 919a20252f..9a594a22c5 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -672,6 +672,24 @@ gdk_pixmap_colormap_new_from_pixbuf (GdkColormap *colormap, return pixmap; } +/** + * gdk_pixmap_colormap_create_from_xpm: + * @drawable: a #GdkDrawable, used to determine default values + * for the new pixmap. Can be %NULL if @colormap is given. + * @colormap: the #GdkColormap that the new pixmap will be use. + * If omitted, the colormap for @window will be used. + * @mask: a pointer to a place to store a bitmap representing + * the transparency mask of the XPM file. Can be %NULL, + * in which case transparency will be ignored. + * @transparent_color: the color to be used for the pixels + * that are transparent in the input file. Can be %NULL, + * in which case a default color will be used. + * @filename: the filename of a file containing XPM data. + * + * Create a pixmap from a XPM file using a particular colormap. + * + * Returns: (transfer none): the #GdkPixmap. + */ GdkPixmap* gdk_pixmap_colormap_create_from_xpm (GdkDrawable *drawable, GdkColormap *colormap, @@ -700,6 +718,22 @@ gdk_pixmap_colormap_create_from_xpm (GdkDrawable *drawable, return pixmap; } +/** + * gdk_pixmap_create_from_xpm: + * @drawable: a #GdkDrawable, used to determine default values + * for the new pixmap. + * @mask: (out) a pointer to a place to store a bitmap representing + * the transparency mask of the XPM file. Can be %NULL, + * in which case transparency will be ignored. + * @transparent_color: the color to be used for the pixels + * that are transparent in the input file. Can be %NULL, + * in which case a default color will be used. + * @filename: the filename of a file containing XPM data. + * + * Create a pixmap from a XPM file. + * + * Returns: (transfer none): the #GdkPixmap + */ GdkPixmap* gdk_pixmap_create_from_xpm (GdkDrawable *drawable, GdkBitmap **mask, @@ -710,6 +744,23 @@ gdk_pixmap_create_from_xpm (GdkDrawable *drawable, transparent_color, filename); } +/** + * gdk_pixmap_colormap_create_from_xpm_d: + * @drawable: a #GdkDrawable, used to determine default values + * for the new pixmap. Can be %NULL if @colormap is given. + * @colormap: the #GdkColormap that the new pixmap will be use. + * If omitted, the colormap for @window will be used. + * @mask: a pointer to a place to store a bitmap representing + * the transparency mask of the XPM file. Can be %NULL, + * in which case transparency will be ignored. + * @transparent_color: the color to be used for the pixels + * that are transparent in the input file. Can be %NULL, + * in which case a default color will be used. + * @data: Pointer to a string containing the XPM data. + * + * Create a pixmap from data in XPM format using a particular + * colormap. + */ GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable *drawable, GdkColormap *colormap, @@ -738,6 +789,22 @@ gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable *drawable, return pixmap; } +/** + * gdk_pixmap_create_from_xpm_d: + * @drawable: a #GdkDrawable, used to determine default values + * for the new pixmap. + * @mask: (out): Pointer to a place to store a bitmap representing + * the transparency mask of the XPM file. Can be %NULL, + * in which case transparency will be ignored. + * @transparent_color: This color will be used for the pixels + * that are transparent in the input file. Can be %NULL + * in which case a default color will be used. + * @data: Pointer to a string containing the XPM data. + * + * Create a pixmap from data in XPM format. + * + * Returns: (transfer none): the #GdkPixmap. + */ GdkPixmap* gdk_pixmap_create_from_xpm_d (GdkDrawable *drawable, GdkBitmap **mask, |