mac cleanup, pure cgcolor

[wxWidgets.git] / src / unix / fontenum.cpp

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index a577af0357d99ff37e08bcb26207a97ee49415df..b7a026e5b6ce71837f808a776574808586fa1b92 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -17,20 +17,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "fontenum.h"
-#endif
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dynarray.h"
-#include "wx/string.h"
+#if wxUSE_FONTENUM
+
+#include "wx/fontenum.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+#endif
+

 #include "wx/regex.h"
 #include "wx/regex.h"

-#include "wx/utils.h"
-#include "wx/app.h"

 #include "wx/fontmap.h"
 #include "wx/fontmap.h"

-#include "wx/fontenum.h"

 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 


@@ -45,10 +47,10 @@
 #ifdef __WXGTK20__
 #include "gtk/gtk.h"
 extern GtkWidget *wxGetRootWindow();
 #ifdef __WXGTK20__
 #include "gtk/gtk.h"
 extern GtkWidget *wxGetRootWindow();

-#endif
+#endif // __WXGTK20__

 
 

-static int
-cmp_families (const void *a, const void *b)
+extern "C" int wxCMPFUNC_CONV
+wxCompareFamilies (const void *a, const void *b)

 {
   const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
   const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b);
 {
   const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
   const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b);


@@ -56,62 +58,50 @@ cmp_families (const void *a, const void *b)
   return g_utf8_collate (a_name, b_name);
 }
 
   return g_utf8_collate (a_name, b_name);
 }
 

-// I admit I don't yet understand encodings with Pango

 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {

-#if defined(__WXGTK20__) || !defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
-    if ( fixedWidthOnly
-#if defined(__WXGTK24__)
-        && (gtk_check_version(2,4,0) != NULL)
-#endif
-       )
-{
-        OnFacename( wxT("monospace") );
-    }
-    else
-#endif
+    if ( encoding != wxFONTENCODING_SYSTEM && encoding != wxFONTENCODING_UTF8 )

     {
     {

-        PangoFontFamily **families = NULL;
-        gint n_families = 0;
-        pango_context_list_families ( 
+        // Pango supports only UTF-8 encoding (and system means any, so we
+        // accept it too)
+        return false;
+    }
+
+    PangoFontFamily **families = NULL;
+    gint n_families = 0;
+    pango_context_list_families (

 #ifdef __WXGTK20__
 #ifdef __WXGTK20__

-            gtk_widget_get_pango_context( wxGetRootWindow() ),
+        gtk_widget_get_pango_context( wxGetRootWindow() ),

 #else
 #else

-            wxTheApp->GetPangoContext(),
+        wxTheApp->GetPangoContext(),

 #endif
 #endif

-            &families, &n_families );
-        qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families);
+        &families, &n_families );
+    qsort (families, n_families, sizeof (PangoFontFamily *), wxCompareFamilies);

 
 

-        for (int i=0; i<n_families; i++)
-        {
-#if defined(__WXGTK24__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
-            if (!fixedWidthOnly || (
-#ifdef __WXGTK24__
-                !gtk_check_version(2,4,0) &&
-#endif
-                pango_font_family_is_monospace(families[i])
-                                   ) )
+    for ( int i = 0; i < n_families; i++ )
+    {
+#if defined(__WXGTK20__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
+        if ( !fixedWidthOnly ||
+            pango_font_family_is_monospace(families[i]) )

 #endif
 #endif

-            {
-                const gchar *name = pango_font_family_get_name(families[i]);
-                OnFacename(wxString(name, wxConvUTF8));
-            }
+        {
+            const gchar *name = pango_font_family_get_name(families[i]);
+            OnFacename(wxString(name, wxConvUTF8));

         }
         }

-        g_free(families);

     }
     }

+    g_free(families);

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
+bool wxFontEnumerator::EnumerateEncodings(const wxString& facename)

 {
 {

-    return FALSE;
+    return EnumerateEncodingsUTF8(facename);

 }
 
 
 }
 
 

-#else
-  // Pango
+#else // !wxUSE_PANGO

 
 #ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
                // The resulting warnings are switched off here
 
 #ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
                // The resulting warnings are switched off here


@@ -198,6 +188,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
             continue;
         }
 
             continue;
         }
 

