summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-04-29 06:58:25 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-04-29 06:58:25 +0000
commit9928583a7228db8632f85b6664b4cfd22207b640 (patch)
tree4d23ac82b3f5f9222d6181c075c69f5b80e6b035
parentbfe179e048eb82c035e1b2be63ab10d2f157dc3e (diff)
downloadgdk-pixbuf-9928583a7228db8632f85b6664b4cfd22207b640.tar.gz
Change colormap to font map in docs. (#340093)
2006-04-29 Behdad Esfahbod <behdad@gnome.org> * gtk/gtkwidget.c (gtk_widget_create_pango_layout) (gtk_widget_get/create_pango_context): Change colormap to font map in docs. (#340093)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--gtk/gtkwidget.c6
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f5f012756..cac996aa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-29 Behdad Esfahbod <behdad@gnome.org>
+
+ * gtk/gtkwidget.c (gtk_widget_create_pango_layout)
+ (gtk_widget_get/create_pango_context): Change colormap to font map in
+ docs. (#340093)
+
2006-04-28 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f5f012756..cac996aa9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-04-29 Behdad Esfahbod <behdad@gnome.org>
+
+ * gtk/gtkwidget.c (gtk_widget_create_pango_layout)
+ (gtk_widget_get/create_pango_context): Change colormap to font map in
+ docs. (#340093)
+
2006-04-28 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 7234fb60b..66d527bf7 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5175,7 +5175,7 @@ gtk_widget_peek_pango_context (GtkWidget *widget)
* gtk_widget_get_pango_context:
* @widget: a #GtkWidget
*
- * Gets a #PangoContext with the appropriate colormap, font description
+ * Gets a #PangoContext with the appropriate font map, font description,
* and base direction for this widget. Unlike the context returned
* by gtk_widget_create_pango_context(), this context is owned by
* the widget (it can be used until the screen for the widget changes
@@ -5245,7 +5245,7 @@ gtk_widget_update_pango_context (GtkWidget *widget)
* gtk_widget_create_pango_context:
* @widget: a #GtkWidget
*
- * Creates a new #PangoContext with the appropriate colormap,
+ * Creates a new #PangoContext with the appropriate font map,
* font description, and base direction for drawing text for
* this widget. See also gtk_widget_get_pango_context().
*
@@ -5281,7 +5281,7 @@ gtk_widget_create_pango_context (GtkWidget *widget)
* @widget: a #GtkWidget
* @text: text to set on the layout (can be %NULL)
*
- * Creates a new #PangoLayout with the appropriate colormap,
+ * Creates a new #PangoLayout with the appropriate font map,
* font description, and base direction for drawing text for
* this widget.
*