X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47239bd6b640fa4e4c82fc851696c5f5d9e2fa37..ddfd64a99c22c80cde68c699567d6aa0d9cd8745:/src/unix/fontutil.cpp

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index c0c8b07bf0..7275663fe2 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -158,9 +158,9 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
         ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace"
     else if (strncmp( family_text, "courier", 7 ) == 0)
         ret = wxFONTFAMILY_TELETYPE; // begins with "Courier"
-#if defined(__WXGTK24__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
+#if defined(__WXGTK20__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
     else
-#ifdef __WXGTK24__
+#ifdef __WXGTK20__
     if (!gtk_check_version(2,4,0))
 #endif
     {
@@ -196,7 +196,7 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
         if (family != NULL && pango_font_family_is_monospace( family ))
             ret = wxFONTFAMILY_TELETYPE; // is deemed a monospace font by pango
     }
-#endif // gtk24 || HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+#endif // GTK+ 2 || HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
     if (ret == wxFONTFAMILY_DEFAULT)
     {
@@ -642,7 +642,7 @@ wxFontStyle wxNativeFontInfo::GetStyle() const
         return wxFONTSTYLE_NORMAL;
     }
 
-    switch ( s[0] )
+    switch ( s[0].GetValue() )
     {
         default:
             // again, unknown but consider normal by default