Make use of new array functions.

[wxWidgets.git] / src / gtk1 / font.cpp

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index e8dbe802e54cff97ef3c8ad72d4d1b9437c26cec..a27989e1056d09f3cce2d17cb9d8514f4146d089 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -179,15 +179,16 @@ void wxFontRefData::Init(int pointSize,
     m_underlined = underlined;
     m_encoding = encoding;
     
-    
+#ifdef __WXGTK20__    
     // Create native font info
     m_nativeFontInfo.description = pango_font_description_new();
 
     // And set its values    
     switch (m_family)
     {
+        case wxFONTFAMILY_MODERN:
         case wxFONTFAMILY_TELETYPE:
-           pango_font_description_set_family( m_nativeFontInfo.description, "monospaced" );
+           pango_font_description_set_family( m_nativeFontInfo.description, "monospace" );
            break;
         case wxFONTFAMILY_SWISS:
            pango_font_description_set_family( m_nativeFontInfo.description, "serif" );
@@ -199,6 +200,7 @@ void wxFontRefData::Init(int pointSize,
     SetStyle( m_style );
     SetPointSize( m_pointSize );
     SetWeight( m_weight );
+#endif
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )
@@ -273,7 +275,7 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
             break;
     }
     
-    if (m_faceName == wxT("monospaced"))
+    if (m_faceName == wxT("monospace"))
     {
         m_family = wxFONTFAMILY_TELETYPE;
     }