avoid a bug in Carbon headers

[wxWidgets.git] / include / wx / arrstr.h

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 4e559f0fd69aaa4e5954aa6999692b489fb314ee..de3508e9c8ea7d05d70854249f5878e4013a4edb 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -23,8 +23,10 @@ WXDLLIMPEXP_BASE int wxStringSortDescending(wxString*, wxString*);
 #include "wx/dynarray.h"
 
 typedef int (*CMPFUNCwxString)(wxString*, wxString*);
 #include "wx/dynarray.h"
 
 typedef int (*CMPFUNCwxString)(wxString*, wxString*);

-WX_DECLARE_USER_EXPORTED_BASEARRAY(wxString, wxBaseArrayStringBase,
-                                   WXDLLIMPEXP_BASE);
+typedef wxString _wxArraywxBaseArrayStringBase;
+_WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase,
+                        wxArray_SortFunction<wxString>,
+                        class WXDLLIMPEXP_BASE);

 WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase, 
                                   wxBaseArrayStringBase, WXDLLIMPEXP_BASE);
 _WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase, 
 WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase, 
                                   wxBaseArrayStringBase, WXDLLIMPEXP_BASE);
 _WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase, 


@@ -36,6 +38,8 @@ class WXDLLIMPEXP_BASE wxArrayString : public wxArrayStringBase
 public:
     wxArrayString() { }
     wxArrayString(const wxArrayString& a) : wxArrayStringBase(a) { }
 public:
     wxArrayString() { }
     wxArrayString(const wxArrayString& a) : wxArrayStringBase(a) { }

+
+    int Index(const wxChar* sz, bool bCase = true, bool bFromEnd = false) const;

 };
 
 class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase
 };
 
 class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase


@@ -54,6 +58,8 @@ public:
         for ( size_t n = 0; n < src.size(); n++ )
             Add(src[n]);
     }
         for ( size_t n = 0; n < src.size(); n++ )
             Add(src[n]);
     }

+
+    int Index(const wxChar* sz, bool bCase = true, bool bFromEnd = false) const;

 };
 
 #else // if !wxUSE_STL
 };
 
 #else // if !wxUSE_STL