add GetLo/Hi() test

[wxWidgets.git] / src / gtk1 / font.cpp

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index db03f434a60139f5c374c7c8bea39793815e53e3..097519952e5b0b6d2acfcc2db1f18751dc669261 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.cpp
+// Name:        src/gtk1/font.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,74 +15,108 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "font.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/font.h"
 
 #include "wx/font.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/settings.h"
+    #include "wx/cmndata.h"
+    #include "wx/gdicmn.h"
+#endif
+
+#include "wx/fontutil.h"

 #include "wx/utils.h"
 #include "wx/utils.h"

-#include "wx/log.h"
-#include "wx/gdicmn.h"

 #include "wx/tokenzr.h"
 
 #include <strings.h>
 
 #include "wx/tokenzr.h"
 
 #include <strings.h>
 

-#include "gdk/gdk.h"
+#include "wx/gtk1/private.h"
+#include <gdk/gdkprivate.h>

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// local data
+// constants

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-#if wxUSE_FONTNAMEDIRECTORY
-    extern wxFontNameDirectory *wxTheFontNameDirectory;
-#endif
+// the default size (in points) for the fonts
+static const int wxDEFAULT_FONT_SIZE = 12;

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// private functions
+// wxScaledFontList: maps the font sizes to the GDK fonts for the given font

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// returns TRUE if there are any fonts matching this font spec
-static bool wxTestFontSpec(const wxString& fontspec);
-
-static GdkFont *wxLoadQueryFont( int pointSize,
-                                 int family,
-                                 int style,
-                                 int weight,
-                                 bool underlined,
-                                 const wxString &facename,
-                                 wxFontEncoding encoding );
-
-static GdkFont *wxLoadQueryNearestFont( int pointSize,
-                                        int family,
-                                        int style,
-                                        int weight,
-                                        bool underlined,
-                                        const wxString &facename,
-                                        wxFontEncoding encoding);
+WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
+                    wxScaledFontList);

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------
 

-class wxFontRefData : public wxObjectRefData
+class wxFontRefData : public wxGDIRefData

 {
 public:
 {
 public:

-    wxFontRefData(int size = wxDEFAULT,
-                  int family = wxDEFAULT,
-                  int style = wxDEFAULT,
-                  int weight = wxDEFAULT,
-                  bool underlined = FALSE,
+    // from broken down font parameters, also default ctor
+    wxFontRefData(int size = -1,
+                  int family = wxFONTFAMILY_DEFAULT,
+                  int style = wxFONTSTYLE_NORMAL,
+                  int weight = wxFONTWEIGHT_NORMAL,
+                  bool underlined = false,

                   const wxString& faceName = wxEmptyString,
                   const wxString& faceName = wxEmptyString,

-                  wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-        : m_scaled_xfonts(wxKEY_INTEGER)
-    {
-        Init(size, family, style, weight, underlined, faceName, encoding);
-    }
+                  wxFontEncoding encoding = wxFONTENCODING_DEFAULT);

 
 

+    // from XFLD
+    wxFontRefData(const wxString& fontname);
+
+    // copy ctor

     wxFontRefData( const wxFontRefData& data );
 
     virtual ~wxFontRefData();
 
     wxFontRefData( const wxFontRefData& data );
 
     virtual ~wxFontRefData();
 

+    // do we have the native font info?
+    bool HasNativeFont() const
+    {
+        // only use m_nativeFontInfo if it had been initialized
+        return !m_nativeFontInfo.IsDefault();
+    }
+
+    // setters: all of them also take care to modify m_nativeFontInfo if we
+    // have it so as to not lose the information not carried by our fields
+    void SetPointSize(int pointSize);
+    void SetFamily(int family);
+    void SetStyle(int style);
+    void SetWeight(int weight);
+    void SetUnderlined(bool underlined);
+    bool 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);
+
+    // 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__)
+    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,
 protected:
     // common part of all ctors
     void Init(int pointSize,


@@ -93,26 +127,33 @@ protected:
               const wxString& faceName,
               wxFontEncoding encoding);
 
               const wxString& faceName,
               wxFontEncoding encoding);
 

-private:
-    wxList    m_scaled_xfonts;
-
-    int       m_pointSize;
-    int       m_family,
-              m_style,
-              m_weight;
-    bool      m_underlined;
-    wxString  m_faceName;
-    wxFontEncoding m_encoding;
+    // set all fields from (already initialized and valid) m_nativeFontInfo
+    void InitFromNative();

 
 

-    bool      m_byXFontName;
-    GdkFont  *m_font;
-
-    friend wxFont;
+private:
+    // clear m_scaled_xfonts if any
+    void ClearGdkFonts();
+
+    // the map of font sizes to "GdkFont *"
+    wxScaledFontList  m_scaled_xfonts;
+
+    int             m_pointSize;
+    int             m_family,
+                    m_style,
+                    m_weight;
+    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;

 };
 
 };
 

-// ============================================================================
-// implementation
-// ============================================================================
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData


@@ -126,120 +167,324 @@ void wxFontRefData::Init(int pointSize,
                          const wxString& faceName,
                          wxFontEncoding encoding)
 {
                          const wxString& faceName,
                          wxFontEncoding encoding)
 {

-    if (family == wxDEFAULT)
-        m_family = wxSWISS;
-    else
-        m_family = family;
+    m_family = family == wxFONTFAMILY_DEFAULT ? wxFONTFAMILY_SWISS : family;

 
     m_faceName = faceName;
 
 
     m_faceName = faceName;
 

-    if (style == wxDEFAULT)
-        m_style = wxNORMAL;
-    else
-        m_style = style;
-
-    if (weight == wxDEFAULT)
-        m_weight = wxNORMAL;
-    else
-        m_weight = weight;
+    // we accept both wxDEFAULT and wxNORMAL here - should we?
+    m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style;
+    m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight;

 
 

-    if (pointSize == wxDEFAULT)
-        m_pointSize = 12;
-    else
-        m_pointSize = pointSize;
+    // and here, do we really want to forbid creation of the font of the size
+    // 90 (the value of wxDEFAULT)??
+    m_pointSize = pointSize == wxDEFAULT || pointSize == -1
+                    ? wxDEFAULT_FONT_SIZE
+                    : pointSize;

 
     m_underlined = underlined;
     m_encoding = encoding;
 
 
     m_underlined = underlined;
     m_encoding = encoding;
 

-    m_byXFontName = FALSE;
-    m_font = (GdkFont *) NULL;
+    m_noAA = false;
+}
+
+void wxFontRefData::InitFromNative()
+{
+    m_noAA = false;
+
+    // get the font parameters from the XLFD
+    // -------------------------------------
+
+    m_faceName = m_nativeFontInfo.GetXFontComponent(wxXLFD_FAMILY);
+
+    m_weight = wxFONTWEIGHT_NORMAL;
+
+    wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();
+    if ( !w.empty() && w != _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;
+        }
+    }
+
+    switch ( wxToupper(m_nativeFontInfo.
+                           GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )
+    {
+        case _T('I'):   // italique
+            m_style = wxFONTSTYLE_ITALIC;
+            break;
+
+        case _T('O'):   // oblique
+            m_style = wxFONTSTYLE_SLANT;
+            break;
+
+        default:
+            m_style = wxFONTSTYLE_NORMAL;
+    }
+
+    long ptSize;
+    if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_POINTSIZE).ToLong(&ptSize) )
+    {
+        // size in XLFD is in 10 point units
+        m_pointSize = (int)(ptSize / 10);
+    }
+    else
+    {
+        m_pointSize = wxDEFAULT_FONT_SIZE;
+    }
+
+    // examine the spacing: if the font is monospaced, assume wxTELETYPE
+    // family for compatibility with the old code which used it instead of
+    // IsFixedWidth()
+    if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == _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;
+    }
+
+    // X fonts are never underlined...
+    m_underlined = false;
+
+    // deal with font encoding
+    wxString
+        registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(),
+        encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper();
+
+    if ( registry == _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;
+    }

 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )

-             : m_scaled_xfonts(wxKEY_INTEGER)
+             : wxGDIRefData()

 {
 {

-    Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
-         data.m_underlined, data.m_faceName, data.m_encoding);
+    m_pointSize = data.m_pointSize;
+    m_family = data.m_family;
+    m_style = data.m_style;
+    m_weight = data.m_weight;
+
+    m_underlined = data.m_underlined;

 
 

-    if (data.m_font)
-        m_font = gdk_font_ref( data.m_font );
+    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());

 }
 
 }
 

-wxFontRefData::~wxFontRefData()
+wxFontRefData::wxFontRefData(int size, int family, int style,
+                             int weight, bool underlined,
+                             const wxString& faceName,
+                             wxFontEncoding encoding)

 {
 {

-    wxNode *node = m_scaled_xfonts.First();
-    while (node)
+    Init(size, family, style, weight, underlined, faceName, encoding);
+}
+
+wxFontRefData::wxFontRefData(const wxString& fontname)
+{
+    // FromString() should really work in GTK1 too, doesn't it?
+    m_nativeFontInfo.SetXFontName(fontname);
+
+    InitFromNative();
+}
+
+void wxFontRefData::ClearGdkFonts()
+{
+    for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin();
+          i != m_scaled_xfonts.end();
+          ++i )

     {
     {

-        GdkFont *font = (GdkFont*)node->Data();
-        wxNode *next = node->Next();
+        GdkFont *font = i->second;

         gdk_font_unref( font );
         gdk_font_unref( font );

-        node = next;

     }
 
     }
 

-    if (m_font)
-        gdk_font_unref( m_font );
+    m_scaled_xfonts.clear();
+}
+
+wxFontRefData::~wxFontRefData()
+{
+    ClearGdkFonts();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxFont
+// wxFontRefData SetXXX()

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+void wxFontRefData::SetPointSize(int pointSize)
+{
+    m_pointSize = pointSize;

 
 

-void wxFont::Init()
+    if ( HasNativeFont() )
+    {
+        wxString size;
+        if ( pointSize == -1 )
+            size = _T('*');
+        else
+            size.Printf(_T("%d"), 10*pointSize);
+
+        m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size);
+    }
+}
+
+void wxFontRefData::SetFamily(int family)

 {
 {

-    if (wxTheFontList)
-        wxTheFontList->Append( this );
+    m_family = family;
+
+    // TODO: what are we supposed to do with m_nativeFontInfo here?
+}
+
+void wxFontRefData::SetStyle(int style)
+{
+    m_style = style;
+
+    if ( HasNativeFont() )
+    {
+        wxString slant;
+        switch ( style )
+        {
+            case wxFONTSTYLE_ITALIC:
+                slant = _T('i');
+                break;
+
+            case wxFONTSTYLE_SLANT:
+                slant = _T('o');
+                break;
+
+            default:
+                wxFAIL_MSG( _T("unknown font style") );
+                // fall through
+
+            case wxFONTSTYLE_NORMAL:
+                slant = _T('r');
+        }
+
+        m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant);
+    }

 }
 
 }
 

-wxFont::wxFont( GdkFont *font, char *xFontName )
+void wxFontRefData::SetWeight(int weight)

 {
 {

-    if (!xFontName)
-        return;
+    m_weight = weight;

 
 

-    // VZ: this ctor ddidn't append the font to wxTheFontList before, but
-    //     there is no reason to not do it, is there?
-    Init();
+    if ( HasNativeFont() )
+    {
+        wxString boldness;
+        switch ( weight )
+        {
+            case wxFONTWEIGHT_BOLD:
+                boldness = _T("bold");
+                break;

 
 

-    m_refData = new wxFontRefData();
+            case wxFONTWEIGHT_LIGHT:
+                boldness = _T("light");
+                break;

 
 

-//  M_FONTDATA->m_byXFontName = TRUE;
-    M_FONTDATA->m_font = font;
+            default:
+                wxFAIL_MSG( _T("unknown font weight") );
+                // fall through

 
 

-    wxString tmp;
+            case wxFONTWEIGHT_NORMAL:
+                // unspecified
+                boldness = _T("medium");
+        }

 
 

-    wxString fontname( xFontName );
-    wxStringTokenizer tn( fontname, _T("-") );
+        m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness);
+    }
+}

 
 

-    tn.GetNextToken();                           // foundry
+void wxFontRefData::SetUnderlined(bool underlined)
+{
+    m_underlined = underlined;

 
 

-    M_FONTDATA->m_faceName = tn.GetNextToken();  // courier
+    // the XLFD doesn't have "underlined" field anyhow
+}

 
 

-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("BOLD")) M_FONTDATA->m_weight = wxBOLD;
+bool wxFontRefData::SetFaceName(const wxString& facename)
+{
+    m_faceName = facename;

 
 

-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("I")) M_FONTDATA->m_style = wxITALIC;
-    if (tmp == _T("O")) M_FONTDATA->m_style = wxITALIC;
+    if ( HasNativeFont() )
+    {
+        m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
+    }

 
 

-    tn.GetNextToken();                           // set width
-    tn.GetNextToken();                           // ?
-    tn.GetNextToken();                           // pixel size
+    return true;
+}

 
 

-    tmp = tn.GetNextToken();                     // pointsize
-    int num =  wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
-    M_FONTDATA->m_pointSize = num / 10;
+void wxFontRefData::SetEncoding(wxFontEncoding encoding)
+{
+    m_encoding = encoding;

 
 

-    tn.GetNextToken();                           // x-res
-    tn.GetNextToken();                           // y-res
+    if ( HasNativeFont() )
+    {
+        wxNativeEncodingInfo info;
+        if ( wxGetNativeFontEncoding(encoding, &info) )
+        {
+            m_nativeFontInfo.SetXFontComponent(wxXLFD_REGISTRY, info.xregistry);
+            m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding);
+        }
+    }
+}

 
 

-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("M")) M_FONTDATA->m_family = wxMODERN;
-    else if (M_FONTDATA->m_faceName == _T("TIMES")) M_FONTDATA->m_family = wxROMAN;
-    else if (M_FONTDATA->m_faceName == _T("HELVETICA")) M_FONTDATA->m_family = wxSWISS;
-    else if (M_FONTDATA->m_faceName == _T("LUCIDATYPEWRITER")) M_FONTDATA->m_family = wxTELETYPE;
-    else if (M_FONTDATA->m_faceName == _T("LUCIDA")) M_FONTDATA->m_family = wxDECORATIVE;
-    else if (M_FONTDATA->m_faceName == _T("UTOPIA")) M_FONTDATA->m_family = wxSCRIPT;
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+    // previously cached fonts shouldn't be used
+    ClearGdkFonts();
+
+    m_nativeFontInfo = info;
+
+    // set all the other font parameters from the native font info
+    InitFromNative();
+}
+
+// ----------------------------------------------------------------------------
+// wxFont creation
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+
+wxFont::wxFont(const wxNativeFontInfo& info)
+{
+    (void) Create(info.GetXFontName());

 }
 
 bool wxFont::Create( int pointSize,
 }
 
 bool wxFont::Create( int pointSize,


@@ -248,14 +493,29 @@ bool wxFont::Create( int pointSize,
                      int weight,
                      bool underlined,
                      const wxString& face,
                      int weight,
                      bool underlined,
                      const wxString& face,

-                     wxFontEncoding encoding )
+                     wxFontEncoding encoding)

 {
 {

+    UnRef();
+

     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 

-    Init();
+    return true;
+}

 
 

-    return TRUE;
+bool wxFont::Create(const wxString& fontname)
+{
+    // VZ: does this really happen?
+    if ( fontname.empty() )
+    {
+        *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+        return true;
+    }
+
+    m_refData = new wxFontRefData(fontname);
+
+    return true;

 }
 
 void wxFont::Unshare()
 }
 
 void wxFont::Unshare()


@@ -274,8 +534,16 @@ void wxFont::Unshare()
 
 wxFont::~wxFont()
 {
 
 wxFont::~wxFont()
 {

-    if (wxTheFontList)
-        wxTheFontList->DeleteObject( this );
+}
+
+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+    return new wxFontRefData;
+}
+
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxFontRefData(*wx_static_cast(const wxFontRefData *, data));

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -284,54 +552,92 @@ wxFont::~wxFont()
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {

-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

 
     return M_FONTDATA->m_pointSize;
 }
 
 wxString wxFont::GetFaceName() const
 {
 
     return M_FONTDATA->m_pointSize;
 }
 
 wxString wxFont::GetFaceName() const
 {

-    wxCHECK_MSG( Ok(), _T(""), _T("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );

 
     return M_FONTDATA->m_faceName;
 }
 
 int wxFont::GetFamily() const
 {
 
     return M_FONTDATA->m_faceName;
 }
 
 int wxFont::GetFamily() const
 {

-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

 
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {
 
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {

-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

 
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {
 
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {

-    wxCHECK_MSG( Ok(), 0, _T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

 
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {
 
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( Ok(), FALSE, _T("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );

 
     return M_FONTDATA->m_underlined;
 }
 
 
     return M_FONTDATA->m_underlined;
 }
 

-

 wxFontEncoding wxFont::GetEncoding() const
 {
 wxFontEncoding wxFont::GetEncoding() const
 {

-    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, _T("invalid font") );
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );

 
 

+    // m_encoding is unused in wxGTK2, return encoding that the user set.

     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

+bool wxFont::GetNoAntiAliasing() const
+{
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+
+    return M_FONTDATA->m_noAA;
+}
+
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+
+    if ( !M_FONTDATA->HasNativeFont() )
+    {
+        // NB: this call has important side-effect: it not only finds
+        //     GdkFont representation, it also initializes m_nativeFontInfo
+        //     by calling its SetXFontName method
+        GetInternalFont();
+    }
+
+    return &(M_FONTDATA->m_nativeFontInfo);
+}
+
+bool wxFont::IsFixedWidth() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+
+    if ( M_FONTDATA->HasNativeFont() )
+    {
+        // the monospace fonts are supposed to have "M" in the spacing field
+        wxString spacing = M_FONTDATA->
+                            m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING);
+
+        return spacing.Upper() == _T('M');
+    }
+
+    return wxFontBase::IsFixedWidth();
+}
+

 // ----------------------------------------------------------------------------
 // change font attributes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // change font attributes
 // ----------------------------------------------------------------------------


@@ -340,877 +646,158 @@ void wxFont::SetPointSize(int pointSize)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_pointSize = pointSize;
+    M_FONTDATA->SetPointSize(pointSize);

 }
 
 void wxFont::SetFamily(int family)
 {
     Unshare();
 
 }
 
 void wxFont::SetFamily(int family)
 {
     Unshare();
 

-    M_FONTDATA->m_family = family;
+    M_FONTDATA->SetFamily(family);

 }
 
 void wxFont::SetStyle(int style)
 {
     Unshare();
 
 }
 
 void wxFont::SetStyle(int style)
 {
     Unshare();
 

-    M_FONTDATA->m_style = style;
+    M_FONTDATA->SetStyle(style);

 }
 
 void wxFont::SetWeight(int weight)
 {
     Unshare();
 
 }
 
 void wxFont::SetWeight(int weight)
 {
     Unshare();
 

-    M_FONTDATA->m_weight = weight;
+    M_FONTDATA->SetWeight(weight);

 }
 
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_faceName = faceName;
+    return M_FONTDATA->SetFaceName(faceName) &&
+           wxFontBase::SetFaceName(faceName);

 }
 
 void wxFont::SetUnderlined(bool underlined)
 {
     Unshare();
 
 }
 
 void wxFont::SetUnderlined(bool underlined)
 {
     Unshare();
 

-    M_FONTDATA->m_underlined = underlined;
+    M_FONTDATA->SetUnderlined(underlined);

 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {
     Unshare();
 
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {
     Unshare();
 

-    M_FONTDATA->m_encoding = encoding;
+    M_FONTDATA->SetEncoding(encoding);

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// get internal representation of font
-// ----------------------------------------------------------------------------
-
-GdkFont *wxFont::GetInternalFont( float scale ) const
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )

 {
 {

-    if (!Ok())
-    {
-        wxFAIL_MSG( _T("invalid font") );
-
-        return (GdkFont*) NULL;
-    }
-
-    /* short cut if the special X font constructor has been used */
-    if (M_FONTDATA->m_byXFontName)
-        return M_FONTDATA->m_font;
-
-    long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */
-    int point_scale = (M_FONTDATA->m_pointSize * 10 * int_scale) / 100;
-    GdkFont *font = (GdkFont *) NULL;
-
-    wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
-    if (node)
-    {
-        font = (GdkFont*)node->Data();
-    }
-    else
-    {
-#if 0
-        if ((int_scale == 100) &&
-                (M_FONTDATA->m_family == wxSWISS) &&
-                (M_FONTDATA->m_style == wxNORMAL) &&
-                (M_FONTDATA->m_pointSize == 12) &&
-                (M_FONTDATA->m_weight == wxNORMAL) &&
-                (M_FONTDATA->m_underlined == FALSE))
-        {
-            font = gdk_font_load( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" );
-        }
-        else
-#endif // 0
-        {
-            font = wxLoadQueryNearestFont( point_scale,
-                                           M_FONTDATA->m_family,
-                                           M_FONTDATA->m_style,
-                                           M_FONTDATA->m_weight,
-                                           M_FONTDATA->m_underlined,
-                                           M_FONTDATA->m_faceName,
-                                           M_FONTDATA->m_encoding );
-        }
-
-        M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
-    }
-
-    if (!font)
-    {
-        wxLogError(_T("could not load any font"));
-    }
+    Unshare();

 
 

-    return font;
+    M_FONTDATA->SetNativeFontInfo( info );

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// local utilities to find a X font
-//-----------------------------------------------------------------------------
-
-// returns TRUE if there are any fonts matching this font spec
-static bool wxTestFontSpec(const wxString& fontSpec)
+void wxFont::SetNoAntiAliasing( bool no )

 {
 {

-    GdkFont *test = gdk_font_load( wxConvCurrent->cWX2MB(fontSpec) );
-    if ( test )
-    {
-        gdk_font_unref( test );
+    Unshare();

 
 

-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+    M_FONTDATA->SetNoAntiAliasing( no );

 }
 
 }
 

-static GdkFont *wxLoadQueryFont( int pointSize,
-                                 int family,
-                                 int style,
-                                 int weight,
-                                 bool WXUNUSED(underlined),
-                                 const wxString &facename,
-                                 wxFontEncoding encoding )
-{
-    wxString xfamily;
-    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("*");
-    }
-
-    wxString fontSpec;
-    if (!facename.IsEmpty())
-    {
-        fontSpec.Printf(_T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"),
-                        facename.c_str());
-
-        if ( wxTestFontSpec(fontSpec) )
-        {
-            xfamily = facename;
-        }
-        //else: no such family, use default one instead
-    }
-
-    wxString xstyle;
-    switch (style)
-    {
-        case wxITALIC:     xstyle = _T("i"); break;
-        case wxSLANT:      xstyle = _T("o"); break;
-        case wxNORMAL:     xstyle = _T("r"); break;
-        default:           xstyle = _T("*"); break;
-    }
-
-    wxString xweight;
-    switch (weight)
-    {
-        case wxBOLD:       xweight = _T("bold"); break;
-        case wxLIGHT:
-        case wxNORMAL:     xweight = _T("medium"); break;
-        default:           xweight = _T("*"); break;
-    }
-
-    wxString xregistry, xencoding;
-    if ( encoding == wxFONTENCODING_DEFAULT )
-    {
-        // use the apps default
-        encoding = wxFont::GetDefaultEncoding();
-    }
-
-    bool test = TRUE;   // should we test for availability of encoding?
-    switch ( encoding )
-    {
-        case wxFONTENCODING_ISO8859_1:
-        case wxFONTENCODING_ISO8859_2:
-        case wxFONTENCODING_ISO8859_3:
-        case wxFONTENCODING_ISO8859_4:
-        case wxFONTENCODING_ISO8859_5:
-        case wxFONTENCODING_ISO8859_6:
-        case wxFONTENCODING_ISO8859_7:
-        case wxFONTENCODING_ISO8859_8:
-        case wxFONTENCODING_ISO8859_9:
-        case wxFONTENCODING_ISO8859_10:
-        case wxFONTENCODING_ISO8859_11:
-        case wxFONTENCODING_ISO8859_13:
-        case wxFONTENCODING_ISO8859_14:
-        case wxFONTENCODING_ISO8859_15:
-            {
-                int cp = encoding - wxFONTENCODING_ISO8859_1 + 1;
-                xregistry = _T("iso8859");
-                xencoding.Printf(_T("%d"), cp);
-            }
-            break;
-
-        case wxFONTENCODING_KOI8:
-            xregistry = _T("koi8");
-            if ( wxTestFontSpec(_T("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) )
-            {
-                xencoding = _T("1");
-
-                // test passed, no need to do it once more
-                test = FALSE;
-            }
-            else
-            {
-                xencoding = _T("*");
-            }
-            break;
-
-        case wxFONTENCODING_CP1250:
-        case wxFONTENCODING_CP1251:
-        case wxFONTENCODING_CP1252:
-            {
-                int cp = encoding - wxFONTENCODING_CP1250 + 1250;
-                fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"),
-                                cp);
-                if ( wxTestFontSpec(fontSpec) )
-                {
-                    xregistry = _T("microsoft");
-                    xencoding.Printf(_T("cp%d"), cp);
-
-                    // test passed, no need to do it once more
-                    test = FALSE;
-                }
-                else
-                {
-                    // fall back to LatinX
-                    xregistry = _T("iso8859");
-                    xencoding.Printf(_T("%d"), cp - 1249);
-                }
-            }
-            break;
-
-        case wxFONTENCODING_SYSTEM:
-        default:
-            test = FALSE;
-            xregistry =
-            xencoding = _T("*");
-    }
-
-    if ( test )
-    {
-        fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"),
-                        xregistry.c_str(), xencoding.c_str());
-        if ( !wxTestFontSpec(fontSpec) )
-        {
-            // this encoding isn't available - what to do?
-            xregistry =
-            xencoding = _T("*");
-        }
-    }
-
-    // construct the X font spec from our data
-    fontSpec.Printf(_T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"),
-                    xfamily.c_str(), xweight.c_str(), xstyle.c_str(),
-                    pointSize, xregistry.c_str(), xencoding.c_str());
+// ----------------------------------------------------------------------------
+// get internal representation of font
+// ----------------------------------------------------------------------------

 
 

-    return gdk_font_load( wxConvCurrent->cWX2MB(fontSpec) );
-}
+static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;

 
 

-static GdkFont *wxLoadQueryNearestFont( int pointSize,
-                                        int family,
-                                        int style,
-                                        int weight,
-                                        bool underlined,
-                                        const wxString &facename,
-                                        wxFontEncoding encoding )
+// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
+extern GdkFont *GtkGetDefaultGuiFont()

 {
 {

-    GdkFont *font = wxLoadQueryFont( pointSize, family, style, weight,
-                                     underlined, facename, encoding );
-
-    if (!font)
+    if (!g_systemDefaultGuiFont)

     {
     {

-        /* search up and down by stepsize 10 */
-        int max_size = pointSize + 20 * (1 + (pointSize/180));
-        int min_size = pointSize - 20 * (1 + (pointSize/180));
-
-        int i;
-
-        /* Search for smaller size (approx.) */
-        for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 )
+        GtkWidget *widget = gtk_button_new();
+        GtkStyle *def = gtk_rc_get_style( widget );
+        if (def)

         {
         {

-            font = wxLoadQueryFont(i, family, style, weight, underlined,
-                                   facename, encoding );
+            g_systemDefaultGuiFont = gdk_font_ref( def->font );

         }
         }

-
-        /* Search for larger size (approx.) */
-        for ( i = pointSize + 10; !font && i <= max_size; i += 10 )
-        {
-            font = wxLoadQueryFont( i, family, style, weight, underlined,
-                                    facename, encoding );
-        }
-
-        /* Try default family */
-        if ( !font && family != wxDEFAULT )
-        {
-            font = wxLoadQueryFont( pointSize, wxDEFAULT, style, weight,
-                                    underlined, facename, encoding );
-        }
-
-        /* Bogus font */
-        if ( !font )
+        else

         {
         {

-            font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
-                                   underlined, facename, encoding );
+            def = gtk_widget_get_default_style();
+            if (def)
+                g_systemDefaultGuiFont = gdk_font_ref( def->font );

         }
         }

+        gtk_widget_destroy( widget );

     }
     }

-
-    return font;
-}
-
-// wow, what's this stuff? Is it used/useful? (VZ)
-#if 0
-
-//-----------------------------------------------------------------------------
-// face names and index functions
-//-----------------------------------------------------------------------------
-
-static char *font_defaults[] = {
-    "FamilyDefault", "Default",
-    "FamilyRoman", "Roman",
-    "FamilyDecorative", "Decorative",
-    "FamilyModern", "Modern",
-    "FamilyTeletype", "Teletype",
-    "FamilySwiss", "Swiss",
-    "FamilyScript", "Script",
-
-    "AfmMedium", "",
-    "AfmBold", "Bo",
-    "AfmLight", "",
-    "AfmStraight", "",
-    "AfmItalic", "${AfmSlant}",
-    "AfmSlant", "O",
-    "AfmRoman", "Ro",
-    "AfmTimes", "Times",
-    "AfmHelvetica", "Helv",
-    "AfmCourier", "Cour",
-
-    "Afm___", "${AfmTimes,$[weight],$[style]}",
-
-    "AfmTimes__", "${AfmTimes}${Afm$[weight]}${Afm$[style]}",
-    "AfmTimesMediumStraight", "${AfmTimes}${AfmRoman}",
-    "AfmTimesLightStraight", "${AfmTimes}${AfmRoman}",
-    "AfmTimes_Italic", "${AfmTimes}$[weight]${AfmItalic}",
-    "AfmTimes_Slant", "${AfmTimes}$[weight]${AfmItalic}",
-
-    "AfmSwiss__", "${AfmHelvetica}${Afm$[weight]}${Afm$[style]}",
-    "AfmModern__", "${AfmCourier}${Afm$[weight]}${Afm$[style]}",
-
-    "AfmTeletype__", "${AfmModern,$[weight],$[style]}",
-
-    "PostScriptMediumStraight", "",
-    "PostScriptMediumItalic", "-Oblique",
-    "PostScriptMediumSlant", "-Oblique",
-    "PostScriptLightStraight", "",
-    "PostScriptLightItalic", "-Oblique",
-    "PostScriptLightSlant", "-Oblique",
-    "PostScriptBoldStraight", "-Bold",
-    "PostScriptBoldItalic", "-BoldOblique",
-    "PostScriptBoldSlant", "-BoldOblique",
-
-#if WX_NORMALIZED_PS_FONTS
-    "PostScript___", "${PostScriptTimes,$[weight],$[style]}",
-#else
-    "PostScriptRoman__", "${PostScriptTimes,$[weight],$[style]}",
-    "PostScript___", "LucidaSans${PostScript$[weight]$[style]}",
-#endif
-
-    "PostScriptTimesMedium", "",
-    "PostScriptTimesLight", "",
-    "PostScriptTimesBold", "Bold",
-
-    "PostScriptTimes__", "Times${PostScript$[weight]$[style]}",
-    "PostScriptTimesMediumStraight", "Times-Roman",
-    "PostScriptTimesLightStraight", "Times-Roman",
-    "PostScriptTimes_Slant", "Times-${PostScriptTimes$[weight]}Italic",
-    "PostScriptTimes_Italic", "Times-${PostScriptTimes$[weight]}Italic",
-
-    "PostScriptSwiss__", "Helvetica${PostScript$[weight]$[style]}",
-    "PostScriptModern__", "Courier${PostScript$[weight]$[style]}",
-
-    "PostScriptTeletype__", "${PostScriptModern,$[weight],$[style]}",
-
-#if !WX_NORMALIZED_PS_FONTS
-    "PostScriptScript__", "Zapf-Chancery-MediumItalic",
-#endif
-
-    "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
-};
-
-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)
-{
-    switch (s)
-    {
-        case wxITALIC: return wxSTYLE_ITALIC;
-        case wxSLANT:  return wxSTYLE_SLANT;
-        case wxNORMAL:
-        default:       return wxSTYLE_NORMAL;
-    }
-};
-
-//-----------------------------------------------------------------------------
-// wxSuffixMap
-//-----------------------------------------------------------------------------
-
-class wxSuffixMap
-{
-public:
-    ~wxSuffixMap();
-
-    inline char *GetName(int weight, int style)
+    else

     {
     {

-        return ( map [WCoordinate(weight)] [SCoordinate(style)] );
+        // already have it, but ref it once more before returning
+        gdk_font_ref(g_systemDefaultGuiFont);

     }
 
     }
 

-    char *map[wxNUM_WEIGHTS][wxNUM_STYLES];
-    void Initialize(const char *, const char *);
-};
+    return g_systemDefaultGuiFont;
+}

 
 

-static void SearchResource(const char *prefix, const char **names, int count, char **v)
+GdkFont *wxFont::GetInternalFont( float scale ) const

 {
 {

-    int k, i, j;
-    char resource[1024], **defaults, *internal;
+    GdkFont *font = (GdkFont *) NULL;

 
 

-    k = 1 << count;
+    wxCHECK_MSG( Ok(), font, wxT("invalid font") );

 
 

-    *v = (char *) NULL;
-    internal = (char *) NULL;
+    long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
+    int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);

 
 

-    for (i = 0; i < k; i++)
+    wxScaledFontList& list = M_FONTDATA->m_scaled_xfonts;
+    wxScaledFontList::iterator i = list.find(int_scale);
+    if ( i != list.end() )

     {
     {

-        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;
-            }
-        }
+        font = i->second;

     }
     }

-
-    if (internal)
+    else // we don't have this font in this size yet

     {
     {

-        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
+        if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))

         {
         {

-            *v = copystring(internal);
+            font = GtkGetDefaultGuiFont();

         }
         }

-    }
-}
-
-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;
-            }
-}
-
-void wxSuffixMap::Initialize(const char *resname, const char *devresname)
-{
-    const char *weight, *style;
-    char *v;
-    int i, j, k;
-    const char *names[3];

 
 

-    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++)
+        if ( !font )

         {
         {

-            switch (j)
+            // do we have the XLFD?
+            if ( int_scale == 100 && M_FONTDATA->HasNativeFont() )

             {
             {

-                case wxSTYLE_NORMAL: style = "Straight"; break;
-                case wxSTYLE_ITALIC: style = "Italic"; break;
-                case wxSTYLE_SLANT:
-                default:         style = "Slant";
+                font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());

             }
             }

-            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++)
+            // no XLFD of no exact match - try the approximate one now
+            if ( !font )

             {
             {

-                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;
-                }
+                wxString xfontname;
+                font = wxLoadQueryNearestFont( point_scale,
+                                               M_FONTDATA->m_family,
+                                               M_FONTDATA->m_style,
+                                               M_FONTDATA->m_weight,
+                                               M_FONTDATA->m_underlined,
+                                               M_FONTDATA->m_faceName,
+                                               M_FONTDATA->m_encoding,
+                                               &xfontname);
+                // NB: wxFont::GetNativeFontInfo relies on this
+                //     side-effect of GetInternalFont
+                if ( int_scale == 100 )
+                    M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);

             }
             }

-            // We have a final value:
-            map[k][j] = v;

         }
         }

-    }
-}
-
-//-----------------------------------------------------------------------------
-// wxFontNameItem
-//-----------------------------------------------------------------------------
-
-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);
-#endif
-
-        int id;
-        int family;
-        char *name;
-        wxSuffixMap screen, printing, afm;
-        bool isroman;
-};
-
-IMPLEMENT_ABSTRACT_CLASS(wxFontNameItem, wxObject)
-
-wxFontNameItem::wxFontNameItem(const char *Name, int Id, int Family)
-{
-    name   = copystring(Name);
-    id     = Id;
-    family = Family;
-
-    screen.  Initialize(name, "Screen");
-    printing.Initialize(name, "PostScript");
-    afm.     Initialize(name, "Afm");
-}
-
-wxFontNameItem::~wxFontNameItem()
-{
-    if (name)
-        delete[] name;
-    name = (char *) NULL;
-}
-
-#if defined(__WXDEBUG__)
-void wxFontNameItem::Dump(ostream& str)
-{
-    str << "wxFontNameItem(" << name << ")";
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// wxFontDirectory
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
-
-wxFontNameDirectory::wxFontNameDirectory()
-{
-    table = new wxHashTable(wxKEY_INTEGER, 20);
-    nextFontId = -1;
-}

 
 

-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;
-}
-
-int wxFontNameDirectory::GetNewFontId()
-{
-    return (nextFontId--);
-}
-
-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");
-}
-
-void wxFontNameDirectory::Initialize(int fontid, int family, const char *resname)
-{
-    char *fam, resource[256];
-
-    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));
-}
-
-int wxFontNameDirectory::FindOrCreateFontId(const char *name, int family)
-{
-    int id;
-
-    // font exists -> return id
-    if ( (id = GetFontId(name)) ) return id;
-
-    // create new font
-    Initialize(id=GetNewFontId(), family, name);
-    return id;
-}
-
-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;
-}
-
-char *wxFontNameDirectory::GetPostScriptName(int fontid, int weight, int style)
-{
-    wxFontNameItem *item = (wxFontNameItem*)table->Get(fontid); // find font
-    if (item)
-        return item->GetPostScriptName(weight, style);
-
-    // font does not exist
-    return (char *) NULL;
-}
-
-char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style)
-{
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
-    if (item)
-        return item->GetAFMName(weight, style);
-    // font does not exist
-    return (char *) NULL;
-}
-
-char *wxFontNameDirectory::GetFontName(int fontid)
-{
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
-    if (item)
-        return item->GetName();
-
-    // font does not exist
-    return (char *) NULL;
-}
-
-int wxFontNameDirectory::GetFontId(const char *name)
-{
-    wxNode *node;
-
-    table->BeginFind();
-
-    while ( (node = table->Next()) )
-    {
-        wxFontNameItem *item = (wxFontNameItem*)node->Data();
-        if (!strcmp(name, item->name))
-            return item->id;
+        if ( font )
+        {
+            list[int_scale] = font;
+        }

     }
 
     }
 

-    // font does not exist
-    return 0;
-}
-
-int wxFontNameDirectory::GetFamily(int fontid)
-{
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid);
+    // 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?") );

 
 

-    if (item)
-        return item->family;
-
-    // font does not exist
-    return wxDEFAULT;
+    return font;

 }
 }

-
-#endif // 0