gtk/gtksettings.c gtk/gtkstyle.c: Patch from Richard Hestilow to add a

Sat Feb 23 20:59:05 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkstyle.c gtk/gtkrc.[ch]: gtk/gtksettings.c gtk/gtkstyle.c:
        Patch from Richard Hestilow to add a gtk-font-name GtkSetting.

        * gdk/x11/gdkevents-x11.c: Add Gtk/FontName XSETTING.
This commit is contained in:
Owen Taylor
2002-02-24 02:24:51 +00:00
committed by Owen Taylor
parent d21ebc724c
commit 82b76bbee3
13 changed files with 146 additions and 7 deletions

View File

@ -485,8 +485,9 @@ static void
gtk_style_init (GtkStyle *style)
{
gint i;
const gchar *font_name = _gtk_rc_context_get_default_font_name (gtk_settings_get_default ());
style->font_desc = pango_font_description_from_string ("Sans 10");
style->font_desc = pango_font_description_from_string (font_name);
style->attach_count = 0;
style->colormap = NULL;
@ -2339,7 +2340,7 @@ gtk_default_draw_shadow (GtkStyle *style,
return;
}
if (widget && GTK_IS_SPIN_BUTTON (widget) &&
detail && strcmp (detail, "spinbutton") == 0)
detail && strcmp (detail, "spinbutton") == 0)
{
draw_spinbutton_shadow (style, window, state_type,
gtk_widget_get_direction (widget), area, x, y, width, height);