Move wxControl::GetCompositeControlsDefaultAttributes() from MSW to common.

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index a72dfdf81e8eb56e0cfb5d2da8a775e403a6bce0..90a63d4a7c2a3e820fc59cedc0baa084a8a801a7 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -20,16 +20,19 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_FONTENUM
+
+#include "wx/fontenum.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

+    #include "wx/string.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/string.h"

 #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"
 


@@ -46,7 +49,9 @@
 extern GtkWidget *wxGetRootWindow();
 #endif // __WXGTK20__
 
 extern GtkWidget *wxGetRootWindow();
 #endif // __WXGTK20__
 

-extern "C" int wxCMPFUNC_CONV
+extern "C"
+{
+static int wxCMPFUNC_CONV

 wxCompareFamilies (const void *a, const void *b)
 {
   const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
 wxCompareFamilies (const void *a, const void *b)
 {
   const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);


@@ -54,63 +59,52 @@ wxCompareFamilies (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 // __WXGTK20__ || !HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+    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 *), wxCompareFamilies);
+        &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


@@ -354,3 +348,5 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 }
 
 #endif // !wxUSE_PANGO
 }
 
 #endif // !wxUSE_PANGO

+
+#endif // wxUSE_FONTENUM