Make 3.0 parallel-installable to 2.x

[~andy/gtk] / docs / reference / gtk / tmpl / gtkfontseldlg.sgml

diff --git a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
index d6e07d28f74fe520230509a4a635013d07c89d7e..6e98aa799260b5334cf42a233efd1caafa05106e 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
@@ -2,7 +2,7 @@
 GtkFontSelectionDialog
 
 <!-- ##### SECTION Short_Description ##### -->
-a dialog box for selecting fonts.
+A dialog box for selecting fonts
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
@@ -13,45 +13,22 @@ To set the font which is initially selected, use
 gtk_font_selection_dialog_set_font_name().
 </para>
 <para>
-To get the selected font use gtk_font_selection_dialog_get_font()
-or gtk_font_selection_dialog_get_font_name().
+To get the selected font use gtk_font_selection_dialog_get_font_name().
 </para>
 <para>
 To change the text which is shown in the preview area, use
 gtk_font_selection_dialog_set_preview_text().
 </para>
-<para>
-Filters can be used to limit the fonts shown. There are 2 filters in the
-#GtkFontSelectionDialog - a base filter and a user filter. The base filter
-can not be changed by the user, so this can be used when the user must choose
-from the restricted set of fonts (e.g. for a terminal-type application you may
-want to force the user to select a fixed-width font). The user filter can be
-changed or reset by the user, by using the 'Reset Filter' button or changing
-the options on the 'Filter' page of the dialog.
-</para>
-
-<example>
-<title>Setting a filter to show only fixed-width fonts.</title>
-<programlisting>
-  gchar *spacings[] = { "c", "m", NULL };
-  gtk_font_selection_dialog_set_filter (GTK_FONT_SELECTION_DIALOG (fontsel),
-                                      GTK_FONT_FILTER_BASE, GTK_FONT_ALL,
-                                      NULL, NULL, NULL, NULL, spacings, NULL);
-</programlisting>
-</example>
 
+<refsect2 id="GtkFontSelectionDialog-BUILDER-UI">
+<title>GtkFontSelectionDialog as GtkBuildable</title>
 <para>
-To allow only true scalable fonts to be selected use:
+The GtkFontSelectionDialog implementation of the GtkBuildable interface
+exposes the embedded #GtkFontSelection as internal child with the
+name "font_selection". It also exposes the buttons with the names
+"ok_button", "cancel_button" and "apply_button".
 </para>
-
-<example>
-<title>Setting a filter to show only true scalable fonts.</title>
-<programlisting>
-  gtk_font_selection_dialog_set_filter (GTK_FONT_SELECTION_DIALOG (fontsel),
-                                      GTK_FONT_FILTER_BASE, GTK_FONT_SCALABLE,
-                                      NULL, NULL, NULL, NULL, NULL, NULL);
-</programlisting>
-</example>
+</refsect2>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
@@ -59,72 +36,85 @@ To allow only true scalable fonts to be selected use:
 
 <varlistentry>
 <term>#GtkFontSelection</term>
-<listitem><para>the underlying widget for selecting fonts.</para></listitem>
+<listitem><para>the underlying widget for selecting
+fonts.</para></listitem>
+<term>#GtkDialog</term>
+<listitem><para>the parent class of GtkFontSelectionDialog</para></listitem>
 </varlistentry>
 
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkFontSelectionDialog ##### -->
+
+
+
+<!-- ##### FUNCTION gtk_font_selection_dialog_new ##### -->
 <para>
-The #GtkFontSelectionDialog struct contains private data only, and should
-only be accessed using the functions below.
+
 </para>
 
+@title: 
+@Returns: 
 
-<!-- ##### FUNCTION gtk_font_selection_dialog_new ##### -->
+
+<!-- ##### FUNCTION gtk_font_selection_dialog_get_font_name ##### -->
 <para>
-Creates a new #GtkFontSelectionDialog.
 </para>
 
-@title: the title of the dialog box.
-@Returns: a new #GtkFontSelectionDialog.
+@fsd: 
+@Returns: 
 
 
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_font ##### -->
+<!-- ##### FUNCTION gtk_font_selection_dialog_set_font_name ##### -->
 <para>
-Gets the currently-selected font.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@Returns: the currently-selected font, or %NULL if no font is selected.
+@fsd: 
+@fontname: 
+@Returns: 
 
 
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_font_name ##### -->
+<!-- ##### FUNCTION gtk_font_selection_dialog_get_preview_text ##### -->
 <para>
-Gets the currently-selected font name.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@Returns: the currently-selected font name, or %NULL if no font is selected.
+@fsd: 
+@Returns: 
 
 
-<!-- ##### FUNCTION gtk_font_selection_dialog_set_font_name ##### -->
+<!-- ##### FUNCTION gtk_font_selection_dialog_set_preview_text ##### -->
 <para>
-Sets the currently-selected font.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@fontname: a fontname.
-@Returns: %TRUE if the font was found.
+@fsd: 
+@text: 
 
 
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_preview_text ##### -->
+<!-- ##### FUNCTION gtk_font_selection_dialog_get_cancel_button ##### -->
 <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 ##### -->
+<!-- ##### FUNCTION gtk_font_selection_dialog_get_ok_button ##### -->
 <para>
-Sets the text displayed in the preview area.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@text: the text to display in the preview area.
+@fsd: 
+@Returns: