diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 3eb3d45c33..e22a87f96b 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1339,24 +1339,6 @@ gtk_font_selection_get_size (GtkFontSelection *fontsel) return fontsel->size; } -/** - * gtk_font_selection_get_font: - * @fontsel: a #GtkFontSelection - * - * Gets the currently-selected font. - * - * 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); -} - /** * gtk_font_selection_get_font_name: * @fontsel: a #GtkFontSelection @@ -1692,26 +1674,6 @@ gtk_font_selection_dialog_get_ok_button (GtkFontSelectionDialog *fsd) return fsd->ok_button; } -/** - * gtk_font_selection_dialog_get_apply_button: - * @fsd: a #GtkFontSelectionDialog - * - * Obtains a button. The button doesn't have any function. - * - * Return value: a #GtkWidget - * - * Since: 2.14 - * - * Deprecated: 2.16: Don't use this function. - */ -GtkWidget * -gtk_font_selection_dialog_get_apply_button (GtkFontSelectionDialog *fsd) -{ - g_return_val_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd), NULL); - - return fsd->apply_button; -} - /** * gtk_font_selection_dialog_get_cancel_button: * @fsd: a #GtkFontSelectionDialog @@ -1778,25 +1740,6 @@ gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd) return gtk_font_selection_get_font_name (GTK_FONT_SELECTION (fsd->fontsel)); } -/** - * gtk_font_selection_dialog_get_font: - * @fsd: a #GtkFontSelectionDialog - * - * Gets the currently-selected font. - * - * Return value: the #GdkFont from the #GtkFontSelection for the - * currently selected font in the dialog, or %NULL if no font is selected - * - * 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_internal (GTK_FONT_SELECTION (fsd->fontsel)); -} - /** * gtk_font_selection_dialog_set_font_name: * @fsd: a #GtkFontSelectionDialog diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index 6cf97359d1..a8936517aa 100644 --- a/gtk/gtkfontsel.h +++ b/gtk/gtkfontsel.h @@ -156,10 +156,6 @@ PangoFontFace * gint gtk_font_selection_get_size (GtkFontSelection *fontsel); gchar* gtk_font_selection_get_font_name (GtkFontSelection *fontsel); -#ifndef GTK_DISABLE_DEPRECATED -GdkFont* gtk_font_selection_get_font (GtkFontSelection *fontsel); -#endif /* GTK_DISABLE_DEPRECATED */ - gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel, const gchar *fontname); const gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel); @@ -176,9 +172,6 @@ GType gtk_font_selection_dialog_get_type (void) G_GNUC_CONST; GtkWidget *gtk_font_selection_dialog_new (const gchar *title); GtkWidget *gtk_font_selection_dialog_get_ok_button (GtkFontSelectionDialog *fsd); -#ifndef GTK_DISABLE_DEPRECATED -GtkWidget *gtk_font_selection_dialog_get_apply_button (GtkFontSelectionDialog *fsd); -#endif GtkWidget *gtk_font_selection_dialog_get_cancel_button (GtkFontSelectionDialog *fsd); /* This returns the X Logical Font Description fontname, or NULL if no font @@ -188,13 +181,6 @@ GtkWidget *gtk_font_selection_dialog_get_cancel_button (GtkFontSelectionDialog * You should g_free() the returned font name after you're done with it. */ gchar* gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd); -#ifndef GTK_DISABLE_DEPRECATED -/* This will return the current GdkFont, or NULL if none is selected or there - was a problem loading it. Remember to use gdk_font_ref/unref() if you want - to use the font (in a style, for example). */ -GdkFont* gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd); -#endif /* GTK_DISABLE_DEPRECATED */ - /* This sets the currently displayed font. It should be a valid X Logical Font Description font name (anything else will be ignored), e.g. "-adobe-courier-bold-o-normal--25-*-*-*-*-*-*-*"