use UTF8-encoded char* strings in UTF8 build instead of wchar_t* if the current local...

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

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 0af197f78da852a5a5de65f5c2c61bb6e7eaf016..859175c11bfb522768cc126c36ed29701dabd4f8 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/motif/font.cpp
+// Name:        src/x11/font.cpp

 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:


@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -17,32 +20,44 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "font.h"
-#endif
-

 #ifdef __VMS
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
 #endif
 #ifdef __VMS
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
 #endif

-#include <Xm/Xm.h>
+

 #ifdef __VMS
 #pragma message enable nosimpint
 #endif
 
 #ifdef __VMS
 #pragma message enable nosimpint
 #endif
 

-#include "wx/defs.h"
-#include "wx/string.h"

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

-#include "wx/gdicmn.h"
-#include "wx/utils.h"       // for wxGetDisplay()
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/utils.h"       // for wxGetDisplay()
+    #include "wx/settings.h"
+    #include "wx/gdicmn.h"
+#endif
+

 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"

-#include "wx/settings.h"
+#include "wx/fontenum.h"
+
+#include "wx/x11/private.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 // ----------------------------------------------------------------------------

-// private classes
+// constants
+// ----------------------------------------------------------------------------
+
+// the default size (in points) for the fonts
+static const int wxDEFAULT_FONT_SIZE = 12;
+
+
+#if wxUSE_UNICODE
+#else
+// ----------------------------------------------------------------------------
+// wxXFont

 // ----------------------------------------------------------------------------
 
 // For every wxFont, there must be a font for each display and scale requested.
 // ----------------------------------------------------------------------------
 
 // For every wxFont, there must be a font for each display and scale requested.


@@ -51,15 +66,34 @@ class wxXFont : public wxObject
 {
 public:
     wxXFont();
 {
 public:
     wxXFont();

-    ~wxXFont();
+    virtual ~wxXFont();

 
     WXFontStructPtr     m_fontStruct;   // XFontStruct
 
     WXFontStructPtr     m_fontStruct;   // XFontStruct

-    WXFontList          m_fontList;     // Motif XmFontList

     WXDisplay*          m_display;      // XDisplay
     int                 m_scale;        // Scale * 100
 };
 
     WXDisplay*          m_display;      // XDisplay
     int                 m_scale;        // Scale * 100
 };
 

-class wxFontRefData: public wxGDIRefData
+wxXFont::wxXFont()
+{
+    m_fontStruct = (WXFontStructPtr) 0;
+    m_display = (WXDisplay*) 0;
+    m_scale = 100;
+}
+
+wxXFont::~wxXFont()
+{
+    // Freeing the font used to produce a segv, but
+    // appears to be OK now (bug fix in X11?)
+    XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
+    XFreeFont((Display*) m_display, fontStruct);
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
+
+class wxFontRefData: public wxObjectRefData

 {
 friend class wxFont;
 
 {
 friend class wxFont;
 


@@ -68,20 +102,34 @@ public:
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,

-                  bool underlined = FALSE,
+                  bool underlined = false,

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

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

 
 

-    wxFontRefData(const wxFontRefData& data)
-    {
-        Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
-             data.m_underlined, data.m_faceName, data.m_encoding);
-    }
+    // copy cstr
+    wxFontRefData(const wxFontRefData& data);
+
+    // from XFLD
+    wxFontRefData(const wxString& fontname);
+
+    // dstr
+    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(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; }

 
 

-    ~wxFontRefData();
+    // and this one also modifies all the other font data fields
+    void SetNativeFontInfo(const wxNativeFontInfo& info);

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -93,6 +141,9 @@ protected:
               const wxString& faceName,
               wxFontEncoding encoding);
 
               const wxString& faceName,
               wxFontEncoding encoding);
 

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

     // font attributes
     int           m_pointSize;
     int           m_family;
     // font attributes
     int           m_pointSize;
     int           m_family;


@@ -100,41 +151,21 @@ protected:
     int           m_weight;
     bool          m_underlined;
     wxString      m_faceName;
     int           m_weight;
     bool          m_underlined;
     wxString      m_faceName;

