]> 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
Remove obsolete GTK1 compatibility macros. Patch #1413458 - Paul Cornett
[wxWidgets.git] / src / gtk / font.cpp
diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index a327b75fd019cee664d27b1c617213adff1db81b..120d0a87e54b168f3a0a7cf4e6b17ccbbd12b91a 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -1,975 +1,586 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        font.cpp
+// Name:        gtk/font.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:       wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "font.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/font.h"
 
 #include "wx/font.h"
+#include "wx/fontutil.h"
+#include "wx/cmndata.h"
 #include "wx/utils.h"
 #include "wx/log.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 <strings.h>
 
-#include "gdk/gdk.h"
+#include "wx/gtk/private.h"
+#include <gdk/gdkprivate.h>
 
 
-//-----------------------------------------------------------------------------
-// local data
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
 
 
-extern wxFontNameDirectory *wxTheFontNameDirectory;
+// the default size (in points) for the fonts
+static const int wxDEFAULT_FONT_SIZE = 12;
 
 
-//-----------------------------------------------------------------------------
-// wxFont
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxScaledFontList: maps the font sizes to the GDK fonts for the given font
+// ----------------------------------------------------------------------------
 
 
-class wxFontRefData: public wxObjectRefData
+WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
+                    wxScaledFontList);
+
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
+
+class wxFontRefData : public wxObjectRefData
 {
 public:
 {
 public:
-
-    wxFontRefData();
+    // from broken down font parameters, also default ctor
+    wxFontRefData(int size = -1,
+                  int family = wxFONTFAMILY_DEFAULT,
+                  int style = wxFONTSTYLE_NORMAL,
+                  int weight = wxFONTWEIGHT_NORMAL,
+                  bool underlined = FALSE,
+                  const wxString& faceName = wxEmptyString,
+                  wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    // from XFLD
+    wxFontRefData(const wxString& fontname);
+
+    // copy ctor
     wxFontRefData( const wxFontRefData& data );
     wxFontRefData( const wxFontRefData& data );
-    ~wxFontRefData();
 
 
-    wxList    m_scaled_xfonts;
-    int       m_pointSize;
-    int       m_family, m_style, m_weight;
-    bool      m_underlined;
-    int       m_fontId;
-    wxString  m_faceName;
+    virtual ~wxFontRefData();
 
 
-    bool      m_byXFontName;
-    GdkFont  *m_font;
+    // do we have the native font info?
+    bool HasNativeFont() const
+    {
+        // we always have a Pango font description
+        return TRUE;
+    }
 
 
-    friend wxFont;
+    // setters: all of them also take care to modify m_nativeFontInfo if we
+    // have it so as to not lose the information not carried by our fields
+    void SetPointSize(int pointSize);
+    void SetFamily(int family);
+    void SetStyle(int style);
+    void SetWeight(int weight);
+    void SetUnderlined(bool underlined);
+    void SetFaceName(const wxString& facename);
+    void SetEncoding(wxFontEncoding encoding);
+
+    void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
+    bool GetNoAntiAliasing() const { return m_noAA; }
+
+    // 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,
+              bool underlined,
+              const wxString& faceName,
+              wxFontEncoding encoding);
+
+    // set all fields from (already initialized and valid) m_nativeFontInfo
+    void InitFromNative();
+
+private:
+    // clear m_scaled_xfonts if any
+    void ClearGdkFonts();
+
+    int             m_pointSize;
+    int             m_family,
+                    m_style,
+                    m_weight;
+    bool            m_underlined;
+    wxString        m_faceName;
+    wxFontEncoding  m_encoding;  // Unused under GTK 2.0
+    bool            m_noAA;      // No anti-aliasing
+
+    // The native font info, basicly an XFLD under GTK 1.2 and
+    // the pango font description under GTK 2.0.
+    wxNativeFontInfo m_nativeFontInfo;
+
+    friend class wxFont;
 };
 
 };
 
-wxFontRefData::wxFontRefData() : m_scaled_xfonts(wxKEY_INTEGER)
-{
-    m_byXFontName = FALSE;
-    m_pointSize = 12;
-    m_family = wxSWISS;
-    m_style = wxNORMAL;
-    m_weight = wxNORMAL;
-    m_underlined = FALSE;
-    m_fontId = 0;
-    m_font = (GdkFont *) NULL;
-}
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
 
 
-wxFontRefData::wxFontRefData( const wxFontRefData& data ) : m_scaled_xfonts(wxKEY_INTEGER)
+void wxFontRefData::Init(int pointSize,
+                         int family,
+                         int style,
+                         int weight,
+                         bool underlined,
+                         const wxString& faceName,
+                         wxFontEncoding encoding)
 {
 {
-    m_byXFontName = FALSE;
-    m_pointSize = data.m_pointSize;
-    m_family = data.m_family;
-    m_style = data.m_style;
-    m_weight = data.m_weight;
-    m_underlined = data.m_underlined;
-    m_fontId = data.m_fontId;
-    m_faceName = data.m_faceName;
-    m_font = (GdkFont *) NULL;
-    if (data.m_font) m_font = gdk_font_ref( data.m_font );
-}
+    m_family = family == wxFONTFAMILY_DEFAULT ? wxFONTFAMILY_SWISS : family;
 
 
-wxFontRefData::~wxFontRefData()
-{
-    wxNode *node = m_scaled_xfonts.First();
-    while (node)
-    {
-        GdkFont *font = (GdkFont*)node->Data();
-        wxNode *next = node->Next();
-        gdk_font_unref( font );
-        node = next;
-    }
-    if (m_font) gdk_font_unref( m_font );
-}
+    m_faceName = faceName;
 
 
-//-----------------------------------------------------------------------------
+    // we accept both wxDEFAULT and wxNORMAL here - should we?
+    m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style;
+    m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight;
 
 
-#define M_FONTDATA ((wxFontRefData *)m_refData)
+    // 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;
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+    m_underlined = underlined;
+    m_encoding = encoding;
 
 
-wxFont::wxFont()
-{
-    if (wxTheFontList) wxTheFontList->Append( this );
-}
+    m_noAA = FALSE;
 
 
-wxFont::wxFont( char *xFontName )
-{
-    if (!xFontName) return;
+    // Create native font info
+    m_nativeFontInfo.description = pango_font_description_new();
 
 
-    m_refData = new wxFontRefData();
+    // And set its values
+    if (!m_faceName.empty())
+    {
+       pango_font_description_set_family( m_nativeFontInfo.description, wxGTK_CONV(m_faceName) );
+    }
+    else
+    {
+        switch (m_family)
+        {
+            case wxFONTFAMILY_MODERN:
+            case wxFONTFAMILY_TELETYPE:
+               pango_font_description_set_family( m_nativeFontInfo.description, "monospace" );
+               break;
+            case wxFONTFAMILY_ROMAN:
+               pango_font_description_set_family( m_nativeFontInfo.description, "serif" );
+               break;
+            case wxFONTFAMILY_SWISS:
+               // SWISS = sans serif
+            default:
+               pango_font_description_set_family( m_nativeFontInfo.description, "sans" );
+               break;
+        }
+    }
 
 
-    M_FONTDATA->m_byXFontName = TRUE;
-    M_FONTDATA->m_font = gdk_font_load( xFontName );
+    SetStyle( m_style );
+    SetPointSize( m_pointSize );
+    SetWeight( m_weight );
 }
 
 }
 
-wxFont::wxFont( int pointSize, int family, int style, int weight, bool underlined = FALSE, 
-                const wxString& face = wxEmptyString )
+void wxFontRefData::InitFromNative()
 {
 {
-    m_refData = new wxFontRefData();
+    m_noAA = FALSE;
+
+    // Get native info
+    PangoFontDescription *desc = m_nativeFontInfo.description;
 
 
-    if (family == wxDEFAULT) family = wxSWISS;
-    M_FONTDATA->m_family = family;
-    
-    if (!face.IsEmpty())
+    // init fields
+    m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
+
+    // Pango sometimes needs to have a size
+    int pango_size = pango_font_description_get_size( desc );
+    if (pango_size == 0)
+        m_nativeFontInfo.SetPointSize(12);
+
+    m_pointSize = m_nativeFontInfo.GetPointSize();
+    m_style = m_nativeFontInfo.GetStyle();
+    m_weight = m_nativeFontInfo.GetWeight();
+
+    if (m_faceName == wxT("monospace"))
+    {
+        m_family = wxFONTFAMILY_TELETYPE;
+    }
+    else if (m_faceName == wxT("sans"))
+    {
+        m_family = wxFONTFAMILY_SWISS;
+    }
+    else if (m_faceName == wxT("serif"))
     {
     {
-        M_FONTDATA->m_faceName = face;
-        M_FONTDATA->m_fontId = wxTheFontNameDirectory->FindOrCreateFontId( face, family );
-        M_FONTDATA->m_family  = wxTheFontNameDirectory->GetFamily( family );
+        m_family = wxFONTFAMILY_ROMAN;
     }
     else
     {
     }
     else
     {
-        M_FONTDATA->m_fontId = family;
-        M_FONTDATA->m_family  = wxTheFontNameDirectory->GetFamily( family );
+        m_family = wxFONTFAMILY_UNKNOWN;
     }
 
     }
 
-    if (style == wxDEFAULT) style = wxNORMAL;
-    M_FONTDATA->m_style = style;
-    if (weight == wxDEFAULT) weight = wxNORMAL;
-    M_FONTDATA->m_weight = weight;
-    if (pointSize == wxDEFAULT) pointSize = 12;
-    M_FONTDATA->m_pointSize = pointSize;
-    M_FONTDATA->m_underlined = underlined;
+    // Pango description are never underlined (?)
+    m_underlined = FALSE;
 
 
-    if (wxTheFontList) wxTheFontList->Append( this );
-  
+    // Cannot we choose that
+    m_encoding = wxFONTENCODING_SYSTEM;
 }
 
 }
 
-wxFont::wxFont( const wxFont& font )
+wxFontRefData::wxFontRefData( const wxFontRefData& data )
+             : wxObjectRefData()
 {
 {
-    Ref( font );
-
-    if (wxTheFontList) wxTheFontList->Append( this );
-}
+    m_pointSize = data.m_pointSize;
+    m_family = data.m_family;
+    m_style = data.m_style;
+    m_weight = data.m_weight;
 
 
-wxFont::~wxFont()
-{
-    if (wxTheFontList) wxTheFontList->DeleteObject( this );
-}
+    m_underlined = data.m_underlined;
 
 
-wxFont& wxFont::operator = ( const wxFont& font )
-{
-    if (*this == font) return (*this);
-    Ref( font );
-    return *this;
-}
+    m_faceName = data.m_faceName;
+    m_encoding = data.m_encoding;
 
 
-bool wxFont::operator == ( const wxFont& font )
-{
-    return m_refData == font.m_refData;
-}
+    m_noAA = data.m_noAA;
 
 
-bool wxFont::operator != ( const wxFont& font )
-{
-    return m_refData != font.m_refData;
+    // Forces a copy of the internal data.  wxNativeFontInfo should probably
+    // have a copy ctor and assignment operator to fix this properly but that
+    // would break binary compatibility...
+    m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString());
 }
 
 }
 
-bool wxFont::Ok() const
+wxFontRefData::wxFontRefData(int size, int family, int style,
+                             int weight, bool underlined,
+                             const wxString& faceName,
+                             wxFontEncoding encoding)
 {
 {
-    return (m_refData != NULL);
+    Init(size, family, style, weight, underlined, faceName, encoding);
 }
 
 }
 
-int wxFont::GetPointSize() const
+wxFontRefData::wxFontRefData(const wxString& fontname)
 {
 {
-    wxCHECK_MSG( Ok(), 0, "invalid font" );
+    m_nativeFontInfo.FromString( fontname );
 
 
-    return M_FONTDATA->m_pointSize;
+    InitFromNative();
 }
 
 }
 
-wxString wxFont::GetFaceName() const
+void wxFontRefData::ClearGdkFonts()
 {
 {
-    wxCHECK_MSG( Ok(), "", "invalid font" );
-
-    wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
-    return s;
 }
 
 }
 
-int wxFont::GetFamily() const
+wxFontRefData::~wxFontRefData()
 {
 {
-    wxCHECK_MSG( Ok(), 0, "invalid font" );
-
-    return M_FONTDATA->m_family;
+    ClearGdkFonts();
 }
 
 }
 
-wxString wxFont::GetFamilyString() const
-{
-    wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
-
-    switch (M_FONTDATA->m_family)
-    {
-        case wxDECORATIVE:   return wxString("wxDECORATIVE");
-        case wxROMAN:        return wxString("wxROMAN");
-        case wxSCRIPT:       return wxString("wxSCRIPT");
-        case wxSWISS:        return wxString("wxSWISS");
-        case wxMODERN:       return wxString("wxMODERN");
-        case wxTELETYPE:     return wxString("wxTELETYPE");
-        default:             return "wxDEFAULT";
-    }
+// ----------------------------------------------------------------------------
+// wxFontRefData SetXXX()
+// ----------------------------------------------------------------------------
 
 
-    return "wxDEFAULT";
-}
-
-int wxFont::GetFontId() const
+void wxFontRefData::SetPointSize(int pointSize)
 {
 {
-    wxCHECK_MSG( Ok(), 0, "invalid font" );
+    m_pointSize = pointSize;
 
 
-    return M_FONTDATA->m_fontId; // stub
+    m_nativeFontInfo.SetPointSize(pointSize);
 }
 
 }
 
