renamed wxWave to wxSound; compatibility fixes

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

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 957361363235e0d1d980918b59b8a2094049b2eb..9643b64e7641dba42d9171d350cc12ba879fd502 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -15,17 +15,20 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 

-int WXDLLIMPEXP_BASE wxStringSortAscending(wxString*, wxString*);
-int WXDLLIMPEXP_BASE wxStringSortDescending(wxString*, wxString*);
+WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortAscending(wxString*, wxString*);
+WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortDescending(wxString*, wxString*);

 
 #if wxUSE_STL
 
 #include "wx/dynarray.h"
 
 
 #if wxUSE_STL
 
 #include "wx/dynarray.h"
 

-typedef int (*CMPFUNCwxString)(wxString*, wxString*);
-WX_DECLARE_EXPORTED_BASEARRAY(wxString, wxBaseArrayStringBase);
-WX_DEFINE_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase, 
-                             wxBaseArrayStringBase);
+typedef int (wxCMPFUNC_CONV *CMPFUNCwxString)(wxString*, wxString*);
+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, 
                               wxBaseArrayStringBase, = wxStringSortAscending,
                               class WXDLLIMPEXP_BASE, CMPFUNCwxString);
 _WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase, 
                               wxBaseArrayStringBase, = wxStringSortAscending,
                               class WXDLLIMPEXP_BASE, CMPFUNCwxString);


@@ -35,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


@@ -53,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


@@ -76,19 +83,17 @@ class WXDLLIMPEXP_BASE wxArrayString
 {
 public:
   // type of function used by wxArrayString::Sort()
 {
 public:
   // type of function used by wxArrayString::Sort()

-  typedef int (*CompareFunction)(const wxString& first,
+  typedef int (wxCMPFUNC_CONV *CompareFunction)(const wxString& first,

                                  const wxString& second);
   // type of function used by wxArrayString::Sort(), for compatibility with
   // wxArray
                                  const wxString& second);
   // type of function used by wxArrayString::Sort(), for compatibility with
   // wxArray

-  typedef int (*CompareFunction2)(wxString* first,
+  typedef int (wxCMPFUNC_CONV *CompareFunction2)(wxString* first,

                                   wxString* second);
 
   // constructors and destructor
     // default ctor
                                   wxString* second);
 
   // constructors and destructor
     // default ctor

-  wxArrayString()
-      : m_nSize(0), m_nCount(0), m_pItems(NULL), m_autoSort(FALSE)
-      { Init(FALSE); }
-    // if autoSort is TRUE, the array is always sorted (in alphabetical order)
+  wxArrayString() { Init(false); }
+    // if autoSort is true, the array is always sorted (in alphabetical order)

     //
     // NB: the reason for using int and not bool is that like this we can avoid
     //     using this ctor for implicit conversions from "const char *" (which
     //
     // NB: the reason for using int and not bool is that like this we can avoid
     //     using this ctor for implicit conversions from "const char *" (which


@@ -96,9 +101,7 @@ public:
     //
     //     of course, using explicit would be even better - if all compilers
     //     supported it...
     //
     //     of course, using explicit would be even better - if all compilers
     //     supported it...

-  wxArrayString(int autoSort)
-      : m_nSize(0), m_nCount(0), m_pItems(NULL), m_autoSort(FALSE)
-      { Init(autoSort != 0); }
+  wxArrayString(int autoSort) { Init(autoSort != 0); }

     // copy ctor
   wxArrayString(const wxArrayString& array);
     // assignment operator
     // copy ctor
   wxArrayString(const wxArrayString& array);
     // assignment operator


@@ -144,20 +147,20 @@ public:
       return Item(Count() - 1);
   }
 
       return Item(Count() - 1);
   }
 

-#if WXWIN_COMPATIBILITY_2_4

     // return a wxString[], useful for the controls which
     // take one in their ctor.  You must delete[] it yourself
     // once you are done with it.  Will return NULL if the
     // ArrayString was empty.
     // return a wxString[], useful for the controls which
     // take one in their ctor.  You must delete[] it yourself
     // once you are done with it.  Will return NULL if the
     // ArrayString was empty.

+#if WXWIN_COMPATIBILITY_2_4

   wxString* GetStringArray() const;
 #endif
 
   // item management
     // Search the element in the array, starting from the beginning if
   wxString* GetStringArray() const;
 #endif
 
   // item management
     // Search the element in the array, starting from the beginning if

-    // bFromEnd is FALSE or from end otherwise. If bCase, comparison is case
+    // bFromEnd is false or from end otherwise. If bCase, comparison is case

     // sensitive (default). Returns index of the first item matched or
     // wxNOT_FOUND
     // sensitive (default). Returns index of the first item matched or
     // wxNOT_FOUND

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

     // add new element at the end (if the array is not sorted), return its
     // index
   size_t Add(const wxString& str, size_t nInsert = 1);
     // add new element at the end (if the array is not sorted), return its
     // index
   size_t Add(const wxString& str, size_t nInsert = 1);


