summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-03-22 23:15:52 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-03-22 23:15:52 -0400
commit3ed737e5fc9c3339e08eefb98bdfc12eecf6665c (patch)
tree4d8f694baa19a15a62eadbd4c40008bc3fc09175
parentf5c67120027d1da300e09d43de70c42cc91eb558 (diff)
downloadgtk+-3ed737e5fc9c3339e08eefb98bdfc12eecf6665c.tar.gz
Another small doc cleanup
-rw-r--r--gdk/gdkpixmap.c34
1 files changed, 18 insertions, 16 deletions
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index 9a594a22c5..79ebd5c1fa 100644
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -747,26 +747,28 @@ gdk_pixmap_create_from_xpm (GdkDrawable *drawable,
/**
* 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.
+ * 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.
+ * 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.
+ * 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.
+ * 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.
+ *
+ * Returns: (transfer none): the #GdkPixmap.
*/
GdkPixmap*
-gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable *drawable,
- GdkColormap *colormap,
- GdkBitmap **mask,
- const GdkColor *transparent_color,
- gchar **data)
+gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable *drawable,
+ GdkColormap *colormap,
+ GdkBitmap **mask,
+ const GdkColor *transparent_color,
+ gchar **data)
{
GdkPixbuf *pixbuf;
GdkPixmap *pixmap;
@@ -792,13 +794,13 @@ gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable *drawable,
/**
* gdk_pixmap_create_from_xpm_d:
* @drawable: a #GdkDrawable, used to determine default values
- * for the new pixmap.
+ * 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.
+ * 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.
+ * 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.