-int wxFont::GetStyle() const
+void wxFontRefData::SetFamily(int family)
 {
 {
-    wxCHECK_MSG( Ok(), 0, "invalid font" );
+    m_family = family;
 
 
-    return M_FONTDATA->m_style;
+    // TODO: what are we supposed to do with m_nativeFontInfo here?
 }
 
 }
 
-wxString wxFont::GetStyleString() const
+void wxFontRefData::SetStyle(int style)
 {
 {
-    wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
-
-    switch (M_FONTDATA->m_style)
-    {
-        case wxNORMAL:   return wxString("wxNORMAL");
-        case wxSLANT:    return wxString("wxSLANT");
-        case wxITALIC:   return wxString("wxITALIC");
-        default:         return wxString("wxDEFAULT");
-    }
+    m_style = style;
 
 
-    return wxString("wxDEFAULT");
+    m_nativeFontInfo.SetStyle((wxFontStyle)style);
 }
 
 }
 
-int wxFont::GetWeight() const
+void wxFontRefData::SetWeight(int weight)
 {
 {
-    wxCHECK_MSG( Ok(), 0, "invalid font" );
+    m_weight = weight;
 
 
-    return M_FONTDATA->m_weight;
+    m_nativeFontInfo.SetWeight((wxFontWeight)weight);
 }
 
 }
 
-wxString wxFont::GetWeightString() const
+void wxFontRefData::SetUnderlined(bool underlined)
 {
 {
-    wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
+    m_underlined = underlined;
 
 
-    switch (M_FONTDATA->m_weight)
-    {
-        case wxNORMAL:   return wxString("wxNORMAL");
-        case wxBOLD:     return wxString("wxBOLD");
-        case wxLIGHT:    return wxString("wxLIGHT");
-        default:         return wxString("wxDEFAULT");
-    }
-
-    return wxString("wxDEFAULT");
+    // the XLFD doesn't have "underlined" field anyhow
 }
 
 }
 
-bool wxFont::GetUnderlined() const
+void wxFontRefData::SetFaceName(const wxString& facename)
 {
 {
-    wxCHECK_MSG( Ok(), FALSE, "invalid font" );
+    m_faceName = facename;
 
 
-    return M_FONTDATA->m_underlined;
+    m_nativeFontInfo.SetFaceName(facename);
 }
 
 }
 
-void wxFont::Unshare()
+void wxFontRefData::SetEncoding(wxFontEncoding encoding)
 {
 {
-    if (!m_refData)
-    {
-       m_refData = new wxFontRefData();
-    }
-    else
-    {
-       wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-       UnRef();
-       m_refData = ref;
-    }
+    m_encoding = encoding;
 }
 
 }
 
-void wxFont::SetPointSize(int pointSize)
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
 {
 {
-    Unshare();
-
-    M_FONTDATA->m_pointSize = pointSize;
-}
+    // previously cached fonts shouldn't be used
+    ClearGdkFonts();
 
 
-void wxFont::SetFamily(int family)
-{
-    Unshare();
+    m_nativeFontInfo = info;
 
 
-    M_FONTDATA->m_family = family;
+    // set all the other font parameters from the native font info
+    InitFromNative();
 }
 
 }
 
-void wxFont::SetStyle(int style)
-{
-    Unshare();
+// ----------------------------------------------------------------------------
+// wxFont creation
+// ----------------------------------------------------------------------------
 
 
-    M_FONTDATA->m_style = style;
-}
+IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 
-void wxFont::SetWeight(int weight)
+void wxFont::Init()
 {
 {
-    Unshare();
-
-    M_FONTDATA->m_weight = weight;
 }
 
 }
 
-void wxFont::SetFaceName(const wxString& faceName)
+wxFont::wxFont(const wxNativeFontInfo& info)
 {
 {
-    Unshare();
+    Init();
 
 
-    M_FONTDATA->m_faceName = faceName;
+    Create( info.GetPointSize(),
+            info.GetFamily(),
+            info.GetStyle(),
+            info.GetWeight(),
+            info.GetUnderlined(),
+            info.GetFaceName(),
+            info.GetEncoding() );
 }
 
 }
 
