Merge docs inline

svn path=/trunk/; revision=21971
This commit is contained in:
Matthias Clasen 2008-12-29 04:19:56 +00:00
parent 97ba70e19b
commit d482dea1d7
2 changed files with 20 additions and 17 deletions

View File

@ -1,3 +1,7 @@
2008-12-28 Matthias Clasen <mclasen@redhat.com>
* gtk/tmpl/gtkfontseldlg.sgml: Merge docs inline.
2008-12-28 Matthias Clasen <mclasen@redhat.com>
* gtk/building.sgml: It's <envar>, not <envvar>

View File

@ -54,20 +54,20 @@ fonts.</para></listitem>
<!-- ##### FUNCTION gtk_font_selection_dialog_new ##### -->
<para>
Creates a new #GtkFontSelectionDialog.
</para>
@title: the title of the dialog box.
@Returns: a new #GtkFontSelectionDialog.
@title:
@Returns:
<!-- ##### FUNCTION gtk_font_selection_dialog_get_font ##### -->
<para>
Gets the currently-selected font.
</para>
@fsd: a #GtkFontSelectionDialog.
@Returns: the currently-selected font, or %NULL if no font is selected.
@fsd:
@Returns:
<!-- ##### FUNCTION gtk_font_selection_dialog_get_font_name ##### -->
@ -80,31 +80,30 @@ Gets the currently-selected font.
<!-- ##### FUNCTION gtk_font_selection_dialog_set_font_name ##### -->
<para>
Sets the currently-selected font.
</para>
@fsd: a #GtkFontSelectionDialog.
@fontname: a fontname.
@Returns: %TRUE if the font was found.
@fsd:
@fontname:
@Returns:
<!-- ##### FUNCTION gtk_font_selection_dialog_get_preview_text ##### -->
<para>
Gets the text displayed in the preview area.
</para>
@fsd: a #GtkFontSelectionDialog.
@Returns: the text displayed in the preview area. This string is owned
by the widget and should not be modified or freed.
@fsd:
@Returns:
<!-- ##### FUNCTION gtk_font_selection_dialog_set_preview_text ##### -->
<para>
Sets the text displayed in the preview area.
</para>
@fsd: a #GtkFontSelectionDialog.
@text: the text to display in the preview area.
@fsd:
@text:
<!-- ##### FUNCTION gtk_font_selection_dialog_get_apply_button ##### -->