Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 06637b118da1623a8c2bb1283f204ce874b5bc5e..a07b6fa9204e53f869884185261affe3bc9912e5 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -17,11 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "font.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #ifdef __VMS
 #pragma message disable nosimpint
 
 #ifdef __VMS
 #pragma message disable nosimpint


@@ -32,17 +29,19 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-#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/motif/private.h"
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -53,12 +52,16 @@ class wxXFont : public wxObject
 {
 public:
     wxXFont();
 {
 public:
     wxXFont();

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

 
 

+#if !wxMOTIF_NEW_FONT_HANDLING

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

+#endif
+#if !wxMOTIF_USE_RENDER_TABLE

     WXFontList          m_fontList;     // Motif XmFontList
     WXFontList          m_fontList;     // Motif XmFontList

-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#else // if wxMOTIF_USE_RENDER_TABLE

     WXRenderTable       m_renderTable;  // Motif XmRenderTable
     WXRenderTable       m_renderTable;  // Motif XmRenderTable

+    WXRendition         m_rendition;    // Motif XmRendition

 #endif
     WXDisplay*          m_display;      // XDisplay
     int                 m_scale;        // Scale * 100
 #endif
     WXDisplay*          m_display;      // XDisplay
     int                 m_scale;        // Scale * 100


@@ -66,14 +69,14 @@ public:
 
 class wxFontRefData: public wxGDIRefData
 {
 
 class wxFontRefData: public wxGDIRefData
 {

-friend class wxFont;
+    friend class wxFont;

 
 public:
     wxFontRefData(int size = wxDEFAULT,
 
 public:
     wxFontRefData(int size = wxDEFAULT,

-                  int family = wxDEFAULT,
-                  int style = wxDEFAULT,
-                  int weight = wxDEFAULT,
-                  bool underlined = FALSE,
+                  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)
     {


@@ -86,23 +89,23 @@ public:
              data.m_underlined, data.m_faceName, data.m_encoding);
     }
 
              data.m_underlined, data.m_faceName, data.m_encoding);
     }
 

-    ~wxFontRefData();
+    virtual ~wxFontRefData();

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

-              int family,
-              int style,
-              int weight,
+              wxFontFamily family,
+              wxFontStyle style,
+              wxFontWeight weight,

               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);
 
     // font attributes
     int           m_pointSize;
               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);
 
     // font attributes
     int           m_pointSize;

-    int           m_family;
-    int           m_style;
-    int           m_weight;
+    wxFontFamily  m_family;
+    wxFontStyle   m_style;
+    wxFontWeight  m_weight;

     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;
     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;


@@ -123,10 +126,14 @@ protected:
 
 wxXFont::wxXFont()
 {
 
 wxXFont::wxXFont()
 {

+#if !wxMOTIF_NEW_FONT_HANDLING

     m_fontStruct = (WXFontStructPtr) 0;
     m_fontStruct = (WXFontStructPtr) 0;

+#endif
+#if !wxMOTIF_USE_RENDER_TABLE

     m_fontList = (WXFontList) 0;
     m_fontList = (WXFontList) 0;

-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#else // if wxMOTIF_USE_RENDER_TABLE

     m_renderTable = (WXRenderTable) 0;
     m_renderTable = (WXRenderTable) 0;

+    m_rendition   = (WXRendition) 0;

 #endif
     m_display = (WXDisplay*) 0;
     m_scale = 100;
 #endif
     m_display = (WXDisplay*) 0;
     m_scale = 100;


@@ -134,16 +141,20 @@ wxXFont::wxXFont()
 
 wxXFont::~wxXFont()
 {
 
 wxXFont::~wxXFont()
 {

-    XmFontList fontList = (XmFontList) m_fontList;
-    XmFontListFree (fontList);
-
-#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
-    XmRenderTable renderTable = (XmRenderTable) m_renderTable;
-    XmRenderTableFree (renderTable);
+#if !wxMOTIF_USE_RENDER_TABLE
+    if (m_fontList)
+        XmFontListFree ((XmFontList) m_fontList);
+    m_fontList = NULL;
+#else // if wxMOTIF_USE_RENDER_TABLE
+    if (m_renderTable)
+        XmRenderTableFree ((XmRenderTable) m_renderTable);
+    m_renderTable = NULL;

 #endif
 
     // TODO: why does freeing the font produce a segv???
     // Note that XFreeFont wasn't called in wxWin 1.68 either.
 #endif
 
     // TODO: why does freeing the font produce a segv???
     // Note that XFreeFont wasn't called in wxWin 1.68 either.

+    // MBN: probably some interaction with fonts being still
+    //      in use in some widgets...

     // XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
     //        XFreeFont((Display*) m_display, fontStruct);
 }
     // XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
     //        XFreeFont((Display*) m_display, fontStruct);
 }


@@ -153,27 +164,27 @@ wxXFont::~wxXFont()
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,

-                         int family,
-                         int style,
-                         int weight,
+                         wxFontFamily family,
+                         wxFontStyle style,
+                         wxFontWeight weight,

                          bool underlined,
                          const wxString& faceName,
                          wxFontEncoding encoding)
 {
     if (family == wxDEFAULT)
                          bool underlined,
                          const wxString& faceName,
                          wxFontEncoding encoding)
 {
     if (family == wxDEFAULT)

-        m_family = wxSWISS;
+        m_family = wxFONTFAMILY_SWISS;

     else
         m_family = family;
 
     m_faceName = faceName;
 
     if (style == wxDEFAULT)
     else
         m_family = family;
 
     m_faceName = faceName;
 
     if (style == wxDEFAULT)

-        m_style = wxNORMAL;
+        m_style = wxFONTSTYLE_NORMAL;

     else
         m_style = style;
 
     if (weight == wxDEFAULT)
     else
         m_style = style;
 
     if (weight == wxDEFAULT)

-        m_weight = wxNORMAL;
+        m_weight = wxFONTWEIGHT_NORMAL;

     else
         m_weight = weight;
 
     else
         m_weight = weight;
 


@@ -198,25 +209,21 @@ wxFontRefData::~wxFontRefData()
     m_fonts.Clear();
 }
 
     m_fonts.Clear();
 }
 

+#define M_FONTDATA ((wxFontRefData*)m_refData)
+

 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 
 wxFont::wxFont(const wxNativeFontInfo& info)
 {
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 
 wxFont::wxFont(const wxNativeFontInfo& info)
 {

-    Init();
-

     (void)Create(info.GetXFontName());
 }
 
     (void)Create(info.GetXFontName());
 }
 

-void wxFont::Init()
-{
-}
-

 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& faceName,
                     wxFontEncoding encoding)
                     bool underlined,
                     const wxString& faceName,
                     wxFontEncoding encoding)


@@ -225,9 +232,7 @@ bool wxFont::Create(int pointSize,
     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;

 }
 
 bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
 }
 
 bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)


@@ -235,7 +240,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     if( !fontname )
     {
         *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
     if( !fontname )
     {
         *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);

-        return TRUE;
+        return true;

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


@@ -253,18 +258,18 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     M_FONTDATA->m_faceName = tn.GetNextToken();  // family
 
     tmp = tn.GetNextToken().MakeUpper();         // weight
     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("BOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;
+    if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;
+    if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;
+    if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;
+    if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;

 
 

-    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
-    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
+    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxFONTWEIGHT_LIGHT;
+    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxFONTWEIGHT_LIGHT;

 
     tmp = tn.GetNextToken().MakeUpper();        // slant
 
     tmp = tn.GetNextToken().MakeUpper();        // slant

-    if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
-    if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;
+    if (tmp == wxT("I")) M_FONTDATA->m_style = wxFONTSTYLE_ITALIC;
+    if (tmp == wxT("O")) M_FONTDATA->m_style = wxFONTSTYLE_ITALIC;

 
     tn.GetNextToken();                           // set width
     tn.GetNextToken();                           // add. style
 
     tn.GetNextToken();                           // set width
     tn.GetNextToken();                           // add. style


@@ -273,7 +278,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     tmp = tn.GetNextToken();                     // pointsize
     if (tmp != wxT("*"))
     {
     tmp = tn.GetNextToken();                     // pointsize
     if (tmp != wxT("*"))
     {

-        long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
+        long num = wxStrtol (tmp.mb_str(), (wxChar **) NULL, 10);

         M_FONTDATA->m_pointSize = (int)(num / 10);
     }
 
         M_FONTDATA->m_pointSize = (int)(num / 10);
     }
 


@@ -283,17 +288,17 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     tmp = tn.GetNextToken().MakeUpper();         // spacing
 
     if (tmp == wxT("M"))
     tmp = tn.GetNextToken().MakeUpper();         // spacing
 
     if (tmp == wxT("M"))

-        M_FONTDATA->m_family = wxMODERN;
+        M_FONTDATA->m_family = wxFONTFAMILY_MODERN;

     else if (M_FONTDATA->m_faceName == wxT("TIMES"))
     else if (M_FONTDATA->m_faceName == wxT("TIMES"))

-        M_FONTDATA->m_family = wxROMAN;
+        M_FONTDATA->m_family = wxFONTFAMILY_ROMAN;

     else if (M_FONTDATA->m_faceName == wxT("HELVETICA"))
     else if (M_FONTDATA->m_faceName == wxT("HELVETICA"))

-        M_FONTDATA->m_family = wxSWISS;
+        M_FONTDATA->m_family = wxFONTFAMILY_SWISS;

     else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER"))
     else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER"))

-        M_FONTDATA->m_family = wxTELETYPE;
+        M_FONTDATA->m_family = wxFONTFAMILY_TELETYPE;

     else if (M_FONTDATA->m_faceName == wxT("LUCIDA"))
     else if (M_FONTDATA->m_faceName == wxT("LUCIDA"))

-        M_FONTDATA->m_family = wxDECORATIVE;
+        M_FONTDATA->m_family = wxFONTFAMILY_DECORATIVE;

     else if (M_FONTDATA->m_faceName == wxT("UTOPIA"))
     else if (M_FONTDATA->m_faceName == wxT("UTOPIA"))

-        M_FONTDATA->m_family = wxSCRIPT;
+        M_FONTDATA->m_family = wxFONTFAMILY_SCRIPT;

 
     tn.GetNextToken();                           // avg width
 
 
     tn.GetNextToken();                           // avg width
 


@@ -304,7 +309,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
         wxString registry = tn.GetNextToken().MakeUpper(),
                  encoding = tn.GetNextToken().MakeUpper();
 
         wxString registry = tn.GetNextToken().MakeUpper(),
                  encoding = tn.GetNextToken().MakeUpper();
 

-        if ( registry == _T("ISO8859") )
+        if ( registry == wxT("ISO8859") )

         {
             int cp;
             if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
         {
             int cp;
             if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )


@@ -313,7 +318,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
                     (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
             }
         }
                     (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
             }
         }

-        else if ( registry == _T("MICROSOFT") )
+        else if ( registry == wxT("MICROSOFT") )

         {
             int cp;
             if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
         {
             int cp;
             if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )


@@ -322,21 +327,31 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
                     (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
             }
         }
                     (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
             }
         }

-        else if ( registry == _T("KOI8") )
+        else if ( registry == wxT("KOI8") )

         {
             M_FONTDATA->m_encoding = wxFONTENCODING_KOI8;
         }
         //else: unknown encoding - may be give a warning here?
         else
         {
             M_FONTDATA->m_encoding = wxFONTENCODING_KOI8;
         }
         //else: unknown encoding - may be give a warning here?
         else

-            return FALSE;
+            return false;

     }
     }

-    return TRUE;
+    return true;

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

+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+    return new wxFontRefData;
+}
+
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxFontRefData(*static_cast<const wxFontRefData *>(data));
+}
+

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


@@ -362,48 +377,40 @@ void wxFont::SetPointSize(int pointSize)
 
     M_FONTDATA->m_pointSize = pointSize;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_pointSize = pointSize;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 }
 

-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)

 {
     Unshare();
 
     M_FONTDATA->m_family = family;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 {
     Unshare();
 
     M_FONTDATA->m_family = family;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 }
 

-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)

 {
     Unshare();
 
     M_FONTDATA->m_style = style;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 {
     Unshare();
 
     M_FONTDATA->m_style = style;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 }
 

-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)

 {
     Unshare();
 
     M_FONTDATA->m_weight = weight;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 {
     Unshare();
 
     M_FONTDATA->m_weight = weight;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 }
 

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

 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 

-    RealizeResource();
+    return wxFontBase::SetFaceName(faceName);

 }
 
 void wxFont::SetUnderlined(bool underlined)
 }
 
 void wxFont::SetUnderlined(bool underlined)


@@ -411,8 +418,6 @@ void wxFont::SetUnderlined(bool underlined)
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;

-
-    RealizeResource();

 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)


