Distrib things

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index c03570a342460e2bdfe6bec716bc75ad4f561420..4b46312660b357f9fc2896a6fdc79ce5a77ba3d0 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -35,14 +35,14 @@ wxXFont::wxXFont()
 
 wxXFont::~wxXFont()
 {
 
 wxXFont::~wxXFont()
 {

-    XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;

     XmFontList fontList = (XmFontList) m_fontList;
 
     XmFontListFree (fontList);
 
     XmFontList fontList = (XmFontList) m_fontList;
 
     XmFontListFree (fontList);
 

-       // TODO: why does freeing the font produce a segv???
+    // TODO: why does freeing the font produce a segv???

     // Note that XFreeFont wasn't called in wxWin 1.68 either.
     // Note that XFreeFont wasn't called in wxWin 1.68 either.

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

 }
 
 wxFontRefData::wxFontRefData()
 }
 
 wxFontRefData::wxFontRefData()


@@ -127,17 +127,17 @@ bool wxFont::RealizeResource()
 
 void wxFont::Unshare()
 {
 
 void wxFont::Unshare()
 {

-       // Don't change shared data
-       if (!m_refData)
+    // Don't change shared data
+    if (!m_refData)

     {
     {

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

     else
     {
     else
     {

-               wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-               UnRef();
-               m_refData = ref;
-       }
+        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }

 }
 
 void wxFont::SetPointSize(int pointSize)
 }
 
 void wxFont::SetPointSize(int pointSize)


@@ -196,32 +196,32 @@ void wxFont::SetUnderlined(bool underlined)
 
 wxString wxFont::GetFamilyString() const
 {
 
 wxString wxFont::GetFamilyString() const
 {

-  wxString fam("");
-  switch (GetFamily())
-  {
+    wxString fam("");
+    switch (GetFamily())
+    {

     case wxDECORATIVE:
     case wxDECORATIVE:

-      fam = "wxDECORATIVE";
-      break;
+        fam = "wxDECORATIVE";
+        break;

     case wxROMAN:
     case wxROMAN:

-      fam = "wxROMAN";
-      break;
+        fam = "wxROMAN";
+        break;

     case wxSCRIPT:
     case wxSCRIPT:

-      fam = "wxSCRIPT";
-      break;
+        fam = "wxSCRIPT";
+        break;

     case wxSWISS:
     case wxSWISS:

-      fam = "wxSWISS";
-      break;
+        fam = "wxSWISS";
+        break;

     case wxMODERN:
     case wxMODERN:

-      fam = "wxMODERN";
-      break;
+        fam = "wxMODERN";
+        break;

     case wxTELETYPE:
     case wxTELETYPE:

-      fam = "wxTELETYPE";
-      break;
+        fam = "wxTELETYPE";
+        break;

     default:
     default:

-      fam = "wxDEFAULT";
-      break;
-  }
-  return fam;
+        fam = "wxDEFAULT";
+        break;
+    }
+    return fam;

 }
 
 /* New font system */
 }
 
 /* New font system */


@@ -229,7 +229,7 @@ wxString wxFont::GetFaceName() const
 {
     wxString str("");
     if (M_FONTDATA)
 {
     wxString str("");
     if (M_FONTDATA)

-           str = M_FONTDATA->m_faceName ;
+        str = M_FONTDATA->m_faceName ;

     return str;
 }
 
     return str;
 }
 


@@ -238,15 +238,15 @@ wxString wxFont::GetStyleString() const
     wxString styl("");
     switch (GetStyle())
     {
     wxString styl("");
     switch (GetStyle())
     {

-        case wxITALIC:
-            styl = "wxITALIC";
-            break;
-        case wxSLANT:
-            styl = "wxSLANT";
-            break;
-        default:
-            styl = "wxNORMAL";
-            break;
+    case wxITALIC:
+        styl = "wxITALIC";
+        break;
+    case wxSLANT:
+        styl = "wxSLANT";
+        break;
+    default:
+        styl = "wxNORMAL";
+        break;

     }
     return styl;
 }
     }
     return styl;
 }


@@ -256,15 +256,15 @@ wxString wxFont::GetWeightString() const
     wxString w("");
     switch (GetWeight())
     {
     wxString w("");
     switch (GetWeight())
     {

-        case wxBOLD:
-            w = "wxBOLD";
-            break;
-        case wxLIGHT:
-            w = "wxLIGHT";
-            break;
-        default:
-            w = "wxNORMAL";
-            break;
+    case wxBOLD:
+        w = "wxBOLD";
+        break;
+    case wxLIGHT:
+        w = "wxLIGHT";
+        break;
+    default:
+        w = "wxNORMAL";
+        break;

     }
     return w;
 }
     }
     return w;
 }


