]> git.saurik.com Git - wxWidgets.git/blobdiff - src/unix/fontutil.cpp
don't expect errno to be set to EOVERFLOW if vsnprintf() fails
[wxWidgets.git] / src / unix / fontutil.cpp
index ddbf06d0cf9388b7150b699bc0dae623229ae8ec..84c7abec5d6f4c55661bcca7af629ba7714f0ce7 100644 (file)
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        unix/fontutil.cpp
+// Name:        src/unix/fontutil.cpp
 // Purpose:     Font helper functions for X11 (GDK/X)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     Font helper functions for X11 (GDK/X)
 // Author:      Vadim Zeitlin
 // Modified by:
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "fontutil.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"
 
@@ -29,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/font.h" // wxFont enums
     #include "wx/encinfo.h"
 #endif // PCH
 
     #include "wx/encinfo.h"
 #endif // PCH
 
@@ -44,6 +41,7 @@
 
 #ifdef __WXGTK20__
 #include "wx/gtk/private.h"
 
 #ifdef __WXGTK20__
 #include "wx/gtk/private.h"
+extern GtkWidget *wxGetRootWindow();
 #else
 #include "wx/x11/private.h"
 #endif
 #else
 #include "wx/x11/private.h"
 #endif
@@ -63,10 +61,10 @@ wxNativeFontInfo::Init(const wxNativeFontInfo& info)
     if (info.description)
         description = pango_font_description_copy(info.description);
     else
     if (info.description)
         description = pango_font_description_copy(info.description);
     else
-        description = NULL;            
+        description = NULL;
 }
 
 }
 
-wxNativeFontInfo::Free()
+void wxNativeFontInfo::Free()
 {
     if (description)
         pango_font_description_free(description);
 {
     if (description)
         pango_font_description_free(description);
@@ -99,36 +97,32 @@ wxFontStyle wxNativeFontInfo::GetStyle() const
 
 wxFontWeight wxNativeFontInfo::GetWeight() const
 {
 
 wxFontWeight wxNativeFontInfo::GetWeight() const
 {
-    wxFontWeight m_weight = wxFONTWEIGHT_NORMAL;
+#if 0
+    // We seem to currently initialize only by string.
+    // In that case PANGO_FONT_MASK_WEIGHT is always set.
+    if (!(pango_font_description_get_set_fields(description) & PANGO_FONT_MASK_WEIGHT))
+        return wxFONTWEIGHT_NORMAL;
+#endif
 
 
-    switch (pango_font_description_get_weight( description ))
-    {
-        case PANGO_WEIGHT_ULTRALIGHT:
-            m_weight = wxFONTWEIGHT_LIGHT;
-            break;
-        case PANGO_WEIGHT_LIGHT:
-            m_weight = wxFONTWEIGHT_LIGHT;
-            break;
-        case PANGO_WEIGHT_NORMAL:
-            m_weight = wxFONTWEIGHT_NORMAL;
-            break;
-        case PANGO_WEIGHT_BOLD:
-            m_weight = wxFONTWEIGHT_BOLD;
-            break;
-        case PANGO_WEIGHT_ULTRABOLD:
-            m_weight = wxFONTWEIGHT_BOLD;
-            break;
-        case PANGO_WEIGHT_HEAVY:
-            m_weight = wxFONTWEIGHT_BOLD;
-            break;
-    }
+    PangoWeight pango_weight = pango_font_description_get_weight( description );
+
+    // Until the API can be changed the following ranges of weight values are used:
+    // wxFONTWEIGHT_LIGHT:  100 .. 349 - range of 250
+    // wxFONTWEIGHT_NORMAL: 350 .. 599 - range of 250
+    // wxFONTWEIGHT_BOLD:   600 .. 900 - range of 301 (600 is "semibold" already)
+
+    if (pango_weight >= 600)
+        return wxFONTWEIGHT_BOLD;
+
+    if (pango_weight < 350)
+        return wxFONTWEIGHT_LIGHT;
 
 
-    return m_weight;
+    return wxFONTWEIGHT_NORMAL;
 }
 
 bool wxNativeFontInfo::GetUnderlined() const
 {
 }
 
 bool wxNativeFontInfo::GetUnderlined() const
 {
-    return FALSE;
+    return false;
 }
 
 wxString wxNativeFontInfo::GetFaceName() const
 }
 
 wxString wxNativeFontInfo::GetFaceName() const
@@ -140,7 +134,71 @@ wxString wxNativeFontInfo::GetFaceName() const
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
 {
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
 {
-    return wxFONTFAMILY_SWISS;
+    wxFontFamily ret = wxFONTFAMILY_DEFAULT;
+    // note: not passing -1 as the 2nd parameter to g_ascii_strdown to work
+    // around a bug in the 64-bit glib shipped with solaris 10, -1 causes it
+    // to try to allocate 2^32 bytes.
+    const char *family_name = pango_font_description_get_family( description );
+    char *family_text = g_ascii_strdown( family_name, family_name ? strlen( family_name ) : 0 );
+    // Check for some common fonts, to salvage what we can from the current win32 centric wxFont API:
+    if (strncmp( family_text, "monospace", 9 ) == 0)
+        ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace"
+    else if (strncmp( family_text, "courier", 7 ) == 0)
+        ret = wxFONTFAMILY_TELETYPE; // begins with "Courier"
+#if defined(__WXGTK24__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
+    else
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+#endif
+    {
+        PangoFontFamily **families;
+        PangoFontFamily  *family = NULL;
+        int n_families;
+        pango_context_list_families(
+#ifdef __WXGTK20__
+                gtk_widget_get_pango_context( wxGetRootWindow() ),
+#else
+                wxTheApp->GetPangoContext(),
+#endif
+                &families, &n_families);
+
+        for (int i = 0;i < n_families;++i)
+        {
+            if (g_ascii_strcasecmp(pango_font_family_get_name( families[i] ), pango_font_description_get_family( description )) == 0 )
+            {
+                family = families[i];
+                break;
+            }
+        }
+
+        g_free(families);
+
+        // Some gtk+ systems might query for a non-existing font from wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)
+        // on initialization, don't assert until wxSystemSettings::GetFont is checked for this - MR
+        // wxASSERT_MSG( family, wxT("wxNativeFontInfo::GetFamily() - No appropriate PangoFontFamily found for ::description") );
+
+        //BCI: Cache the wxFontFamily inside the class. Validate cache with
+        //BCI: g_ascii_strcasecmp(pango_font_description_get_family(description), pango_font_family_get_name(family)) == 0
+
+        if (family != NULL && pango_font_family_is_monospace( family ))
+            ret = wxFONTFAMILY_TELETYPE; // is deemed a monospace font by pango
+    }
+#endif // gtk24 || HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+
+    if (ret == wxFONTFAMILY_DEFAULT)
+    {
+        if (strstr( family_text, "sans" ) != NULL) // checked before serif, so that "* Sans Serif" fonts are detected correctly
+            ret = wxFONTFAMILY_SWISS; // contains "Sans"
+        else if (strstr( family_text, "serif" ) != NULL)
+            ret = wxFONTFAMILY_ROMAN; // contains "Serif"
+        else if (strncmp( family_text, "times", 5 ) == 0)
+            ret = wxFONTFAMILY_ROMAN; // begins with "Times"
+        else if (strncmp( family_text, "old", 3 ) == 0)
+            ret = wxFONTFAMILY_DECORATIVE; // Begins with "Old" - "Old English", "Old Town"
+    }
+
+    free(family_text);
+    return ret;
 }
 
 wxFontEncoding wxNativeFontInfo::GetEncoding() const
 }
 
 wxFontEncoding wxNativeFontInfo::GetEncoding() const
@@ -149,19 +207,46 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 }
 
 
 }
 
 
-void wxNativeFontInfo::SetPointSize(int WXUNUSED(pointsize))
+void wxNativeFontInfo::SetPointSize(int pointsize)
 {
 {
-    wxFAIL_MSG( _T("not implemented") );
+    pango_font_description_set_size( description, pointsize * PANGO_SCALE );
 }
 
 }
 
-void wxNativeFontInfo::SetStyle(wxFontStyle WXUNUSED(style))
+void wxNativeFontInfo::SetStyle(wxFontStyle style)
 {
 {
-    wxFAIL_MSG( _T("not implemented") );
+    switch (style)
+    {
+        case wxFONTSTYLE_ITALIC:
+            pango_font_description_set_style( description, PANGO_STYLE_ITALIC );
+            break;
+        case wxFONTSTYLE_SLANT:
+            pango_font_description_set_style( description, PANGO_STYLE_OBLIQUE );
+            break;
+        default:
+            wxFAIL_MSG( _T("unknown font style") );
+            // fall through
+        case wxFONTSTYLE_NORMAL:
+            pango_font_description_set_style( description, PANGO_STYLE_NORMAL );
+            break;
+    }
 }
 
 }
 
-void wxNativeFontInfo::SetWeight(wxFontWeight WXUNUSED(weight))
+void wxNativeFontInfo::SetWeight(wxFontWeight weight)
 {
 {
-    wxFAIL_MSG( _T("not implemented") );
+    switch (weight)
+    {
+        case wxFONTWEIGHT_BOLD:
+            pango_font_description_set_weight(description, PANGO_WEIGHT_BOLD);
+            break;
+        case wxFONTWEIGHT_LIGHT:
+            pango_font_description_set_weight(description, PANGO_WEIGHT_LIGHT);
+            break;
+        default:
+            wxFAIL_MSG( _T("unknown font weight") );
+            // fall through
+        case wxFONTWEIGHT_NORMAL:
+            pango_font_description_set_weight(description, PANGO_WEIGHT_NORMAL);
+    }
 }
 
 void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
 }
 
 void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
@@ -169,9 +254,9 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
     wxFAIL_MSG( _T("not implemented") );
 }
 
     wxFAIL_MSG( _T("not implemented") );
 }
 
-void wxNativeFontInfo::SetFaceName(wxString WXUNUSED(facename))
+void wxNativeFontInfo::SetFaceName(const wxString& facename)
 {
 {
-    wxFAIL_MSG( _T("not implemented") );
+    pango_font_description_set_family( description, wxGTK_CONV(facename) );
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
@@ -193,7 +278,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
 
     description = pango_font_description_from_string( wxGTK_CONV( s ) );
 
 
     description = pango_font_description_from_string( wxGTK_CONV( s ) );
 
-    return TRUE;
+    return true;
 }
 
 wxString wxNativeFontInfo::ToString() const
 }
 
 wxString wxNativeFontInfo::ToString() const
@@ -221,7 +306,7 @@ wxString wxNativeFontInfo::ToUserString() const
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
-    return FALSE;
+    return false;
 }
 
 wxString wxNativeEncodingInfo::ToString() const
 }
 
 wxString wxNativeEncodingInfo::ToString() const
@@ -231,13 +316,23 @@ wxString wxNativeEncodingInfo::ToString() const
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 {
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 {
-    return TRUE;
+    return true;
 }
 
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
 }
 
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
-    return FALSE;
+    // we *must* return true for default encoding as otherwise wxFontMapper
+    // considers that we can't load any font and aborts with wxLogFatalError!
+    if ( encoding == wxFONTENCODING_SYSTEM )
+    {
+        info->facename.clear();
+        info->encoding = wxFONTENCODING_SYSTEM;
+    }
+
+    // pretend that we support everything, it's better than to always return
+    // false as the old code did
+    return true;
 }
 
 #else // GTK+ 1.x
 }
 
 #else // GTK+ 1.x
@@ -336,28 +431,28 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
     wxString encid = tokenizer.GetNextToken();
     long enc;
     if ( !encid.ToLong(&enc) )
     wxString encid = tokenizer.GetNextToken();
     long enc;
     if ( !encid.ToLong(&enc) )
-        return FALSE;
+        return false;
     encoding = (wxFontEncoding)enc;
 
     xregistry = tokenizer.GetNextToken();
     if ( !xregistry )
     encoding = (wxFontEncoding)enc;
 
     xregistry = tokenizer.GetNextToken();
     if ( !xregistry )
-        return FALSE;
+        return false;
 
     xencoding = tokenizer.GetNextToken();
     if ( !xencoding )
 
     xencoding = tokenizer.GetNextToken();
     if ( !xencoding )
-        return FALSE;
+        return false;
 
     // ok even if empty
     facename = tokenizer.GetNextToken();
 
 
     // ok even if empty
     facename = tokenizer.GetNextToken();
 
-    return TRUE;
+    return true;
 }
 
 wxString wxNativeEncodingInfo::ToString() const
 {
     wxString s;
     s << (long)encoding << _T(';') << xregistry << _T(';') << xencoding;
 }
 
 wxString wxNativeEncodingInfo::ToString() const
 {
     wxString s;
     s << (long)encoding << _T(';') << xregistry << _T(';') << xencoding;
-    if ( !!facename )
+    if ( !facename.empty() )
     {
         s << _T(';') << facename;
     }
     {
         s << _T(';') << facename;
     }
@@ -371,7 +466,7 @@ wxString wxNativeEncodingInfo::ToString() const
 
 void wxNativeFontInfo::Init()
 {
 
 void wxNativeFontInfo::Init()
 {
-    m_isDefault = TRUE;
+    m_isDefault = true;
 }
 
 bool wxNativeFontInfo::FromString(const wxString& s)
 }
 
 bool wxNativeFontInfo::FromString(const wxString& s)
@@ -381,13 +476,13 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     // check the version
     wxString token = tokenizer.GetNextToken();
     if ( token != _T('0') )
     // check the version
     wxString token = tokenizer.GetNextToken();
     if ( token != _T('0') )
-        return FALSE;
+        return false;
 
     xFontName = tokenizer.GetNextToken();
 
     // this should be the end
     if ( tokenizer.HasMoreTokens() )
 
     xFontName = tokenizer.GetNextToken();
 
     // this should be the end
     if ( tokenizer.HasMoreTokens() )
-        return FALSE;
+        return false;
 
     return FromXFontName(xFontName);
 }
 
     return FromXFontName(xFontName);
 }
@@ -417,13 +512,13 @@ bool wxNativeFontInfo::HasElements() const
 
 wxString wxNativeFontInfo::GetXFontComponent(wxXLFDField field) const
 {
 
 wxString wxNativeFontInfo::GetXFontComponent(wxXLFDField field) const
 {
-    wxCHECK_MSG( field < wxXLFD_MAX, _T(""), _T("invalid XLFD field") );
+    wxCHECK_MSG( field < wxXLFD_MAX, wxEmptyString, _T("invalid XLFD field") );
 
     if ( !HasElements() )
     {
         // const_cast
         if ( !((wxNativeFontInfo *)this)->FromXFontName(xFontName) )
 
     if ( !HasElements() )
     {
         // const_cast
         if ( !((wxNativeFontInfo *)this)->FromXFontName(xFontName) )
-            return _T("");
+            return wxEmptyString;
     }
 
     return fontElements[field];
     }
 
     return fontElements[field];
@@ -436,7 +531,7 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname)
 
     // skip the leading, usually empty field (font name registry)
     if ( !tokenizer.HasMoreTokens() )
 
     // skip the leading, usually empty field (font name registry)
     if ( !tokenizer.HasMoreTokens() )
-        return FALSE;
+        return false;
 
     (void)tokenizer.GetNextToken();
 
 
     (void)tokenizer.GetNextToken();
 
@@ -445,14 +540,14 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname)
         if ( !tokenizer.HasMoreTokens() )
         {
             // not enough elements in the XLFD - or maybe an alias
         if ( !tokenizer.HasMoreTokens() )
         {
             // not enough elements in the XLFD - or maybe an alias
-            return FALSE;
+            return false;
         }
 
         wxString field = tokenizer.GetNextToken();
         if ( !field.empty() && field != _T('*') )
         {
             // we're really initialized now
         }
 
         wxString field = tokenizer.GetNextToken();
         if ( !field.empty() && field != _T('*') )
         {
             // we're really initialized now
-            m_isDefault = FALSE;
+            m_isDefault = false;
         }
 
         fontElements[n] = field;
         }
 
         fontElements[n] = field;
@@ -460,9 +555,9 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname)
 
     // this should be all
     if ( tokenizer.HasMoreTokens() )
 
     // this should be all
     if ( tokenizer.HasMoreTokens() )
-        return FALSE;
+        return false;
 
 
-    return TRUE;
+    return true;
 }
 
 wxString wxNativeFontInfo::GetXFontName() const
 }
 
 wxString wxNativeFontInfo::GetXFontName() const
@@ -520,7 +615,7 @@ void wxNativeFontInfo::SetXFontName(const wxString& xFontName_)
 
     xFontName = xFontName_;
 
 
     xFontName = xFontName_;
 
-    m_isDefault = FALSE;
+    m_isDefault = false;
 }
 
 int wxNativeFontInfo::GetPointSize() const
 }
 
 int wxNativeFontInfo::GetPointSize() const
@@ -573,7 +668,7 @@ wxFontWeight wxNativeFontInfo::GetWeight() const
 bool wxNativeFontInfo::GetUnderlined() const
 {
     // X fonts are never underlined
 bool wxNativeFontInfo::GetUnderlined() const
 {
     // X fonts are never underlined
-    return FALSE;
+    return false;
 }
 
 wxString wxNativeFontInfo::GetFaceName() const
 }
 
 wxString wxNativeFontInfo::GetFaceName() const
@@ -658,12 +753,12 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
     // can't do this under X
 }
 
     // can't do this under X
 }
 
-void wxNativeFontInfo::SetFaceName(wxString facename)
+void wxNativeFontInfo::SetFaceName(const wxString& facename)
 {
     SetXFontComponent(wxXLFD_FAMILY, facename);
 }
 
 {
     SetXFontComponent(wxXLFD_FAMILY, facename);
 }
 
-void wxNativeFontInfo::SetFamily(wxFontFamily family)
+void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
 {
     // wxFontFamily -> X foundry, anyone?
     wxFAIL_MSG( _T("not implemented") );
 {
     // wxFontFamily -> X foundry, anyone?
     wxFAIL_MSG( _T("not implemented") );
@@ -688,7 +783,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
-    wxCHECK_MSG( info, FALSE, _T("bad pointer in wxGetNativeFontEncoding") );
+    wxCHECK_MSG( info, false, _T("bad pointer in wxGetNativeFontEncoding") );
 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {
 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {
@@ -725,7 +820,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             break;
 
         case wxFONTENCODING_GB2312:
             break;
 
         case wxFONTENCODING_GB2312:
-            info->xregistry = wxT("GB2312");   // or the otherway round? 
+            info->xregistry = wxT("GB2312");   // or the otherway round?
             info->xencoding = wxT("*");
             break;
 
             info->xencoding = wxT("*");
             break;
 
@@ -752,6 +847,12 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             }
             break;
 
             }
             break;
 
+        case wxFONTENCODING_EUC_JP:
+        case wxFONTENCODING_SHIFT_JIS:
+            info->xregistry = "jis*";
+            info->xencoding = "*";
+            break;
+
         case wxFONTENCODING_SYSTEM:
             info->xregistry =
             info->xencoding = wxT("*");
         case wxFONTENCODING_SYSTEM:
             info->xregistry =
             info->xencoding = wxT("*");
@@ -759,12 +860,12 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
 
         default:
             // don't know how to translate this encoding into X fontspec
 
         default:
             // don't know how to translate this encoding into X fontspec
-            return FALSE;
+            return false;
     }
 
     info->encoding = encoding;
 
     }
 
     info->encoding = encoding;
 
-    return TRUE;
+    return true;
 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
@@ -828,7 +929,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
     wxNativeFont font = 0;
 
     // if we already have the X font name, try to use it
     wxNativeFont font = 0;
 
     // if we already have the X font name, try to use it
