wxX11 wxFont miss the wxFont (const wxString &nativeInfoString) ctor, it will cause build tests failed. Added and fixed

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

include/wx/x11/font.h

@@ -67,12 +67,14 @@ public:
 
     wxFont(const wxNativeFontInfo& info);
 
-    // FIXME: I added the ! to make it compile;
+    wxFont(const wxString &nativeInfoString)
-    // is this right? - JACS
+    {
-#if !wxUSE_UNICODE
+        Create(nativeInfoString);
+    }
+
     bool Create(const wxString& fontname,
         wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
-#endif
+
     // DELETEME: no longer seems to be implemented.
     // bool Create(const wxNativeFontInfo& fontinfo);
 

src/x11/font.cpp

@@ -565,8 +565,6 @@ bool wxFont::Create(int pointSize,
     return true;
 }
 
-#if !wxUSE_UNICODE
-
 bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
 {
     if( !fontname )
@@ -577,7 +575,11 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
 
     m_refData = new wxFontRefData();
 
-    M_FONTDATA->m_nativeFontInfo.SetXFontName(fontname);  // X font name
+#if wxUSE_UNICODE // X font name
+    M_FONTDATA->m_nativeFontInfo.FromString( fontname );
+#else
+    M_FONTDATA->m_nativeFontInfo.SetXFontName(fontname);
+#endif
 
     wxString tmp;
 
@@ -669,7 +671,6 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     }
     return true;
 }
-#endif // !wxUSE_UNICODE
 
 wxFont::~wxFont()
 {