Merge in Gdk-custom.c introspection annotations

[~andy/gtk] / docs / reference / gdk / tmpl / pixmaps.sgml

diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml
index 5ea7f8aac8d8c9b511c4f510e4f41b656de6d1de..4cf90863f29a8e5456b1765e053fa792f9b067ca 100644 (file)
--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/docs/reference/gdk/tmpl/pixmaps.sgml
@@ -77,76 +77,15 @@ for the new pixmap. Can be %NULL, if the depth is given.
 
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm ##### -->
-<para>
-Create a pixmap from a XPM file.
-</para>
-
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap.
-@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.
-@Returns: the #GdkPixmap
 
 
 <!-- ##### FUNCTION gdk_pixmap_colormap_create_from_xpm ##### -->
-<para>
-Create a pixmap from a XPM file using a particular colormap.
-</para>
-
-@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.
-@Returns: the #GdkPixmap.
 
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm_d ##### -->
-<para>
-Create a pixmap from data in XPM format.
-</para>
-
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap.
-@mask: 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.
-@Returns: the #GdkPixmap
 
 
 <!-- ##### FUNCTION gdk_pixmap_colormap_create_from_xpm_d ##### -->
-<para>
-Create a pixmap from data in XPM format using a particular
-colormap.
-</para>
-
-@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.
-@Returns: the #GdkPixmap.
 
 
 <!-- ##### MACRO gdk_pixmap_ref ##### -->
@@ -164,7 +103,7 @@ Deprecated equivalent of g_object_unref().
 
 
 
-<!-- ##### STRUCT GdkBitmap ##### -->
+<!-- ##### TYPEDEF GdkBitmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable of depth
 1. Pointers to structures of type #GdkPixmap, #GdkBitmap, and
@@ -172,7 +111,6 @@ An opaque structure representing an offscreen drawable of depth
 refers generically to any of these types.
 </para>
 
-@user_data: 
 
 <!-- ##### MACRO gdk_bitmap_ref ##### -->
 <para>