Get the stock label when stock ID is used with empty label in Create()

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

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 79f36b31dda4c5d712a2f463931073eee97ceb30..6599fa5e7114c93a99558c86b777d2a4ae01a0b3 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -57,15 +57,16 @@ void wxNativeFontInfo::Init()
     description = NULL;
 }
 
     description = NULL;
 }
 

-wxNativeFontInfo::wxNativeFontInfo(const wxNativeFontInfo& info)
+void
+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::~wxNativeFontInfo()
+void wxNativeFontInfo::Free()

 {
     if (description)
         pango_font_description_free(description);
 {
     if (description)
         pango_font_description_free(description);


@@ -236,7 +237,17 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 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


@@ -724,7 +735,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;