Commit b575e3bc authored by mitz@apple.com's avatar mitz@apple.com
Browse files

- try to fix the wx build

        * platform/graphics/wx/FontPlatformDataWx.cpp:
        (WebCore::fontWeightToWxFontWeight):
        (WebCore::FontPlatformData::FontPlatformData):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@31650 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 760da6dc
2008-04-04 Dan Bernstein <mitz@apple.com>
- try to fix the wx build
* platform/graphics/wx/FontPlatformDataWx.cpp:
(WebCore::fontWeightToWxFontWeight):
(WebCore::FontPlatformData::FontPlatformData):
2008-04-04 Jon Honeycutt <jhoneycutt@apple.com>
 
Reviewed by Beth.
......@@ -54,9 +54,9 @@ static wxFontFamily fontFamilyToWxFontFamily(const int family)
}
}
static wxFontWeight fontWeightToWxFontWeight(bool isBold)
static wxFontWeight fontWeightToWxFontWeight(FontWeight weight)
{
if (isBold)
if (weight >= FontWeight600)
return wxFONTWEIGHT_BOLD;
return wxFONTWEIGHT_NORMAL;
......@@ -81,7 +81,7 @@ FontPlatformData::FontPlatformData(const FontDescription& desc, const AtomicStri
m_font = wxFont( wxSize(0, -desc.computedPixelSize()),
fontFamilyToWxFontFamily(desc.genericFamily()),
italicToWxFontStyle(desc.italic()),
fontWeightToWxFontWeight(desc.bold()),
fontWeightToWxFontWeight(desc.weight()),
false,
family.string()
);
......@@ -89,7 +89,7 @@ FontPlatformData::FontPlatformData(const FontDescription& desc, const AtomicStri
m_font = wxFont( desc.computedPixelSize(),
fontFamilyToWxFontFamily(desc.genericFamily()),
italicToWxFontStyle(desc.italic()),
fontWeightToWxFontWeight(desc.bold()),
fontWeightToWxFontWeight(desc.weight()),
false,
family.string()
);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment