Permalink
Browse files

remove FONT_STYLE_BOLD_ITALICS as not required

  • Loading branch information...
1 parent d76567e commit 9a76d926256ff10c224cdb1a1a3b871c2161043b Jonathan Marshall committed May 15, 2012
Showing with 2 additions and 3 deletions.
  1. +0 −1 xbmc/guilib/GUIFont.h
  2. +1 −1 xbmc/guilib/GUIFontManager.cpp
  3. +1 −1 xbmc/settings/GUISettings.cpp
View
@@ -49,7 +49,6 @@ class CGUIFontTTFBase;
#define FONT_STYLE_NORMAL 0
#define FONT_STYLE_BOLD 1
#define FONT_STYLE_ITALICS 2
-#define FONT_STYLE_BOLD_ITALICS 3
#define FONT_STYLE_UPPERCASE 4
#define FONT_STYLE_LOWERCASE 8
#define FONT_STYLE_MASK 0xF
@@ -438,7 +438,7 @@ void GUIFontManager::LoadFonts(const TiXmlNode* fontNode)
else if (style == "italics")
iStyle = FONT_STYLE_ITALICS;
else if (style == "bolditalics")
- iStyle = FONT_STYLE_BOLD_ITALICS;
+ iStyle = (FONT_STYLE_BOLD | FONT_STYLE_ITALICS);
else if (style == "uppercase")
iStyle = FONT_STYLE_UPPERCASE;
else if (style == "lowercase")
@@ -752,7 +752,7 @@ void CGUISettings::Initialize()
fontStyles.insert(make_pair(738, FONT_STYLE_NORMAL));
fontStyles.insert(make_pair(739, FONT_STYLE_BOLD));
fontStyles.insert(make_pair(740, FONT_STYLE_ITALICS));
- fontStyles.insert(make_pair(741, FONT_STYLE_BOLD_ITALICS));
+ fontStyles.insert(make_pair(741, FONT_STYLE_BOLD | FONT_STYLE_ITALICS));
AddInt(sub, "subtitles.style", 736, FONT_STYLE_BOLD, fontStyles, SPIN_CONTROL_TEXT);
AddInt(sub, "subtitles.color", 737, SUBTITLE_COLOR_START + 1, SUBTITLE_COLOR_START, 1, SUBTITLE_COLOR_END, SPIN_CONTROL_TEXT);

0 comments on commit 9a76d92

Please sign in to comment.