diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2006-01-02 23:31:29 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2006-01-02 23:31:29 +0000 |
| commit | 611ec68e46d77168ff16b00e083d362e29be007d (patch) | |
| tree | 99791ff6b9decdf44d870677f9c0151581f7785c /riscos | |
| parent | e68f319778277b34a4ade12a4c003b81c1b6c5a0 (diff) | |
| download | netsurf-611ec68e46d77168ff16b00e083d362e29be007d.tar.gz netsurf-611ec68e46d77168ff16b00e083d362e29be007d.tar.bz2 | |
[project @ 2006-01-02 23:31:28 by jmb]
Implement font default option properly
svn path=/import/netsurf/; revision=1969
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/font.c | 21 | ||||
| -rw-r--r-- | riscos/options.h | 4 |
2 files changed, 1 insertions, 24 deletions
diff --git a/riscos/font.c b/riscos/font.c index 622f713c2..4bbfcc8b0 100644 --- a/riscos/font.c +++ b/riscos/font.c @@ -452,26 +452,7 @@ void nsfont_read_style(const struct css_style *style, *font_family = option_font_fantasy; break; default: - switch (option_font_default) { - case CSS_FONT_FAMILY_SANS_SERIF: - *font_family = option_font_sans; - break; - case CSS_FONT_FAMILY_SERIF: - *font_family = option_font_serif; - break; - case CSS_FONT_FAMILY_MONOSPACE: - *font_family = option_font_mono; - break; - case CSS_FONT_FAMILY_CURSIVE: - *font_family = option_font_cursive; - break; - case CSS_FONT_FAMILY_FANTASY: - *font_family = option_font_fantasy; - break; - default: - *font_family = option_font_sans; - break; - } + *font_family = option_font_sans; break; } diff --git a/riscos/options.h b/riscos/options.h index 4d55e0da9..1c153c088 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -14,7 +14,6 @@ #ifndef _NETSURF_RISCOS_OPTIONS_H_ #define _NETSURF_RISCOS_OPTIONS_H_ -#include "netsurf/css/css.h" #include "netsurf/desktop/options.h" #include "netsurf/riscos/tinct.h" @@ -53,7 +52,6 @@ extern char *option_font_serif; extern char *option_font_mono; extern char *option_font_cursive; extern char *option_font_fantasy; -extern int option_font_default; /* a css_font_family */ extern bool option_block_popups; extern bool option_url_suggestion; extern int option_image_memory_direct; /* -1 means auto-detect */ @@ -96,7 +94,6 @@ char *option_font_serif = 0; \ char *option_font_mono = 0; \ char *option_font_cursive = 0; \ char *option_font_fantasy = 0; \ -int option_font_default = CSS_FONT_FAMILY_SANS_SERIF; \ bool option_block_popups = false; \ bool option_url_suggestion = true; \ int option_image_memory_direct = -1; \ @@ -139,7 +136,6 @@ bool option_strip_extensions = true; { "font_mono", OPTION_STRING, &option_font_mono }, \ { "font_cursive", OPTION_STRING, &option_font_cursive }, \ { "font_fantasy", OPTION_STRING, &option_font_fantasy }, \ -{ "font_default", OPTION_INTEGER, &option_font_default }, \ { "block_popups", OPTION_BOOL, &option_block_popups }, \ { "url_suggestion", OPTION_BOOL, &option_url_suggestion }, \ { "image_memory_direct", OPTION_INTEGER, &option_image_memory_direct }, \ |