Dialog unit mods; wxProp tidying

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index feeb310e0bacf7a884d9eedd459050fa63642d76..c03570a342460e2bdfe6bec716bc75ad4f561420 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -19,13 +19,33 @@
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 

-#include <X11/Xlib.h>
+#include <Xm/Xm.h>

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
 
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
 

-wxFontRefData::wxFontRefData(): m_fontsByScale(wxKEY_INTEGER)
+wxXFont::wxXFont()
+{
+    m_fontStruct = (WXFontStructPtr) 0;
+    m_fontList = (WXFontList) 0;
+    m_display = (WXDisplay*) 0;
+    m_scale = 100;
+}
+
+wxXFont::~wxXFont()
+{
+    XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
+    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.
+       //        XFreeFont((Display*) m_display, fontStruct);
+}
+
+wxFontRefData::wxFontRefData()

 {
     m_style = 0;
     m_pointSize = 0;
 {
     m_style = 0;
     m_pointSize = 0;


@@ -36,7 +56,7 @@ wxFontRefData::wxFontRefData(): m_fontsByScale(wxKEY_INTEGER)
     m_faceName = "";
 }
 
     m_faceName = "";
 }
 

-wxFontRefData::wxFontRefData(const wxFontRefData& data): m_fontsByScale(wxKEY_INTEGER)
+wxFontRefData::wxFontRefData(const wxFontRefData& data)

 {
     m_style = data.m_style;
     m_pointSize = data.m_pointSize;
 {
     m_style = data.m_style;
     m_pointSize = data.m_pointSize;


@@ -52,14 +72,14 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data): m_fontsByScale(wxKEY_IN
 
 wxFontRefData::~wxFontRefData()
 {
 
 wxFontRefData::~wxFontRefData()
 {

-    wxNode* node = m_fontsByScale.First();
+    wxNode* node = m_fonts.First();

     while (node)
     {
     while (node)
     {

-        XFontStruct* fontStruct = (XFontStruct*) node->Data();
-        XFreeFont((Display*) wxGetDisplay, fontStruct);
+        wxXFont* f = (wxXFont*) node->Data();
+        delete f;

         node = node->Next();
     }
         node = node->Next();
     }

-    m_fontsByScale.Clear();
+    m_fonts.Clear();

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


@@ -252,18 +272,21 @@ wxString wxFont::GetWeightString() const
 // Find an existing, or create a new, XFontStruct
 // based on this wxFont and the given scale. Append the
 // font to list in the private data for future reference.
 // Find an existing, or create a new, XFontStruct
 // based on this wxFont and the given scale. Append the
 // font to list in the private data for future reference.

-WXFontStructPtr wxFont::FindOrCreateFontStruct(double scale)
+wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const

 {
   if (!Ok())
 {
   if (!Ok())

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

 
 

-  long intScale = long(scale * 100.0 + 0.5); // key for fontlist
+  long intScale = long(scale * 100.0 + 0.5); // key for wxXFont

   int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
   int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 

-  wxNode* node = M_FONTDATA->m_fontsByScale.Find(intScale);
-  if (node)
+  wxNode* node = M_FONTDATA->m_fonts.First();
+  while (node)

   {
   {

-    return (WXFontStructPtr) node->Data();
+    wxXFont* f = (wxXFont*) node->Data();
+    if ((!display || (f->m_display == display)) && (f->m_scale == intScale))
+        return f;
+    node = node->Next();

   }
 
   WXFontStructPtr font = LoadQueryFont(pointSize, M_FONTDATA->m_family,
   }
 
   WXFontStructPtr font = LoadQueryFont(pointSize, M_FONTDATA->m_family,


@@ -290,17 +313,23 @@ WXFontStructPtr wxFont::FindOrCreateFontStruct(double scale)
        if (!font)
            font = LoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
                                    M_FONTDATA->m_underlined);
        if (!font)
            font = LoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
                                    M_FONTDATA->m_underlined);

+        wxASSERT_MSG( (font != (XFontStruct*) NULL), "Could not allocate even a default font -- something is wrong." );

   }
   if (font)
   {
   }
   if (font)
   {

-      M_FONTDATA->m_fontsByScale.Append(intScale, (wxObject*) font);
-      return (WXFontStructPtr) font;
+      wxXFont* f = new wxXFont;
+      f->m_fontStruct = 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;

   }
   }

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

 }
 
 WXFontStructPtr wxFont::LoadQueryFont(int pointSize, int family, int style,
 }
 
 WXFontStructPtr wxFont::LoadQueryFont(int pointSize, int family, int style,

-   int weight, bool underlined)
+   int weight, bool underlined) const

 {
     char *xfamily;
     char *xstyle;
 {
     char *xfamily;
     char *xstyle;