More comments about non-native GTH widgets.

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 738981520bc338ea0529bd0a15e348d70a315b1c..8dbe0064bd681b038678d339f613c2a913515575 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

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

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


@@ -15,19 +15,40 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

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

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

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

-#include "gdk/gdk.h"
+#include "wx/gtk/private.h"
+#include <gdk/gdkprivate.h>
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the default size (in points) for the fonts
+static const int wxDEFAULT_FONT_SIZE = 12;
+
+// ----------------------------------------------------------------------------
+// wxScaledFontList: maps the font sizes to the GDK fonts for the given font
+// ----------------------------------------------------------------------------
+
+WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
+                    wxScaledFontList);

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


@@ -36,16 +57,46 @@
 class wxFontRefData : public wxObjectRefData
 {
 public:
 class wxFontRefData : public wxObjectRefData
 {
 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,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);

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

     wxFontRefData( const wxFontRefData& data );
     wxFontRefData( const wxFontRefData& data );

+

     virtual ~wxFontRefData();
 
     virtual ~wxFontRefData();
 

+    // do we have the native font info?
+    bool HasNativeFont() const
+    {
+        // we always have a Pango font description
+        return true;
+    }
+
+    // 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);
+

 protected:
     // common part of all ctors
     void Init(int pointSize,
 protected:
     // common part of all ctors
     void Init(int pointSize,


@@ -56,8 +107,13 @@ protected:
               const wxString& faceName,
               wxFontEncoding encoding);
 
               const wxString& faceName,
               wxFontEncoding encoding);
 

+    // set all fields from (already initialized and valid) m_nativeFontInfo
+    void InitFromNative();
+

 private:
 private:

-    wxList          m_scaled_xfonts;
+    // clear m_scaled_xfonts if any
+    void ClearGdkFonts();
+

     int             m_pointSize;
     int             m_family,
                     m_style,
     int             m_pointSize;
     int             m_family,
                     m_style,


@@ -65,13 +121,14 @@ private:
     bool            m_underlined;
     wxString        m_faceName;
     wxFontEncoding  m_encoding;
     bool            m_underlined;
     wxString        m_faceName;
     wxFontEncoding  m_encoding;

+    bool            m_noAA;      // No anti-aliasing

 
 

-    friend wxFont;
-};
+    // The native font info, basicly an XFLD under GTK 1.2 and
+    // the pango font description under GTK 2.0.
+    wxNativeFontInfo m_nativeFontInfo;

 
 

-// ============================================================================
-// implementation
-// ============================================================================
+    friend class wxFont;
+};

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


@@ -85,158 +142,223 @@ 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;
+    // we accept both wxDEFAULT and wxNORMAL here - should we?
+    m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style;
+    m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight;
+
+    // and here, do we really want to forbid creation of the font of the size
+    // 90 (the value of wxDEFAULT)??
+    m_pointSize = pointSize == wxDEFAULT || pointSize == -1
+                    ? wxDEFAULT_FONT_SIZE
+                    : pointSize;

 
 

-    if (weight == wxDEFAULT)
-        m_weight = wxNORMAL;
+    m_underlined = underlined;
+    m_encoding = encoding;
+
+    m_noAA = false;
+
+    // Create native font info
+    m_nativeFontInfo.description = pango_font_description_new();
+
+    // And set its values
+    if (!m_faceName.empty())
+    {
+       pango_font_description_set_family( m_nativeFontInfo.description,
+                                          wxGTK_CONV_SYS(m_faceName) );
+    }

     else
     else

-        m_weight = weight;
+    {
+        switch (m_family)
+        {
+            case wxFONTFAMILY_MODERN:
+            case wxFONTFAMILY_TELETYPE:
+               pango_font_description_set_family( m_nativeFontInfo.description, "monospace" );
+               break;
+            case wxFONTFAMILY_ROMAN:
+               pango_font_description_set_family( m_nativeFontInfo.description, "serif" );
+               break;
+            case wxFONTFAMILY_SWISS:
+               // SWISS = sans serif
+            default:
+               pango_font_description_set_family( m_nativeFontInfo.description, "sans" );
+               break;
+        }
+    }
+
+    SetStyle( m_style );
+    SetPointSize( m_pointSize );
+    SetWeight( m_weight );
+}
+
+void wxFontRefData::InitFromNative()
+{
+    m_noAA = false;
+
+    // Get native info
+    PangoFontDescription *desc = m_nativeFontInfo.description;
+
+    // init fields
+    m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
+
+    // Pango sometimes needs to have a size
+    int pango_size = pango_font_description_get_size( desc );
+    if (pango_size == 0)
+        m_nativeFontInfo.SetPointSize(12);
+
+    m_pointSize = m_nativeFontInfo.GetPointSize();
+    m_style = m_nativeFontInfo.GetStyle();
+    m_weight = m_nativeFontInfo.GetWeight();

 
 

-    if (pointSize == wxDEFAULT)
-        m_pointSize = 12;
+    if (m_faceName == wxT("monospace"))
+    {
+        m_family = wxFONTFAMILY_TELETYPE;
+    }
+    else if (m_faceName == wxT("sans"))
+    {
+        m_family = wxFONTFAMILY_SWISS;
+    }
+    else if (m_faceName == wxT("serif"))
+    {
+        m_family = wxFONTFAMILY_ROMAN;
+    }

     else
     else

-        m_pointSize = pointSize;
+    {
+        m_family = wxFONTFAMILY_UNKNOWN;
+    }

 
 

-    m_underlined = underlined;
-    m_encoding = encoding;
+    // Pango description are never underlined (?)
+    m_underlined = false;
+
+    // always with GTK+ 2
+    m_encoding = wxFONTENCODING_UTF8;

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

-    : m_scaled_xfonts(wxKEY_INTEGER)
+             : wxObjectRefData()

 {
 {

-    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;
+
+    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(int size, int family, int style,
 }
 
 wxFontRefData::wxFontRefData(int size, int family, int style,

-    int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding )
-    : m_scaled_xfonts(wxKEY_INTEGER)
+                             int weight, bool underlined,
+                             const wxString& faceName,
+                             wxFontEncoding encoding)
+{
+    Init(size, family, style, weight, underlined, faceName, encoding);
+}
+
+wxFontRefData::wxFontRefData(const wxString& fontname)
+{
+    m_nativeFontInfo.FromString( fontname );
+
+    InitFromNative();
+}
+
+void wxFontRefData::ClearGdkFonts()

 {
 {

-    Init(size, family, style, weight, 
-        underlined, faceName, encoding);

 }
 
 wxFontRefData::~wxFontRefData()
 {
 }
 
 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;
-    }
+    ClearGdkFonts();

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

-// wxFont
+// wxFontRefData SetXXX()

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

-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-
-void wxFont::Init()
+void wxFontRefData::SetPointSize(int pointSize)

 {
 {

-    if (wxTheFontList)
-        wxTheFontList->Append( this );
+    m_pointSize = pointSize;
+
+    m_nativeFontInfo.SetPointSize(pointSize);

 }
 
 }
 

-wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
+void wxFontRefData::SetFamily(int family)

 {
 {

-    if (!xFontName)
-        return;
+    m_family = family;

 
 

-    Init();
+    // TODO: what are we supposed to do with m_nativeFontInfo here?
+}

 
 

-    m_refData = new wxFontRefData();
+void wxFontRefData::SetStyle(int style)
+{
+    m_style = style;

 
 

-    wxString tmp;
+    m_nativeFontInfo.SetStyle((wxFontStyle)style);
+}

 
 

-    wxString fontname( xFontName );
-    wxStringTokenizer tn( fontname, wxT("-") );
+void wxFontRefData::SetWeight(int weight)
+{
+    m_weight = weight;

 
 

-    tn.GetNextToken();                           // foundry
+    m_nativeFontInfo.SetWeight((wxFontWeight)weight);
+}

 
 

-    M_FONTDATA->m_faceName = tn.GetNextToken();  // family
+void wxFontRefData::SetUnderlined(bool underlined)
+{
+    m_underlined = underlined;

 
 

-    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;
+    // the XLFD doesn't have "underlined" field anyhow
+}

 
 

-    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
-    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
-    
-    tmp = tn.GetNextToken().MakeUpper();        // slant
-    if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
-    if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;
+bool wxFontRefData::SetFaceName(const wxString& facename)
+{
+    m_faceName = facename;

 
 

-    tn.GetNextToken();                           // set width
-    tn.GetNextToken();                           // add. style
-    tn.GetNextToken();                           // pixel size
+    return m_nativeFontInfo.SetFaceName(facename);
+}

 
 

-    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
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+    // previously cached fonts shouldn't be used
+    ClearGdkFonts();

 
 

-    tmp = tn.GetNextToken().MakeUpper();         // spacing
+    m_nativeFontInfo = info;

 
 

-    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;
+    // set all the other font parameters from the native font info
+    InitFromNative();
+}

 
 

-    tn.GetNextToken();                           // avg width
+// ----------------------------------------------------------------------------
+// wxFont creation
+// ----------------------------------------------------------------------------

 
 

-    // deal with font encoding
-    wxString registry = tn.GetNextToken().MakeUpper(),
-             encoding = tn.GetNextToken().MakeUpper();
+IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

 
 

-    if ( registry == _T("ISO8859") )
-    {
-        int cp;
-        if ( wxSscanf(encoding, "%d", &cp) == 1 )
-        {
-            M_FONTDATA->m_encoding =
-                (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
-        }
-    }
-    else if ( registry == _T("MICROSOFT") )
-    {
-        int cp;
-        if ( wxSscanf(encoding, "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?
+wxFont::wxFont(const wxNativeFontInfo& info)
+{
+    Create( info.GetPointSize(),
+            info.GetFamily(),
+            info.GetStyle(),
+            info.GetWeight(),
+            info.GetUnderlined(),
+            info.GetFaceName(),
+            info.GetEncoding() );

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


@@ -245,12 +367,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);
 

-    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()


@@ -269,8 +408,6 @@ void wxFont::Unshare()
 
 wxFont::~wxFont()
 {
 
 wxFont::~wxFont()
 {

-    if (wxTheFontList)
-        wxTheFontList->DeleteObject( this );

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


@@ -281,52 +418,84 @@ int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-    return M_FONTDATA->m_pointSize;
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
+                                       : M_FONTDATA->m_pointSize;

 }
 
 wxString wxFont::GetFaceName() const
 {
 }
 
 wxString wxFont::GetFaceName() const
 {

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

 
 

-    return M_FONTDATA->m_faceName;
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
+                                       : M_FONTDATA->m_faceName;

 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-    return M_FONTDATA->m_family;
+    int ret = M_FONTDATA->m_family;
+    if (M_FONTDATA->HasNativeFont())
+        // wxNativeFontInfo::GetFamily is expensive, must not call more than once
+        ret = M_FONTDATA->m_nativeFontInfo.GetFamily();
+
+    if (ret == wxFONTFAMILY_DEFAULT)
+        ret = M_FONTDATA->m_family;
+
+    return ret;

 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-    return M_FONTDATA->m_style;
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
+                                       : M_FONTDATA->m_style;

 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-    return M_FONTDATA->m_weight;
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
+                                       : M_FONTDATA->m_weight;

 }
 
 bool wxFont::GetUnderlined() const
 {
 }
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("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, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxFONTENCODING_SYSTEM, wxT("invalid font") );

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

+bool wxFont::GetNoAntiAliasing() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+
+    return M_FONTDATA->m_noAA;
+}
+
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+
+    return &(M_FONTDATA->m_nativeFontInfo);
+}
+
+bool wxFont::IsFixedWidth() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+
+    return wxFontBase::IsFixedWidth();
+}
+

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


@@ -335,105 +504,62 @@ 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( wxT("invalid font") );
-
-        return (GdkFont*) NULL;
-    }
-
-    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 );
-        }
+    Unshare();

 
 

-        M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
-    }
+    M_FONTDATA->SetNativeFontInfo( info );
+}

 
 

-    if (!font)
-    {
-        wxLogError(wxT("could not load any font"));
-    }
+void wxFont::SetNoAntiAliasing( bool no )
+{
+    Unshare();

 
 

-    return font;
+    M_FONTDATA->SetNoAntiAliasing( no );

 }
 }

-