handle PANGO_WEIGHT_SEMIBOLD font weight (avoids gcc warnings and generally makes...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index b1cda1cf236523237cac0a7156e0c946089b0f97..c5b726de0ee426260cb3b0d7892883098aa96a00 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -246,20 +246,21 @@ void wxFontRefData::InitFromNative()
     switch (pango_font_description_get_weight( desc ))
     {
         case PANGO_WEIGHT_ULTRALIGHT:
     switch (pango_font_description_get_weight( desc ))
     {
         case PANGO_WEIGHT_ULTRALIGHT:

-            m_weight = wxFONTWEIGHT_LIGHT;
-            break;

         case PANGO_WEIGHT_LIGHT:
             m_weight = wxFONTWEIGHT_LIGHT;
             break;
         case PANGO_WEIGHT_LIGHT:
             m_weight = wxFONTWEIGHT_LIGHT;
             break;

+
+        default:
+            wxFAIL_MSG(_T("unknown Pango font weight"));
+            // fall through
+

         case PANGO_WEIGHT_NORMAL:
             m_weight = wxFONTWEIGHT_NORMAL;
             break;
         case PANGO_WEIGHT_NORMAL:
             m_weight = wxFONTWEIGHT_NORMAL;
             break;

+
+        case PANGO_WEIGHT_SEMIBOLD:

         case PANGO_WEIGHT_BOLD:
         case PANGO_WEIGHT_BOLD:

-            m_weight = wxFONTWEIGHT_BOLD;
-            break;

         case PANGO_WEIGHT_ULTRABOLD:
         case PANGO_WEIGHT_ULTRABOLD:

-            m_weight = wxFONTWEIGHT_BOLD;
-            break;

         case PANGO_WEIGHT_HEAVY:
             m_weight = wxFONTWEIGHT_BOLD;
             break;
         case PANGO_WEIGHT_HEAVY:
             m_weight = wxFONTWEIGHT_BOLD;
             break;