wxMessageBox off the main thread lost result code.

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

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 9fe25c6b0a4bf259779bfab68620472f7cd4d8fb..db67c8ef08e443a936317ba1d8147f02e12ddab2 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/arrstr.h
+// Name:        wx/arrstr.h

 // Purpose:     wxArrayString class
 // Author:      Mattia Barbon and Vadim Zeitlin
 // Modified by:
 // Created:     07/07/03
 // Purpose:     wxArrayString class
 // Author:      Mattia Barbon and Vadim Zeitlin
 // Modified by:
 // Created:     07/07/03

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -28,7 +27,7 @@ inline int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
     return wxStringSortAscending(s2, s1);
 }
 
     return wxStringSortAscending(s2, s1);
 }
 

-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS

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


@@ -100,7 +99,7 @@ private:
     }
 };
 
     }
 };
 

-#else // if !wxUSE_STL
+#else // if !wxUSE_STD_CONTAINERS

 
 // this shouldn't be defined for compilers not supporting template methods or
 // without std::distance()
 
 // this shouldn't be defined for compilers not supporting template methods or
 // without std::distance()


@@ -173,23 +172,26 @@ public:
 
   // items access (range checking is done in debug version)
     // get item at position uiIndex
 
   // items access (range checking is done in debug version)
     // get item at position uiIndex

-  wxString& Item(size_t nIndex) const
+  wxString& Item(size_t nIndex)

     {
         wxASSERT_MSG( nIndex < m_nCount,
                       wxT("wxArrayString: index out of bounds") );
 
         return m_pItems[nIndex];
     }
     {
         wxASSERT_MSG( nIndex < m_nCount,
                       wxT("wxArrayString: index out of bounds") );
 
         return m_pItems[nIndex];
     }

+  const wxString& Item(size_t nIndex) const { return const_cast<wxArrayString*>(this)->Item(nIndex); }

 
     // same as Item()
 
     // same as Item()

-  wxString& operator[](size_t nIndex) const { return Item(nIndex); }
+  wxString& operator[](size_t nIndex) { return Item(nIndex); }
+  const wxString& operator[](size_t nIndex) const { return Item(nIndex); }

     // get last item
     // get last item

-  wxString& Last() const
+  wxString& Last()

   {
       wxASSERT_MSG( !IsEmpty(),
                     wxT("wxArrayString: index out of bounds") );
       return Item(GetCount() - 1);
   }
   {
       wxASSERT_MSG( !IsEmpty(),
                     wxT("wxArrayString: index out of bounds") );
       return Item(GetCount() - 1);
   }

+  const wxString& Last() const { return const_cast<wxArrayString*>(this)->Last(); }

 
 
   // item management
 
 
   // item management


@@ -249,7 +251,7 @@ public:
   public:
     pointer m_ptr;
     reverse_iterator() : m_ptr(NULL) { }
   public:
     pointer m_ptr;
     reverse_iterator() : m_ptr(NULL) { }

-    reverse_iterator(pointer ptr) : m_ptr(ptr) { }
+    wxEXPLICIT reverse_iterator(pointer ptr) : m_ptr(ptr) { }

     reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }
     pointer operator->() const { return m_ptr; }
     reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }
     pointer operator->() const { return m_ptr; }


@@ -275,7 +277,7 @@ public:
   public:
     pointer m_ptr;
     const_reverse_iterator() : m_ptr(NULL) { }
   public:
     pointer m_ptr;
     const_reverse_iterator() : m_ptr(NULL) { }

-    const_reverse_iterator(pointer ptr) : m_ptr(ptr) { }
+    wxEXPLICIT const_reverse_iterator(pointer ptr) : m_ptr(ptr) { }

     const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }
     const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }


@@ -381,7 +383,7 @@ public:
     { Copy(array); }
 };
 
     { Copy(array); }
 };
 

-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS

 
 // this class provides a temporary wxString* from a
 // wxArrayString
 
 // this class provides a temporary wxString* from a
 // wxArrayString


@@ -422,7 +424,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // by default, these functions use the escape character to escape the
 // ----------------------------------------------------------------------------
 
 // by default, these functions use the escape character to escape the

-// separators occuring inside the string to be joined, this can be disabled by
+// separators occurring inside the string to be joined, this can be disabled by

 // passing '\0' as escape
 
 WXDLLIMPEXP_BASE wxString wxJoin(const wxArrayString& arr,
 // passing '\0' as escape
 
 WXDLLIMPEXP_BASE wxString wxJoin(const wxArrayString& arr,