X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6811251bfc825216c41f2653ec3e96ebf92de9f1..c9f00f2fce9cacd46ae25417d6c3a5add7640320:/src/x11/font.cpp?ds=sidebyside

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 5018bc39ed..783a009b74 100644
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -883,6 +883,11 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
         node = node->GetNext();
     }
 
+    wxString xFontName = M_FONTDATA->m_nativeFontInfo.GetXFontName();
+    if (xFontName == "-*-*-*-*-*--*-*-*-*-*-*-*-*")
+      // wxFont constructor not called with native font info parameter => take M_FONTDATA values
+      xFontName.Clear();
+    
     // not found, create a new one
     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,
@@ -891,7 +896,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
                                                M_FONTDATA->m_weight,
                                                M_FONTDATA->m_underlined,
                                                wxT(""),
-                                               M_FONTDATA->m_encoding);
+                                               M_FONTDATA->m_encoding,
+                                               & xFontName);
 
     if ( !font )
     {