Minor corrections to make dist after reports

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

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index a78d09e9dd4bb3d46d63d51a78445098dc5e72bf..81177940fdf9317e0d4c40e519fc68cce8a67c96 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -15,9 +15,6 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 

-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"


@@ -177,7 +174,7 @@ public:
     // sort array elements in alphabetical order (or reversed alphabetical
     // order if reverseOrder parameter is true)
   void Sort(bool reverseOrder = false);
     // sort array elements in alphabetical order (or reversed alphabetical
     // order if reverseOrder parameter is true)
   void Sort(bool reverseOrder = false);

-    // sort array elements using specified comparaison function
+    // sort array elements using specified comparison function

   void Sort(CompareFunction compareFunction);
   void Sort(CompareFunction2 compareFunction);
 
   void Sort(CompareFunction compareFunction);
   void Sort(CompareFunction2 compareFunction);
 


@@ -299,8 +296,6 @@ protected:
 private:
   void Grow(size_t nIncrement = 0);     // makes array bigger if needed
 
 private:
   void Grow(size_t nIncrement = 0);     // makes array bigger if needed
 

-  void DoSort();                        // common part of all Sort() variants
-

   size_t  m_nSize,    // current size of the array
           m_nCount;   // current number of elements
 
   size_t  m_nSize,    // current size of the array
           m_nCount;   // current number of elements
 


@@ -404,7 +399,7 @@ public:
     // default copy constructor is ok
 
     // iteration interface
     // default copy constructor is ok
 
     // iteration interface

-    unsigned int GetCount() const { return m_size; }
+    size_t GetCount() const { return m_size; }

     bool IsEmpty() const { return GetCount() == 0; }
     const wxString& operator[] (unsigned int i) const
     {
     bool IsEmpty() const { return GetCount() == 0; }
     const wxString& operator[] (unsigned int i) const
     {


@@ -429,7 +424,7 @@ private:
     };
 
     wxStringContainerType m_type;
     };
 
     wxStringContainerType m_type;

-    unsigned int m_size;
+    size_t m_size;

     union
     {
         const wxString *      ptr;
     union
     {
         const wxString *      ptr;