cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[wxGTK2] Don't duplicate code inside wxFontRefData::InitFromNative()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp 2005-08-24 00:25:19 +00:00
parent 0042166636
commit d332c51456
2 changed files with 8 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/gtk/font.cpp
View File

@ -239,37 +239,11 @@ void wxFontRefData::InitFromNative()
// Pango sometimes needs to have a size
int pango_size = pango_font_description_get_size( desc );
if (pango_size == 0)
pango_font_description_set_size( desc, 12 * PANGO_SCALE);
m_nativeFontInfo.SetPointSize(12);
m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
switch (pango_font_description_get_style( desc ))
{
case PANGO_STYLE_NORMAL:
m_style = wxFONTSTYLE_NORMAL;
break;
case PANGO_STYLE_ITALIC:
m_style = wxFONTSTYLE_ITALIC;
break;
case PANGO_STYLE_OBLIQUE:
m_style = wxFONTSTYLE_SLANT;
break;
}
PangoWeight pango_weight = pango_font_description_get_weight( desc );
if (pango_weight >= 600)
{
m_weight = wxFONTWEIGHT_BOLD;
}
else if (pango_weight < 350)
{
m_weight = wxFONTWEIGHT_LIGHT;
}
else
{
m_weight = wxFONTWEIGHT_NORMAL;
}
m_pointSize = m_nativeFontInfo.GetPointSize();
m_style = m_nativeFontInfo.GetStyle();
m_weight = m_nativeFontInfo.GetWeight();
if (m_faceName == wxT("monospace"))
{

34
src/gtk1/font.cpp
View File

@ -239,37 +239,11 @@ void wxFontRefData::InitFromNative()
// Pango sometimes needs to have a size
int pango_size = pango_font_description_get_size( desc );
if (pango_size == 0)
pango_font_description_set_size( desc, 12 * PANGO_SCALE);
m_nativeFontInfo.SetPointSize(12);
m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
switch (pango_font_description_get_style( desc ))
{
case PANGO_STYLE_NORMAL:
m_style = wxFONTSTYLE_NORMAL;
break;
case PANGO_STYLE_ITALIC:
m_style = wxFONTSTYLE_ITALIC;
break;
case PANGO_STYLE_OBLIQUE:
m_style = wxFONTSTYLE_SLANT;
break;
}
PangoWeight pango_weight = pango_font_description_get_weight( desc );
if (pango_weight >= 600)
{
m_weight = wxFONTWEIGHT_BOLD;
}
else if (pango_weight < 350)
{
m_weight = wxFONTWEIGHT_LIGHT;
}
else
{
m_weight = wxFONTWEIGHT_NORMAL;
}
m_pointSize = m_nativeFontInfo.GetPointSize();
m_style = m_nativeFontInfo.GetStyle();
m_weight = m_nativeFontInfo.GetWeight();
if (m_faceName == wxT("monospace"))
{