Mention in the docs that @pixmap_return and @mask_return can be %NULL.

Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/gdkpixbuf-render.c
        (gdk_pixbuf_render_pixmap_and_mask[_for_colormap]): Mention
        in the docs that @pixmap_return and @mask_return can
        be %NULL.

diff --git a/ChangeLog b/ChangeLog
index 915901eef3fab24a8feb92f4ba474d59edc84d43..345b83f3e058e036eb2562b30985a37a2f84ae8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixbuf-render.c 
+       (gdk_pixbuf_render_pixmap_and_mask[_for_colormap]): Mention
+       in the docs that @pixmap_return and @mask_return can
+       be %NULL.
+
 2002-08-10  Soren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/gtk/tree_widget.sgml,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 915901eef3fab24a8feb92f4ba474d59edc84d43..345b83f3e058e036eb2562b30985a37a2f84ae8c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixbuf-render.c 
+       (gdk_pixbuf_render_pixmap_and_mask[_for_colormap]): Mention
+       in the docs that @pixmap_return and @mask_return can
+       be %NULL.
+
 2002-08-10  Soren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/gtk/tree_widget.sgml,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 915901eef3fab24a8feb92f4ba474d59edc84d43..345b83f3e058e036eb2562b30985a37a2f84ae8c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixbuf-render.c 
+       (gdk_pixbuf_render_pixmap_and_mask[_for_colormap]): Mention
+       in the docs that @pixmap_return and @mask_return can
+       be %NULL.
+
 2002-08-10  Soren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/gtk/tree_widget.sgml,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 915901eef3fab24a8feb92f4ba474d59edc84d43..345b83f3e058e036eb2562b30985a37a2f84ae8c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixbuf-render.c 
+       (gdk_pixbuf_render_pixmap_and_mask[_for_colormap]): Mention
+       in the docs that @pixmap_return and @mask_return can
+       be %NULL.
+
 2002-08-10  Soren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/gtk/tree_widget.sgml,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 915901eef3fab24a8feb92f4ba474d59edc84d43..345b83f3e058e036eb2562b30985a37a2f84ae8c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixbuf-render.c 
+       (gdk_pixbuf_render_pixmap_and_mask[_for_colormap]): Mention
+       in the docs that @pixmap_return and @mask_return can
+       be %NULL.
+
 2002-08-10  Soren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/gtk/tree_widget.sgml,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 915901eef3fab24a8feb92f4ba474d59edc84d43..345b83f3e058e036eb2562b30985a37a2f84ae8c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sat Aug 10 22:18:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixbuf-render.c 
+       (gdk_pixbuf_render_pixmap_and_mask[_for_colormap]): Mention
+       in the docs that @pixmap_return and @mask_return can
+       be %NULL.
+
 2002-08-10  Soren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/gtk/tree_widget.sgml,

diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c
index 98d0b62e9c7b5bad9a4fec6ab4ea8934413bdc20..99156f7ea96c3fef94f3333f76f1c17d8ca0dcac 100644 (file)
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.c
@@ -244,8 +244,10 @@ gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf   *pixbuf,
 /**
  * gdk_pixbuf_render_pixmap_and_mask:
  * @pixbuf: A pixbuf.
- * @pixmap_return: Return value for the created pixmap.
- * @mask_return: Return value for the created mask.
+ * @pixmap_return: Location to store a pointer to the created pixmap,
+ *   or %NULL if the pixmap is not needed.
+ * @mask_return: Location to store a pointer to the created mask,
+ *   or %NULL if the mask is not needed.
  * @alpha_threshold: Threshold value for opacity values.
  *
  * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
@@ -279,8 +281,10 @@ gdk_pixbuf_render_pixmap_and_mask (GdkPixbuf  *pixbuf,
  * gdk_pixbuf_render_pixmap_and_mask_for_colormap:
  * @pixbuf: A pixbuf.
  * @colormap: A #GdkColormap
- * @pixmap_return: Return value for the created pixmap.
- * @mask_return: Return value for the created mask.
+ * @pixmap_return: Location to store a pointer to the created pixmap,
+ *   or %NULL if the pixmap is not needed.
+ * @mask_return: Location to store a pointer to the created mask,
+ *   or %NULL if the mask is not needed.
  * @alpha_threshold: Threshold value for opacity values.
  *
  * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return