@@ -421,8 +426,6 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
 
     M_FONTDATA->m_encoding = encoding;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_encoding = encoding;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 }
 
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)


@@ -438,58 +441,56 @@ void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 
 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;
 }
 
 wxString wxFont::GetFaceName() const
 {
 
     return M_FONTDATA->m_pointSize;
 }
 
 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_faceName ;
 }
 

-int wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const

 {
 {

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

     return M_FONTDATA->m_family;
 }
 
     return M_FONTDATA->m_family;
 }
 

-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_style;
 }
 

-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;
 }
 
 bool wxFont::GetUnderlined() const
 {
 
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {

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

 
     return M_FONTDATA->m_underlined;
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {
 
     return M_FONTDATA->m_underlined;
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {

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

 
     return M_FONTDATA->m_encoding;
 }
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 
     return M_FONTDATA->m_encoding;
 }
 
 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.GetXFontName().IsEmpty())
+    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().empty())

         GetInternalFont();
 
     return &(M_FONTDATA->m_nativeFontInfo);
         GetInternalFont();
 
     return &(M_FONTDATA->m_nativeFontInfo);


@@ -504,8 +505,8 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 // font to list in the private data for future reference.
 wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
 {
 // font to list in the private data for future reference.
 wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
 {

-    if ( !Ok() )
-        return (wxXFont *)NULL;
+    if ( !IsOk() )
+        return NULL;

 
     long intScale = long(scale * 100.0 + 0.5); // key for wxXFont
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
     long intScale = long(scale * 100.0 + 0.5); // key for wxXFont
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;


@@ -521,6 +522,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     }
 
     // not found, create a new one
     }
 
     // not found, create a new one

+    wxString xFontSpec;

     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,
                                                M_FONTDATA->m_family,
     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,
                                                M_FONTDATA->m_family,


@@ -528,29 +530,38 @@ 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,
+                                               &xFontSpec);

 
     if ( !font )
     {
         wxFAIL_MSG( wxT("Could not allocate even a default font -- something is wrong.") );
 
 
     if ( !font )
     {
         wxFAIL_MSG( wxT("Could not allocate even a default font -- something is wrong.") );
 

-        return (wxXFont*) NULL;
+        return NULL;

     }
 
     wxXFont* f = new wxXFont;
     }
 
     wxXFont* f = new wxXFont;

+#if wxMOTIF_NEW_FONT_HANDLING
+    XFreeFont( (Display*) display, font );
+#else

     f->m_fontStruct = (WXFontStructPtr)font;
     f->m_fontStruct = (WXFontStructPtr)font;

+#endif

     f->m_display = ( display ? display : wxGetDisplay() );
     f->m_scale = intScale;
     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);

 
 

-#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+#if wxMOTIF_USE_RENDER_TABLE

     XmRendition rendition;
     XmRenderTable renderTable;
     Arg args[5];
     int count = 0;
 
     XmRendition rendition;
     XmRenderTable renderTable;
     Arg args[5];
     int count = 0;
 

+#if wxMOTIF_NEW_FONT_HANDLING
+    char* fontSpec = wxStrdup(xFontSpec.mb_str());
+    XtSetArg( args[count], XmNfontName, fontSpec ); ++count;
+    XtSetArg( args[count], XmNfontType, XmFONT_IS_FONTSET ); ++count;
+#else

     XtSetArg( args[count], XmNfont, font ); ++count;
     XtSetArg( args[count], XmNfont, font ); ++count;

+#endif

     XtSetArg( args[count], XmNunderlineType,
               GetUnderlined() ? XmSINGLE_LINE : XmNO_LINE ); ++count;
     rendition = XmRenditionCreate( XmGetXmDisplay( (Display*)f->m_display ),
     XtSetArg( args[count], XmNunderlineType,
               GetUnderlined() ? XmSINGLE_LINE : XmNO_LINE ); ++count;
     rendition = XmRenditionCreate( XmGetXmDisplay( (Display*)f->m_display ),


@@ -560,11 +571,20 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
                                               XmMERGE_REPLACE );
 
     f->m_renderTable = (WXRenderTable)renderTable;
                                               XmMERGE_REPLACE );
 
     f->m_renderTable = (WXRenderTable)renderTable;

+    f->m_rendition = (WXRendition)rendition;
+    wxASSERT( f->m_renderTable != NULL );
+#else // if !wxMOTIF_USE_RENDER_TABLE
+    f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
+    wxASSERT( f->m_fontList != NULL );

 #endif
 
 #endif
 

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

     return f;
 }
 
     return f;
 }
 

