Allow native font specification

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

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 5018bc39ed6dfaf9b19a3f66b21cae8b3721a1a0..573951a98bf40afc43d57adaf0f104713bf214e8 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -883,6 +883,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

+    wxString xFontName = M_FONTDATA->m_nativeFontInfo.GetXFontName();
+    

     // not found, create a new one
     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,
     // not found, create a new one
     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,


@@ -891,7 +893,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
                                                M_FONTDATA->m_weight,
                                                M_FONTDATA->m_underlined,
                                                wxT(""),
                                                M_FONTDATA->m_weight,
                                                M_FONTDATA->m_underlined,
                                                wxT(""),

-                                               M_FONTDATA->m_encoding);
+                                               M_FONTDATA->m_encoding,
+                                               & xFontName);

 
     if ( !font )
     {
 
     if ( !font )
     {