@@ -274,103 +274,103 @@ wxString wxFont::GetWeightString() 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 (!Ok())
+        return (wxXFont*) 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;

 
 

-  wxNode* node = M_FONTDATA->m_fonts.First();
-  while (node)
-  {
-    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,
-    M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
-
-  if (!font)
-  {
-       // search up and down by stepsize 10
-       int max_size = pointSize + 20 * (1 + (pointSize/180));
-       int min_size = pointSize - 20 * (1 + (pointSize/180));
-       int i;
-
-       // Search for smaller size (approx.)
-       for (i=pointSize-10; !font && i >= 10 && i >= min_size; i -= 10)
-           font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
-       // Search for larger size (approx.)
-       for (i=pointSize+10; !font && i <= max_size; i += 10)
-           font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
-       // Try default family
-       if (!font && M_FONTDATA->m_family != wxDEFAULT)
-           font = LoadQueryFont(pointSize, wxDEFAULT, M_FONTDATA->m_style, 
-                                  M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
-       // Bogus font
-       if (!font)
-           font = LoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
-                                   M_FONTDATA->m_underlined);
+    wxNode* node = M_FONTDATA->m_fonts.First();
+    while (node)
+    {
+        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,
+        M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
+
+    if (!font)
+    {
+        // search up and down by stepsize 10
+        int max_size = pointSize + 20 * (1 + (pointSize/180));
+        int min_size = pointSize - 20 * (1 + (pointSize/180));
+        int i;
+
+        // Search for smaller size (approx.)
+        for (i=pointSize-10; !font && i >= 10 && i >= min_size; i -= 10)
+            font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
+        // Search for larger size (approx.)
+        for (i=pointSize+10; !font && i <= max_size; i += 10)
+            font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
+        // Try default family
+        if (!font && M_FONTDATA->m_family != wxDEFAULT)
+            font = LoadQueryFont(pointSize, wxDEFAULT, M_FONTDATA->m_style,
+            M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
+        // Bogus font
+        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." );
         wxASSERT_MSG( (font != (XFontStruct*) NULL), "Could not allocate even a default font -- something is wrong." );

-  }
-  if (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 (wxXFont*) NULL;
+    }
+    if (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 (wxXFont*) NULL;

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

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

 {
     char *xfamily;
     char *xstyle;
     char *xweight;
     switch (family)
     {
 {
     char *xfamily;
     char *xstyle;
     char *xweight;
     switch (family)
     {

-      case wxDECORATIVE: xfamily = "lucida";
-                         break;
-      case wxROMAN:      xfamily = "times";
-                         break;
-      case wxMODERN:     xfamily = "courier";
-                         break;
-      case wxSWISS:      xfamily = "lucida";
-                         break;
-      case wxDEFAULT:
-        default:           xfamily = "*";
+    case wxDECORATIVE: xfamily = "lucida";
+        break;
+    case wxROMAN:      xfamily = "times";
+        break;
+    case wxMODERN:     xfamily = "courier";
+        break;
+    case wxSWISS:      xfamily = "lucida";
+        break;
+    case wxDEFAULT:
+    default:           xfamily = "*";

     }
     switch (style)
     {
     }
     switch (style)
     {

-      case wxITALIC:     xstyle = "i";
-                         break;
-      case wxSLANT:      xstyle = "o";
-                         break;
-      case wxNORMAL:     xstyle = "r";
-                         break;
-      default:           xstyle = "*";
-                         break;
+    case wxITALIC:     xstyle = "i";
+        break;
+    case wxSLANT:      xstyle = "o";
+        break;
+    case wxNORMAL:     xstyle = "r";
+        break;
+    default:           xstyle = "*";
+        break;

     }
     switch (weight)
     {
     }
     switch (weight)
     {

-      case wxBOLD:       xweight = "bold";
-                         break;
-      case wxLIGHT:
-      case wxNORMAL:     xweight = "medium";
-                         break;
-      default:           xweight = "*";
-                         break;
+    case wxBOLD:       xweight = "bold";
+        break;
+    case wxLIGHT:
+    case wxNORMAL:     xweight = "medium";
+        break;
+    default:           xweight = "*";
+        break;

     }
 
     sprintf(wxBuffer, "-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*",
     }
 
     sprintf(wxBuffer, "-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*",

-            xfamily, xweight, xstyle, pointSize);
+        xfamily, xweight, xstyle, pointSize);

 
     Display *dpy = (Display*) wxGetDisplay();
     XFontStruct* font = XLoadQueryFont(dpy, wxBuffer);
 
     Display *dpy = (Display*) wxGetDisplay();
     XFontStruct* font = XLoadQueryFont(dpy, wxBuffer);