From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 10 Jun 2005 14:57:11 +0000 (+0000)
Subject: Don't use native font always.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/97bdb4c89008098cc9e06a624633d4beca1553b8

Don't use native font always.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 573951a98b..783a009b74 100644
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -884,6 +884,9 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     }
 
     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 *)