-    wxFontEncoding m_encoding;
+    wxFontEncoding m_encoding;   // Unused in Unicode mode
+    bool            m_noAA;      // No anti-aliasing

 
     wxNativeFontInfo m_nativeFontInfo;
 
     wxNativeFontInfo m_nativeFontInfo;

-    
+
+    void ClearX11Fonts();
+
+#if wxUSE_UNICODE
+#else

     // A list of wxXFonts
     wxList        m_fonts;
     // A list of wxXFonts
     wxList        m_fonts;

+#endif

 };
 
 };
 

-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxXFont
-// ----------------------------------------------------------------------------
-
-wxXFont::wxXFont()
-{
-    m_fontStruct = (WXFontStructPtr) 0;
-    m_fontList = (WXFontList) 0;
-    m_display = (WXDisplay*) 0;
-    m_scale = 100;
-}
-
-wxXFont::~wxXFont()
-{
-    XmFontList fontList = (XmFontList) m_fontList;
-
-    XmFontListFree (fontList);
-
-    // TODO: why does freeing the font produce a segv???
-    // Note that XFreeFont wasn't called in wxWin 1.68 either.
-    // XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
-    //        XFreeFont((Display*) m_display, fontStruct);
-}
+#define M_FONTDATA ((wxFontRefData*)m_refData)

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


@@ -148,57 +179,385 @@ 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;
+
+    m_underlined = underlined;
+    m_encoding = encoding;
+
+#if wxUSE_UNICODE
+    if ( m_nativeFontInfo.description )
+        pango_font_description_free(m_nativeFontInfo.description);
+
+    // Create native font info
+    m_nativeFontInfo.description = pango_font_description_new();
+
+    // if a face name is specified, use it if it's available, otherwise use
+    // just the family
+    if ( faceName.empty() || !wxFontEnumerator::IsValidFacename(faceName) )
+    {
+        // TODO: scan system for valid fonts matching the given family instead
+        //       of hardcoding them here
+        switch ( m_family )
+        {
+            case wxFONTFAMILY_TELETYPE:
+                m_faceName = wxT("monospace");
+                break;
+
+            case wxFONTFAMILY_ROMAN:
+                m_faceName = wxT("serif");
+                break;
+
+            default:
+                m_faceName = wxT("sans");
+        }
+    }
+    else // specified face name is available, use it
+    {
+        m_faceName = faceName;
+    }
+
+    m_nativeFontInfo.SetFaceName(m_faceName);
+    m_nativeFontInfo.SetWeight((wxFontWeight)m_weight);
+    m_nativeFontInfo.SetStyle((wxFontStyle)m_style);
+#endif // wxUSE_UNICODE
+
+    SetPointSize(pointSize);
+}
+
+void wxFontRefData::InitFromNative()
+{
+    m_noAA = false;
+
+#if wxUSE_UNICODE
+    // Get native info
+    PangoFontDescription *desc = m_nativeFontInfo.description;
+
+    // init fields
+    m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );

 
 

-    if (weight == wxDEFAULT)
-        m_weight = wxNORMAL;
+    m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
+
+    switch (pango_font_description_get_style( desc ))
+    {
+        case PANGO_STYLE_NORMAL:
+            m_style = wxFONTSTYLE_NORMAL;
+            break;
+        case PANGO_STYLE_ITALIC:
+            m_style = wxFONTSTYLE_ITALIC;
+            break;
+        case PANGO_STYLE_OBLIQUE:
+            m_style = wxFONTSTYLE_SLANT;
+            break;
+    }
+
+// Not defined in some Pango versions
+#define wxPANGO_WEIGHT_SEMIBOLD 600
+
+    switch (pango_font_description_get_weight( desc ))
+    {
+        case PANGO_WEIGHT_ULTRALIGHT:
+        case PANGO_WEIGHT_LIGHT:
+            m_weight = wxFONTWEIGHT_LIGHT;
+            break;
+
+        default:
+            wxFAIL_MSG(_T("unknown Pango font weight"));
+            // fall through
+
+        case PANGO_WEIGHT_NORMAL:
+            m_weight = wxFONTWEIGHT_NORMAL;
+            break;
+
+        case wxPANGO_WEIGHT_SEMIBOLD:
+        case PANGO_WEIGHT_BOLD:
+        case PANGO_WEIGHT_ULTRABOLD:
+        case PANGO_WEIGHT_HEAVY:
+            m_weight = wxFONTWEIGHT_BOLD;
+            break;
+    }
+
+    if (m_faceName == wxT("monospace"))
+    {
+        m_family = wxFONTFAMILY_TELETYPE;
+    }
+    else if (m_faceName == wxT("sans"))
+    {
+        m_family = wxFONTFAMILY_SWISS;
+    }

     else
     else

-        m_weight = weight;
+    {
+        m_family = wxFONTFAMILY_UNKNOWN;
+    }
+
+    // Pango description are never underlined (?)
+    m_underlined = false;
+
+    // Cannot we choose that
+    m_encoding = wxFONTENCODING_SYSTEM;
+#else // X11
+    // get the font parameters from the XLFD
+    // -------------------------------------
+
+    m_faceName = m_nativeFontInfo.GetXFontComponent(wxXLFD_FAMILY);
+
+    m_weight = wxFONTWEIGHT_NORMAL;
+
+    wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();
+    if ( !w.empty() && w != _T('*') )
+    {
+        // the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD
+        // and BLACK
+        if ( ((w[0u] == _T('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||
+                                   !wxStrcmp(w.c_str() + 1, wxT("LACK"))))) ||
+             wxStrstr(w.c_str() + 1, _T("BOLD")) )
+        {
+            m_weight = wxFONTWEIGHT_BOLD;
+        }
+        else if ( w == _T("LIGHT") || w == _T("THIN") )
+        {
+            m_weight = wxFONTWEIGHT_LIGHT;
+        }
+    }
+
+    switch ( wxToupper(*m_nativeFontInfo.
+                            GetXFontComponent(wxXLFD_SLANT).c_str()) )
+    {
+        case _T('I'):   // italique
+            m_style = wxFONTSTYLE_ITALIC;
+            break;
+
+        case _T('O'):   // oblique
+            m_style = wxFONTSTYLE_SLANT;
+            break;
+
+        default:
+            m_style = wxFONTSTYLE_NORMAL;
+    }

 
 

-    if (pointSize == wxDEFAULT)
-        m_pointSize = 12;
+    long ptSize;
+    if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_POINTSIZE).ToLong(&ptSize) )
+    {
+        // size in XLFD is in 10 point units
+        m_pointSize = (int)(ptSize / 10);
+    }

     else
     else

-        m_pointSize = pointSize;
+    {
+        m_pointSize = wxDEFAULT_FONT_SIZE;
+    }

 
 

-    m_underlined = underlined;
-    m_encoding = encoding;
+    // examine the spacing: if the font is monospaced, assume wxTELETYPE
+    // family for compatibility with the old code which used it instead of
+    // IsFixedWidth()
+    if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == _T('M') )
+    {
+        m_family = wxFONTFAMILY_TELETYPE;
+    }
+    else // not monospaceed
+    {
+        // don't even try guessing it, it doesn't work for too many fonts
+        // anyhow
+        m_family = wxFONTFAMILY_UNKNOWN;
+    }
+
+    // X fonts are never underlined...
+    m_underlined = false;
+
+    // deal with font encoding
+    wxString
+        registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(),
+        encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper();
+
+    if ( registry == _T("ISO8859") )
+    {
+        int cp;
+        if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
+        {
+            m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
+        }
+    }
+    else if ( registry == _T("MICROSOFT") )
+    {
+        int cp;
+        if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
+        {
+            m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
+        }
+    }
+    else if ( registry == _T("KOI8") )
+    {
+        m_encoding = wxFONTENCODING_KOI8;
+    }
+    else // unknown encoding
+    {
+        // may be give a warning here? or use wxFontMapper?
+        m_encoding = wxFONTENCODING_SYSTEM;
+    }
+#endif // Pango/X11

 }
 
 }
 

-wxFontRefData::~wxFontRefData()
+wxFontRefData::wxFontRefData( const wxFontRefData& data )
+             : wxObjectRefData()
+{
+    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;
+
+    m_nativeFontInfo = data.m_nativeFontInfo;
+}
+
+wxFontRefData::wxFontRefData(int size, int family, int style,
+                             int weight, bool underlined,
+                             const wxString& faceName,
+                             wxFontEncoding encoding)
+{
+    Init(size, family, style, weight, underlined, faceName, encoding);
+}
+
+wxFontRefData::wxFontRefData(const wxString& fontname)
+{
+    // VZ: FromString() should really work in both cases, doesn't it?
+#if wxUSE_UNICODE
+    m_nativeFontInfo.FromString( fontname );
+#else
+    m_nativeFontInfo.SetXFontName(fontname);
+#endif
+
+    InitFromNative();
+}
+
+void wxFontRefData::ClearX11Fonts()

 {
 {

-    wxNode* node = m_fonts.First();
+#if wxUSE_UNICODE
+#else
+    wxList::compatibility_iterator node = m_fonts.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxXFont* f = (wxXFont*) node->Data();
+        wxXFont* f = (wxXFont*) node->GetData();

         delete f;
         delete f;

-        node = node->Next();
+        node = node->GetNext();

     }
     m_fonts.Clear();
     }
     m_fonts.Clear();

+#endif
+}
+
+wxFontRefData::~wxFontRefData()
+{
+    ClearX11Fonts();

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

-// wxFont
+// wxFontRefData SetXXX()

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

-wxFont::wxFont(const wxNativeFontInfo& info)
+void wxFontRefData::SetPointSize(int pointSize)
+{
+    // NB: Pango doesn't support point sizes less than 1
+    m_pointSize = pointSize == wxDEFAULT || pointSize < 1 ? wxDEFAULT_FONT_SIZE
+                                                          : pointSize;
+
+#if wxUSE_UNICODE
+    m_nativeFontInfo.SetPointSize(m_pointSize);
+#endif
+}
+
+void wxFontRefData::SetFamily(int family)
+{
+    m_family = family;
+
+    // TODO: what are we supposed to do with m_nativeFontInfo here?
+}
+
+void wxFontRefData::SetStyle(int style)
+{
+    m_style = style;
+
+#if wxUSE_UNICODE
+    // Get native info
+    PangoFontDescription *desc = m_nativeFontInfo.description;
+
+    switch ( style )
+    {
+        case wxFONTSTYLE_ITALIC:
+            pango_font_description_set_style( desc, PANGO_STYLE_ITALIC );
+            break;
+        case wxFONTSTYLE_SLANT:
+            pango_font_description_set_style( desc, PANGO_STYLE_OBLIQUE );
+            break;
+        default:
+            wxFAIL_MSG( _T("unknown font style") );
+            // fall through
+        case wxFONTSTYLE_NORMAL:
+            pango_font_description_set_style( desc, PANGO_STYLE_NORMAL );
+            break;
+    }
+#endif
+}
+
+void wxFontRefData::SetWeight(int weight)
+{
+    m_weight = weight;
+}
+
+void wxFontRefData::SetUnderlined(bool underlined)
+{
+    m_underlined = underlined;
+
+    // the XLFD doesn't have "underlined" field anyhow
+}
+
+bool wxFontRefData::SetFaceName(const wxString& facename)
+{
+    m_faceName = facename;
+    return true;
+}
+
+void wxFontRefData::SetEncoding(wxFontEncoding encoding)
+{
+    m_encoding = encoding;
+}
+
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)

 {
 {

-    Init();
+    // previously cached fonts shouldn't be used
+    ClearX11Fonts();

 
 

-    (void)Create(info.GetXFontName());
+    m_nativeFontInfo = info;
+
+    // set all the other font parameters from the native font info
+    InitFromNative();

 }
 
 }
 