+        // coverity[returned_null]

         char *dash = strchr(font + 1, '-');
         char *family = dash + 1;
         dash = strchr(family, '-');
         char *dash = strchr(font + 1, '-');
         char *family = dash + 1;
         dash = strchr(family, '-');


@@ -209,7 +200,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
             if ( !This->OnFacename(fam) )
             {
                 // stop enumerating
             if ( !This->OnFacename(fam) )
             {
                 // stop enumerating

-                return FALSE;
+                return false;

             }
 
             families.Add(fam);
             }
 
             families.Add(fam);


@@ -217,7 +208,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
         //else: already seen
     }
 
         //else: already seen
     }
 

-    return TRUE;
+    return true;

 }
 #endif
   // wxUSE_NANOX
 }
 #endif
   // wxUSE_NANOX


@@ -230,14 +221,14 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
 #if wxUSE_NANOX
                                           bool fixedWidthOnly)
 {
 #if wxUSE_NANOX

-    return FALSE;
+    return false;

 #else
     int nFonts;
     char **fonts;
 
     if ( fixedWidthOnly )
     {
 #else
     int nFonts;
     char **fonts;
 
     if ( fixedWidthOnly )
     {

-        bool cont = TRUE;
+        bool cont = true;

         fonts = CreateFontList(wxT('m'), encoding, &nFonts);
         if ( fonts )
         {
         fonts = CreateFontList(wxT('m'), encoding, &nFonts);
         if ( fonts )
         {


@@ -248,13 +239,13 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
         if ( !cont )
         {
 
         if ( !cont )
         {

-            return TRUE;
+            return true;

         }
 
         fonts = CreateFontList(wxT('c'), encoding, &nFonts);
         if ( !fonts )
         {
         }
 
         fonts = CreateFontList(wxT('c'), encoding, &nFonts);
         if ( !fonts )
         {

-            return TRUE;
+            return true;

         }
     }
     else
         }
     }
     else


@@ -268,14 +259,14 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
             wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM,
                          wxT("No fonts at all on this system?"));
 
             wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM,
                          wxT("No fonts at all on this system?"));
 

-            return FALSE;
+            return false;

         }
     }
 
     (void)ProcessFamiliesFromFontList(this, fonts, nFonts);
 
     XFreeFontNames(fonts);
         }
     }
 
     (void)ProcessFamiliesFromFontList(this, fonts, nFonts);
 
     XFreeFontNames(fonts);

-    return TRUE;
+    return true;

 #endif
     // wxUSE_NANOX
 }
 #endif
     // wxUSE_NANOX
 }


@@ -283,11 +274,11 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
 #if wxUSE_NANOX
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
 #if wxUSE_NANOX

-    return FALSE;
+    return false;

 #else
     wxString pattern;
     pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
 #else
     wxString pattern;
     pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),

-                   family.IsEmpty() ? wxT("*") : family.c_str());
+                   family.empty() ? wxT("*") : family.c_str());

 
     // get the list of all fonts
     int nFonts;
 
     // get the list of all fonts
     int nFonts;


@@ -297,7 +288,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     if ( !fonts )
     {
         // unknown family?
     if ( !fonts )
     {
         // unknown family?

-        return FALSE;
+        return false;

     }
 
     // extract the list of (unique) encodings
     }
 
     // extract the list of (unique) encodings


@@ -317,7 +308,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
         dash = strchr(familyFont, '-');
         *dash = '\0'; // !NULL because Matches() above succeeded
 
         dash = strchr(familyFont, '-');
         *dash = '\0'; // !NULL because Matches() above succeeded
 

-        if ( !family.IsEmpty() && (family != familyFont) )
+        if ( !family.empty() && (family != familyFont) )

         {
             // family doesn't match
             continue;
         {
             // family doesn't match
             continue;


@@ -348,10 +339,11 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
     XFreeFontNames(fonts);
 
 
     XFreeFontNames(fonts);
 

-    return TRUE;
+    return true;

 #endif
     // wxUSE_NANOX
 }
 
 #endif
     // wxUSE_NANOX
 }
 

-#endif
-   // __WXGTK20__
+#endif // !wxUSE_PANGO
+
+#endif // wxUSE_FONTENUM