Initialize m_isShown correctly in wxGenericDragImage::BeginDrag().

[wxWidgets.git] / src / unix / fontutil.cpp

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 625848636aed1f674dfc3056033f6e368520a514..4cb8399cedf5627618a381ac3aad1835c0c8331b 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -159,15 +159,12 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
 
     // Check for some common fonts, to salvage what we can from the current
     // win32 centric wxFont API:
 
     // Check for some common fonts, to salvage what we can from the current
     // win32 centric wxFont API:

-    if (strncasecmp( family_text, "monospace", 9 ) == 0)
+    if (wxStrnicmp( family_text, "monospace", 9 ) == 0)

         ret = wxFONTFAMILY_TELETYPE;    // begins with "Monospace"
         ret = wxFONTFAMILY_TELETYPE;    // begins with "Monospace"

-    else if (strncasecmp( family_text, "courier", 7 ) == 0)
+    else if (wxStrnicmp( family_text, "courier", 7 ) == 0)

         ret = wxFONTFAMILY_TELETYPE;    // begins with "Courier"
 #if defined(__WXGTK20__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
     else
         ret = wxFONTFAMILY_TELETYPE;    // begins with "Courier"
 #if defined(__WXGTK20__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
     else

-#ifdef __WXGTK20__
-    if (!gtk_check_version(2,4,0))
-#endif

     {
         PangoFontFamily **families;
         PangoFontFamily  *family = NULL;
     {
         PangoFontFamily **families;
         PangoFontFamily  *family = NULL;


@@ -209,9 +206,9 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
             ret = wxFONTFAMILY_SWISS;       // contains "Sans"
         else if (strstr( family_text, "serif" ) != NULL || strstr( family_text, "Serif" ) != NULL)
             ret = wxFONTFAMILY_ROMAN;       // contains "Serif"
             ret = wxFONTFAMILY_SWISS;       // contains "Sans"
         else if (strstr( family_text, "serif" ) != NULL || strstr( family_text, "Serif" ) != NULL)
             ret = wxFONTFAMILY_ROMAN;       // contains "Serif"

-        else if (strncasecmp( family_text, "times", 5 ) == 0)
+        else if (wxStrnicmp( family_text, "times", 5 ) == 0)

             ret = wxFONTFAMILY_ROMAN;       // begins with "Times"
             ret = wxFONTFAMILY_ROMAN;       // begins with "Times"

-        else if (strncasecmp( family_text, "old", 3 ) == 0)
+        else if (wxStrnicmp( family_text, "old", 3 ) == 0)

             ret = wxFONTFAMILY_DECORATIVE;  // begins with "Old" - "Old English", "Old Town"
     }
 
             ret = wxFONTFAMILY_DECORATIVE;  // begins with "Old" - "Old English", "Old Town"
     }
 


@@ -272,6 +269,11 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
     wxFAIL_MSG( "not implemented" );
 }
 
     wxFAIL_MSG( "not implemented" );
 }
 

+void wxNativeFontInfo::SetStrikethrough(bool WXUNUSED(strikethrough))
+{
+    wxFAIL_MSG( "not implemented" );
+}
+

 bool wxNativeFontInfo::SetFaceName(const wxString& facename)
 {
     pango_font_description_set_family(description, wxPANGO_CONV(facename));
 bool wxNativeFontInfo::SetFaceName(const wxString& facename)
 {
     pango_font_description_set_family(description, wxPANGO_CONV(facename));