AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-10 20:50:12 +00:00
Code Issues Projects Releases Wiki Activity

font button: Deprecate the font-name property

Browse Source 
It has long been redundant with the GtkFontChooser::font
property.
This commit is contained in:
Matthias Clasen 2017-12-21 11:12:23 -05:00
parent ed0600e8c0
commit 87e1615610
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkfontbutton.c
View File

@ -133,6 +133,9 @@ static void dialog_destroy (GtkWidget *widget,
static void gtk_font_button_label_use_font (GtkFontButton *gfs); static void gtk_font_button_label_use_font (GtkFontButton *gfs);
static void gtk_font_button_update_font_info (GtkFontButton *gfs); static void gtk_font_button_update_font_info (GtkFontButton *gfs);
static void font_button_set_font_name (GtkFontButton *font_button,
const char *fontname);
static guint font_button_signals[LAST_SIGNAL] = { 0 }; static guint font_button_signals[LAST_SIGNAL] = { 0 };
static void static void
@ -484,6 +487,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
* The name of the currently selected font. * The name of the currently selected font.
* *
* Since: 2.4 * Since: 2.4
* @Deprecated: Use the #GtkFontChooser::font property instead
*/ */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_FONT_NAME, PROP_FONT_NAME,
@ -491,7 +495,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
P_("Font name"), P_("Font name"),
P_("The name of the selected font"), P_("The name of the selected font"),
_("Sans 12"), _("Sans 12"),
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
/** /**
* GtkFontButton:use-font: * GtkFontButton:use-font:
@ -662,7 +666,7 @@ gtk_font_button_set_property (GObject *object,
break; break;
case GTK_FONT_CHOOSER_PROP_FONT: case GTK_FONT_CHOOSER_PROP_FONT:
case PROP_FONT_NAME: case PROP_FONT_NAME:
gtk_font_button_set_font_name (font_button, g_value_get_string (value)); font_button_set_font_name (font_button, g_value_get_string (value));
break; break;
case PROP_USE_FONT: case PROP_USE_FONT:
gtk_font_button_set_use_font (font_button, g_value_get_boolean (value)); gtk_font_button_set_use_font (font_button, g_value_get_boolean (value));
@ -1003,6 +1007,7 @@ gtk_font_button_set_show_size (GtkFontButton *font_button,
* Returns: an internal copy of the font name which must not be freed. * Returns: an internal copy of the font name which must not be freed.
* *
* Since: 2.4 * Since: 2.4
* Deprecated: 3.22: Use gtk_font_chooser_get_font() instead
*/ */
const gchar * const gchar *
gtk_font_button_get_font_name (GtkFontButton *font_button) gtk_font_button_get_font_name (GtkFontButton *font_button)
@ -1012,6 +1017,16 @@ gtk_font_button_get_font_name (GtkFontButton *font_button)
return font_button->priv->fontname; return font_button->priv->fontname;
} }
static void
font_button_set_font_name (GtkFontButton *font_button,
const char *fontname)
{
PangoFontDescription *font_desc;
font_desc = pango_font_description_from_string (fontname);
gtk_font_button_take_font_desc (font_button, font_desc);
}
/** /**
* gtk_font_button_set_font_name: * gtk_font_button_set_font_name:
* @font_button: a #GtkFontButton * @font_button: a #GtkFontButton
@ -1022,18 +1037,16 @@ gtk_font_button_get_font_name (GtkFontButton *font_button)
* Returns: %TRUE * Returns: %TRUE
* *
* Since: 2.4 * Since: 2.4
* Deprecated: 3.22: Use gtk_font_chooser_set_font() instead
*/ */
gboolean gboolean
gtk_font_button_set_font_name (GtkFontButton *font_button, gtk_font_button_set_font_name (GtkFontButton *font_button,
const gchar *fontname) const gchar *fontname)
{ {
PangoFontDescription *font_desc;
g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), FALSE); g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), FALSE);
g_return_val_if_fail (fontname != NULL, FALSE); g_return_val_if_fail (fontname != NULL, FALSE);
font_desc = pango_font_description_from_string (fontname); font_button_set_font_name (font_button, fontname);
gtk_font_button_take_font_desc (font_button, font_desc);
return TRUE; return TRUE;
} }

4
gtk/gtkfontbutton.h
View File

@ -92,9 +92,9 @@ gboolean gtk_font_button_get_use_size (GtkFontButton *font_button
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
void gtk_font_button_set_use_size (GtkFontButton *font_button, void gtk_font_button_set_use_size (GtkFontButton *font_button,
gboolean use_size); gboolean use_size);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_3_22
const gchar * gtk_font_button_get_font_name (GtkFontButton *font_button); const gchar * gtk_font_button_get_font_name (GtkFontButton *font_button);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_3_22
gboolean gtk_font_button_set_font_name (GtkFontButton *font_button, gboolean gtk_font_button_set_font_name (GtkFontButton *font_button,
const gchar *fontname); const gchar *fontname);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL