]> 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
PyCrust updates
[wxWidgets.git] / src / gtk / font.cpp
diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index ad4f5e96544aeade8ad59dc757b22f7e0532ce8d..15909254a4a109c07bd90fcf085286ae773d4e2e 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -2,820 +2,514 @@
 // Name:        font.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        font.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
 #ifdef __GNUG__
-#pragma implementation "font.h"
+    #pragma implementation "font.h"
 #endif
 
 #include "wx/font.h"
 #endif
 
 #include "wx/font.h"
+#include "wx/fontutil.h"
+#include "wx/cmndata.h"
 #include "wx/utils.h"
 #include "wx/utils.h"
-#include <strings.h>
+#include "wx/log.h"
+#include "wx/gdicmn.h"
+#include "wx/tokenzr.h"
+#include "wx/settings.h"
 
 
-//-----------------------------------------------------------------------------
-// local data
-//-----------------------------------------------------------------------------
-
-static char *wx_font_family [] = {
-    "wxDEFAULT", "wxDECORATIVE", "wxMODERN", "wxROMAN", "wxSCRIPT",
-    "wxSWISS", "wxTELETYPE",
-};
-static char *wx_font_style [] = {
-    "wxDEFAULT", "wxNORMAL", "wxSLANT", "wxITALIC",
-};
-static char *wx_font_weight [] = {
-    "wxDEFAULT", "wxNORMAL", "wxBOLD", "wxLIGHT",
-};
+#include <strings.h>
 
 
-extern wxFontNameDirectory *wxTheFontNameDirectory;
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gtk/gtk.h>
 
 
-//-----------------------------------------------------------------------------
-// wxFont
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
 
 
-class wxFontRefData: public wxObjectRefData
+class wxFontRefData : public wxObjectRefData
 {
 {
-  public:
-  
-    wxFontRefData(void);
-    ~wxFontRefData(void);
- 
-    wxList   m_scaled_xfonts;
-    int      m_pointSize;
-    int      m_family, m_style, m_weight;
-    bool     m_underlined;
-    int      m_fontId;
-    char*    m_faceName;
-     
-    bool     m_byXFontName;
-    GdkFont *m_font;
-    
-    friend wxFont;
-};
+public:
+    wxFontRefData(int size = wxDEFAULT,
+                  int family = wxDEFAULT,
+                  int style = wxDEFAULT,
+                  int weight = wxDEFAULT,
+                  bool underlined = FALSE,
+                  const wxString& faceName = wxEmptyString,
+                  wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+    wxFontRefData( const wxFontRefData& data );
+    virtual ~wxFontRefData();
+
+protected:
+    // common part of all ctors
+    void Init(int pointSize,
+              int family,
+              int style,
+              int weight,
+              bool underlined,
+              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;
+
+    wxNativeFontInfo m_nativeFontInfo;
+
+    friend class wxFont;
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
+
+void wxFontRefData::Init(int pointSize,
+                         int family,
+                         int style,
+                         int weight,
+                         bool underlined,
+                         const wxString& faceName,
+                         wxFontEncoding encoding)
+{
+    if (family == wxDEFAULT)
+        m_family = wxSWISS;
+    else
+        m_family = family;
+
+    m_faceName = faceName;
+
+    if (style == wxDEFAULT)
+        m_style = wxNORMAL;
+    else
+        m_style = style;
+
+    if (weight == wxDEFAULT)
+        m_weight = wxNORMAL;
+    else
+        m_weight = weight;
+
+    if (pointSize == wxDEFAULT)
+        m_pointSize = 12;
+    else
+        m_pointSize = pointSize;
+
+    m_underlined = underlined;
+    m_encoding = encoding;
+}
 
 
-wxFontRefData::wxFontRefData(void) : m_scaled_xfonts(wxKEY_INTEGER)
+wxFontRefData::wxFontRefData( const wxFontRefData& data )
+    : m_scaled_xfonts(wxKEY_INTEGER)
 {
 {
-  m_byXFontName = FALSE;
-  m_pointSize = -1;
-  m_family = -1;
-  m_style = -1;
-  m_weight = -1;
-  m_underlined = FALSE;
-  m_fontId = 0;
-  m_faceName = NULL;
-  m_font = NULL;
-};
+    Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
+         data.m_underlined, data.m_faceName, data.m_encoding);
+}
 
 
-wxFontRefData::~wxFontRefData(void)
+wxFontRefData::wxFontRefData(int size, int family, int style,
+                             int weight, bool underlined,
+                             const wxString& faceName,
+                             wxFontEncoding encoding)
+    : m_scaled_xfonts(wxKEY_INTEGER)
 {
 {
-  wxNode *node = m_scaled_xfonts.First();
-  while (node) 
-  {
-    GdkFont *font = (GdkFont*)node->Data();
-    wxNode *next = node->Next();
-    gdk_font_unref( font );
-    node = next;
-  };
-  if (m_faceName) 
-  {
-    delete m_faceName;
-    m_faceName = NULL;
-  };
-  if (m_font) gdk_font_unref( m_font );
-};
+    Init(size, family, style, weight, underlined, faceName, encoding);
+}
 
 
-//-----------------------------------------------------------------------------
+wxFontRefData::~wxFontRefData()
+{
+    wxNode *node = m_scaled_xfonts.First();
+    while (node)
+    {
+        GdkFont *font = (GdkFont*)node->Data();
+        wxNode *next = node->Next();
+        gdk_font_unref( font );
+        node = next;
+    }
+}
 
 
-#define M_FONTDATA ((wxFontRefData *)m_refData)
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
-wxFont::wxFont(void)
+void wxFont::Init()
 {
 {
-  if (wxTheFontList) wxTheFontList->Append( this );
-};
+}
 
 
-wxFont::wxFont( char *xFontName )
+wxFont::wxFont(const wxNativeFontInfo& info)
 {
 {
-  if (!xFontName) return;
-  
-  m_refData = new wxFontRefData();
-  
-  M_FONTDATA->m_byXFontName = TRUE;
-  M_FONTDATA->m_font = gdk_font_load( xFontName );
-};
+    Init();
 
 
-wxFont::wxFont(int PointSize, int FontIdOrFamily, int Style, int Weight,
-              bool Underlined, const char* Face)
-{
-  m_refData = new wxFontRefData();
-  
-  if ((M_FONTDATA->m_faceName = (Face) ? copystring(Face) : (char*)NULL) ) 
-  {
-    M_FONTDATA->m_fontId = wxTheFontNameDirectory->FindOrCreateFontId( Face, FontIdOrFamily );
-    M_FONTDATA->m_family  = wxTheFontNameDirectory->GetFamily( FontIdOrFamily );
-  }
-  else 
-  {
-    M_FONTDATA->m_fontId = FontIdOrFamily;
-    M_FONTDATA->m_family  = wxTheFontNameDirectory->GetFamily( FontIdOrFamily );
-  };
-  M_FONTDATA->m_style = Style;
-  M_FONTDATA->m_weight = Weight;
-  M_FONTDATA->m_pointSize = PointSize;
-  M_FONTDATA->m_underlined = Underlined;
-
-  if (wxTheFontList) wxTheFontList->Append( this );
-};
+    Create(info.xFontName);
+}
 
 
-wxFont::wxFont(int PointSize, const char *Face, int Family, int Style, 
-              int Weight, bool Underlined)
+bool wxFont::Create(const wxNativeFontInfo& info)
 {
 {
-  m_refData = new wxFontRefData();
-
-  M_FONTDATA->m_fontId = wxTheFontNameDirectory->FindOrCreateFontId( Face, Family );
-  M_FONTDATA->m_faceName = (Face) ? copystring(Face) : (char*)NULL;
-  M_FONTDATA->m_family = wxTheFontNameDirectory->GetFamily( M_FONTDATA->m_fontId );
-  M_FONTDATA->m_style = Style;
-  M_FONTDATA->m_weight = Weight;
-  M_FONTDATA->m_pointSize = PointSize;
-  M_FONTDATA->m_underlined = Underlined;
-
-  if (wxTheFontList) wxTheFontList->Append( this );
-};
+    return Create(info.xFontName);
+}
 
 
-wxFont::wxFont( const wxFont& font )
-{ 
-  Ref( font ); 
-};
+bool wxFont::Create( int pointSize,
+                     int family,
+                     int style,
+                     int weight,
+                     bool underlined,
+                     const wxString& face,
+                     wxFontEncoding encoding)
+{
+    m_refData = new wxFontRefData(pointSize, family, style, weight,
+                                  underlined, face, encoding);
 
 
-wxFont::wxFont( const wxFont* font ) 
-{ 
-  UnRef(); 
-  if (font) Ref( *font ); 
-};
+    return TRUE;
+}
 
 
-wxFont::~wxFont(void)
+bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
 {
 {
-  if (wxTheFontList) wxTheFontList->DeleteObject( this );
-};
+    if( !fontname )
+    {
+         *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT);
+         return TRUE;
+    }
 
 
-wxFont& wxFont::operator = ( const wxFont& font ) 
-{ 
-  if (*this == font) return (*this); 
-  Ref( font ); 
-  return *this; 
-};
+    m_refData = new wxFontRefData();
 
 
-bool wxFont::operator == ( const wxFont& font ) 
-{ 
-  return m_refData == font.m_refData; 
-};
+    M_FONTDATA->m_nativeFontInfo.xFontName = fontname;  // X font name
 
 
-bool wxFont::operator != ( const wxFont& font ) 
-{ 
-  return m_refData != font.m_refData; 
-};
+    wxString tmp;
 
 
-bool wxFont::Ok()
-{
-  return (m_refData != NULL);
-};
+    wxStringTokenizer tn( fontname, wxT("-") );
 
 
-int wxFont::GetPointSize(void) const
-{
-  return M_FONTDATA->m_pointSize;
-};
+    tn.GetNextToken();                           // skip initial empty token
+    tn.GetNextToken();                           // foundry
 
 
-wxString wxFont::GetFaceString(void) const
-{
-  wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
-  return s;
-};
 
 
-wxString wxFont::GetFaceName(void) const
-{
-  wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
-  return s; 
-};
+    M_FONTDATA->m_faceName = tn.GetNextToken();  // family
 
 
-int wxFont::GetFamily(void) const
-{
-  return M_FONTDATA->m_family;
-};
+    tmp = tn.GetNextToken().MakeUpper();         // weight
+    if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
 
 
-wxString wxFont::GetFamilyString(void) const
-{
-  wxString s = wx_font_family[M_FONTDATA->m_family];
-  return s;
-};
+    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
+    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
 
 
-int wxFont::GetFontId(void) const
-{
-  return M_FONTDATA->m_fontId; // stub
-};
+    tmp = tn.GetNextToken().MakeUpper();        // slant
+    if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
+    if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;
 
 
-int wxFont::GetStyle(void) const
-{
-  return M_FONTDATA->m_style;
-};
+    tn.GetNextToken();                           // set width
+    tn.GetNextToken();                           // add. style
+    tn.GetNextToken();                           // pixel size
 
 
-wxString wxFont::GetStyleString(void) const
-{
-  wxString s =  wx_font_style[M_FONTDATA->m_style];
-  return s;
-};
+    tmp = tn.GetNextToken();                     // pointsize
+    if (tmp != wxT("*"))
+    {
+        long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
+        M_FONTDATA->m_pointSize = (int)(num / 10);
+    }
 
 
-int wxFont::GetWeight(void) const
-{
-  return M_FONTDATA->m_weight;
-};
+    tn.GetNextToken();                           // x-res
+    tn.GetNextToken();                           // y-res
+
+    tmp = tn.GetNextToken().MakeUpper();         // spacing
+
+    if (tmp == wxT("M"))
+        M_FONTDATA->m_family = wxMODERN;
+    else if (M_FONTDATA->m_faceName == wxT("TIMES"))
+        M_FONTDATA->m_family = wxROMAN;
+    else if (M_FONTDATA->m_faceName == wxT("HELVETICA"))
+        M_FONTDATA->m_family = wxSWISS;
+    else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER"))
+        M_FONTDATA->m_family = wxTELETYPE;
+    else if (M_FONTDATA->m_faceName == wxT("LUCIDA"))
+        M_FONTDATA->m_family = wxDECORATIVE;
+    else if (M_FONTDATA->m_faceName == wxT("UTOPIA"))
+        M_FONTDATA->m_family = wxSCRIPT;
+
+    tn.GetNextToken();                           // avg width
+
+    // deal with font encoding
+    M_FONTDATA->m_encoding = enc;
+    if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM )
+    {
+        wxString registry = tn.GetNextToken().MakeUpper(),
+                 encoding = tn.GetNextToken().MakeUpper();
+
+        if ( registry == _T("ISO8859") )
+        {
+            int cp;
+            if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
+            {
+                M_FONTDATA->m_encoding =
+                    (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
+            }
+        }
+        else if ( registry == _T("MICROSOFT") )
+        {
+            int cp;
+            if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
+            {
+                M_FONTDATA->m_encoding =
+                    (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
+            }
+        }
+        else if ( registry == _T("KOI8") )
+        {
+            M_FONTDATA->m_encoding = wxFONTENCODING_KOI8;
+        }
+        //else: unknown encoding - may be give a warning here?
+        else
+            return FALSE;
+    }
+    return TRUE;
+}
 
 
-wxString wxFont::GetWeightString(void) const
+void wxFont::Unshare()
 {
 {
-  wxString s = wx_font_weight[M_FONTDATA->m_weight];
-  return s;
-};
+    if (!m_refData)
+    {
+        m_refData = new wxFontRefData();
+    }
+    else
+    {
+        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }
+}
 
 
-bool wxFont::GetUnderlined(void) const
+wxFont::~wxFont()
 {
 {
-  return M_FONTDATA->m_underlined;
-};
-
-//-----------------------------------------------------------------------------
-// get internal representation of font
-//-----------------------------------------------------------------------------
+}
 
 
-// local help function
-static GdkFont *wxLoadQueryNearestFont(int point_size, int fontid,
-                                          int style, int weight, 
-                                          bool underlined);
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
 
 
-GdkFont *wxFont::GetInternalFont(float scale)
+int wxFont::GetPointSize() const
 {
 {
-  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 = NULL;
-
-  wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
-  if (node) 
-  {
-    font = (GdkFont*)node->Data(); 
-  } 
-  else 
-  {
-     font = wxLoadQueryNearestFont( point_scale, M_FONTDATA->m_fontId, M_FONTDATA->m_style,
-                                   M_FONTDATA->m_weight, M_FONTDATA->m_underlined );
-     M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
-  };
-  if (!font)
-       printf("could not load any font");
-//     wxError("could not load any font", "wxFont");
-  return font;
-};
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 
-//-----------------------------------------------------------------------------
-// local utilities to find a X font
-//-----------------------------------------------------------------------------
+    return M_FONTDATA->m_pointSize;
+}
 
 
-static GdkFont *wxLoadQueryFont(int point_size, int fontid, int style,
-                                   int weight, bool WXUNUSED(underlined))
+wxString wxFont::GetFaceName() const
 {
 {
-    char buffer[512];
-    char *name = wxTheFontNameDirectory->GetScreenName( fontid, weight, style );
-
-    if (!name)
-       name = "-*-*-*-*-*-*-*-%d-*-*-*-*-*-*";
-    sprintf(buffer, name, point_size);
+    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
 
 
-    return gdk_font_load( buffer );
+    return M_FONTDATA->m_faceName;
 }
 
 }
 
-static GdkFont *wxLoadQueryNearestFont(int point_size, int fontid,
-                                          int style, int weight,
-                                          bool underlined)
+int wxFont::GetFamily() const
 {
 {
-    GdkFont *font;
-
-    font = wxLoadQueryFont( point_size, fontid, style, weight, underlined );
-
-    if (!font) {
-       // search up and down by stepsize 10
-       int max_size = point_size + 20 * (1 + (point_size/180));
-       int min_size = point_size - 20 * (1 + (point_size/180));
-       int i;
-
-       // Search for smaller size (approx.)
-       for (i=point_size-10; !font && i >= 10 && i >= min_size; i -= 10)
-           font = wxLoadQueryFont(i, fontid, style, weight, underlined);
-       // Search for larger size (approx.)
-       for (i=point_size+10; !font && i <= max_size; i += 10)
-           font = wxLoadQueryFont(i, fontid, style, weight, underlined);
-       // Try default family
-       if (!font && fontid != wxDEFAULT)
-           font = wxLoadQueryFont(point_size, wxDEFAULT, style, 
-                                  weight, underlined);
-       // Bogus font
-       if (!font)
-           font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
-                                   underlined);
-    }
-    return font;
-}
-
-//-----------------------------------------------------------------------------
-// face names and index functions
-//-----------------------------------------------------------------------------
-
-static char *font_defaults[] = {
-    "FamilyDefault", "Default",
-    "FamilyRoman", "Roman",
-    "FamilyDecorative", "Decorative",
-    "FamilyModern", "Modern",
-    "FamilyTeletype", "Teletype",
-    "FamilySwiss", "Swiss",
-    "FamilyScript", "Script",
-
-    "AfmMedium", "",
-    "AfmBold", "Bo",
-    "AfmLight", "",
-    "AfmStraight", "",
-    "AfmItalic", "${AfmSlant}",
-    "AfmSlant", "O",
-    "AfmRoman", "Ro",
-    "AfmTimes", "Times",
-    "AfmHelvetica", "Helv",
-    "AfmCourier", "Cour",
-    
-    "Afm___", "${AfmTimes,$[weight],$[style]}",
-
-    "AfmTimes__", "${AfmTimes}${Afm$[weight]}${Afm$[style]}",
-    "AfmTimesMediumStraight", "${AfmTimes}${AfmRoman}",
-    "AfmTimesLightStraight", "${AfmTimes}${AfmRoman}",
-    "AfmTimes_Italic", "${AfmTimes}$[weight]${AfmItalic}",
-    "AfmTimes_Slant", "${AfmTimes}$[weight]${AfmItalic}",
-
-    "AfmSwiss__", "${AfmHelvetica}${Afm$[weight]}${Afm$[style]}",
-    "AfmModern__", "${AfmCourier}${Afm$[weight]}${Afm$[style]}",
-
-    "AfmTeletype__", "${AfmModern,$[weight],$[style]}",
-
-    "PostScriptMediumStraight", "",
-    "PostScriptMediumItalic", "-Oblique",
-    "PostScriptMediumSlant", "-Oblique",
-    "PostScriptLightStraight", "",
-    "PostScriptLightItalic", "-Oblique",
-    "PostScriptLightSlant", "-Oblique",
-    "PostScriptBoldStraight", "-Bold",
-    "PostScriptBoldItalic", "-BoldOblique",
-    "PostScriptBoldSlant", "-BoldOblique",
-    
-#if WX_NORMALIZED_PS_FONTS
-    "PostScript___", "${PostScriptTimes,$[weight],$[style]}",
-#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", "misc-fixed",
-    "ScreenRomanBase", "*-times",
-    "ScreenDecorativeBase", "*-helvetica",
-    "ScreenModernBase", "*-courier",
-    "ScreenTeletypeBase", "*-lucidatypewriter",
-    "ScreenSwissBase", "*-lucida",
-    "ScreenScriptBase", "*-zapfchancery",
-
-    "ScreenStdSuffix", "-${Screen$[weight]}-${Screen$[style]}"
-    "-normal-*-*-%d-*-*-*-*-*-*",
-
-    "Screen___",
-    "-${ScreenDefaultBase}${ScreenStdSuffix}",
-    "ScreenRoman__",
-    "-${ScreenRomanBase}${ScreenStdSuffix}",
-    "ScreenDecorative__",
-    "-${ScreenDecorativeBase}${ScreenStdSuffix}",
-    "ScreenModern__",
-    "-${ScreenModernBase}${ScreenStdSuffix}",
-    "ScreenTeletype__",
-    "-${ScreenTeletypeBase}${ScreenStdSuffix}",
-    "ScreenSwiss__",
-    "-${ScreenSwissBase}${ScreenStdSuffix}",
-    "ScreenScript__",
-    "-${ScreenScriptBase}${ScreenStdSuffix}",
-    NULL
-};
-
-enum {wxWEIGHT_NORMAL, wxWEIGHT_BOLD,  wxWEIGHT_LIGHT, wxNUM_WEIGHTS};
-enum {wxSTYLE_NORMAL,  wxSTYLE_ITALIC, wxSTYLE_SLANT,  wxNUM_STYLES};
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 
-static int WCoordinate(int w)
-{
-    switch (w) {
-    case wxBOLD:   return wxWEIGHT_BOLD;
-    case wxLIGHT:  return wxWEIGHT_LIGHT;
-    case wxNORMAL:
-    default:       return wxWEIGHT_NORMAL;
-    }
+    return M_FONTDATA->m_family;
 }
 
 }
 
-static int SCoordinate(int s)
+int wxFont::GetStyle() const
 {
 {
-    switch (s) {
-    case wxITALIC: return wxSTYLE_ITALIC;
-    case wxSLANT:  return wxSTYLE_SLANT;
-    case wxNORMAL:
-    default:       return wxSTYLE_NORMAL;
-    }
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
+    return M_FONTDATA->m_style;
 }
 
 }
 
-//-----------------------------------------------------------------------------
-// wxSuffixMap
-//-----------------------------------------------------------------------------
+int wxFont::GetWeight() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 
-class wxSuffixMap {
-public:
-    ~wxSuffixMap(void);
+    return M_FONTDATA->m_weight;
+}
 
 
-    inline char *GetName(int weight, int style)
-    {
-       return ( map [WCoordinate(weight)] [SCoordinate(style)] );
-    }
+bool wxFont::GetUnderlined() const
+{
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
 
 
-    char *map[wxNUM_WEIGHTS][wxNUM_STYLES];
-    void Initialize(const char *, const char *);
-};
+    return M_FONTDATA->m_underlined;
+}
 
 
-//#if !USE_RESOURCES
-#define wxGetResource(a, b, c) 0
-//#endif
 
 
-static void SearchResource(const char *prefix, const char **names, int count, char **v)
+wxFontEncoding wxFont::GetEncoding() const
 {
 {
-    int k, i, j;
-    char resource[1024], **defaults, *internal;
-
-    k = 1 << count;
-    
-    *v = NULL;
-    internal = NULL;
-
-    for (i = 0; i < k; i++) {
-       strcpy(resource, prefix);
-       for (j = 0; j < count; j++) {
-           if (!(i & (1 << j)))
-               strcat(resource, names[j]);
-           else
-               strcat(resource, "_");
-       }
-       if (wxGetResource(wxAPP_CLASS, (char *)resource, v))
-           return;
-       if (!internal) {
-           defaults = font_defaults;
-           while (*defaults) {
-               if (!strcmp(*defaults, resource)) {
-                   internal = defaults[1];
-                   break;
-               }
-               defaults += 2;
-           }
-       }
-    }
-    if (internal)
-       *v = copystring(internal);
-}
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
 
-wxSuffixMap::~wxSuffixMap(void)
-{
-    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] = NULL;
-           }
+    return M_FONTDATA->m_encoding;
 }
 
 }
 
-void wxSuffixMap::Initialize(const char *resname, const char *devresname)
+wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 {
-    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++) {
-           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 = 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 = "";
-                           printf("Bad resource name \"%s\" in font lookup\n", name);
-                       }
-                   } else if (!strcmp(name, "weight")) {
-                       r = weight;
-                   } else if (!strcmp(name, "style")) {
-                       r = style;
-                   } else if (!strcmp(name, "family")) {
-                       r = resname;
-                   } else {
-                       r = "";
-                       printf("Bad font macro name \"%s\"\n", 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;
-       }
-    }
-}
+    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
 
-//-----------------------------------------------------------------------------
-// wxFontNameItem
-//-----------------------------------------------------------------------------
+    if(M_FONTDATA->m_nativeFontInfo.xFontName.IsEmpty())
+        GetInternalFont();
 
 
-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(void)                   {return name;}
-    inline int   GetFamily(void)                 {return family;}
-    inline int   GetId(void)                     {return id;}
-    inline bool  IsRoman(void)                   {return isroman;}
-#if WXDEBUG
-    void Dump(ostream& str);
-#endif
+    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+}
 
 
-    int id;
-    int family;
-    char *name;
-    wxSuffixMap screen, printing, afm;
-    bool isroman;
-};
 
 
-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->m_pointSize = pointSize;
+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
 }
 
 }
 
-wxFontNameItem::~wxFontNameItem(void)
+void wxFont::SetFamily(int family)
 {
 {
-    if (name)
-       delete[] name;
-    name = NULL;
-}
+    Unshare();
 
 
-#if WXDEBUG
-void wxFontNameItem::Dump(ostream& str)
-{
-    str << "wxFontNameItem(" << name << ")";
+    M_FONTDATA->m_family = family;
+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
 }
 }
-#endif
-
-//-----------------------------------------------------------------------------
-// wxFontDirectory
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
 
 
-wxFontNameDirectory::wxFontNameDirectory(void)
+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->m_style = style;
+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
 }
 
 }
 
-int wxFontNameDirectory::GetNewFontId(void)
+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->m_weight = weight;
+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
 }
 
 }
 
-void wxFontNameDirectory::Initialize(int fontid, int family, const char *resname)
+void wxFont::SetFaceName(const wxString& faceName)
 {
 {
-    char *fam, resource[256];
-  
-    sprintf(resource, "Family%s", resname);
-    SearchResource((const char *)resource, 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));
+    Unshare();
+
+    M_FONTDATA->m_faceName = faceName;
+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
 }
 
 }
 
-int wxFontNameDirectory::FindOrCreateFontId(const char *name, int family)
+void wxFont::SetUnderlined(bool underlined)
 {
 {
-    int id;
+    Unshare();
 
 
-    // font exists -> return id
-    if ( (id = GetFontId(name)) ) return id;
-    // create new font
-    Initialize(id=GetNewFontId(), family, name);
-    return id;
+    M_FONTDATA->m_underlined = 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 NULL;
-}
+    Unshare();
 
 
-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 NULL;
+    M_FONTDATA->m_encoding = encoding;
+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
 }
 
 }
 
-char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style)
+void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
 {
 {
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
-    if (item)
-       return item->GetAFMName(weight, style);
-    // font does not exist
-    return NULL;
+    Unshare();
+
+    M_FONTDATA->m_nativeFontInfo = info;
 }
 
 }
 
-char *wxFontNameDirectory::GetFontName(int fontid)
+// ----------------------------------------------------------------------------
+// get internal representation of font
+// ----------------------------------------------------------------------------
+
+static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
+
+GdkFont *GtkGetDefaultGuiFont()
 {
 {
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid); // find font
-    if (item)
-       return item->GetName();
-    // font does not exist
-    return 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;
+    if (!Ok())
+    {
+        wxFAIL_MSG( wxT("invalid font") );
+
+        return (GdkFont*) NULL;
+    }
 
 
-    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);
+    GdkFont *font = (GdkFont *) NULL;
 
 
-    while ( (node = table->Next()) ) {
-       wxFontNameItem *item = (wxFontNameItem*)node->Data();
-       if (!strcmp(name, item->name))
-           return item->id;
+    wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
+    if (node)
+    {
+        font = (GdkFont*)node->Data();
+    }
+    else
+    {
+        if (*this == wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT))
+        {
+            font = GtkGetDefaultGuiFont();
+        }
+        if (!font)
+        {
+            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_nativeFontInfo.xFontName );
+        }
+
+        M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
     }
     }
-    // font does not exist
-    return 0;
-}
 
 
-int wxFontNameDirectory::GetFamily(int fontid)
-{
-    wxFontNameItem *item = (wxFontNameItem *)table->Get(fontid);
-  
-    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;
 }
 }
+
wxWidgets (Impactor)