-void wxFont::SetUnderlined(bool underlined)
+bool wxFont::Create( int pointSize,
+                     int family,
+                     int style,
+                     int weight,
+                     bool underlined,
+                     const wxString& face,
+                     wxFontEncoding encoding)
 {
 {
-    Unshare();
-
-    M_FONTDATA->m_underlined = underlined;
-}
+    UnRef();
 
 
-//-----------------------------------------------------------------------------
-// get internal representation of font
-//-----------------------------------------------------------------------------
+    m_refData = new wxFontRefData(pointSize, family, style, weight,
+                                  underlined, face, encoding);
 
 
-// local help function
-static GdkFont *wxLoadQueryNearestFont(int point_size, int fontid,
-        int style, int weight,
-        bool underlined);
+    return TRUE;
+}
 
 
-GdkFont *wxFont::GetInternalFont(float scale) const
+bool wxFont::Create(const wxString& fontname)
 {
 {
-    if (!Ok())
+    // VZ: does this really happen?
+    if ( fontname.empty() )
     {
     {
-        wxFAIL_MSG( "invalid font" );
-        return (GdkFont*) NULL;
+        *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+        return TRUE;
     }
 
     }
 
-    if (M_FONTDATA->m_byXFontName) return M_FONTDATA->m_font;
+    m_refData = new wxFontRefData(fontname);
 
 
-    long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
-    int point_scale = (M_FONTDATA->m_pointSize * 10 * int_scale) / 100;
-    GdkFont *font = (GdkFont *) NULL;
+    return TRUE;
+}
 
 
-    wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
-    if (node)
+void wxFont::Unshare()
+{
+    if (!m_refData)
     {
     {
-        font = (GdkFont*)node->Data();
+        m_refData = new wxFontRefData();
     }
     else
     {
     }
     else
     {
-        if ((int_scale == 100) &&
-                (M_FONTDATA->m_family == wxSWISS) &&
-                (M_FONTDATA->m_style == wxNORMAL) &&
-                (M_FONTDATA->m_pointSize == 12) &&
-                (M_FONTDATA->m_weight == wxNORMAL) &&
-                (M_FONTDATA->m_underlined == FALSE))
-        {
-            font = gdk_font_load( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" );
-        }
-        else
-        {
-            font = wxLoadQueryNearestFont( point_scale, M_FONTDATA->m_fontId, M_FONTDATA->m_style,
-                    M_FONTDATA->m_weight, M_FONTDATA->m_underlined );
-        }
-        M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
+        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
     }
     }
-    if (!font)
-        wxLogError("could not load any font");
-       
-    return font;
 }
 
 }
 
-//-----------------------------------------------------------------------------
-// local utilities to find a X font
-//-----------------------------------------------------------------------------
-
-static GdkFont *wxLoadQueryFont(int point_size, int fontid, int style,
-        int weight, bool WXUNUSED(underlined))
+wxFont::~wxFont()
 {
 {
-    char buffer[512];
-    char *name = wxTheFontNameDirectory->GetScreenName( fontid, weight, style );
-
-    if (!name)
-        name = "-*-*-*-*-*-*-*-%d-*-*-*-*-*-*";
-    sprintf(buffer, name, point_size);
-
-    return gdk_font_load( buffer );
 }
 
 }
 
-static GdkFont *wxLoadQueryNearestFont(int point_size, int fontid,
-        int style, int weight,
-        bool underlined)
-{
-    GdkFont *font;
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
 
 
-    font = wxLoadQueryFont( point_size, fontid, style, weight, underlined );
-
-    if (!font) {
-        // search up and down by stepsize 10
-        int max_size = point_size + 20 * (1 + (point_size/180));
-        int min_size = point_size - 20 * (1 + (point_size/180));
-        int i;
+int wxFont::GetPointSize() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 
-        // Search for smaller size (approx.)
-        for (i=point_size-10; !font && i >= 10 && i >= min_size; i -= 10)
-            font = wxLoadQueryFont(i, fontid, style, weight, underlined);
-        // Search for larger size (approx.)
-        for (i=point_size+10; !font && i <= max_size; i += 10)
-            font = wxLoadQueryFont(i, fontid, style, weight, underlined);
-        // Try default family
-        if (!font && fontid != wxDEFAULT)
-            font = wxLoadQueryFont(point_size, wxDEFAULT, style,
-                    weight, underlined);
-        // Bogus font
-        if (!font)
-            font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
-                    underlined);
-    }
-    return font;
-}
-
-//-----------------------------------------------------------------------------
-// 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]}",
+#if wxUSE_PANGO
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
+                                       : M_FONTDATA->m_pointSize;
 #else
 #else
-    "PostScriptRoman__", "${PostScriptTimes,$[weight],$[style]}",
-    "PostScript___", "LucidaSans${PostScript$[weight]$[style]}",
+    return M_FONTDATA->m_pointSize;
 #endif
 #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]}",
+wxString wxFont::GetFaceName() const
+{
+    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
 
 
-#if !WX_NORMALIZED_PS_FONTS
-    "PostScriptScript__", "Zapf-Chancery-MediumItalic",
+#if wxUSE_PANGO
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
+                                       : M_FONTDATA->m_faceName;
+#else
+    return M_FONTDATA->m_faceName;
 #endif
 #endif
+}
 
 
-    "ScreenMedium", "medium",
-    "ScreenBold", "bold",
-    "ScreenLight", "light",
-    "ScreenStraight", "r",
-    "ScreenItalic", "i",
-    "ScreenSlant", "o",
-
-    "ScreenDefaultBase", "misc-fixed",
-    "ScreenRomanBase", "*-times",
-    "ScreenDecorativeBase", "*-helvetica",
-    "ScreenModernBase", "*-courier",
-    "ScreenTeletypeBase", "*-lucidatypewriter",
-    "ScreenSwissBase", "*-lucida",
-    "ScreenScriptBase", "*-zapfchancery",
-
-    "ScreenStdSuffix", "-${Screen$[weight]}-${Screen$[style]}"
-        "-normal-*-*-%d-*-*-*-*-*-*",
-
-    "Screen___",
-    "-${ScreenDefaultBase}${ScreenStdSuffix}",
-    "ScreenRoman__",
-    "-${ScreenRomanBase}${ScreenStdSuffix}",
-    "ScreenDecorative__",
-    "-${ScreenDecorativeBase}${ScreenStdSuffix}",
-    "ScreenModern__",
-    "-${ScreenModernBase}${ScreenStdSuffix}",
-    "ScreenTeletype__",
-    "-${ScreenTeletypeBase}${ScreenStdSuffix}",
-    "ScreenSwiss__",
-    "-${ScreenSwissBase}${ScreenStdSuffix}",
-    "ScreenScript__",
-    "-${ScreenScriptBase}${ScreenStdSuffix}",
-    (char *) NULL
-};
-
-enum {wxWEIGHT_NORMAL, wxWEIGHT_BOLD,  wxWEIGHT_LIGHT, wxNUM_WEIGHTS};
-enum {wxSTYLE_NORMAL,  wxSTYLE_ITALIC, wxSTYLE_SLANT,  wxNUM_STYLES};
-
-static int WCoordinate(int w)
-{
-    switch (w) 
-    {
-        case wxBOLD:   return wxWEIGHT_BOLD;
-        case wxLIGHT:  return wxWEIGHT_LIGHT;
-        case wxNORMAL:
-        default:       return wxWEIGHT_NORMAL;
-    }
-};
-
-static int SCoordinate(int s)
+int wxFont::GetFamily() const
 {
 {
-    switch (s) 
-    {
-        case wxITALIC: return wxSTYLE_ITALIC;
-        case wxSLANT:  return wxSTYLE_SLANT;
-        case wxNORMAL:
-        default:       return wxSTYLE_NORMAL;
-    }
-};
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 
-//-----------------------------------------------------------------------------
-// wxSuffixMap
-//-----------------------------------------------------------------------------
-
-class wxSuffixMap 
-{
-public:
-    ~wxSuffixMap();
+#if wxUSE_PANGO
+    int ret = M_FONTDATA->m_family;
+    if (M_FONTDATA->HasNativeFont())
+        // wxNativeFontInfo::GetFamily is expensive, must not call more than once
+        ret = M_FONTDATA->m_nativeFontInfo.GetFamily();
 
 
-    inline char *GetName(int weight, int style)
-    {
-        return ( map [WCoordinate(weight)] [SCoordinate(style)] );
-    }
+    if (ret == wxFONTFAMILY_DEFAULT)
+        ret = M_FONTDATA->m_family;
 
 
-    char *map[wxNUM_WEIGHTS][wxNUM_STYLES];
-    void Initialize(const char *, const char *);
-};
+    return ret;
+#else
+    return M_FONTDATA->m_family;
+#endif
+}
 
 
-static void SearchResource(const char *prefix, const char **names, int count, char **v)
+int wxFont::GetStyle() const
 {
 {
-    int k, i, j;
-    char resource[1024], **defaults, *internal;
-
-    k = 1 << count;
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 
-    *v = (char *) NULL;
-    internal = (char *) NULL;
-
-    for (i = 0; i < k; i++) 
-    {
-        strcpy(resource, prefix);
-        for (j = 0; j < count; j++) 
-       {
-           /* upon failure to find a matching fontname 
-              in the default fonts above, we substitute more
-              and more values by _ so that at last ScreenMyFontBoldNormal
-              would turn into Screen___ and this will then get
-              converted to -${ScreenDefaultBase}${ScreenStdSuffix}
-           */
-       
-            if (!(i & (1 << j)))
-                strcat(resource, names[j]);
-            else
-                strcat(resource, "_");
-        }
-       
-        /* we previously search the Xt-resources here */
-
-        if (!internal) 
-       {
-            defaults = font_defaults;
-            while (*defaults) 
-           {
-                if (!strcmp(*defaults, resource)) 
-               {
-                    internal = defaults[1];
-                    break;
-                }
-                defaults += 2;
-            }
-        }
-    }
-    
-    if (internal)
-    {
-        if (strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0)
-       {
-           /* we did not find any font name in the standard list.
-              this can (hopefully does) mean that someone supplied
-              the facename in the wxFont constructor so we insert
-              it here */
-       
-           strcpy( resource,"-*-" );                  /* any producer               */
-           strcat( resource, names[0] );              /* facename                   */
-           strcat( resource, "${ScreenStdSuffix}" );  /* add size params later on   */
-           *v = copystring(resource);
-       }
-       else
-       {
-            *v = copystring(internal);
-       }
-    }
+#if wxUSE_PANGO
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
+                                       : M_FONTDATA->m_style;
+#else
+    return M_FONTDATA->m_style;
+#endif
 }
 
 }
 
