compilation fix

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 0af197f78da852a5a5de65f5c2c61bb6e7eaf016..4e7186a805602aa932f4c2b874c2ff39996cc32a 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -21,6 +21,8 @@
     #pragma implementation "font.h"
 #endif
 
     #pragma implementation "font.h"
 #endif
 

+#include "wx/defs.h"
+

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


@@ -30,7 +32,6 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-#include "wx/defs.h"

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


@@ -38,6 +39,7 @@
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/settings.h"

+#include "wx/motif/private.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 


@@ -55,6 +57,9 @@ public:
 
     WXFontStructPtr     m_fontStruct;   // XFontStruct
     WXFontList          m_fontList;     // Motif XmFontList
 
     WXFontStructPtr     m_fontStruct;   // XFontStruct
     WXFontList          m_fontList;     // Motif XmFontList

+#if wxCHECK_MOTIF_VERSION( 2, 0 )
+    WXRenderTable       m_renderTable;  // Motif XmRenderTable
+#endif

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


@@ -103,7 +108,7 @@ protected:
     wxFontEncoding m_encoding;
 
     wxNativeFontInfo m_nativeFontInfo;
     wxFontEncoding m_encoding;
 
     wxNativeFontInfo m_nativeFontInfo;

-    
+

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


@@ -120,6 +125,9 @@ wxXFont::wxXFont()
 {
     m_fontStruct = (WXFontStructPtr) 0;
     m_fontList = (WXFontList) 0;
 {
     m_fontStruct = (WXFontStructPtr) 0;
     m_fontList = (WXFontList) 0;

+#if wxCHECK_MOTIF_VERSION( 2, 0 )
+    m_renderTable = (WXRenderTable) 0;
+#endif

     m_display = (WXDisplay*) 0;
     m_scale = 100;
 }
     m_display = (WXDisplay*) 0;
     m_scale = 100;
 }


@@ -127,9 +135,13 @@ wxXFont::wxXFont()
 wxXFont::~wxXFont()
 {
     XmFontList fontList = (XmFontList) m_fontList;
 wxXFont::~wxXFont()
 {
     XmFontList fontList = (XmFontList) m_fontList;

-

     XmFontListFree (fontList);
 
     XmFontListFree (fontList);
 

+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+    XmRenderTable renderTable = (XmRenderTable) m_renderTable;
+    XmRenderTableFree (renderTable);
+#endif
+

     // 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;
     // 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;


@@ -176,12 +188,12 @@ void wxFontRefData::Init(int pointSize,
 
 wxFontRefData::~wxFontRefData()
 {
 
 wxFontRefData::~wxFontRefData()
 {

-    wxNode* node = m_fonts.First();
+    wxList::Node* 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();
 }


@@ -318,7 +330,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
         else
             return FALSE;
     }
         else
             return FALSE;
     }

-    return TRUE;    
+    return TRUE;

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


@@ -350,7 +362,7 @@ 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();
 }
 
     RealizeResource();
 }
 


@@ -360,7 +372,7 @@ void wxFont::SetFamily(int family)
 
     M_FONTDATA->m_family = family;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_family = family;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -370,7 +382,7 @@ void wxFont::SetStyle(int style)
 
     M_FONTDATA->m_style = style;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_style = style;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -380,7 +392,7 @@ void wxFont::SetWeight(int weight)
 
     M_FONTDATA->m_weight = weight;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_weight = weight;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -390,7 +402,7 @@ void wxFont::SetFaceName(const wxString& faceName)
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -399,7 +411,7 @@ void wxFont::SetUnderlined(bool underlined)
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -409,11 +421,11 @@ 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();
 }
 
     RealizeResource();
 }
 

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

 {
     Unshare();
 
 {
     Unshare();
 


@@ -427,7 +439,7 @@ void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
 int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

-    
+

     return M_FONTDATA->m_pointSize;
 }
 
     return M_FONTDATA->m_pointSize;
 }
 


@@ -499,13 +511,13 @@ 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::Node* 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();

     }
 
     // not found, create a new one
     }
 
     // not found, create a new one


@@ -532,6 +544,24 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
     M_FONTDATA->m_fonts.Append(f);
 
     f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
     M_FONTDATA->m_fonts.Append(f);
 

+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+    XmRendition rendition;
+    XmRenderTable renderTable;
+    Arg args[5];
+    int count = 0;
+
+    XtSetArg( args[count], XmNfont, font ); ++count;
+    XtSetArg( args[count], XmNunderlineType,
+              GetUnderlined() ? XmSINGLE_LINE : XmNO_LINE ); ++count;
+    rendition = XmRenditionCreate( XmGetXmDisplay( (Display*)f->m_display ),
+                                   (XmStringTag)"",
+                                   args, count );
+    renderTable = XmRenderTableAddRenditions( NULL, &rendition, 1,
+                                              XmMERGE_REPLACE );
+
+    f->m_renderTable = (WXRenderTable)renderTable;
+#endif
+

     return f;
 }
 
     return f;
 }
 


@@ -549,3 +579,31 @@ 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 )
+
+WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
+{
+    wxXFont* f = GetInternalFont(1.0, display);
+
+    return (f ? f->m_renderTable : (WXFontList) 0);
+}
+
+#endif
+
+WXFontType wxFont::GetFontType(WXDisplay* display) const
+{
+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+    return Ok() ? GetRenderTable(display) : NULL;
+#else
+    return Ok() ? GetFontList(1.0, display) : NULL;
+#endif
+}
+
+/*static*/ WXString wxFont::GetFontTag()
+{
+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+    return (WXString)XmNrenderTable;
+#else
+    return (WXString)XmNfontList;
+#endif
+}