Lots of work to set PangoFontDescription as the

native font info data. WIP.


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

include/wx/defs.h

@@ -1785,7 +1785,7 @@ enum wxPrintMode
 // ----------------------------------------------------------------------------
 
 // define this macro if font handling is done using the X font names
-#if defined(__WXGTK__) || defined(__X__)
+#if (defined(__WXGTK__) && !defined(__WXGTK20__)) || defined(__X__)
     #define _WX_X_FONTLIKE
 #endif
 

include/wx/fontenc.h

@@ -113,6 +113,9 @@ struct WXDLLEXPORT wxNativeEncodingInfo
 #elif defined(_WX_X_FONTLIKE)
     wxString xregistry,
              xencoding;
+#elif defined(__WXGTK20__)
+    // No way to specify this in Pango as this
+    // seems to be handled internally.
 #elif defined(__WXMGL__)
     int      mglEncoding;
 #else

include/wx/fontutil.h

@@ -113,6 +113,8 @@ public:
     FATTRS       fa;
     FONTMETRICS  fm;
     FACENAMEDESC fn;
+#elif defined(__WXGTK20__)
+    PangoFontDescription *description;
 #else // other platforms
     //
     //  This is a generic implementation that should work on all ports