use wcs(n)casecmp() if available; use wxStricmp() to implement wxString::CmpNoCase...

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

diff --git a/configure b/configure
index 7cfe3dba7c3f5c7f078a5f3ca75562f939974394..ecd5c516f846b9ee8b90400897deba488fc0018c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in 58060 2009-01-12 23:25:39Z FM .
+# From configure.in Id: configure.in 58069 2009-01-13 12:01:30Z FM .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #


@@ -34957,7 +34957,9 @@ _ACEOF
 
 
 
 
 
 

-for ac_func in wcsdup strnlen wcsnlen
+
+
+for ac_func in wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp

 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5

diff --git a/configure.in b/configure.in
index 208271592da2eca36c35b3a948b33688d88c5262..a2dc1ce0712d72c6bda163cf1bb06e2082b77477 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4047,7 +4047,7 @@ if test "$wxUSE_WCHAR_T" = "yes"; then
         AC_DEFINE(HAVE_WCSLEN)
     fi
 
         AC_DEFINE(HAVE_WCSLEN)
     fi
 

-    AC_CHECK_FUNCS([wcsdup strnlen wcsnlen])
+    AC_CHECK_FUNCS([wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp])

 
     dnl On HP-UX aCC need this define to find mbstrtowcs() &c
     dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict
 
     dnl On HP-UX aCC need this define to find mbstrtowcs() &c
     dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index 67f69da6cefccea4b8c75e06ad47a1d1bcc6540b..27aafc6e8be2a03a5e6961e83859f06aa659514b 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -233,31 +233,39 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 
 /* define wxCRT_StricmpA/W and wxCRT_StrnicmpA/W for various compilers */
 
 
 /* define wxCRT_StricmpA/W and wxCRT_StrnicmpA/W for various compilers */
 

-/* note that we definitely are going to need our own version for widechar
- * versions */
-#if !defined(wxCRT_StricmpA)
-    #if defined(__BORLANDC__) || defined(__WATCOMC__) || \
-            defined(__VISAGECPP__) || \
-            defined(__EMX__) || defined(__DJGPP__)
-        #define wxCRT_StricmpA stricmp
-        #define wxCRT_StrnicmpA strnicmp
-    #elif defined(__WXPALMOS__)
-        /* FIXME: There is no equivalent to strnicmp in the Palm OS API.  This
-         * quick hack should do until one can be written.
-         */
-        #define wxCRT_StricmpA StrCaselessCompare
-        #define wxCRT_StrnicmpA StrNCaselessCompare
-    #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
-            (defined(__MWERKS__) && defined(__INTEL__))
-        #define wxCRT_StricmpA _stricmp
-        #define wxCRT_StrnicmpA _strnicmp
-    #elif defined(__UNIX__) || defined(__GNUWIN32__)
-        #define wxCRT_StricmpA strcasecmp
-        #define wxCRT_StrnicmpA strncasecmp
-    /* #else -- use wxWidgets implementation */
+#if defined(__BORLANDC__) || defined(__WATCOMC__) || \
+        defined(__VISAGECPP__) || \
+        defined(__EMX__) || defined(__DJGPP__)
+    #define wxCRT_StricmpA stricmp
+    #define wxCRT_StrnicmpA strnicmp
+#elif defined(__WXPALMOS__)
+    /* FIXME: There is no equivalent to strnicmp in the Palm OS API.  This
+     * quick hack should do until one can be written.
+     */
+    #define wxCRT_StricmpA StrCaselessCompare
+    #define wxCRT_StrnicmpA StrNCaselessCompare
+#elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
+        (defined(__MWERKS__) && defined(__INTEL__))
+    #define wxCRT_StricmpA _stricmp
+    #define wxCRT_StrnicmpA _strnicmp
+#elif defined(__UNIX__) || defined(__GNUWIN32__)
+    #define wxCRT_StricmpA strcasecmp
+    #define wxCRT_StrnicmpA strncasecmp
+/* #else -- use wxWidgets implementation */
+#endif
+
+#ifdef __VISUALC__
+    #define wxCRT_StricmpW _wcsicmp
+    #define wxCRT_StrnicmpW _wcsnicmp
+#elif defined(__UNIX__)
+    #ifdef HAVE_WCSCASECMP
+        #define wxCRT_StricmpW wcscasecmp

     #endif
     #endif

-#endif /* !defined(wxCRT_StricmpA) */
-/* FIXME-UTF8: use wcs(n)casecmp if available for *W versions */
+    #ifdef HAVE_WCSNCASECMP
+        #define wxCRT_StrnicmpW wcsncasecmp
+    #endif
+/* #else -- use wxWidgets implementation */
+#endif

 
 #ifdef HAVE_STRTOK_R
     #define  wxCRT_StrtokA(str, sep, last)    strtok_r(str, sep, last)
 
 #ifdef HAVE_STRTOK_R
     #define  wxCRT_StrtokA(str, sep, last)    strtok_r(str, sep, last)

diff --git a/setup.h.in b/setup.h.in
index 8b7365d7b88c22ad4ff416a677800739f58196e7..c59195003d52b48c4bd7e64c1111600eb3b91055 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -912,6 +912,12 @@
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 

+/* Define if you have wcscasecmp() function  */
+#undef HAVE_WCSCASECMP
+
+/* Define if you have wcsncasecmp() function  */
+#undef HAVE_WCSNCASECMP
+

 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 

diff --git a/src/common/string.cpp b/src/common/string.cpp
index d7a7c7d9f3612d4fe5034ca246896d346c881b1e..56af51ae22c28dbe3e8306171f575729270236ac 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1115,6 +1115,7 @@ size_t wxString::find_last_not_of(const wxOtherCharType* sz, size_t nStart,
 
 int wxString::CmpNoCase(const wxString& s) const
 {
 
 int wxString::CmpNoCase(const wxString& s) const
 {

+#if wxUSE_UNICODE_UTF8

     // FIXME-UTF8: use wxUniChar::ToLower/ToUpper once added
 
     const_iterator i1 = begin();
     // FIXME-UTF8: use wxUniChar::ToLower/ToUpper once added
 
     const_iterator i1 = begin();


@@ -1138,6 +1139,9 @@ int wxString::CmpNoCase(const wxString& s) const
     else if ( len1 > len2 )
         return 1;
     return 0;
     else if ( len1 > len2 )
         return 1;
     return 0;

+#else // wxUSE_UNICODE_WCHAR or ANSI
+    return wxStricmp(m_impl.c_str(), s.m_impl.c_str());
+#endif

 }
 
 
 }