+#if !wxMOTIF_NEW_FONT_HANDLING
+

 WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(scale, display);
 WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(scale, display);


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

+#endif
+
+#if !wxMOTIF_USE_RENDER_TABLE
+

 WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(scale, display);
 WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(scale, display);


@@ -579,31 +603,100 @@ WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
     return (f ? f->m_fontList : (WXFontList) 0);
 }
 
     return (f ? f->m_fontList : (WXFontList) 0);
 }
 

-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#else // if wxMOTIF_USE_RENDER_TABLE

 
 WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(1.0, display);
 
 
 WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(1.0, display);
 

-    return (f ? f->m_renderTable : (WXFontList) 0);
+    return (f ? f->m_renderTable : (WXRenderTable) 0);

 }
 
 }
 

-#endif
+#endif // wxMOTIF_USE_RENDER_TABLE

 
 WXFontType wxFont::GetFontType(WXDisplay* display) const
 {
 
 WXFontType wxFont::GetFontType(WXDisplay* display) const
 {

-#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
-    return Ok() ? GetRenderTable(display) : NULL;
+#if wxMOTIF_USE_RENDER_TABLE
+    return IsOk() ? GetRenderTable(display) : NULL;
+#else
+    return IsOk() ? GetFontList(1.0, display) : NULL;
+#endif
+}
+
+WXFontType wxFont::GetFontTypeC(WXDisplay* display) const
+{
+#if wxMOTIF_USE_RENDER_TABLE
+    return IsOk() ? GetRenderTable(display) : NULL;

 #else
 #else

-    return Ok() ? GetFontList(1.0, display) : NULL;
+    return IsOk() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL;

 #endif
 }
 
 /*static*/ WXString wxFont::GetFontTag()
 {
 #endif
 }
 
 /*static*/ WXString wxFont::GetFontTag()
 {

-#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+#if wxMOTIF_USE_RENDER_TABLE

     return (WXString)XmNrenderTable;
 #else
     return (WXString)XmNfontList;
 #endif
 }
     return (WXString)XmNrenderTable;
 #else
     return (WXString)XmNfontList;
 #endif
 }

+
+#if wxMOTIF_USE_RENDER_TABLE
+
+WXFontSet wxFont::GetFontSet(double scale, WXDisplay* display) const
+{
+    wxXFont* f = GetInternalFont(scale, display);
+
+    if( !f ) return (WXFontSet) 0;
+
+    Arg args[2];
+    int count = 0;
+
+    XtSetArg( args[count], XmNfont, 0 ); ++count;
+    XmRenditionRetrieve( (XmRendition) f->m_rendition, args, count );
+
+    return (WXFontSet) args[0].value;
+}
+
+void wxGetTextExtent(WXDisplay* display, const wxFont& font, double scale,
+                     const wxString& str,
+                     int* width, int* height, int* ascent, int* descent)
+{
+    XRectangle ink, logical;
+    WXFontSet fset = font.GetFontSet(scale, display);
+
+    XmbTextExtents( (XFontSet)fset, str.mb_str(), str.length(), &ink, &logical);
+
+    if( width ) *width = logical.width;
+    if( height ) *height = logical.height;
+    if( ascent ) *ascent = -logical.y;
+    if( descent ) *descent = logical.height + logical.y;
+}
+
+#else // if !wxMOTIF_USE_RENDER_TABLE
+
+void wxGetTextExtent(WXDisplay* display, const wxFont& font,
+                     double scale, const wxString& str,
+                     int* width, int* height, int* ascent, int* descent)
+{
+    WXFontStructPtr pFontStruct = font.GetFontStruct(scale, display);
+
+    int direction, ascent2, descent2;
+    XCharStruct overall;
+    int slen = str.length();
+
+    XTextExtents((XFontStruct*) pFontStruct,
+                 const_cast<char*>((const char *)str.mb_str()), slen,
+                 &direction, &ascent2, &descent2, &overall);
+
+    if ( width )
+        *width = (overall.width);
+    if ( height )
+        *height = (ascent2 + descent2);
+    if ( descent )
+        *descent = descent2;
+    if ( ascent )
+        *ascent = ascent2;
+}
+
+#endif // !wxMOTIF_USE_RENDER_TABLE