]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/font.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix broken and missing DataView interface items for Phoenix
[wxWidgets.git] / src / gtk / font.cpp
diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 86663b5c27c2c1f41709c1f05476330f0b9c00b7..f2e48c3ca89856a52ea9dbd92f5b79c76dd181d0 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        font.cpp
-// Purpose:
+// Name:        src/gtk/font.cpp
+// Purpose:     wxFont for wxGTK
 // Author:      Robert Roebling
 // Id:          $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -15,964 +15,528 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "font.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/font.h"
 
 #include "wx/font.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/gdicmn.h"
-#include "wx/tokenzr.h"
 
 
-#include <strings.h>
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/gdicmn.h"
+#endif
 
 
-#include "gdk/gdk.h"
+#include "wx/fontutil.h"
+#include "wx/tokenzr.h"
+
+#include "wx/gtk/private.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;
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------
 
-class wxFontRefData : public wxObjectRefData
+class wxFontRefData : public wxGDIRefData
 {
 public:
 {
 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,
+                  bool strikethrough = false,
                   const wxString& faceName = wxEmptyString,
                   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);
+
+    wxFontRefData(const wxString& nativeFontInfoString);
 
 
+    // copy ctor
     wxFontRefData( const wxFontRefData& data );
 
     virtual ~wxFontRefData();
 
     wxFontRefData( const wxFontRefData& data );
 
     virtual ~wxFontRefData();
 
+    // 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);
+    void SetStrikethrough(bool strikethrough);
+    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,
 protected:
     // common part of all ctors
     void Init(int pointSize,
-              int family,
-              int style,
-              int weight,
+              wxFontFamily family,
+              wxFontStyle style,
+              wxFontWeight weight,
               bool underlined,
               bool underlined,
+              bool strikethrough,
               const wxString& faceName,
               wxFontEncoding encoding);
 
               const wxString& faceName,
               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;
+    // set all fields from (already initialized and valid) m_nativeFontInfo
+    void InitFromNative();
 
 
-    bool      m_byXFontName;
-    GdkFont  *m_font;
+private:
+    // The native font info: basically a PangoFontDescription, plus
+    // 'underlined' and 'strikethrough' attributes not supported by Pango.
+    wxNativeFontInfo m_nativeFontInfo;
 
 
-    friend wxFont;
+    friend class wxFont;
 };
 
 };
 
-// ============================================================================
-// implementation
-// ============================================================================
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
-                         int family,
-                         int style,
-                         int weight,
+                         wxFontFamily family,
+                         wxFontStyle style,
+                         wxFontWeight weight,
                          bool underlined,
                          bool underlined,
+                         bool strikethrough,
                          const wxString& faceName,
                          const wxString& faceName,
-                         wxFontEncoding encoding)
+                         wxFontEncoding WXUNUSED(encoding))
 {
 {
-    if (family == wxDEFAULT)
-        m_family = wxSWISS;
-    else
-        m_family = family;
-
-    m_faceName = faceName;
+    if (family == wxFONTFAMILY_DEFAULT)
+        family = wxFONTFAMILY_SWISS;
 
 
-    if (style == wxDEFAULT)
-        m_style = wxNORMAL;
-    else
-        m_style = style;
-
-    if (weight == wxDEFAULT)
-        m_weight = wxNORMAL;
-    else
-        m_weight = weight;
+    // Create native font info
+    m_nativeFontInfo.description = pango_font_description_new();
 
 
-    if (pointSize == wxDEFAULT)
-        m_pointSize = 12;
+    // And set its values
+    if (!faceName.empty())
+    {
+        pango_font_description_set_family( m_nativeFontInfo.description,
+                                           wxGTK_CONV_SYS(faceName) );
+    }
     else
     else
-        m_pointSize = pointSize;
-
-    m_underlined = underlined;
-    m_encoding = encoding;
+    {
+        SetFamily(family);
+    }
 
 
-    m_byXFontName = FALSE;
-    m_font = (GdkFont *) NULL;
+    SetStyle( style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style );
+    SetPointSize( (pointSize == wxDEFAULT || pointSize == -1)
+                    ? wxDEFAULT_FONT_SIZE
+                    : pointSize );
+    SetWeight( weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight );
+    SetUnderlined( underlined );
+    SetStrikethrough( strikethrough );
 }
 
 }
 
-wxFontRefData::wxFontRefData( const wxFontRefData& data )
-             : m_scaled_xfonts(wxKEY_INTEGER)
+void wxFontRefData::InitFromNative()
 {
 {
-    Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
-         data.m_underlined, data.m_faceName, data.m_encoding);
+    // Get native info
+    PangoFontDescription *desc = m_nativeFontInfo.description;
 
 
-    if (data.m_font)
-        m_font = gdk_font_ref( data.m_font );
+    // Pango sometimes needs to have a size
+    int pango_size = pango_font_description_get_size( desc );
+    if (pango_size == 0)
+        m_nativeFontInfo.SetPointSize(wxDEFAULT_FONT_SIZE);
 }
 
 }
 
-wxFontRefData::~wxFontRefData()
+wxFontRefData::wxFontRefData( const wxFontRefData& data )
+             : wxGDIRefData()
 {
 {
-    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 );
+    // 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());
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxFont
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-
-void wxFont::Init()
+wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
+                             wxFontWeight weight, bool underlined, bool strikethrough,
+                             const wxString& faceName,
+                             wxFontEncoding encoding)
 {
 {
-    if (wxTheFontList)
-        wxTheFontList->Append( this );
+    Init(size, family, style, weight, underlined, strikethrough, faceName, encoding);
 }
 
 }
 
-wxFont::wxFont( GdkFont *font, char *xFontName )
+wxFontRefData::wxFontRefData(const wxString& nativeFontInfoString)
 {
 {
-    if (!xFontName)
-        return;
-
-    // VZ: this ctor ddidn't append the font to wxTheFontList before, but
-    //     there is no reason to not do it, is there?
-    Init();
-
-    m_refData = new wxFontRefData();
-
-//  M_FONTDATA->m_byXFontName = TRUE;
-    M_FONTDATA->m_font = font;
-
-    wxString tmp;
+    m_nativeFontInfo.FromString( nativeFontInfoString );
 
 
-    wxString fontname( xFontName );
-    wxStringTokenizer tn( fontname, _T("-") );
-
-    tn.GetNextToken();                           // foundry
-
-    M_FONTDATA->m_faceName = tn.GetNextToken();  // courier
-
-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("BOLD")) M_FONTDATA->m_weight = wxBOLD;
-
-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("I")) M_FONTDATA->m_style = wxITALIC;
-    if (tmp == _T("O")) M_FONTDATA->m_style = wxITALIC;
-
-    tn.GetNextToken();                           // set width
-    tn.GetNextToken();                           // ?
-    tn.GetNextToken();                           // pixel size
-
-    tmp = tn.GetNextToken();                     // pointsize
-    int num =  wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
-    M_FONTDATA->m_pointSize = num / 10;
-
-    tn.GetNextToken();                           // x-res
-    tn.GetNextToken();                           // y-res
-
-    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;
+    InitFromNative();
 }
 
 }
 
-bool wxFont::Create( int pointSize,
-                     int family,
-                     int style,
-                     int weight,
-                     bool underlined,
-                     const wxString& face,
-                     wxFontEncoding encoding )
+wxFontRefData::~wxFontRefData()
 {
 {
-    m_refData = new wxFontRefData(pointSize, family, style, weight,
-                                  underlined, face, encoding);
+}
 
 
-    Init();
+// ----------------------------------------------------------------------------
+// wxFontRefData SetXXX()
+// ----------------------------------------------------------------------------
 
 
-    return TRUE;
+void wxFontRefData::SetPointSize(int pointSize)
+{
+    m_nativeFontInfo.SetPointSize(pointSize);
 }
 
 }
 
