X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dda88f5eee7ae13a328f92996847f90caed2e5e9..40e5ebbf98728d627e4d3c9e3a57f28f5bb8fcb9:/src/gtk/font.cpp diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index a4e761d20c..94cc8e66d5 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -1,9 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.cpp +// Name: src/gtk/font.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,24 +15,37 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "font.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/font.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/settings.h" + #include "wx/cmndata.h" + #include "wx/gdicmn.h" +#endif + #include "wx/fontutil.h" -#include "wx/cmndata.h" -#include "wx/utils.h" -#include "wx/log.h" -#include "wx/gdicmn.h" #include "wx/tokenzr.h" -#include "wx/settings.h" -#include +#include "wx/gtk/private.h" + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// the default size (in points) for the fonts +static const int wxDEFAULT_FONT_SIZE = 12; + +// ---------------------------------------------------------------------------- +// wxScaledFontList: maps the font sizes to the GDK fonts for the given font +// ---------------------------------------------------------------------------- -#include -#include -#include +WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual, + wxScaledFontList); // ---------------------------------------------------------------------------- // wxFontRefData @@ -41,16 +54,46 @@ class wxFontRefData : public wxObjectRefData { public: - wxFontRefData(int size = wxDEFAULT, - int family = wxDEFAULT, - int style = wxDEFAULT, - int weight = wxDEFAULT, - bool underlined = FALSE, + // from broken down font parameters, also default ctor + wxFontRefData(int size = -1, + int family = wxFONTFAMILY_DEFAULT, + int style = wxFONTSTYLE_NORMAL, + int weight = wxFONTWEIGHT_NORMAL, + bool underlined = false, const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + + // from XFLD + wxFontRefData(const wxString& fontname); + + // 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 SetFamily(int family); + void SetStyle(int style); + void SetWeight(int weight); + void SetUnderlined(bool underlined); + bool SetFaceName(const wxString& facename); + void SetEncoding(wxFontEncoding encoding); + + void SetNoAntiAliasing( bool no = true ) { m_noAA = no; } + bool GetNoAntiAliasing() const { return m_noAA; } + + // and this one also modifies all the other font data fields + void SetNativeFontInfo(const wxNativeFontInfo& info); + protected: // common part of all ctors void Init(int pointSize, @@ -61,8 +104,13 @@ protected: const wxString& faceName, wxFontEncoding encoding); + // set all fields from (already initialized and valid) m_nativeFontInfo + void InitFromNative(); + private: - wxList m_scaled_xfonts; + // clear m_scaled_xfonts if any + void ClearGdkFonts(); + int m_pointSize; int m_family, m_style, @@ -70,15 +118,16 @@ private: bool m_underlined; wxString m_faceName; wxFontEncoding m_encoding; + bool m_noAA; // No anti-aliasing + // The native font info, basicly an XFLD under GTK 1.2 and + // the pango font description under GTK 2.0. wxNativeFontInfo m_nativeFontInfo; friend class wxFont; }; -// ============================================================================ -// implementation -// ============================================================================ +#define M_FONTDATA ((wxFontRefData*)m_refData) // ---------------------------------------------------------------------------- // wxFontRefData @@ -92,234 +141,260 @@ void wxFontRefData::Init(int pointSize, const wxString& faceName, wxFontEncoding encoding) { - if (family == wxDEFAULT) - m_family = wxSWISS; - else - m_family = family; + m_family = family == wxFONTFAMILY_DEFAULT ? wxFONTFAMILY_SWISS : family; m_faceName = faceName; - if (style == wxDEFAULT) - m_style = wxNORMAL; - else - m_style = style; + // 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; + + 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(); - if (weight == wxDEFAULT) - m_weight = wxNORMAL; + // And set its values + if (!m_faceName.empty()) + { + pango_font_description_set_family( m_nativeFontInfo.description, + wxGTK_CONV_SYS(m_faceName) ); + } else - m_weight = weight; + { + 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; + } + } + + SetStyle( m_style ); + SetPointSize( m_pointSize ); + SetWeight( m_weight ); +} + +void wxFontRefData::InitFromNative() +{ + m_noAA = false; - if (pointSize == wxDEFAULT) - m_pointSize = 12; + // 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(); + + 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_pointSize = pointSize; + { + m_family = wxFONTFAMILY_UNKNOWN; + } - m_underlined = underlined; - m_encoding = encoding; + // Pango description are never underlined (?) + m_underlined = false; + + // always with GTK+ 2 + m_encoding = wxFONTENCODING_UTF8; } wxFontRefData::wxFontRefData( const wxFontRefData& data ) - : m_scaled_xfonts(wxKEY_INTEGER) + : wxObjectRefData() { - Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight, - data.m_underlined, data.m_faceName, data.m_encoding); + 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 + // have a copy ctor and assignment operator to fix this properly but that + // would break binary compatibility... + m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString()); } wxFontRefData::wxFontRefData(int size, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding) - : m_scaled_xfonts(wxKEY_INTEGER) { Init(size, family, style, weight, underlined, faceName, encoding); } -wxFontRefData::~wxFontRefData() +wxFontRefData::wxFontRefData(const wxString& fontname) { - wxNode *node = m_scaled_xfonts.First(); - while (node) - { - GdkFont *font = (GdkFont*)node->Data(); - wxNode *next = node->Next(); - gdk_font_unref( font ); - node = next; - } -} + m_nativeFontInfo.FromString( fontname ); -// ---------------------------------------------------------------------------- -// wxNativeFontInfo -// ---------------------------------------------------------------------------- + InitFromNative(); +} -bool wxNativeFontInfo::FromString(const wxString& s) +void wxFontRefData::ClearGdkFonts() { - xFontName = s; - return TRUE; } -wxString wxNativeFontInfo::ToString() const +wxFontRefData::~wxFontRefData() { - return xFontName; + ClearGdkFonts(); } // ---------------------------------------------------------------------------- -// wxFont +// wxFontRefData SetXXX() // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - -void wxFont::Init() +void wxFontRefData::SetPointSize(int pointSize) { - if (wxTheFontList) - wxTheFontList->Append( this ); + m_pointSize = pointSize; + + m_nativeFontInfo.SetPointSize(pointSize); } -wxFont::wxFont(const wxNativeFontInfo& info) +void wxFontRefData::SetFamily(int family) { - Init(); + m_family = family; - Create(info.ToString()); + // TODO: what are we supposed to do with m_nativeFontInfo here? } -bool wxFont::Create(const wxNativeFontInfo& info) +void wxFontRefData::SetStyle(int style) { - return Create(info.xFontName); + m_style = style; + + m_nativeFontInfo.SetStyle((wxFontStyle)style); } -bool wxFont::Create( int pointSize, - int family, - int style, - int weight, - bool underlined, - const wxString& face, - wxFontEncoding encoding) +void wxFontRefData::SetWeight(int weight) { - m_refData = new wxFontRefData(pointSize, family, style, weight, - underlined, face, encoding); + m_weight = weight; - return TRUE; + m_nativeFontInfo.SetWeight((wxFontWeight)weight); } -bool wxFont::Create(const wxString& fontname, wxFontEncoding enc) +void wxFontRefData::SetUnderlined(bool underlined) { - if( !fontname ) - { - *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT); - return TRUE; - } - - m_refData = new wxFontRefData(); + m_underlined = underlined; - M_FONTDATA->m_nativeFontInfo.xFontName = fontname; // X font name + // the XLFD doesn't have "underlined" field anyhow +} - wxString tmp; +bool wxFontRefData::SetFaceName(const wxString& facename) +{ + m_faceName = facename; - wxStringTokenizer tn( fontname, wxT("-") ); + return m_nativeFontInfo.SetFaceName(facename); +} - tn.GetNextToken(); // skip initial empty token - tn.GetNextToken(); // foundry +void wxFontRefData::SetEncoding(wxFontEncoding encoding) +{ + m_encoding = encoding; +} +void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) +{ + // previously cached fonts shouldn't be used + ClearGdkFonts(); - M_FONTDATA->m_faceName = tn.GetNextToken(); // family + m_nativeFontInfo = info; - tmp = tn.GetNextToken().MakeUpper(); // weight - if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxBOLD; - if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxBOLD; - if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxBOLD; - if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxBOLD; - if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxBOLD; + // set all the other font parameters from the native font info + InitFromNative(); +} - if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT; - if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT; +// ---------------------------------------------------------------------------- +// wxFont creation +// ---------------------------------------------------------------------------- - tmp = tn.GetNextToken().MakeUpper(); // slant - if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC; - if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC; +IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - tn.GetNextToken(); // set width - tn.GetNextToken(); // add. style - tn.GetNextToken(); // pixel size +wxFont::wxFont(const wxNativeFontInfo& info) +{ + Create( info.GetPointSize(), + info.GetFamily(), + info.GetStyle(), + info.GetWeight(), + info.GetUnderlined(), + info.GetFaceName(), + info.GetEncoding() ); +} - tmp = tn.GetNextToken(); // pointsize - if (tmp != wxT("*")) - { - long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10); - M_FONTDATA->m_pointSize = (int)(num / 10); - } +bool wxFont::Create( int pointSize, + int family, + int style, + int weight, + bool underlined, + const wxString& face, + wxFontEncoding encoding) +{ + UnRef(); - tn.GetNextToken(); // x-res - tn.GetNextToken(); // y-res - - tmp = tn.GetNextToken().MakeUpper(); // spacing - - if (tmp == wxT("M")) - M_FONTDATA->m_family = wxMODERN; - else if (M_FONTDATA->m_faceName == wxT("TIMES")) - M_FONTDATA->m_family = wxROMAN; - else if (M_FONTDATA->m_faceName == wxT("HELVETICA")) - M_FONTDATA->m_family = wxSWISS; - else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER")) - M_FONTDATA->m_family = wxTELETYPE; - else if (M_FONTDATA->m_faceName == wxT("LUCIDA")) - M_FONTDATA->m_family = wxDECORATIVE; - else if (M_FONTDATA->m_faceName == wxT("UTOPIA")) - M_FONTDATA->m_family = wxSCRIPT; - - tn.GetNextToken(); // avg width - - // deal with font encoding - M_FONTDATA->m_encoding = enc; - if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM ) - { - wxString registry = tn.GetNextToken().MakeUpper(), - encoding = tn.GetNextToken().MakeUpper(); + m_refData = new wxFontRefData(pointSize, family, style, weight, + underlined, face, encoding); - if ( registry == _T("ISO8859") ) - { - int cp; - if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 ) - { - M_FONTDATA->m_encoding = - (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1); - } - } - else if ( registry == _T("MICROSOFT") ) - { - int cp; - if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 ) - { - M_FONTDATA->m_encoding = - (wxFontEncoding)(wxFONTENCODING_CP1250 + cp); - } - } - else if ( registry == _T("KOI8") ) - { - M_FONTDATA->m_encoding = wxFONTENCODING_KOI8; - } - //else: unknown encoding - may be give a warning here? - else - return FALSE; - } - return TRUE; + return true; } -void wxFont::Unshare() +bool wxFont::Create(const wxString& fontname) { - if (!m_refData) + // VZ: does this really happen? + if ( fontname.empty() ) { - m_refData = new wxFontRefData(); - } - else - { - wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData); - UnRef(); - m_refData = ref; + *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + + return true; } + + m_refData = new wxFontRefData(fontname); + + return true; } wxFont::~wxFont() { - if (wxTheFontList) - wxTheFontList->DeleteObject( this ); } // ---------------------------------------------------------------------------- @@ -330,62 +405,83 @@ int wxFont::GetPointSize() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); - return M_FONTDATA->m_pointSize; + return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize() + : M_FONTDATA->m_pointSize; } wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") ); + wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); - return M_FONTDATA->m_faceName; + return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName() + : M_FONTDATA->m_faceName; } int wxFont::GetFamily() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); - return M_FONTDATA->m_family; + int 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; + + return ret; } int wxFont::GetStyle() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); - return M_FONTDATA->m_style; + return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle() + : M_FONTDATA->m_style; } int wxFont::GetWeight() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); - return M_FONTDATA->m_weight; + return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight() + : M_FONTDATA->m_weight; } bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") ); + wxCHECK_MSG( Ok(), false, wxT("invalid font") ); return M_FONTDATA->m_underlined; } - wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( Ok(), wxFONTENCODING_SYSTEM, wxT("invalid font") ); return M_FONTDATA->m_encoding; } -wxNativeFontInfo *wxFont::GetNativeFontInfo() const +bool wxFont::GetNoAntiAliasing() const { - wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") ); + wxCHECK_MSG( Ok(), false, wxT("invalid font") ); - if(M_FONTDATA->m_nativeFontInfo.xFontName.IsEmpty()) - GetInternalFont(); + return M_FONTDATA->m_noAA; +} - return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo); +const wxNativeFontInfo *wxFont::GetNativeFontInfo() const +{ + wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") ); + + return &(M_FONTDATA->m_nativeFontInfo); } +bool wxFont::IsFixedWidth() const +{ + wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + + return wxFontBase::IsFixedWidth(); +} // ---------------------------------------------------------------------------- // change font attributes @@ -393,136 +489,74 @@ wxNativeFontInfo *wxFont::GetNativeFontInfo() const void wxFont::SetPointSize(int pointSize) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_pointSize = pointSize; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetPointSize(pointSize); } void wxFont::SetFamily(int family) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_family = family; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetFamily(family); } void wxFont::SetStyle(int style) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_style = style; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetStyle(style); } void wxFont::SetWeight(int weight) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_weight = weight; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetWeight(weight); } -void wxFont::SetFaceName(const wxString& faceName) +bool wxFont::SetFaceName(const wxString& faceName) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_faceName = faceName; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + return M_FONTDATA->SetFaceName(faceName) && + wxFontBase::SetFaceName(faceName); } void wxFont::SetUnderlined(bool underlined) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_underlined = underlined; + M_FONTDATA->SetUnderlined(underlined); } void wxFont::SetEncoding(wxFontEncoding encoding) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_encoding = encoding; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now + M_FONTDATA->SetEncoding(encoding); } -void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) +void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info ) { - Unshare(); + AllocExclusive(); - M_FONTDATA->m_nativeFontInfo = info; + M_FONTDATA->SetNativeFontInfo( info ); } -// ---------------------------------------------------------------------------- -// get internal representation of font -// ---------------------------------------------------------------------------- +void wxFont::SetNoAntiAliasing( bool no ) +{ + AllocExclusive(); -static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL; + M_FONTDATA->SetNoAntiAliasing( no ); +} -GdkFont *GtkGetDefaultGuiFont() +wxObjectRefData* wxFont::CreateRefData() const { - if (!g_systemDefaultGuiFont) - { - GtkWidget *widget = gtk_button_new(); - GtkStyle *def = gtk_rc_get_style( widget ); - if (def) - { - g_systemDefaultGuiFont = gdk_font_ref( def->font ); - } - else - { - def = gtk_widget_get_default_style(); - if (def) - g_systemDefaultGuiFont = gdk_font_ref( def->font ); - } - gtk_widget_destroy( widget ); - } - return g_systemDefaultGuiFont; + return new wxFontRefData; } -GdkFont *wxFont::GetInternalFont( float scale ) const +wxObjectRefData* wxFont::CloneRefData(const wxObjectRefData* data) const { - if (!Ok()) - { - wxFAIL_MSG( wxT("invalid font") ); - - return (GdkFont*) NULL; - } - - long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */ - int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100); - GdkFont *font = (GdkFont *) NULL; - - wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale); - if (node) - { - font = (GdkFont*)node->Data(); - } - else - { - if (*this == wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT)) - { - font = GtkGetDefaultGuiFont(); - } - if (!font) - { - font = wxLoadQueryNearestFont( point_scale, - M_FONTDATA->m_family, - M_FONTDATA->m_style, - M_FONTDATA->m_weight, - M_FONTDATA->m_underlined, - M_FONTDATA->m_faceName, - M_FONTDATA->m_encoding, - &M_FONTDATA->m_nativeFontInfo.xFontName ); - } - - M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font ); - } - - // it's quite useless to make it a wxCHECK because we're going to crash - // anyhow... - wxASSERT_MSG( font, wxT("could not load any font?") ); - - return font; + return new wxFontRefData(*wx_static_cast(const wxFontRefData*, data)); } -