@@ -175,8 +178,8 @@ public:
 
   // sorting
     // sort array elements in alphabetical order (or reversed alphabetical
 
   // sorting
     // sort array elements in alphabetical order (or reversed alphabetical

-    // order if reverseOrder parameter is TRUE)
-  void Sort(bool reverseOrder = FALSE);
+    // order if reverseOrder parameter is true)
+  void Sort(bool reverseOrder = false);

     // sort array elements using specified comparaison function
   void Sort(CompareFunction compareFunction);
   void Sort(CompareFunction2 compareFunction);
     // sort array elements using specified comparaison function
   void Sort(CompareFunction compareFunction);
   void Sort(CompareFunction2 compareFunction);


@@ -201,9 +204,9 @@ public:
   // FIXME: same in dynarray.h
   class reverse_iterator
   {
   // FIXME: same in dynarray.h
   class reverse_iterator
   {

-    typedef wxArrayString name;
-    typedef name::reference reference;
-    typedef name::pointer pointer;
+    typedef wxString value_type;
+    typedef value_type* pointer;
+    typedef value_type& reference;

     typedef reverse_iterator itor;
     friend itor operator+(int o, const itor& it);
     friend itor operator+(const itor& it, int o);
     typedef reverse_iterator itor;
     friend itor operator+(int o, const itor& it);
     friend itor operator+(const itor& it, int o);


@@ -227,9 +230,9 @@ public:
 
   class const_reverse_iterator
   {
 
   class const_reverse_iterator
   {

-    typedef wxArrayString name;
-    typedef name::const_reference reference;
-    typedef name::const_pointer pointer;
+    typedef wxString value_type;
+    typedef const value_type* pointer;
+    typedef const value_type& reference;

     typedef const_reverse_iterator itor;
     friend itor operator+(int o, const itor& it);
     friend itor operator+(const itor& it, int o);
     typedef const_reverse_iterator itor;
     friend itor operator+(int o, const itor& it);
     friend itor operator+(const itor& it, int o);


@@ -252,6 +255,9 @@ public:
     bool operator !=(const itor& it) { return m_ptr != it.m_ptr; }
   };
 
     bool operator !=(const itor& it) { return m_ptr != it.m_ptr; }
   };
 

+  wxArrayString(const_iterator first, const_iterator last)
+    { Init(false); assign(first, last); }
+  wxArrayString(size_type n, const_reference v) { Init(false); assign(n, v); }

   void assign(const_iterator first, const_iterator last);
   void assign(size_type n, const_reference v)
     { clear(); Add(v, n); }
   void assign(const_iterator first, const_iterator last);
   void assign(size_type n, const_reference v)
     { clear(); Add(v, n); }


@@ -304,18 +310,43 @@ private:
 
   wxChar  **m_pItems; // pointer to data
 
 
   wxChar  **m_pItems; // pointer to data
 

-  bool    m_autoSort; // if TRUE, keep the array always sorted
+  bool    m_autoSort; // if true, keep the array always sorted

 };
 
 class WXDLLIMPEXP_BASE wxSortedArrayString : public wxArrayString
 {
 public:
 };
 
 class WXDLLIMPEXP_BASE wxSortedArrayString : public wxArrayString
 {
 public:

-  wxSortedArrayString() : wxArrayString(TRUE)
+  wxSortedArrayString() : wxArrayString(true)

     { }
     { }

-  wxSortedArrayString(const wxArrayString& array) : wxArrayString(TRUE)
+  wxSortedArrayString(const wxArrayString& array) : wxArrayString(true)

     { Copy(array); }
 };
 
 #endif // !wxUSE_STL
 
     { Copy(array); }
 };
 
 #endif // !wxUSE_STL
 

+// this class provides a temporary wxString* from a
+// wxArrayString
+class WXDLLIMPEXP_BASE wxCArrayString
+{
+public:
+    wxCArrayString( const wxArrayString& array )
+        : m_array( array ), m_strings( NULL )
+    { }
+    ~wxCArrayString() { delete[] m_strings; }
+
+    size_t GetCount() const { return m_array.GetCount(); }
+    wxString* GetStrings()
+    {
+        if( m_strings ) return m_strings;
+        size_t count = m_array.GetCount();
+        m_strings = new wxString[count];
+        for( size_t i = 0; i < count; ++i )
+            m_strings[i] = m_array[i];
+        return m_strings;
+    }
+private:
+    const wxArrayString& m_array;
+    wxString* m_strings;
+};
+

 #endif
 #endif