]> 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
Fix crash in wxDataViewProgressRenderer in non-Unicode build.
[wxWidgets.git] / src / gtk / font.cpp
diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 1da01a2ed06703f39d210b8fafc7a90524da35fc..3ac8f4590aebc8f817dcec6caf46f57833692933 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        font.cpp
-// Purpose:
+// Name:        src/gtk/font.cpp
+// Purpose:     wxFont for wxGTK
 // Author:      Robert Roebling
 // Id:          $Id$
 // 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,327 +15,301 @@
 // 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/utils.h"
+    #include "wx/settings.h"
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/fontutil.h"
 #include "wx/fontutil.h"
-#include "wx/cmndata.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/tokenzr.h"
-#include "wx/settings.h"
 
 
-#include <strings.h>
+#include "wx/gtk/private.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
 
 
-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
-#include <gtk/gtk.h>
+// the default size (in points) for the fonts
+static const int wxDEFAULT_FONT_SIZE = 12;
 
 // ----------------------------------------------------------------------------
 // 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,
+                  wxFontFamily family = wxFONTFAMILY_DEFAULT,
+                  wxFontStyle style = wxFONTSTYLE_NORMAL,
+                  wxFontWeight weight = wxFONTWEIGHT_NORMAL,
+                  bool underlined = false,
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    wxFontRefData(const wxString& nativeFontInfoString);
+
+    // copy ctor
     wxFontRefData( const wxFontRefData& data );
     wxFontRefData( const wxFontRefData& data );
+
     virtual ~wxFontRefData();
 
     virtual ~wxFontRefData();
 
+    // 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(wxFontFamily family);
+    void SetStyle(wxFontStyle style);
+    void SetWeight(wxFontWeight weight);
+    void SetUnderlined(bool underlined);
+    bool SetFaceName(const wxString& facename);
+    void SetEncoding(wxFontEncoding encoding);
+
+    // 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,
-              int family,
-              int style,
-              int weight,
+              wxFontFamily family,
+              wxFontStyle style,
+              wxFontWeight weight,
               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);
 
               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);
 
+    // set all fields from (already initialized and valid) m_nativeFontInfo
+    void InitFromNative();
+
 private:
 private:
-    wxList          m_scaled_xfonts;
-    int             m_pointSize;
-    int             m_family,
-                    m_style,
-                    m_weight;
     bool            m_underlined;
     bool            m_underlined;
-    wxString        m_faceName;
-    wxFontEncoding  m_encoding;
 
 
+    // The native font info: basically a PangoFontDescription
     wxNativeFontInfo m_nativeFontInfo;
 
     friend class wxFont;
 };
 
     wxNativeFontInfo m_nativeFontInfo;
 
     friend class wxFont;
 };
 
-// ============================================================================
-// implementation
-// ============================================================================
+#define M_FONTDATA ((wxFontRefData*)m_refData)
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
-                         int family,
-                         int style,
-                         int weight,
+                         wxFontFamily family,
+                         wxFontStyle style,
+                         wxFontWeight weight,
                          bool underlined,
                          const wxString& faceName,
                          bool underlined,
                          const wxString& faceName,
-                         wxFontEncoding encoding)
+                         wxFontEncoding WXUNUSED(encoding))
 {
 {
-    if (family == wxDEFAULT)
-        m_family = wxSWISS;
-    else
-        m_family = family;
+    if (family == wxFONTFAMILY_DEFAULT)
+        family = wxFONTFAMILY_SWISS;
 
 
-    m_faceName = faceName;
+    m_underlined = underlined;
 
 
-    if (style == wxDEFAULT)
-        m_style = wxNORMAL;
-    else
-        m_style = style;
+    // Create native font info
+    m_nativeFontInfo.description = pango_font_description_new();
 
 
-    if (weight == wxDEFAULT)
-        m_weight = wxNORMAL;
+    // And set its values
+    if (!faceName.empty())
+    {
+        pango_font_description_set_family( m_nativeFontInfo.description,
+                                           wxGTK_CONV_SYS(faceName) );
+    }
     else
     else
-        m_weight = weight;
+    {
+        SetFamily(family);
+    }
 
 
-    if (pointSize == wxDEFAULT)
-        m_pointSize = 12;
-    else
-        m_pointSize = pointSize;
+    SetStyle( style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style );
+    SetPointSize( (pointSize == wxDEFAULT || pointSize == -1)
+                    ? wxDEFAULT_FONT_SIZE
+                    : pointSize );
+    SetWeight( weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight );
+}
 
 
-    m_underlined = underlined;
-    m_encoding = encoding;
+void wxFontRefData::InitFromNative()
+{
+    // Get native info
+    PangoFontDescription *desc = m_nativeFontInfo.description;
+
+    // Pango sometimes needs to have a size
+    int pango_size = pango_font_description_get_size( desc );
+    if (pango_size == 0)
+        m_nativeFontInfo.SetPointSize(wxDEFAULT_FONT_SIZE);
+
+    // Pango description are never underlined
+    m_underlined = false;
 }
 
 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_underlined = data.m_underlined;
+
+    // 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,
-                             int weight, bool underlined,
+wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
+                             wxFontWeight weight, bool underlined,
                              const wxString& faceName,
                              wxFontEncoding encoding)
                              const wxString& faceName,
                              wxFontEncoding encoding)
-    : m_scaled_xfonts(wxKEY_INTEGER)
 {
     Init(size, family, style, weight, underlined, faceName, encoding);
 }
 
 {
     Init(size, family, style, weight, underlined, faceName, encoding);
 }
 
+wxFontRefData::wxFontRefData(const wxString& nativeFontInfoString)
+{
+    m_nativeFontInfo.FromString( nativeFontInfoString );
+
+    InitFromNative();
+}
+
 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;
-    }
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
-// wxNativeFontInfo
+// wxFontRefData SetXXX()
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-bool wxNativeFontInfo::FromString(const wxString& s)
+void wxFontRefData::SetPointSize(int pointSize)
 {
 {
-    wxStringTokenizer tokenizer(s, _T(";"));
+    m_nativeFontInfo.SetPointSize(pointSize);
+}
+
+/*
+    NOTE: disabled because pango_font_description_set_absolute_size() and
+          wxDC::GetCharHeight() do not mix well: setting with the former a pixel
+          size of "30" makes the latter return 36...
+          Besides, we need to return GetPointSize() a point size value even if
+          SetPixelSize() was used and this would require further changes
+          (and use of pango_font_description_get_size_is_absolute in some places).
+
+bool wxFontRefData::SetPixelSize(const wxSize& pixelSize)
+{
+    wxCHECK_MSG( pixelSize.GetWidth() >= 0 && pixelSize.GetHeight() > 0, false,
+                 "Negative values for the pixel size or zero pixel height are not allowed" );
+
+    if (wx_pango_version_check(1,8,0) != NULL ||
+        pixelSize.GetWidth() != 0)
+    {
+        // NOTE: pango_font_description_set_absolute_size() only sets the font height;
+        //       if the user set the pixel width of the font explicitly or the pango
+        //       library is too old, we cannot proceed
+        return false;
+    }
 
 
-    wxString token = tokenizer.GetNextToken();
-    //
-    //  Ignore the version for now
-    //
+    pango_font_description_set_absolute_size( m_nativeFontInfo.description,
+                                              pixelSize.GetHeight() * PANGO_SCALE );
 
 
-    xFontName = tokenizer.GetNextToken();
-    if(!xFontName)
-        return FALSE;
-        
-    return TRUE;
+    return true;
 }
 }
+*/
 
 
-wxString wxNativeFontInfo::ToString() const
+void wxFontRefData::SetFamily(wxFontFamily family)
 {
 {
-    wxString s;
-    
-    s.Printf(_T("%d;%s"),
-             0,                         // version
-             xFontName.c_str());
-             
-    return s;
+    m_nativeFontInfo.SetFamily(family);
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxFont
-// ----------------------------------------------------------------------------
+void wxFontRefData::SetStyle(wxFontStyle style)
+{
+    m_nativeFontInfo.SetStyle(style);
+}
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+void wxFontRefData::SetWeight(wxFontWeight weight)
+{
+    m_nativeFontInfo.SetWeight(weight);
+}
 
 
-void wxFont::Init()
+void wxFontRefData::SetUnderlined(bool underlined)
 {
 {
-    if (wxTheFontList)
-        wxTheFontList->Append( this );
+    m_underlined = underlined;
+
+    // the Pango font descriptor does not have an underlined attribute
+    // (and wxNativeFontInfo::SetUnderlined asserts); rather it's
+    // wxWindowDCImpl::DoDrawText that handles underlined fonts, so we
+    // here we just need to save the underlined attribute
 }
 
 }
 
-wxFont::wxFont(const wxNativeFontInfo& info)
+bool wxFontRefData::SetFaceName(const wxString& facename)
 {
 {
-    Init();
+    return m_nativeFontInfo.SetFaceName(facename);
+}
 
 
-    Create(info.xFontName);
+void wxFontRefData::SetEncoding(wxFontEncoding WXUNUSED(encoding))
+{
+    // with GTK+ 2 Pango always uses UTF8 internally, we cannot change it
 }
 
 }
 
-bool wxFont::Create(const wxNativeFontInfo& info)
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
 {
 {
-    return Create(info.xFontName);
+    m_nativeFontInfo = info;
+
+    // set all the other font parameters from the native font info
+    InitFromNative();
+}
+
+// ----------------------------------------------------------------------------
+// wxFont creation
+// ----------------------------------------------------------------------------
+
+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,
-                     int family,
-                     int style,
-                     int weight,
+                     wxFontFamily family,
+                     wxFontStyle style,
+                     wxFontWeight weight,
                      bool underlined,
                      const wxString& face,
                      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, wxFontEncoding enc)
+bool wxFont::Create(const wxString& fontname)
 {
 {
-    if( !fontname )
+    // VZ: does this really happen?
+    if ( fontname.empty() )
     {
     {
-         *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT);
-         return TRUE;
-    }
-
-    m_refData = new wxFontRefData();
-
-    M_FONTDATA->m_nativeFontInfo.xFontName = fontname;  // X font name
-
-    wxString tmp;
-
-    wxStringTokenizer tn( fontname, wxT("-") );
-
-    tn.GetNextToken();                           // skip initial empty token
-    tn.GetNextToken();                           // foundry
-
+        *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
 
-    M_FONTDATA->m_faceName = tn.GetNextToken();  // 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;
-
-    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;
-
-    tn.GetNextToken();                           // set width
-    tn.GetNextToken();                           // add. style
-    tn.GetNextToken();                           // pixel size
-
-    tmp = tn.GetNextToken();                     // pointsize
-    if (tmp != wxT("*"))
-    {
-        long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
-        M_FONTDATA->m_pointSize = (int)(num / 10);
+        return true;
     }
 
     }
 
-    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;
-}
+    m_refData = new wxFontRefData(fontname);
 
 
-void wxFont::Unshare()
-{
-    if (!m_refData)
-    {
-        m_refData = new wxFontRefData();
-    }
-    else
-    {
-        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-        UnRef();
-        m_refData = ref;
-    }
+    return true;
 }
 
 wxFont::~wxFont()
 {
 }
 
 wxFont::~wxFont()
 {
-    if (wxTheFontList)
-        wxTheFontList->DeleteObject( this );
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -344,64 +318,65 @@ wxFont::~wxFont()
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
 
 
-    return M_FONTDATA->m_pointSize;
+    return M_FONTDATA->m_nativeFontInfo.GetPointSize();
 }
 
 wxString wxFont::GetFaceName() const
 {
 }
 
 wxString wxFont::GetFaceName() const
 {
-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
 
 
-    return M_FONTDATA->m_faceName;
+    return M_FONTDATA->m_nativeFontInfo.GetFaceName();
 }
 
 }
 
-int wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const
 {
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
-
-    return M_FONTDATA->m_family;
+    return M_FONTDATA->m_nativeFontInfo.GetFamily();
 }
 
 }
 
-int wxFont::GetStyle() const
+wxFontStyle wxFont::GetStyle() const
 {
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
 
 
-    return M_FONTDATA->m_style;
+    return M_FONTDATA->m_nativeFontInfo.GetStyle();
 }
 
 }
 