-wxSuffixMap::~wxSuffixMap()
+int wxFont::GetWeight() const
 {
 {
-    int k, j;
+    wxCHECK_MSG( Ok(), 0, 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;
-            }
+#if wxUSE_PANGO
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
+                                       : M_FONTDATA->m_weight;
+#else
+    return M_FONTDATA->m_weight;
+#endif
 }
 
 }
 
-void wxSuffixMap::Initialize(const char *resname, const char *devresname)
+bool wxFont::GetUnderlined() const
 {
 {
-    const char *weight, *style;
-    char *v;
-    int i, j, k;
-    const char *names[3];
+    wxCHECK_MSG( Ok(), FALSE, 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_underlined;
 }
 
 }
 
-//-----------------------------------------------------------------------------
-// wxFontNameItem
-//-----------------------------------------------------------------------------
-
-class wxFontNameItem : public wxObject 
+wxFontEncoding wxFont::GetEncoding() 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( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
 
-        int id;
-        int family;
-        char *name;
-        wxSuffixMap screen, printing, afm;
-        bool isroman;
-};
-
-IMPLEMENT_ABSTRACT_CLASS(wxFontNameItem, wxObject)
+    // m_encoding is unused in wxGTK2, return encoding that the user set.
+    return M_FONTDATA->m_encoding;
+}
 
 
-wxFontNameItem::wxFontNameItem(const char *Name, int Id, int Family)
+bool wxFont::GetNoAntiAliasing() const
 {
 {
-    name   = copystring(Name);
-    id     = Id;
-    family = Family;
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
 
-    screen.  Initialize(name, "Screen");
-    printing.Initialize(name, "PostScript");
-    afm.     Initialize(name, "Afm");
+    return M_FONTDATA->m_noAA;
 }
 
 }
 
-wxFontNameItem::~wxFontNameItem()
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 {
-    if (name)
-        delete[] name;
-    name = (char *) NULL;
+    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+
+    return &(M_FONTDATA->m_nativeFontInfo);
 }
 
 }
 
-#if defined(__WXDEBUG__)
-void wxFontNameItem::Dump(ostream& str)
+bool wxFont::IsFixedWidth() const
 {
 {
-    str << "wxFontNameItem(" << name << ")";
-}
-#endif
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
 
 
-//-----------------------------------------------------------------------------
-// wxFontDirectory
-//-----------------------------------------------------------------------------
+    return wxFontBase::IsFixedWidth();
+}
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
+// ----------------------------------------------------------------------------
+// change font attributes
+// ----------------------------------------------------------------------------
 
 
-wxFontNameDirectory::wxFontNameDirectory()
+void wxFont::SetPointSize(int pointSize)
 {
 {
-    table = new wxHashTable(wxKEY_INTEGER, 20);
-    nextFontId = -1;
-}
+    Unshare();
 
 
-wxFontNameDirectory::~wxFontNameDirectory()
-{
-    // Cleanup wxFontNameItems allocated
-    table->BeginFind();
-    wxNode *node = table->Next();
-    while (node) 
-    {
-        wxFontNameItem *item = (wxFontNameItem*)node->Data();
-        delete item;
-        node = table->Next();
-    }
-    delete table;
+    M_FONTDATA->SetPointSize(pointSize);
 }
 
 }
 
-int wxFontNameDirectory::GetNewFontId()
+void wxFont::SetFamily(int family)
 {
 {
-    return (nextFontId--);
-}
+    Unshare();
 
 
-void wxFontNameDirectory::Initialize()
-{
-    Initialize(wxDEFAULT,    wxDEFAULT,    "Default");
-    Initialize(wxDECORATIVE, wxDECORATIVE, "Decorative");
-    Initialize(wxROMAN,      wxROMAN,      "Roman");
-    Initialize(wxMODERN,     wxMODERN,     "Modern");
-    Initialize(wxTELETYPE,   wxTELETYPE,   "Teletype");
-    Initialize(wxSWISS,      wxSWISS,      "Swiss");
-    Initialize(wxSCRIPT,     wxSCRIPT,     "Script");
+    M_FONTDATA->SetFamily(family);
 }
 
 }
 
-void wxFontNameDirectory::Initialize(int fontid, int family, const char *resname)
+void wxFont::SetStyle(int style)
 {
 {
-    char *fam, resource[256];
+    Unshare();
 
 
-    sprintf(resource, "Family%s", resname);
-    SearchResource((const char *)resource, (const char **) NULL, 0, (char **)&fam);
-    
-    if (fam) 
-    {
-        if      (!strcmp(fam, "Default"))    family = wxDEFAULT;
-        else if (!strcmp(fam, "Roman"))        family = wxROMAN;
-        else if (!strcmp(fam, "Decorative"))    family = wxDECORATIVE;
-        else if (!strcmp(fam, "Modern"))    family = wxMODERN;
-        else if (!strcmp(fam, "Teletype"))    family = wxTELETYPE;
-        else if (!strcmp(fam, "Swiss"))        family = wxSWISS;
-        else if (!strcmp(fam, "Script"))    family = wxSCRIPT;
-        delete[] fam; // free resource
-    }
-    table->Put(fontid, new wxFontNameItem(resname, fontid, family));
+    M_FONTDATA->SetStyle(style);
 }
 
 }
 
-int wxFontNameDirectory::FindOrCreateFontId(const char *name, int family)
+void wxFont::SetWeight(int weight)
 {
 {
-    int id;
-    
-    // font exists -> return id
-    if ( (id = GetFontId(name)) ) return id;
-    
-    // create new font
-    Initialize(id=GetNewFontId(), family, name);
-    return id;
-}
+    Unshare();
 
 
-char *wxFontNameDirectory::GetScreenName(int fontid, int weight, int style)
-{
-    wxFontNameItem *item = (wxFontNameItem*)table->Get(fontid); // find font
-    if (item)
-        return item->GetScreenName(weight, style);
-       
-    // font does not exist
-    return (char *) NULL;
+    M_FONTDATA->SetWeight(weight);
 }
 
 }
 
-char *wxFontNameDirectory::GetPostScriptName(int fontid, int weight, int style)
+void wxFont::SetFaceName(const wxString& faceName)
 {
 {
-    wxFontNameItem *item = (wxFontNameItem*)table->Get(fontid); // find font
-    if (item)
-        return item->GetPostScriptName(weight, style);
-       
-    // font does not exist
-    return (char *) NULL;
+    Unshare();
+
+    M_FONTDATA->SetFaceName(faceName);
 }
 
 }
 
-char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style)
+void wxFont::SetUnderlined(bool underlined)
 {
 {
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
-    if (item)
-        return item->GetAFMName(weight, style);
-    // font does not exist
-    return (char *) NULL;
+    Unshare();
+
+    M_FONTDATA->SetUnderlined(underlined);
 }
 
 }
 
-char *wxFontNameDirectory::GetFontName(int fontid)
+void wxFont::SetEncoding(wxFontEncoding encoding)
 {
 {
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
-    if (item)
-        return item->GetName();
-       
-    // font does not exist
-    return (char *) NULL;
+    Unshare();
+
+    M_FONTDATA->SetEncoding(encoding);
 }
 
 }
 
-int wxFontNameDirectory::GetFontId(const char *name)
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
 {
 {
-    wxNode *node;
-
-    table->BeginFind();
+    Unshare();
 
 
-    while ( (node = table->Next()) ) 
-    {
-        wxFontNameItem *item = (wxFontNameItem*)node->Data();
-        if (!strcmp(name, item->name))
-            return item->id;
-    }
-    
-    // font does not exist
-    return 0;
+    M_FONTDATA->SetNativeFontInfo( info );
 }
 
 }
 
-int wxFontNameDirectory::GetFamily(int fontid)
+void wxFont::SetNoAntiAliasing( bool no )
 {
 {
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid);
+    Unshare();
 
 
-    if (item)
-        return item->family;
-       
-    // font does not exist
-    return wxDEFAULT;
+    M_FONTDATA->SetNoAntiAliasing( no );
 }
 }
wxWidgets (Impactor)