/////////////////////////////////////////////////////////////////////////////
-// Name: font.cpp
+// Name: src/gtk1/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
/////////////////////////////////////////////////////////////////////////////
// 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/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 <strings.h>
-#include <gdk/gdk.h>
+#include "wx/gtk1/private.h"
#include <gdk/gdkprivate.h>
-#include <gtk/gtk.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
+// ----------------------------------------------------------------------------
+
+WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
+ wxScaledFontList);
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
-class wxFontRefData : public wxObjectRefData
+class wxFontRefData : public wxGDIRefData
{
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,
+ 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 );
+
virtual ~wxFontRefData();
+ // do we have the native font info?
+ bool HasNativeFont() const
+ {
+ // only use m_nativeFontInfo if it had been initialized
+ 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(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,
- int family,
- int style,
- int weight,
+ 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:
- wxList m_scaled_xfonts;
+ // clear m_scaled_xfonts if any
+ void ClearGdkFonts();
+
+ // the map of font sizes to "GdkFont *"
+ wxScaledFontList m_scaled_xfonts;
+
int m_pointSize;
- int m_family,
- m_style,
- m_weight;
+ wxFontFamily m_family;
+ wxFontStyle m_style;
+ wxFontWeight m_weight;
bool m_underlined;
wxString m_faceName;
- wxFontEncoding m_encoding;
+ 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;
};
-// ============================================================================
-// implementation
-// ============================================================================
+#define M_FONTDATA ((wxFontRefData*)m_refData)
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
void wxFontRefData::Init(int pointSize,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
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;
-
- if (weight == wxDEFAULT)
- m_weight = wxNORMAL;
- else
- m_weight = weight;
+ // we accept both wxDEFAULT and wxNORMAL here - should we?
+ m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style;
+ m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : 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;
}
+void wxFontRefData::InitFromNative()
+{
+ // 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 != 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;
+ }
+ }
+
+ switch ( wxToupper(m_nativeFontInfo.
+ GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )
+ {
+ 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_pointSize = wxDEFAULT_FONT_SIZE;
+ }
+
+ // 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;
+ }
+
+ // 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 == 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;
+ }
+}
+
wxFontRefData::wxFontRefData( const wxFontRefData& data )
- : m_scaled_xfonts(wxKEY_INTEGER)
+ : wxGDIRefData()
{
- 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;
+
+ // 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,
+wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
+ wxFontWeight 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)
+{
+ // FromString() should really work in GTK1 too, doesn't it?
+ m_nativeFontInfo.SetXFontName(fontname);
+
+ InitFromNative();
+}
+
+void wxFontRefData::ClearGdkFonts()
{
- wxNode *node = m_scaled_xfonts.First();
- while (node)
+ for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin();
+ i != m_scaled_xfonts.end();
+ ++i )
{
- GdkFont *font = (GdkFont*)node->Data();
- wxNode *next = node->Next();
+ GdkFont *font = i->second;
gdk_font_unref( font );
- node = next;
}
+
+ m_scaled_xfonts.clear();
+}
+
+wxFontRefData::~wxFontRefData()
+{
+ ClearGdkFonts();
}
// ----------------------------------------------------------------------------
-// wxFont
+// wxFontRefData SetXXX()
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-
-void wxFont::Init()
+void wxFontRefData::SetPointSize(int pointSize)
{
-}
+ m_pointSize = pointSize;
-wxFont::wxFont(const wxNativeFontInfo& info)
-{
- Init();
+ if ( HasNativeFont() )
+ {
+ wxString size;
+ if ( pointSize == -1 )
+ size = wxT('*');
+ else
+ size.Printf(wxT("%d"), 10*pointSize);
- Create(info.xFontName);
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size);
+ }
}
-bool wxFont::Create(const wxNativeFontInfo& info)
+void wxFontRefData::SetFamily(wxFontFamily family)
{
- return Create(info.xFontName);
+ m_family = family;
+
+ // TODO: what are we supposed to do with m_nativeFontInfo here?
}
-bool wxFont::Create( int pointSize,
- int family,
- int style,
- int weight,
- bool underlined,
- const wxString& face,
- wxFontEncoding encoding)
+void wxFontRefData::SetStyle(wxFontStyle style)
{
- m_refData = new wxFontRefData(pointSize, family, style, weight,
- underlined, face, encoding);
+ m_style = style;
+
+ if ( HasNativeFont() )
+ {
+ wxString slant;
+ switch ( style )
+ {
+ case wxFONTSTYLE_ITALIC:
+ slant = wxT('i');
+ break;
- return TRUE;
+ case wxFONTSTYLE_SLANT:
+ slant = wxT('o');
+ break;
+
+ default:
+ wxFAIL_MSG( wxT("unknown font style") );
+ // fall through
+
+ case wxFONTSTYLE_NORMAL:
+ slant = wxT('r');
+ }
+
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant);
+ }
}
-bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
+void wxFontRefData::SetWeight(wxFontWeight weight)
{
- if( !fontname )
- {
- *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
- return TRUE;
- }
+ m_weight = weight;
- m_refData = new wxFontRefData();
+ if ( HasNativeFont() )
+ {
+ wxString boldness;
+ switch ( weight )
+ {
+ case wxFONTWEIGHT_BOLD:
+ boldness = wxT("bold");
+ break;
- M_FONTDATA->m_nativeFontInfo.xFontName = fontname; // X font name
+ case wxFONTWEIGHT_LIGHT:
+ boldness = wxT("light");
+ break;
- wxString tmp;
+ default:
+ wxFAIL_MSG( wxT("unknown font weight") );
+ // fall through
- wxStringTokenizer tn( fontname, wxT("-") );
+ case wxFONTWEIGHT_NORMAL:
+ // unspecified
+ boldness = wxT("medium");
+ }
- tn.GetNextToken(); // skip initial empty token
- tn.GetNextToken(); // foundry
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness);
+ }
+}
+void wxFontRefData::SetUnderlined(bool underlined)
+{
+ m_underlined = underlined;
- M_FONTDATA->m_faceName = tn.GetNextToken(); // family
+ // the XLFD doesn't have "underlined" field anyhow
+}
- 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;
+bool wxFontRefData::SetFaceName(const wxString& facename)
+{
+ m_faceName = facename;
- if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
- if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
+ if ( HasNativeFont() )
+ {
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
+ }
- tmp = tn.GetNextToken().MakeUpper(); // slant
- if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
- if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;
+ return true;
+}
- tn.GetNextToken(); // set width
- tn.GetNextToken(); // add. style
- tn.GetNextToken(); // pixel size
+void wxFontRefData::SetEncoding(wxFontEncoding encoding)
+{
+ m_encoding = encoding;
- tmp = tn.GetNextToken(); // pointsize
- if (tmp != wxT("*"))
+ if ( HasNativeFont() )
{
- long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
- M_FONTDATA->m_pointSize = (int)(num / 10);
+ wxNativeEncodingInfo info;
+ if ( wxGetNativeFontEncoding(encoding, &info) )
+ {
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_REGISTRY, info.xregistry);
+ m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding);
+ }
}
+}
- tn.GetNextToken(); // x-res
- tn.GetNextToken(); // y-res
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+ // previously cached fonts shouldn't be used
+ ClearGdkFonts();
- tmp = tn.GetNextToken().MakeUpper(); // spacing
+ m_nativeFontInfo = info;
- 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;
+ // set all the other font parameters from the native font info
+ InitFromNative();
+}
- tn.GetNextToken(); // avg width
+// ----------------------------------------------------------------------------
+// wxFont creation
+// ----------------------------------------------------------------------------
- // deal with font encoding
- M_FONTDATA->m_encoding = enc;
- if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM )
+IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+
+wxFont::wxFont(const wxNativeFontInfo& info)
+{
+ (void) Create(info.GetXFontName());
+}
+
+bool wxFont::Create( int pointSize,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
+ bool underlined,
+ const wxString& face,
+ wxFontEncoding encoding)
+{
+ UnRef();
+
+ m_refData = new wxFontRefData(pointSize, family, style, weight,
+ underlined, face, encoding);
+
+ return true;
+}
+
+bool wxFont::Create(const wxString& fontname)
+{
+ // VZ: does this really happen?
+ if ( fontname.empty() )
{
- wxString registry = tn.GetNextToken().MakeUpper(),
- encoding = tn.GetNextToken().MakeUpper();
+ *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- 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;
+
+ m_refData = new wxFontRefData(fontname);
+
+ return true;
}
void wxFont::Unshare()
{
}
+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+ return new wxFontRefData;
+}
+
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
+{
+ return new wxFontRefData(*static_cast<const wxFontRefData *>(data));
+}
+
// ----------------------------------------------------------------------------
// accessors
// ----------------------------------------------------------------------------
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
return M_FONTDATA->m_faceName;
}
-int wxFont::GetFamily() const
+wxFontFamily wxFont::GetFamily() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
return M_FONTDATA->m_family;
}
-int wxFont::GetStyle() const
+wxFontStyle wxFont::GetStyle() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") );
return M_FONTDATA->m_style;
}
-int wxFont::GetWeight() const
+wxFontWeight wxFont::GetWeight() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") );
return 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") );
+ // m_encoding is unused in wxGTK2, return encoding that the user set.
return M_FONTDATA->m_encoding;
}
-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
- wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+ wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
- if(M_FONTDATA->m_nativeFontInfo.xFontName.IsEmpty())
+ if ( !M_FONTDATA->HasNativeFont() )
+ {
+ // NB: this call has important side-effect: it not only finds
+ // GdkFont representation, it also initializes m_nativeFontInfo
+ // by calling its SetXFontName method
GetInternalFont();
+ }
- return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+ return &(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() == wxT('M');
+ }
+
+ return wxFontBase::IsFixedWidth();
+}
// ----------------------------------------------------------------------------
// change font attributes
{
Unshare();
- M_FONTDATA->m_pointSize = pointSize;
- M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now
+ M_FONTDATA->SetPointSize(pointSize);
}
-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)
{
Unshare();
- M_FONTDATA->m_family = family;
- M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now
+ M_FONTDATA->SetFamily(family);
}
-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)
{
Unshare();
- M_FONTDATA->m_style = style;
- M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now
+ M_FONTDATA->SetStyle(style);
}
-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)
{
Unshare();
- 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();
- 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();
- M_FONTDATA->m_underlined = underlined;
+ M_FONTDATA->SetUnderlined(underlined);
}
void wxFont::SetEncoding(wxFontEncoding encoding)
{
Unshare();
- 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();
- M_FONTDATA->m_nativeFontInfo = info;
+ M_FONTDATA->SetNativeFontInfo( info );
}
// ----------------------------------------------------------------------------
// get internal representation of font
// ----------------------------------------------------------------------------
-static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
+static GdkFont *g_systemDefaultGuiFont = NULL;
-GdkFont *GtkGetDefaultGuiFont()
+// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
+extern GdkFont *GtkGetDefaultGuiFont()
{
if (!g_systemDefaultGuiFont)
{
GdkFont *wxFont::GetInternalFont( float scale ) const
{
- if (!Ok())
- {
- wxFAIL_MSG( wxT("invalid font") );
+ GdkFont *font = NULL;
- return (GdkFont*) NULL;
- }
+ wxCHECK_MSG( Ok(), font, wxT("invalid font") );
- long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */
+ 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)
+ wxScaledFontList& list = M_FONTDATA->m_scaled_xfonts;
+ wxScaledFontList::iterator i = list.find(int_scale);
+ if ( i != list.end() )
{
- font = (GdkFont*)node->Data();
+ font = i->second;
}
- else
+ else // we don't have this font in this size yet
{
if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
{
font = GtkGetDefaultGuiFont();
}
- if (!font)
+
+ 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 );
+ // 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);
+ }
}
- M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
+ if ( font )
+ {
+ list[int_scale] = font;
+ }
}
// it's quite useless to make it a wxCHECK because we're going to crash
return font;
}
-
projects / wxWidgets.git / blobdiff