-    if( xFontName && !xFontName->IsEmpty() )
+    if( xFontName && !xFontName->empty() )
     {
         //
         //  Make sure point size is correct for scale factor.
     {
         //
         //  Make sure point size is correct for scale factor.
@@ -868,7 +969,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
         {
             // second round: use normal weight
             if ( round == 1 )
         {
             // second round: use normal weight
             if ( round == 1 )
-        {
+            {
                 if ( testweight != wxNORMAL )
                 {
                     testweight = wxNORMAL;
                 if ( testweight != wxNORMAL )
                 {
                     testweight = wxNORMAL;
@@ -897,11 +998,11 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
                 font = wxLoadQueryFont(i, family, teststyle, testweight, underlined,
                                    facename, info.xregistry, info.xencoding,
                                    xFontName);
                 font = wxLoadQueryFont(i, family, teststyle, testweight, underlined,
                                    facename, info.xregistry, info.xencoding,
                                    xFontName);
-        }
+            }
 
 
-        // Search for larger size (approx.)
-        for ( i = pointSize + 10; !font && i <= max_size; i += 10 )
-        {
+            // Search for larger size (approx.)
+            for ( i = pointSize + 10; !font && i <= max_size; i += 10 )
+            {
                 font = wxLoadQueryFont(i, family, teststyle, testweight, underlined,
                                    facename, info.xregistry, info.xencoding,
                                    xFontName);
                 font = wxLoadQueryFont(i, family, teststyle, testweight, underlined,
                                    facename, info.xregistry, info.xencoding,
                                    xFontName);
@@ -941,7 +1042,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
                 if ( !font )
                 {
                     font = wxLoadQueryFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL,
                 if ( !font )
                 {
                     font = wxLoadQueryFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL,
-                                           FALSE, wxEmptyString,
+                                           false, wxEmptyString,
                                            info.xregistry, info.xencoding,
                                            xFontName);
 
                                            info.xregistry, info.xencoding,
                                            xFontName);
 
@@ -954,7 +1055,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
 
                         font = wxLoadQueryFont(-1,
                                                wxDEFAULT, wxNORMAL, wxNORMAL,
 
                         font = wxLoadQueryFont(-1,
                                                wxDEFAULT, wxNORMAL, wxNORMAL,
-                                               FALSE, wxEmptyString,
+                                               false, wxEmptyString,
                                                _T("*"), _T("*"),
                                                xFontName);
                     }
                                                _T("*"), _T("*"),
                                                xFontName);
                     }
@@ -970,20 +1071,20 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 
-// returns TRUE if there are any fonts matching this font spec
+// returns true if there are any fonts matching this font spec
 static bool wxTestFontSpec(const wxString& fontspec)
 {
     // some X servers will fail to load this font because there are too many
     // matches so we must test explicitly for this
     if ( fontspec == _T("-*-*-*-*-*-*-*-*-*-*-*-*-*-*") )
     {
 static bool wxTestFontSpec(const wxString& fontspec)
 {
     // some X servers will fail to load this font because there are too many
     // matches so we must test explicitly for this
     if ( fontspec == _T("-*-*-*-*-*-*-*-*-*-*-*-*-*-*") )
     {
-        return TRUE;
+        return true;
     }
 
     wxNativeFont test = (wxNativeFont) g_fontHash->Get( fontspec );
     if (test)
     {
     }
 
     wxNativeFont test = (wxNativeFont) g_fontHash->Get( fontspec );
     if (test)
     {
-        return TRUE;
+        return true;
     }
 
     test = wxLoadFont(fontspec);
     }
 
     test = wxLoadFont(fontspec);
@@ -993,11 +1094,11 @@ static bool wxTestFontSpec(const wxString& fontspec)
     {
         wxFreeFont(test);
 
     {
         wxFreeFont(test);
 
-        return TRUE;
+        return true;
     }
     else
     {
     }
     else
     {
-        return FALSE;
+        return false;
     }
 }
 
     }
 }
 
@@ -1094,7 +1195,7 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
 
 #else
     wxString fontSpec;
 
 #else
     wxString fontSpec;
-    if (!facename.IsEmpty())
+    if (!facename.empty())
     {
         fontSpec.Printf(wxT("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"),
                         facename.c_str());
     {
         fontSpec.Printf(wxT("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"),
                         facename.c_str());
@@ -1292,7 +1393,7 @@ bool wxFontModule::OnInit()
 {
     g_fontHash = new wxHashTable( wxKEY_STRING );
 
 {
     g_fontHash = new wxHashTable( wxKEY_STRING );
 
-    return TRUE;
+    return true;
 }
 
 void wxFontModule::OnExit()
 }
 
 void wxFontModule::OnExit()
@@ -1303,4 +1404,3 @@ void wxFontModule::OnExit()
 }
 
 #endif // GTK 2.0/1.x
 }
 
 #endif // GTK 2.0/1.x
-