Make radiobutton tab behaviour the same on MSW

[wxWidgets.git] / src / common / dynarray.cpp

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index c69cb4cd409a44bf5c85e741dee3dd9e4a538a20..738e9813a39a140945104945b8d424fd221c7872 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -6,7 +6,7 @@
 // Created:     12.09.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     12.09.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -434,45 +434,104 @@ _WX_DEFINE_BASEARRAY(double,       wxBaseArrayDouble)
 
 _WX_DEFINE_BASEARRAY(wxString, wxBaseArrayStringBase);
 
 
 _WX_DEFINE_BASEARRAY(wxString, wxBaseArrayStringBase);
 

+// some compilers (Sun CC being the only known example) distinguish between
+// extern "C" functions and the functions with C++ linkage and ptr_fun and
+// wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in
+// this case, we need the wrappers below to make this work
+inline int wxStrcmpCppWrapper(const wxChar *p, const wxChar *q)
+{
+    return wxStrcmp(p, q);
+}
+
+inline int wxStricmpCppWrapper(const wxChar *p, const wxChar *q)
+{
+    return wxStricmp(p, q);
+}
+

 int wxArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) const
 {
     wxArrayString::const_iterator it;
 
     if (bCase)
 int wxArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) const
 {
     wxArrayString::const_iterator it;
 
     if (bCase)

+    {

         it = std::find_if(begin(), end(),
         it = std::find_if(begin(), end(),

-                          std::not1(std::bind2nd(std::ptr_fun(wxStrcmp), sz)));
-    else
+                          std::not1(
+                              std::bind2nd(
+                                  std::ptr_fun(wxStrcmpCppWrapper), sz)));
+    }
+    else // !bCase
+    {

         it = std::find_if(begin(), end(),
         it = std::find_if(begin(), end(),

-                          std::not1(std::bind2nd(std::ptr_fun(wxStricmp), sz)));
+                          std::not1(
+                              std::bind2nd(
+                                  std::ptr_fun(wxStricmpCppWrapper), sz)));
+    }

 
     return it == end() ? wxNOT_FOUND : it - begin();
 }
 
 
     return it == end() ? wxNOT_FOUND : it - begin();
 }
 

+template<class F>

 class wxStringCompareLess
 {
 public:
 class wxStringCompareLess
 {
 public:

-    typedef int (wxCMPFUNC_CONV * fnc)(const wxChar*, const wxChar*);
-public:
-    wxStringCompareLess(fnc f) : m_f(f) { }
+    wxStringCompareLess(F f) : m_f(f) { }

     bool operator()(const wxChar* s1, const wxChar* s2)
         { return m_f(s1, s2) < 0; }
     bool operator()(const wxChar* s1, const wxChar* s2)
         { return m_f(s1, s2) < 0; }

+    bool operator()(const wxString& s1, const wxString& s2)
+        { return m_f(s1, s2) < 0; }

 private:
 private:

-    fnc m_f;
+    F m_f;

 };
 
 };
 

+template<class F>
+wxStringCompareLess<F> wxStringCompare(F f)
+{
+    return wxStringCompareLess<F>(f);
+}
+
+void wxArrayString::Sort(CompareFunction function)
+{
+    std::sort(begin(), end(), wxStringCompare(function));
+}
+
+void wxArrayString::Sort(bool reverseOrder)
+{
+    if (reverseOrder)
+    {
+        std::sort(begin(), end(), std::greater<wxString>());
+    }
+    else
+    {
+        std::sort(begin(), end());
+    }
+}
+

 int wxSortedArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) const
 {
     wxSortedArrayString::const_iterator it;
 int wxSortedArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) const
 {
     wxSortedArrayString::const_iterator it;

+    wxString s(sz);

 
     if (bCase)
 
     if (bCase)

-        it = std::lower_bound(begin(), end(), sz,
-                              wxStringCompareLess(wxStrcmp));
+        it = std::lower_bound(begin(), end(), s,
+                              wxStringCompare(wxStrcmpCppWrapper));

     else
     else

-        it = std::lower_bound(begin(), end(), sz,
-                              wxStringCompareLess(wxStricmp));
+        it = std::lower_bound(begin(), end(), s,
+                              wxStringCompare(wxStricmpCppWrapper));

 
 

-    if (it == end() || (bCase ? wxStrcmp : wxStricmp)(it->c_str(), sz) != 0)
+    if (it == end())

         return wxNOT_FOUND;
         return wxNOT_FOUND;

+
+    if (bCase)
+    {
+        if (wxStrcmp(it->c_str(), sz) != 0)
+            return wxNOT_FOUND;
+    }
+    else
+    {
+        if (wxStricmp(it->c_str(), sz) != 0)
+            return wxNOT_FOUND;
+    }
+

     return it - begin();
 }
 
     return it - begin();
 }