/////////////////////////////////////////////////////////////////////////////
-// Name: font.cpp
+// Name: src/gtk1/font.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Copyright: (c) 1998 Robert Roebling and Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "font.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// 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/settings.h"
+ #include "wx/gdicmn.h"
+ #include "wx/crt.h"
+#endif
+
+#include "wx/fontutil.h"
+#include "wx/encinfo.h"
#include "wx/utils.h"
-#include "wx/log.h"
+#include "wx/tokenzr.h"
+
#include <strings.h>
-//-----------------------------------------------------------------------------
-// local data
-//-----------------------------------------------------------------------------
+#include "wx/gtk1/private.h"
+#include <gdk/gdkprivate.h>
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the default size (in points) for the fonts
+static const int wxDEFAULT_FONT_SIZE = 12;
-extern wxFontNameDirectory *wxTheFontNameDirectory;
+// ----------------------------------------------------------------------------
+// wxScaledFontList: maps the font sizes to the GDK fonts for the given font
+// ----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// wxFont
-//-----------------------------------------------------------------------------
+WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
+ wxScaledFontList);
-class wxFontRefData: public wxObjectRefData
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
+
+class wxFontRefData : public wxGDIRefData
{
public:
-
- wxFontRefData();
+ // from broken down font parameters, also default ctor
+ wxFontRefData(int size = -1,
+ wxFontFamily family = wxFONTFAMILY_DEFAULT,
+ wxFontStyle style = wxFONTSTYLE_NORMAL,
+ wxFontWeight 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 );
- ~wxFontRefData();
- wxList m_scaled_xfonts;
- int m_pointSize;
- int m_family, m_style, m_weight;
- bool m_underlined;
- int m_fontId;
- wxString m_faceName;
+ virtual ~wxFontRefData();
- bool m_byXFontName;
- GdkFont *m_font;
+ // do we have the native font info?
+ bool HasNativeFont() const
+ {
+ // only use m_nativeFontInfo if it had been initialized
+ return !m_nativeFontInfo.IsDefault();
+ }
- friend wxFont;
+ // 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(wxFontFamily family);
+ void SetStyle(wxFontStyle style);
+ void SetWeight(wxFontWeight weight);
+ void SetUnderlined(bool underlined);
+ bool SetFaceName(const wxString& facename);
+ void SetEncoding(wxFontEncoding encoding);
+
+ // 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,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
+ bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding);
+
+ // set all fields from (already initialized and valid) m_nativeFontInfo
+ void InitFromNative();
+
+private:
+ // clear m_scaled_xfonts if any
+ void ClearGdkFonts();
+
+ // the map of font sizes to "GdkFont *"
+ wxScaledFontList m_scaled_xfonts;
+
+ int m_pointSize;
+ wxFontFamily m_family;
+ wxFontStyle m_style;
+ wxFontWeight m_weight;
+ bool m_underlined;
+ wxString m_faceName;
+ wxFontEncoding m_encoding; // Unused under GTK 2.0
+
+ // 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;
};
-wxFontRefData::wxFontRefData() : m_scaled_xfonts(wxKEY_INTEGER)
-{
- m_byXFontName = FALSE;
- m_pointSize = 12;
- m_family = wxSWISS;
- m_style = wxNORMAL;
- m_weight = wxNORMAL;
- m_underlined = FALSE;
- m_fontId = 0;
- m_font = (GdkFont *) NULL;
-}
+#define M_FONTDATA ((wxFontRefData*)m_refData)
-wxFontRefData::wxFontRefData( const wxFontRefData& data ) : m_scaled_xfonts(wxKEY_INTEGER)
-{
- m_byXFontName = FALSE;
- 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_fontId = data.m_fontId;
- m_faceName = data.m_faceName;
- m_font = (GdkFont *) NULL;
- if (data.m_font) m_font = gdk_font_ref( data.m_font );
-}
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
-wxFontRefData::~wxFontRefData()
+void wxFontRefData::Init(int pointSize,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
+ bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding)
{
- wxNode *node = m_scaled_xfonts.First();
- while (node)
- {
- GdkFont *font = (GdkFont*)node->Data();
- wxNode *next = node->Next();
- gdk_font_unref( font );
- node = next;
- }
- if (m_font) gdk_font_unref( m_font );
-}
+ m_family = family == wxFONTFAMILY_DEFAULT ? wxFONTFAMILY_SWISS : family;
-//-----------------------------------------------------------------------------
+ m_faceName = faceName;
-#define M_FONTDATA ((wxFontRefData *)m_refData)
+ // we accept both wxDEFAULT and wxNORMAL here - should we?
+ m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style;
+ m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight;
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+ // 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;
-wxFont::wxFont()
-{
- if (wxTheFontList) wxTheFontList->Append( this );
+ m_underlined = underlined;
+ m_encoding = encoding;
}
-wxFont::wxFont( char *xFontName )
+void wxFontRefData::InitFromNative()
{
- if (!xFontName) return;
+ // get the font parameters from the XLFD
+ // -------------------------------------
- m_refData = new wxFontRefData();
+ m_faceName = m_nativeFontInfo.GetXFontComponent(wxXLFD_FAMILY);
- M_FONTDATA->m_byXFontName = TRUE;
- M_FONTDATA->m_font = gdk_font_load( xFontName );
-}
+ m_weight = wxFONTWEIGHT_NORMAL;
-wxFont::wxFont( int pointSize, int family, int style, int weight, bool underlined = FALSE,
- const wxString& face = wxEmptyString )
-{
- m_refData = new wxFontRefData();
+ wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();
+ if ( !w.empty() && w != wxT('*') )
+ {
+ // the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD
+ // and BLACK
+ if ( ((w[0u] == wxT('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||
+ !wxStrcmp(w.c_str() + 1, wxT("LACK"))))) ||
+ wxStrstr(w.c_str() + 1, wxT("BOLD")) )
+ {
+ m_weight = wxFONTWEIGHT_BOLD;
+ }
+ else if ( w == wxT("LIGHT") || w == wxT("THIN") )
+ {
+ m_weight = wxFONTWEIGHT_LIGHT;
+ }
+ }
- if (family == wxDEFAULT) family = wxSWISS;
- M_FONTDATA->m_family = family;
-
- if (!face.IsEmpty())
+ switch ( wxToupper(m_nativeFontInfo.
+ GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )
{
- M_FONTDATA->m_faceName = face;
- M_FONTDATA->m_fontId = wxTheFontNameDirectory->FindOrCreateFontId( face, family );
- M_FONTDATA->m_family = wxTheFontNameDirectory->GetFamily( family );
+ case wxT('I'): // italique
+ m_style = wxFONTSTYLE_ITALIC;
+ break;
+
+ case wxT('O'): // oblique
+ m_style = wxFONTSTYLE_SLANT;
+ break;
+
+ default:
+ m_style = wxFONTSTYLE_NORMAL;
+ }
+
+ long ptSize;
+ if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_POINTSIZE).ToLong(&ptSize) )
+ {
+ // size in XLFD is in 10 point units
+ m_pointSize = (int)(ptSize / 10);
}
else
{
- M_FONTDATA->m_fontId = family;
- M_FONTDATA->m_family = wxTheFontNameDirectory->GetFamily( family );
+ m_pointSize = wxDEFAULT_FONT_SIZE;
}
- if (style == wxDEFAULT) style = wxNORMAL;
- M_FONTDATA->m_style = style;
- if (weight == wxDEFAULT) weight = wxNORMAL;
- M_FONTDATA->m_weight = weight;
- if (pointSize == wxDEFAULT) pointSize = 12;
- M_FONTDATA->m_pointSize = pointSize;
- M_FONTDATA->m_underlined = underlined;
+ // examine the spacing: if the font is monospaced, assume wxTELETYPE
+ // family for compatibility with the old code which used it instead of
+ // IsFixedWidth()
+ if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == wxT('M') )
+ {
+ m_family = wxFONTFAMILY_TELETYPE;
+ }
+ else // not monospaceed
+ {
+ // don't even try guessing it, it doesn't work for too many fonts
+ // anyhow
+ m_family = wxFONTFAMILY_UNKNOWN;
+ }
- if (wxTheFontList) wxTheFontList->Append( this );
-
-}
+ // X fonts are never underlined...
+ m_underlined = false;
-wxFont::wxFont( const wxFont& font )
-{
- Ref( font );
+ // deal with font encoding
+ wxString
+ registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(),
+ encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper();
- if (wxTheFontList) wxTheFontList->Append( this );
+ if ( registry == wxT("ISO8859") )
+ {
+ int cp;
+ if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
+ {
+ m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
+ }
+ }
+ else if ( registry == wxT("MICROSOFT") )
+ {
+ int cp;
+ if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
+ {
+ m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
+ }
+ }
+ else if ( registry == wxT("KOI8") )
+ {
+ m_encoding = wxFONTENCODING_KOI8;
+ }
+ else // unknown encoding
+ {
+ // may be give a warning here? or use wxFontMapper?
+ m_encoding = wxFONTENCODING_SYSTEM;
+ }
}
-wxFont::~wxFont()
+wxFontRefData::wxFontRefData( const wxFontRefData& data )
+ : wxGDIRefData()
{
- if (wxTheFontList) wxTheFontList->DeleteObject( this );
-}
+ m_pointSize = data.m_pointSize;
+ m_family = data.m_family;
+ m_style = data.m_style;
+ m_weight = data.m_weight;
-wxFont& wxFont::operator = ( const wxFont& font )
-{
- if (*this == font) return (*this);
- Ref( font );
- return *this;
-}
+ m_underlined = data.m_underlined;
-bool wxFont::operator == ( const wxFont& font )
-{
- return m_refData == font.m_refData;
-}
+ m_faceName = data.m_faceName;
+ m_encoding = data.m_encoding;
-bool wxFont::operator != ( const wxFont& font )
-{
- return m_refData != font.m_refData;
+ // 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());
}
-bool wxFont::Ok() const
+wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
+ wxFontWeight weight, bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding)
{
- return (m_refData != NULL);
+ Init(size, family, style, weight, underlined, faceName, encoding);
}
-int wxFont::GetPointSize() const
+wxFontRefData::wxFontRefData(const wxString& fontname)
{
- wxCHECK_MSG( Ok(), 0, "invalid font" );
+ // FromString() should really work in GTK1 too, doesn't it?
+ m_nativeFontInfo.SetXFontName(fontname);
- return M_FONTDATA->m_pointSize;
+ InitFromNative();
}
-wxString wxFont::GetFaceName() const
+void wxFontRefData::ClearGdkFonts()
{
- wxCHECK_MSG( Ok(), "", "invalid font" );
+ for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin();
+ i != m_scaled_xfonts.end();
+ ++i )
+ {
+ GdkFont *font = i->second;
+ gdk_font_unref( font );
+ }
- wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
- return s;
+ m_scaled_xfonts.clear();
}
-int wxFont::GetFamily() const
+wxFontRefData::~wxFontRefData()
{
- wxCHECK_MSG( Ok(), 0, "invalid font" );
-
- return M_FONTDATA->m_family;
+ ClearGdkFonts();
}
-wxString wxFont::GetFamilyString() const
+// ----------------------------------------------------------------------------
+// wxFontRefData SetXXX()
+// ----------------------------------------------------------------------------
+
+void wxFontRefData::SetPointSize(int pointSize)
{
- wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
+ m_pointSize = pointSize;
- switch (M_FONTDATA->m_family)
+ if ( HasNativeFont() )
{
- case wxDECORATIVE: return wxString("wxDECORATIVE");
- case wxROMAN: return wxString("wxROMAN");
- case wxSCRIPT: return wxString("wxSCRIPT");
- case wxSWISS: return wxString("wxSWISS");
- case wxMODERN: return wxString("wxMODERN");
- case wxTELETYPE: return wxString("wxTELETYPE");
- default: return "wxDEFAULT";
- }
-
- return "wxDEFAULT";
-}
-
-int wxFont::GetFontId() const
-{
- wxCHECK_MSG( Ok(), 0, "invalid font" );
+ wxString size;
+ if ( pointSize == -1 )
+ size = wxT('*');
+ else
+ size.Printf(wxT("%d"), 10*pointSize);
- return M_FONTDATA->m_fontId; // stub
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size);
+ }
}
-int wxFont::GetStyle() const
+void wxFontRefData::SetFamily(wxFontFamily family)
{
- wxCHECK_MSG( Ok(), 0, "invalid font" );
+ m_family = family;
- return M_FONTDATA->m_style;
+ // TODO: what are we supposed to do with m_nativeFontInfo here?
}
-wxString wxFont::GetStyleString() const
+void wxFontRefData::SetStyle(wxFontStyle style)
{
- wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
+ m_style = style;
- switch (M_FONTDATA->m_style)
+ if ( HasNativeFont() )
{
- case wxNORMAL: return wxString("wxNORMAL");
- case wxSLANT: return wxString("wxSLANT");
- case wxITALIC: return wxString("wxITALIC");
- default: return wxString("wxDEFAULT");
- }
+ wxString slant;
+ switch ( style )
+ {
+ case wxFONTSTYLE_ITALIC:
+ slant = wxT('i');
+ break;
- return wxString("wxDEFAULT");
-}
+ case wxFONTSTYLE_SLANT:
+ slant = wxT('o');
+ break;
-int wxFont::GetWeight() const
-{
- wxCHECK_MSG( Ok(), 0, "invalid font" );
+ default:
+ wxFAIL_MSG( wxT("unknown font style") );
+ // fall through
- return M_FONTDATA->m_weight;
+ case wxFONTSTYLE_NORMAL:
+ slant = wxT('r');
+ }
+
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant);
+ }
}
-wxString wxFont::GetWeightString() const
+void wxFontRefData::SetWeight(wxFontWeight weight)
{
- wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
+ m_weight = weight;
- switch (M_FONTDATA->m_weight)
+ if ( HasNativeFont() )
{
- case wxNORMAL: return wxString("wxNORMAL");
- case wxBOLD: return wxString("wxBOLD");
- case wxLIGHT: return wxString("wxLIGHT");
- default: return wxString("wxDEFAULT");
- }
+ wxString boldness;
+ switch ( weight )
+ {
+ case wxFONTWEIGHT_BOLD:
+ boldness = wxT("bold");
+ break;
- return wxString("wxDEFAULT");
-}
+ case wxFONTWEIGHT_LIGHT:
+ boldness = wxT("light");
+ break;
-bool wxFont::GetUnderlined() const
-{
- wxCHECK_MSG( Ok(), FALSE, "invalid font" );
+ default:
+ wxFAIL_MSG( wxT("unknown font weight") );
+ // fall through
- return M_FONTDATA->m_underlined;
-}
+ case wxFONTWEIGHT_NORMAL:
+ // unspecified
+ boldness = wxT("medium");
+ }
-void wxFont::Unshare()
-{
- if (!m_refData)
- {
- m_refData = new wxFontRefData();
- }
- else
- {
- wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
- UnRef();
- m_refData = ref;
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness);
}
}
-void wxFont::SetPointSize(int pointSize)
+void wxFontRefData::SetUnderlined(bool underlined)
{
- Unshare();
+ m_underlined = underlined;
- M_FONTDATA->m_pointSize = pointSize;
+ // the XLFD doesn't have "underlined" field anyhow
}
-void wxFont::SetFamily(int family)
+bool wxFontRefData::SetFaceName(const wxString& facename)
{
- Unshare();
+ m_faceName = facename;
+
+ if ( HasNativeFont() )
+ {
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
+ }
- M_FONTDATA->m_family = family;
+ return true;
}
-void wxFont::SetStyle(int style)
+void wxFontRefData::SetEncoding(wxFontEncoding encoding)
{
- Unshare();
+ m_encoding = encoding;
- M_FONTDATA->m_style = style;
+ if ( HasNativeFont() )
+ {
+ wxNativeEncodingInfo info;
+ if ( wxGetNativeFontEncoding(encoding, &info) )
+ {
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_REGISTRY, info.xregistry);
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding);
+ }
+ }
}
-void wxFont::SetWeight(int weight)
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
{
- Unshare();
+ // previously cached fonts shouldn't be used
+ ClearGdkFonts();
- M_FONTDATA->m_weight = weight;
+ m_nativeFontInfo = info;
+
+ // set all the other font parameters from the native font info
+ InitFromNative();
}
-void wxFont::SetFaceName(const wxString& faceName)
-{
- Unshare();
+// ----------------------------------------------------------------------------
+// wxFont creation
+// ----------------------------------------------------------------------------
- M_FONTDATA->m_faceName = faceName;
+wxFont::wxFont(const wxNativeFontInfo& info)
+{
+ (void) Create(info.GetXFontName());
}
-void wxFont::SetUnderlined(bool underlined)
+bool wxFont::Create( int pointSize,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
+ bool underlined,
+ const wxString& face,
+ wxFontEncoding encoding)
{
- Unshare();
+ UnRef();
- M_FONTDATA->m_underlined = underlined;
-}
-
-//-----------------------------------------------------------------------------
-// get internal representation of font
-//-----------------------------------------------------------------------------
+ m_refData = new wxFontRefData(pointSize, family, style, weight,
+ underlined, face, encoding);
-// local help function
-static GdkFont *wxLoadQueryNearestFont(int point_size, int fontid,
- int style, int weight,
- bool underlined);
+ return true;
+}
-GdkFont *wxFont::GetInternalFont(float scale) const
+bool wxFont::Create(const wxString& fontname)
{
- if (!Ok())
+ // VZ: does this really happen?
+ if ( fontname.empty() )
{
- wxFAIL_MSG( "invalid font" );
- return (GdkFont*) NULL;
+ *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+ return true;
}
- if (M_FONTDATA->m_byXFontName) return M_FONTDATA->m_font;
+ m_refData = new wxFontRefData(fontname);
- long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
- int point_scale = (M_FONTDATA->m_pointSize * 10 * int_scale) / 100;
- GdkFont *font = (GdkFont *) NULL;
+ return true;
+}
- wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
- if (node)
+void wxFont::Unshare()
+{
+ if (!m_refData)
{
- font = (GdkFont*)node->Data();
+ m_refData = new wxFontRefData();
}
else
{
- if ((int_scale == 100) &&
- (M_FONTDATA->m_family == wxSWISS) &&
- (M_FONTDATA->m_style == wxNORMAL) &&
- (M_FONTDATA->m_pointSize == 12) &&
- (M_FONTDATA->m_weight == wxNORMAL) &&
- (M_FONTDATA->m_underlined == FALSE))
- {
- font = gdk_font_load( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" );
- }
- else
- {
- font = wxLoadQueryNearestFont( point_scale, M_FONTDATA->m_fontId, M_FONTDATA->m_style,
- M_FONTDATA->m_weight, M_FONTDATA->m_underlined );
- }
- M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
+ wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
+ UnRef();
+ m_refData = ref;
}
- if (!font)
- wxLogError("could not load any font");
-
- return font;
}
-//-----------------------------------------------------------------------------
-// local utilities to find a X font
-//-----------------------------------------------------------------------------
-
-static GdkFont *wxLoadQueryFont(int point_size, int fontid, int style,
- int weight, bool WXUNUSED(underlined))
+wxFont::~wxFont()
{
- char buffer[512];
- char *name = wxTheFontNameDirectory->GetScreenName( fontid, weight, style );
-
- if (!name)
- name = "-*-*-*-*-*-*-*-%d-*-*-*-*-*-*";
- sprintf(buffer, name, point_size);
+}
- return gdk_font_load( buffer );
+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+ return new wxFontRefData;
}
-static GdkFont *wxLoadQueryNearestFont(int point_size, int fontid,
- int style, int weight,
- bool underlined)
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
{
- GdkFont *font;
+ return new wxFontRefData(*static_cast<const wxFontRefData *>(data));
+}
- font = wxLoadQueryFont( point_size, fontid, style, weight, underlined );
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
- if (!font) {
- // search up and down by stepsize 10
- int max_size = point_size + 20 * (1 + (point_size/180));
- int min_size = point_size - 20 * (1 + (point_size/180));
- int i;
+int wxFont::GetPointSize() const
+{
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
- // Search for smaller size (approx.)
- for (i=point_size-10; !font && i >= 10 && i >= min_size; i -= 10)
- font = wxLoadQueryFont(i, fontid, style, weight, underlined);
- // Search for larger size (approx.)
- for (i=point_size+10; !font && i <= max_size; i += 10)
- font = wxLoadQueryFont(i, fontid, style, weight, underlined);
- // Try default family
- if (!font && fontid != wxDEFAULT)
- font = wxLoadQueryFont(point_size, wxDEFAULT, style,
- weight, underlined);
- // Bogus font
- if (!font)
- font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
- underlined);
- }
- return font;
+ return M_FONTDATA->m_pointSize;
}
-//-----------------------------------------------------------------------------
-// face names and index functions
-//-----------------------------------------------------------------------------
-
-static char *font_defaults[] = {
- "FamilyDefault", "Default",
- "FamilyRoman", "Roman",
- "FamilyDecorative", "Decorative",
- "FamilyModern", "Modern",
- "FamilyTeletype", "Teletype",
- "FamilySwiss", "Swiss",
- "FamilyScript", "Script",
-
- "AfmMedium", "",
- "AfmBold", "Bo",
- "AfmLight", "",
- "AfmStraight", "",
- "AfmItalic", "${AfmSlant}",
- "AfmSlant", "O",
- "AfmRoman", "Ro",
- "AfmTimes", "Times",
- "AfmHelvetica", "Helv",
- "AfmCourier", "Cour",
-
- "Afm___", "${AfmTimes,$[weight],$[style]}",
-
- "AfmTimes__", "${AfmTimes}${Afm$[weight]}${Afm$[style]}",
- "AfmTimesMediumStraight", "${AfmTimes}${AfmRoman}",
- "AfmTimesLightStraight", "${AfmTimes}${AfmRoman}",
- "AfmTimes_Italic", "${AfmTimes}$[weight]${AfmItalic}",
- "AfmTimes_Slant", "${AfmTimes}$[weight]${AfmItalic}",
-
- "AfmSwiss__", "${AfmHelvetica}${Afm$[weight]}${Afm$[style]}",
- "AfmModern__", "${AfmCourier}${Afm$[weight]}${Afm$[style]}",
-
- "AfmTeletype__", "${AfmModern,$[weight],$[style]}",
-
- "PostScriptMediumStraight", "",
- "PostScriptMediumItalic", "-Oblique",
- "PostScriptMediumSlant", "-Oblique",
- "PostScriptLightStraight", "",
- "PostScriptLightItalic", "-Oblique",
- "PostScriptLightSlant", "-Oblique",
- "PostScriptBoldStraight", "-Bold",
- "PostScriptBoldItalic", "-BoldOblique",
- "PostScriptBoldSlant", "-BoldOblique",
-
-#if WX_NORMALIZED_PS_FONTS
- "PostScript___", "${PostScriptTimes,$[weight],$[style]}",
-#else
- "PostScriptRoman__", "${PostScriptTimes,$[weight],$[style]}",
- "PostScript___", "LucidaSans${PostScript$[weight]$[style]}",
-#endif
-
- "PostScriptTimesMedium", "",
- "PostScriptTimesLight", "",
- "PostScriptTimesBold", "Bold",
+wxString wxFont::GetFaceName() const
+{
+ wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
- "PostScriptTimes__", "Times${PostScript$[weight]$[style]}",
- "PostScriptTimesMediumStraight", "Times-Roman",
- "PostScriptTimesLightStraight", "Times-Roman",
- "PostScriptTimes_Slant", "Times-${PostScriptTimes$[weight]}Italic",
- "PostScriptTimes_Italic", "Times-${PostScriptTimes$[weight]}Italic",
+ return M_FONTDATA->m_faceName;
+}
- "PostScriptSwiss__", "Helvetica${PostScript$[weight]$[style]}",
- "PostScriptModern__", "Courier${PostScript$[weight]$[style]}",
+wxFontFamily wxFont::DoGetFamily() const
+{
+ return M_FONTDATA->m_family;
+}
- "PostScriptTeletype__", "${PostScriptModern,$[weight],$[style]}",
+wxFontStyle wxFont::GetStyle() const
+{
+ wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
-#if !WX_NORMALIZED_PS_FONTS
- "PostScriptScript__", "Zapf-Chancery-MediumItalic",
-#endif
+ return M_FONTDATA->m_style;
+}
- "ScreenMedium", "medium",
- "ScreenBold", "bold",
- "ScreenLight", "light",
- "ScreenStraight", "r",
- "ScreenItalic", "i",
- "ScreenSlant", "o",
-
- "ScreenDefaultBase", "misc-fixed",
- "ScreenRomanBase", "*-times",
- "ScreenDecorativeBase", "*-helvetica",
- "ScreenModernBase", "*-courier",
- "ScreenTeletypeBase", "*-lucidatypewriter",
- "ScreenSwissBase", "*-lucida",
- "ScreenScriptBase", "*-zapfchancery",
-
- "ScreenStdSuffix", "-${Screen$[weight]}-${Screen$[style]}"
- "-normal-*-*-%d-*-*-*-*-*-*",
-
- "Screen___",
- "-${ScreenDefaultBase}${ScreenStdSuffix}",
- "ScreenRoman__",
- "-${ScreenRomanBase}${ScreenStdSuffix}",
- "ScreenDecorative__",
- "-${ScreenDecorativeBase}${ScreenStdSuffix}",
- "ScreenModern__",
- "-${ScreenModernBase}${ScreenStdSuffix}",
- "ScreenTeletype__",
- "-${ScreenTeletypeBase}${ScreenStdSuffix}",
- "ScreenSwiss__",
- "-${ScreenSwissBase}${ScreenStdSuffix}",
- "ScreenScript__",
- "-${ScreenScriptBase}${ScreenStdSuffix}",
- (char *) NULL
-};
+wxFontWeight wxFont::GetWeight() const
+{
+ wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
-enum {wxWEIGHT_NORMAL, wxWEIGHT_BOLD, wxWEIGHT_LIGHT, wxNUM_WEIGHTS};
-enum {wxSTYLE_NORMAL, wxSTYLE_ITALIC, wxSTYLE_SLANT, wxNUM_STYLES};
+ return M_FONTDATA->m_weight;
+}
-static int WCoordinate(int w)
+bool wxFont::GetUnderlined() const
{
- switch (w)
- {
- case wxBOLD: return wxWEIGHT_BOLD;
- case wxLIGHT: return wxWEIGHT_LIGHT;
- case wxNORMAL:
- default: return wxWEIGHT_NORMAL;
- }
-};
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
-static int SCoordinate(int s)
+ return M_FONTDATA->m_underlined;
+}
+
+wxFontEncoding wxFont::GetEncoding() const
{
- switch (s)
- {
- case wxITALIC: return wxSTYLE_ITALIC;
- case wxSLANT: return wxSTYLE_SLANT;
- case wxNORMAL:
- default: return wxSTYLE_NORMAL;
- }
-};
+ wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
-//-----------------------------------------------------------------------------
-// wxSuffixMap
-//-----------------------------------------------------------------------------
+ // m_encoding is unused in wxGTK2, return encoding that the user set.
+ return M_FONTDATA->m_encoding;
+}
-class wxSuffixMap
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
-public:
- ~wxSuffixMap();
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );
- inline char *GetName(int weight, int style)
+ if ( !M_FONTDATA->HasNativeFont() )
{
- return ( map [WCoordinate(weight)] [SCoordinate(style)] );
+ // NB: this call has important side-effect: it not only finds
+ // GdkFont representation, it also initializes m_nativeFontInfo
+ // by calling its SetXFontName method
+ GetInternalFont();
}
- char *map[wxNUM_WEIGHTS][wxNUM_STYLES];
- void Initialize(const char *, const char *);
-};
+ return &(M_FONTDATA->m_nativeFontInfo);
+}
-static void SearchResource(const char *prefix, const char **names, int count, char **v)
+bool wxFont::IsFixedWidth() const
{
- int k, i, j;
- char resource[1024], **defaults, *internal;
-
- k = 1 << count;
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
- *v = (char *) NULL;
- internal = (char *) NULL;
-
- for (i = 0; i < k; i++)
- {
- strcpy(resource, prefix);
- for (j = 0; j < count; j++)
- {
- /* upon failure to find a matching fontname
- in the default fonts above, we substitute more
- and more values by _ so that at last ScreenMyFontBoldNormal
- would turn into Screen___ and this will then get
- converted to -${ScreenDefaultBase}${ScreenStdSuffix}
- */
-
- if (!(i & (1 << j)))
- strcat(resource, names[j]);
- else
- strcat(resource, "_");
- }
-
- /* we previously search the Xt-resources here */
-
- if (!internal)
- {
- defaults = font_defaults;
- while (*defaults)
- {
- if (!strcmp(*defaults, resource))
- {
- internal = defaults[1];
- break;
- }
- defaults += 2;
- }
- }
- }
-
- if (internal)
+ if ( M_FONTDATA->HasNativeFont() )
{
- if (strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0)
- {
- /* we did not find any font name in the standard list.
- this can (hopefully does) mean that someone supplied
- the facename in the wxFont constructor so we insert
- it here */
-
- strcpy( resource,"-*-" ); /* any producer */
- strcat( resource, names[0] ); /* facename */
- strcat( resource, "${ScreenStdSuffix}" ); /* add size params later on */
- *v = copystring(resource);
- }
- else
- {
- *v = copystring(internal);
- }
+ // the monospace fonts are supposed to have "M" in the spacing field
+ wxString spacing = M_FONTDATA->
+ m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING);
+
+ return spacing.Upper() == wxT('M');
}
+
+ return wxFontBase::IsFixedWidth();
}
-wxSuffixMap::~wxSuffixMap()
+// ----------------------------------------------------------------------------
+// change font attributes
+// ----------------------------------------------------------------------------
+
+void wxFont::SetPointSize(int pointSize)
{
- int k, j;
+ Unshare();
- for (k = 0; k < wxNUM_WEIGHTS; ++k)
- for (j = 0; j < wxNUM_STYLES; ++j)
- if (map[k][j])
- {
- delete[] map[k][j];
- map[k][j] = (char *) NULL;
- }
+ M_FONTDATA->SetPointSize(pointSize);
}
-void wxSuffixMap::Initialize(const char *resname, const char *devresname)
+void wxFont::SetFamily(wxFontFamily family)
{
- const char *weight, *style;
- char *v;
- int i, j, k;
- const char *names[3];
+ Unshare();
- for (k = 0; k < wxNUM_WEIGHTS; k++)
- {
- switch (k)
- {
- case wxWEIGHT_NORMAL: weight = "Medium"; break;
- case wxWEIGHT_LIGHT: weight = "Light"; break;
- case wxWEIGHT_BOLD:
- default: weight = "Bold";
- }
- for (j = 0; j < wxNUM_STYLES; j++)
- {
- switch (j)
- {
- case wxSTYLE_NORMAL: style = "Straight"; break;
- case wxSTYLE_ITALIC: style = "Italic"; break;
- case wxSTYLE_SLANT:
- default: style = "Slant";
- }
- names[0] = resname;
- names[1] = weight;
- names[2] = style;
-
- SearchResource(devresname, names, 3, &v);
-
- /* Expand macros in the found string: */
-found:
- int len, closer = 0, startpos = 0;
-
- len = (v ? strlen(v) : 0);
- for (i = 0; i < len; i++)
- {
- if (v[i] == '$' && ((v[i+1] == '[') || (v[i+1] == '{')))
- {
- startpos = i;
- closer = (v[i+1] == '[') ? ']' : '}';
- ++i;
- }
- else if (v[i] == closer)
- {
- int newstrlen;
- const char *r = (char *) NULL; bool delete_r = FALSE;
- char *name;
-
- name = v + startpos + 2;
- v[i] = 0;
-
- if (closer == '}')
- {
- int i, count, len;
- char **names;
-
- for (i = 0, count = 1; name[i]; i++)
- if (name[i] == ',')
- count++;
-
- len = i;
-
- names = new char*[count];
- names[0] = name;
- for (i = 0, count = 1; i < len; i++)
- if (name[i] == ',')
- {
- names[count++] = name + i + 1;
- name[i] = 0;
- }
-
- SearchResource("", (const char **)names, count, (char **)&r);
- delete_r = (r != 0);
- delete[] names;
-
- if (!r)
- {
- for (i = 0; i < len; i++)
- if (!name[i])
- name[i] = ',';
- r = "";
- wxLogError( "Bad resource name in font lookup." );
- }
- } else if (!strcmp(name, "weight")) {
- r = weight;
- } else if (!strcmp(name, "style")) {
- r = style;
- } else if (!strcmp(name, "family")) {
- r = resname;
- } else {
- r = "";
- wxLogError( "Bad font macro name." );
- }
-
- // add r to v
- newstrlen = strlen(r);
- char *naya = new char[startpos + newstrlen + len - i];
- memcpy(naya, v, startpos);
- memcpy(naya + startpos, r, newstrlen);
- memcpy(naya + startpos + newstrlen, v + i + 1, len - i);
- if (delete_r)
- delete[] (char*)r;
- delete[] v;
- v = naya;
-
- goto found;
- }
- }
- /* We have a final value: */
- map[k][j] = v;
- }
- }
+ M_FONTDATA->SetFamily(family);
}
-//-----------------------------------------------------------------------------
-// wxFontNameItem
-//-----------------------------------------------------------------------------
-
-class wxFontNameItem : public wxObject
+void wxFont::SetStyle(wxFontStyle style)
{
- DECLARE_DYNAMIC_CLASS(wxFontNameItem)
-public:
- wxFontNameItem(const char *name, int id, int family);
- ~wxFontNameItem();
-
- inline char* GetScreenName(int w, int s) {return screen.GetName(w, s);}
- inline char* GetPostScriptName(int w, int s) {return printing.GetName(w, s);}
- inline char* GetAFMName(int w, int s) {return afm.GetName(w, s);}
- inline char* GetName() {return name;}
- inline int GetFamily() {return family;}
- inline int GetId() {return id;}
- inline bool IsRoman() {return isroman;}
-#if defined(__WXDEBUG__)
- void Dump(ostream& str);
-#endif
-
- int id;
- int family;
- char *name;
- wxSuffixMap screen, printing, afm;
- bool isroman;
-};
+ Unshare();
-IMPLEMENT_ABSTRACT_CLASS(wxFontNameItem, wxObject)
+ M_FONTDATA->SetStyle(style);
+}
-wxFontNameItem::wxFontNameItem(const char *Name, int Id, int Family)
+void wxFont::SetWeight(wxFontWeight weight)
{
- name = copystring(Name);
- id = Id;
- family = Family;
+ Unshare();
- screen. Initialize(name, "Screen");
- printing.Initialize(name, "PostScript");
- afm. Initialize(name, "Afm");
+ M_FONTDATA->SetWeight(weight);
}
-wxFontNameItem::~wxFontNameItem()
+bool wxFont::SetFaceName(const wxString& faceName)
{
- if (name)
- delete[] name;
- name = (char *) NULL;
-}
+ Unshare();
-#if defined(__WXDEBUG__)
-void wxFontNameItem::Dump(ostream& str)
-{
- str << "wxFontNameItem(" << name << ")";
+ return M_FONTDATA->SetFaceName(faceName) &&
+ wxFontBase::SetFaceName(faceName);
}
-#endif
-//-----------------------------------------------------------------------------
-// wxFontDirectory
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
-
-wxFontNameDirectory::wxFontNameDirectory()
+void wxFont::SetUnderlined(bool underlined)
{
- table = new wxHashTable(wxKEY_INTEGER, 20);
- nextFontId = -1;
-}
+ Unshare();
-wxFontNameDirectory::~wxFontNameDirectory()
-{
- // Cleanup wxFontNameItems allocated
- table->BeginFind();
- wxNode *node = table->Next();
- while (node)
- {
- wxFontNameItem *item = (wxFontNameItem*)node->Data();
- delete item;
- node = table->Next();
- }
- delete table;
+ M_FONTDATA->SetUnderlined(underlined);
}
-int wxFontNameDirectory::GetNewFontId()
+void wxFont::SetEncoding(wxFontEncoding encoding)
{
- return (nextFontId--);
-}
+ Unshare();
-void wxFontNameDirectory::Initialize()
-{
- Initialize(wxDEFAULT, wxDEFAULT, "Default");
- Initialize(wxDECORATIVE, wxDECORATIVE, "Decorative");
- Initialize(wxROMAN, wxROMAN, "Roman");
- Initialize(wxMODERN, wxMODERN, "Modern");
- Initialize(wxTELETYPE, wxTELETYPE, "Teletype");
- Initialize(wxSWISS, wxSWISS, "Swiss");
- Initialize(wxSCRIPT, wxSCRIPT, "Script");
+ M_FONTDATA->SetEncoding(encoding);
}
-void wxFontNameDirectory::Initialize(int fontid, int family, const char *resname)
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
{
- char *fam, resource[256];
+ Unshare();
- sprintf(resource, "Family%s", resname);
- SearchResource((const char *)resource, (const char **) NULL, 0, (char **)&fam);
-
- if (fam)
- {
- if (!strcmp(fam, "Default")) family = wxDEFAULT;
- else if (!strcmp(fam, "Roman")) family = wxROMAN;
- else if (!strcmp(fam, "Decorative")) family = wxDECORATIVE;
- else if (!strcmp(fam, "Modern")) family = wxMODERN;
- else if (!strcmp(fam, "Teletype")) family = wxTELETYPE;
- else if (!strcmp(fam, "Swiss")) family = wxSWISS;
- else if (!strcmp(fam, "Script")) family = wxSCRIPT;
- delete[] fam; // free resource
- }
- table->Put(fontid, new wxFontNameItem(resname, fontid, family));
+ M_FONTDATA->SetNativeFontInfo( info );
}
-int wxFontNameDirectory::FindOrCreateFontId(const char *name, int family)
-{
- int id;
-
- // font exists -> return id
- if ( (id = GetFontId(name)) ) return id;
-
- // create new font
- Initialize(id=GetNewFontId(), family, name);
- return id;
-}
+// ----------------------------------------------------------------------------
+// get internal representation of font
+// ----------------------------------------------------------------------------
-char *wxFontNameDirectory::GetScreenName(int fontid, int weight, int style)
-{
- wxFontNameItem *item = (wxFontNameItem*)table->Get(fontid); // find font
- if (item)
- return item->GetScreenName(weight, style);
-
- // font does not exist
- return (char *) NULL;
-}
+static GdkFont *g_systemDefaultGuiFont = NULL;
-char *wxFontNameDirectory::GetPostScriptName(int fontid, int weight, int style)
+// this is also used from toolbar.cpp and tooltip.cpp, hence extern
+extern GdkFont *GtkGetDefaultGuiFont()
{
- wxFontNameItem *item = (wxFontNameItem*)table->Get(fontid); // find font
- if (item)
- return item->GetPostScriptName(weight, style);
-
- // font does not exist
- return (char *) NULL;
-}
+ 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 );
+ }
+ else
+ {
+ // already have it, but ref it once more before returning
+ gdk_font_ref(g_systemDefaultGuiFont);
+ }
-char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style)
-{
- wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
- if (item)
- return item->GetAFMName(weight, style);
- // font does not exist
- return (char *) NULL;
+ return g_systemDefaultGuiFont;
}
-char *wxFontNameDirectory::GetFontName(int fontid)
+GdkFont *wxFont::GetInternalFont( float scale ) const
{
- wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
- if (item)
- return item->GetName();
-
- // font does not exist
- return (char *) NULL;
-}
+ GdkFont *font = NULL;
-int wxFontNameDirectory::GetFontId(const char *name)
-{
- wxNode *node;
+ wxCHECK_MSG( IsOk(), font, wxT("invalid font") );
- table->BeginFind();
+ long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
+ int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
- while ( (node = table->Next()) )
+ wxScaledFontList& list = M_FONTDATA->m_scaled_xfonts;
+ wxScaledFontList::iterator i = list.find(int_scale);
+ if ( i != list.end() )
{
- wxFontNameItem *item = (wxFontNameItem*)node->Data();
- if (!strcmp(name, item->name))
- return item->id;
+ font = i->second;
}
-
- // font does not exist
- return 0;
-}
+ else // we don't have this font in this size yet
+ {
+ if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
+ {
+ font = GtkGetDefaultGuiFont();
+ }
-int wxFontNameDirectory::GetFamily(int fontid)
-{
- wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid);
+ if ( !font )
+ {
+ // do we have the XLFD?
+ if ( int_scale == 100 && M_FONTDATA->HasNativeFont() )
+ {
+ font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());
+ }
+
+ // no XLFD of no exact match - try the approximate one now
+ if ( !font )
+ {
+ wxString xfontname;
+ 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,
+ &xfontname);
+ // NB: wxFont::GetNativeFontInfo relies on this
+ // side-effect of GetInternalFont
+ if ( int_scale == 100 )
+ M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
+ }
+ }
+
+ if ( font )
+ {
+ list[int_scale] = font;
+ }
+ }
- if (item)
- return item->family;
-
- // font does not exist
- return wxDEFAULT;
+ // 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;
}
projects / wxWidgets.git / blobdiff