Bug 534979 – GtkImageMenuItem is a bin but has two children.

[~andy/gtk] / gtk / gtkfontsel.c

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 15d762fa61d066293cfa15cae059a4613141eb63..a4a81410255f106c990708f85b7a4ee8eece6a50 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * Massively updated for Pango by Owen Taylor, May 2000
@@ -1257,6 +1257,8 @@ gtk_font_selection_get_preview_entry (GtkFontSelection *fontsel)
  * gtk_font_selection_get_family:
  * @fontsel: a #GtkFontSelection
  * 
+ * Gets the #PangoFontFamily representing the selected font family.
+ *
  * Return value: A #PangoFontFamily representing the selected font
  * family. Font families are a collection of font faces.
  *
@@ -1274,9 +1276,12 @@ gtk_font_selection_get_family (GtkFontSelection *fontsel)
  * gtk_font_selection_get_face:
  * @fontsel: a #GtkFontSelection
  * 
- * Return value: A #PangoFontFace representing the selected font group
+ * Gets the #PangoFontFace representing the selected font group
  * details (i.e. family, slant, weight, width, etc).   
  *
+ * Return value: A #PangoFontFace representing the selected font group
+ *     details 
+ *
  * Since: 2.14
  **/
 PangoFontFace *
@@ -1291,6 +1296,8 @@ gtk_font_selection_get_face (GtkFontSelection *fontsel)
  * gtk_font_selection_get_size:
  * @fontsel: a #GtkFontSelection
  * 
+ * The selected font size.
+ *
  * Return value: A #gint representing the font size selected, or -1
  * if not.
  *
@@ -1307,14 +1314,16 @@ gtk_font_selection_get_size (GtkFontSelection *fontsel)
 /**
  * gtk_font_selection_get_font:
  * @fontsel: a #GtkFontSelection
- * 
- * Return value: A #GdkFont.  
+ *
+ * Return value: A #GdkFont.
+ *
+ * Deprecated: 2.0: Use gtk_font_selection_get_font_name() instead.
  **/
 GdkFont *
 gtk_font_selection_get_font (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
-  
+
   return gtk_font_selection_get_font_internal (fontsel);
 }
 
@@ -1602,6 +1611,8 @@ gtk_font_selection_dialog_new (const gchar *title)
  * gtk_font_selection_dialog_get_ok_button:
  * @fsd: a #GtkFontSelectionDialog
  *
+ * Gets the 'OK' button.
+ *
  * Return value: the #GtkWidget used in the dialog for the 'OK' button.
  *
  * Since: 2.14
@@ -1618,6 +1629,8 @@ gtk_font_selection_dialog_get_ok_button (GtkFontSelectionDialog *fsd)
  * gtk_font_selection_dialog_get_apply_button:
  * @fsd: a #GtkFontSelectionDialog
  *
+ * Gets the 'Apply' button.
+ *
  * Return value: the #GtkWidget used in the dialog for the 'Apply' button.
  *
  * Since: 2.14
@@ -1631,9 +1644,11 @@ gtk_font_selection_dialog_get_apply_button (GtkFontSelectionDialog *fsd)
 }
 
 /**
- * gtk_font_selection_dialog_get_apply_button:
+ * gtk_font_selection_dialog_get_cancel_button:
  * @fsd: a #GtkFontSelectionDialog
  *
+ * Gets the 'Cancel' button.
+ *
  * Return value: the #GtkWidget used in the dialog for the 'Cancel' button.
  */
 GtkWidget *
@@ -1696,13 +1711,15 @@ gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd)
  *
  * Return value: the #GdkFont from the #GtkFontSelection for the
  * currently selected font in the dialog.
+ *
+ * Deprecated: 2.0: Use gtk_font_selection_dialog_get_font_name() instead.
  */
 GdkFont*
 gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd), NULL);
 
-  return gtk_font_selection_get_font (GTK_FONT_SELECTION (fsd->fontsel));
+  return gtk_font_selection_get_font_internal (GTK_FONT_SELECTION (fsd->fontsel));
 }
 
 /**
@@ -1710,6 +1727,8 @@ gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd)
  * @fsd: a #GtkFontSelectionDialog
  * @fontname: a pointer to a string
  *
+ * Sets the currently selected font. 
+ * 
  * Return value: %TRUE if the font selected in @fsd is now the
  * @fontname specified. %FALSE otherwise. 
  */