Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All QFont enum values are available since Qt 5.5

Browse Source
This commit is contained in:
Maarten Bent
2018-09-18 19:11:20 +02:00
parent d2ab2ef442
commit a02df37fb8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qt/font.cpp
View File

@@ -22,16 +22,22 @@
// Older versions of QT don't define all the QFont::Weight enum values, so just // Older versions of QT don't define all the QFont::Weight enum values, so just
// do it ourselves here for all case instead. // 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 enum
{ {
wxQFont_Thin = 0, wxQFont_Thin = wxQFontEnumOrInt( QFont::Thin, 0 ),
wxQFont_ExtraLight = 12, wxQFont_ExtraLight = wxQFontEnumOrInt( QFont::ExtraLight, 12 ),
wxQFont_Light = QFont::Light, wxQFont_Light = QFont::Light,
wxQFont_Normal = QFont::Normal, wxQFont_Normal = QFont::Normal,
wxQFont_Medium = 57, wxQFont_Medium = wxQFontEnumOrInt( QFont::Medium, 57 ),
wxQFont_DemiBold = QFont::DemiBold, wxQFont_DemiBold = QFont::DemiBold,
wxQFont_Bold = QFont::Bold, wxQFont_Bold = QFont::Bold,
wxQFont_ExtraBold = 81, wxQFont_ExtraBold = wxQFontEnumOrInt( QFont::ExtraBold, 81 ),
wxQFont_Black = QFont::Black wxQFont_Black = QFont::Black
}; };