/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/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/gdicmn.h"
+ #include "wx/encinfo.h"
+ #include "wx/crt.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 "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
#include <gdk/gdkprivate.h>
// ----------------------------------------------------------------------------
static const int wxDEFAULT_FONT_SIZE = 12;
// ----------------------------------------------------------------------------
-// wxScaledFontList
+// wxScaledFontList: maps the font sizes to the GDK fonts for the given font
// ----------------------------------------------------------------------------
-// TODO: replace this with a type safe list or hash!!
-class wxScaledFontList : public wxList
-{
-public:
- wxScaledFontList() : wxList(wxKEY_INTEGER) { }
-};
+WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
+ wxScaledFontList);
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
-class wxFontRefData : public wxObjectRefData
+class wxFontRefData : public wxGDIRefData
{
public:
// 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,
+ wxFontFamily family = wxFONTFAMILY_DEFAULT,
+ wxFontStyle style = wxFONTSTYLE_NORMAL,
+ wxFontWeight weight = wxFONTWEIGHT_NORMAL,
+ bool underlined = false,
const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
// do we have the native font info?
bool HasNativeFont() const
{
-#ifdef __WXGTK20__
- return TRUE; // ?
-#else
+ // only use m_nativeFontInfo if it had been initialized
return !m_nativeFontInfo.IsDefault();
-#endif
}
// 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 SetFamily(wxFontFamily family);
+ void SetStyle(wxFontStyle style);
+ void SetWeight(wxFontWeight weight);
void SetUnderlined(bool underlined);
- void SetFaceName(const wxString& facename);
+ bool 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" :-(
-#if defined(__WXDEBUG__) && !defined(__WXGTK20__)
- 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
+ // 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:
-#ifndef __WXGTK20__
+ // clear m_scaled_xfonts if any
+ void ClearGdkFonts();
+
// the map of font sizes to "GdkFont *"
wxScaledFontList m_scaled_xfonts;
-#endif
- // the broken down font parameters
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; // Unused under GTK 2.0
friend class wxFont;
};
-// ============================================================================
-// wxFontRefData implementation
-// ============================================================================
+#define M_FONTDATA ((wxFontRefData*)m_refData)
// ----------------------------------------------------------------------------
-// wxFontRefData creation
+// 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)
// 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_pointSize = pointSize == wxDEFAULT || pointSize == -1
+ ? wxDEFAULT_FONT_SIZE
+ : pointSize;
m_underlined = underlined;
m_encoding = encoding;
-
-#ifdef __WXGTK20__
- // Create native font info
- m_nativeFontInfo.description = pango_font_description_new();
-
- // And set its values
- switch (m_family)
- {
- case wxFONTFAMILY_TELETYPE:
- pango_font_description_set_family( m_nativeFontInfo.description, "monospace" );
- break;
- case wxFONTFAMILY_SWISS:
- pango_font_description_set_family( m_nativeFontInfo.description, "serif" );
- break;
- default:
- pango_font_description_set_family( m_nativeFontInfo.description, "sans" );
- break;
- }
- SetStyle( m_style );
- SetPointSize( m_pointSize );
- SetWeight( m_weight );
-#endif
}
-wxFontRefData::wxFontRefData( const wxFontRefData& data )
- : wxObjectRefData()
+void wxFontRefData::InitFromNative()
{
- 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)
-{
-#ifdef __WXGTK20__
- m_nativeFontInfo.FromString( fontname );
-
- // Get native info
- PangoFontDescription *desc = m_nativeFontInfo.description;
-
- // init fields
- m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
-
- m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
-
- switch (pango_font_description_get_style( desc ))
- {
- case PANGO_STYLE_NORMAL:
- m_style = wxFONTSTYLE_NORMAL;
- break;
- case PANGO_STYLE_ITALIC:
- m_style = wxFONTSTYLE_ITALIC;
- break;
- case PANGO_STYLE_OBLIQUE:
- m_style = wxFONTSTYLE_SLANT;
- break;
- }
-
- switch (pango_font_description_get_weight( desc ))
- {
- case PANGO_WEIGHT_ULTRALIGHT:
- m_weight = wxFONTWEIGHT_LIGHT;
- break;
- case PANGO_WEIGHT_LIGHT:
- m_weight = wxFONTWEIGHT_LIGHT;
- break;
- case PANGO_WEIGHT_NORMAL:
- m_weight = wxFONTWEIGHT_NORMAL;
- break;
- case PANGO_WEIGHT_BOLD:
- m_weight = wxFONTWEIGHT_BOLD;
- break;
- case PANGO_WEIGHT_ULTRABOLD:
- m_weight = wxFONTWEIGHT_BOLD;
- break;
- case PANGO_WEIGHT_HEAVY:
- m_weight = wxFONTWEIGHT_BOLD;
- break;
- }
-
- if (m_faceName == wxT("monospace"))
- {
- m_family = wxFONTFAMILY_TELETYPE;
- }
- else if (m_faceName == wxT("sans"))
- {
- m_family = wxFONTFAMILY_SWISS;
- }
- else
- {
- m_family = wxFONTFAMILY_UNKNOWN;
- }
-
- // Pango description are never underlined (?)
- m_underlined = FALSE;
-
- // Cannot we choose that
- m_encoding = wxFONTENCODING_SYSTEM;
-#else
- // remember the X font name
- m_nativeFontInfo.SetXFontName(fontname);
-
// get the font parameters from the XLFD
// -------------------------------------
m_weight = wxFONTWEIGHT_NORMAL;
wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();
- if ( !w.empty() && w != _T('*') )
+ if ( !w.empty() && w != wxT('*') )
{
// the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD
// and BLACK
- if ( ((w[0u] == _T('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||
+ if ( ((w[0u] == wxT('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||
!wxStrcmp(w.c_str() + 1, wxT("LACK"))))) ||
- wxStrstr(w.c_str() + 1, _T("BOLD")) )
+ wxStrstr(w.c_str() + 1, wxT("BOLD")) )
{
m_weight = wxFONTWEIGHT_BOLD;
}
- else if ( w == _T("LIGHT") || w == _T("THIN") )
+ else if ( w == wxT("LIGHT") || w == wxT("THIN") )
{
m_weight = wxFONTWEIGHT_LIGHT;
}
}
- switch ( wxToupper(*m_nativeFontInfo.
- GetXFontComponent(wxXLFD_SLANT).c_str()) )
+ switch ( wxToupper(m_nativeFontInfo.
+ GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )
{
- case _T('I'): // italique
+ case wxT('I'): // italique
m_style = wxFONTSTYLE_ITALIC;
break;
- case _T('O'): // oblique
+ case wxT('O'): // oblique
m_style = wxFONTSTYLE_SLANT;
break;
// 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') )
+ if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == wxT('M') )
{
m_family = wxFONTFAMILY_TELETYPE;
}
}
// X fonts are never underlined...
- m_underlined = FALSE;
+ 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") )
+ if ( registry == wxT("ISO8859") )
{
int cp;
if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
}
}
- else if ( registry == _T("MICROSOFT") )
+ else if ( registry == wxT("MICROSOFT") )
{
int cp;
if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
}
}
- else if ( registry == _T("KOI8") )
+ else if ( registry == wxT("KOI8") )
{
m_encoding = wxFONTENCODING_KOI8;
}
else // unknown encoding
{
- // may be give a warning here?
+ // may be give a warning here? or use wxFontMapper?
m_encoding = wxFONTENCODING_SYSTEM;
}
-#endif
}
-wxFontRefData::~wxFontRefData()
+wxFontRefData::wxFontRefData( const wxFontRefData& data )
+ : wxGDIRefData()
+{
+ m_pointSize = data.m_pointSize;
+ m_family = data.m_family;
+ m_style = data.m_style;
+ m_weight = data.m_weight;
+
+ m_underlined = data.m_underlined;
+
+ m_faceName = data.m_faceName;
+ m_encoding = data.m_encoding;
+
+ // 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, wxFontFamily family, wxFontStyle style,
+ wxFontWeight weight, bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding)
{
-#ifndef __WXGTK20__
- wxNode *node = m_scaled_xfonts.First();
- while (node)
+ Init(size, family, style, weight, underlined, faceName, encoding);
+}
+
+wxFontRefData::wxFontRefData(const wxString& fontname)
+{
+ // FromString() should really work in GTK1 too, doesn't it?
+ m_nativeFontInfo.SetXFontName(fontname);
+
+ InitFromNative();
+}
+
+void wxFontRefData::ClearGdkFonts()
+{
+ 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;
}
-#endif
+
+ m_scaled_xfonts.clear();
+}
+
+wxFontRefData::~wxFontRefData()
+{
+ ClearGdkFonts();
}
// ----------------------------------------------------------------------------
{
m_pointSize = pointSize;
-#ifdef __WXGTK20__
- // Get native info
- PangoFontDescription *desc = m_nativeFontInfo.description;
-
- pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE );
-#else
if ( HasNativeFont() )
{
wxString size;
if ( pointSize == -1 )
- size = _T('*');
+ size = wxT('*');
else
- size.Printf(_T("%d"), 10*pointSize);
+ size.Printf(wxT("%d"), 10*pointSize);
m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size);
}
-#endif
}
-void wxFontRefData::SetFamily(int family)
+void wxFontRefData::SetFamily(wxFontFamily family)
{
m_family = family;
// TODO: what are we supposed to do with m_nativeFontInfo here?
}
-void wxFontRefData::SetStyle(int style)
+void wxFontRefData::SetStyle(wxFontStyle style)
{
m_style = style;
-#ifdef __WXGTK20__
- // Get native info
- PangoFontDescription *desc = m_nativeFontInfo.description;
-
- switch ( style )
- {
- case wxFONTSTYLE_ITALIC:
- pango_font_description_set_style( desc, PANGO_STYLE_ITALIC );
- break;
- case wxFONTSTYLE_SLANT:
- pango_font_description_set_style( desc, PANGO_STYLE_OBLIQUE );
- break;
- default:
- wxFAIL_MSG( _T("unknown font style") );
- // fall through
- case wxFONTSTYLE_NORMAL:
- pango_font_description_set_style( desc, PANGO_STYLE_NORMAL );
- break;
- }
-#else
if ( HasNativeFont() )
{
wxString slant;
switch ( style )
{
case wxFONTSTYLE_ITALIC:
- slant = _T('i');
+ slant = wxT('i');
break;
case wxFONTSTYLE_SLANT:
- slant = _T('o');
+ slant = wxT('o');
break;
default:
- wxFAIL_MSG( _T("unknown font style") );
+ wxFAIL_MSG( wxT("unknown font style") );
// fall through
case wxFONTSTYLE_NORMAL:
- slant = _T('r');
+ slant = wxT('r');
}
m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant);
}
-#endif
}
-void wxFontRefData::SetWeight(int weight)
+void wxFontRefData::SetWeight(wxFontWeight weight)
{
m_weight = weight;
-#ifndef __WXGTK20__
if ( HasNativeFont() )
{
wxString boldness;
switch ( weight )
{
case wxFONTWEIGHT_BOLD:
- boldness = _T("bold");
+ boldness = wxT("bold");
break;
case wxFONTWEIGHT_LIGHT:
- boldness = _T("light");
+ boldness = wxT("light");
break;
default:
- wxFAIL_MSG( _T("unknown font weight") );
+ wxFAIL_MSG( wxT("unknown font weight") );
// fall through
case wxFONTWEIGHT_NORMAL:
// unspecified
- boldness = _T("medium");
+ boldness = wxT("medium");
}
m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness);
}
-#endif
}
void wxFontRefData::SetUnderlined(bool underlined)
// the XLFD doesn't have "underlined" field anyhow
}
-void wxFontRefData::SetFaceName(const wxString& facename)
+bool wxFontRefData::SetFaceName(const wxString& facename)
{
m_faceName = facename;
-#ifndef __WXGTK20__
if ( HasNativeFont() )
{
m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
}
-#endif
+
+ return true;
}
void wxFontRefData::SetEncoding(wxFontEncoding encoding)
{
m_encoding = encoding;
-#ifndef __WXGTK20__
if ( HasNativeFont() )
{
wxNativeEncodingInfo info;
m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding);
}
}
-#endif
}
-// ============================================================================
-// wxFont implementation
-// ============================================================================
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+ // previously cached fonts shouldn't be used
+ ClearGdkFonts();
+
+ m_nativeFontInfo = info;
+
+ // set all the other font parameters from the native font info
+ InitFromNative();
+}
// ----------------------------------------------------------------------------
// wxFont creation
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-
-void wxFont::Init()
-{
-}
-
wxFont::wxFont(const wxNativeFontInfo& info)
{
- Init();
-
-#ifdef __WXGTK20__
- Create( info.GetPointSize(),
- info.GetFamily(),
- info.GetStyle(),
- info.GetWeight(),
- info.GetUnderlined(),
- info.GetFaceName(),
- info.GetEncoding() );
-#else
- Create(info.GetXFontName());
-#endif
+ (void) Create(info.GetXFontName());
}
bool wxFont::Create( int pointSize,
- int family,
- int style,
- int weight,
+ 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;
+ return true;
}
bool wxFont::Create(const wxString& fontname)
{
*this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- return TRUE;
+ return true;
}
m_refData = new wxFontRefData(fontname);
- return TRUE;
+ 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
// ----------------------------------------------------------------------------
-// all accessors are just forwarded to wxFontRefData which has everything we
-// need
-
int wxFont::GetPointSize() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
return M_FONTDATA->m_pointSize;
}
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
return M_FONTDATA->m_faceName;
}
-int wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const
{
- wxCHECK_MSG( Ok(), 0, 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( IsOk(), 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( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
return M_FONTDATA->m_weight;
}
bool wxFont::GetUnderlined() const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
return M_FONTDATA->m_underlined;
}
wxFontEncoding wxFont::GetEncoding() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), 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( IsOk(), NULL, wxT("invalid font") );
-#ifndef __WXGTK20__ // ???
- if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
+ 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();
-#endif
+ }
- return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+ return &(M_FONTDATA->m_nativeFontInfo);
}
bool wxFont::IsFixedWidth() const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
-#ifndef __WXGTK20__
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 spacing.Upper() == wxT('M');
}
-#endif
return wxFontBase::IsFixedWidth();
}
void wxFont::SetPointSize(int pointSize)
{
Unshare();
-
+
M_FONTDATA->SetPointSize(pointSize);
}
-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)
{
Unshare();
M_FONTDATA->SetFamily(family);
}
-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)
{
Unshare();
M_FONTDATA->SetStyle(style);
}
-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)
{
Unshare();
M_FONTDATA->SetWeight(weight);
}
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
{
Unshare();
- M_FONTDATA->SetFaceName(faceName);
+ return M_FONTDATA->SetFaceName(faceName) &&
+ wxFontBase::SetFaceName(faceName);
}
void wxFont::SetUnderlined(bool underlined)
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;
-// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
+// this is also used from toolbar.cpp and tooltip.cpp, hence extern
extern GdkFont *GtkGetDefaultGuiFont()
{
if (!g_systemDefaultGuiFont)
GtkStyle *def = gtk_rc_get_style( widget );
if (def)
{
- g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
+ g_systemDefaultGuiFont = gdk_font_ref( def->font );
}
else
{
def = gtk_widget_get_default_style();
if (def)
- g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
+ g_systemDefaultGuiFont = gdk_font_ref( def->font );
}
gtk_widget_destroy( widget );
}
GdkFont *wxFont::GetInternalFont( float scale ) const
{
- GdkFont *font = (GdkFont *) NULL;
+ GdkFont *font = NULL;
- wxCHECK_MSG( Ok(), font, wxT("invalid font") )
+ wxCHECK_MSG( IsOk(), font, wxT("invalid font") );
-#ifdef __WXGTK20__
- if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
- {
- font = GtkGetDefaultGuiFont();
- }
- else
- {
- PangoFontDescription *font_description = GetNativeFontInfo()->description;
-
- font = gdk_font_from_description( font_description );
- }
-#else
long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
- 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 // we don't have this font in this size yet
{
if ( !font )
{
// do we have the XLFD?
- if ( M_FONTDATA->HasNativeFont() )
+ if ( int_scale == 100 && M_FONTDATA->HasNativeFont() )
{
font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());
}
M_FONTDATA->m_faceName,
M_FONTDATA->m_encoding,
&xfontname);
- if ( font )
- {
+ // NB: wxFont::GetNativeFontInfo relies on this
+ // side-effect of GetInternalFont
+ if ( int_scale == 100 )
M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
- }
}
}
if ( font )
{
- M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
+ list[int_scale] = font;
}
}
-#endif // GTK 2.0
// it's quite useless to make it a wxCHECK because we're going to crash
// anyhow...
return font;
}
-
projects / wxWidgets.git / blobdiff