]> 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
make sure we are comparing the stripped strings
[wxWidgets.git] / src / gtk / font.cpp
diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 842c71658726be598f4f47a463a8bfe2f06c16eb..3989eea3bfcdd2e2a55b5609179426eb36ba7d74 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -1,1013 +1,974 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// 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"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "font.h"
 #endif
 
 #endif
 
+// 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>
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the default size (in points) for the fonts
+static const int wxDEFAULT_FONT_SIZE = 12;
 
 
-//-----------------------------------------------------------------------------
-// local data
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxScaledFontList: maps the font sizes to the GDK fonts for the given font
+// ----------------------------------------------------------------------------
 
 
-/*
-extern wxFontNameDirectory *wxTheFontNameDirectory;
-*/
+WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
+                    wxScaledFontList);
 
 
-//-----------------------------------------------------------------------------
-// wxFont
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
 
 
-class wxFontRefData: public wxObjectRefData
+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;
-    wxString  m_faceName;
+    virtual ~wxFontRefData();
 
 
-    bool      m_byXFontName;
-    GdkFont  *m_font;
+    // do we have the native font info?
+    bool HasNativeFont() const
+    {
+#ifdef __WXGTK20__
+        // we always have a Pango font description
+        return TRUE;
+#else // GTK 1.x
+        // only use m_nativeFontInfo if it had been initialized
+        return !m_nativeFontInfo.IsDefault();
+#endif // GTK 2.0/1.x
+    }
 
 
-    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() { return m_noAA; }
+
+    // and this one also modifies all the other font data fields
+    void SetNativeFontInfo(const wxNativeFontInfo& info);
+
+    // 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
+
+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();
+
+#ifndef __WXGTK20__
+    // the map of font sizes to "GdkFont *"
+    wxScaledFontList  m_scaled_xfonts;
+#endif // GTK 2.0/1.x
+
+    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_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_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;
+
+    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;
+
+    // and here, do we really want to forbid creation of the font of the size
+    // 90 (the value of wxDEFAULT)??
+    m_pointSize = pointSize == wxDEFAULT || pointSize == -1
+                    ? wxDEFAULT_FONT_SIZE
+                    : pointSize;
+
+    m_underlined = underlined;
+    m_encoding = encoding;
+
+    m_noAA = FALSE;
+
+#ifdef __WXGTK20__
+    // Create native font info
+    m_nativeFontInfo.description = pango_font_description_new();
+
+    // 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;
+        }
+    }
+
+    SetStyle( m_style );
+    SetPointSize( m_pointSize );
+    SetWeight( m_weight );
+#endif // GTK 2.0
 }
 
 }
 
-wxFontRefData::~wxFontRefData()
+void wxFontRefData::InitFromNative()
 {
 {
-    wxNode *node = m_scaled_xfonts.First();
-    while (node)
+    m_noAA = FALSE;
+
+#ifdef __WXGTK20__
+    // Get native info
+    PangoFontDescription *desc = m_nativeFontInfo.description;
+
+    // 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)
+        pango_font_description_set_size( desc, 12 * PANGO_SCALE);
+        
+    m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
+
+    switch (pango_font_description_get_style( desc ))
     {
     {
-        GdkFont *font = (GdkFont*)node->Data();
-        wxNode *next = node->Next();
-        gdk_font_unref( font );
-        node = next;
+        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;
     }
     }
-    if (m_font) gdk_font_unref( m_font );
-}
 
 
-//-----------------------------------------------------------------------------
+    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;
+    }
 
 
-#define M_FONTDATA ((wxFontRefData *)m_refData)
+    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_family = wxFONTFAMILY_ROMAN;
+    }
+    else
+    {
+        m_family = wxFONTFAMILY_UNKNOWN;
+    }
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+    // Pango description are never underlined (?)
+    m_underlined = FALSE;
 
 
-wxFont::wxFont()
-{
-    if (wxTheFontList) wxTheFontList->Append( this );
-}
+    // Cannot we choose that
+    m_encoding = wxFONTENCODING_SYSTEM;
+#else // GTK 1.x
+    // get the font parameters from the XLFD
+    // -------------------------------------
 
 
-wxFont::wxFont( char *xFontName )
-{
-    if (!xFontName) return;
+    m_faceName = m_nativeFontInfo.GetXFontComponent(wxXLFD_FAMILY);
 
 
-    m_refData = new wxFontRefData();
+    m_weight = wxFONTWEIGHT_NORMAL;
 
 
-    M_FONTDATA->m_byXFontName = TRUE;
-    M_FONTDATA->m_font = gdk_font_load( xFontName );
-}
+    wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();
+    if ( !w.empty() && w != _T('*') )
+    {
+        // the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD
+        // and BLACK
+        if ( ((w[0u] == _T('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||
+                                   !wxStrcmp(w.c_str() + 1, wxT("LACK"))))) ||
+             wxStrstr(w.c_str() + 1, _T("BOLD")) )
+        {
+            m_weight = wxFONTWEIGHT_BOLD;
+        }
+        else if ( w == _T("LIGHT") || w == _T("THIN") )
+        {
+            m_weight = wxFONTWEIGHT_LIGHT;
+        }
+    }
 
 
-wxFont::wxFont( int pointSize, int family, int style, int weight, bool underlined, const wxString& face )
-{
-    m_refData = new wxFontRefData();
+    switch ( wxToupper(*m_nativeFontInfo.
+                            GetXFontComponent(wxXLFD_SLANT).c_str()) )
+    {
+        case _T('I'):   // italique
+            m_style = wxFONTSTYLE_ITALIC;
+            break;
 
 
-    if (family == wxDEFAULT) 
-        M_FONTDATA->m_family = wxSWISS;
-    else
-        M_FONTDATA->m_family = family;
-    
-    if (!face.IsEmpty()) M_FONTDATA->m_faceName = face;
+        case _T('O'):   // oblique
+            m_style = wxFONTSTYLE_SLANT;
+            break;
 
 
-    if (style == wxDEFAULT) 
-        M_FONTDATA->m_style = wxNORMAL;
-    else
-        M_FONTDATA->m_style = style;
-    
-    if (weight == wxDEFAULT) 
-        M_FONTDATA->m_weight = wxNORMAL;
-    else
-        M_FONTDATA->m_weight = weight;
-    
-    if (pointSize == wxDEFAULT) 
-        M_FONTDATA->m_pointSize = 12;
+        default:
+            m_style = wxFONTSTYLE_NORMAL;
+    }
+
+    long ptSize;
+    if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_POINTSIZE).ToLong(&ptSize) )
+    {
+        // size in XLFD is in 10 point units
+        m_pointSize = (int)(ptSize / 10);
+    }
     else
     else
-        M_FONTDATA->m_pointSize = pointSize;
-    
-    M_FONTDATA->m_underlined = underlined;
+    {
+        m_pointSize = wxDEFAULT_FONT_SIZE;
+    }
 
 
-    if (wxTheFontList) wxTheFontList->Append( this );
-  
-}
+    // examine the spacing: if the font is monospaced, assume wxTELETYPE
+    // family for compatibility with the old code which used it instead of
+    // IsFixedWidth()
+    if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == _T('M') )
+    {
+        m_family = wxFONTFAMILY_TELETYPE;
+    }
+    else // not monospaceed
+    {
+        // don't even try guessing it, it doesn't work for too many fonts
+        // anyhow
+        m_family = wxFONTFAMILY_UNKNOWN;
+    }
 
 
-wxFont::wxFont( const wxFont& font )
-{
-    Ref( font );
+    // X fonts are never underlined...
+    m_underlined = FALSE;
 
 
-    if (wxTheFontList) wxTheFontList->Append( this );
-}
+    // deal with font encoding
+    wxString
+        registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(),
+        encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper();
 
 
-wxFont::~wxFont()
-{
-    if (wxTheFontList) wxTheFontList->DeleteObject( this );
+    if ( registry == _T("ISO8859") )
+    {
+        int cp;
+        if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
+        {
+            m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
+        }
+    }
+    else if ( registry == _T("MICROSOFT") )
+    {
+        int cp;
+        if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
+        {
+            m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
+        }
+    }
+    else if ( registry == _T("KOI8") )
+    {
+        m_encoding = wxFONTENCODING_KOI8;
+    }
+    else // unknown encoding
+    {
+        // may be give a warning here? or use wxFontMapper?
+        m_encoding = wxFONTENCODING_SYSTEM;
+    }
+#endif // GTK 2.0/1.x
 }
 
 }
 
-wxFont& wxFont::operator = ( const wxFont& font )
+wxFontRefData::wxFontRefData( const wxFontRefData& data )
+             : wxObjectRefData()
 {
 {
-    if (*this == font) return (*this);
-    Ref( font );
-    return *this;
-}
+    m_pointSize = data.m_pointSize;
+    m_family = data.m_family;
+    m_style = data.m_style;
+    m_weight = data.m_weight;
 
 
-bool wxFont::operator == ( const wxFont& font ) const
-{
-    return m_refData == font.m_refData;
-}
+    m_underlined = data.m_underlined;
 
 
-bool wxFont::operator != ( const wxFont& font ) const
-{
-    return m_refData != font.m_refData;
+    m_faceName = data.m_faceName;
+    m_encoding = data.m_encoding;
+
+    m_noAA = data.m_noAA;
+
+    // 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, _T("invalid font") );
+    // VZ: FromString() should really work in both cases, doesn't it?
+#ifdef __WXGTK20__
+    m_nativeFontInfo.FromString( fontname );
+#else // GTK 1.x
+    m_nativeFontInfo.SetXFontName(fontname);
+#endif // GTK 2.0/1.x
 
 
-    return M_FONTDATA->m_pointSize;
+    InitFromNative();
 }
 
 }
 
-wxString wxFont::GetFaceName() const
+void wxFontRefData::ClearGdkFonts()
 {
 {
-    wxCHECK_MSG( Ok(), _T(""), _T("invalid font") );
+#ifndef __WXGTK20__
+    for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin();
+          i != m_scaled_xfonts.end();
+          ++i )
+    {
+        GdkFont *font = i->second;
+        gdk_font_unref( font );
+    }
 
 
-    return M_FONTDATA->m_faceName;
+    m_scaled_xfonts.clear();
+#endif // GTK 1.x
 }
 
 }
 
-int wxFont::GetFamily() const
+wxFontRefData::~wxFontRefData()
 {
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
-
-    return M_FONTDATA->m_family;
+    ClearGdkFonts();
 }
 
 }
 
-wxString wxFont::GetFamilyString() const
+// ----------------------------------------------------------------------------
+// wxFontRefData SetXXX()
+// ----------------------------------------------------------------------------
+
+void wxFontRefData::SetPointSize(int pointSize)
 {
 {
-    wxCHECK_MSG( Ok(), _T("wxDEFAULT"), _T("invalid font") );
+    m_pointSize = pointSize;
+
+#ifdef __WXGTK20__
+    // Get native info
+    PangoFontDescription *desc = m_nativeFontInfo.description;
 
 
-    switch (M_FONTDATA->m_family)
+    pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE );
+#else
+    if ( HasNativeFont() )
     {
     {
-        case wxDECORATIVE:   return wxString(_T("wxDECORATIVE"));
-        case wxROMAN:        return wxString(_T("wxROMAN"));
-        case wxSCRIPT:       return wxString(_T("wxSCRIPT"));
-        case wxSWISS:        return wxString(_T("wxSWISS"));
-        case wxMODERN:       return wxString(_T("wxMODERN"));
-        case wxTELETYPE:     return wxString(_T("wxTELETYPE"));
-        default:             return _T("wxDEFAULT");
-    }
+        wxString size;
+        if ( pointSize == -1 )
+            size = _T('*');
+        else
+            size.Printf(_T("%d"), 10*pointSize);
 
 
-    return "wxDEFAULT";
+        m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size);
+    }
+#endif
 }
 
 }
 
-int wxFont::GetStyle() const
+void wxFontRefData::SetFamily(int family)
 {
 {
-    wxCHECK_MSG( Ok(), 0, _T("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(), _T("wxDEFAULT"), _T("invalid font") );
+    m_style = style;
+
+#ifdef __WXGTK20__
+    // Get native info
+    PangoFontDescription *desc = m_nativeFontInfo.description;
 
 
-    switch (M_FONTDATA->m_style)
+    switch ( style )
     {
     {
-        case wxNORMAL:   return wxString(_T("wxNORMAL"));
-        case wxSLANT:    return wxString(_T("wxSLANT"));
-        case wxITALIC:   return wxString(_T("wxITALIC"));
-        default:         return wxString(_T("wxDEFAULT"));
+        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');
+                break;
 
 
-    return wxString(_T("wxDEFAULT"));
-}
+            case wxFONTSTYLE_SLANT:
+                slant = _T('o');
+                break;
 
 
-int wxFont::GetWeight() const
-{
-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+            default:
+                wxFAIL_MSG( _T("unknown font style") );
+                // fall through
 
 
-    return M_FONTDATA->m_weight;
+            case wxFONTSTYLE_NORMAL:
+                slant = _T('r');
+        }
+
+        m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant);
+    }
+#endif
 }
 
 }
 
-wxString wxFont::GetWeightString() const
+void wxFontRefData::SetWeight(int weight)
 {
 {
-    wxCHECK_MSG( Ok(), _T("wxDEFAULT"), _T("invalid font") );
+    m_weight = weight;
 
 
-    switch (M_FONTDATA->m_weight)
+#ifdef __WXGTK20__
+    PangoFontDescription *desc = m_nativeFontInfo.description;
+    switch ( weight )
     {
     {
-        case wxNORMAL:   return wxString(_T("wxNORMAL"));
-        case wxBOLD:     return wxString(_T("wxBOLD"));
-        case wxLIGHT:    return wxString(_T("wxLIGHT"));
-        default:         return wxString(_T("wxDEFAULT"));
+        case wxFONTWEIGHT_BOLD:
+            pango_font_description_set_weight(desc, PANGO_WEIGHT_BOLD);
+            break;
+
+        case wxFONTWEIGHT_LIGHT:
+            pango_font_description_set_weight(desc, PANGO_WEIGHT_LIGHT);
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown font weight") );
+            // fall through
+
+        case wxFONTWEIGHT_NORMAL:
+            // unspecified
+            pango_font_description_set_weight(desc, PANGO_WEIGHT_NORMAL);
     }
     }
+#else //!__WXGTK20__
+    if ( HasNativeFont() )
+    {
+        wxString boldness;
+        switch ( weight )
+        {
+            case wxFONTWEIGHT_BOLD:
+                boldness = _T("bold");
+                break;
+
+            case wxFONTWEIGHT_LIGHT:
+                boldness = _T("light");
+                break;
 
 
-    return wxString(_T("wxDEFAULT"));
+            default:
+                wxFAIL_MSG( _T("unknown font weight") );
+                // fall through
+
+            case wxFONTWEIGHT_NORMAL:
+                // unspecified
+                boldness = _T("medium");
+        }
+
+        m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness);
+    }
+#endif
 }
 
 }
 
-bool wxFont::GetUnderlined() const
+void wxFontRefData::SetUnderlined(bool underlined)
 {
 {
-    wxCHECK_MSG( Ok(), FALSE, _T("invalid font") );
+    m_underlined = underlined;
 
 
-    return M_FONTDATA->m_underlined;
+    // the XLFD doesn't have "underlined" field anyhow
 }
 
 }
 
-void wxFont::Unshare()
+void wxFontRefData::SetFaceName(const wxString& facename)
 {
 {
-    if (!m_refData)
-    {
-       m_refData = new wxFontRefData();
-    }
-    else
+    m_faceName = facename;
+
+#ifndef __WXGTK20__
+    if ( HasNativeFont() )
     {
     {
-       wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-       UnRef();
-       m_refData = ref;
+        m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
     }
     }
+#endif
 }
 
 }
 
-void wxFont::SetPointSize(int pointSize)
+void wxFontRefData::SetEncoding(wxFontEncoding encoding)
 {
 {
-    Unshare();
+    m_encoding = encoding;
 
 
-    M_FONTDATA->m_pointSize = pointSize;
+#ifndef __WXGTK20__
+    if ( HasNativeFont() )
+    {
+        wxNativeEncodingInfo info;
+        if ( wxGetNativeFontEncoding(encoding, &info) )
+        {
+            m_nativeFontInfo.SetXFontComponent(wxXLFD_REGISTRY, info.xregistry);
+            m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding);
+        }
+    }
+#endif
 }
 
 }
 
-void wxFont::SetFamily(int family)
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
 {
 {
-    Unshare();
+    // previously cached fonts shouldn't be used
+    ClearGdkFonts();
+
+    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;
+#ifdef __WXGTK20__
+    Create( info.GetPointSize(),
+            info.GetFamily(),
+            info.GetStyle(),
+            info.GetWeight(),
+            info.GetUnderlined(),
+            info.GetFaceName(),
+            info.GetEncoding() );
+#else
+    (void) Create(info.GetXFontName());
+#endif
 }
 
 }
 
-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);
 
 
-static GdkFont *wxLoadQueryNearestFont( int point_size, int family, int style, int weight, 
-                                        bool underlined, const wxString &facename );
+    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( _T("invalid font") );
-        return (GdkFont*) NULL;
-    }
+        *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
 
-    /* short cut if the special X font constructor has been used */
-    if (M_FONTDATA->m_byXFontName) return M_FONTDATA->m_font;
+        return TRUE;
+    }
 
 
-    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;
+    m_refData = new wxFontRefData(fontname);
 
 
-    wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
-    if (node)
-    {
-        font = (GdkFont*)node->Data();
-    }
-    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_family, M_FONTDATA->m_style,
-                    M_FONTDATA->m_weight, M_FONTDATA->m_underlined, M_FONTDATA->m_faceName );
-        }
-        M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
-    }
-    
-    if (!font)
-    {
-        wxLogError(_T("could not load any font"));
-    }
-       
-    return font;
+    return TRUE;
 }
 
 }
 
-//-----------------------------------------------------------------------------
-// local utilities to find a X font
-//-----------------------------------------------------------------------------
-
-static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight, 
-                                bool underlined, const wxString &facename )
+void wxFont::Unshare()
 {
 {
-    wxChar *xfamily = (wxChar*) NULL;
-    wxChar *xstyle = (wxChar*) NULL;
-    wxChar *xweight = (wxChar*) NULL;
-    
-    switch (family)
-    {
-        case wxDECORATIVE: xfamily = _T("lucida"); break;
-        case wxROMAN:      xfamily = _T("times");  break;
-        case wxMODERN:     xfamily = _T("courier"); break;
-        case wxSWISS:      xfamily = _T("helvetica"); break;
-       case wxTELETYPE:   xfamily = _T("lucidatypewriter"); break;
-       case wxSCRIPT:     xfamily = _T("utopia"); break;
-        default:           xfamily = _T("*");
-    }
-    
-    if (!facename.IsEmpty())
-    {
-        wxSprintf( wxBuffer, _T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str() );
-        GdkFont *test = gdk_font_load( wxConv_libc.cWX2MB(wxBuffer) );
-        if (test)
-       {
-           gdk_font_unref( test );
-           xfamily = WXSTRINGCAST facename;
-       }
-    }
-    
-    switch (style)
+    if (!m_refData)
     {
     {
-        case wxITALIC:     xstyle = _T("i"); break;
-        case wxSLANT:      xstyle = _T("o"); break;
-        case wxNORMAL:     xstyle = _T("r"); break;
-        default:           xstyle = _T("*"); break;
+        m_refData = new wxFontRefData();
     }
     }
-    switch (weight)
+    else
     {
     {
-        case wxBOLD:       xweight = _T("bold"); break;
-        case wxLIGHT:
-        case wxNORMAL:     xweight = _T("medium"); break;
-        default:           xweight = _T("*"); break;
+        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
     }
     }
-    
-    wxSprintf( wxBuffer, _T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*"),
-        xfamily, xweight, xstyle, pointSize);
-    
-    return gdk_font_load( wxConv_libc.cWX2MB(wxBuffer) );
 }
 
 }
 
-static GdkFont *wxLoadQueryNearestFont( int point_size, int family, int style, int weight, 
-                                       bool underlined, const wxString &facename )
+wxFont::~wxFont()
 {
 {
-    GdkFont *font = wxLoadQueryFont( point_size, family, style, weight, underlined, facename );
-
-    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;
-
-        /* Search for smaller size (approx.) */
-        for (i=point_size-10; !font && i >= 10 && i >= min_size; i -= 10)
-            font = wxLoadQueryFont(i, family, style, weight, underlined, facename );
+}
 
 
-        /* Search for larger size (approx.) */
-        for (i=point_size+10; !font && i <= max_size; i += 10)
-            font = wxLoadQueryFont( i, family, style, weight, underlined, facename );
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
 
 
-        /* Try default family */
-        if (!font && family != wxDEFAULT)
-            font = wxLoadQueryFont( point_size, wxDEFAULT, style, weight, underlined, facename );
+int wxFont::GetPointSize() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 
-        /* Bogus font */
-        if (!font)
-            font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL, underlined, facename );
-    }
-    
-    return font;
+    return M_FONTDATA->m_pointSize;
 }
 
 }
 
-/*
-
-//-----------------------------------------------------------------------------
-// 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
+wxString wxFont::GetFaceName() const
+{
+    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
 
 
-    "PostScriptTimesMedium", "",
-    "PostScriptTimesLight", "",
-    "PostScriptTimesBold", "Bold",
+    return M_FONTDATA->m_faceName;
+}
 
 
-    "PostScriptTimes__", "Times${PostScript$[weight]$[style]}",
-    "PostScriptTimesMediumStraight", "Times-Roman",
-    "PostScriptTimesLightStraight", "Times-Roman",
-    "PostScriptTimes_Slant", "Times-${PostScriptTimes$[weight]}Italic",
-    "PostScriptTimes_Italic", "Times-${PostScriptTimes$[weight]}Italic",
+int wxFont::GetFamily() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 
-    "PostScriptSwiss__", "Helvetica${PostScript$[weight]$[style]}",
-    "PostScriptModern__", "Courier${PostScript$[weight]$[style]}",
+    return M_FONTDATA->m_family;
+}
 
 
-    "PostScriptTeletype__", "${PostScriptModern,$[weight],$[style]}",
+int wxFont::GetStyle() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 
-#if !WX_NORMALIZED_PS_FONTS
-    "PostScriptScript__", "Zapf-Chancery-MediumItalic",
-#endif
+    return M_FONTDATA->m_style;
+}
 
 
-    "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
-};
+int wxFont::GetWeight() const
+{
+    wxCHECK_MSG( Ok(), 0, 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_weight;
+}
 
 
-static int WCoordinate(int w)
+bool wxFont::GetUnderlined() const
 {
 {
-    switch (w) 
-    {
-        case wxBOLD:   return wxWEIGHT_BOLD;
-        case wxLIGHT:  return wxWEIGHT_LIGHT;
-        case wxNORMAL:
-        default:       return wxWEIGHT_NORMAL;
-    }
-};
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
 
 
-static int SCoordinate(int s)
+    return M_FONTDATA->m_underlined;
+}
+
+wxFontEncoding wxFont::GetEncoding() const
 {
 {
-    switch (s) 
-    {
-        case wxITALIC: return wxSTYLE_ITALIC;
-        case wxSLANT:  return wxSTYLE_SLANT;
-        case wxNORMAL:
-        default:       return wxSTYLE_NORMAL;
-    }
-};
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
 
-//-----------------------------------------------------------------------------
-// wxSuffixMap
-//-----------------------------------------------------------------------------
+    return M_FONTDATA->m_encoding;
+}
 
 
-class wxSuffixMap 
+bool wxFont::GetNoAntiAliasing()
 {
 {
-public:
-    ~wxSuffixMap();
-
-    inline char *GetName(int weight, int style)
-    {
-        return ( map [WCoordinate(weight)] [SCoordinate(style)] );
-    }
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
 
-    char *map[wxNUM_WEIGHTS][wxNUM_STYLES];
-    void Initialize(const char *, const char *);
-};
+    return M_FONTDATA->m_noAA;
+}
 
 
-static void SearchResource(const char *prefix, const char **names, int count, char **v)
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 {
-    int k, i, j;
-    char resource[1024], **defaults, *internal;
-
-    k = 1 << count;
+    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
 
-    *v = (char *) NULL;
-    internal = (char *) NULL;
+#ifndef __WXGTK20__
+    if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
+        GetInternalFont();
+#endif
 
 
-    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) &&
-           (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);
-       }
-    }
-}
-
-wxSuffixMap::~wxSuffixMap()
-{
-    int k, j;
-
-    for (k = 0; k < wxNUM_WEIGHTS; ++k)
-        for (j = 0; j < wxNUM_STYLES; ++j)
-            if (map[k][j]) 
-           {
-                delete[] map[k][j];
-                map[k][j] = (char *) NULL;
-            }
+    return &(M_FONTDATA->m_nativeFontInfo);
 }
 
 }
 
-void wxSuffixMap::Initialize(const char *resname, const char *devresname)
+bool wxFont::IsFixedWidth() 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++) 
+#ifndef __WXGTK20__
+    if ( M_FONTDATA->HasNativeFont() )
     {
     {
-        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;
-        }
-    }
-}
-
-//-----------------------------------------------------------------------------
-// wxFontNameItem
-//-----------------------------------------------------------------------------
+        // the monospace fonts are supposed to have "M" in the spacing field
+        wxString spacing = M_FONTDATA->
+                            m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING);
 
 
-class wxFontNameItem : public wxObject 
-{
-    DECLARE_DYNAMIC_CLASS(wxFontNameItem)
-public:
-        wxFontNameItem(const char *name, int id, int family);
-        ~wxFontNameItem();
-
-        inline char* GetScreenName(int w, int s)     {return screen.GetName(w, s);}
-        inline char* GetPostScriptName(int w, int s) {return printing.GetName(w, s);}
-        inline char* GetAFMName(int w, int s)        {return afm.GetName(w, s);}
-        inline char* GetName()                   {return name;}
-        inline int   GetFamily()                 {return family;}
-        inline int   GetId()                     {return id;}
-        inline bool  IsRoman()                   {return isroman;}
-#if defined(__WXDEBUG__)
-        void Dump(ostream& str);
+        return spacing.Upper() == _T('M');
+    }
 #endif
 
 #endif
 
-        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;
+    Unshare();
 
 
-    screen.  Initialize(name, "Screen");
-    printing.Initialize(name, "PostScript");
-    afm.     Initialize(name, "Afm");
+    M_FONTDATA->SetPointSize(pointSize);
 }
 
 }
 
-wxFontNameItem::~wxFontNameItem()
+void wxFont::SetFamily(int family)
 {
 {
-    if (name)
-        delete[] name;
-    name = (char *) NULL;
-}
+    Unshare();
 
 
-#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(int style)
 {
 {
-    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->SetStyle(style);
 }
 
 }
 
-int wxFontNameDirectory::GetNewFontId()
+void wxFont::SetWeight(int weight)
 {
 {
-    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->SetWeight(weight);
 }
 
 }
 
-void wxFontNameDirectory::Initialize(int fontid, int family, const char *resname)
+void wxFont::SetFaceName(const wxString& faceName)
 {
 {
-    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->SetFaceName(faceName);
 }
 
 }
 
-int wxFontNameDirectory::FindOrCreateFontId(const char *name, int family)
+void wxFont::SetUnderlined(bool underlined)
 {
 {
-    int id;
-    
-    // font exists -> return id
-    if ( (id = GetFontId(name)) ) return id;
-    
-    // create new font
-    Initialize(id=GetNewFontId(), family, name);
-    return id;
+    Unshare();
+
+    M_FONTDATA->SetUnderlined(underlined);
 }
 
 }
 
-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);
-       
-    // font does not exist
-    return (char *) NULL;
+    Unshare();
+
+    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);
-       
-    // font does not exist
-    return (char *) NULL;
+    Unshare();
+
+    M_FONTDATA->SetNativeFontInfo( info );
 }
 
 }
 
-char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style)
+void wxFont::SetNoAntiAliasing( bool no )
 {
 {
-    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->SetNoAntiAliasing( no );
 }
 
 }
 
-char *wxFontNameDirectory::GetFontName(int fontid)
+// ----------------------------------------------------------------------------
+// get internal representation of font
+// ----------------------------------------------------------------------------
+
+#ifndef __WXGTK20__
+static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
+
+// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
+extern GdkFont *GtkGetDefaultGuiFont()
 {
 {
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
-    if (item)
-        return item->GetName();
-       
-    // font does not exist
-    return (char *) NULL;
+    if (!g_systemDefaultGuiFont)
+    {
+        GtkWidget *widget = gtk_button_new();
+        GtkStyle *def = gtk_rc_get_style( widget );
+        if (def)
+        {
+            g_systemDefaultGuiFont = gdk_font_ref( def->font );
+        }
+        else
+        {
+            def = gtk_widget_get_default_style();
+            if (def)
+                g_systemDefaultGuiFont = gdk_font_ref( def->font );
+        }
+        gtk_widget_destroy( widget );
+    }
+    else
+    {
+        // already have it, but ref it once more before returning
+        gdk_font_ref(g_systemDefaultGuiFont);
+    }
+
+    return g_systemDefaultGuiFont;
 }
 
 }
 
-int wxFontNameDirectory::GetFontId(const char *name)
+GdkFont *wxFont::GetInternalFont( float scale ) const
 {
 {
-    wxNode *node;
+    GdkFont *font = (GdkFont *) NULL;
+
+    wxCHECK_MSG( Ok(), font, wxT("invalid font") )
 
 
-    table->BeginFind();
+    long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
+    int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
 
 
-    while ( (node = table->Next()) ) 
+    wxScaledFontList& list = M_FONTDATA->m_scaled_xfonts;
+    wxScaledFontList::iterator i = list.find(int_scale);
+    if ( i != list.end() )
     {
     {
-        wxFontNameItem *item = (wxFontNameItem*)node->Data();
-        if (!strcmp(name, item->name))
-            return item->id;
+        font = i->second;
     }
     }
-    
-    // font does not exist
-    return 0;
-}
+    else // we don't have this font in this size yet
+    {
+        if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
+        {
+            font = GtkGetDefaultGuiFont();
+        }
 
 
-int wxFontNameDirectory::GetFamily(int fontid)
-{
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid);
+        if ( !font )
+        {
+            // do we have the XLFD?
+            if ( M_FONTDATA->HasNativeFont() )
+            {
+                font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());
+            }
+
+            // no XLFD of no exact match - try the approximate one now
+            if ( !font )
+            {
+                wxString xfontname;
+                font = wxLoadQueryNearestFont( point_scale,
+                                               M_FONTDATA->m_family,
+                                               M_FONTDATA->m_style,
+                                               M_FONTDATA->m_weight,
+                                               M_FONTDATA->m_underlined,
+                                               M_FONTDATA->m_faceName,
+                                               M_FONTDATA->m_encoding,
+                                               &xfontname);
+            }
+        }
+
+        if ( font )
+        {
+            list[int_scale] = font;
+        }
+    }
 
 
-    if (item)
-        return item->family;
-       
-    // font does not exist
-    return wxDEFAULT;
+    // it's quite useless to make it a wxCHECK because we're going to crash
+    // anyhow...
+    wxASSERT_MSG( font, wxT("could not load any font?") );
+
+    return font;
 }
 }
+#endif  // not GTK 2.0
 
 
-*/
wxWidgets (Impactor)