X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23f4f495a5f91414c633ccc27a137901d61b923f..4f33a4dd4c6e92ec613aa73737030e992f5d8c65:/src/unix/fontutil.cpp?ds=inline

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 7ca376fb91..8ec7b7892d 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -24,27 +24,37 @@
     #pragma hdrstop
 #endif
 
+#include "wx/fontutil.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
     #include "wx/font.h" // wxFont enums
     #include "wx/encinfo.h"
     #include "wx/hash.h"
     #include "wx/utils.h"       // for wxGetDisplay()
+    #include "wx/module.h"
 #endif // PCH
 
-#include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #include "wx/tokenzr.h"
-#include "wx/module.h"
+#include "wx/fontenum.h"
 
 #if wxUSE_PANGO
 
 #include "pango/pango.h"
 
 #ifdef __WXGTK20__
-#include "wx/gtk/private.h"
-extern GtkWidget *wxGetRootWindow();
+    #include "wx/gtk/private.h"
+    extern GtkWidget *wxGetRootWindow();
+
+    #define wxPANGO_CONV wxGTK_CONV_SYS
+    #define wxPANGO_CONV_BACK wxGTK_CONV_BACK_SYS
 #else
-#include "wx/x11/private.h"
+    #include "wx/x11/private.h"
+    #include "wx/gtk/private/string.h"
+
+    #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
+    #define wxPANGO_CONV_BACK(s) (wxConvUTF8.cMB2WX((s)))
 #endif
 
 // ----------------------------------------------------------------------------
@@ -128,9 +138,7 @@ bool wxNativeFontInfo::GetUnderlined() const
 
 wxString wxNativeFontInfo::GetFaceName() const
 {
-    wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) );
-
-    return tmp;
+    return wxPANGO_CONV_BACK(pango_font_description_get_family(description));
 }
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
@@ -143,7 +151,8 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
     if ( !family_name )
         return ret;
 
-    char *family_text = g_ascii_strdown( family_name, strlen( family_name ) );
+    wxGtkString family_text(g_ascii_strdown(family_name, strlen(family_name)));
+
     // 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"
@@ -201,7 +210,6 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
             ret = wxFONTFAMILY_DECORATIVE; // Begins with "Old" - "Old English", "Old Town"
     }
 
-    free(family_text);
     return ret;
 }
 
@@ -258,9 +266,10 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
     wxFAIL_MSG( _T("not implemented") );
 }
 
-void wxNativeFontInfo::SetFaceName(const wxString& facename)
+bool wxNativeFontInfo::SetFaceName(const wxString& facename)
 {
-    pango_font_description_set_family(description, wxGTK_CONV_SYS(facename));
+    pango_font_description_set_family(description, wxPANGO_CONV(facename));
+    return true;
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
@@ -305,18 +314,20 @@ bool wxNativeFontInfo::FromString(const wxString& s)
         }
     }
 
-    description = pango_font_description_from_string( wxGTK_CONV_SYS( str ) );
+    description = pango_font_description_from_string(wxPANGO_CONV(str));
+
+    // ensure a valid facename is selected
+    if (!wxFontEnumerator::IsValidFacename(GetFaceName()))
+        SetFaceName(wxNORMAL_FONT->GetFaceName());
 
     return true;
 }
 
 wxString wxNativeFontInfo::ToString() const
 {
-    char *str = pango_font_description_to_string( description );
-    wxString tmp = wxGTK_CONV_BACK(  str );
-    g_free( str );
+    wxGtkString str(pango_font_description_to_string( description ));
 
-    return tmp;
+    return wxPANGO_CONV_BACK(str);
 }
 
 bool wxNativeFontInfo::FromUserString(const wxString& s)
@@ -329,36 +340,6 @@ wxString wxNativeFontInfo::ToUserString() const
     return ToString();
 }
 
-// ----------------------------------------------------------------------------
-// wxNativeEncodingInfo
-// ----------------------------------------------------------------------------
-
-bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s))
-{
-    return false;
-}
-
-wxString wxNativeEncodingInfo::ToString() const
-{
-    return wxEmptyString;
-}
-
-bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info))
-{
-    return true;
-}
-
-bool wxGetNativeFontEncoding(wxFontEncoding encoding,
-                             wxNativeEncodingInfo *info)
-{
-    // all encodings are available in GTK+ 2 because we translate text in any
-    // encoding to UTF-8 internally anyhow
-    info->facename.clear();
-    info->encoding = encoding;
-
-    return true;
-}
-
 #else // GTK+ 1.x
 
 #ifdef __X__
@@ -661,7 +642,7 @@ wxFontStyle wxNativeFontInfo::GetStyle() const
         return wxFONTSTYLE_NORMAL;
     }
 
-    switch ( s[0] )
+    switch ( s[0].GetValue() )
     {
         default:
             // again, unknown but consider normal by default
@@ -776,9 +757,10 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
     // can't do this under X
 }
 
-void wxNativeFontInfo::SetFaceName(const wxString& facename)
+bool wxNativeFontInfo::SetFaceName(const wxString& facename)
 {
     SetXFontComponent(wxXLFD_FAMILY, facename);
+    return true;
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))