Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxStrnicmp() instead of strncasecmp() in wxGTK code.

Browse Source 
This fixes compilation under Windows where strncasecmp() is not available --
but portable wxStrnicmp() always is.

Closes #14036.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-02-23 13:56:14 +00:00
parent f090e4ef67
commit 36cc76505c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/textctrl.cpp
View File

@@ -403,7 +403,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e )
for( n = 0; n < WXSIZEOF(URIPrefixes); ++n )
{
prefix_len = strlen(URIPrefixes[n]);
if((len > prefix_len) && !strncasecmp(text, URIPrefixes[n], prefix_len))
if((len > prefix_len) && !wxStrnicmp(text, URIPrefixes[n], prefix_len))
break;
}

8
src/unix/fontutil.cpp
View File

@@ -159,9 +159,9 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
// 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"
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
@@ -209,9 +209,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"
else if (strncasecmp( family_text, "times", 5 ) == 0)
else if (wxStrnicmp( family_text, "times", 5 ) == 0)
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"
}