-void wxFont::Init()
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------
+
+wxFont::wxFont(const wxNativeFontInfo& info)

 {
 {

+#if wxUSE_UNICODE
+    Create( info.GetPointSize(),
+            info.GetFamily(),
+            info.GetStyle(),
+            info.GetWeight(),
+            info.GetUnderlined(),
+            info.GetFaceName(),
+            info.GetEncoding() );
+#else
+    (void) Create(info.GetXFontName());
+#endif

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


@@ -210,20 +569,21 @@ bool wxFont::Create(int pointSize,
                     wxFontEncoding encoding)
 {
     UnRef();
                     wxFontEncoding encoding)
 {
     UnRef();

+

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

-    RealizeResource();
-
-    return TRUE;
+    return true;

 }
 
 }
 

+#if !wxUSE_UNICODE
+

 bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
 {
     if( !fontname )
     {
         *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
 bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
 {
     if( !fontname )
     {
         *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);

-        return TRUE;
+        return true;

     }
 
     m_refData = new wxFontRefData();
     }
 
     m_refData = new wxFontRefData();


@@ -316,10 +676,11 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
         }
         //else: unknown encoding - may be give a warning here?
         else
         }
         //else: unknown encoding - may be give a warning here?
         else

-            return FALSE;
+            return false;

     }
     }

-    return TRUE;    
+    return true;

 }
 }

+#endif // !wxUSE_UNICODE

 
 wxFont::~wxFont()
 {
 
 wxFont::~wxFont()
 {


@@ -344,147 +705,175 @@ void wxFont::Unshare()
     }
 }
 
     }
 }
 

-void wxFont::SetPointSize(int pointSize)
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
+int wxFont::GetPointSize() const

 {
 {

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

 
 

-    M_FONTDATA->m_pointSize = pointSize;
-    M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
-    
-    RealizeResource();
+    return M_FONTDATA->m_pointSize;

 }
 
 }
 

-void wxFont::SetFamily(int family)
+wxString wxFont::GetFaceName() const

 {
 {

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

 
 

-    M_FONTDATA->m_family = family;
-    M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
-    
-    RealizeResource();
+    return M_FONTDATA->m_faceName;

 }
 
 }
 

-void wxFont::SetStyle(int style)
+int wxFont::GetFamily() const

 {
 {

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

 
 

-    M_FONTDATA->m_style = style;
-    M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
-    
-    RealizeResource();
+    return M_FONTDATA->m_family;

 }
 
 }
 

-void wxFont::SetWeight(int weight)
+int wxFont::GetStyle() const

 {
 {

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

 
 

-    M_FONTDATA->m_weight = weight;
-    M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
-    
-    RealizeResource();
+    return M_FONTDATA->m_style;

 }
 
 }
 

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

 {
 {

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

 
 

-    M_FONTDATA->m_faceName = faceName;
-    M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
-    
-    RealizeResource();
+    return M_FONTDATA->m_weight;

 }
 
 }
 

-void wxFont::SetUnderlined(bool underlined)
+bool wxFont::GetUnderlined() const

 {
 {

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

 
 

-    M_FONTDATA->m_underlined = underlined;
-    
-    RealizeResource();
+    return M_FONTDATA->m_underlined;

 }
 
 }
 

-void wxFont::SetEncoding(wxFontEncoding encoding)
+wxFontEncoding wxFont::GetEncoding() const

 {
 {

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

 
 

-    M_FONTDATA->m_encoding = encoding;
-    M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
-    
-    RealizeResource();
+    return M_FONTDATA->m_encoding;

 }
 
 }
 

-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+bool wxFont::GetNoAntiAliasing() const

 {
 {

-    Unshare();
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+
+    return M_FONTDATA->m_noAA;
+}
+
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+
+#if wxUSE_UNICODE
+#else
+    if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
+        GetInternalFont();
+#endif
+
+    return &(M_FONTDATA->m_nativeFontInfo);
+}
+
+bool wxFont::IsFixedWidth() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+
+#if wxUSE_UNICODE
+   return wxFontBase::IsFixedWidth();
+#else
+    // Robert, is this right? HasNativeFont doesn't exist.
+    if ( true )
+    //    if ( M_FONTDATA->HasNativeFont() )
+    {
+        // the monospace fonts are supposed to have "M" in the spacing field
+        wxString spacing = M_FONTDATA->
+                            m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING);
+
+        return spacing.Upper() == _T('M');
+    }
+   // Unreaceable code for now
+   // return wxFontBase::IsFixedWidth();
+#endif

 
 

-    M_FONTDATA->m_nativeFontInfo = info;

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

-// query font attributes
+// change font attributes

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