-int wxFont::GetWeight() const
+wxFontWeight wxFont::GetWeight() const
 {
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
 
 
-    return M_FONTDATA->m_weight;
+    return M_FONTDATA->m_nativeFontInfo.GetWeight();
 }
 
 bool wxFont::GetUnderlined() const
 {
 }
 
 bool wxFont::GetUnderlined() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), 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( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") );
 
 
-    return M_FONTDATA->m_encoding;
+    return wxFONTENCODING_UTF8;
+        // Pango always uses UTF8... see also SetEncoding()
 }
 
 }
 
-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 {
-    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );
 
 
-    if(M_FONTDATA->m_nativeFontInfo.xFontName.IsEmpty())
-        GetInternalFont();
-
-    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+    return &(M_FONTDATA->m_nativeFontInfo);
 }
 
 }
 
+bool wxFont::IsFixedWidth() const
+{
+    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
+
+    return wxFontBase::IsFixedWidth();
+}
 
 // ----------------------------------------------------------------------------
 // change font attributes
 
 // ----------------------------------------------------------------------------
 // change font attributes
@@ -409,136 +384,67 @@ wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 
 void wxFont::SetPointSize(int pointSize)
 {
 
 void wxFont::SetPointSize(int pointSize)
 {
-    Unshare();
+    AllocExclusive();
 
 
-    M_FONTDATA->m_pointSize = pointSize;
-    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
+    M_FONTDATA->SetPointSize(pointSize);
 }
 
 }
 
-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)
 {
 {
-    Unshare();
+    AllocExclusive();
 
 
-    M_FONTDATA->m_family = family;
-    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
+    M_FONTDATA->SetFamily(family);
 }
 
 }
 
-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)
 {
 {
-    Unshare();
+    AllocExclusive();
 
 
-    M_FONTDATA->m_style = style;
-    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
+    M_FONTDATA->SetStyle(style);
 }
 
 }
 
-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)
 {
 {
-    Unshare();
+    AllocExclusive();
 
 
-    M_FONTDATA->m_weight = weight;
-    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
+    M_FONTDATA->SetWeight(weight);
 }
 
 }
 
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
 {
 {
-    Unshare();
+    AllocExclusive();
 
 
-    M_FONTDATA->m_faceName = faceName;
-    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
+    return M_FONTDATA->SetFaceName(faceName) &&
+           wxFontBase::SetFaceName(faceName);
 }
 
 void wxFont::SetUnderlined(bool underlined)
 {
 }
 
 void wxFont::SetUnderlined(bool underlined)
 {
-    Unshare();
+    AllocExclusive();
 
 
-    M_FONTDATA->m_underlined = underlined;
+    M_FONTDATA->SetUnderlined(underlined);
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {
-    Unshare();
+    AllocExclusive();
 
 
-    M_FONTDATA->m_encoding = encoding;
-    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
+    M_FONTDATA->SetEncoding(encoding);
 }
 
 }
 
-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
 {
 {
-    Unshare();
+    AllocExclusive();
 
 
-    M_FONTDATA->m_nativeFontInfo = info;
+    M_FONTDATA->SetNativeFontInfo( info );
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// get internal representation of font
-// ----------------------------------------------------------------------------
-
-static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
-
-GdkFont *GtkGetDefaultGuiFont()
+wxGDIRefData* wxFont::CreateGDIRefData() const
 {
 {
-    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 );
-    }
-    return g_systemDefaultGuiFont;
+    return new wxFontRefData;
 }
 
 }
 
-GdkFont *wxFont::GetInternalFont( float scale ) const
+wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) const
 {
 {
-    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 = (int)((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 (*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 );
-    }
-
-    // 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;
+    return new wxFontRefData(*static_cast<const wxFontRefData*>(data));
 }
 }
-
wxWidgets (Impactor)