/////////////////////////////////////////////////////////////////////////////
-// Name: font.cpp
+// Name: gtk/font.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
#endif
#include "wx/font.h"
+#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 <strings.h>
-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gtk/gtk.h>
// ----------------------------------------------------------------------------
-// local data
+// constants
// ----------------------------------------------------------------------------
-#if wxUSE_FONTNAMEDIRECTORY
- extern wxFontNameDirectory *wxTheFontNameDirectory;
-#endif
+// the default size (in points) for the fonts
+static const int wxDEFAULT_FONT_SIZE = 12;
// ----------------------------------------------------------------------------
-// private functions
+// wxScaledFontList
// ----------------------------------------------------------------------------
-// returns TRUE if there are any fonts matching this font spec
-static bool wxTestFontSpec(const wxString& fontspec);
-
-static GdkFont *wxLoadQueryFont( int pointSize,
- int family,
- int style,
- int weight,
- bool underlined,
- const wxString &facename,
- wxFontEncoding encoding );
-
-static GdkFont *wxLoadQueryNearestFont( int pointSize,
- int family,
- int style,
- int weight,
- bool underlined,
- const wxString &facename,
- wxFontEncoding encoding);
+// TODO: replace this with a type safe list or hash!!
+class wxScaledFontList : public wxList
+{
+public:
+ wxScaledFontList() : wxList(wxKEY_INTEGER) { }
+};
// ----------------------------------------------------------------------------
// wxFontRefData
class wxFontRefData : public wxObjectRefData
{
public:
- wxFontRefData(int size = wxDEFAULT,
- int family = wxDEFAULT,
- int style = wxDEFAULT,
- int weight = wxDEFAULT,
+ // 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)
- : m_scaled_xfonts(wxKEY_INTEGER)
- {
- Init(size, family, style, weight, underlined, faceName, encoding);
- }
+ 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
+ {
+ return !m_nativeFontInfo.IsDefault();
+ }
+
+ // 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);
+ void SetFaceName(const wxString& facename);
+ void SetEncoding(wxFontEncoding encoding);
+
+ // debugger helper: shows what the font really is
+ //
+ // VZ: I need this as my gdb either shows wildly wrong values or crashes
+ // when I ask it to "p fontRefData" :-(
+#ifdef __WXDEBUG__
+ void Dump() const
+ {
+ wxPrintf(_T("%s-%s-%s-%d-%d\n"),
+ m_faceName.c_str(),
+ m_weight == wxFONTWEIGHT_NORMAL
+ ? _T("normal")
+ : m_weight == wxFONTWEIGHT_BOLD
+ ? _T("bold")
+ : _T("light"),
+ m_style == wxFONTSTYLE_NORMAL ? _T("regular") : _T("italic"),
+ m_pointSize,
+ m_encoding);
+ }
+#endif // Debug
+
protected:
// common part of all ctors
void Init(int pointSize,
wxFontEncoding encoding);
private:
- wxList m_scaled_xfonts;
-
- int m_pointSize;
- int m_family,
- m_style,
- m_weight;
- bool m_underlined;
- wxString m_faceName;
- wxFontEncoding m_encoding;
-
- bool m_byXFontName;
- GdkFont *m_font;
-
- friend wxFont;
+ // the map of font sizes to "GdkFont *"
+ wxScaledFontList m_scaled_xfonts;
+
+ // the broken down font parameters
+ int m_pointSize;
+ int m_family,
+ m_style,
+ m_weight;
+ bool m_underlined;
+ wxString m_faceName;
+ wxFontEncoding m_encoding;
+
+ // the native font info, basicly an XFLD
+ wxNativeFontInfo m_nativeFontInfo;
+
+ friend class wxFont;
};
// ============================================================================
-// implementation
+// wxFontRefData implementation
// ============================================================================
// ----------------------------------------------------------------------------
-// wxFontRefData
+// wxFontRefData creation
// ----------------------------------------------------------------------------
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;
- if (weight == wxDEFAULT)
- m_weight = wxNORMAL;
- else
- m_weight = weight;
-
- if (pointSize == wxDEFAULT)
- m_pointSize = 12;
- else
- m_pointSize = pointSize;
+ // 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;
-
- m_byXFontName = FALSE;
- m_font = (GdkFont *) NULL;
}
wxFontRefData::wxFontRefData( const wxFontRefData& data )
- : m_scaled_xfonts(wxKEY_INTEGER)
{
- 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_nativeFontInfo = data.m_nativeFontInfo;
+}
+
+wxFontRefData::wxFontRefData(int size, int family, int style,
+ int weight, bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding)
+{
+ Init(size, family, style, weight, underlined, faceName, encoding);
+}
+
+wxFontRefData::wxFontRefData(const wxString& fontname)
+{
+ // remember the X font name
+ m_nativeFontInfo.SetXFontName(fontname);
+
+ // get the font parameters from the XLFD
+ // -------------------------------------
+
+ m_faceName = m_nativeFontInfo.GetXFontComponent(wxXLFD_FAMILY);
+
+ m_weight = wxFONTWEIGHT_NORMAL;
+
+ wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();
+ if ( !w.empty() && w != _T('*') )
+ {
+ // the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD
+ // and BLACK
+ if ( ((w[0u] == _T('B') && (!strcmp(w.c_str() + 1, _T("OLD")) ||
+ !strcmp(w.c_str() + 1, _T("LACK"))))) ||
+ strstr(w.c_str() + 1, _T("BOLD")) )
+ {
+ m_weight = wxFONTWEIGHT_BOLD;
+ }
+ else if ( w == _T("LIGHT") || w == _T("THIN") )
+ {
+ m_weight = wxFONTWEIGHT_LIGHT;
+ }
+ }
+
+ switch ( wxToupper(*m_nativeFontInfo.
+ GetXFontComponent(wxXLFD_SLANT).c_str()) )
+ {
+ case _T('I'): // italique
+ m_style = wxFONTSTYLE_ITALIC;
+ break;
+
+ case _T('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_pointSize = wxDEFAULT_FONT_SIZE;
+ }
- if (data.m_font)
- m_font = gdk_font_ref( data.m_font );
+ // 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() == _T('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;
+ }
+
+ // X fonts are never underlined...
+ m_underlined = FALSE;
+
+ // deal with font encoding
+ wxString
+ registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(),
+ encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper();
+
+ if ( registry == _T("ISO8859") )
+ {
+ int cp;
+ if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
+ {
+ m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
+ }
+ }
+ else if ( registry == _T("MICROSOFT") )
+ {
+ int cp;
+ if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
+ {
+ m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
+ }
+ }
+ else if ( registry == _T("KOI8") )
+ {
+ m_encoding = wxFONTENCODING_KOI8;
+ }
+ else // unknown encoding
+ {
+ // may be give a warning here?
+ m_encoding = wxFONTENCODING_SYSTEM;
+ }
}
wxFontRefData::~wxFontRefData()
gdk_font_unref( font );
node = next;
}
-
- if (m_font)
- gdk_font_unref( m_font );
}
// ----------------------------------------------------------------------------
-// wxFont
+// wxFontRefData SetXXX()
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+void wxFontRefData::SetPointSize(int pointSize)
+{
+ m_pointSize = pointSize;
-void wxFont::Init()
+ if ( HasNativeFont() )
+ {
+ wxString size;
+ if ( pointSize == -1 )
+ size = _T('*');
+ else
+ size.Printf(_T("%d"), 10*pointSize);
+
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size);
+ }
+}
+
+void wxFontRefData::SetFamily(int family)
{
- if (wxTheFontList)
- wxTheFontList->Append( this );
+ m_family = family;
+
+ // TODO: what are we supposed to do with m_nativeFontInfo here?
}
-wxFont::wxFont( GdkFont *font, char *xFontName )
+void wxFontRefData::SetStyle(int style)
{
- if (!xFontName)
- return;
+ m_style = style;
- // VZ: this ctor ddidn't append the font to wxTheFontList before, but
- // there is no reason to not do it, is there?
- Init();
+ if ( HasNativeFont() )
+ {
+ wxString slant;
+ switch ( style )
+ {
+ case wxFONTSTYLE_ITALIC:
+ slant = _T('i');
+ break;
+
+ case wxFONTSTYLE_SLANT:
+ slant = _T('o');
+ break;
+
+ default:
+ wxFAIL_MSG( _T("unknown font style") );
+ // fall through
+
+ case wxFONTSTYLE_NORMAL:
+ slant = _T('r');
+ }
+
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant);
+ }
+}
+
+void wxFontRefData::SetWeight(int weight)
+{
+ m_weight = weight;
+
+ if ( HasNativeFont() )
+ {
+ wxString boldness;
+ switch ( weight )
+ {
+ case wxFONTWEIGHT_BOLD:
+ boldness = _T("bold");
+ break;
+
+ case wxFONTWEIGHT_LIGHT:
+ boldness = _T("light");
+ break;
- m_refData = new wxFontRefData();
+ default:
+ wxFAIL_MSG( _T("unknown font weight") );
+ // fall through
-// M_FONTDATA->m_byXFontName = TRUE;
- M_FONTDATA->m_font = font;
+ case wxFONTWEIGHT_NORMAL:
+ // unspecified
+ boldness = _T("medium");
+ }
- wxString tmp;
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness);
+ }
+}
- wxString fontname( xFontName );
- wxStringTokenizer tn( fontname, _T("-") );
+void wxFontRefData::SetUnderlined(bool underlined)
+{
+ m_underlined = underlined;
- tn.GetNextToken(); // foundry
+ // the XLFD doesn't have "underlined" field anyhow
+}
- M_FONTDATA->m_faceName = tn.GetNextToken(); // courier
+void wxFontRefData::SetFaceName(const wxString& facename)
+{
+ m_faceName = facename;
- tmp = tn.GetNextToken().MakeUpper();
- if (tmp == _T("BOLD")) M_FONTDATA->m_weight = wxBOLD;
+ if ( HasNativeFont() )
+ {
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
+ }
+}
+
+void wxFontRefData::SetEncoding(wxFontEncoding encoding)
+{
+ m_encoding = encoding;
- tmp = tn.GetNextToken().MakeUpper();
- if (tmp == _T("I")) M_FONTDATA->m_style = wxITALIC;
- if (tmp == _T("O")) M_FONTDATA->m_style = wxITALIC;
+ if ( HasNativeFont() )
+ {
+ wxNativeEncodingInfo info;
+ if ( wxGetNativeFontEncoding(encoding, &info) )
+ {
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_REGISTRY, info.xregistry);
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding);
+ }
+ }
+}
- tn.GetNextToken(); // set width
- tn.GetNextToken(); // ?
- tn.GetNextToken(); // pixel size
+// ============================================================================
+// wxFont implementation
+// ============================================================================
- tmp = tn.GetNextToken(); // pointsize
- int num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
- M_FONTDATA->m_pointSize = num / 10;
+// ----------------------------------------------------------------------------
+// wxFont creation
+// ----------------------------------------------------------------------------
- tn.GetNextToken(); // x-res
- tn.GetNextToken(); // y-res
+IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
- tmp = tn.GetNextToken().MakeUpper();
- if (tmp == _T("M")) M_FONTDATA->m_family = wxMODERN;
- else if (M_FONTDATA->m_faceName == _T("TIMES")) M_FONTDATA->m_family = wxROMAN;
- else if (M_FONTDATA->m_faceName == _T("HELVETICA")) M_FONTDATA->m_family = wxSWISS;
- else if (M_FONTDATA->m_faceName == _T("LUCIDATYPEWRITER")) M_FONTDATA->m_family = wxTELETYPE;
- else if (M_FONTDATA->m_faceName == _T("LUCIDA")) M_FONTDATA->m_family = wxDECORATIVE;
- else if (M_FONTDATA->m_faceName == _T("UTOPIA")) M_FONTDATA->m_family = wxSCRIPT;
+void wxFont::Init()
+{
+}
+
+wxFont::wxFont(const wxNativeFontInfo& info)
+{
+ Init();
+
+ Create(info.GetXFontName());
}
bool wxFont::Create( int pointSize,
int weight,
bool underlined,
const wxString& face,
- wxFontEncoding encoding )
+ wxFontEncoding encoding)
{
m_refData = new wxFontRefData(pointSize, family, style, weight,
underlined, face, encoding);
- Init();
+ return TRUE;
+}
+
+bool wxFont::Create(const wxString& fontname)
+{
+ // VZ: does this really happen?
+ if ( fontname.empty() )
+ {
+ *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+ return TRUE;
+ }
+
+ m_refData = new wxFontRefData(fontname);
return TRUE;
}
wxFont::~wxFont()
{
- if (wxTheFontList)
- wxTheFontList->DeleteObject( this );
}
// ----------------------------------------------------------------------------
// accessors
// ----------------------------------------------------------------------------
+// all accessors are just forwarded to wxFontRefData which has everything we
+// need
+
int wxFont::GetPointSize() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
return M_FONTDATA->m_pointSize;
}
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG( Ok(), _T(""), _T("invalid font") );
+ wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
return M_FONTDATA->m_faceName;
}
int wxFont::GetFamily() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
return M_FONTDATA->m_family;
}
int wxFont::GetStyle() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
return M_FONTDATA->m_style;
}
int wxFont::GetWeight() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+ wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
return M_FONTDATA->m_weight;
}
bool wxFont::GetUnderlined() const
{
- wxCHECK_MSG( Ok(), FALSE, _T("invalid font") );
+ wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
return M_FONTDATA->m_underlined;
}
-
wxFontEncoding wxFont::GetEncoding() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, _T("invalid font") );
+ wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
return M_FONTDATA->m_encoding;
}
+wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+ wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+
+ if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
+ GetInternalFont();
+
+ return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+}
+
+bool wxFont::IsFixedWidth() const
+{
+ wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+
+ if ( M_FONTDATA->HasNativeFont() )
+ {
+ // the monospace fonts are supposed to have "M" in the spacing field
+ wxString spacing = M_FONTDATA->
+ m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING);
+
+ return spacing.Upper() == _T('M');
+ }
+
+ return wxFontBase::IsFixedWidth();
+}
+
// ----------------------------------------------------------------------------
// change font attributes
// ----------------------------------------------------------------------------
{
Unshare();
- M_FONTDATA->m_pointSize = pointSize;
+ M_FONTDATA->SetPointSize(pointSize);
}
void wxFont::SetFamily(int family)
{
Unshare();
- M_FONTDATA->m_family = family;
+ M_FONTDATA->SetFamily(family);
}
void wxFont::SetStyle(int style)
{
Unshare();
- M_FONTDATA->m_style = style;
+ M_FONTDATA->SetStyle(style);
}
void wxFont::SetWeight(int weight)
{
Unshare();
- M_FONTDATA->m_weight = weight;
+ M_FONTDATA->SetWeight(weight);
}
void wxFont::SetFaceName(const wxString& faceName)
{
Unshare();
- M_FONTDATA->m_faceName = faceName;
+ M_FONTDATA->SetFaceName(faceName);
}
void wxFont::SetUnderlined(bool underlined)
{
Unshare();
- M_FONTDATA->m_underlined = underlined;
+ M_FONTDATA->SetUnderlined(underlined);
}
void wxFont::SetEncoding(wxFontEncoding encoding)
{
Unshare();
- M_FONTDATA->m_encoding = encoding;
+ M_FONTDATA->SetEncoding(encoding);
}
-// ----------------------------------------------------------------------------
-// get internal representation of font
-// ----------------------------------------------------------------------------
-
-GdkFont *wxFont::GetInternalFont( float scale ) const
+void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
{
- if (!Ok())
- {
- wxFAIL_MSG( _T("invalid font") );
-
- return (GdkFont*) NULL;
- }
-
- /* short cut if the special X font constructor has been used */
- if (M_FONTDATA->m_byXFontName)
- return M_FONTDATA->m_font;
-
- 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;
-
- wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
- if (node)
- {
- font = (GdkFont*)node->Data();
- }
- else
- {
-#if 0
- 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
-#endif // 0
- {
- 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_scaled_xfonts.Append( int_scale, (wxObject*)font );
- }
-
- if (!font)
- {
- wxLogError(_T("could not load any font"));
- }
+ Unshare();
- return font;
+ M_FONTDATA->m_nativeFontInfo = info;
}
-//-----------------------------------------------------------------------------
-// local utilities to find a X font
-//-----------------------------------------------------------------------------
-
-// returns TRUE if there are any fonts matching this font spec
-static bool wxTestFontSpec(const wxString& fontSpec)
-{
- GdkFont *test = gdk_font_load( wxConvCurrent->cWX2MB(fontSpec) );
- if ( test )
- {
- gdk_font_unref( test );
+// ----------------------------------------------------------------------------
+// get internal representation of font
+// ----------------------------------------------------------------------------
- return TRUE;
- }
- else
- {
- return FALSE;
- }
-}
+static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
-static GdkFont *wxLoadQueryFont( int pointSize,
- int family,
- int style,
- int weight,
- bool WXUNUSED(underlined),
- const wxString &facename,
- wxFontEncoding encoding )
+// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
+extern GdkFont *GtkGetDefaultGuiFont()
{
- wxString xfamily;
- switch (family)
- {
- case wxDECORATIVE: xfamily = _T("lucida"); break;
- case wxROMAN: xfamily = _T("times"); break;
- case wxMODERN: xfamily = _T("courier"); break;
- case wxSWISS: xfamily = _T("helvetica"); break;
- case wxTELETYPE: xfamily = _T("lucidatypewriter"); break;
- case wxSCRIPT: xfamily = _T("utopia"); break;
- default: xfamily = _T("*");
- }
-
- wxString fontSpec;
- if (!facename.IsEmpty())
+ if (!g_systemDefaultGuiFont)
{
- fontSpec.Printf(_T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"),
- facename.c_str());
-
- if ( wxTestFontSpec(fontSpec) )
+ GtkWidget *widget = gtk_button_new();
+ GtkStyle *def = gtk_rc_get_style( widget );
+ if (def)
{
- xfamily = facename;
+ g_systemDefaultGuiFont = gdk_font_ref( def->font );
}
- //else: no such family, use default one instead
- }
-
- wxString xstyle;
- switch (style)
- {
- case wxITALIC: xstyle = _T("i"); break;
- case wxSLANT: xstyle = _T("o"); break;
- case wxNORMAL: xstyle = _T("r"); break;
- default: xstyle = _T("*"); break;
- }
-
- wxString xweight;
- switch (weight)
- {
- case wxBOLD: xweight = _T("bold"); break;
- case wxLIGHT:
- case wxNORMAL: xweight = _T("medium"); break;
- default: xweight = _T("*"); break;
- }
-
- wxString xregistry, xencoding;
- if ( encoding == wxFONTENCODING_DEFAULT )
- {
- // use the apps default
- encoding = wxFont::GetDefaultEncoding();
- }
-
- bool test = TRUE; // should we test for availability of encoding?
- switch ( encoding )
- {
- case wxFONTENCODING_ISO8859_1:
- case wxFONTENCODING_ISO8859_2:
- case wxFONTENCODING_ISO8859_3:
- case wxFONTENCODING_ISO8859_4:
- case wxFONTENCODING_ISO8859_5:
- case wxFONTENCODING_ISO8859_6:
- case wxFONTENCODING_ISO8859_7:
- case wxFONTENCODING_ISO8859_8:
- case wxFONTENCODING_ISO8859_9:
- case wxFONTENCODING_ISO8859_10:
- case wxFONTENCODING_ISO8859_11:
- case wxFONTENCODING_ISO8859_13:
- case wxFONTENCODING_ISO8859_14:
- case wxFONTENCODING_ISO8859_15:
- {
- int cp = encoding - wxFONTENCODING_ISO8859_1 + 1;
- xregistry = _T("iso8859");
- xencoding.Printf(_T("%d"), cp);
- }
- break;
-
- case wxFONTENCODING_KOI8:
- xregistry = _T("koi8");
- if ( wxTestFontSpec(_T("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) )
- {
- xencoding = _T("1");
-
- // test passed, no need to do it once more
- test = FALSE;
- }
- else
- {
- xencoding = _T("*");
- }
- break;
-
- case wxFONTENCODING_CP1250:
- case wxFONTENCODING_CP1251:
- case wxFONTENCODING_CP1252:
- {
- int cp = encoding - wxFONTENCODING_CP1250 + 1250;
- fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"),
- cp);
- if ( wxTestFontSpec(fontSpec) )
- {
- xregistry = _T("microsoft");
- xencoding.Printf(_T("cp%d"), cp);
-
- // test passed, no need to do it once more
- test = FALSE;
- }
- else
- {
- // fall back to LatinX
- xregistry = _T("iso8859");
- xencoding.Printf(_T("%d"), cp - 1249);
- }
- }
- break;
-
- case wxFONTENCODING_SYSTEM:
- default:
- test = FALSE;
- xregistry =
- xencoding = _T("*");
- }
-
- if ( test )
- {
- fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"),
- xregistry.c_str(), xencoding.c_str());
- if ( !wxTestFontSpec(fontSpec) )
+ else
{
- // this encoding isn't available - what to do?
- xregistry =
- xencoding = _T("*");
+ def = gtk_widget_get_default_style();
+ if (def)
+ g_systemDefaultGuiFont = gdk_font_ref( def->font );
}
+ gtk_widget_destroy( widget );
}
-
- // construct the X font spec from our data
- fontSpec.Printf(_T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"),
- xfamily.c_str(), xweight.c_str(), xstyle.c_str(),
- pointSize, xregistry.c_str(), xencoding.c_str());
-
- return gdk_font_load( wxConvCurrent->cWX2MB(fontSpec) );
-}
-
-static GdkFont *wxLoadQueryNearestFont( int pointSize,
- int family,
- int style,
- int weight,
- bool underlined,
- const wxString &facename,
- wxFontEncoding encoding )
-{
- GdkFont *font = wxLoadQueryFont( pointSize, family, style, weight,
- underlined, facename, encoding );
-
- if (!font)
+ else
{
- /* search up and down by stepsize 10 */
- int max_size = pointSize + 20 * (1 + (pointSize/180));
- int min_size = pointSize - 20 * (1 + (pointSize/180));
-
- int i;
-
- /* Search for smaller size (approx.) */
- for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 )
- {
- font = wxLoadQueryFont(i, family, style, weight, underlined,
- facename, encoding );
- }
-
- /* Search for larger size (approx.) */
- for ( i = pointSize + 10; !font && i <= max_size; i += 10 )
- {
- font = wxLoadQueryFont( i, family, style, weight, underlined,
- facename, encoding );
- }
-
- /* Try default family */
- if ( !font && family != wxDEFAULT )
- {
- font = wxLoadQueryFont( pointSize, wxDEFAULT, style, weight,
- underlined, facename, encoding );
- }
-
- /* Bogus font */
- if ( !font )
- {
- font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
- underlined, facename, encoding );
- }
+ // already have it, but ref it once more before returning
+ gdk_font_ref(g_systemDefaultGuiFont);
}
- return font;
+ return g_systemDefaultGuiFont;
}
-// wow, what's this stuff? Is it used/useful? (VZ)
-#if 0
-
-//-----------------------------------------------------------------------------
-// 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",
-
- "PostScriptTimes__", "Times${PostScript$[weight]$[style]}",
- "PostScriptTimesMediumStraight", "Times-Roman",
- "PostScriptTimesLightStraight", "Times-Roman",
- "PostScriptTimes_Slant", "Times-${PostScriptTimes$[weight]}Italic",
- "PostScriptTimes_Italic", "Times-${PostScriptTimes$[weight]}Italic",
-
- "PostScriptSwiss__", "Helvetica${PostScript$[weight]$[style]}",
- "PostScriptModern__", "Courier${PostScript$[weight]$[style]}",
-
- "PostScriptTeletype__", "${PostScriptModern,$[weight],$[style]}",
-
-#if !WX_NORMALIZED_PS_FONTS
- "PostScriptScript__", "Zapf-Chancery-MediumItalic",
-#endif
-
- "ScreenMedium", "medium",
- "ScreenBold", "bold",
- "ScreenLight", "light",
- "ScreenStraight", "r",
- "ScreenItalic", "i",
- "ScreenSlant", "o",
-
- "ScreenDefaultBase", "*-times",
-
- "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
-};
-
-enum {wxWEIGHT_NORMAL, wxWEIGHT_BOLD, wxWEIGHT_LIGHT, wxNUM_WEIGHTS};
-enum {wxSTYLE_NORMAL, wxSTYLE_ITALIC, wxSTYLE_SLANT, wxNUM_STYLES};
-
-static int WCoordinate(int w)
-{
- switch (w)
- {
- case wxBOLD: return wxWEIGHT_BOLD;
- case wxLIGHT: return wxWEIGHT_LIGHT;
- case wxNORMAL:
- default: return wxWEIGHT_NORMAL;
- }
-};
-
-static int SCoordinate(int s)
-{
- switch (s)
- {
- case wxITALIC: return wxSTYLE_ITALIC;
- case wxSLANT: return wxSTYLE_SLANT;
- case wxNORMAL:
- default: return wxSTYLE_NORMAL;
- }
-};
-
-//-----------------------------------------------------------------------------
-// wxSuffixMap
-//-----------------------------------------------------------------------------
-
-class wxSuffixMap
-{
-public:
- ~wxSuffixMap();
-
- inline char *GetName(int weight, int style)
- {
- return ( map [WCoordinate(weight)] [SCoordinate(style)] );
- }
-
- char *map[wxNUM_WEIGHTS][wxNUM_STYLES];
- void Initialize(const char *, const char *);
-};
-
-static void SearchResource(const char *prefix, const char **names, int count, char **v)
+GdkFont *wxFont::GetInternalFont( float scale ) const
{
- int k, i, j;
- char resource[1024], **defaults, *internal;
+ GdkFont *font = (GdkFont *) NULL;
- k = 1 << count;
+ wxCHECK_MSG( Ok(), font, wxT("invalid font") )
- *v = (char *) NULL;
- internal = (char *) 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);
- for (i = 0; i < k; i++)
+ wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
+ if (node)
{
- 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;
- }
- }
+ font = (GdkFont*)node->Data();
}
-
- if (internal)
+ else // we don't have this font in this size yet
{
- if ((strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) &&
- (strcmp(names[0], "Default") != 0))
+ if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
{
- // 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);
+ font = GtkGetDefaultGuiFont();
}
- else
- {
- *v = copystring(internal);
- }
- }
-}
-
-wxSuffixMap::~wxSuffixMap()
-{
- int k, j;
-
- 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;
- }
-}
-void wxSuffixMap::Initialize(const char *resname, const char *devresname)
-{
- const char *weight, *style;
- char *v;
- int i, j, k;
- const char *names[3];
-
- 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++)
+ if ( !font )
{
- switch (j)
+ // do we have the XLFD?
+ if ( M_FONTDATA->HasNativeFont() )
{
- case wxSTYLE_NORMAL: style = "Straight"; break;
- case wxSTYLE_ITALIC: style = "Italic"; break;
- case wxSTYLE_SLANT:
- default: style = "Slant";
+ font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());
}
- 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++)
+ // no XLFD of no exact match - try the approximate one now
+ if ( !font )
{
- if (v[i] == '$' && ((v[i+1] == '[') || (v[i+1] == '{')))
- {
- startpos = i;
- closer = (v[i+1] == '[') ? ']' : '}';
- ++i;
- }
- else if (v[i] == closer)
+ 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);
+ if ( font )
{
- 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;
+ M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
}
}
- // We have a final value:
- map[k][j] = v;
}
- }
-}
-
-//-----------------------------------------------------------------------------
-// wxFontNameItem
-//-----------------------------------------------------------------------------
-
-class wxFontNameItem : public wxObject
-{
- 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;
-};
-
-IMPLEMENT_ABSTRACT_CLASS(wxFontNameItem, wxObject)
-
-wxFontNameItem::wxFontNameItem(const char *Name, int Id, int Family)
-{
- name = copystring(Name);
- id = Id;
- family = Family;
-
- screen. Initialize(name, "Screen");
- printing.Initialize(name, "PostScript");
- afm. Initialize(name, "Afm");
-}
-
-wxFontNameItem::~wxFontNameItem()
-{
- if (name)
- delete[] name;
- name = (char *) NULL;
-}
-
-#if defined(__WXDEBUG__)
-void wxFontNameItem::Dump(ostream& str)
-{
- str << "wxFontNameItem(" << name << ")";
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// wxFontDirectory
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
-
-wxFontNameDirectory::wxFontNameDirectory()
-{
- table = new wxHashTable(wxKEY_INTEGER, 20);
- nextFontId = -1;
-}
-
-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;
-}
-
-int wxFontNameDirectory::GetNewFontId()
-{
- return (nextFontId--);
-}
-
-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");
-}
-void wxFontNameDirectory::Initialize(int fontid, int family, const char *resname)
-{
- char *fam, resource[256];
-
- 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));
-}
-
-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;
-}
-
-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;
-}
-
-char *wxFontNameDirectory::GetPostScriptName(int fontid, int weight, int style)
-{
- wxFontNameItem *item = (wxFontNameItem*)table->Get(fontid); // find font
- if (item)
- return item->GetPostScriptName(weight, style);
-
- // font does not exist
- return (char *) NULL;
-}
-
-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;
-}
-
-char *wxFontNameDirectory::GetFontName(int fontid)
-{
- wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
- if (item)
- return item->GetName();
-
- // font does not exist
- return (char *) NULL;
-}
-
-int wxFontNameDirectory::GetFontId(const char *name)
-{
- wxNode *node;
-
- table->BeginFind();
-
- while ( (node = table->Next()) )
- {
- wxFontNameItem *item = (wxFontNameItem*)node->Data();
- if (!strcmp(name, item->name))
- return item->id;
+ if ( font )
+ {
+ M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
+ }
}
- // font does not exist
- return 0;
-}
-
-int wxFontNameDirectory::GetFamily(int fontid)
-{
- wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid);
-
- if (item)
- return item->family;
+ // 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?") );
- // font does not exist
- return wxDEFAULT;
+ return font;
}
-#endif // 0
projects / wxWidgets.git / blobdiff