-int wxFont::GetPointSize() const
+void wxFont::SetPointSize(int pointSize)

 {
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
-    
-    return M_FONTDATA->m_pointSize;
+    Unshare();
+
+    M_FONTDATA->SetPointSize(pointSize);

 }
 
 }
 

-wxString wxFont::GetFaceName() const
+void wxFont::SetFamily(int family)

 {
 {

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

 
 

-    return M_FONTDATA->m_faceName ;
+    M_FONTDATA->SetFamily(family);

 }
 
 }
 

-int wxFont::GetFamily() const
+void wxFont::SetStyle(int style)

 {
 {

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

 
 

-    return M_FONTDATA->m_family;
+    M_FONTDATA->SetStyle(style);

 }
 
 }
 

-int wxFont::GetStyle() const
+void wxFont::SetWeight(int weight)

 {
 {

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

 
 

-    return M_FONTDATA->m_style;
+    M_FONTDATA->SetWeight(weight);

 }
 
 }
 

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

 {
 {

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

 
 

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

 }
 
 }
 

-bool wxFont::GetUnderlined() const
+void wxFont::SetUnderlined(bool underlined)

 {
 {

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

 
 

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

 }
 
 }
 

-wxFontEncoding wxFont::GetEncoding() const
+void wxFont::SetEncoding(wxFontEncoding encoding)

 {
 {

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

 
 

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

 }
 
 }
 

-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )

 {
 {

-    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+    Unshare();

 
 

-    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
-        GetInternalFont();
+    M_FONTDATA->SetNativeFontInfo( info );
+}

 
 

-    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+void wxFont::SetNoAntiAliasing( bool no )
+{
+    Unshare();
+
+    M_FONTDATA->SetNoAntiAliasing( no );

 }
 
 }
 

+#if wxUSE_UNICODE
+#else
+

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

-// real implementation
+// X11 implementation

 // ----------------------------------------------------------------------------
 
 // Find an existing, or create a new, XFontStruct
 // ----------------------------------------------------------------------------
 
 // Find an existing, or create a new, XFontStruct


@@ -499,15 +888,20 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
     // search existing fonts first
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
     // search existing fonts first

-    wxNode* node = M_FONTDATA->m_fonts.First();
+    wxList::compatibility_iterator node = M_FONTDATA->m_fonts.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxXFont* f = (wxXFont*) node->Data();
+        wxXFont* f = (wxXFont*) node->GetData();

         if ((!display || (f->m_display == display)) && (f->m_scale == intScale))
             return f;
         if ((!display || (f->m_display == display)) && (f->m_scale == intScale))
             return f;

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

+    wxString xFontName = M_FONTDATA->m_nativeFontInfo.GetXFontName();
+    if (xFontName == "-*-*-*-*-*--*-*-*-*-*-*-*-*")
+      // wxFont constructor not called with native font info parameter => take M_FONTDATA values
+      xFontName.Clear();
+

     // not found, create a new one
     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,
     // not found, create a new one
     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,


@@ -516,7 +910,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
                                                M_FONTDATA->m_weight,
                                                M_FONTDATA->m_underlined,
                                                wxT(""),
                                                M_FONTDATA->m_weight,
                                                M_FONTDATA->m_underlined,
                                                wxT(""),

-                                               M_FONTDATA->m_encoding);
+                                               M_FONTDATA->m_encoding,
+                                               & xFontName);

 
     if ( !font )
     {
 
     if ( !font )
     {


@@ -529,7 +924,6 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     f->m_fontStruct = (WXFontStructPtr)font;
     f->m_display = ( display ? display : wxGetDisplay() );
     f->m_scale = intScale;
     f->m_fontStruct = (WXFontStructPtr)font;
     f->m_display = ( display ? display : wxGetDisplay() );
     f->m_scale = intScale;

-    f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);

     M_FONTDATA->m_fonts.Append(f);
 
     return f;
     M_FONTDATA->m_fonts.Append(f);
 
     return f;


@@ -542,10 +936,4 @@ WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
     return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
 }
 
     return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
 }
 

-WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
-{
-    wxXFont* f = GetInternalFont(scale, display);
-
-    return (f ? f->m_fontList : (WXFontList) 0);
-}
-
+#endif