summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2008-02-15 17:45:30 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2008-02-15 17:45:30 +0000
commitd68cb0fd0eb35b21d13efd5bc3374698c35f8e05 (patch)
tree7cef0a4795aa5b1908e9ab0a4f0588605d48a32b
parentfada06c4c9b26b78307dbaa7b7f25732f1faaab1 (diff)
downloadpango-d68cb0fd0eb35b21d13efd5bc3374698c35f8e05.tar.gz
Improve docs.
2008-02-15 Behdad Esfahbod <behdad@gnome.org> * pango/pango-layout.c: Improve docs. svn path=/trunk/; revision=2567
-rw-r--r--ChangeLog4
-rw-r--r--pango/pango-layout.c8
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dcce2e8a..d3563bd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-15 Behdad Esfahbod <behdad@gnome.org>
+
+ * pango/pango-layout.c: Improve docs.
+
2008-02-14 Tor Lillqvist <tml@novell.com>
Bug 515484 – Pango on Windows is missing non-TrueType
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index fcc3b112..6a38bf24 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -589,7 +589,7 @@ pango_layout_get_spacing (PangoLayout *layout)
/**
* pango_layout_set_attributes:
* @layout: a #PangoLayout
- * @attrs: a #PangoAttrList
+ * @attrs: a #PangoAttrList, can be %NULL
*
* Sets the text attributes for a layout object.
* References @attrs, so the caller can unref its reference.
@@ -995,6 +995,12 @@ pango_layout_is_ellipsized (PangoLayout *layout)
* positive.
*
* Sets the text of the layout.
+ *
+ * Note that if you have used
+ * pango_layout_set_markup() or pango_layout_set_markup_with_accel() on
+ * @layout before, you may want to call pango_layout_set_attributes() to clear
+ * the attributes set on the layout from the markup as this function does not
+ * clear attributes.
**/
void
pango_layout_set_text (PangoLayout *layout,