Put some life into GTK 2.0 drawing.

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

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 0af197f78da852a5a5de65f5c2c61bb6e7eaf016..6f6db81d0cc4fa42d4bec15dab9aed602bb2405d 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:


@@ -25,7 +25,7 @@
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
 #endif
 #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


@@ -38,6 +38,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/x11/private.h"

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


@@ -54,7 +55,6 @@ public:
     ~wxXFont();
 
     WXFontStructPtr     m_fontStruct;   // XFontStruct
     ~wxXFont();
 
     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
 };


@@ -119,17 +119,12 @@ protected:
 wxXFont::wxXFont()
 {
     m_fontStruct = (WXFontStructPtr) 0;
 wxXFont::wxXFont()
 {
     m_fontStruct = (WXFontStructPtr) 0;

-    m_fontList = (WXFontList) 0;

     m_display = (WXDisplay*) 0;
     m_scale = 100;
 }
 
 wxXFont::~wxXFont()
 {
     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;
     // 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;


@@ -529,7 +524,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 +536,3 @@ 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);
-}
-