-void wxFont::Unshare()
+/*
+    NOTE: disabled because pango_font_description_set_absolute_size() and
+          wxDC::GetCharHeight() do not mix well: setting with the former a pixel
+          size of "30" makes the latter return 36...
+          Besides, we need to return GetPointSize() a point size value even if
+          SetPixelSize() was used and this would require further changes
+          (and use of pango_font_description_get_size_is_absolute in some places).
+
+bool wxFontRefData::SetPixelSize(const wxSize& pixelSize)
 {
 {
-    if (!m_refData)
-    {
-        m_refData = new wxFontRefData();
-    }
-    else
+    wxCHECK_MSG( pixelSize.GetWidth() >= 0 && pixelSize.GetHeight() > 0, false,
+                 "Negative values for the pixel size or zero pixel height are not allowed" );
+
+    if (wx_pango_version_check(1,8,0) != NULL ||
+        pixelSize.GetWidth() != 0)
     {
     {
-        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-        UnRef();
-        m_refData = ref;
+        // NOTE: pango_font_description_set_absolute_size() only sets the font height;
+        //       if the user set the pixel width of the font explicitly or the pango
+        //       library is too old, we cannot proceed
+        return false;
     }
     }
+
+    pango_font_description_set_absolute_size( m_nativeFontInfo.description,
+                                              pixelSize.GetHeight() * PANGO_SCALE );
+
+    return true;
 }
 }
+*/
 
 
-wxFont::~wxFont()
+void wxFontRefData::SetFamily(wxFontFamily family)
 {
 {
-    if (wxTheFontList)
-        wxTheFontList->DeleteObject( this );
+    m_nativeFontInfo.SetFamily(family);
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// accessors
-// ----------------------------------------------------------------------------
-
-int wxFont::GetPointSize() const
+void wxFontRefData::SetStyle(wxFontStyle style)
 {
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
-
-    return M_FONTDATA->m_pointSize;
+    m_nativeFontInfo.SetStyle(style);
 }
 
 }
 
-wxString wxFont::GetFaceName() const
+void wxFontRefData::SetWeight(wxFontWeight weight)
 {
 {
-    wxCHECK_MSG( Ok(), _T(""), _T("invalid font") );
-
-    return M_FONTDATA->m_faceName;
+    m_nativeFontInfo.SetWeight(weight);
 }
 
 }
 
-int wxFont::GetFamily() const
+void wxFontRefData::SetUnderlined(bool underlined)
 {
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
-
-    return M_FONTDATA->m_family;
+    m_nativeFontInfo.SetUnderlined(underlined);
 }
 
 }
 
-int wxFont::GetStyle() const
+void wxFontRefData::SetStrikethrough(bool strikethrough)
 {
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
-
-    return M_FONTDATA->m_style;
+    m_nativeFontInfo.SetStrikethrough(strikethrough);
 }
 
 }
 
-int wxFont::GetWeight() const
+bool wxFontRefData::SetFaceName(const wxString& facename)
 {
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
-
-    return M_FONTDATA->m_weight;
+    return m_nativeFontInfo.SetFaceName(facename);
 }
 
 }
 
-bool wxFont::GetUnderlined() const
+void wxFontRefData::SetEncoding(wxFontEncoding WXUNUSED(encoding))
 {
 {
-    wxCHECK_MSG( Ok(), FALSE, _T("invalid font") );
-
-    return M_FONTDATA->m_underlined;
+    // with GTK+ 2 Pango always uses UTF8 internally, we cannot change it
 }
 
 }
 
-
-wxFontEncoding wxFont::GetEncoding() const
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
 {
 {
-    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, _T("invalid font") );
+    m_nativeFontInfo = info;
 
 
-    return M_FONTDATA->m_encoding;
+    // set all the other font parameters from the native font info
+    InitFromNative();
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
-// change font attributes
+// wxFont creation
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-void wxFont::SetPointSize(int pointSize)
+wxFont::wxFont(const wxNativeFontInfo& info)
 {
 {
-    Unshare();
+    Create( info.GetPointSize(),
+            info.GetFamily(),
+            info.GetStyle(),
+            info.GetWeight(),
+            info.GetUnderlined(),
+            info.GetFaceName(),
+            info.GetEncoding() );
 
 
-    M_FONTDATA->m_pointSize = pointSize;
+    if ( info.GetStrikethrough() )
+        SetStrikethrough(true);
 }
 
 }
 
-void wxFont::SetFamily(int family)
+wxFont::wxFont(int pointSize,
+               wxFontFamily family,
+               int flags,
+               const wxString& face,
+               wxFontEncoding encoding)
 {
 {
-    Unshare();
-
-    M_FONTDATA->m_family = family;
+    m_refData = new wxFontRefData(pointSize, family,
+                                  GetStyleFromFlags(flags),
+                                  GetWeightFromFlags(flags),
+                                  GetUnderlinedFromFlags(flags),
+                                  GetStrikethroughFromFlags(flags),
+                                  face, encoding);
 }
 
 }
 
-void wxFont::SetStyle(int style)
+bool wxFont::Create( int pointSize,
+                     wxFontFamily family,
+                     wxFontStyle style,
+                     wxFontWeight weight,
+                     bool underlined,
+                     const wxString& face,
+                     wxFontEncoding encoding )
 {
 {
-    Unshare();
-
-    M_FONTDATA->m_style = style;
-}
+    UnRef();
 
 
-void wxFont::SetWeight(int weight)
-{
-    Unshare();
+    m_refData = new wxFontRefData(pointSize, family, style, weight,
+                                  underlined, false, face, encoding);
 
 
-    M_FONTDATA->m_weight = weight;
+    return true;
 }
 
 }
 
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::Create(const wxString& fontname)
 {
 {
-    Unshare();
+    // VZ: does this really happen?
+    if ( fontname.empty() )
+    {
+        *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
 
-    M_FONTDATA->m_faceName = faceName;
-}
+        return true;
+    }
 
 
-void wxFont::SetUnderlined(bool underlined)
-{
-    Unshare();
+    m_refData = new wxFontRefData(fontname);
 
 
-    M_FONTDATA->m_underlined = underlined;
+    return true;
 }
 
 }
 
-void wxFont::SetEncoding(wxFontEncoding encoding)
+wxFont::~wxFont()
 {
 {
-    Unshare();
-
-    M_FONTDATA->m_encoding = encoding;
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
-// get internal representation of font
+// accessors
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-GdkFont *wxFont::GetInternalFont( float scale ) const
+int wxFont::GetPointSize() const
 {
 {
-    if (!Ok())
-    {
-        wxFAIL_MSG( _T("invalid font") );
-
-        return (GdkFont*) NULL;
-    }
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
 
 
-    /* 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"));
-    }
-
-    return font;
-}
-
-//-----------------------------------------------------------------------------
-// local utilities to find a X font
-//-----------------------------------------------------------------------------
-
-// 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
+    return M_FONTDATA->m_nativeFontInfo.GetPointSize();
+}
 
 
-    "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
-};
+wxString wxFont::GetFaceName() const
+{
+    wxCHECK_MSG( IsOk(), wxEmptyString, 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_nativeFontInfo.GetFaceName();
+}
 
 
-static int WCoordinate(int w)
+wxFontFamily wxFont::DoGetFamily() const
 {
 {
-    switch (w)
-    {
-        case wxBOLD:   return wxWEIGHT_BOLD;
-        case wxLIGHT:  return wxWEIGHT_LIGHT;
-        case wxNORMAL:
-        default:       return wxWEIGHT_NORMAL;
-    }
-};
+    return M_FONTDATA->m_nativeFontInfo.GetFamily();
+}
 
 
-static int SCoordinate(int s)
+wxFontStyle wxFont::GetStyle() const
 {
 {
-    switch (s)
-    {
-        case wxITALIC: return wxSTYLE_ITALIC;
-        case wxSLANT:  return wxSTYLE_SLANT;
-        case wxNORMAL:
-        default:       return wxSTYLE_NORMAL;
-    }
-};
+    wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
 
 
-//-----------------------------------------------------------------------------
-// wxSuffixMap
-//-----------------------------------------------------------------------------
+    return M_FONTDATA->m_nativeFontInfo.GetStyle();
+}
 
 
-class wxSuffixMap
+wxFontWeight wxFont::GetWeight() const
 {
 {
-public:
-    ~wxSuffixMap();
-
-    inline char *GetName(int weight, int style)
-    {
-        return ( map [WCoordinate(weight)] [SCoordinate(style)] );
-    }
+    wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
 
 
-    char *map[wxNUM_WEIGHTS][wxNUM_STYLES];
-    void Initialize(const char *, const char *);
-};
+    return M_FONTDATA->m_nativeFontInfo.GetWeight();
+}
 
 
-static void SearchResource(const char *prefix, const char **names, int count, char **v)
+bool wxFont::GetUnderlined() 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
+    return M_FONTDATA->m_nativeFontInfo.GetUnderlined();
+}
 
 
-        if (!internal)
-        {
-            defaults = font_defaults;
-            while (*defaults)
-            {
-                if (!strcmp(*defaults, resource))
-                {
-                    internal = defaults[1];
-                    break;
-                }
-                defaults += 2;
-            }
-        }
-    }
+bool wxFont::GetStrikethrough() const
+{
+    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
 
 
-    if (internal)
-    {
-        if ((strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) &&
-            (strcmp(names[0], "Default") != 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);
-        }
-    }
+    return M_FONTDATA->m_nativeFontInfo.GetStrikethrough();
 }
 
 }
 
-wxSuffixMap::~wxSuffixMap()
+wxFontEncoding wxFont::GetEncoding() const
 {
 {
-    int k, j;
+    wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") );
 
 
-    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;
-            }
+    return wxFONTENCODING_UTF8;
+        // Pango always uses UTF8... see also SetEncoding()
 }
 
 }
 
-void wxSuffixMap::Initialize(const char *resname, const char *devresname)
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 {
-    const char *weight, *style;
-    char *v;
-    int i, j, k;
-    const char *names[3];
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );
 
 
-    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;
-        }
-    }
+    return &(M_FONTDATA->m_nativeFontInfo);
 }
 
 }
 
-//-----------------------------------------------------------------------------
-// wxFontNameItem
-//-----------------------------------------------------------------------------
-
-class wxFontNameItem : public wxObject
+bool wxFont::IsFixedWidth() const
 {
 {
-    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
+    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
 
 
-        int id;
-        int family;
-        char *name;
-        wxSuffixMap screen, printing, afm;
-        bool isroman;
-};
+    return wxFontBase::IsFixedWidth();
+}
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxFontNameItem, wxObject)
+// ----------------------------------------------------------------------------
+// change font attributes
+// ----------------------------------------------------------------------------
 
 
-wxFontNameItem::wxFontNameItem(const char *Name, int Id, int Family)
+void wxFont::SetPointSize(int pointSize)
 {
 {
-    name   = copystring(Name);
-    id     = Id;
-    family = Family;
+    AllocExclusive();
 
 
-    screen.  Initialize(name, "Screen");
-    printing.Initialize(name, "PostScript");
-    afm.     Initialize(name, "Afm");
+    M_FONTDATA->SetPointSize(pointSize);
 }
 
 }
 
-wxFontNameItem::~wxFontNameItem()
+void wxFont::SetFamily(wxFontFamily family)
 {
 {
-    if (name)
-        delete[] name;
-    name = (char *) NULL;
-}
+    AllocExclusive();
 
 
-#if defined(__WXDEBUG__)
-void wxFontNameItem::Dump(ostream& str)
-{
-    str << "wxFontNameItem(" << name << ")";
+    M_FONTDATA->SetFamily(family);
 }
 }
-#endif
 
 
-//-----------------------------------------------------------------------------
-// wxFontDirectory
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
-
-wxFontNameDirectory::wxFontNameDirectory()
+void wxFont::SetStyle(wxFontStyle style)
 {
 {
-    table = new wxHashTable(wxKEY_INTEGER, 20);
-    nextFontId = -1;
-}
+    AllocExclusive();
 
 
-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->SetStyle(style);
 }
 
 }
 
-int wxFontNameDirectory::GetNewFontId()
+void wxFont::SetWeight(wxFontWeight weight)
 {
 {
-    return (nextFontId--);
+    AllocExclusive();
+
+    M_FONTDATA->SetWeight(weight);
 }
 
 }
 
-void wxFontNameDirectory::Initialize()
+bool wxFont::SetFaceName(const wxString& faceName)
 {
 {
-    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");
+    AllocExclusive();
+
+    return M_FONTDATA->SetFaceName(faceName) &&
+           wxFontBase::SetFaceName(faceName);
 }
 
 }
 
-void wxFontNameDirectory::Initialize(int fontid, int family, const char *resname)
+void wxFont::SetUnderlined(bool underlined)
 {
 {
-    char *fam, resource[256];
-
-    sprintf(resource, "Family%s", resname);
-    SearchResource((const char *)resource, (const char **) NULL, 0, (char **)&fam);
+    AllocExclusive();
 
 
-    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->SetUnderlined(underlined);
 }
 
 }
 
-int wxFontNameDirectory::FindOrCreateFontId(const char *name, int family)
+void wxFont::SetStrikethrough(bool strikethrough)
 {
 {
-    int id;
-
-    // font exists -> return id
-    if ( (id = GetFontId(name)) ) return id;
+    AllocExclusive();
 
 
-    // create new font
-    Initialize(id=GetNewFontId(), family, name);
-    return id;
+    M_FONTDATA->SetStrikethrough(strikethrough);
 }
 
 }
 
-char *wxFontNameDirectory::GetScreenName(int fontid, int weight, int style)
+void wxFont::SetEncoding(wxFontEncoding encoding)
 {
 {
-    wxFontNameItem *item = (wxFontNameItem*)table->Get(fontid); // find font
-    if (item)
-        return item->GetScreenName(weight, style);
+    AllocExclusive();
 
 
-    // font does not exist
-    return (char *) NULL;
+    M_FONTDATA->SetEncoding(encoding);
 }
 
 }
 
-char *wxFontNameDirectory::GetPostScriptName(int fontid, int weight, int style)
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
 {
 {
-    wxFontNameItem *item = (wxFontNameItem*)table->Get(fontid); // find font
-    if (item)
-        return item->GetPostScriptName(weight, style);
+    AllocExclusive();
 
 
-    // font does not exist
-    return (char *) NULL;
+    M_FONTDATA->SetNativeFontInfo( info );
 }
 
 }
 
-char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style)
+wxGDIRefData* wxFont::CreateGDIRefData() const
 {
 {
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
-    if (item)
-        return item->GetAFMName(weight, style);
-    // font does not exist
-    return (char *) NULL;
+    return new wxFontRefData;
 }
 
 }
 
-char *wxFontNameDirectory::GetFontName(int fontid)
+wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) const
 {
 {
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
-    if (item)
-        return item->GetName();
-
-    // font does not exist
-    return (char *) NULL;
+    return new wxFontRefData(*static_cast<const wxFontRefData*>(data));
 }
 
 }
 
-int wxFontNameDirectory::GetFontId(const char *name)
+bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const
 {
 {
-    wxNode *node;
+    if (!IsOk() || !(GetUnderlined() || GetStrikethrough()))
+        return false;
 
 
-    table->BeginFind();
+    PangoAttrList* attrs = pango_attr_list_new();
+    PangoAttribute* a;
 
 
-    while ( (node = table->Next()) )
+    if (wx_pango_version_check(1,16,0))
     {
     {
-        wxFontNameItem *item = (wxFontNameItem*)node->Data();
-        if (!strcmp(name, item->name))
-            return item->id;
+        // a PangoLayout which has leading/trailing spaces with underlined font
+        // is not correctly drawn by this pango version: Pango won't underline the spaces.
+        // This can be a problem; e.g. wxHTML rendering of underlined text relies on
+        // this behaviour. To workaround this problem, we use a special hack here
+        // suggested by pango maintainer Behdad Esfahbod: we prepend and append two
+        // empty space characters and give them a dummy colour attribute.
+        // This will force Pango to underline the leading/trailing spaces, too.
+
+        const char* text = pango_layout_get_text(layout);
+        const size_t n = strlen(text);
+        if ((n > 0 && text[0] == ' ') || (n > 1 && text[n - 1] == ' '))
+        {
+            wxCharBuffer buf(n + 6);
+            // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
+            memcpy(buf.data(), "\342\200\214", 3);
+            // copy the user string
+            memcpy(buf.data() + 3, text, n);
+            // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
+            memcpy(buf.data() + 3 + n, "\342\200\214", 3);
+
+            pango_layout_set_text(layout, buf, n + 6);
+
+            // Add dummy attributes (use colour as it's invisible anyhow for 0
+            // width spaces) to ensure that the spaces in the beginning/end of the
+            // string are underlined too.
+            a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614);
+            a->start_index = 0;
+            a->end_index = 3;
+            pango_attr_list_insert(attrs, a);
+
+            a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614);
+            a->start_index = n + 3;
+            a->end_index = n + 6;
+            pango_attr_list_insert(attrs, a);
+        }
+    }
+    if (GetUnderlined())
+    {
+        a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
+        pango_attr_list_insert(attrs, a);
+    }
+    if (GetStrikethrough())
+    {
+        a = pango_attr_strikethrough_new(true);
+        pango_attr_list_insert(attrs, a);
     }
 
     }
 
-    // font does not exist
-    return 0;
-}
-
-int wxFontNameDirectory::GetFamily(int fontid)
-{
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid);
-
-    if (item)
-        return item->family;
+    pango_layout_set_attributes(layout, attrs);
+    pango_attr_list_unref(attrs);
 
 
-    // font does not exist
-    return wxDEFAULT;
+    return true;
 }
 }
-
-#endif // 0
wxWidgets (Impactor)