From f20180e74313bbb9f18bea594125221bba13aba2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Jan 2019 02:57:45 +0100 Subject: [PATCH] Avoid -Wswitch gcc warning in wxQt wxNativeFontInfo::SetStyle() Explicitly handle wxFONTSTYLE_MAX, even if it's just to assert that it's unexpected here. --- src/qt/font.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/qt/font.cpp b/src/qt/font.cpp index 6600d8a90c..f9e5b1fd9b 100644 --- a/src/qt/font.cpp +++ b/src/qt/font.cpp @@ -513,18 +513,28 @@ void wxNativeFontInfo::SetPixelSize(const wxSize& size) void wxNativeFontInfo::SetStyle(wxFontStyle style) { - switch(style) + QFont::Style qtStyle; + + switch ( style ) { case wxFONTSTYLE_ITALIC: - m_qtFont.setStyle(QFont::StyleItalic); + qtStyle = QFont::StyleItalic; break; + case wxFONTSTYLE_NORMAL: - m_qtFont.setStyle(QFont::StyleNormal); + qtStyle = QFont::StyleNormal; break; + case wxFONTSTYLE_SLANT: - m_qtFont.setStyle(QFont::StyleOblique); + qtStyle = QFont::StyleOblique; break; + + case wxFONTSTYLE_MAX: + wxFAIL_MSG("unknown font style"); + return; } + + m_qtFont.setStyle(qtStyle); } void wxNativeFontInfo::SetNumericWeight(int weight)