summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-05-29 03:07:01 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-05-29 03:07:01 +0000
commitbceb3fcc73e19fd9642b9ed20081e150c5dbcf14 (patch)
tree031644290024c2632bde8e87da53b45cb05c06f1 /docs
parentfb7faf4d19d82b6d2ef01f645e048b4dd77bbf01 (diff)
downloadgdk-pixbuf-bceb3fcc73e19fd9642b9ed20081e150c5dbcf14.tar.gz
Bug 535250 - GtkToolButton reference page says "label" where
it should say "icon", uses underscores * gtk/tmpl/gtktoolbutton.sgml: Improve introduction svn path=/trunk/; revision=20227
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/ChangeLog11
-rw-r--r--docs/reference/gtk/tmpl/gtktoolbutton.sgml10
2 files changed, 16 insertions, 5 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e415274e4..5ccb04cd0 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,14 @@
+2008-05-28 Matthias Clasen <mclasen@redhat.com>
+
+ Bug 535250 - GtkToolButton reference page says "label" where
+ it should say "icon", uses underscores
+
+ * gtk/tmpl/gtktoolbutton.sgml: Improve introduction
+
+2008-05-27 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtk-sections.txt: Additions
+
2008-05-27 Matthias Clasen <mclasen@redhat.com>
Bug 531887 - GtkTooltips is deprecated, but what should I use?
diff --git a/docs/reference/gtk/tmpl/gtktoolbutton.sgml b/docs/reference/gtk/tmpl/gtktoolbutton.sgml
index 3d49b573d..95561b609 100644
--- a/docs/reference/gtk/tmpl/gtktoolbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbutton.sgml
@@ -17,19 +17,19 @@ containing a stock item.
<para>
The label of a #GtkToolButton is determined by the properties
-"label_widget", "label", and "stock_id". If "label_widget" is
+"label-widget", "label", and "stock-id". If "label-widget" is
non-%NULL, then that widget is used as the label. Otherwise, if
"label" is non-%NULL, that string is used as the label. Otherwise, if
-"stock_id" is non-%NULL, the label is determined by the stock
+"stock-id" is non-%NULL, the label is determined by the stock
item. Otherwise, the button does not have a label.
</para>
<para>
The icon of a #GtkToolButton is determined by the properties
-"icon_widget" and "stock_id". If "icon_widget" is non-%NULL, then
-that widget is used as the icon. Otherwise, if "stock_id" is
+"icon-widget" and "stock-id". If "icon-widget" is non-%NULL, then
+that widget is used as the icon. Otherwise, if "stock-id" is
non-%NULL, the icon is determined by the stock item. Otherwise,
-the button does not have a label.
+the button does not have a icon.
</para>
<!-- ##### SECTION See_Also ##### -->