X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db16cab4610b294c3412f6508754b55ef4a42895..687dcff3a46a55c11851b1cabdbbbef5492a2f5f:/include/wx/fontutil.h diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 26369c39d2..93ae30121f 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -6,7 +6,7 @@ // Created: 05.11.99 // RCS-ID: $Id$ // Copyright: (c) wxWindows team -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // General note: this header is private to wxWindows and is not supposed to be @@ -16,7 +16,7 @@ #ifndef _WX_FONTUTIL_H_ #define _WX_FONTUTIL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "fontutil.h" #endif @@ -72,7 +72,9 @@ enum wxXLFDField // further it might make sense to make it a real class with virtual methods struct WXDLLEXPORT wxNativeFontInfo { -#if defined(_WX_X_FONTLIKE) +#if wxUSE_PANGO + PangoFontDescription *description; +#elif defined(_WX_X_FONTLIKE) // the members can't be accessed directly as we only parse the // xFontName on demand private: @@ -113,8 +115,6 @@ 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