From a02df37fb8b1d1c434847c3234dc2188972a6d94 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 18 Sep 2018 19:11:20 +0200 Subject: [PATCH] All QFont enum values are available since Qt 5.5 --- src/qt/font.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/qt/font.cpp b/src/qt/font.cpp index 496e5e69e3..79e66fc81a 100644 --- a/src/qt/font.cpp +++ b/src/qt/font.cpp @@ -22,16 +22,22 @@ // Older versions of QT don't define all the QFont::Weight enum values, so just // do it ourselves here for all case instead. +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) +#define wxQFontEnumOrInt(a, b) a +#else +#define wxQFontEnumOrInt(a, b) b +#endif + enum { - wxQFont_Thin = 0, - wxQFont_ExtraLight = 12, + wxQFont_Thin = wxQFontEnumOrInt( QFont::Thin, 0 ), + wxQFont_ExtraLight = wxQFontEnumOrInt( QFont::ExtraLight, 12 ), wxQFont_Light = QFont::Light, wxQFont_Normal = QFont::Normal, - wxQFont_Medium = 57, + wxQFont_Medium = wxQFontEnumOrInt( QFont::Medium, 57 ), wxQFont_DemiBold = QFont::DemiBold, wxQFont_Bold = QFont::Bold, - wxQFont_ExtraBold = 81, + wxQFont_ExtraBold = wxQFontEnumOrInt( QFont::ExtraBold, 81 ), wxQFont_Black = QFont::Black };