X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/514401354c0f3a3c384535980de05b1c91d78986..83f787ba2137594f12c7bd0659dc3c2fb973598f:/src/x11/font.cpp diff --git a/src/x11/font.cpp b/src/x11/font.cpp index c5b726de0e..32ebc2ac85 100644 --- a/src/x11/font.cpp +++ b/src/x11/font.cpp @@ -164,6 +164,8 @@ protected: #endif }; +#define M_FONTDATA ((wxFontRefData*)m_refData) + // ---------------------------------------------------------------------------- // wxFontRefData // ---------------------------------------------------------------------------- @@ -243,6 +245,9 @@ void wxFontRefData::InitFromNative() break; } +// Not defined in some Pango versions +#define wxPANGO_WEIGHT_SEMIBOLD 600 + switch (pango_font_description_get_weight( desc )) { case PANGO_WEIGHT_ULTRALIGHT: @@ -258,7 +263,7 @@ void wxFontRefData::InitFromNative() m_weight = wxFONTWEIGHT_NORMAL; break; - case PANGO_WEIGHT_SEMIBOLD: + case wxPANGO_WEIGHT_SEMIBOLD: case PANGO_WEIGHT_BOLD: case PANGO_WEIGHT_ULTRABOLD: case PANGO_WEIGHT_HEAVY: