const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
- // from XFLD
- wxFontRefData(const wxString& fontname);
+ wxFontRefData(const wxString& nativeFontInfoString);
// copy ctor
wxFontRefData( const wxFontRefData& data );
virtual ~wxFontRefData();
- // do we have the native font info?
- bool HasNativeFont() const
- {
- // we always have a Pango font description
- return true;
- }
-
// setters: all of them also take care to modify m_nativeFontInfo if we
// have it so as to not lose the information not carried by our fields
void SetPointSize(int pointSize);
void InitFromNative();
private:
- // clear m_scaled_xfonts if any
- void ClearGdkFonts();
-
- int m_pointSize;
- wxFontFamily m_family;
- wxFontStyle m_style;
- wxFontWeight m_weight;
bool m_underlined;
- wxString m_faceName;
- wxFontEncoding m_encoding;
bool m_noAA; // No anti-aliasing
// The native font info: basically a PangoFontDescription
wxFontWeight weight,
bool underlined,
const wxString& faceName,
- wxFontEncoding encoding)
+ wxFontEncoding WXUNUSED(encoding))
{
- m_family = family == wxFONTFAMILY_DEFAULT ? wxFONTFAMILY_SWISS : family;
-
- m_faceName = faceName;
-
- // we accept both wxDEFAULT and wxNORMAL here - should we?
- m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style;
- m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight;
-
- // and here, do we really want to forbid creation of the font of the size
- // 90 (the value of wxDEFAULT)??
- m_pointSize = pointSize == wxDEFAULT || pointSize == -1
- ? wxDEFAULT_FONT_SIZE
- : pointSize;
+ if (family == wxFONTFAMILY_DEFAULT)
+ family = wxFONTFAMILY_SWISS;
m_underlined = underlined;
- m_encoding = encoding;
- if ( m_encoding == wxFONTENCODING_DEFAULT )
- m_encoding = wxFont::GetDefaultEncoding();
-
m_noAA = false;
// Create native font info
m_nativeFontInfo.description = pango_font_description_new();
// And set its values
- if (!m_faceName.empty())
+ if (!faceName.empty())
{
- pango_font_description_set_family( m_nativeFontInfo.description,
- wxGTK_CONV_SYS(m_faceName) );
+ pango_font_description_set_family( m_nativeFontInfo.description,
+ wxGTK_CONV_SYS(faceName) );
}
else
{
- switch (m_family)
- {
- case wxFONTFAMILY_MODERN:
- case wxFONTFAMILY_TELETYPE:
- pango_font_description_set_family( m_nativeFontInfo.description, "monospace" );
- break;
- case wxFONTFAMILY_ROMAN:
- pango_font_description_set_family( m_nativeFontInfo.description, "serif" );
- break;
- case wxFONTFAMILY_SWISS:
- // SWISS = sans serif
- default:
- pango_font_description_set_family( m_nativeFontInfo.description, "sans" );
- break;
- }
+ SetFamily(family);
}
- SetStyle( m_style );
- SetPointSize( m_pointSize );
- SetWeight( m_weight );
+ SetStyle( style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style );
+ SetPointSize( (pointSize == wxDEFAULT || pointSize == -1)
+ ? wxDEFAULT_FONT_SIZE
+ : pointSize );
+ SetWeight( weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight );
}
void wxFontRefData::InitFromNative()
// Get native info
PangoFontDescription *desc = m_nativeFontInfo.description;
- // init fields
- m_faceName = wxGTK_CONV_BACK_SYS(pango_font_description_get_family(desc));
-
// Pango sometimes needs to have a size
int pango_size = pango_font_description_get_size( desc );
if (pango_size == 0)
- m_nativeFontInfo.SetPointSize(12);
-
- m_pointSize = m_nativeFontInfo.GetPointSize();
- m_style = m_nativeFontInfo.GetStyle();
- m_weight = m_nativeFontInfo.GetWeight();
+ m_nativeFontInfo.SetPointSize(wxDEFAULT_FONT_SIZE);
- if (m_faceName == wxT("monospace"))
- {
- m_family = wxFONTFAMILY_TELETYPE;
- }
- else if (m_faceName == wxT("sans"))
- {
- m_family = wxFONTFAMILY_SWISS;
- }
- else if (m_faceName == wxT("serif"))
- {
- m_family = wxFONTFAMILY_ROMAN;
- }
- else
- {
- m_family = wxFONTFAMILY_UNKNOWN;
- }
-
- // Pango description are never underlined (?)
+ // Pango description are never underlined
m_underlined = false;
-
- // always with GTK+ 2
- m_encoding = wxFONTENCODING_UTF8;
}
wxFontRefData::wxFontRefData( const wxFontRefData& data )
: wxGDIRefData()
{
- m_pointSize = data.m_pointSize;
- m_family = data.m_family;
- m_style = data.m_style;
- m_weight = data.m_weight;
-
m_underlined = data.m_underlined;
-
- m_faceName = data.m_faceName;
- m_encoding = data.m_encoding;
-
m_noAA = data.m_noAA;
// Forces a copy of the internal data. wxNativeFontInfo should probably
Init(size, family, style, weight, underlined, faceName, encoding);
}
-wxFontRefData::wxFontRefData(const wxString& fontname)
+wxFontRefData::wxFontRefData(const wxString& nativeFontInfoString)
{
- m_nativeFontInfo.FromString( fontname );
+ m_nativeFontInfo.FromString( nativeFontInfoString );
InitFromNative();
}
-void wxFontRefData::ClearGdkFonts()
-{
-}
-
wxFontRefData::~wxFontRefData()
{
- ClearGdkFonts();
}
// ----------------------------------------------------------------------------
void wxFontRefData::SetPointSize(int pointSize)
{
- m_pointSize = pointSize;
-
m_nativeFontInfo.SetPointSize(pointSize);
}
return true;
}
-
*/
void wxFontRefData::SetFamily(wxFontFamily family)
{
- m_family = family;
-
- // TODO: what are we supposed to do with m_nativeFontInfo here?
+ m_nativeFontInfo.SetFamily(family);
}
void wxFontRefData::SetStyle(wxFontStyle style)
{
- m_style = style;
-
- m_nativeFontInfo.SetStyle((wxFontStyle)style);
+ m_nativeFontInfo.SetStyle(style);
}
void wxFontRefData::SetWeight(wxFontWeight weight)
{
- m_weight = weight;
-
- m_nativeFontInfo.SetWeight((wxFontWeight)weight);
+ m_nativeFontInfo.SetWeight(weight);
}
void wxFontRefData::SetUnderlined(bool underlined)
{
m_underlined = underlined;
- // the XLFD doesn't have "underlined" field anyhow
+ // the Pango font descriptor does not have an underlined attribute
+ // (and wxNativeFontInfo::SetUnderlined asserts); rather it's
+ // wxWindowDCImpl::DoDrawText that handles underlined fonts, so we
+ // here we just need to save the underlined attribute
}
bool wxFontRefData::SetFaceName(const wxString& facename)
{
- m_faceName = facename;
-
return m_nativeFontInfo.SetFaceName(facename);
}
-void wxFontRefData::SetEncoding(wxFontEncoding encoding)
+void wxFontRefData::SetEncoding(wxFontEncoding WXUNUSED(encoding))
{
- m_encoding = encoding;
+ // with GTK+ 2 Pango always uses UTF8 internally, we cannot change it
}
void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
{
- // previously cached fonts shouldn't be used
- ClearGdkFonts();
-
m_nativeFontInfo = info;
// set all the other font parameters from the native font info
int wxFont::GetPointSize() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
- return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
- : M_FONTDATA->m_pointSize;
+ return M_FONTDATA->m_nativeFontInfo.GetPointSize();
}
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
- return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
- : M_FONTDATA->m_faceName;
+ return M_FONTDATA->m_nativeFontInfo.GetFaceName();
}
wxFontFamily wxFont::GetFamily() const
{
- wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
-
- wxFontFamily ret = M_FONTDATA->m_family;
- if (M_FONTDATA->HasNativeFont())
- // wxNativeFontInfo::GetFamily is expensive, must not call more than once
- ret = M_FONTDATA->m_nativeFontInfo.GetFamily();
-
- if (ret == wxFONTFAMILY_DEFAULT)
- ret = M_FONTDATA->m_family;
+ wxCHECK_MSG( IsOk(), wxFONTFAMILY_MAX, wxT("invalid font") );
- return ret;
+ return M_FONTDATA->m_nativeFontInfo.GetFamily();
}
wxFontStyle wxFont::GetStyle() const
{
- wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
- return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
- : M_FONTDATA->m_style;
+ return M_FONTDATA->m_nativeFontInfo.GetStyle();
}
wxFontWeight wxFont::GetWeight() const
{
- wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
- return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
- : M_FONTDATA->m_weight;
+ return M_FONTDATA->m_nativeFontInfo.GetWeight();
}
bool wxFont::GetUnderlined() const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
return M_FONTDATA->m_underlined;
}
wxFontEncoding wxFont::GetEncoding() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_SYSTEM, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") );
- return M_FONTDATA->m_encoding;
+ return wxFONTENCODING_UTF8;
+ // Pango always uses UTF8... see also SetEncoding()
}
bool wxFont::GetNoAntiAliasing() const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
return M_FONTDATA->m_noAA;
}
const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );
return &(M_FONTDATA->m_nativeFontInfo);
}
bool wxFont::IsFixedWidth() const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
return wxFontBase::IsFixedWidth();
}
projects / wxWidgets.git / blobdiff